This commit was manufactured by cvs2svn to create tag 'v201001111655'.
diff --git a/bundles/org.eclipse.jst.standard.schemas/.cvsignore b/bundles/org.eclipse.jst.standard.schemas/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/bundles/org.eclipse.jst.standard.schemas/.project b/bundles/org.eclipse.jst.standard.schemas/.project
deleted file mode 100644
index 07974e9..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.standard.schemas</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/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 79ae132..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Apr 28 03:39:56 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index d4ac9ad..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sat Apr 28 09:28:31 EDT 2007
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-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/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF
deleted file mode 100644
index 536d202..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.standard.schemas;singleton:=true
-Bundle-Version: 1.0.400.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Require-Bundle: org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)"
-Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.jst.standard.schemas/about.html b/bundles/org.eclipse.jst.standard.schemas/about.html
deleted file mode 100644
index 9f62af2..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>About</title>
-</head>
-
-<body>
-<p>June, 2008</p>
-<h3>License</h3>
-<p>The Eclipse Foundation makes available all content in this plug-in   (&quot;Content&quot;). Unless otherwise indicated below, the Content is provided to you   under the terms and conditions of the Eclipse Public License Version 1.0   (&quot;EPL&quot;). A copy of the EPL is available at <a href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</a>.   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-<p>If you did not receive this Content directly from the Eclipse Foundation, the   Content is being redistributed by another party (&quot;Redistributor&quot;) and different   terms and conditions may apply to your use of any object code in the Content.   Check the Redistributor's license that was provided with the Content. If no such   license exists, contact the Redistributor. Unless otherwise indicated below, the   terms and conditions of the EPL still apply to any source code in the Content   and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org/</a>.</p>
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third parties as set out below. If you   did not receive this Content directly from the Eclipse Foundation, the following is provided   for informational purposes only, and you should look to the Redistributor's license for   terms and conditions of use.</p>
-<h4>Appserv Commons schemas and DTDs v2_b33 (Subset) </h4>
-<p>Your use of the Appserv Commons schemas and DTDs is subject to the terms and  conditions of the Common Development and Distribution License v1.0. A  copy of the license is contained  in the file <a href="about_files/CDDLv1.0.txt">LICENSE.txt</a> and is also available at <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>. </p>
-<p>The source for the schemas and DTDs is available on the Glassfish community website at <a href="https://glassfish.dev.java.net/public/downloadsindex.html">https://glassfish.dev.java.net/</a>. </p>
-
-<h4>Java Server Faces 1.2 schema and DTDs (Subset) </h4>
-<p>Your use of the Java Server Faces schemas and DTDs is subject to the terms and  conditions of the Common Development and Distribution License v1.0. A  copy of the license is contained  in the file <a href="about_files/CDDLv1.0.txt">LICENSE.txt</a> and is also available at <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>. </p>
-<p>The source for the schemas and DTDs is available on the Java Server Faces project page on the Glassfish community website at <a href="https://javaserverfaces.dev.java.net">https://javaserverfaces.dev.java.net/</a>. </p>
-
-<h4>Java Persistence API XML Schemas</h4>
-<p>Your use of the Java Persistence API XML Schemas (orm_1_0.xsd, persistence_1_0.xsd) is subject to  the terms and  conditions of the Common Development and Distribution License v1.0. A  copy of the license is contained  in the file <a href="about_files/CDDLv1.0.txt">LICENSE.txt</a> and is also available at <a href="https://glassfish.dev.java.net/public/CDDLv1.0.html">https://glassfish.dev.java.net/public/CDDLv1.0.html</a>. </p>
-<p>The original source for the schemas is available on <a href="http://java.sun.com/xml/ns/persistence/">http://java.sun.com/xml/ns/persistence/</a>. </p>
-</body>
-</html>
diff --git a/bundles/org.eclipse.jst.standard.schemas/about_files/CDDLv1.0.txt b/bundles/org.eclipse.jst.standard.schemas/about_files/CDDLv1.0.txt
deleted file mode 100644
index 1154e0a..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/about_files/CDDLv1.0.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
-
-1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
-1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
-1.4. Executable means the Covered Software in any form other than Source Code.
-
-1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
-
-1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
-1.7. License means this document.
-
-1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. Modifications means the Source Code and Executable form of any of the following:
-
-A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
-B. Any new file that contains any part of the Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made available under the terms of this License.
-
-1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
-
-1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
-1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)áthe power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)áownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sectionsá2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-(d) Notwithstanding Sectioná2.1(b) above, no patent license is granted: (1)áfor code that You delete from the Original Software, or (2)áfor infringements caused by: (i)áthe modification of the Original Software, or (ii)áthe combination of the Original Software with other software or devices.
-
-2.2. Contributor Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)áModifications made by that Contributor (or portions thereof); and (2)áthe combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-(c) The licenses granted in Sectionsá2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-(d) Notwithstanding Sectioná2.2(b) above, no patent license is granted: (1)áfor any code that Contributor has deleted from the Contributor Version; (2)áfor infringements caused by: (i)áthird party modifications of Contributor Version, or (ii)áthe combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)áunder Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
-3.3. Required Notices.
-You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-3.6. Larger Works.
-You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)árename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)áotherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sectionsá2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
-
-6.3. In the event of termination under Sectionsá6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a commercial item, as that term is defined in 48áC.F.R.á2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. á252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48áC.F.R.á12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. 
-
-
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/about_files/LICENSE.txt b/bundles/org.eclipse.jst.standard.schemas/about_files/LICENSE.txt
deleted file mode 100644
index 1154e0a..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/about_files/LICENSE.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-
-1. Definitions.
-
-1.1. Contributor means each individual or entity that creates or contributes to the creation of Modifications.
-
-1.2. Contributor Version means the combination of the Original Software, prior Modifications used by a Contributor (if any), and the Modifications made by that particular Contributor.
-
-1.3. Covered Software means (a) the Original Software, or (b) Modifications, or (c) the combination of files containing Original Software with files containing Modifications, in each case including portions thereof.
-
-1.4. Executable means the Covered Software in any form other than Source Code.
-
-1.5. Initial Developer means the individual or entity that first makes Original Software available under this License.
-
-1.6. Larger Work means a work which combines Covered Software or portions thereof with code not governed by the terms of this License.
-
-1.7. License means this document.
-
-1.8. Licensable means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-
-1.9. Modifications means the Source Code and Executable form of any of the following:
-
-A. Any file that results from an addition to, deletion from or modification of the contents of a file containing Original Software or previous Modifications;
-
-B. Any new file that contains any part of the Original Software or previous Modification; or
-
-C. Any new file that is contributed or otherwise made available under the terms of this License.
-
-1.10. Original Software means the Source Code and Executable form of computer software code that is originally released under this License.
-
-1.11. Patent Claims means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-
-1.12. Source Code means (a) the common form of computer software code in which modifications are made and (b) associated documentation included in or with such code.
-
-1.13. You (or Your) means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License. For legal entities, You includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, control means (a)áthe power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b)áownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants.
-
-2.1. The Initial Developer Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, the Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Initial Developer, to use, reproduce, modify, display, perform, sublicense and distribute the Original Software (or portions thereof), with or without Modifications, and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using or selling of Original Software, to make, have made, use, practice, sell, and offer for sale, and/or otherwise dispose of the Original Software (or portions thereof).
-(c) The licenses granted in Sectionsá2.1(a) and (b) are effective on the date Initial Developer first distributes or otherwise makes the Original Software available to a third party under the terms of this License.
-(d) Notwithstanding Sectioná2.1(b) above, no patent license is granted: (1)áfor code that You delete from the Original Software, or (2)áfor infringements caused by: (i)áthe modification of the Original Software, or (ii)áthe combination of the Original Software with other software or devices.
-
-2.2. Contributor Grant.
-Conditioned upon Your compliance with Section 3.1 below and subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-(a) under intellectual property rights (other than patent or trademark) Licensable by Contributor to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof), either on an unmodified basis, with other Modifications, as Covered Software and/or as part of a Larger Work; and
-(b) under Patent Claims infringed by the making, using, or selling of Modifications made by that Contributor either alone and/or in combination with its Contributor Version (or portions of such combination), to make, use, sell, offer for sale, have made, and/or otherwise dispose of: (1)áModifications made by that Contributor (or portions thereof); and (2)áthe combination of Modifications made by that Contributor with its Contributor Version (or portions of such combination).
-(c) The licenses granted in Sectionsá2.2(a) and 2.2(b) are effective on the date Contributor first distributes or otherwise makes the Modifications available to a third party.
-(d) Notwithstanding Sectioná2.2(b) above, no patent license is granted: (1)áfor any code that Contributor has deleted from the Contributor Version; (2)áfor infringements caused by: (i)áthird party modifications of Contributor Version, or (ii)áthe combination of Modifications made by that Contributor with other software (except as part of the Contributor Version) or other devices; or (3)áunder Patent Claims infringed by Covered Software in the absence of Modifications made by that Contributor.
-
-3. Distribution Obligations.
-
-3.1. Availability of Source Code.
-
-Any Covered Software that You distribute or otherwise make available in Executable form must also be made available in Source Code form and that Source Code form must be distributed only under the terms of this License. You must include a copy of this License with every copy of the Source Code form of the Covered Software You distribute or otherwise make available. You must inform recipients of any such Covered Software in Executable form as to how they can obtain such Covered Software in Source Code form in a reasonable manner on or through a medium customarily used for software exchange.
-
-3.2. Modifications.
-
-The Modifications that You create or to which You contribute are governed by the terms of this License. You represent that You believe Your Modifications are Your original creation(s) and/or You have sufficient rights to grant the rights conveyed by this License.
-
-3.3. Required Notices.
-You must include a notice in each of Your Modifications that identifies You as the Contributor of the Modification. You may not remove or alter any copyright, patent or trademark notices contained within the Covered Software, or any notices of licensing or any descriptive text giving attribution to any Contributor or the Initial Developer.
-
-3.4. Application of Additional Terms.
-You may not offer or impose any terms on any Covered Software in Source Code form that alters or restricts the applicable version of this License or the recipients rights hereunder. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, you may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor. You must make it absolutely clear that any such warranty, support, indemnity or liability obligation is offered by You alone, and You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of warranty, support, indemnity or liability terms You offer.
-
-3.5. Distribution of Executable Versions.
-You may distribute the Executable form of the Covered Software under the terms of this License or under the terms of a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable form does not attempt to limit or alter the recipients rights in the Source Code form from the rights set forth in this License. If You distribute the Covered Software in Executable form under a different license, You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or Contributor. You hereby agree to indemnify the Initial Developer and every Contributor for any liability incurred by the Initial Developer or such Contributor as a result of any such terms You offer.
-
-3.6. Larger Works.
-You may create a Larger Work by combining Covered Software with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Software.
-
-4. Versions of the License.
-
-4.1. New Versions.
-Sun Microsystems, Inc. is the initial license steward and may publish revised and/or new versions of this License from time to time. Each version will be given a distinguishing version number. Except as provided in Section 4.3, no one other than the license steward has the right to modify this License.
-
-4.2. Effect of New Versions.
-
-You may always continue to use, distribute or otherwise make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. If the Initial Developer includes a notice in the Original Software prohibiting it from being distributed or otherwise made available under any subsequent version of the License, You must distribute and make the Covered Software available under the terms of the version of the License under which You originally received the Covered Software. Otherwise, You may also choose to use, distribute or otherwise make the Covered Software available under the terms of any subsequent version of the License published by the license steward.
-4.3. Modified Versions.
-
-When You are an Initial Developer and You want to create a new license for Your Original Software, You may create and use a modified version of this License if You: (a)árename the license and remove any references to the name of the license steward (except to note that the license differs from this License); and (b)áotherwise make it clear that the license contains terms which differ from this License.
-
-5. DISCLAIMER OF WARRANTY.
-
-COVERED SOFTWARE IS PROVIDED UNDER THIS LICENSE ON AN AS IS BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE COVERED SOFTWARE IS FREE OF DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED SOFTWARE IS WITH YOU. SHOULD ANY COVERED SOFTWARE PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-6. TERMINATION.
-
-6.1. This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-
-6.2. If You assert a patent infringement claim (excluding declaratory judgment actions) against Initial Developer or a Contributor (the Initial Developer or Contributor against whom You assert such claim is referred to as Participant) alleging that the Participant Software (meaning the Contributor Version where the Participant is a Contributor or the Original Software where the Participant is the Initial Developer) directly or indirectly infringes any patent, then any and all rights granted directly or indirectly to You by such Participant, the Initial Developer (if the Initial Developer is not the Participant) and all Contributors under Sectionsá2.1 and/or 2.2 of this License shall, upon 60 days notice from Participant terminate prospectively and automatically at the expiration of such 60 day notice period, unless if within such 60 day period You withdraw Your claim with respect to the Participant Software against such Participant either unilaterally or pursuant to a written agreement with Participant.
-
-6.3. In the event of termination under Sectionsá6.1 or 6.2 above, all end user licenses that have been validly granted by You or any distributor hereunder prior to termination (excluding licenses granted to You by any distributor) shall survive termination.
-
-7. LIMITATION OF LIABILITY.
-
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOST PROFITS, LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTYS NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-8. U.S. GOVERNMENT END USERS.
-
-The Covered Software is a commercial item, as that term is defined in 48áC.F.R.á2.101 (Oct. 1995), consisting of commercial computer software (as that term is defined at 48 C.F.R. á252.227-7014(a)(1)) and commercial computer software documentation as such terms are used in 48áC.F.R.á12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire Covered Software with only those rights set forth herein. This U.S. Government Rights clause is in lieu of, and supersedes, any other FAR, DFAR, or other clause or provision that addresses Government rights in computer software under this License.
-
-9. MISCELLANEOUS.
-
-This License represents the complete agreement concerning subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. This License shall be governed by the law of the jurisdiction specified in a notice contained within the Original Software (except to the extent applicable law, if any, provides otherwise), excluding such jurisdictions conflict-of-law provisions. Any litigation relating to this License shall be subject to the jurisdiction of the courts located in the jurisdiction and venue specified in a notice contained within the Original Software, with the losing party responsible for costs, including, without limitation, court costs and reasonable attorneys fees and expenses. The application of the United Nations Convention on Contracts for the International Sale of Goods is expressly excluded. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not apply to this License. You agree that You alone are responsible for compliance with the United States export administration regulations (and the export control laws and regulation of any other countries) when You use, distribute or otherwise make available any Covered Software.
-
-10. RESPONSIBILITY FOR CLAIMS.
-
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-
-NOTICE PURSUANT TO SECTION 9 OF THE COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL)
-The GlassFish code released under the CDDL shall be governed by the laws of the State of California (excluding conflict-of-law provisions). Any litigation relating to this License shall be subject to the jurisdiction of the Federal Courts of the Northern District of California and the state courts of the State of California, with venue lying in Santa Clara County, California. 
-
-
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/build.properties b/bundles/org.eclipse.jst.standard.schemas/build.properties
deleted file mode 100644
index 06cd99b..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               dtdsAndSchemas/,\
-               plugin.properties,\
-               about.html,\
-               about_files/
-src.includes = dtdsAndSchemas/,\
-               plugin.xml,\
-               META-INF/,\
-               plugin.properties,\
-               about.html,\
-               about_files/
-generateSourceBundle=false
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_2.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_2.dtd
deleted file mode 100644
index 6c58cc9..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_2.dtd
+++ /dev/null
@@ -1,292 +0,0 @@
-<!--
-Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road,
-Palo Alto, CA  94303, U.S.A.  All rights reserved.
- 
-This product or document is protected by copyright and distributed
-under licenses restricting its use, copying, distribution, and
-decompilation.  No part of this product or documentation may be
-reproduced in any form by any means without prior written authorization
-of Sun and its licensors, if any.  
-
-Third party software, including font technology, is copyrighted and 
-licensed from Sun suppliers. 
-
-Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, 
-are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. 
-and other countries.
-
-All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc.
-in the U.S. and other countries. Products bearing SPARC
-trademarks are based upon an architecture developed by Sun Microsystems, Inc. 
-
-PostScript is a registered trademark of Adobe Systems, Inc. 
-
- 
-Federal Acquisitions: Commercial Software - Government Users Subject to 
-Standard License Terms and Conditions.
-
-
- 
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
-TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-_________________________________________________________________________
-Copyright 1999 Sun Microsystems, Inc., 
-901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis. 
-Tous droits re'serve's.
- 
-
-Ce produit ou document est prote'ge' par un copyright et distribue' avec 
-des licences qui en restreignent l'utilisation, la copie, la distribution,
-et la de'compilation.  Aucune partie de ce produit ou de sa documentation
-associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen 
-que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses 
-bailleurs de licence, s'il y en a.  
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie 
-relative aux polices de caracte`res, est prote'ge' par un copyright 
-et licencie' par des fournisseurs de Sun.
- 
-Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,  
-sont des marques de fabrique ou des marques de'pose'es de Sun 
-Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
- 
-Toutes les marques SPARC sont utilise'es sous licence et sont
-des marques de fabrique ou des marques de'pose'es de SPARC
-International, Inc. aux Etats-Unis et  dans
-d'autres pays. Les produits portant les marques SPARC sont
-base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.  
-
-Postcript est une marque enregistre'e d'Adobe Systems Inc. 
- 
-LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
-DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
-TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
-A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
--->
-
-<!--
-The application-client element is the root element of an application client
-deployment descriptor.
-The application client deployment descriptor describes the EJB components and
-external resources referenced by the application client.
--->
-<!ELEMENT application-client (icon?, display-name, description?, env-entry*,
-ejb-ref*, resource-ref*)>
-
-<!--
-The description element is used to provide text describing the parent element.
-The description element should include any information that the
-application-client file producer wants to provide to the consumer of the
-application-client file (i.e., to the Deployer). Typically, the tools used by
-the application-client file consumer will display the description when
-processing the parent element that contains the description.
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended to be displayed
-by tools.
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The ejb-link element is used in the ejb-ref element to specify that an EJB
-reference is linked to an enterprise bean in the encompassing J2EE Application
-package. The value of the ejb-link element must be the ejb-name of an enterprise
-bean in the same J2EE Application package. Used in: ejb-ref
-Example: <ejb-link>EmployeeRecord</ejb-link>
--->
-<!ELEMENT ejb-link (#PCDATA)>
-
-<!--
-The ejb-ref element is used for the declaration of a reference to an enterprise
-bean's home. The declaration consists of an optional description; the EJB
-reference name used in the code of the referencing application client; the
-expected type of the referenced enterprise bean; the expected home and remote
-interfaces of the referenced enterprise bean; and an optional ejb-link
-information. The optional ejb-link element is used to specify the referenced
-enterprise bean.
--->
-<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type, home, remote,
-ejb-link?)>
-
-<!--
-The ejb-ref-name element contains the name of an EJB reference. The EJB
-reference is an entry in the application client's environment. It is recommended
-that name is prefixed with "ejb/". Used in: ejb-ref
-Example: <ejb-ref-name>ejb/Payroll</ejb-ref-name>
--->
-<!ELEMENT ejb-ref-name (#PCDATA)>
-
-<!--
-The ejb-ref-type element contains the expected type of the referenced enterprise
-bean. The ejb-ref-type element must be one of the following:
-<ejb-ref-type>Entity</ejb-ref-type>
-<ejb-ref-type>Session</ejb-ref-type>
-Used in: ejb-ref
--->
-<!ELEMENT ejb-ref-type (#PCDATA)>
-
-<!--
-The env-entry element contains the declaration of an application client's
-environment entries. The declaration consists of an optional description, the
-name of the environment entry, and an optional value.
--->
-<!ELEMENT env-entry (description?, env-entry-name, env-entry-type,
-env-entry-value?)>
-
-<!--
-The env-entry-name element contains the name of an application client's
-environment entry. Used in: env-entry
-Example: <env-entry-name>EmployeeAppDB</env-entry-name>
--->
-<!ELEMENT env-entry-name (#PCDATA)>
-
-<!--
-The env-entry-type element contains the fully-qualified Java type of the
-environment entry value that is expected by the application client's code. The
-following are the legal values of env-entry-type: java.lang.Boolean,
-java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte,
-java.lang.Short, java.lang.Long, and java.lang.Float.
-
-Used in: env-entry
-
-Example:
-<env-entry-type>java.lang.Boolean</env-entry-type>
--->
-<!ELEMENT env-entry-type (#PCDATA)>
-
-<!--
-The env-entry-value element contains the value of an application client's
-environment entry. The value must be a String that is valid for the constructor
-of the specified type that takes a single String parameter.
-
-Used in: env-entry
-
-Example:
-<env-entry-value>/datasources/MyDatabase</env-entry-value>
--->
-<!ELEMENT env-entry-value (#PCDATA)>
-
-<!--
-The home element contains the fully-qualified name of the enterprise bean's home
-interface.
-Used in: ejb-ref
-Example: <home>com.aardvark.payroll.PayrollHome</home>
--->
-<!ELEMENT home (#PCDATA)>
-
-<!--
-The icon element contains a small-icon and large-icon element which specify the
-URIs for a small and a large GIF or JPEG icon image used to represent the
-application client in a GUI tool.
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The large-icon element contains the name of a file containing a large (32 x 32)
-icon image. The file name is a relative path within the application-client jar
-file. The image must be either in the JPEG or GIF format, and the file name must
-end with the suffix ".jpg" or ".gif" respectively. The icon can be used by
-tools.
-Example:
-<large-icon>lib/images/employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The remote element contains the fully-qualified name of the enterprise bean's
-remote interface.
-Used in: ejb-ref
-Example:
-<remote>com.wombat.empl.EmployeeService</remote>
--->
-<!ELEMENT remote (#PCDATA)>
-
-<!--
-The res-auth element specifies whether the enterprise bean code signs on
-programmatically to the resource manager, or whether the Container will sign on
-to the resource manager on behalf of the bean. In the latter case, the Container
-uses information that is supplied by the Deployer.
-The value of this element must be one of the two following:
-<res-auth>Application</res-auth>
-<res-auth>Container</res-auth>
--->
-<!ELEMENT res-auth (#PCDATA)>
-
-<!--
-The res-ref-name element specifies the name of the resource factory reference
-name. The resource factory reference name is the name of the application
-client's environment entry whose value contains the JNDI name of the data
-source.
-Used in: resource-ref
--->
-<!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-The res-type element specifies the type of the data source. The type is
-specified by the Java interface (or class) expected to be implemented by the
-data source.
-Used in: resource-ref
--->
-<!ELEMENT res-type (#PCDATA)>
-
-<!--
-The resource-ref element contains a declaration of application clients's
-reference to an external resource. It consists of an optional description, the
-resource factory reference name, the indication of the resource factory type
-expected by the application client's code, and the type of authentication (bean
-or container).
-
-Example:
-<resource-ref>
-<res-ref-name>EmployeeAppDB</res-ref-name>
-<res-type>javax.sql.DataSource</res-type>
-<res-auth>Container</res-auth>
-</resource-ref>
--->
-<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth)>
-<!--
-The small-icon element contains the name of a file containing a small (16 x 16)
-icon image. The file name is a relative path within the application-client jar
-file. The image must be either in the JPEG or GIF format, and the file name must
-end with the suffix ".jpg" or ".gif" respectively. The icon can be used by
-tools.
-Example:
-<small-icon>lib/images/employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools to easily make tool-specific references to
-the elements of the deployment descriptor.
- -->
-<!ATTLIST application-client id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST ejb-link id ID #IMPLIED>
-<!ATTLIST ejb-ref id ID #IMPLIED>
-<!ATTLIST ejb-ref-name id ID #IMPLIED>
-<!ATTLIST ejb-ref-type id ID #IMPLIED>
-<!ATTLIST env-entry id ID #IMPLIED>
-<!ATTLIST env-entry-name id ID #IMPLIED>
-<!ATTLIST env-entry-type id ID #IMPLIED>
-<!ATTLIST env-entry-value id ID #IMPLIED>
-<!ATTLIST home id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST remote id ID #IMPLIED>
-<!ATTLIST res-auth id ID #IMPLIED>
-<!ATTLIST res-ref-name id ID #IMPLIED>
-<!ATTLIST res-type id ID #IMPLIED>
-<!ATTLIST resource-ref id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_3.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_3.dtd
deleted file mode 100644
index f9d456d..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_3.dtd
+++ /dev/null
@@ -1,506 +0,0 @@
-<!--
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, U.S.A.
-All rights reserved.
-
-Sun Microsystems, Inc. has intellectual property rights relating to
-technology embodied in the product that is described in this document.
-In particular, and without limitation, these intellectual property
-rights may include one or more of the U.S. patents listed at
-http://www.sun.com/patents and one or more additional patents or
-pending patent applications in the U.S. and in other countries.
-
-This document and the product to which it pertains are distributed
-under licenses restricting their use, copying, distribution, and
-decompilation.  This document may be reproduced and distributed but may
-not be changed without prior written authorization of Sun and its
-licensors, if any.
-
-Third-party software, including font technology, is copyrighted and
-licensed from Sun suppliers.
-
-Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
-Enterprise JavaBeans are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users Subject to
-Standard License Terms and Conditions.
-
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-
-_________________________________________________________________________
-
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, E'tats-Unis.
-Tous droits re'serve's.
-
-Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
-relatants a` la technologie incorpore'e dans le produit qui est de'crit
-dans ce document. En particulier, et sans la limitation, ces droits de
-proprie'te' intellectuels peuvent inclure un ou plus des brevets
-ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
-brevets plus supple'mentaires ou les applications de brevet en attente
-dans les E'tats-Unis et dans les autres pays.
-
-Ce produit ou document est prote'ge' par un copyright et distribue'
-avec des licences qui en restreignent l'utilisation, la copie, la
-distribution, et la de'compilation.  Ce documention associe n peut
-e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
-l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
-licence, le cas e'che'ant.
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie
-relative aux polices de caracte`res, est prote'ge' par un copyright et
-licencie' par des fournisseurs de Sun.
-
-Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
-Enterprise JavaBeans sont des marques de fabrique ou des marques
-de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
-pays.
-
-LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
-EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
-NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
-L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
-CONTREFAC,ON.
--->
-
-<!--
-This is the XML DTD for the J2EE 1.3 application client deployment
-descriptor.  All J2EE 1.3 application client deployment descriptors
-must include a DOCTYPE of the following form:
-
-  <!DOCTYPE application-client PUBLIC
-	"-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"
-	"http://java.sun.com/dtd/application-client_1_3.dtd">
-
--->
-
-<!--
-The following conventions apply to all J2EE deployment descriptor
-elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace
-  in the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is
-  case sensitive.
-
-- In elements that specify a pathname to a file within the same
-  JAR file, relative filenames (i.e., those not starting with "/")
-  are considered relative to the root of the JAR file's namespace.
-  Absolute filenames (i.e., those starting with "/") also specify
-  names in the root of the JAR file's namespace.  In general, relative
-  names are preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the servlet API.
--->
-
-
-<!--
-The application-client element is the root element of an application
-client deployment descriptor.  The application client deployment
-descriptor describes the EJB components and external resources
-referenced by the application client.
--->
-<!ELEMENT application-client (icon?, display-name, description?,
-		env-entry*, ejb-ref*, resource-ref*, resource-env-ref*,
-		callback-handler?)>
-
-<!--
-The callback-handler element names a class provided by the
-application.  The class must have a no args constructor and must
-implement the javax.security.auth.callback.CallbackHandler interface.
-The class will be instantiated by the application client container and
-used by the container to collect authentication information from the
-user.
-
-Used in: application-client
--->
-<!ELEMENT callback-handler (#PCDATA)>
-
-<!--
-The description element is used to provide text describing the parent
-element.  The description element should include any information that
-the application client jar file producer wants to provide to the consumer of
-the application client jar file (i.e., to the Deployer). Typically, the tools
-used by the application client jar file consumer will display the description
-when processing the parent element that contains the description.
-
-Used in: application-client, ejb-ref, env-entry, resource-env-ref,
-resource-ref
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended to be
-displayed by tools.  The display name need not be unique.
-
-Used in: application-client
-
-Example:
-
-<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The ejb-link element is used in the ejb-ref element
-to specify that an EJB reference is linked to an
-enterprise bean.
-
-The name in the ejb-link element is composed of a
-path name specifying the ejb-jar containing the referenced enterprise
-bean with the ejb-name of the target bean appended and separated from
-the path name by "#".  The path name is relative to the jar file
-containing the application client that is referencing the enterprise bean.
-This allows multiple enterprise beans with the same ejb-name to be
-uniquely identified.
-
-Used in: ejb-ref
-
-Examples:
-
-	<ejb-link>EmployeeRecord</ejb-link>
-
-	<ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
--->
-<!ELEMENT ejb-link (#PCDATA)>
-
-<!--
-The ejb-ref element is used for the declaration of a reference to
-an enterprise bean's home. The declaration consists of:
-
-	- an optional description
-	- the EJB reference name used in the code of
-	  the application client that's referencing the enterprise bean
-	- the expected type of the referenced enterprise bean
-	- the expected home and remote interfaces of the referenced
-	  enterprise bean
-	- optional ejb-link information, used to specify the referenced
-	  enterprise bean
-
-Used in: application-client
--->
-<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type,
-		home, remote, ejb-link?)>
-
-<!--
-The ejb-ref-name element contains the name of an EJB reference. The
-EJB reference is an entry in the application client's environment and is
-relative to the java:comp/env context.  The name must be unique
-within the application client.
-
-It is recommended that name is prefixed with "ejb/".
-
-Used in: ejb-ref
-
-Example:
-
-<ejb-ref-name>ejb/Payroll</ejb-ref-name>
--->
-<!ELEMENT ejb-ref-name (#PCDATA)>
-
-<!--
-The ejb-ref-type element contains the expected type of the
-referenced enterprise bean.
-
-The ejb-ref-type element must be one of the following:
-
-	<ejb-ref-type>Entity</ejb-ref-type>
-	<ejb-ref-type>Session</ejb-ref-type>
-
-Used in: ejb-ref
--->
-<!ELEMENT ejb-ref-type (#PCDATA)>
-
-<!--
-The env-entry element contains the declaration of an application client's
-environment entry. The declaration consists of an optional
-description, the name of the environment entry, and an optional
-value.  If a value is not specified, one must be supplied
-during deployment.
-
-Used in: application-client
--->
-<!ELEMENT env-entry (description?, env-entry-name, env-entry-type,
-		env-entry-value?)>
-
-<!--
-The env-entry-name element contains the name of an application client's
-environment entry.  The name is a JNDI name relative to the
-java:comp/env context.  The name must be unique within an application client.
-
-Used in: env-entry
-
-Example:
-
-<env-entry-name>minAmount</env-entry-name>
--->
-<!ELEMENT env-entry-name (#PCDATA)>
-
-<!--
-The env-entry-type element contains the fully-qualified Java type of
-the environment entry value that is expected by the application client's
-code.
-
-The following are the legal values of env-entry-type:
-
-	java.lang.Boolean
-	java.lang.Byte
-	java.lang.Character
-	java.lang.String
-	java.lang.Short
-	java.lang.Integer
-	java.lang.Long
-	java.lang.Float
-	java.lang.Double
-
-
-Used in: env-entry
-
-Example:
-
-<env-entry-type>java.lang.Boolean</env-entry-type>
--->
-<!ELEMENT env-entry-type (#PCDATA)>
-
-<!--
-The env-entry-value element contains the value of an application client's
-environment entry. The value must be a String that is valid for the
-constructor of the specified type that takes a single String
-parameter, or for java.lang.Character, a single character.
-
-Used in: env-entry
-
-Example:
-
-<env-entry-value>100.00</env-entry-value>
--->
-<!ELEMENT env-entry-value (#PCDATA)>
-
-<!--
-The home element contains the fully-qualified name of the enterprise
-bean's home interface.
-
-Used in: ejb-ref
-
-Example:
-
-<home>com.aardvark.payroll.PayrollHome</home>
--->
-<!ELEMENT home (#PCDATA)>
-
-<!--
-The icon element contains small-icon and large-icon elements that
-specify the file names for small and a large GIF or JPEG icon images
-used to represent the parent element in a GUI tool.
-
-Used in: application-client
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The large-icon element contains the name of a file
-containing a large (32 x 32) icon image. The file
-name is a relative path within the application client's
-jar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The remote element contains the fully-qualified name of the enterprise
-bean's remote interface.
-
-Used in: ejb-ref
-
-Example:
-
-<remote>com.wombat.empl.EmployeeService</remote>
--->
-<!ELEMENT remote (#PCDATA)>
-
-<!--
-The res-auth element specifies whether the application client code signs
-on programmatically to the resource manager, or whether the Container
-will sign on to the resource manager on behalf of the application client. In the
-latter case, the Container uses information that is supplied by the
-Deployer.
-
-The value of this element must be one of the two following:
-
-	<res-auth>Application</res-auth>
-	<res-auth>Container</res-auth>
-
-Used in: resource-ref
--->
-<!ELEMENT res-auth (#PCDATA)>
-
-<!--
-The res-ref-name element specifies the name of a resource manager
-connection factory reference.  The name is a JNDI name relative to the
-java:comp/env context.  The name must be unique within an application client.
-
-Used in: resource-ref
--->
-<!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-The res-sharing-scope element specifies whether connections obtained
-through the given resource manager connection factory reference can be
-shared. The value of this element, if specified, must be one of the
-two following:
-
-	<res-sharing-scope>Shareable</res-sharing-scope>
-	<res-sharing-scope>Unshareable</res-sharing-scope>
-
-The default value is Shareable.
-
-Used in: resource-ref
--->
-<!ELEMENT res-sharing-scope (#PCDATA)>
-
-<!--
-The res-type element specifies the type of the data source. The type
-is specified by the fully qualified Java language class or interface
-expected to be implemented by the data source.
-
-Used in: resource-ref
--->
-<!ELEMENT res-type (#PCDATA)>
-
-<!--
-The resource-env-ref element contains a declaration of an application client's
-reference to an administered object associated with a resource
-in the application client's environment.  It consists of an optional
-description, the resource environment reference name, and an
-indication of the resource environment reference type expected by
-the application client code.
-
-Used in: application-client
-
-Example:
-
-<resource-env-ref>
-    <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-</resource-env-ref>
--->
-<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
-		resource-env-ref-type)>
-
-<!--
-The resource-env-ref-name element specifies the name of a resource
-environment reference; its value is the environment entry name used in
-the application client code.  The name is a JNDI name relative to the
-java:comp/env context and must be unique within an application client.
-
-Used in: resource-env-ref
--->
-<!ELEMENT resource-env-ref-name (#PCDATA)>
-
-<!--
-The resource-env-ref-type element specifies the type of a resource
-environment reference.  It is the fully qualified name of a Java
-language class or interface.
-
-Used in: resource-env-ref
--->
-<!ELEMENT resource-env-ref-type (#PCDATA)>
-
-<!--
-The resource-ref element contains a declaration of an application client's
-reference to an external resource. It consists of an optional
-description, the resource manager connection factory reference name,
-the indication of the resource manager connection factory type
-expected by the application client code, the type of authentication
-(Application or Container), and an optional specification of the
-shareability of connections obtained from the resource (Shareable or
-Unshareable).
-
-Used in: application-client
-
-Example:
-
-    <resource-ref>
-	<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-	<res-type>javax.sql.DataSource</res-type>
-	<res-auth>Container</res-auth>
-	<res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
--->
-<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
-		res-sharing-scope?)>
-
-<!--
-The small-icon element contains the name of a file
-containing a small (16 x 16) icon image. The file
-name is a relative path within the application client's
-jar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e., information beyond the standard deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tool-specific files to the
-information in the standard deployment descriptor.
-
-Tools are not allowed to add the non-standard information into the
-standard deployment descriptor.
--->
-
-<!ATTLIST application-client id ID #IMPLIED>
-<!ATTLIST callback-handler id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST ejb-link id ID #IMPLIED>
-<!ATTLIST ejb-ref id ID #IMPLIED>
-<!ATTLIST ejb-ref-name id ID #IMPLIED>
-<!ATTLIST ejb-ref-type id ID #IMPLIED>
-<!ATTLIST env-entry id ID #IMPLIED>
-<!ATTLIST env-entry-name id ID #IMPLIED>
-<!ATTLIST env-entry-type id ID #IMPLIED>
-<!ATTLIST env-entry-value id ID #IMPLIED>
-<!ATTLIST home id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST remote id ID #IMPLIED>
-<!ATTLIST res-auth id ID #IMPLIED>
-<!ATTLIST res-ref-name id ID #IMPLIED>
-<!ATTLIST res-sharing-scope id ID #IMPLIED>
-<!ATTLIST res-type id ID #IMPLIED>
-<!ATTLIST resource-env-ref id ID #IMPLIED>
-<!ATTLIST resource-env-ref-name id ID #IMPLIED>
-<!ATTLIST resource-env-ref-type id ID #IMPLIED>
-<!ATTLIST resource-ref id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_4.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_4.xsd
deleted file mode 100644
index ec88971..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_1_4.xsd
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.4">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)application-client_1_4.xsds	1.17 02/11/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2002 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the application client 1.4
-	deployment descriptor.  The deployment descriptor must
-	be named "META-INF/application-client.xml" in the
-	application client's jar file.  All application client
-	deployment descriptors must indicate the application
-	client schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and indicate the version of the schema by
-	using the version element as shown below:
-
-	    <application-client xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-		http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
-	      version="1.4">
-	      ...
-	    </application-client>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for J2EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="application-client" type="j2ee:application-clientType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The application-client element is the root element of an
-	application client deployment descriptor.  The application
-	client deployment descriptor describes the EJB components
-	and external resources referenced by the application
-	client.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="env-entry-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The env-entry-name element contains the name of an
-	  application client's environment entry.  The name is a JNDI
-	  name relative to the java:comp/env context.  The name must
-	  be unique within an application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:env-entry"/>
-      <xsd:field    xpath="j2ee:env-entry-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="ejb-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the application
-	  client's environment and is relative to the
-	  java:comp/env context. The name must be unique within the
-	  application client.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:ejb-ref"/>
-      <xsd:field    xpath="j2ee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="res-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The res-ref-name element specifies the name of a
-	  resource manager connection factory reference.The name
-	  is a JNDI name relative to the java:comp/env context.
-	  The name must be unique within an application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:resource-ref"/>
-      <xsd:field    xpath="j2ee:res-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="resource-env-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The resource-env-ref-name element specifies the name of
-	  a resource environment reference; its value is the
-	  environment entry name used in the application client
-	  code. The name is a JNDI name relative to the
-	  java:comp/env context and must be unique within an
-	  application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:resource-env-ref"/>
-      <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="message-destination-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The message-destination-ref-name element specifies the
-	  name of a message destination reference; its value is
-	  the message destination reference name used in the
-	  application client code. The name is a JNDI name
-	  relative to the java:comp/env context and must be unique
-	  within an application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:message-destination-ref"/>
-      <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-    </xsd:unique>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="application-clientType">
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="env-entry"
-		   type="j2ee:env-entryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-		   type="j2ee:ejb-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:group ref="j2ee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-		   type="j2ee:resource-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-		   type="j2ee:resource-env-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-		   type="j2ee:message-destination-refType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="callback-handler"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The callback-handler element names a class provided by
-	    the application.  The class must have a no args
-	    constructor and must implement the
-	    javax.security.auth.callback.CallbackHandler
-	    interface.  The class will be instantiated by the
-	    application client container and used by the container
-	    to collect authentication information from the user.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination"
-		   type="j2ee:message-destinationType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="1.4"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.4.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_5.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_5.xsd
deleted file mode 100644
index e740827..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_5.xsd
+++ /dev/null
@@ -1,304 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="5">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)application-client_5.xsds	1.26 02/17/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the application client 5
-	deployment descriptor.  The deployment descriptor must
-	be named "META-INF/application-client.xml" in the
-	application client's jar file.  All application client
-	deployment descriptors must indicate the application
-	client schema by using the Java EE namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and indicate the version of the schema by
-	using the version element as shown below:
-
-	    <application-client xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-		http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
-	      version="5">
-	      ...
-	    </application-client>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for Java EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/application-client_5.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="application-client" type="javaee:application-clientType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The application-client element is the root element of an
-	application client deployment descriptor.  The application
-	client deployment descriptor describes the EJB components
-	and external resources referenced by the application
-	client.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="env-entry-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The env-entry-name element contains the name of an
-	  application client's environment entry.  The name is a JNDI
-	  name relative to the java:comp/env context.  The name must
-	  be unique within an application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:env-entry"/>
-      <xsd:field    xpath="javaee:env-entry-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="ejb-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the application
-	  client's environment and is relative to the
-	  java:comp/env context. The name must be unique within the
-	  application client.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-ref"/>
-      <xsd:field    xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="res-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The res-ref-name element specifies the name of a
-	  resource manager connection factory reference.The name
-	  is a JNDI name relative to the java:comp/env context.
-	  The name must be unique within an application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-ref"/>
-      <xsd:field    xpath="javaee:res-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="resource-env-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The resource-env-ref-name element specifies the name of
-	  a resource environment reference; its value is the
-	  environment entry name used in the application client
-	  code. The name is a JNDI name relative to the
-	  java:comp/env context and must be unique within an
-	  application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-env-ref"/>
-      <xsd:field    xpath="javaee:resource-env-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="message-destination-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The message-destination-ref-name element specifies the
-	  name of a message destination reference; its value is
-	  the message destination reference name used in the
-	  application client code. The name is a JNDI name
-	  relative to the java:comp/env context and must be unique
-	  within an application client.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:message-destination-ref"/>
-      <xsd:field    xpath="javaee:message-destination-ref-name"/>
-    </xsd:unique>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="application-clientType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="env-entry"
-		   type="javaee:env-entryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-		   type="javaee:ejb-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-		   type="javaee:resource-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-		   type="javaee:resource-env-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-		   type="javaee:message-destination-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref"
-		   type="javaee:persistence-unit-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="post-construct"
-		   type="javaee:lifecycle-callbackType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="pre-destroy"
-		   type="javaee:lifecycle-callbackType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="callback-handler"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The callback-handler element names a class provided by
-	    the application.  The class must have a no args
-	    constructor and must implement the
-	    javax.security.auth.callback.CallbackHandler
-	    interface.  The class will be instantiated by the
-	    application client container and used by the container
-	    to collect authentication information from the user.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination"
-		   type="javaee:message-destinationType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="5"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 5.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-
-    <xsd:attribute name="metadata-complete" type="xsd:boolean">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The metadata-complete attribute defines whether this
-	  deployment descriptor and other related deployment
-	  descriptors for this module (e.g., web service
-	  descriptors) are complete, or whether the class
-	  files available to this module and packaged with
-	  this application should be examined for annotations
-	  that specify deployment information.
-
-	  If metadata-complete is set to "true", the deployment
-	  tool must ignore any annotations that specify deployment
-	  information, which might be present in the class files
-	  of the application.
-
-	  If metadata-complete is not specified or is set to
-	  "false", the deployment tool must examine the class
-	  files of the application for annotations, as
-	  specified by the specifications.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_6.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_6.xsd
deleted file mode 100644
index 4a8e5e9..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application-client_6.xsd
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="6">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      This is the XML Schema for the application client 6
-      deployment descriptor.  The deployment descriptor must
-      be named "META-INF/application-client.xml" in the
-      application client's jar file.  All application client
-      deployment descriptors must indicate the application
-      client schema by using the Java EE namespace:
-      
-      http://java.sun.com/xml/ns/javaee
-      
-      and indicate the version of the schema by
-      using the version element as shown below:
-      
-      <application-client xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-      	http://java.sun.com/xml/ns/javaee/application-client_6.xsd"
-      version="6">
-      ...
-      </application-client>
-      
-      The instance documents may indicate the published version of
-      the schema using the xsi:schemaLocation attribute for Java EE
-      namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/application-client_6.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_6.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="application-client"
-               type="javaee:application-clientType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The application-client element is the root element of an
-        application client deployment descriptor.  The application
-        client deployment descriptor describes the EJB components
-        and external resources referenced by the application
-        client.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:unique name="env-entry-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The env-entry-name element contains the name of an
-          application client's environment entry.  The name is a JNDI
-          name relative to the java:comp/env context.  The name must
-          be unique within an application client.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:env-entry"/>
-      <xsd:field xpath="javaee:env-entry-name"/>
-    </xsd:unique>
-    <xsd:unique name="ejb-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The ejb-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the application
-          client's environment and is relative to the
-          java:comp/env context. The name must be unique within the
-          application client.
-          
-          It is recommended that name is prefixed with "ejb/".
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-ref"/>
-      <xsd:field xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="res-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The res-ref-name element specifies the name of a
-          resource manager connection factory reference.The name
-          is a JNDI name relative to the java:comp/env context.
-          The name must be unique within an application client.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-ref"/>
-      <xsd:field xpath="javaee:res-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="resource-env-ref-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The resource-env-ref-name element specifies the name of
-          a resource environment reference; its value is the
-          environment entry name used in the application client
-          code. The name is a JNDI name relative to the
-          java:comp/env context and must be unique within an
-          application client.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-env-ref"/>
-      <xsd:field xpath="javaee:resource-env-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="message-destination-ref-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The message-destination-ref-name element specifies the
-          name of a message destination reference; its value is
-          the message destination reference name used in the
-          application client code. The name is a JNDI name
-          relative to the java:comp/env context and must be unique
-          within an application client.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:message-destination-ref"/>
-      <xsd:field xpath="javaee:message-destination-ref-name"/>
-    </xsd:unique>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="application-clientType">
-    <xsd:sequence>
-      <xsd:element name="module-name"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="env-entry"
-                   type="javaee:env-entryType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-                   type="javaee:ejb-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-                   type="javaee:resource-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-                   type="javaee:resource-env-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-                   type="javaee:message-destination-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref"
-                   type="javaee:persistence-unit-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="post-construct"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-destroy"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="callback-handler"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The callback-handler element names a class provided by
-            the application.  The class must have a no args
-            constructor and must implement the
-            javax.security.auth.callback.CallbackHandler
-            interface.  The class will be instantiated by the
-            application client container and used by the container
-            to collect authentication information from the user.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination"
-                   type="javaee:message-destinationType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="data-source"
-                   type="javaee:data-sourceType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="javaee:dewey-versionType"
-                   fixed="6"
-                   use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The required value for the version is 6.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="metadata-complete"
-                   type="xsd:boolean">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The metadata-complete attribute defines whether this
-          deployment descriptor and other related deployment
-          descriptors for this module (e.g., web service
-          descriptors) are complete, or whether the class
-          files available to this module and packaged with
-          this application should be examined for annotations
-          that specify deployment information.
-          
-          If metadata-complete is set to "true", the deployment
-          tool must ignore any annotations that specify deployment
-          information, which might be present in the class files
-          of the application.
-          
-          If metadata-complete is not specified or is set to
-          "false", the deployment tool must examine the class
-          files of the application for annotations, as
-          specified by the specifications.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_2.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_2.dtd
deleted file mode 100644
index 6757362..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_2.dtd
+++ /dev/null
@@ -1,197 +0,0 @@
-<!--
-Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road,
-Palo Alto, CA  94303, U.S.A.  All rights reserved.
- 
-This product or document is protected by copyright and distributed
-under licenses restricting its use, copying, distribution, and
-decompilation.  No part of this product or documentation may be
-reproduced in any form by any means without prior written authorization
-of Sun and its licensors, if any.  
-
-Third party software, including font technology, is copyrighted and 
-licensed from Sun suppliers. 
-
-Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, 
-are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. 
-and other countries.
-
-All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc.
-in the U.S. and other countries. Products bearing SPARC
-trademarks are based upon an architecture developed by Sun Microsystems, Inc. 
-
-PostScript is a registered trademark of Adobe Systems, Inc. 
-
- 
-Federal Acquisitions: Commercial Software - Government Users Subject to 
-Standard License Terms and Conditions.
-
-
- 
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
-TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-_________________________________________________________________________
-Copyright 1999 Sun Microsystems, Inc., 
-901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis. 
-Tous droits re'serve's.
- 
-
-Ce produit ou document est prote'ge' par un copyright et distribue' avec 
-des licences qui en restreignent l'utilisation, la copie, la distribution,
-et la de'compilation.  Aucune partie de ce produit ou de sa documentation
-associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen 
-que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses 
-bailleurs de licence, s'il y en a.  
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie 
-relative aux polices de caracte`res, est prote'ge' par un copyright 
-et licencie' par des fournisseurs de Sun.
- 
-Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,  
-sont des marques de fabrique ou des marques de'pose'es de Sun 
-Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
- 
-Toutes les marques SPARC sont utilise'es sous licence et sont
-des marques de fabrique ou des marques de'pose'es de SPARC
-International, Inc. aux Etats-Unis et  dans
-d'autres pays. Les produits portant les marques SPARC sont
-base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.  
-
-Postcript est une marque enregistre'e d'Adobe Systems Inc. 
- 
-LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
-DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
-TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
-A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
--->
-
-<!--
-The alt-dd element specifies an optional URI to the post-assembly version of the
-deployment descriptor file for a particular J2EE module. The URI must specify
-the full pathname of the deployment descriptor file relative to the
-application's root directory. If alt-dd is not specified, the deployer must read
-the deployment descriptor from the default location and file name required by
-the respective component specification.
--->
-<!ELEMENT alt-dd (#PCDATA)>
-
-<!--
-The application element is the root element of a J2EE application deployment
-descriptor.
--->
-<!ELEMENT application (icon?, display-name, description?, module+,
-security-role*)>
-
-<!--
-The context-root element specifies the context root of a web application
--->
-<!ELEMENT context-root (#PCDATA)>
-
-<!--
-The description element provides a human readable description of the
-application. The description element should include any information that the
-application assembler wants to provide the deployer.
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The display-name element specifies an application name.
-The application name is assigned to the application by the application assembler
-and is used to identify the application to the deployer at deployment time.
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The ejb element specifies the URI of a ejb-jar, relative to the top level of the
-application package.
--->
-<!ELEMENT ejb (#PCDATA)>
-
-<!--
-The icon element contains a small-icon and large-icon element which specify the
-URIs for a small and a large GIF or JPEG icon image to represent the application
-in a GUI.
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The java element specifies the URI of a java application client module, relative
-to the top level of the application package.
--->
-<!ELEMENT java (#PCDATA)>
-
-<!--
-The large-icon element specifies the URI for a large GIF or JPEG icon image to
-represent the application in a GUI.
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The module element represents a single J2EE module and contains an ejb, java, or
-web element, which indicates the module type and contains a path to the module
-file, and an optional alt-dd element, which specifies an optional URI to the
-post-assembly version of the deployment descriptor.
-The application deployment descriptor must have one module element for each J2EE
-module in the application package.
--->
-<!ELEMENT module ((ejb | java | web), alt-dd?)>
-
-<!--
-The role-name element contains the name of a security role.
--->
-<!ELEMENT role-name (#PCDATA)>
-
-<!--
-The security-role element contains the definition of a security role which is
-global to the application. The definition consists of a description of the
-security role, and the security role name. The descriptions at this level
-override those in the component level security-role definitions and must be the
-descriptions tool display to the deployer.
--->
-<!ELEMENT security-role (description?, role-name)>
-
-<!--
-The small-icon element specifies the URI for a small GIF or JPEG icon image to
-represent the application in a GUI.
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The web element contains the web-uri and context-root of a web application
-module.
--->
-<!ELEMENT web (web-uri, context-root)>
-
-<!--
-The web-uri element specifies the URI of a web application file, relative to the
-top level of the application package.
--->
-<!ELEMENT web-uri (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools to easily make tool-specific references to
-the elements of the deployment descriptor.
- -->
-<!ATTLIST alt-dd id ID #IMPLIED>
-<!ATTLIST application id ID #IMPLIED>
-<!ATTLIST context-root id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST ejb id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST java id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST module id ID #IMPLIED>
-<!ATTLIST role-name id ID #IMPLIED>
-<!ATTLIST security-role id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST web id ID #IMPLIED>
-<!ATTLIST web-uri id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_3.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_3.dtd
deleted file mode 100644
index 22a49ac..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_3.dtd
+++ /dev/null
@@ -1,312 +0,0 @@
-<!--
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, U.S.A.
-All rights reserved.
-
-Sun Microsystems, Inc. has intellectual property rights relating to
-technology embodied in the product that is described in this document.
-In particular, and without limitation, these intellectual property
-rights may include one or more of the U.S. patents listed at
-http://www.sun.com/patents and one or more additional patents or
-pending patent applications in the U.S. and in other countries.
-
-This document and the product to which it pertains are distributed
-under licenses restricting their use, copying, distribution, and
-decompilation.  This document may be reproduced and distributed but may
-not be changed without prior written authorization of Sun and its
-licensors, if any.
-
-Third-party software, including font technology, is copyrighted and
-licensed from Sun suppliers.
-
-Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
-Enterprise JavaBeans are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users Subject to
-Standard License Terms and Conditions.
-
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-
-_________________________________________________________________________
-
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, E'tats-Unis.
-Tous droits re'serve's.
-
-Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
-relatants a` la technologie incorpore'e dans le produit qui est de'crit
-dans ce document. En particulier, et sans la limitation, ces droits de
-proprie'te' intellectuels peuvent inclure un ou plus des brevets
-ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
-brevets plus supple'mentaires ou les applications de brevet en attente
-dans les E'tats-Unis et dans les autres pays.
-
-Ce produit ou document est prote'ge' par un copyright et distribue'
-avec des licences qui en restreignent l'utilisation, la copie, la
-distribution, et la de'compilation.  Ce documention associe n peut
-e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
-l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
-licence, le cas e'che'ant.
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie
-relative aux polices de caracte`res, est prote'ge' par un copyright et
-licencie' par des fournisseurs de Sun.
-
-Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
-Enterprise JavaBeans sont des marques de fabrique ou des marques
-de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
-pays.
-
-LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
-EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
-NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
-L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
-CONTREFAC,ON.
--->
-
-<!--
-This is the XML DTD for the J2EE 1.3 application deployment
-descriptor.  All J2EE 1.3 application deployment descriptors
-must include a DOCTYPE of the following form:
-
-  <!DOCTYPE application PUBLIC
-	"-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-	"http://java.sun.com/dtd/application_1_3.dtd">
-
--->
-
-<!--
-The following conventions apply to all J2EE deployment descriptor
-elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace
-  in the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is
-  case sensitive.
-
-- In elements that specify a pathname to a file within the same
-  JAR file, relative filenames (i.e., those not starting with "/")
-  are considered relative to the root of the JAR file's namespace.
-  Absolute filenames (i.e., those starting with "/") also specify
-  names in the root of the JAR file's namespace.  In general, relative
-  names are preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the servlet API.
--->
-
-
-<!--
-The application element is the root element of a J2EE application
-deployment descriptor.
--->
-<!ELEMENT application (icon?, display-name, description?, module+,
-		security-role*)>
-
-<!--
-The alt-dd element specifies an optional URI to the post-assembly
-version of the deployment descriptor file for a particular J2EE module.
-The URI must specify the full pathname of the deployment descriptor
-file relative to the application's root directory. If alt-dd is not
-specified, the deployer must read the deployment descriptor from the
-default location and file name required by the respective component
-specification.
-
-Used in: module
--->
-<!ELEMENT alt-dd (#PCDATA)>
-
-<!--
-The connector element specifies the URI of a resource adapter archive
-file, relative to the top level of the application package.
-
-Used in: module
--->
-<!ELEMENT connector (#PCDATA)>
-
-<!--
-The context-root element specifies the context root of a web
-application.
-
-Used in: web
--->
-<!ELEMENT context-root (#PCDATA)>
-
-<!--
-The description element is used to provide text describing the parent
-element.  The description element should include any information that
-the application ear file producer wants to provide to the consumer of
-the application ear file (i.e., to the Deployer). Typically, the tools
-used by the application ear file consumer will display the description
-when processing the parent element that contains the description.
-
-Used in: application, security-role
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended to be
-displayed by tools.  The display name need not be unique.
-
-Used in: application
-
-Example:
-
-<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The ejb element specifies the URI of an ejb-jar, relative to the top
-level of the application package.
-
-Used in: module
--->
-<!ELEMENT ejb (#PCDATA)>
-
-<!--
-The icon element contains small-icon and large-icon elements that
-specify the file names for small and a large GIF or JPEG icon images
-used to represent the parent element in a GUI tool.
-
-Used in: application
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The java element specifies the URI of a java application client module,
-relative to the top level of the application package.
-
-Used in: module
--->
-<!ELEMENT java (#PCDATA)>
-
-<!--
-The large-icon element contains the name of a file
-containing a large (32 x 32) icon image. The file
-name is a relative path within the application's
-ear file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The module element represents a single J2EE module and contains a
-connector, ejb, java, or web element, which indicates the module type
-and contains a path to the module file, and an optional alt-dd element,
-which specifies an optional URI to the post-assembly version of the
-deployment descriptor.
-
-The application deployment descriptor must have one module element for
-each J2EE module in the application package.
-
-Used in: application
--->
-<!ELEMENT module ((connector | ejb | java | web), alt-dd?)>
-
-<!--
-The role-name element contains the name of a security role.
-
-The name must conform to the lexical rules for an NMTOKEN.
-
-Used in: security-role
--->
-<!ELEMENT role-name (#PCDATA)>
-
-<!--
-The security-role element contains the definition of a security
-role. The definition consists of an optional description of the
-security role, and the security role name.
-
-Used in: application
-
-Example:
-
-    <security-role>
-	<description>
-	    This role includes all employees who are authorized
-	    to access the employee service application.
-	</description>
-	<role-name>employee</role-name>
-    </security-role>
--->
-<!ELEMENT security-role (description?, role-name)>
-
-<!--
-The small-icon element contains the name of a file
-containing a small (16 x 16) icon image. The file
-name is a relative path within the application's
-ear file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The web element contains the web-uri and context-root of a web
-application module.
-
-Used in: module
--->
-<!ELEMENT web (web-uri, context-root)>
-
-<!--
-The web-uri element specifies the URI of a web application file,
-relative to the top level of the application package.
-
-Used in: web
--->
-<!ELEMENT web-uri (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e., information beyond the standard deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tool-specific files to the
-information in the standard deployment descriptor.
-
-Tools are not allowed to add the non-standard information into the
-standard deployment descriptor.
--->
-
-<!ATTLIST alt-dd id ID #IMPLIED>
-<!ATTLIST application id ID #IMPLIED>
-<!ATTLIST connector id ID #IMPLIED>
-<!ATTLIST context-root id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST ejb id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST java id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST module id ID #IMPLIED>
-<!ATTLIST role-name id ID #IMPLIED>
-<!ATTLIST security-role id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST web id ID #IMPLIED>
-<!ATTLIST web-uri id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_4.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_4.xsd
deleted file mode 100644
index c458cfd..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_1_4.xsd
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.4">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)application_1_4.xsds	1.13 02/11/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the application 1.4 deployment
-	descriptor.  The deployment descriptor must be named
-	"META-INF/application.xml" in the application's ear file.
-	All application deployment descriptors must indicate
-	the application schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and indicate the version of the schema by
-	using the version element as shown below:
-
-	    <application xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-		http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
-	      version="1.4">
-	      ...
-	    </application>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for J2EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/j2ee/application_1_4.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="application" type="j2ee:applicationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The application element is the root element of a J2EE
-	application deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="context-root-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The context-root element content must be unique
-	  in the ear.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:module/j2ee:web"/>
-      <xsd:field    xpath="j2ee:context-root"/>
-    </xsd:unique>
-
-    <xsd:unique name="security-role-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The security-role-name element content
-	  must be unique in the ear.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:security-role"/>
-      <xsd:field    xpath="j2ee:role-name"/>
-    </xsd:unique>
-
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="applicationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The applicationType defines the structure of the
-	application.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="module"
-		   type="j2ee:moduleType"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The application deployment descriptor must have one
-	    module element for each J2EE module in the
-	    application package. A module element is defined
-	    by moduleType definition.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="security-role"
-		   type="j2ee:security-roleType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="1.4"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.4.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="moduleType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The moduleType defines a single J2EE module and contains a
-	connector, ejb, java, or web element, which indicates the
-	module type and contains a path to the module file, and an
-	optional alt-dd element, which specifies an optional URI to
-	the post-assembly version of the deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:choice>
-	<xsd:element name="connector"
-		     type="j2ee:pathType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The connector element specifies the URI of a
-	      resource adapter archive file, relative to the
-	      top level of the application package.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="ejb"
-		     type="j2ee:pathType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb element specifies the URI of an ejb-jar,
-	      relative to the top level of the application
-	      package.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="java"
-		     type="j2ee:pathType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The java element specifies the URI of a java
-	      application client module, relative to the top
-	      level of the application package.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="web"
-		     type="j2ee:webType"/>
-      </xsd:choice>
-      <xsd:element name="alt-dd"
-		   type="j2ee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The alt-dd element specifies an optional URI to the
-	    post-assembly version of the deployment descriptor
-	    file for a particular J2EE module.  The URI must
-	    specify the full pathname of the deployment
-	    descriptor file relative to the application's root
-	    directory. If alt-dd is not specified, the deployer
-	    must read the deployment descriptor from the default
-	    location and file name required by the respective
-	    component specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webType defines the web-uri and context-root of
-	a web application module.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="web-uri"
-		   type="j2ee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The web-uri element specifies the URI of a web
-	    application file, relative to the top level of the
-	    application package.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="context-root"
-		   type="j2ee:string">
-
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The context-root element specifies the context root
-	    of a web application.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_5.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_5.xsd
deleted file mode 100644
index 4509662..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_5.xsd
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="5">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)application_5.xsds	1.17 08/05/05
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the application 5 deployment
-	descriptor.  The deployment descriptor must be named
-	"META-INF/application.xml" in the application's ear file.
-	All application deployment descriptors must indicate
-	the application schema by using the Java EE namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and indicate the version of the schema by
-	using the version element as shown below:
-
-	    <application xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-		http://java.sun.com/xml/ns/javaee/application_5.xsd"
-	      version="5">
-	      ...
-	    </application>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for Java EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/application_5.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="application" type="javaee:applicationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The application element is the root element of a Java EE
-	application deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="context-root-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The context-root element content must be unique
-	  in the ear.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:module/javaee:web"/>
-      <xsd:field    xpath="javaee:context-root"/>
-    </xsd:unique>
-
-    <xsd:unique name="security-role-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The security-role-name element content
-	  must be unique in the ear.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:security-role"/>
-      <xsd:field    xpath="javaee:role-name"/>
-    </xsd:unique>
-
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="applicationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The applicationType defines the structure of the
-	application.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="module"
-		   type="javaee:moduleType"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The application deployment descriptor must have one
-	    module element for each Java EE module in the
-	    application package. A module element is defined
-	    by moduleType definition.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="security-role"
-		   type="javaee:security-roleType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="library-directory"
-		   type="javaee:pathType"
-		   minOccurs="0"
-		   maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The library-directory element specifies the pathname
-	    of a directory within the application package, relative
-	    to the top level of the application package.  All files
-	    named "*.jar" in this directory must be made available
-	    in the class path of all components included in this
-	    application package.  If this element isn't specified,
-	    the directory named "lib" is searched.  An empty element
-	    may be used to disable searching.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="5"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 5.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="moduleType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The moduleType defines a single Java EE module and contains a
-	connector, ejb, java, or web element, which indicates the
-	module type and contains a path to the module file, and an
-	optional alt-dd element, which specifies an optional URI to
-	the post-assembly version of the deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:choice>
-	<xsd:element name="connector"
-		     type="javaee:pathType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The connector element specifies the URI of a
-	      resource adapter archive file, relative to the
-	      top level of the application package.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="ejb"
-		     type="javaee:pathType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb element specifies the URI of an ejb-jar,
-	      relative to the top level of the application
-	      package.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="java"
-		     type="javaee:pathType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The java element specifies the URI of a java
-	      application client module, relative to the top
-	      level of the application package.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="web"
-		     type="javaee:webType"/>
-      </xsd:choice>
-      <xsd:element name="alt-dd"
-		   type="javaee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The alt-dd element specifies an optional URI to the
-	    post-assembly version of the deployment descriptor
-	    file for a particular Java EE module.  The URI must
-	    specify the full pathname of the deployment
-	    descriptor file relative to the application's root
-	    directory. If alt-dd is not specified, the deployer
-	    must read the deployment descriptor from the default
-	    location and file name required by the respective
-	    component specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webType defines the web-uri and context-root of
-	a web application module.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="web-uri"
-		   type="javaee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The web-uri element specifies the URI of a web
-	    application file, relative to the top level of the
-	    application package.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="context-root"
-		   type="javaee:string">
-
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The context-root element specifies the context root
-	    of a web application.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_6.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_6.xsd
deleted file mode 100644
index 26111c6..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/application_6.xsd
+++ /dev/null
@@ -1,394 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="6">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      This is the XML Schema for the application 6 deployment
-      descriptor.  The deployment descriptor must be named
-      "META-INF/application.xml" in the application's ear file.
-      All application deployment descriptors must indicate
-      the application schema by using the Java EE namespace:
-      
-      http://java.sun.com/xml/ns/javaee
-      
-      and indicate the version of the schema by
-      using the version element as shown below:
-      
-      <application xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
-      	http://java.sun.com/xml/ns/javaee/application_6.xsd"
-      version="6">
-      ...
-      </application>
-      
-      The instance documents may indicate the published version of
-      the schema using the xsi:schemaLocation attribute for Java EE
-      namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/application_6.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_6.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="application"
-               type="javaee:applicationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The application element is the root element of a Java EE
-        application deployment descriptor.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:unique name="context-root-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The context-root element content must be unique
-          in the ear. 
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:module/javaee:web"/>
-      <xsd:field xpath="javaee:context-root"/>
-    </xsd:unique>
-    <xsd:unique name="security-role-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The security-role-name element content
-          must be unique in the ear.  
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:security-role"/>
-      <xsd:field xpath="javaee:role-name"/>
-    </xsd:unique>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="applicationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The applicationType defines the structure of the
-        application. 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="application-name"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="initialize-in-order"
-                   type="javaee:generic-booleanType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            If initialize-in-order is true, modules must be initialized
-            in the order they're listed in this deployment descriptor,
-            with the exception of application client modules, which can
-            be initialized in any order.
-            If initialize-in-order is not set or set to false, the order
-            of initialization is unspecified and may be product-dependent.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="module"
-                   type="javaee:moduleType"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The application deployment descriptor must have one
-            module element for each Java EE module in the
-            application package. A module element is defined 
-            by moduleType definition. 
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="security-role"
-                   type="javaee:security-roleType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="library-directory"
-                   type="javaee:pathType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The library-directory element specifies the pathname
-            of a directory within the application package, relative
-            to the top level of the application package.  All files
-            named "*.jar" in this directory must be made available
-            in the class path of all components included in this
-            application package.  If this element isn't specified,
-            the directory named "lib" is searched.  An empty element
-            may be used to disable searching.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="env-entry"
-                   type="javaee:env-entryType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-                   type="javaee:ejb-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-local-ref"
-                   type="javaee:ejb-local-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-                   type="javaee:resource-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-                   type="javaee:resource-env-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-                   type="javaee:message-destination-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-context-ref"
-                   type="javaee:persistence-context-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref"
-                   type="javaee:persistence-unit-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination"
-                   type="javaee:message-destinationType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="data-source"
-                   type="javaee:data-sourceType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="javaee:dewey-versionType"
-                   fixed="6"
-                   use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The required value for the version is 6.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="moduleType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The moduleType defines a single Java EE module and contains a
-        connector, ejb, java, or web element, which indicates the
-        module type and contains a path to the module file, and an
-        optional alt-dd element, which specifies an optional URI to
-        the post-assembly version of the deployment descriptor.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="connector"
-                     type="javaee:pathType">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The connector element specifies the URI of a
-              resource adapter archive file, relative to the
-              top level of the application package.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="ejb"
-                     type="javaee:pathType">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb element specifies the URI of an ejb-jar,
-              relative to the top level of the application
-              package.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="java"
-                     type="javaee:pathType">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The java element specifies the URI of a java
-              application client module, relative to the top
-              level of the application package.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="web"
-                     type="javaee:webType"/>
-      </xsd:choice>
-      <xsd:element name="alt-dd"
-                   type="javaee:pathType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The alt-dd element specifies an optional URI to the
-            post-assembly version of the deployment descriptor
-            file for a particular Java EE module.  The URI must
-            specify the full pathname of the deployment
-            descriptor file relative to the application's root
-            directory. If alt-dd is not specified, the deployer
-            must read the deployment descriptor from the default
-            location and file name required by the respective
-            component specification.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The webType defines the web-uri and context-root of
-        a web application module.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="web-uri"
-                   type="javaee:pathType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The web-uri element specifies the URI of a web
-            application file, relative to the top level of the
-            application package.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="context-root"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The context-root element specifies the context root
-            of a web application.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_0.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_0.dtd
deleted file mode 100644
index 1ab3b55..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_0.dtd
+++ /dev/null
@@ -1,557 +0,0 @@
-<!--
-Copyright 2000-2001 Sun Microsystems, Inc. 901 San Antonio Road,
-Palo Alto, CA  94303, U.S.A.  All rights reserved.
-
-This product or document is protected by copyright and distributed
-under licenses restricting its use, copying, distribution, and
-decompilation.  No part of this product or documentation may be
-reproduced in any form by any means without prior written authorization
-of Sun and its licensors, if any.
-
-Third party software, including font technology, is copyrighted and
-licensed from Sun suppliers.
-
-Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java
-Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans,
-are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S.
-and other countries.
-
-All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc.
-in the U.S. and other countries. Products bearing SPARC
-trademarks are based upon an architecture developed by Sun Microsystems, Inc.
-
-PostScript is a registered trademark of Adobe Systems, Inc.
-
-Federal Acquisitions: Commercial Software - Government Users Subject to
-Standard License Terms and Conditions.
-
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
-TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-_________________________________________________________________________
-
-Copyright 2000-2001 Sun Microsystems, Inc.,
-901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis.
-Tous droits re'serve's.
-
-
-Ce produit ou document est prote'ge' par un copyright et distribue' avec
-des licences qui en restreignent l'utilisation, la copie, la distribution,
-et la de'compilation.  Aucune partie de ce produit ou de sa documentation
-associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen
-que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses
-bailleurs de licence, s'il y en a.
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie
-relative aux polices de caracte`res, est prote'ge' par un copyright
-et licencie' par des fournisseurs de Sun.
-
-Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java
-Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,
-sont des marques de fabrique ou des marques de'pose'es de Sun
-Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
-
-Toutes les marques SPARC sont utilise'es sous licence et sont
-des marques de fabrique ou des marques de'pose'es de SPARC
-International, Inc. aux Etats-Unis et  dans
-d'autres pays. Les produits portant les marques SPARC sont
-base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.
-
-Postcript est une marque enregistre'e d'Adobe Systems Inc.
-
-LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
-DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
-TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
-A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
--->
-
-<!--
-This is the XML DTD for the Connector 1.0 deployment descriptor.
-All Connector 1.0 deployment descriptors must include a DOCTYPE
-of the following form:
-
-  <!DOCTYPE connector PUBLIC
-	"-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"
-	"http://java.sun.com/dtd/connector_1_0.dtd">
-
--->
-
-<!--
-The following conventions apply to all J2EE deployment descriptor
-elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace
-  in the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is
-  case sensitive.
-
-- In elements that specify a pathname to a file within the same
-  JAR file, relative filenames (i.e., those not starting with "/")
-  are considered relative to the root of the JAR file's namespace.
-  Absolute filenames (i.e., those starting with "/") also specify
-  names in the root of the JAR file's namespace.  In general, relative
-  names are preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the servlet API.
--->
-
-
-<!--
-The connector element is the root element of the deployment descriptor
-for the resource adapter. This element includes general information - vendor
-name, version, specification version supported, icon -  about the
-resource adapter module. It also includes information specific to the
-implementation of the resource adapter library as specified through
-the element resourceadapter.
--->
-<!ELEMENT connector (display-name?, description?, icon?, vendor-name,
-spec-version, eis-type, version, license?, resourceadapter)>
-
-<!--
-The element authentication-mechanism specifies an authentication mechanism
-supported by the resource adapter. Note that this support is for
-the resource adapter and not for the underlying EIS instance. The
-optional description specifies any resource adapter specific requirement
-for the support of security contract and authentication mechanism.
-
-Note that BasicPassword mechanism type should support the
-javax.resource.spi.security.PasswordCredential interface.
-The Kerbv5 mechanism type should support the
-javax.resource.spi.security.GenericCredential interface.
-
-Used in: resourceadapter
--->
-<!ELEMENT authentication-mechanism (
-description?, authentication-mechanism-type, credential-interface)>
-
-<!--
-The element authentication-mechanism-type specifies type of an authentication
-mechanism.
-
-The example values are:
-   <authentication-mechanism-type>BasicPassword
-                   </authentication-mechanism-type>
-   <authentication-mechanism-type>Kerbv5
-                   </authentication-mechanism-type>
-
-Any additional security mechanisms are outside the scope of the
-Connector architecture specification.
-
-Used in: authentication-mechanism
--->
-<!ELEMENT authentication-mechanism-type (#PCDATA)>
-
-<!--
-The element config-property contains a declaration of a single
-configuration property for a ManagedConnectionFactory instance.
-
-Each ManagedConnectionFactory instance creates connections to a
-specific EIS instance based on the properties configured on the
-ManagedConnectionFactory instance. The configurable properties are
-specified only once in the deployment descriptor, even though a
-resource adapter can be used to configure multiple ManagedConnnection-
-Factory instances (that create connections to different instances of
-the same EIS).
-
-The declaration consists of an optional description, name, type
-and an optional value of the configuration property. If the resource
-adapter provider does not specify a value than the deployer is
-responsible for providing a valid value for a configuration property.
-
-Any bounds or well-defined values of properties should be described
-in the description element.
-
-Used in: resourceadapter
--->
-<!ELEMENT config-property (description?, config-property-name,
-config-property-type, config-property-value?)>
-
-<!--
-The element config-property-name contains the name of a configuration
-property.
-
-The connector architecture defines a set of well-defined properties
-all of type java.lang.String. These are as follows:
-     <config-property-name>ServerName</config-property-name>
-     <config-property-name>PortNumber</config-property-name>
-     <config-property-name>UserName</config-property-name>
-     <config-property-name>Password</config-property-name>
-     <config-property-name>ConnectionURL</config-property-name>
-
-A resource adapter provider can extend this property set to include
-properties specific to the resource adapter and its underlying EIS.
-
-Used in: config-property
-
-Example: <config-property-name>ServerName</config-property-name>
--->
-<!ELEMENT config-property-name (#PCDATA)>
-
-<!--
-The element config-property-type contains the fully qualified Java
-type of a configuration property as required by ManagedConnection-
-Factory instance.
-
-The following are the legal values of config-property-type:
-   java.lang.Boolean, java.lang.String, java.lang.Integer,
-   java.lang.Double, java.lang.Byte, java.lang.Short,
-   java.lang.Long, java.lang.Float, java.lang.Character
-
-Used in: config-property
-
-Example: <config-property-type>java.lang.String</config-property-type>
--->
-<!ELEMENT config-property-type (#PCDATA)>
-
-<!--
-The element config-property-value contains the value of a configuration
-entry.
-
-Used in: config-property
-
-Example: <config-property-value>WombatServer</config-property-value>
--->
-<!ELEMENT config-property-value (#PCDATA)>
-
-<!--
-The element connection-impl-class specifies the fully-qualified
-name of the Connection class that implements resource adapter
-specific Connection interface.
-
-Used in: resourceadapter
-
-Example: <connection-impl-class>com.wombat.ConnectionImpl
-         </connection-impl-class>
--->
-<!ELEMENT connection-impl-class (#PCDATA)>
-
-<!--
-The element connection-interface specifies the fully-qualified
-name of the Connection interface supported by the resource
-adapter.
-
-Used in: resourceadapter
-
-Example: <connection-interface>javax.resource.cci.Connection
-         </connection-interface>
--->
-<!ELEMENT connection-interface (#PCDATA)>
-
-<!--
-The element connectionfactory-impl-class specifies the fully-qualified
-name of the ConnectionFactory class that implements resource adapter
-specific ConnectionFactory interface.
-
-Used in: resourceadapter
-
-Example: <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
-         </connectionfactory-impl-class>
--->
-<!ELEMENT connectionfactory-impl-class (#PCDATA)>
-
-<!--
-The element connectionfactory-interface specifies the fully-qualified
-name of the ConnectionFactory interface supported by the resource
-adapter.
-
-Used in: resourceadapter
-
-Example: <connectionfactory-interface>com.wombat.ConnectionFactory
-         </connectionfactory-interface>
-OR
-<connectionfactory-interface>javax.resource.cci.ConnectionFactory
-         </connectionfactory-interface>
--->
-<!ELEMENT connectionfactory-interface (#PCDATA)>
-
-<!--
-The element credential-interface specifies the interface that the
-resource adapter implementation supports for the representation
-of the credentials. This element should be used by application server
-to find out the Credential interface it should use as part of the
-security contract.
-
-The possible values are:
-   <credential-interface>javax.resource.spi.security.PasswordCredential
-        </credential-interface>
-   <credential-interface>javax.resource.spi.security.GenericCredential
-        </credential-interface>
-
-Used in: authentication-mechanism
--->
-<!ELEMENT credential-interface (#PCDATA)>
-
-<!--
-The description element is used to provide text describing the parent
-element.  The description element should include any information that
-the resource adapter rar file producer wants to provide to the consumer of
-the resource adapter rar file (i.e., to the Deployer). Typically, the tools
-used by the resource adapter rar file consumer will display the description
-when processing the parent element that contains the description.
-
-Used in: authentication-mechanism, config-property, connector, license,
-security-permission
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended to be
-displayed by tools.  The display name need not be unique.
-
-Used in: connector
-
-Example:
-
-<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The element eis-type contains information about the type of the
-EIS. For example, the type of an EIS can be product name of EIS
-independent of any version info.
-
-This helps in identifying EIS instances that can be used with
-this resource adapter.
-
-Used in: connector
--->
-<!ELEMENT eis-type (#PCDATA)>
-
-<!--
-The icon element contains small-icon and large-icon elements that
-specify the file names for small and a large GIF or JPEG icon images
-used to represent the parent element in a GUI tool.
-
-Used in: connector
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The large-icon element contains the name of a file
-containing a large (32 x 32) icon image. The file
-name is a relative path within the resource adapter's
-rar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The element license specifies licensing requirements for the resource
-adapter module. This element specifies whether a license is required
-to deploy and use this resource adapter, and an optional description
-of the licensing terms (examples: duration of license, number of
-connection restrictions).
-
-Used in: connector
--->
-<!ELEMENT license (description?, license-required)>
-
-<!--
-The element license-required specifies whether a license is required
-to deploy and use the resource adapter. This element must be one of
-the following:
-
-	<license-required>true</license-required>
-	<license-required>false</license-required>
-
-Used in: license
--->
-<!ELEMENT license-required (#PCDATA)>
-
-<!--
-The element managedconnectionfactory-class specifies the fully qualified
-name of the Java class that implements the javax.resource.spi.Managed-
-ConnectionFactory interface. This Java class is provided as part of
-resource adapter's implementation of connector architecture specified
-contracts.
-
-Used in: resourceadapter
-
-Example:
-  <managedconnectionfactory-class>com.wombat.ManagedConnectionFactoryImpl
-  </managedconnectionfactory-class>
--->
-<!ELEMENT managedconnectionfactory-class (#PCDATA)>
-
-<!--
-The element reauthentication-support specifies whether the resource
-adapter implementation supports re-authentication of existing Managed-
-Connection instance. Note that this information is for the resource
-adapter implementation and not for the underlying EIS instance.
-
-This element must be one of the following:
-        <reauthentication-support>true</reauthentication-support>
-        <reauthentication-support>false</reauthentication-support>
-Used in: resourceadapter
--->
-<!ELEMENT reauthentication-support (#PCDATA)>
-
-<!--
-The element resourceadapter specifies information about the resource
-adapter. The information includes fully-qualified names of
-class/interfaces required as part of the connector architecture
-specified contracts, level of transaction support provided,
-configurable properties for ManagedConnectionFactory instances,
-one or more authentication mechanisms supported and additional
-required security permissions.
-
-If there is no authentication-mechanism specified as part of
-resource adapter element then the resource adapter does not
-support any standard security authentication mechanisms as part
-of security contract. The application server ignores the security
-part of the system contracts in this case.
-
-Used in: connector
--->
-<!ELEMENT resourceadapter (
-managedconnectionfactory-class, connectionfactory-interface,
-connectionfactory-impl-class, connection-interface,
-connection-impl-class, transaction-support, config-property*,
-authentication-mechanism*, reauthentication-support, security-permission*
-)>
-
-<!--
-The element security permission specifies a security permission that
-is required by the resource adapter code.
-
-The security permission listed in the deployment descriptor are ones
-that are different from those required by the default permission set
-as specified in the connector specification. The optional description
-can mention specific reason that resource adapter requires a given
-security permission.
-
-Used in: resourceadapter
--->
-<!ELEMENT security-permission (description?, security-permission-spec)>
-
-<!--
-The element permission-spec specifies a security permission based
-on the Security policy file syntax. Refer to the following URL for
-Sun's implementation of the security permission specification:
-
-http:
-
-Used in: security-permission
--->
-<!ELEMENT security-permission-spec (#PCDATA)>
-
-<!--
-The small-icon element contains the name of a file
-containing a small (16 x 16) icon image. The file
-name is a relative path within the resource adapter's
-rar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The element spec-version specifies the version of the connector
-architecture specification that is supported by this resource
-adapter. This information enables deployer to configure the resource
-adapter to support deployment and runtime requirements of the
-corresponding connector architecture specification.
-
-Used in: connector
-
-Example:
-  <spec-version>1.0</spec-version>
--->
-<!ELEMENT spec-version (#PCDATA)>
-
-<!--
-The transaction-support element specifies the level of transaction
-support provided by the resource adapter.
-The value of transaction-support must be one of the following:
- <transaction-support>NoTransaction</transaction-support>
- <transaction-support>LocalTransaction</transaction-support>
- <transaction-support>XATransaction</transaction-support>
-
-Used in: resourceadapter
--->
-<!ELEMENT transaction-support (#PCDATA)>
-
-<!--
-The element vendor-name specifies the name of resource adapter provider
-vendor.
-
-Used in: connector
-
-Example:
-  <vendor-name>Wombat Corp.</vendor-name>
--->
-<!ELEMENT vendor-name (#PCDATA)>
-
-<!--
-The element version specifies a string-based version of the
-resource adapter from the resource adapter provider.
-
-Used in: connector
-
-Example:
-  <version>1.0</version>
--->
-<!ELEMENT version (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e., information beyond the standard deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tool-specific files to the
-information in the standard deployment descriptor.
-
-Tools are not allowed to add the non-standard information into the
-standard deployment descriptor.
--->
-
-<!ATTLIST authentication-mechanism id ID #IMPLIED>
-<!ATTLIST authentication-mechanism-type id ID #IMPLIED>
-<!ATTLIST config-property id ID #IMPLIED>
-<!ATTLIST config-property-name id ID #IMPLIED>
-<!ATTLIST config-property-type id ID #IMPLIED>
-<!ATTLIST config-property-value id ID #IMPLIED>
-<!ATTLIST connection-impl-class id ID #IMPLIED>
-<!ATTLIST connection-interface id ID #IMPLIED>
-<!ATTLIST connectionfactory-impl-class id ID #IMPLIED>
-<!ATTLIST connectionfactory-interface id ID #IMPLIED>
-<!ATTLIST connector id ID #IMPLIED>
-<!ATTLIST credential-interface id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST eis-type id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST license id ID #IMPLIED>
-<!ATTLIST license-required id ID #IMPLIED>
-<!ATTLIST managedconnectionfactory-class id ID #IMPLIED>
-<!ATTLIST reauthentication-support id ID #IMPLIED>
-<!ATTLIST resourceadapter id ID #IMPLIED>
-<!ATTLIST security-permission id ID #IMPLIED>
-<!ATTLIST security-permission-spec id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST spec-version id ID #IMPLIED>
-<!ATTLIST transaction-support id ID #IMPLIED>
-<!ATTLIST vendor-name id ID #IMPLIED>
-<!ATTLIST version id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_5.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_5.xsd
deleted file mode 100644
index 26d1912..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_5.xsd
+++ /dev/null
@@ -1,1036 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.5">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)connector_1_5.xsds	1.27 06/17/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the Connector 1.5 deployment
-	descriptor.  The deployment descriptor must be named
-	"META-INF/ra.xml" in the connector's rar file.  All Connector
-	deployment descriptors must indicate the connector resource
-	adapter schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <connector xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-		 http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-	      version="1.5">
-	      ...
-	    </connector>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for J2EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="connector" type="j2ee:connectorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The connector element is the root element of the deployment
-	descriptor for the resource adapter. This element includes
-	general information - vendor name, resource adapter version,
-	icon - about the resource adapter module. It also includes
-	information specific to the implementation of the resource
-	adapter library as specified through the element
-	resourceadapter.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activationspecType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activationspecType specifies an activation
-	specification.  The information includes fully qualified
-	Java class name of an activation specification and a set of
-	required configuration property names.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="activationspec-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element activationspec-class specifies the fully
-	      qualified Java class name of the activation
-	      specification class. This class must implement the
-	      javax.resource.spi.ActivationSpec interface. The
-	      implementation of this class is required to be a
-	      JavaBean.
-
-	      Example:
-		  <activationspec-class>com.wombat.ActivationSpecImpl
-		  </activationspec-class>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="required-config-property"
-		   type="j2ee:required-config-propertyType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="adminobjectType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The adminobjectType specifies information about an
-	administered object.  Administered objects are specific to a
-	messaging style or message provider.  This contains
-	information on the Java type of the interface implemented by
-	an administered object, its Java class name and its
-	configuration properties.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="adminobject-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element adminobject-interface specifies the
-	      fully qualified name of the Java type of the
-	      interface implemented by an administered object.
-
-	      Example:
-		<adminobject-interface>javax.jms.Destination
-		</adminobject-interface>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="adminobject-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element adminobject-class specifies the fully
-	      qualified Java class name of an administered object.
-
-	      Example:
-		  <adminobject-class>com.wombat.DestinationImpl
-		  </adminobject-class>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="config-property"
-		   type="j2ee:config-propertyType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="authentication-mechanismType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The authentication-mechanismType specifies an authentication
-	mechanism supported by the resource adapter. Note that this
-	support is for the resource adapter and not for the
-	underlying EIS instance. The optional description specifies
-	any resource adapter specific requirement for the support of
-	security contract and authentication mechanism.
-
-	Note that BasicPassword mechanism type should support the
-	javax.resource.spi.security.PasswordCredential interface.
-	The Kerbv5 mechanism type should support the
-	org.ietf.jgss.GSSCredential interface or the deprecated
-	javax.resource.spi.security.GenericCredential interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="authentication-mechanism-type"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element authentication-mechanism-type specifies
-	      type of an authentication mechanism.
-
-	      The example values are:
-
-	      <authentication-mechanism-type>BasicPassword
-	      </authentication-mechanism-type>
-
-	      <authentication-mechanism-type>Kerbv5
-	      </authentication-mechanism-type>
-
-	      Any additional security mechanisms are outside the
-	      scope of the Connector architecture specification.
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="credential-interface"
-		   type="j2ee:credential-interfaceType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="config-property-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The config-property-nameType contains the name of a
-	  configuration property.
-
-	  The connector architecture defines a set of well-defined
-	  properties all of type java.lang.String. These are as
-	  follows.
-
-	       ServerName
-	       PortNumber
-	       UserName
-	       Password
-	       ConnectionURL
-
-	  A resource adapter provider can extend this property set to
-	  include properties specific to the resource adapter and its
-	  underlying EIS.
-
-	  Possible values include
-		  ServerName
-		  PortNumber
-		  UserName
-		  Password
-		  ConnectionURL
-
-	  Example: <config-property-name>ServerName</config-property-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="config-property-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The config-property-typeType contains the fully
-	  qualified Java type of a configuration property.
-
-	  The following are the legal values:
-	     java.lang.Boolean, java.lang.String, java.lang.Integer,
-	     java.lang.Double, java.lang.Byte, java.lang.Short,
-	     java.lang.Long, java.lang.Float, java.lang.Character
-
-	  Used in: config-property
-
-	  Example:
-	  <config-property-type>java.lang.String</config-property-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="java.lang.Boolean"/>
-	<xsd:enumeration value="java.lang.String"/>
-	<xsd:enumeration value="java.lang.Integer"/>
-	<xsd:enumeration value="java.lang.Double"/>
-	<xsd:enumeration value="java.lang.Byte"/>
-	<xsd:enumeration value="java.lang.Short"/>
-	<xsd:enumeration value="java.lang.Long"/>
-	<xsd:enumeration value="java.lang.Float"/>
-	<xsd:enumeration value="java.lang.Character"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The config-propertyType contains a declaration of a single
-	configuration property that may be used for providing
-	configuration information.
-
-	The declaration consists of an optional description, name,
-	type and an optional value of the configuration property. If
-	the resource adapter provider does not specify a value than
-	the deployer is responsible for providing a valid value for
-	a configuration property.
-
-	Any bounds or well-defined values of properties should be
-	described in the description element.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="config-property-name"
-		   type="j2ee:config-property-nameType"/>
-      <xsd:element name="config-property-type"
-		   type="j2ee:config-property-typeType"/>
-      <xsd:element name="config-property-value"
-		   type="j2ee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element config-property-value contains the value
-	      of a configuration entry. Note, it is possible for a
-	      resource adapter deployer to override this
-	      configuration information during deployment.
-
-	      Example:
-	      <config-property-value>WombatServer</config-property-value>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="connection-definitionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The connection-definitionType defines a set of connection
-	interfaces and classes pertaining to a particular connection
-	type. This also includes configurable properties for
-	ManagedConnectionFactory instances that may be produced out
-	of this set.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="managedconnectionfactory-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element managedconnectionfactory-class specifies
-	      the fully qualified name of the Java class that
-	      implements the
-	      javax.resource.spi.ManagedConnectionFactory interface.
-	      This Java class is provided as part of resource
-	      adapter's implementation of connector architecture
-	      specified contracts. The implementation of this
-	      class is required to be a JavaBean.
-
-	      Example:
-	      <managedconnectionfactory-class>
-		  com.wombat.ManagedConnectionFactoryImpl
-	      </managedconnectionfactory-class>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property"
-		   type="j2ee:config-propertyType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="connectionfactory-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element connectionfactory-interface specifies
-	      the fully qualified name of the ConnectionFactory
-	      interface supported by the resource adapter.
-
-	      Example:
-	      <connectionfactory-interface>com.wombat.ConnectionFactory
-	      </connectionfactory-interface>
-
-	      OR
-
-	      <connectionfactory-interface>javax.resource.cci.ConnectionFactory
-	      </connectionfactory-interface>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="connectionfactory-impl-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element connectionfactory-impl-class specifies
-	      the fully qualified name of the ConnectionFactory
-	      class that implements resource adapter
-	      specific ConnectionFactory interface.
-
-	      Example:
-
-	      <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
-	      </connectionfactory-impl-class>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="connection-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The connection-interface element specifies the fully
-	      qualified name of the Connection interface supported
-	      by the resource adapter.
-
-	      Example:
-
-		  <connection-interface>javax.resource.cci.Connection
-		  </connection-interface>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="connection-impl-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The connection-impl-classType specifies the fully
-	      qualified name of the Connection class that
-	      implements resource adapter specific Connection
-	      interface.  It is used by the connection-impl-class
-	      elements.
-
-	      Example:
-
-		  <connection-impl-class>com.wombat.ConnectionImpl
-		  </connection-impl-class>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="connectorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The connectorType defines a resource adapter.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="vendor-name"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element vendor-name specifies the name of
-	    resource adapter provider vendor.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="eis-type"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element eis-type contains information about the
-	    type of the EIS. For example, the type of an EIS can
-	    be product name of EIS independent of any version
-	    info.
-
-	    This helps in identifying EIS instances that can be
-	    used with this resource adapter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="resourceadapter-version"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element resourceadapter-version specifies a string-based version
-	    of the resource adapter from the resource adapter
-	    provider.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="license"
-		   type="j2ee:licenseType"
-		   minOccurs="0"/>
-      <xsd:element name="resourceadapter"
-		   type="j2ee:resourceadapterType"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="1.5"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The version specifies the version of the
-	  connector architecture specification that is
-	  supported by this resource adapter. This information
-	  enables deployer to configure the resource adapter to
-	  support deployment and runtime requirements of the
-	  corresponding connector architecture specification.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="credential-interfaceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The credential-interfaceType specifies the
-	interface that the resource adapter implementation
-	supports for the representation of the
-	credentials. This element(s) that use this type,
-	i.e. credential-interface,  should be used by
-	application server to find out the Credential
-	interface it should use as part of the security
-	contract.
-
-	The possible values are:
-
-	javax.resource.spi.security.PasswordCredential
-	org.ietf.jgss.GSSCredential
-	javax.resource.spi.security.GenericCredential
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType">
-	<xsd:enumeration
-	     value="javax.resource.spi.security.PasswordCredential"/>
-	<xsd:enumeration
-	     value="org.ietf.jgss.GSSCredential"/>
-	<xsd:enumeration
-	     value="javax.resource.spi.security.GenericCredential"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="inbound-resourceadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The inbound-resourceadapterType specifies information
-	about an inbound resource adapter. This contains information
-	specific to the implementation of the resource adapter
-	library as specified through the messageadapter element.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="messageadapter"
-		   type="j2ee:messageadapterType"
-		   minOccurs="0">
-	<xsd:unique name="messagelistener-type-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The messagelistener-type element content must be
-	      unique in the messageadapter. Several messagelisteners
-	      can not use the same messagelistener-type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:messagelistener"/>
-	  <xsd:field    xpath="j2ee:messagelistener-type"/>
-	</xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="licenseType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The licenseType specifies licensing requirements for the
-	resource adapter module. This type specifies whether a
-	license is required to deploy and use this resource adapter,
-	and an optional description of the licensing terms
-	(examples: duration of license, number of connection
-	restrictions). It is used by the license element.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="license-required"
-		   type="j2ee:true-falseType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element license-required specifies whether a
-	    license is required to deploy and use the
-	    resource adapter. This element must be one of
-	    the following, "true" or "false".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="messageadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The messageadapterType specifies information about the
-	messaging capabilities of the resource adapter. This
-	contains information specific to the implementation of the
-	resource adapter library as specified through the
-	messagelistener element.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="messagelistener"
-		   type="j2ee:messagelistenerType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="messagelistenerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The messagelistenerType specifies information about a
-	specific message listener supported by the messaging
-	resource adapter. It contains information on the Java type
-	of the message listener interface and an activation
-	specification.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="messagelistener-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The element messagelistener-type specifies the fully
-	      qualified name of the Java type of a message
-	      listener interface.
-
-	      Example:
-
-		<messagelistener-type>javax.jms.MessageListener
-		</messagelistener-type>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="activationspec"
-		   type="j2ee:activationspecType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="outbound-resourceadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The outbound-resourceadapterType specifies information about
-	an outbound resource adapter. The information includes fully
-	qualified names of classes/interfaces required as part of
-	the connector architecture specified contracts for
-	connection management, level of transaction support
-	provided, one or more authentication mechanisms supported
-	and additional required security permissions.
-
-	If there is no authentication-mechanism specified as part of
-	resource adapter element then the resource adapter does not
-	support any standard security authentication mechanisms as
-	part of security contract. The application server ignores
-	the security part of the system contracts in this case.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="connection-definition"
-		   type="j2ee:connection-definitionType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="transaction-support"
-		   type="j2ee:transaction-supportType"/>
-      <xsd:element name="authentication-mechanism"
-		   type="j2ee:authentication-mechanismType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="reauthentication-support"
-		   type="j2ee:true-falseType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element reauthentication-support specifies
-	    whether the resource adapter implementation supports
-	    re-authentication of existing Managed- Connection
-	    instance. Note that this information is for the
-	    resource adapter implementation and not for the
-	    underlying EIS instance. This element must have
-	    either a "true" or "false" value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="required-config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The required-config-propertyType contains a declaration
-	  of a single configuration property used for specifying a
-	  required configuration property name. It is used
-	  by required-config-property elements.
-
-	  Example:
-
-	  <required-config-property>Destination</required-config-property>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="config-property-name"
-		   type="j2ee:config-property-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resourceadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The resourceadapterType specifies information about the
-	resource adapter. The information includes fully qualified
-	resource adapter Java class name, configuration properties,
-	information specific to the implementation of the resource
-	adapter library as specified through the
-	outbound-resourceadapter and inbound-resourceadapter
-	elements, and an optional set of administered objects.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="resourceadapter-class"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element resourceadapter-class specifies the
-	    fully qualified name of a Java class that implements
-	    the javax.resource.spi.ResourceAdapter
-	    interface. This Java class is provided as part of
-	    resource adapter's implementation of connector
-	    architecture specified contracts. The implementation
-	    of this class is required to be a JavaBean.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="config-property"
-		   type="j2ee:config-propertyType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="outbound-resourceadapter"
-		   type="j2ee:outbound-resourceadapterType"
-		   minOccurs="0">
-	<xsd:unique name="connectionfactory-interface-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The connectionfactory-interface element content
-	      must be unique in the outbound-resourceadapter.
-	      Multiple connection-definitions can not use the
-	      same connectionfactory-type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:connection-definition"/>
-	  <xsd:field    xpath="j2ee:connectionfactory-interface"/>
-	</xsd:unique>
-      </xsd:element>
-      <xsd:element name="inbound-resourceadapter"
-		   type="j2ee:inbound-resourceadapterType"
-		   minOccurs="0"/>
-      <xsd:element name="adminobject"
-		   type="j2ee:adminobjectType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="security-permission"
-		   type="j2ee:security-permissionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-permissionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-permissionType specifies a security
-	permission that is required by the resource adapter code.
-
-	The security permission listed in the deployment descriptor
-	are ones that are different from those required by the
-	default permission set as specified in the connector
-	specification. The optional description can mention specific
-	reason that resource adapter requires a given security
-	permission.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="security-permission-spec"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element security-permission-spec specifies a security
-	    permission based on the Security policy file
-	    syntax. Refer to the following URL for Sun's
-	    implementation of the security permission
-	    specification:
-
-	    http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-supportType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transaction-supportType specifies the level of
-	transaction support provided by the resource adapter. It is
-	used by transaction-support elements.
-
-	The value must be one of the following:
-
-	    NoTransaction
-	    LocalTransaction
-	    XATransaction
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="NoTransaction"/>
-	<xsd:enumeration value="LocalTransaction"/>
-	<xsd:enumeration value="XATransaction"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_6.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_6.xsd
deleted file mode 100644
index 45d875c..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/connector_1_6.xsd
+++ /dev/null
@@ -1,1261 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="1.6">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      This is the XML Schema for the Connector 1.6 deployment
-      descriptor.  The deployment descriptor must be named
-      "META-INF/ra.xml" in the connector's rar file.  All Connector
-      deployment descriptors must indicate the connector resource
-      adapter schema by using the Java EE namespace:
-      
-      http://java.sun.com/xml/ns/javaee
-      
-      and by indicating the version of the schema by
-      using the version element as shown below:
-      
-      <connector xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-      	 http://java.sun.com/xml/ns/javaee/connector_1_6.xsd"
-      version="1.6">
-      ...
-      </connector>
-      
-      The instance documents may indicate the published version of
-      the schema using the xsi:schemaLocation attribute for Java EE
-      namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/connector_1_6.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_6.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="connector"
-               type="javaee:connectorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The connector element is the root element of the deployment
-        descriptor for the resource adapter. This element includes
-        general information - vendor name, resource adapter version,
-        icon - about the resource adapter module. It also includes
-        information specific to the implementation of the resource
-        adapter library as specified through the element
-        resourceadapter.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activationspecType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The activationspecType specifies an activation
-        specification.  The information includes fully qualified
-        Java class name of an activation specification and a set of
-        required configuration property names.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="activationspec-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element activationspec-class specifies the fully
-            qualified Java class name of the activation
-            specification class. This class must implement the
-            javax.resource.spi.ActivationSpec interface. The
-            implementation of this class is required to be a
-            JavaBean.
-            
-            Example:
-            	  <activationspec-class>com.wombat.ActivationSpecImpl
-            	  </activationspec-class>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="required-config-property"
-                   type="javaee:required-config-propertyType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The required-config-property element is deprecated since
-            Connectors 1.6 specification. The resource adapter 
-            implementation is recommended to use the @NotNull
-            Bean Validation annotation or its XML validation
-            descriptor equivalent to indicate that a configuration
-            property is required to be specified by the deployer.
-            See the Connectors specification for more information. 
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property"
-                   type="javaee:config-propertyType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="adminobjectType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The adminobjectType specifies information about an
-        administered object.  Administered objects are specific to a
-        messaging style or message provider.  This contains
-        information on the Java type of the interface implemented by
-        an administered object, its Java class name and its
-        configuration properties.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="adminobject-interface"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element adminobject-interface specifies the
-            fully qualified name of the Java type of the
-            interface implemented by an administered object.
-            
-            Example:
-            	<adminobject-interface>javax.jms.Destination
-            	</adminobject-interface>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="adminobject-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element adminobject-class specifies the fully
-            qualified Java class name of an administered object.
-            
-            Example:
-            	  <adminobject-class>com.wombat.DestinationImpl
-            	  </adminobject-class>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property"
-                   type="javaee:config-propertyType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="authentication-mechanismType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The authentication-mechanismType specifies an authentication
-        mechanism supported by the resource adapter. Note that this
-        support is for the resource adapter and not for the
-        underlying EIS instance. The optional description specifies
-        any resource adapter specific requirement for the support of
-        security contract and authentication mechanism.
-        
-        Note that BasicPassword mechanism type should support the
-        javax.resource.spi.security.PasswordCredential interface.
-        The Kerbv5 mechanism type should support the
-        org.ietf.jgss.GSSCredential interface or the deprecated
-        javax.resource.spi.security.GenericCredential interface.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="authentication-mechanism-type"
-                   type="javaee:xsdStringType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element authentication-mechanism-type specifies
-            type of an authentication mechanism.
-            
-            The example values are:
-            
-            <authentication-mechanism-type>BasicPassword
-            </authentication-mechanism-type>
-            
-            <authentication-mechanism-type>Kerbv5
-            </authentication-mechanism-type>
-            
-            Any additional security mechanisms are outside the
-            scope of the Connector architecture specification.
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="credential-interface"
-                   type="javaee:credential-interfaceType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="config-property-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The config-property-nameType contains the name of a
-        configuration property.
-        
-        The connector architecture defines a set of well-defined
-        properties all of type java.lang.String. These are as
-        follows.
-        
-        ServerName
-        PortNumber
-        UserName
-        Password
-        ConnectionURL
-        
-        A resource adapter provider can extend this property set to
-        include properties specific to the resource adapter and its
-        underlying EIS.
-        
-        Possible values include
-        	  ServerName
-        	  PortNumber
-        	  UserName
-        	  Password
-        	  ConnectionURL
-        
-        Example: <config-property-name>ServerName</config-property-name>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="config-property-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The config-property-typeType contains the fully
-        qualified Java type of a configuration property.
-        
-        The following are the legal values:
-        java.lang.Boolean, java.lang.String, java.lang.Integer,
-        java.lang.Double, java.lang.Byte, java.lang.Short,
-        java.lang.Long, java.lang.Float, java.lang.Character
-        
-        Used in: config-property
-        
-        Example:
-        <config-property-type>java.lang.String</config-property-type>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="java.lang.Boolean"/>
-        <xsd:enumeration value="java.lang.String"/>
-        <xsd:enumeration value="java.lang.Integer"/>
-        <xsd:enumeration value="java.lang.Double"/>
-        <xsd:enumeration value="java.lang.Byte"/>
-        <xsd:enumeration value="java.lang.Short"/>
-        <xsd:enumeration value="java.lang.Long"/>
-        <xsd:enumeration value="java.lang.Float"/>
-        <xsd:enumeration value="java.lang.Character"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The config-propertyType contains a declaration of a single
-        configuration property that may be used for providing
-        configuration information.
-        
-        The declaration consists of an optional description, name,
-        type and an optional value of the configuration property. If
-        the resource adapter provider does not specify a value than
-        the deployer is responsible for providing a valid value for
-        a configuration property.
-        
-        Any bounds or well-defined values of properties should be
-        described in the description element.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="config-property-name"
-                   type="javaee:config-property-nameType"/>
-      <xsd:element name="config-property-type"
-                   type="javaee:config-property-typeType"/>
-      <xsd:element name="config-property-value"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element config-property-value contains the value
-            of a configuration entry. Note, it is possible for a
-            resource adapter deployer to override this
-            configuration information during deployment.
-            
-            Example:
-            <config-property-value>WombatServer</config-property-value>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property-ignore"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element config-property-ignore is used to specify 
-            whether the configuration tools must ignore considering the 
-            configuration property during auto-discovery of
-            Configuration properties. See the Connector specification for
-            more details. If unspecified, the container must not ignore
-            the configuration property during auto-discovery.
-            This element must be one of the following, "true" or "false".
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property-supports-dynamic-updates"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element config-property-supports-dynamic-updates is used to specify 
-            whether the configuration property allows its value to be updated, by
-            application server's configuration tools, during the lifetime of
-            the JavaBean instance. See the Connector specification for
-            more details. If unspecified, the container must not dynamically
-            reconfigure the property.
-            This element must be one of the following, "true" or "false".
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property-confidential"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element config-property-confidential is used to specify 
-            whether the configuration property is confidential and
-            recommends application server's configuration tools to use special 
-            visual aids for editing them. See the Connector specification for
-            more details. If unspecified, the container must not treat the
-            property as confidential.
-            This element must be one of the following, "true" or "false".
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="connection-definitionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The connection-definitionType defines a set of connection
-        interfaces and classes pertaining to a particular connection
-        type. This also includes configurable properties for
-        ManagedConnectionFactory instances that may be produced out
-        of this set.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="managedconnectionfactory-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element managedconnectionfactory-class specifies
-            the fully qualified name of the Java class that
-            implements the
-            javax.resource.spi.ManagedConnectionFactory interface.
-            This Java class is provided as part of resource
-            adapter's implementation of connector architecture
-            specified contracts. The implementation of this
-            class is required to be a JavaBean.
-            
-            Example:
-            <managedconnectionfactory-class>
-            	  com.wombat.ManagedConnectionFactoryImpl
-            </managedconnectionfactory-class>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property"
-                   type="javaee:config-propertyType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="connectionfactory-interface"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element connectionfactory-interface specifies
-            the fully qualified name of the ConnectionFactory
-            interface supported by the resource adapter.
-            
-            Example:
-            <connectionfactory-interface>com.wombat.ConnectionFactory
-            </connectionfactory-interface>
-            
-            OR
-            
-            <connectionfactory-interface>javax.resource.cci.ConnectionFactory
-            </connectionfactory-interface>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="connectionfactory-impl-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element connectionfactory-impl-class specifies
-            the fully qualified name of the ConnectionFactory
-            class that implements resource adapter
-            specific ConnectionFactory interface.
-            
-            Example:
-            
-            <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
-            </connectionfactory-impl-class>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="connection-interface"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The connection-interface element specifies the fully
-            qualified name of the Connection interface supported
-            by the resource adapter.
-            
-            Example:
-            
-            	  <connection-interface>javax.resource.cci.Connection
-            	  </connection-interface>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="connection-impl-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The connection-impl-classType specifies the fully
-            qualified name of the Connection class that
-            implements resource adapter specific Connection
-            interface.  It is used by the connection-impl-class
-            elements.
-            
-            Example:
-            
-            	  <connection-impl-class>com.wombat.ConnectionImpl
-            	  </connection-impl-class>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="connectorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The connectorType defines a resource adapter.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="module-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element module-name specifies the name of the
-            resource adapter.
-            
-            If there is no module-name specified, the module-name
-            is determined as defined in Section EE.8.1.1 and EE.8.1.2 
-            of the Java Platform, Enterprise Edition (Java EE) 
-            Specification, version 6.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="vendor-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element vendor-name specifies the name of
-            resource adapter provider vendor.
-            
-            If there is no vendor-name specified, the application 
-            server must consider the default "" (empty string) as
-            the name of the resource adapter provider vendor.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="eis-type"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element eis-type contains information about the
-            type of the EIS. For example, the type of an EIS can
-            be product name of EIS independent of any version
-            info.
-            
-            This helps in identifying EIS instances that can be
-            used with this resource adapter.
-            
-            If there is no eis-type specified, the application 
-            server must consider the default "" (empty string) as
-            the type of the EIS.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="resourceadapter-version"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element resourceadapter-version specifies a string-based version
-            of the resource adapter from the resource adapter
-            provider.
-            
-            If there is no resourceadapter-version specified, the application 
-            server must consider the default "" (empty string) as
-            the version of the resource adapter.
-            	
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="license"
-                   type="javaee:licenseType"
-                   minOccurs="0"/>
-      <xsd:element name="resourceadapter"
-                   type="javaee:resourceadapterType"/>
-      <xsd:element name="required-work-context"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element required-work-context specifies a fully qualified class 
-            name that implements WorkContext interface, that the resource adapter 
-            requires the application server to support.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="javaee:dewey-versionType"
-                   fixed="1.6"
-                   use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The version indicates the version of the schema to be used by the
-          deployment tool. This element doesn't have a default, and the resource adapter 
-          developer/deployer is required to specify it. The element allows the deployment 
-          tool to choose which schema to validate the descriptor against.
-          	  
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="metadata-complete"
-                   type="xsd:boolean">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The metadata-complete attribute defines whether the deployment 
-          descriptor for the resource adapter module is complete, or whether
-          the class files available to the module and packaged with the resource 
-          adapter should be examined for annotations that specify deployment 
-          information.
-          
-          If metadata-complete is set to "true", the deployment tool of the 
-          application server must ignore any annotations that specify deployment 
-          information, which might be present in the class files of the 
-          application.If metadata-complete is not specified or is set to "false", 
-          the deployment tool must examine the class files of the application for 
-          annotations, as specified by this specification. If the 
-          deployment descriptor is not included or is included but not marked 
-          metadata-complete, the deployment tool will process annotations.
-          
-          Application servers must assume that metadata-complete is true for 
-          resource adapter modules with deployment descriptor version 
-          lower than 1.6.
-          		
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="credential-interfaceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The credential-interfaceType specifies the
-        interface that the resource adapter implementation
-        supports for the representation of the
-        credentials. This element(s) that use this type,
-        i.e. credential-interface,  should be used by
-        application server to find out the Credential
-        interface it should use as part of the security
-        contract.
-        
-        The possible values are:
-        
-        javax.resource.spi.security.PasswordCredential
-        org.ietf.jgss.GSSCredential
-        javax.resource.spi.security.GenericCredential
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType">
-        <xsd:enumeration value="javax.resource.spi.security.PasswordCredential"/>
-        <xsd:enumeration value="org.ietf.jgss.GSSCredential"/>
-        <xsd:enumeration value="javax.resource.spi.security.GenericCredential"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="inbound-resourceadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The inbound-resourceadapterType specifies information
-        about an inbound resource adapter. This contains information
-        specific to the implementation of the resource adapter
-        library as specified through the messageadapter element.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="messageadapter"
-                   type="javaee:messageadapterType"
-                   minOccurs="0">
-        <xsd:unique name="messagelistener-type-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The messagelistener-type element content must be
-              unique in the messageadapter. Several messagelisteners
-              can not use the same messagelistener-type.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:messagelistener"/>
-          <xsd:field xpath="javaee:messagelistener-type"/>
-        </xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="licenseType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The licenseType specifies licensing requirements for the
-        resource adapter module. This type specifies whether a
-        license is required to deploy and use this resource adapter,
-        and an optional description of the licensing terms
-        (examples: duration of license, number of connection
-        restrictions). It is used by the license element.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="license-required"
-                   type="javaee:true-falseType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element license-required specifies whether a
-            license is required to deploy and use the
-            resource adapter. This element must be one of
-            the following, "true" or "false".
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="messageadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The messageadapterType specifies information about the
-        messaging capabilities of the resource adapter. This
-        contains information specific to the implementation of the
-        resource adapter library as specified through the
-        messagelistener element.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="messagelistener"
-                   type="javaee:messagelistenerType"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="messagelistenerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The messagelistenerType specifies information about a
-        specific message listener supported by the messaging
-        resource adapter. It contains information on the Java type
-        of the message listener interface and an activation
-        specification.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="messagelistener-type"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The element messagelistener-type specifies the fully
-            qualified name of the Java type of a message
-            listener interface.
-            
-            Example:
-            
-            	<messagelistener-type>javax.jms.MessageListener
-            	</messagelistener-type>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="activationspec"
-                   type="javaee:activationspecType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="outbound-resourceadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The outbound-resourceadapterType specifies information about
-        an outbound resource adapter. The information includes fully
-        qualified names of classes/interfaces required as part of
-        the connector architecture specified contracts for
-        connection management, level of transaction support
-        provided, one or more authentication mechanisms supported
-        and additional required security permissions.
-        
-        If any of the outbound resource adapter elements (transaction-support,
-        authentication-mechanism, reauthentication-support) is specified through
-        this element or metadata annotations, and no  connection-definition is 
-        specified as part of this element or through annotations, the 
-        application server must consider this an error and fail deployment. 
-        
-        If there is no authentication-mechanism specified as part of
-        this element or metadata annotations, then the resource adapter does 
-        not support any standard security authentication mechanisms as 
-        part of security contract. The application server ignores the security 
-        part of the system contracts in this case.
-        
-        If there is no transaction-support specified as part of this element 
-        or metadata annotation, then the application server must consider that 
-        the resource adapter does not support either the resource manager local 
-        or JTA transactions and must consider the transaction support as 
-        NoTransaction. Note that resource adapters may specify the level of 
-        transaction support to be used at runtime for a ManagedConnectionFactory 
-        through the TransactionSupport interface.
-        
-        If there is no reauthentication-support specified as part of
-        this element or metadata annotation, then the application server must consider 
-        that the resource adapter does not support re-authentication of 
-        ManagedConnections.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="connection-definition"
-                   type="javaee:connection-definitionType"
-                   maxOccurs="unbounded"
-                   minOccurs="0"/>
-      <xsd:element name="transaction-support"
-                   type="javaee:transaction-supportType"
-                   minOccurs="0"/>
-      <xsd:element name="authentication-mechanism"
-                   type="javaee:authentication-mechanismType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="reauthentication-support"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            	    The element reauthentication-support specifies
-            	    whether the resource adapter implementation supports
-            	    re-authentication of existing Managed- Connection
-            	    instance. Note that this information is for the
-            	    resource adapter implementation and not for the
-            	    underlying EIS instance. This element must have
-            	    either a "true" or "false" value.
-            
-            	  
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="required-config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The required-config-propertyType contains a declaration
-        of a single configuration property used for specifying a
-        required configuration property name. It is used
-        by required-config-property elements.
-        
-        Usage of this type is deprecated from Connectors 1.6 specification. 
-        Refer to required-config-property element for more information.
-        
-        Example:
-        
-        <required-config-property>
-        <config-property-name>Destination</config-property-name>
-        </required-config-property>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="config-property-name"
-                   type="javaee:config-property-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resourceadapterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The resourceadapterType specifies information about the
-        resource adapter. The information includes fully qualified
-        resource adapter Java class name, configuration properties,
-        information specific to the implementation of the resource
-        adapter library as specified through the
-        outbound-resourceadapter and inbound-resourceadapter
-        elements, and an optional set of administered objects.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="resourceadapter-class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element resourceadapter-class specifies the
-            fully qualified name of a Java class that implements
-            the javax.resource.spi.ResourceAdapter
-            interface. This Java class is provided as part of
-            resource adapter's implementation of connector
-            architecture specified contracts. The implementation
-            of this class is required to be a JavaBean.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="config-property"
-                   type="javaee:config-propertyType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="outbound-resourceadapter"
-                   type="javaee:outbound-resourceadapterType"
-                   minOccurs="0">
-        <xsd:unique name="connectionfactory-interface-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The connectionfactory-interface element content
-              must be unique in the outbound-resourceadapter.
-              Multiple connection-definitions can not use the
-              same connectionfactory-type.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:connection-definition"/>
-          <xsd:field xpath="javaee:connectionfactory-interface"/>
-        </xsd:unique>
-      </xsd:element>
-      <xsd:element name="inbound-resourceadapter"
-                   type="javaee:inbound-resourceadapterType"
-                   minOccurs="0"/>
-      <xsd:element name="adminobject"
-                   type="javaee:adminobjectType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:unique name="adminobject-type-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The adminobject-interface and adminobject-class element content must be
-              unique in the resourceadapterType. Several admin objects
-              can not use the same adminobject-interface and adminobject-class.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:adminobject"/>
-          <xsd:field xpath="javaee:adminobject-interface"/>
-          <xsd:field xpath="javaee:adminobject-class"/>
-        </xsd:unique>
-      </xsd:element>
-      <xsd:element name="security-permission"
-                   type="javaee:security-permissionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-permissionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The security-permissionType specifies a security
-        permission that is required by the resource adapter code.
-        
-        The security permission listed in the deployment descriptor
-        are ones that are different from those required by the
-        default permission set as specified in the connector
-        specification. The optional description can mention specific
-        reason that resource adapter requires a given security
-        permission.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="security-permission-spec"
-                   type="javaee:xsdStringType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The element security-permission-spec specifies a security
-            permission based on the Security policy file
-            syntax. Refer to the following URL for Sun's
-            implementation of the security permission
-            specification:
-            
-            http://java.sun.com/javase/6/docs/technotes/guides/security/PolicyFiles.html
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-supportType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The transaction-supportType specifies the level of
-        transaction support provided by the resource adapter. It is
-        used by transaction-support elements.
-        
-        The value must be one of the following:
-        
-        NoTransaction
-        LocalTransaction
-        XATransaction
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="NoTransaction"/>
-        <xsd:enumeration value="LocalTransaction"/>
-        <xsd:enumeration value="XATransaction"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_1_1.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_1_1.dtd
deleted file mode 100644
index efd838e..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_1_1.dtd
+++ /dev/null
@@ -1,894 +0,0 @@
-<!--
-Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road,
-Palo Alto, CA  94303, U.S.A.  All rights reserved.
- 
-This product or document is protected by copyright and distributed
-under licenses restricting its use, copying, distribution, and
-decompilation.  No part of this product or documentation may be
-reproduced in any form by any means without prior written authorization
-of Sun and its licensors, if any.  
-
-Third party software, including font technology, is copyrighted and 
-licensed from Sun suppliers. 
-
-Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, 
-are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. 
-and other countries.
-
-All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc.
-in the U.S. and other countries. Products bearing SPARC
-trademarks are based upon an architecture developed by Sun Microsystems, Inc. 
-
-PostScript is a registered trademark of Adobe Systems, Inc. 
-
- 
-Federal Acquisitions: Commercial Software - Government Users Subject to 
-Standard License Terms and Conditions.
-
-
- 
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
-TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-_________________________________________________________________________
-Copyright 1999 Sun Microsystems, Inc., 
-901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis. 
-Tous droits re'serve's.
- 
-
-Ce produit ou document est prote'ge' par un copyright et distribue' avec 
-des licences qui en restreignent l'utilisation, la copie, la distribution,
-et la de'compilation.  Aucune partie de ce produit ou de sa documentation
-associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen 
-que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses 
-bailleurs de licence, s'il y en a.  
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie 
-relative aux polices de caracte`res, est prote'ge' par un copyright 
-et licencie' par des fournisseurs de Sun.
- 
-Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,  
-sont des marques de fabrique ou des marques de'pose'es de Sun 
-Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
- 
-Toutes les marques SPARC sont utilise'es sous licence et sont
-des marques de fabrique ou des marques de'pose'es de SPARC
-International, Inc. aux Etats-Unis et  dans
-d'autres pays. Les produits portant les marques SPARC sont
-base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.  
-
-Postcript est une marque enregistre'e d'Adobe Systems Inc. 
- 
-LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
-DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
-TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
-A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
--->
-
-
-<!--
-This is the XML DTD for the EJB 1.1 deployment descriptor.
--->
-
-
-<!--
-The assembly-descriptor element contains application-assembly information.
-
-The application-assembly information consists of the following parts:
-the definition of security roles, the definition of method permissions,
-and the definition of transaction attributes for enterprise beans with
-container-managed transaction demarcation.
-
-All the parts are optional in the sense that they are omitted if the
-lists represented by them are empty.
-
-Providing an assembly-descriptor in the deployment descriptor is
-optional for the ejb-jar file producer.
-
-Used in: ejb-jar
--->
-<!ELEMENT assembly-descriptor (security-role*, method-permission*,
-		container-transaction*)>
-
-<!--
-The cmp-field element describes a container-managed field. The field
-element includes an optional description of the field, and the name of
-the field.
-
-Used in: entity
--->
-<!ELEMENT cmp-field (description?, field-name)>
-
-<!--
-The container-transaction element specifies how the container must
-manage transaction scopes for the enterprise bean's method invocations.
-The element consists of an optional description, a list of method
-elements, and a transaction attribute.The transaction attribute is to
-be applied to all the specified methods.
-
-Used in: assembly-descriptor
--->
-<!ELEMENT container-transaction (description?, method+,
-		trans-attribute)>
-
-<!--
-The description element is used by the ejb-jar file producer to provide
-text describing the parent element.
-
-The description element should include any information that the ejb-jar
-file producer wants to provide to the consumer of the ejb-jar file
-(i.e. to the Deployer). Typically, the tools used by the ejb-jar file
-consumer will display the description when processing the parent
-element.
-
-Used in: cmp-field, container-transaction, ejb-jar, entity, env-entry,
-ejb-ref, method, method-permission, resource-ref, security-role,
-security-role-ref, and session.
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended to be
-display by tools.
-
-Used in: ejb-jar, session, and entity
-
-Example:
-	<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The ejb-class element contains the fully-qualified name of the
-enterprise bean's class.
-
-Used in: entity and session
-
-Example:
-		<ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
--->
-<!ELEMENT ejb-class (#PCDATA)>
-
-<!--
-The optional ejb-client-jar element specifies a JAR file that contains
-the class files necessary for a client program to access the enterprise
-beans in the ejb-jar file. The Deployer should make the ejb-client JAR
-file accessible to the client's class-loader.
-
-Used in: ejb-jar
-
-Example:
-	<ejb-client-jar>employee_service_client.jar</ejb-client-jar>
--->
-<!ELEMENT ejb-client-jar (#PCDATA)>
-
-<!--
-The ejb-jar element is the root element of the EJB deployment
-descriptor. It contains an optional description of the ejb-jar file,
-optional display name, optional small icon file name, optional large
-icon file name, mandatory structural information about all included
-enterprise beans, optional application-assembly descriptor, and an
-optional name of an ejb-client-jar file for the ejb-jar.
--->
-<!ELEMENT ejb-jar (description?, display-name?, small-icon?,
-		large-icon?, enterprise-beans, assembly-descriptor?,
-		ejb-client-jar?)>
-
-<!--
-The ejb-link element is used in the ejb-ref element to specify that an
-EJB reference is linked to another enterprise bean in the ejb-jar
-file.
-
-The value of the ejb-link element must be the ejb-name of an enterprise
-bean in the same ejb-jar file, or in another ejb-jar file in the same
-J2EE application unit.
-
-Used in: ejb-ref
-
-Example:
-		<ejb-link>EmployeeRecord</ejb-link>
--->
-<!ELEMENT ejb-link (#PCDATA)>
-
-<!--
-The ejb-name element specifies an enterprise bean's name. This name is
-assigned by the ejb-jar file producer to name the enterprise bean in
-the ejb-jar file's deployment descriptor. The name must be unique among
-the names of the enterprise beans in the same ejb-jar file.
-
-The enterprise bean code does not depend on the name; therefore the
-name can be changed during the application-assembly process without
-breaking the enterprise bean's function.
-
-There is no architected relationship between the ejb-name in the
-deployment descriptor and the JNDI name that the Deployer will assign
-to the enterprise bean's home.
-
-The name must conform to the lexical rules for an NMTOKEN.
-
-Used in: entity, method, and session
-
-Example:
-		<ejb-name>EmployeeService</ejb-name>
--->
-<!ELEMENT ejb-name (#PCDATA)>
-
-<!--
-The ejb-ref element is used for the declaration of a reference to
-another enterprise bean's home. The declaration consists of an optional
-description; the EJB reference name used in the code of the referencing
-enterprise bean; the expected type of the referenced enterprise bean;
-the expected home and remote interfaces of the referenced enterprise
-bean; and an optional ejb-link information.
-
-The optional ejb-link element is used to specify the referenced
-enterprise bean. It is used typically in ejb-jar files that contain an
-assembled application.
-
-Used in: entity and session
--->
-<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type, home,
-		remote, ejb-link?)>
-
-<!--
-The ejb-ref-name element contains the name of an EJB reference. The EJB
-reference is an entry in the enterprise bean's environment.
-
-It is recommended that name is prefixed with "ejb/".
-
-Used in: ejb-ref
-
-Example:
-		<ejb-ref-name>ejb/Payroll</ejb-ref-name>
--->
-<!ELEMENT ejb-ref-name (#PCDATA)>
-
-<!--
-The ejb-ref-type element contains the expected type of the referenced
-enterprise bean.
-
-The ejb-ref-type element must be one of the following:
-		<ejb-ref-type>Entity</ejb-ref-type>
-		<ejb-ref-type>Session</ejb-ref-type>
-
-Used in: ejb-ref
--->
-<!ELEMENT ejb-ref-type (#PCDATA)>
-
-<!--
-The enterprise-beans element contains the declarations of one or more
-enterprise beans.
--->
-<!ELEMENT enterprise-beans (session | entity)+>
-
-<!--
-The entity element declares an entity bean. The declaration consists
-of: an optional description; optional display name; optional small icon
-file name; optional large icon file name; a name assigned to the
-enterprise bean in the deployment descriptor; the names of the entity
-bean's home and remote interfaces; the entity bean's implementation
-class; the entity bean's persistence management type; the entity bean's
-primary key class name; an indication of the entity bean's reentrancy;
-an optional list of container-managed fields; an optional specification
-of the primary key field; an optional declaration of the bean's
-environment entries; an optional declaration of the bean's EJB
-references; an optional declaration of the security role references;
-and an optional declaration of the bean's resource manager connection
-factory references.
-
-The optional primkey-field may be present in the descriptor if the
-entity's persistency-type is Container.
-
-The other elements that are optional are "optional" in the sense that
-they are omitted if the lists represented by them are empty.
-
-At least one cmp-field element must be present in the descriptor if the
-entity's persistency-type is Container, and none must not be present if
-the entity's persistence-type is Bean.
-
-Used in: enterprise-beans
--->
-<!ELEMENT entity (description?, display-name?, small-icon?,
-		large-icon?, ejb-name, home, remote, ejb-class,
-		persistence-type, prim-key-class, reentrant,
-		cmp-field*, primkey-field?, env-entry*,
-		ejb-ref*, security-role-ref*, resource-ref*)>
-
-<!--
-The env-entry element contains the declaration of an enterprise bean's
-environment entries. The declaration consists of an optional
-description, the name of the environment entry, and an optional value.
-
-Used in: entity and session
--->
-<!ELEMENT env-entry (description?, env-entry-name, env-entry-type,
-		env-entry-value?)>
-
-<!--
-The env-entry-name element contains the name of an enterprise bean's
-environment entry.
-
-Used in: env-entry
-
-Example:
-		<env-entry-name>minAmount</env-entry-name>
--->
-<!ELEMENT env-entry-name (#PCDATA)>
-
-<!--
-The env-entry-type element contains the fully-qualified Java type of
-the environment entry value that is expected by the enterprise bean's
-code.
-
-The following are the legal values of env-entry-type:
-java.lang.Boolean, java.lang.String, java.lang.Integer,
-java.lang.Double, java.lang.Byte, java.lang.Short, java.lang.Long, and
-java.lang.Float.
-
-Used in: env-entry
-
-Example:
-		<env-entry-type>java.lang.Boolean</env-entry-type>
--->
-<!ELEMENT env-entry-type (#PCDATA)>
-
-<!--
-The env-entry-value element contains the value of an enterprise bean's
-environment entry.
-
-Used in: env-entry
-
-Example:
-		<env-entry-value>100.00</env-entry-value>
--->
-<!ELEMENT env-entry-value (#PCDATA)>
-
-<!--
-The field-name element specifies the name of a container managed field.
-The name must be a public field of the enterprise bean class or one of
-its superclasses.
-
-Used in: cmp-field
-
-Example:
-		<field-name>firstName</field-Name>
--->
-<!ELEMENT field-name (#PCDATA)>
-
-<!--
-The home element contains the fully-qualified name of the enterprise
-bean's home interface.
-
-Used in: ejb-ref, entity, and session
-
-Example:
-		<home>com.aardvark.payroll.PayrollHome</home>
--->
-<!ELEMENT home (#PCDATA)>
-
-<!--
-The large-icon element contains the name of a file containing a large
-(32 x 32) icon image. The file name is relative path within the ejb-jar
-file.
-
-The image must be either in the JPEG or GIF format, and the file name
-must end with the suffix ".jpg" or ".gif" respectively.  The icon can
-be used by tools.
-
-Example:
-	<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The method element is used to denote a method of an enterprise bean's
-home or remote interface, or a set of methods. The ejb-name element
-must be the name of one of the enterprise beans in declared in the
-deployment descriptor; the optional method-intf element allows to
-distinguish between a method with the same signature that is defined in
-both the home and remote interface; the method-name element specifies
-the method name; and the optional method-params elements identify a
-single method among multiple methods with an overloaded method name.
-
-There are three possible styles of the method element syntax:
-
-1. 	<method>
-		<ejb-name>EJBNAME</ejb-name>
-   		<method-name>*</method-name>
-	</method>
-
-   This style is used to refer to all the methods of the specified
-   enterprise bean's home and remote interfaces.
-
-2. 	<method>
-		<ejb-name>EJBNAME</ejb-name>
-   		<method-name>METHOD</method-name>
-	</method>>
-
-   This style is used to refer to the specified method of the
-   specified enterprise bean. If there are multiple methods with
-   the same overloaded name, the element of this style refers to
-   all the methods with the overloaded name.
-
-
-
-
-
-3. 	<method>
-		<ejb-name>EJBNAME</ejb-name>
-   		<method-name>METHOD</method-name>
-		<method-params>
-   			<method-param>PARAM-1</method-param>
-   			<method-param>PARAM-2</method-param>
-          			...
-   			<method-param>PARAM-n</method-param>
-		</method-params>
-	<method>	
-
-   This style is used to refer to a single method within a set of
-   methods with an overloaded name. PARAM-1 through PARAM-n are the
-   fully-qualified Java types of the method's input parameters (if
-   the method has no input arguments, the method-params element
-   contains no method-param elements). Arrays are specified by the
-   array element's type, followed by one or more pair of square
-   brackets (e.g. int[][]).
-
-
-Used in: method-permission and container-transaction
-
-Examples:
-
-    Style 1: The following method element refers to all the methods of
-		the EmployeeService bean's home and remote interfaces:
-
-		<method>
-			<ejb-name>EmployeeService</ejb-name>
-			<method-name>*</method-name>
-		</method>
-
-	Style 2: The following method element refers to all the create
-		methods of the EmployeeService bean's home interface:
-
-    		<method>
-			<ejb-name>EmployeeService</ejb-name>
-			<method-name>create</method-name>
-		</method>
-
-	Style 3: The following method element refers to the
-		create(String firstName, String LastName) method of the
-	 	EmployeeService bean's home interface.
-
-    		<method>
-			<ejb-name>EmployeeService</ejb-name>
-			<method-name>create</method-name>
-			<method-params>
-				<method-param>java.lang.String</method-param>
-				<method-param>java.lang.String</method-param>
-			</method-params>
-		</method>
-
-	
-	The following example illustrates a Style 3 element with
-	more complex parameter types. The method
-			foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
-				mypackage.MyClass[][] myclaar)
-        would be specified as:
-
-    		<method>
-			<ejb-name>EmployeeService</ejb-name>
-			<method-name>foobar</method-name>
-			<method-params>
-				<method-param>char</method-param>
-				<method-param>int</method-param>
-				<method-param>int[]</method-param>
-				<method-param>mypackage.MyClass</method-param>
-				<method-param>mypackage.MyClass[][]</method-param>
-			</method-params>
-		</method>
-
-	The optional method-intf element can be used when it becomes
-   necessary to differentiate between a method defined in the home
-   interface and a method with the same name and signature that is
-   defined in the remote interface.
-
-	For example, the method element
-
-   		<method>
-			<ejb-name>EmployeeService</ejb-name>
-			<method-intf>Remote</method-intf>
-			<method-name>create</method-name>
-			<method-params>
-				<method-param>java.lang.String</method-param>
-				<method-param>java.lang.String</method-param>
-			</method-params>
-		</method>
-
-	can be used to differentiate the create(String, String) method
-   defined in the remote interface from the create(String, String)
-   method defined in the home interface, which would be defined as
-
-   		<method>
-			<ejb-name>EmployeeService</ejb-name>
-			<method-intf>Home</method-intf>
-			<method-name>create</method-name>
-			<method-params>
-				<method-param>java.lang.String</method-param>
-				<method-param>java.lang.String</method-param>
-			</method-params>
-		</method>
-
--->
-<!ELEMENT method (description?, ejb-name, method-intf?, method-name,
-			method-params?)>
-
-<!--
-The method-intf element allows a method element to differentiate
-between the methods with the same name and signature that are defined
-in both the remote and home interfaces.
-
-The method-intf element must be one of the following:
-		<method-intf>Home</method-intf>
-		<method-intf>Remote</method-intf>
-
-Used in: method
--->
-<!ELEMENT method-intf (#PCDATA)>
-
-<!--
-The method-name element contains a name of an enterprise bean method,
-or the asterisk (*) character. The asterisk is used when the element
-denotes all the methods of an enterprise bean's remote and home
-interfaces.
-
-Used in: method
--->
-<!ELEMENT method-name (#PCDATA)>
-
-<!--
-The method-param element contains the fully-qualified Java type name of
-a method parameter.
-
-Used in: method-params
--->
-<!ELEMENT method-param (#PCDATA)>
-
-<!--
-The method-params element contains a list of the fully-qualified Java
-type names of the method parameters.
-
-Used in: method
--->
-<!ELEMENT method-params (method-param*)>
-
-<!--
-The method-permission element specifies that one or more security roles
-are allowed to invoke one or more enterprise bean methods. The
-method-permission element consists of an optional description, a list
-of security role names, and a list of method elements.
-
-The security roles used in the method-permission element must be
-defined in the security-role element of the deployment descriptor, and
-the methods must be methods defined in the enterprise bean's remote
-and/or home interfaces.
-
-Used in: assembly-descriptor
--->
-<!ELEMENT method-permission (description?, role-name+, method+)>
-
-<!--
-The persistence-type element specifies an entity bean's persistence
-management type.
-
-The persistence-type element must be one of the two following:
-		<persistence-type>Bean</persistence-type>
-		<persistence-type>Container</persistence-type>
-
-Used in: entity
--->
-<!ELEMENT persistence-type (#PCDATA)>
-
-<!--
-The prim-key-class element contains the fully-qualified name of an
-entity bean's primary key class.
-
-If the definition of the primary key class is deferred to deployment
-time, the prim-key-class element should specify java.lang.Object.
-
-Used in: entity
-
-Examples:
-	<prim-key-class>java.lang.String</prim-key-class>
-	<prim-key-class>com.wombat.empl.EmployeeID</prim-key-class>
-	<prim-key-class>java.lang.Object</prim-key-class>
-
--->
-<!ELEMENT prim-key-class (#PCDATA)>
-
-<!--
-The primkey-field element is used to specify the name of the primary
-key field for an entity with container-managed persistence.
-
-The primkey-field must be one of the fields declared in the cmp-field
-element, and the type of the field must be the same as the primary key
-type.
-
-The primkey-field element is not used if the primary key maps to
-multiple container-managed fields (i.e. the key is a compound key). In
-this case, the fields of the primary key class must be public, and
-their names must correspond to the field names of the entity bean class
-that comprise the key.
-
-Used in: entity
-
-Example:
-	<primkey-field>EmployeeId</primkey-field>
--->
-<!ELEMENT primkey-field (#PCDATA)>
-
-<!--
-The reentrant element specifies whether an entity bean is reentrant or not.
-
-The reentrant element must be one of the two following:
-		<reentrant>True</reentrant>
-		<reentrant>False</reentrant>
-
-Used in: entity
--->
-<!ELEMENT reentrant (#PCDATA)>
-
-<!--
-The remote element contains the fully-qualified name of the enterprise
-bean's remote interface.
-
-Used in: ejb-ref, entity, and session
-
-Example:
-		<remote>com.wombat.empl.EmployeeService</remote>
--->
-<!ELEMENT remote (#PCDATA)>
-
-<!--
-The res-auth element specifies whether the enterprise bean code signs
-on programmatically to the resource manager, or whether the Container
-will sign on to the resource manager on behalf of the bean. In the
-latter case, the Container uses information that is supplied by the
-Deployer.
-
-The value of this element must be one of the two following:
-		<res-auth>Application</res-auth>
-		<res-auth>Container</res-auth>
--->
-<!ELEMENT res-auth (#PCDATA)>
-
-<!--
-The res-ref-name element specifies the name of a resource manager
-connection factory reference.
-
-Used in: resource-ref
--->
-<!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-The res-type element specifies the type of the data source. The type is
-specified by the Java interface (or class) expected to be implemented
-by the data source.
-
-Used in: resource-ref
--->
-<!ELEMENT res-type (#PCDATA)>
-
-<!--
-The resource-ref element contains a declaration of enterprise bean's
-reference to an external resource. It consists of an optional
-description, the resource manager connection factory reference name,
-the indication of the resource manager connection factory type expected
-by the enterprise bean code, and the type of authentication (bean or
-container).
-
-Used in: entity and session
-
-Example:
-		<resource-ref>
-			<res-ref-name>EmployeeAppDB</res-ref-name>
-			<res-type>javax.sql.DataSource</res-type>
-			<res-auth>Container</res-auth>
-		</resource-ref>
--->
-<!ELEMENT resource-ref (description?, res-ref-name, res-type,
-			res-auth)>
-
-<!--
-The role-link element is used to link a security role reference to a
-defined security role. The role-link element must contain the name of
-one of the security roles defined in the security-role elements.
-
-Used in: security-role-ref
--->
-<!ELEMENT role-link (#PCDATA)>
-
-<!--
-The role-name element contains the name of a security role.
-
-The name must conform to the lexical rules for an NMTOKEN.
-
-Used in: method-permission, security-role, and security-role-ref
--->
-<!ELEMENT role-name (#PCDATA)>
-
-<!--
-The security-role element contains the definition of a security role.
-The definition consists of an optional description of the security
-role, and the security role name.
-
-Used in: assembly-descriptor
-
-Example:
-		<security-role>
-			<description>
-				This role includes all employees who
-				are authorized to access the employee
-				service application.
-			</description>
-			<role-name>employee</role-name>
-		</security-role>
--->
-<!ELEMENT security-role (description?, role-name)>
-
-<!--
-The security-role-ref element contains the declaration of a security
-role reference in the enterprise bean's code. The declaration consists
-of an optional description, the security role name used in the code,
-and an optional link to a defined security role.
-
-The value of the role-name element must be the String used as the
-parameter to the EJBContext.isCallerInRole(String roleName) method.
-
-The value of the role-link element must be the name of one of the
-security roles defined in the security-role elements.
-
-Used in: entity and session
-
--->
-<!ELEMENT security-role-ref (description?, role-name, role-link?)>
-
-<!--
-The session-type element describes whether the session bean is a
-stateful session, or stateless session.
-
-The session-type element must be one of the two following:
-		<session-type>Stateful</session-type>
-		<session-type>Stateless</session-type>
--->
-<!ELEMENT session-type (#PCDATA)>
-
-<!--
-The session element declares an session bean. The declaration consists
-of: an optional description; optional display name; optional small icon
-file name; optional large icon file name; a name assigned to the
-enterprise bean in the deployment description; the names of the session
-bean's home and remote interfaces; the session bean's implementation
-class; the session bean's state management type; the session bean's
-transaction management type; an optional declaration of the bean's
-environment entries; an optional declaration of the bean's EJB
-references; an optional declaration of the security role references;
-and an optional declaration of the bean's resource manager connection
-factory references.
-
-The elements that are optional are "optional" in the sense that they
-are omitted when if lists represented by them are empty.
-
-Used in: enterprise-beans
--->
-<!ELEMENT session (description?, display-name?, small-icon?,
-		large-icon?, ejb-name, home, remote, ejb-class,
-		session-type, transaction-type, env-entry*,
-		ejb-ref*, security-role-ref*, resource-ref*)>
-
-<!--
-The small-icon element contains the name of a file containing a small
-(16 x 16) icon image. The file name is relative path within the ejb-jar
-file.
-
-The image must be either in the JPEG or GIF format, and the file name
-must end with the suffix ".jpg" or ".gif" respectively.
-
-The icon can be used by tools.
-
-Example:
-	<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The transaction-type element specifies an enterprise bean's transaction
-management type.
-
-The transaction-type element must be one of the two following:
-		<transaction-type>Bean</transaction-type>
-		<transaction-type>Container</transaction-type>
-
-Used in: session
--->
-<!ELEMENT transaction-type (#PCDATA)>
-
-<!--
-The trans-attribute element specifies how the container must manage the
-transaction boundaries when delegating a method invocation to an
-enterprise bean's business method.
-
-The value of trans-attribute must be one of the following:
-		<trans-attribute>NotSupported</trans-attribute>
-		<trans-attribute>Supports</trans-attribute>
-		<trans-attribute>Required</trans-attribute>
-		<trans-attribute>RequiresNew</trans-attribute>
-		<trans-attribute>Mandatory</trans-attribute>
-		<trans-attribute>Never</trans-attribute>
-
-Used in: container-transaction
--->
-<!ELEMENT trans-attribute (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e information beyond the standard EJB deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tools-specific files to the
-information in the standard deployment descriptor.
-
-The EJB architecture does not allow the tools to add the non-standard
-information into the EJB deployment descriptor.
--->
-<!ATTLIST assembly-descriptor id ID #IMPLIED>
-<!ATTLIST cmp-field id ID #IMPLIED>
-<!ATTLIST container-transaction id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST ejb-class id ID #IMPLIED>
-<!ATTLIST ejb-client-jar id ID #IMPLIED>
-<!ATTLIST ejb-jar id ID #IMPLIED>
-<!ATTLIST ejb-link id ID #IMPLIED>
-<!ATTLIST ejb-name id ID #IMPLIED>
-<!ATTLIST ejb-ref id ID #IMPLIED>
-<!ATTLIST ejb-ref-name id ID #IMPLIED>
-<!ATTLIST ejb-ref-type id ID #IMPLIED>
-<!ATTLIST enterprise-beans id ID #IMPLIED>
-<!ATTLIST entity id ID #IMPLIED>
-<!ATTLIST env-entry id ID #IMPLIED>
-<!ATTLIST env-entry-name id ID #IMPLIED>
-<!ATTLIST env-entry-type id ID #IMPLIED>
-<!ATTLIST env-entry-value id ID #IMPLIED>
-<!ATTLIST field-name id ID #IMPLIED>
-<!ATTLIST home id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST method id ID #IMPLIED>
-<!ATTLIST method-intf id ID #IMPLIED>
-<!ATTLIST method-name id ID #IMPLIED>
-<!ATTLIST method-param id ID #IMPLIED>
-<!ATTLIST method-params id ID #IMPLIED>
-<!ATTLIST method-permission id ID #IMPLIED>
-<!ATTLIST persistence-type id ID #IMPLIED>
-<!ATTLIST prim-key-class id ID #IMPLIED>
-<!ATTLIST primkey-field id ID #IMPLIED>
-<!ATTLIST reentrant id ID #IMPLIED>
-<!ATTLIST remote id ID #IMPLIED>
-<!ATTLIST res-auth id ID #IMPLIED>
-<!ATTLIST res-ref-name id ID #IMPLIED>
-<!ATTLIST res-type id ID #IMPLIED>
-<!ATTLIST resource-ref id ID #IMPLIED>
-<!ATTLIST role-link id ID #IMPLIED>
-<!ATTLIST role-name id ID #IMPLIED>
-<!ATTLIST security-role id ID #IMPLIED>
-<!ATTLIST security-role-ref id ID #IMPLIED>
-<!ATTLIST session-type id ID #IMPLIED>
-<!ATTLIST session id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST transaction-type id ID #IMPLIED>
-<!ATTLIST trans-attribute id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_2_0.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_2_0.dtd
deleted file mode 100644
index 9a2cc7c..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_2_0.dtd
+++ /dev/null
@@ -1,1671 +0,0 @@
-<!--
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, U.S.A.
-All rights reserved.
-
-Sun Microsystems, Inc. has intellectual property rights relating to
-technology embodied in the product that is described in this document.
-In particular, and without limitation, these intellectual property
-rights may include one or more of the U.S. patents listed at
-http://www.sun.com/patents and one or more additional patents or
-pending patent applications in the U.S. and in other countries.
-
-This document and the product to which it pertains are distributed
-under licenses restricting their use, copying, distribution, and
-decompilation.  This document may be reproduced and distributed but may
-not be changed without prior written authorization of Sun and its
-licensors, if any.
-
-Third-party software, including font technology, is copyrighted and
-licensed from Sun suppliers.
-
-Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
-Enterprise JavaBeans are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users Subject to
-Standard License Terms and Conditions.
-
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-
-_________________________________________________________________________
-
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, E'tats-Unis.
-Tous droits re'serve's.
-
-Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
-relatants a` la technologie incorpore'e dans le produit qui est de'crit
-dans ce document. En particulier, et sans la limitation, ces droits de
-proprie'te' intellectuels peuvent inclure un ou plus des brevets
-ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
-brevets plus supple'mentaires ou les applications de brevet en attente
-dans les E'tats-Unis et dans les autres pays.
-
-Ce produit ou document est prote'ge' par un copyright et distribue'
-avec des licences qui en restreignent l'utilisation, la copie, la
-distribution, et la de'compilation.  Ce documention associe n peut
-e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
-l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
-licence, le cas e'che'ant.
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie
-relative aux polices de caracte`res, est prote'ge' par un copyright et
-licencie' par des fournisseurs de Sun.
-
-Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
-Enterprise JavaBeans sont des marques de fabrique ou des marques
-de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
-pays.
-
-LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
-EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
-NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
-L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
-CONTREFAC,ON.
--->
-
-<!--
-This is the XML DTD for the EJB 2.0 deployment descriptor.
-All EJB 2.0 deployment descriptors must include a DOCTYPE
-of the following form:
-
-  <!DOCTYPE ejb-jar PUBLIC
-	"-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
-	"http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
--->
-
-<!--
-The following conventions apply to all J2EE deployment descriptor
-elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace
-  in the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is
-  case sensitive.
-
-- In elements that specify a pathname to a file within the same
-  JAR file, relative filenames (i.e., those not starting with "/")
-  are considered relative to the root of the JAR file's namespace.
-  Absolute filenames (i.e., those starting with "/") also specify
-  names in the root of the JAR file's namespace.  In general, relative
-  names are preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the servlet API.
--->
-
-
-<!--
-The ejb-jar element is the root element of the EJB deployment
-descriptor. It contains
-
-	- an optional description of the ejb-jar file
-	- an optional display name
-	- an optional small icon file name
-	- an optional large icon file name
-	- mandatory structural information about all included
-	  enterprise beans
-	- a descriptor for container managed relationships, if any
-	- an optional application-assembly descriptor
-	- an optional name of an ejb-client-jar file for the ejb-jar.
--->
-<!ELEMENT ejb-jar (description?, display-name?, small-icon?,
-large-icon?, enterprise-beans, relationships?, assembly-descriptor?,
-ejb-client-jar?)>
-
-<!--
-The abstract-schema-name element specifies the name of the abstract
-schema type of an entity bean with cmp-version 2.x. It is used in EJB
-QL queries.
-
-For example, the abstract-schema-name for an entity bean whose local
-interface is com.acme.commerce.Order might be Order.
-
-Used in: entity
--->
-<!ELEMENT abstract-schema-name (#PCDATA)>
-
-<!--
-
-The acknowledge-mode element specifies whether JMS AUTO_ACKNOWLEDGE or
-DUPS_OK_ACKNOWLEDGE message acknowledgment semantics should be used
-for the onMessage message of a message-driven bean that uses bean
-managed transaction demarcation.
-
-The acknowledge-mode element must be one of the two following:
-
-	<acknowledge-mode>Auto-acknowledge</acknowledge-mode>
-	<acknowledge-mode>Dups-ok-acknowledge</acknowledgemode>
-
-Used in: message-driven
--->
-<!ELEMENT acknowledge-mode (#PCDATA)>
-
-<!--
-The assembly-descriptor element contains application-assembly information.
-
-The application-assembly information consists of the following parts:
-the definition of security roles, the definition of method
-permissions, the definition of transaction attributes for
-enterprise beans with container-managed transaction demarcation and
-a list of methods to be excluded from being invoked.
-
-All the parts are optional in the sense that they are omitted if the
-lists represented by them are empty.
-
-Providing an assembly-descriptor in the deployment descriptor is
-optional for the ejb-jar file producer.
-
-Used in: ejb-jar
--->
-<!ELEMENT assembly-descriptor (security-role*, method-permission*,
-container-transaction*, exclude-list?)>
-
-<!--
-The cascade-delete element specifies that, within a particular
-relationship, the lifetime of one or more entity beans is dependent
-upon the lifetime of another entity bean. The cascade-delete element
-can only be specified for an ejb-relationship-role element contained
-in an ejb-relation element in which the other ejb-relationship-role
-element specifies a multiplicity of One.
-
-Used in: ejb-relationship-role
--->
-<!ELEMENT cascade-delete EMPTY>
-
-<!--
-The cmp-field element describes a container-managed field. The
-field element includes an optional description of the field, and the
-name of the field.
-
-Used in: entity
--->
-<!ELEMENT cmp-field (description?, field-name)>
-
-<!--
-The cmp-version element specifies the version of an entity bean
-with container-managed persistence.
-
-The cmp-version element must be one of the two following:
-
-	<cmp-version>1.x</cmp-version>
-	<cmp-version>2.x</cmp-version>
-
-The default value of the cmp-version element is 2.x.
-
-Used in: entity
--->
-<!ELEMENT cmp-version (#PCDATA)>
-
-<!--
-
-The cmr-field element describes the bean provider's view of a
-relationship. It consists of an optional description, and the name and
-the class type of a field in the source of a role of a
-relationship. The cmr-field-name element corresponds to the name used
-for the get and set accessor methods for the relationship. The
-cmr-field-type element is used only for collection-valued
-cmr-fields. It specifies the type of the collection that is used.
-
-Used in: ejb-relationship-role
--->
-<!ELEMENT cmr-field (description?, cmr-field-name, cmr-field-type?)>
-
-<!--
-The cmr-field-name element specifies the name of a logical
-relationship field in the entity bean class. The name of the cmr-field
-must begin with a lowercase letter. This field is accessed by methods
-whose names consist of the name of the field specified by
-cmr-field-name in which the first letter is uppercased, prefixed by
-"get" or "set".
-
-Used in: cmr-field
--->
-<!ELEMENT cmr-field-name (#PCDATA)>
-
-<!--
-The cmr-field-type element specifies the class of a
-collection-valued logical relationship field in the entity bean
-class. The value of the cmr-field-type element must be either:
-java.util.Collection or java.util.Set.
-
-Used in: cmr-field
--->
-<!ELEMENT cmr-field-type (#PCDATA)>
-
-<!--
-The container-transaction element specifies how the container
-must manage transaction scopes for the enterprise bean's method
-invocations. The element consists of an optional description, a list
-of method elements, and a transaction attribute. The transaction
-attribute is to be applied to all the specified methods.
-
-Used in: assembly-descriptor
--->
-<!ELEMENT container-transaction (description?, method+, trans-attribute)>
-
-<!--
-The description element is used to provide text describing the parent
-element.  The description element should include any information that
-the enterprise bean ejb-jar file producer wants to provide to the consumer of
-the enterprise bean ejb-jar file (i.e., to the Deployer). Typically, the tools
-used by the enterprise bean ejb-jar file consumer will display the description
-when processing the parent element that contains the description.
-
-Used in: cmp-field, cmr-field, container-transaction, ejb-jar,
-ejb-local-ref, ejb-ref, ejb-relation, ejb-relationship-role, entity,
-env-entry, exclude-list, message-driven, method, method-permission,
-query, relationship-role-source, relationships, resource-env-ref,
-resource-ref, run-as, security-identity, security-role,
-security-role-ref, session
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The destination-type element specifies the type of the JMS
-destination. The type is specified by the Java interface expected to
-be implemented by the destination.
-
-The destination-type element must be one of the two following:
-
-<destination-type>javax.jms.Queue</destination-type>
-<destination-type>javax.jms.Topic</destination-type>
-
-Used in: message-driven-destination
--->
-<!ELEMENT destination-type (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended to be
-displayed by tools.  The display name need not be unique.
-
-Used in: ejb-jar, entity, message-driven, session
-
-Example:
-
-<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The ejb-class element contains the fully-qualified name of the
-enterprise bean's class.
-
-Used in: entity, message-driven, session
-
-Example:
-
-<ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
--->
-<!ELEMENT ejb-class (#PCDATA)>
-
-<!--
-The optional ejb-client-jar element specifies a JAR file that contains
-the class files necessary for a client program to access the
-enterprise beans in the ejb-jar file.
-
-Used in: ejb-jar
-
-Example:
-
-<ejb-client-jar>employee_service_client.jar</ejb-client-jar>
--->
-<!ELEMENT ejb-client-jar (#PCDATA)>
-
-<!--
-The ejb-link element is used in the ejb-ref or ejb-local-ref
-elements to specify that an EJB reference is linked to an
-enterprise bean.
-
-The value of the ejb-link element must be the ejb-name of an
-enterprise bean in the same ejb-jar file or in another ejb-jar
-file in the same J2EE application unit.
-
-Alternatively, the name in the ejb-link element may be composed of a
-path name specifying the ejb-jar containing the referenced enterprise
-bean with the ejb-name of the target bean appended and separated from
-the path name by "#".  The path name is relative to the ejb-jar file
-containing the enterprise bean that is referencing the enterprise bean.
-This allows multiple enterprise beans with the same ejb-name to be
-uniquely identified.
-
-Used in: ejb-local-ref, ejb-ref
-
-Examples:
-
-	<ejb-link>EmployeeRecord</ejb-link>
-
-	<ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
--->
-<!ELEMENT ejb-link (#PCDATA)>
-
-<!--
-The ejb-local-ref element is used for the declaration of a reference to
-an enterprise bean's local home. The declaration consists of:
-
-	- an optional description
-	- the EJB reference name used in the code of the enterprise bean
-	  that's referencing the enterprise bean
-	- the expected type of the referenced enterprise bean
-	- the expected local home and local interfaces of the referenced
-	  enterprise bean
-	- optional ejb-link information, used to specify the referenced
-	  enterprise bean
-
-Used in: entity, message-driven, session
--->
-<!ELEMENT ejb-local-ref (description?, ejb-ref-name, ejb-ref-type,
-		local-home, local, ejb-link?)>
-
-<!--
-The ejb-name element specifies an enterprise bean's name. This name is
-assigned by the ejb-jar file producer to name the enterprise bean in
-the ejb-jar file's deployment descriptor. The name must be unique
-among the names of the enterprise beans in the same ejb-jar file.
-
-There is no architected relationship between the ejb-name in the
-deployment descriptor and the JNDI name that the Deployer will assign
-to the enterprise bean's home.
-
-The name for an entity bean with cmp-version 2.x must conform to the
-lexical rules for an NMTOKEN. The name for an entity bean with
-cmp-version 2.x must not be a reserved literal in EJB QL.
-
-Used in: entity, message-driven, method, relationship-role-source,
-session
-
-Example:
-
-<ejb-name>EmployeeService</ejb-name>
--->
-<!ELEMENT ejb-name (#PCDATA)>
-
-<!--
-The ejb-ql element contains the EJB QL query string that defines
-a finder or select query. This element is defined within the scope of
-a query element whose contents specify the finder or the select method
-that uses the query. The content must be a valid EJB QL query string
-for the entity bean for which the query is specified.
-
-The ejb-ql element must be specified for all queries that are
-expressible in EJB QL.
-
-Used in: query
-
-Example:
-<query>
-    <query-method>
-        <method-name>ejbSelectPendingLineitems</method-name>
-        <method-params/>
-    </query-method>
-    <ejb-ql>SELECT OBJECT(l) FROM LineItems l WHERE l.shipped <> TRUE
-    </ejb-ql>
-</query>
-
--->
-<!ELEMENT ejb-ql (#PCDATA)>
-
-<!--
-The ejb-ref element is used for the declaration of a reference to
-an enterprise bean's home. The declaration consists of:
-
-	- an optional description
-	- the EJB reference name used in the code of
-	  the enterprise bean that's referencing the enterprise bean
-	- the expected type of the referenced enterprise bean
-	- the expected home and remote interfaces of the referenced
-	  enterprise bean
-	- optional ejb-link information, used to specify the referenced
-	  enterprise bean
-
-Used in: entity, message-driven, session
--->
-<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type,
-		home, remote, ejb-link?)>
-
-<!--
-The ejb-ref-name element contains the name of an EJB reference. The
-EJB reference is an entry in the enterprise bean's environment and is
-relative to the java:comp/env context.  The name must be unique
-within the enterprise bean.
-
-It is recommended that name is prefixed with "ejb/".
-
-Used in: ejb-local-ref, ejb-ref
-
-Example:
-
-<ejb-ref-name>ejb/Payroll</ejb-ref-name>
--->
-<!ELEMENT ejb-ref-name (#PCDATA)>
-
-<!--
-The ejb-ref-type element contains the expected type of the
-referenced enterprise bean.
-
-The ejb-ref-type element must be one of the following:
-
-	<ejb-ref-type>Entity</ejb-ref-type>
-	<ejb-ref-type>Session</ejb-ref-type>
-
-Used in: ejb-local-ref, ejb-ref
--->
-<!ELEMENT ejb-ref-type (#PCDATA)>
-
-<!--
-
-The ejb-relation element describes a relationship between two
-entity beans with container-managed persistence.  An ejb-relation
-element contains a description; an optional ejb-relation-name element;
-and exactly two relationship role declarations, defined by the
-ejb-relationship-role elements. The name of the relationship, if
-specified, is unique within the ejb-jar file.
-
-Used in: relationships
--->
-<!ELEMENT ejb-relation (description?, ejb-relation-name?, ejb-relationship-role,
-ejb-relationship-role)>
-
-<!--
-The ejb-relation-name element provides a unique name for a relationship.
-
-Used in: ejb-relation
--->
-<!ELEMENT ejb-relation-name (#PCDATA)>
-
-<!--
-The ejb-relationship-role element describes a role within a
-relationship. There are two roles in each relationship.
-
-The ejb-relationship-role element contains an optional description; an
-optional name for the relationship role; a specification of the
-multiplicity of the role; an optional specification of cascade-delete
-functionality for the role; the role source; and a declaration of the
-cmr-field, if any, by means of which the other side of the
-relationship is accessed from the perspective of the role source.
-
-The multiplicity and role-source element are mandatory.
-
-The relationship-role-source element designates an entity bean by
-means of an ejb-name element. For bidirectional relationships, both
-roles of a relationship must declare a relationship-role-source
-element that specifies a cmr-field in terms of which the relationship
-is accessed. The lack of a cmr-field element in an
-ejb-relationship-role specifies that the relationship is
-unidirectional in navigability and the entity bean that participates
-in the relationship is "not aware" of the relationship.
-
-Used in: ejb-relation
-
-Example:
-
-<ejb-relation>
-    <ejb-relation-name>Product-LineItem</ejb-relation-name>
-    <ejb-relationship-role>
-        <ejb-relationship-role-name>product-has-lineitems
-        </ejb-relationship-role-name>
-        <multiplicity>One</multiplicity>
-        <relationship-role-source>
-        <ejb-name>ProductEJB</ejb-name>
-        </relationship-role-source>
-     </ejb-relationship-role>
-
--->
-<!ELEMENT ejb-relationship-role (description?, ejb-relationship-role-name?,
-multiplicity, cascade-delete?, relationship-role-source, cmr-field?)>
-
-<!--
-The ejb-relationship-role-name element defines a name for a role that
-is unique within an ejb-relation. Different relationships can use the
-same name for a role.
-
-Used in: ejb-relationship-role
--->
-<!ELEMENT ejb-relationship-role-name (#PCDATA)>
-
-<!--
-The enterprise-beans element contains the declarations of one or more
-enterprise beans.
--->
-<!ELEMENT enterprise-beans (session | entity | message-driven)+>
-
-<!--
-The entity element declares an entity bean. The declaration
-consists of:
-
-	- an optional description
-	- an optional display name
-	- an optional small icon file name
-	- an optional large icon file name
-	- a unique name assigned to the enterprise bean
-	  in the deployment descriptor
-	- the names of the entity bean's remote home and remote
-          interfaces, if any
-	- the names of the entity bean's local home and local
-	  interfaces, if any
-	- the entity bean's implementation class
-	- the entity bean's persistence management type
-	- the entity bean's primary key class name
-	- an indication of the entity bean's reentrancy
-	- an optional specification of the entity bean's cmp-version
-	- an optional specification of the entity bean's abstract
-	  schema name
-	- an optional list of container-managed fields
-	- an optional specification of the primary key field
-	- an optional declaration of the bean's environment entries
-	- an optional declaration of the bean's EJB references
-	- an optional declaration of the bean's local EJB references
-	- an optional declaration of the security role references
-	- an optional declaration of the security identity
-	  to be used for the execution of the bean's methods
-	- an optional declaration of the bean's resource manager
-          connection factory references
-	- an optional declaration of the bean's
-	  resource environment references
-	- an optional set of query declarations
-	  for finder and select methods for an entity
-	  bean with cmp-version 2.x.
-
-The optional abstract-schema-name element must be specified for an
-entity bean with container-managed persistence and cmp-version 2.x.
-
-The optional primkey-field may be present in the descriptor if the
-entity's persistence-type is Container.
-
-The optional cmp-version element may be present in the descriptor if
-the entity's persistence-type is Container. If the persistence-type is
-Container and the cmp-version element is not specified, its value
-defaults to 2.x.
-
-The optional home and remote elements must be specified if the entity
-bean cmp-version is 1.x.
-
-The optional home and remote elements must be specified if the entity
-bean has a remote home and remote interface.
-
-The optional local-home and local elements must be specified if the
-entity bean has a local home and local interface.
-
-Either both the local-home and the local elements or both the
-home and the remote elements must be specified.
-
-The optional query elements must be present if the persistence-type is
-Container and the cmp-version is 2.x and query methods other than
-findByPrimaryKey have been defined for the entity bean.
-
-The other elements that are optional are "optional" in the sense that
-they are omitted if the lists represented by them are empty.
-
-At least one cmp-field element must be present in the descriptor if
-the entity's persistence-type is Container and the cmp-version is 1.x,
-and none must not be present if the entity's persistence-type is Bean.
-
-Used in: enterprise-beans
-
--->
-<!ELEMENT entity (description?, display-name?, small-icon?,
-		large-icon?, ejb-name, home?, remote?, local-home?,
-		local?, ejb-class, persistence-type, prim-key-class,
-		reentrant, cmp-version?, abstract-schema-name?,
-		cmp-field*, primkey-field?, env-entry*, ejb-ref*,
-		ejb-local-ref*, security-role-ref*, security-identity?,
-		resource-ref*, resource-env-ref*, query*)>
-
-<!--
-The env-entry element contains the declaration of an enterprise bean's
-environment entry. The declaration consists of an optional
-description, the name of the environment entry, and an optional
-value.  If a value is not specified, one must be supplied
-during deployment.
-
-Used in: entity, message-driven, session
--->
-<!ELEMENT env-entry (description?, env-entry-name, env-entry-type,
-		env-entry-value?)>
-
-<!--
-The env-entry-name element contains the name of an enterprise bean's
-environment entry.  The name is a JNDI name relative to the
-java:comp/env context.  The name must be unique within an enterprise bean.
-
-Used in: env-entry
-
-Example:
-
-<env-entry-name>minAmount</env-entry-name>
--->
-<!ELEMENT env-entry-name (#PCDATA)>
-
-<!--
-The env-entry-type element contains the fully-qualified Java type of
-the environment entry value that is expected by the enterprise bean's
-code.
-
-The following are the legal values of env-entry-type:
-
-	java.lang.Boolean
-	java.lang.Byte
-	java.lang.Character
-	java.lang.String
-	java.lang.Short
-	java.lang.Integer
-	java.lang.Long
-	java.lang.Float
-	java.lang.Double
-
-
-Used in: env-entry
-
-Example:
-
-<env-entry-type>java.lang.Boolean</env-entry-type>
--->
-<!ELEMENT env-entry-type (#PCDATA)>
-
-<!--
-The env-entry-value element contains the value of an enterprise bean's
-environment entry. The value must be a String that is valid for the
-constructor of the specified type that takes a single String
-parameter, or for java.lang.Character, a single character.
-
-Used in: env-entry
-
-Example:
-
-<env-entry-value>100.00</env-entry-value>
--->
-<!ELEMENT env-entry-value (#PCDATA)>
-
-<!--
-The exclude list element specifies one or more methods which the
-Assembler marks to be uncallable.
-
-If the method permission relation contains methods that are in the
-exclude list, the Deployer should consider those methods to be
-uncallable.
-
-Used in: assembly-descriptor
--->
-<!ELEMENT exclude-list (description?, method+)>
-
-<!--
-The field-name element specifies the name of a container managed
-field.
-
-The name of the cmp-field of an entity bean with cmp-version 2.x must
-begin with a lowercase letter. This field is accessed by methods whose
-names consists of the name of the field specified by field-name in
-which the first letter is uppercased, prefixed by "get" or "set".
-
-The name of the cmp-field of an entity bean with cmp-version 1.x must
-denote a public field of the enterprise bean class or one of its
-superclasses.
-
-Used in: cmp-field
-
-Example:
-
-
-	<field-name>firstName</field-Name>
-
--->
-<!ELEMENT field-name (#PCDATA)>
-
-<!--
-The home element contains the fully-qualified name of the enterprise
-bean's home interface.
-
-Used in: ejb-ref, entity, session
-
-Example:
-
-<home>com.aardvark.payroll.PayrollHome</home>
--->
-<!ELEMENT home (#PCDATA)>
-
-<!--
-The large-icon element contains the name of a file
-containing a large (32 x 32) icon image. The file
-name is a relative path within the enterprise bean's
-ejb-jar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: ejb-jar, entity, message-driven, session
-
-Example:
-
-<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-
-The local element contains the fully-qualified name of the
-enterprise bean's local interface.
-
-Used in: ejb-local-ref, entity, session
-
--->
-<!ELEMENT local (#PCDATA)>
-
-<!--
-
-The local-home element contains the fully-qualified name of the
-enterprise bean's local home interface.
-
-Used in: ejb-local-ref, entity, session
--->
-<!ELEMENT local-home (#PCDATA)>
-
-<!--
-
-The message-driven element declares a message-driven bean. The
-declaration consists of:
-
-	- an optional description
-	- an optional display name
-	- an optional small icon file name
-	- an optional large icon file name
-	- a name assigned to the enterprise bean in
-	  the deployment descriptor
-	- the message-driven bean's implementation class
-	- the message-driven bean's transaction management type
-	- an optional declaration of the message-driven bean's
-	  message selector
-	- an optional declaration of the
-	  acknowledgment mode for the message-driven bean
-	  if bean-managed transaction demarcation is used
-	- an optional declaration of the
-	  intended destination type of the message-driven bean
-	- an optional declaration of the bean's environment entries
-	- an optional declaration of the bean's EJB references
-	- an optional declaration of the bean's local EJB references
-	- an optional declaration of the security
-	  identity to be used for the execution of the bean's methods
-	- an optional declaration of the bean's resource manager
-	  connection factory references
-	- an optional declaration of the bean's resource
-          environment references.
-
-Used in: enterprise-beans
--->
-<!ELEMENT message-driven (description?, display-name?, small-icon?,
-		large-icon?, ejb-name, ejb-class, transaction-type,
-		message-selector?, acknowledge-mode?,
-		message-driven-destination?, env-entry*, ejb-ref*,
-		ejb-local-ref*, security-identity?, resource-ref*,
-		resource-env-ref*)>
-
-<!--
-The message-driven-destination element provides advice to the Deployer
-as to whether a message-driven bean is intended for a Queue or a
-Topic. The declaration consists of: the type of the message-driven
-bean's intended destination and an optional declaration of whether a
-durable or non-durable subscription should be used if the
-destination-type is javax.jms.Topic.
-
-Used in: message-driven
--->
-<!ELEMENT message-driven-destination (destination-type,
-subscription-durability?)>
-
-<!--
-The message-selector element is used to specify the JMS message
-selector to be used in determining which messages a message-driven
-bean is to receive.
-
-Example:
-<message-selector>JMSType = `car' AND color = `blue' AND weight &gt; 2500
-</message-selector>
-
-Used in: message-driven
--->
-<!ELEMENT message-selector (#PCDATA)>
-
-<!--
-
-The method element is used to denote a method of an enterprise
-bean's home or component interface, or, in the case of a message-driven
-bean, the bean's onMessage method, or a set of methods. The ejb-name
-element must be the name of one of the enterprise beans declared in
-the deployment descriptor; the optional method-intf element allows to
-distinguish between a method with the same signature that is multiply
-defined across in both the home and component interfaces; the
-method-name element specifies the method name; and the optional
-method-params elements identify a single method among multiple methods
-with an overloaded method name.
-
-There are three possible styles of the method element syntax:
-
-1.
-<method>
-    <ejb-name>EJBNAME</ejb-name>
-    <method-name>*</method-name>
-</method>
-
-   This style is used to refer to all the methods of the specified
-   enterprise bean's home and component interfaces.
-
-2.
-<method>
-    <ejb-name>EJBNAME</ejb-name>
-    <method-name>METHOD</method-name>
-</method>>
-
-   This style is used to refer to the specified method of the
-   specified enterprise bean. If there are multiple methods with
-   the same overloaded name, the element of this style refers to
-   all the methods with the overloaded name.
-
-
-3.
-<method>
-    <ejb-name>EJBNAME</ejb-name>
-    <method-name>METHOD</method-name>
-    <method-params>
-        <method-param>PARAM-1</method-param>
-        <method-param>PARAM-2</method-param>
-        ...
-        <method-param>PARAM-n</method-param>
-    </method-params>
-<method>
-
-
-   This style is used to refer to a single method within a set of
-   methods with an overloaded name. PARAM-1 through PARAM-n are the
-   fully-qualified Java types of the method's input parameters (if
-   the method has no input arguments, the method-params element
-   contains no method-param elements). Arrays are specified by the
-   array element's type, followed by one or more pair of square
-   brackets (e.g. int[][]). If there are multiple methods with the
-   same overloaded name, this style refers to all of the overloaded
-   methods.
-
-
-Used in: container-transaction, exclude-list, method-permission
-
-Examples:
-
-Style 1: The following method element refers to all the methods of
-the EmployeeService bean's home and component interfaces:
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>*</method-name>
-</method>
-
-Style 2: The following method element refers to all the create
-methods of the EmployeeService bean's home interface(s).
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>create</method-name>
-</method>
-
-
-Style 3: The following method element refers to the
-create(String firstName, String LastName) method of the
-EmployeeService bean's home interface(s).
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-
-The following example illustrates a Style 3 element with
-more complex parameter types. The method
-foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
-mypackage.MyClass[][] myclaar) would be specified as:
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-name>foobar</method-name>
-    <method-params>
-        <method-param>char</method-param>
-        <method-param>int</method-param>
-        <method-param>int[]</method-param>
-        <method-param>mypackage.MyClass</method-param>
-        <method-param>mypackage.MyClass[][]</method-param>
-    </method-params>
-</method>
-
-
-The optional method-intf element can be used when it becomes necessary
-to differentiate between a method that is multiply defined across the
-enterprise bean's home and component interfaces with the same name and
-signature.
-
-
-For example, the method element
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>Remote</method-intf>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-
-can be used to differentiate the create(String, String) method defined
-in the remote interface from the create(String, String) method defined
-in the remote home interface, which would be defined as
-
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>Home</method-intf>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-and the create method that is defined in the local home interface
-which would be defined as
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>LocalHome</method-intf>
-    <method-name>create</method-name>
-    <method-params>
-        <method-param>java.lang.String</method-param>
-        <method-param>java.lang.String</method-param>
-    </method-params>
-</method>
-
-
-The method-intf element can be used with all three Styles of the
-method element usage. For example, the following method element
-example could be used to refer to all the methods of the
-EmployeeService bean's remote home interface.
-
-
-<method>
-    <ejb-name>EmployeeService</ejb-name>
-    <method-intf>Home</method-intf>
-    <method-name>*</method-name>
-</method>
-
--->
-<!ELEMENT method (description?, ejb-name, method-intf?, method-name,
-method-params?)>
-
-<!--
-
-The method-intf element allows a method element to differentiate
-between the methods with the same name and signature that are multiply
-defined across the component and home interfaces (e.g, in both an
-enterprise bean's remote and local interfaces; in both an enterprise bean's
-home and remote interfaces, etc.)
-
-The method-intf element must be one of the following:
-
-	<method-intf>Home</method-intf>
-	<method-intf>Remote</method-intf>
-	<method-intf>LocalHome</method-intf>
-	<method-intf>Local</method-intf>
-
-Used in: method
--->
-<!ELEMENT method-intf (#PCDATA)>
-
-<!--
-The method-name element contains a name of an enterprise bean method
-or the asterisk (*) character. The asterisk is used when the element
-denotes all the methods of an enterprise bean's component and home
-interfaces.
-
-Used in: method, query-method
--->
-<!ELEMENT method-name (#PCDATA)>
-
-<!--
-The method-param element contains the fully-qualified Java type name
-of a method parameter.
-
-Used in: method-params
--->
-<!ELEMENT method-param (#PCDATA)>
-
-<!--
-The method-params element contains a list of the fully-qualified Java
-type names of the method parameters.
-
-Used in: method, query-method
--->
-<!ELEMENT method-params (method-param*)>
-
-<!--
-
-The method-permission element specifies that one or more security
-roles are allowed to invoke one or more enterprise bean methods. The
-method-permission element consists of an optional description, a list
-of security role names or an indicator to state that the method is
-unchecked for authorization, and a list of method elements.
-
-The security roles used in the method-permission element must be
-defined in the security-role elements of the deployment descriptor,
-and the methods must be methods defined in the enterprise bean's
-component and/or home interfaces.
-
-
-Used in: assembly-descriptor
--->
-<!ELEMENT method-permission (description?, (role-name+|unchecked), method+)>
-
-<!--
-The multiplicity element describes the multiplicity of the role that
-participates in a relation.
-
-The multiplicity element must be one of the two following:
-
-	<multiplicity>One</multiplicity>
-	<multiplicity>Many</multiplicity>
-
-Used in: ejb-relationship-role
--->
-<!ELEMENT multiplicity (#PCDATA)>
-
-<!--
-The persistence-type element specifies an entity bean's persistence
-management type.
-
-The persistence-type element must be one of the two following:
-
-	<persistence-type>Bean</persistence-type>
-	<persistence-type>Container</persistence-type>
-
-Used in: entity
--->
-<!ELEMENT persistence-type (#PCDATA)>
-
-<!--
-The prim-key-class element contains the fully-qualified name of an
-entity bean's primary key class.
-
-If the definition of the primary key class is deferred to deployment
-time, the prim-key-class element should specify java.lang.Object.
-
-Used in: entity
-
-Examples:
-
-	<prim-key-class>java.lang.String</prim-key-class>
-
-	<prim-key-class>com.wombat.empl.EmployeeID</prim-key-class>
-
-	<prim-key-class>java.lang.Object</prim-key-class>
-
--->
-<!ELEMENT prim-key-class (#PCDATA)>
-
-<!--
-The primkey-field element is used to specify the name of the primary
-key field for an entity with container-managed persistence.
-
-The primkey-field must be one of the fields declared in the cmp-field
-element, and the type of the field must be the same as the primary key
-type.
-
-The primkey-field element is not used if the primary key maps to
-multiple container-managed fields (i.e. the key is a compound key). In
-this case, the fields of the primary key class must be public, and
-their names must correspond to the field names of the entity bean
-class that comprise the key.
-
-Used in: entity
-
-Example:
-
-	<primkey-field>EmployeeId</primkey-field>
-
--->
-<!ELEMENT primkey-field (#PCDATA)>
-
-<!--
-The query element is used to specify a finder or select query. It
-contains
-	- an optional description of the query
-	- the specification of the finder or select
-	  method it is used by
-        - an optional specification of the result type mapping, if
-          the query is for a select method and entity objects are
-          returned.
-    	- the EJB QL query string that defines the query.
-
-Queries that are expressible in EJB QL must use the ejb-ql element to
-specify the query. If a query is not expressible in EJB QL, the
-description element should be used to describe the semantics of the
-query and the ejb-ql element should be empty.
-
-The result-type-mapping is an optional element. It can only be present
-if the query-method specifies a select method that returns entity
-objects.  The default value for the result-type-mapping element is
-"Local".
-
-
-Used in: entity
--->
-<!ELEMENT query (description?, query-method, result-type-mapping?, ejb-ql)>
-
-<!--
-The query-method element is used to specify the method for a finder or
-select query.
-
-The method-name element specifies the name of a finder or select
-method in the entity bean's implementation class.
-
-Each method-param must be defined for a query-method using the
-method-params element.
-
-Used in: query
-
-Example:
-
-<query>
-    <description>Method finds large orders</description>
-    <query-method>
-        <method-name>findLargeOrders</method-name>
-        <method-params></method-params>
-    </query-method>
-    <ejb-ql>SELECT OBJECT(o) FROM Order o WHERE o.amount &gt; 1000</ejb-ql>
-</query>
-
--->
-<!ELEMENT query-method (method-name, method-params)>
-
-<!--
-The reentrant element specifies whether an entity bean is reentrant or
-not.
-
-The reentrant element must be one of the two following:
-
-	<reentrant>True</reentrant>
-	<reentrant>False</reentrant>
-
-Used in: entity
--->
-<!ELEMENT reentrant (#PCDATA)>
-
-<!--
-
-The relationship-role-source element designates the source of a role
-that participates in a relationship. A relationship-role-source
-element uniquely identifies an entity bean.
-
-Used in: ejb-relationship-role
--->
-<!ELEMENT relationship-role-source (description?, ejb-name)>
-
-<!--
-The relationships element describes the relationships in which
-entity beans with container-managed persistence participate. The
-relationships element contains an optional description; and a list of
-ejb-relation elements, which specify the container managed
-relationships.
-
-
-Used in: ejb-jar
--->
-<!ELEMENT relationships (description?, ejb-relation+)>
-
-<!--
-The remote element contains the fully-qualified name of the enterprise
-bean's remote interface.
-
-Used in: ejb-ref, entity, session
-
-Example:
-
-<remote>com.wombat.empl.EmployeeService</remote>
--->
-<!ELEMENT remote (#PCDATA)>
-
-<!--
-The res-auth element specifies whether the enterprise bean code signs
-on programmatically to the resource manager, or whether the Container
-will sign on to the resource manager on behalf of the enterprise bean. In the
-latter case, the Container uses information that is supplied by the
-Deployer.
-
-The value of this element must be one of the two following:
-
-	<res-auth>Application</res-auth>
-	<res-auth>Container</res-auth>
-
-Used in: resource-ref
--->
-<!ELEMENT res-auth (#PCDATA)>
-
-<!--
-The res-ref-name element specifies the name of a resource manager
-connection factory reference.  The name is a JNDI name relative to the
-java:comp/env context.  The name must be unique within an enterprise bean.
-
-Used in: resource-ref
--->
-<!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-The res-sharing-scope element specifies whether connections obtained
-through the given resource manager connection factory reference can be
-shared. The value of this element, if specified, must be one of the
-two following:
-
-	<res-sharing-scope>Shareable</res-sharing-scope>
-	<res-sharing-scope>Unshareable</res-sharing-scope>
-
-The default value is Shareable.
-
-Used in: resource-ref
--->
-<!ELEMENT res-sharing-scope (#PCDATA)>
-
-<!--
-The res-type element specifies the type of the data source. The type
-is specified by the fully qualified Java language class or interface
-expected to be implemented by the data source.
-
-Used in: resource-ref
--->
-<!ELEMENT res-type (#PCDATA)>
-
-<!--
-The resource-env-ref element contains a declaration of an enterprise bean's
-reference to an administered object associated with a resource
-in the enterprise bean's environment.  It consists of an optional
-description, the resource environment reference name, and an
-indication of the resource environment reference type expected by
-the enterprise bean code.
-
-Used in: entity, message-driven, session
-
-Example:
-
-<resource-env-ref>
-    <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-</resource-env-ref>
--->
-<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
-		resource-env-ref-type)>
-
-<!--
-The resource-env-ref-name element specifies the name of a resource
-environment reference; its value is the environment entry name used in
-the enterprise bean code.  The name is a JNDI name relative to the
-java:comp/env context and must be unique within an enterprise bean.
-
-Used in: resource-env-ref
--->
-<!ELEMENT resource-env-ref-name (#PCDATA)>
-
-<!--
-The resource-env-ref-type element specifies the type of a resource
-environment reference.  It is the fully qualified name of a Java
-language class or interface.
-
-Used in: resource-env-ref
--->
-<!ELEMENT resource-env-ref-type (#PCDATA)>
-
-<!--
-The resource-ref element contains a declaration of an enterprise bean's
-reference to an external resource. It consists of an optional
-description, the resource manager connection factory reference name,
-the indication of the resource manager connection factory type
-expected by the enterprise bean code, the type of authentication
-(Application or Container), and an optional specification of the
-shareability of connections obtained from the resource (Shareable or
-Unshareable).
-
-Used in: entity, message-driven, session
-
-Example:
-
-    <resource-ref>
-	<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-	<res-type>javax.sql.DataSource</res-type>
-	<res-auth>Container</res-auth>
-	<res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
--->
-<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
-		res-sharing-scope?)>
-
-<!--
-
-The result-type-mapping element is used in the query element to specify
-whether an abstract schema type returned by a query for a select method
-is to be mapped to an EJBLocalObject or EJBObject type.
-
-The result-type-mapping element must be one of the following:
-
-        <result-type-mapping>Local</result-type-mapping>
-        <result-type-mapping>Remote</result-type-mapping>
-
-Used in: query
--->
-<!ELEMENT result-type-mapping (#PCDATA)>
-
-<!--
-The role-link element is a reference to a defined security role. The
-role-link element must contain the name of one of the security roles
-defined in the security-role elements.
-
-Used in: security-role-ref
--->
-<!ELEMENT role-link (#PCDATA)>
-
-<!--
-The role-name element contains the name of a security role.
-
-The name must conform to the lexical rules for an NMTOKEN.
-
-Used in: method-permission, run-as, security-role, security-role-ref
--->
-<!ELEMENT role-name (#PCDATA)>
-
-<!--
-The run-as element specifies the run-as identity to be used for the
-execution of the enterprise bean. It contains an optional description, and
-the name of a security role.
-
-Used in: security-identity
--->
-<!ELEMENT run-as (description?, role-name)>
-
-<!--
-
-The security-identity element specifies whether the caller's
-security identity is to be used for the execution of the methods of
-the enterprise bean or whether a specific run-as identity is to be
-used. It contains an optional description and a specification of the
-security identity to be used.
-
-Used in: entity, message-driven, session
--->
-<!ELEMENT security-identity (description?, (use-caller-identity|run-as))>
-
-<!--
-The security-role element contains the definition of a security
-role. The definition consists of an optional description of the
-security role, and the security role name.
-
-Used in: assembly-descriptor
-
-Example:
-
-    <security-role>
-	<description>
-	    This role includes all employees who are authorized
-	    to access the employee service application.
-	</description>
-	<role-name>employee</role-name>
-    </security-role>
--->
-<!ELEMENT security-role (description?, role-name)>
-
-<!--
-The security-role-ref element contains the declaration of a security
-role reference in the enterprise bean's code. The declaration consists
-of an optional description, the security role name used in the code,
-and an optional link to a security role. If the security role is not
-specified, the Deployer must choose an appropriate security role.
-
-The value of the role-name element must be the String used as the
-parameter to the EJBContext.isCallerInRole(String roleName) method
-or the HttpServletRequest.isUserInRole(String role) method.
-
-Used in: entity, session
-
--->
-<!ELEMENT security-role-ref (description?, role-name, role-link?)>
-
-<!--
-The session element declares an session bean. The declaration consists
-of:
-	- an optional description
-	- an optional display name
-	- an optional small icon file name
-	- an optional large icon file name
-	- a name assigned to the enterprise bean
-	  in the deployment description
-	- the names of the session bean's remote home and
-	  remote interfaces, if any
-	- the names of the session bean's local home and
-	  local interfaces, if any
-	- the session bean's implementation class
-	- the session bean's state management type
-	- the session bean's transaction management type
-	- an optional declaration of the bean's environment entries
-	- an optional declaration of the bean's EJB references
-	- an optional declaration of the bean's local EJB references
-	- an optional declaration of the security role references
-	- an optional declaration of the security identity to be
-          used for the execution of the bean's methods
-	- an optional declaration of the bean's resource manager
-	  connection factory references
-	- an optional declaration of the bean's resource environment
-	  references.
-
-The elements that are optional are "optional" in the sense that they
-are omitted when if lists represented by them are empty.
-
-Either both the local-home and the local elements or both the
-home and the remote elements must be specified for the session bean.
-
-Used in: enterprise-beans
--->
-<!ELEMENT session (description?, display-name?, small-icon?,
-large-icon?, ejb-name, home?, remote?, local-home?, local?,
-ejb-class, session-type, transaction-type, env-entry*, ejb-ref*,
-ejb-local-ref*, security-role-ref*, security-identity?, resource-ref*,
-resource-env-ref*)>
-
-<!--
-The session-type element describes whether the session bean is a
-stateful session or stateless session.
-
-The session-type element must be one of the two following:
-
-	<session-type>Stateful</session-type>
-	<session-type>Stateless</session-type>
--->
-<!ELEMENT session-type (#PCDATA)>
-
-<!--
-The small-icon element contains the name of a file
-containing a small (16 x 16) icon image. The file
-name is a relative path within the enterprise bean's
-ejb-jar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: ejb-jar, entity, message-driven, session
-
-Example:
-
-<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The subscription-durability element specifies whether a JMS topic
-subscription is intended to be durable or nondurable.
-
-The subscription-durability element must be one of the two following:
-
-	<subscription-durability>Durable</subscription-durability>
-	<subscription-durability>NonDurable</subscription-durability>
-
-Used in: message-driven-destination
--->
-<!ELEMENT subscription-durability (#PCDATA)>
-
-<!--
-The trans-attribute element specifies how the container must manage
-the transaction boundaries when delegating a method invocation to an
-enterprise bean's business method.
-
-The value of trans-attribute must be one of the following:
-
-
-	<trans-attribute>NotSupported</trans-attribute>
-	<trans-attribute>Supports</trans-attribute>
-	<trans-attribute>Required</trans-attribute>
-	<trans-attribute>RequiresNew</trans-attribute>
-	<trans-attribute>Mandatory</trans-attribute>
-	<trans-attribute>Never</trans-attribute>
-
-Used in: container-transaction
--->
-<!ELEMENT trans-attribute (#PCDATA)>
-
-<!--
-The transaction-type element specifies an enterprise bean's
-transaction management type.
-
-The transaction-type element must be one of the two following:
-
-	<transaction-type>Bean</transaction-type>
-	<transaction-type>Container</transaction-type>
-
-Used in: message-driven, session
--->
-<!ELEMENT transaction-type (#PCDATA)>
-
-<!--
-The unchecked element specifies that a method is not checked for authorization
-by the container prior to invocation of the method.
-
-Used in: method-permission
--->
-<!ELEMENT unchecked EMPTY>
-
-<!--
-
-The use-caller-identity element specifies that the caller's security
-identity be used as the security identity for the execution of the
-enterprise bean's methods.
-
-Used in: security-identity
--->
-<!ELEMENT use-caller-identity EMPTY>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e., information beyond the standard deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tool-specific files to the
-information in the standard deployment descriptor.
-
-Tools are not allowed to add the non-standard information into the
-standard deployment descriptor.
--->
-
-<!ATTLIST abstract-schema-name id ID #IMPLIED>
-<!ATTLIST acknowledge-mode id ID #IMPLIED>
-<!ATTLIST assembly-descriptor id ID #IMPLIED>
-<!ATTLIST cascade-delete id ID #IMPLIED>
-<!ATTLIST cmp-field id ID #IMPLIED>
-<!ATTLIST cmp-version id ID #IMPLIED>
-<!ATTLIST cmr-field id ID #IMPLIED>
-<!ATTLIST cmr-field-name id ID #IMPLIED>
-<!ATTLIST cmr-field-type id ID #IMPLIED>
-<!ATTLIST container-transaction id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST destination-type id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST ejb-class id ID #IMPLIED>
-<!ATTLIST ejb-client-jar id ID #IMPLIED>
-<!ATTLIST ejb-jar id ID #IMPLIED>
-<!ATTLIST ejb-link id ID #IMPLIED>
-<!ATTLIST ejb-local-ref id ID #IMPLIED>
-<!ATTLIST ejb-name id ID #IMPLIED>
-<!ATTLIST ejb-ql id ID #IMPLIED>
-<!ATTLIST ejb-ref id ID #IMPLIED>
-<!ATTLIST ejb-ref-name id ID #IMPLIED>
-<!ATTLIST ejb-ref-type id ID #IMPLIED>
-<!ATTLIST ejb-relation id ID #IMPLIED>
-<!ATTLIST ejb-relation-name id ID #IMPLIED>
-<!ATTLIST ejb-relationship-role id ID #IMPLIED>
-<!ATTLIST ejb-relationship-role-name id ID #IMPLIED>
-<!ATTLIST enterprise-beans id ID #IMPLIED>
-<!ATTLIST entity id ID #IMPLIED>
-<!ATTLIST env-entry id ID #IMPLIED>
-<!ATTLIST env-entry-name id ID #IMPLIED>
-<!ATTLIST env-entry-type id ID #IMPLIED>
-<!ATTLIST env-entry-value id ID #IMPLIED>
-<!ATTLIST exclude-list id ID #IMPLIED>
-<!ATTLIST field-name id ID #IMPLIED>
-<!ATTLIST home id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST local id ID #IMPLIED>
-<!ATTLIST local-home id ID #IMPLIED>
-<!ATTLIST message-driven id ID #IMPLIED>
-<!ATTLIST message-driven-destination id ID #IMPLIED>
-<!ATTLIST message-selector id ID #IMPLIED>
-<!ATTLIST method id ID #IMPLIED>
-<!ATTLIST method-intf id ID #IMPLIED>
-<!ATTLIST method-name id ID #IMPLIED>
-<!ATTLIST method-param id ID #IMPLIED>
-<!ATTLIST method-params id ID #IMPLIED>
-<!ATTLIST method-permission id ID #IMPLIED>
-<!ATTLIST multiplicity id ID #IMPLIED>
-<!ATTLIST persistence-type id ID #IMPLIED>
-<!ATTLIST prim-key-class id ID #IMPLIED>
-<!ATTLIST primkey-field id ID #IMPLIED>
-<!ATTLIST query id ID #IMPLIED>
-<!ATTLIST query-method id ID #IMPLIED>
-<!ATTLIST reentrant id ID #IMPLIED>
-<!ATTLIST relationship-role-source id ID #IMPLIED>
-<!ATTLIST relationships id ID #IMPLIED>
-<!ATTLIST remote id ID #IMPLIED>
-<!ATTLIST res-auth id ID #IMPLIED>
-<!ATTLIST res-ref-name id ID #IMPLIED>
-<!ATTLIST res-sharing-scope id ID #IMPLIED>
-<!ATTLIST res-type id ID #IMPLIED>
-<!ATTLIST resource-env-ref id ID #IMPLIED>
-<!ATTLIST resource-env-ref-name id ID #IMPLIED>
-<!ATTLIST resource-env-ref-type id ID #IMPLIED>
-<!ATTLIST resource-ref id ID #IMPLIED>
-<!ATTLIST result-type-mapping id ID #IMPLIED>
-<!ATTLIST role-link id ID #IMPLIED>
-<!ATTLIST role-name id ID #IMPLIED>
-<!ATTLIST run-as id ID #IMPLIED>
-<!ATTLIST security-identity id ID #IMPLIED>
-<!ATTLIST security-role id ID #IMPLIED>
-<!ATTLIST security-role-ref id ID #IMPLIED>
-<!ATTLIST session id ID #IMPLIED>
-<!ATTLIST session-type id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST subscription-durability id ID #IMPLIED>
-<!ATTLIST trans-attribute id ID #IMPLIED>
-<!ATTLIST transaction-type id ID #IMPLIED>
-<!ATTLIST unchecked id ID #IMPLIED>
-<!ATTLIST use-caller-identity id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_2_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_2_1.xsd
deleted file mode 100644
index 419426b..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_2_1.xsd
+++ /dev/null
@@ -1,2208 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="2.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)ejb-jar_2_1.xsds	1.23 08/01/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the EJB 2.1 deployment descriptor.
-	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
-	the EJB's jar file.  All EJB deployment descriptors must indicate
-	the ejb-jar schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-		  http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
-	      version="2.1">
-	      ...
-	    </ejb-jar>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for the
-	J2EE namespace with the following location:
-
-	http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="ejb-jar" type="j2ee:ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is the root of the ejb-jar deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-name element contains the name of an enterprise
-	  bean. The name must be unique within the ejb-jar file.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:enterprise-beans/*"/>
-      <xsd:field    xpath="j2ee:ejb-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="ejb-name-references"
-		refer="j2ee:ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  relationship-role-source must be to a specific ejb-name
-	  defined within the scope of enterprise-beans element.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector
-	   xpath=".//j2ee:ejb-relationship-role/j2ee:relationship-role-source"/>
-      <xsd:field
-	   xpath="j2ee:ejb-name"/>
-    </xsd:keyref>
-
-    <xsd:key name="role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  A role-name-key is specified to allow the references
-	  from the security-role-refs.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:assembly-descriptor/j2ee:security-role"/>
-      <xsd:field    xpath="j2ee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="role-name-references"
-		refer="j2ee:role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  security-role-ref to a specified role-name.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:enterprise-beans/*/j2ee:security-role-ref"/>
-      <xsd:field    xpath="j2ee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-config-propertyType contains a name/value
-	configuration property pair for a message-driven bean.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="activation-config-property-name"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-name element contains
-	    the name for an activation configuration property of
-	    a message-driven bean.
-
-	    For JMS message-driven beans, the following property
-	    names are recognized: acknowledgeMode,
-	    messageSelector, destinationType, subscriptionDurability
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="activation-config-property-value"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-value element
-	    contains the value for an activation configuration
-	    property of a message-driven bean.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-configType defines information about the
-	expected configuration properties of the message-driven bean
-	in its operational environment. This may include information
-	about message acknowledgement, message selector, expected
-	destination type, etc.
-
-	The configuration information is expressed in terms of
-	name/value configuration properties.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="activation-config-property"
-		   type="j2ee:activation-config-propertyType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="assembly-descriptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The assembly-descriptorType defines
-	application-assembly information.
-
-	The application-assembly information consists of the
-	following parts: the definition of security roles, the
-	definition of method permissions, the definition of
-	transaction attributes for enterprise beans with
-	container-managed transaction demarcation and a list of
-	methods to be excluded from being invoked.
-
-	All the parts are optional in the sense that they are
-	omitted if the lists represented by them are empty.
-
-	Providing an assembly-descriptor in the deployment
-	descriptor is optional for the ejb-jar file producer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="security-role"
-		   type="j2ee:security-roleType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method-permission"
-		   type="j2ee:method-permissionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="container-transaction"
-		   type="j2ee:container-transactionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination"
-		   type="j2ee:message-destinationType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="exclude-list"
-		   type="j2ee:exclude-listType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-fieldType describes a container-managed field. The
-	cmp-fieldType contains an optional description of the field,
-	and the name of the field.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="field-name"
-		   type="j2ee:java-identifierType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The field-name element specifies the name of a
-	    container managed field.
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 2.x must begin with a lowercase
-	    letter. This field is accessed by methods whose
-	    names consists of the name of the field specified by
-	    field-name in which the first letter is uppercased,
-	    prefixed by "get" or "set".
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 1.x must denote a public field of the
-	    enterprise bean class or one of its superclasses.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-versionType specifies the version of an entity bean
-	with container-managed persistence. It is used by
-	cmp-version elements.
-
-	The value must be one of the two following:
-
-	    1.x
-	    2.x
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="1.x"/>
-	<xsd:enumeration value="2.x"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-field-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-field-type element specifies the class of a
-	collection-valued logical relationship field in the entity
-	bean class. The value of an element using cmr-field-typeType
-	must be either: java.util.Collection or java.util.Set.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="java.util.Collection"/>
-	<xsd:enumeration value="java.util.Set"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-fieldType describes the bean provider's view of
-	a relationship. It consists of an optional description, and
-	the name and the class type of a field in the source of a
-	role of a relationship. The cmr-field-name element
-	corresponds to the name used for the get and set accessor
-	methods for the relationship. The cmr-field-type element is
-	used only for collection-valued cmr-fields. It specifies the
-	type of the collection that is used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="cmr-field-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cmr-field-name element specifies the name of a
-	    logical relationship field in the entity bean
-	    class. The name of the cmr-field must begin with a
-	    lowercase letter. This field is accessed by methods
-	    whose names consist of the name of the field
-	    specified by cmr-field-name in which the first
-	    letter is uppercased, prefixed by "get" or "set".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmr-field-type"
-		   type="j2ee:cmr-field-typeType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="container-transactionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The container-transactionType specifies how the container
-	must manage transaction scopes for the enterprise bean's
-	method invocations. It defines an optional description, a
-	list of method elements, and a transaction attribute. The
-	transaction attribute is to be applied to all the specified
-	methods.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="j2ee:methodType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="trans-attribute"
-		   type="j2ee:trans-attributeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-classType contains the fully-qualified name of the
-	  enterprise bean's class. It is used by ejb-class elements.
-
-	  Example:
-
-	      <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-jarType defines the root element of the EJB
-	deployment descriptor. It contains
-
-	    - an optional description of the ejb-jar file
-	    - an optional display name
-	    - an optional icon that contains a small and a large
-	      icon file name
-	    - mandatory structural information about all included
-	      enterprise beans
-	    - a descriptor for container managed relationships,
-	      if any
-	    - an optional application-assembly descriptor
-	    - an optional name of an ejb-client-jar file for the
-	      ejb-jar.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="enterprise-beans"
-		   type="j2ee:enterprise-beansType"/>
-      <xsd:element name="relationships"
-		   type="j2ee:relationshipsType"
-		   minOccurs="0">
-	<xsd:unique name="relationship-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relation-name contains the name of a
-	      relation. The name must be unique within
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-relation"/>
-	  <xsd:field    xpath="j2ee:ejb-relation-name"/>
-	</xsd:unique>
-      </xsd:element>
-      <xsd:element name="assembly-descriptor"
-		   type="j2ee:assembly-descriptorType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Providing an assembly-descriptor in the deployment
-	    descriptor is optional for the ejb-jar file
-	    producer.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-client-jar"
-		   type="j2ee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The optional ejb-client-jar element specifies a JAR
-	      file that contains the class files necessary for a
-	      client program to access the
-	      enterprise beans in the ejb-jar file.
-
-	      Example:
-
-		  <ejb-client-jar>employee_service_client.jar
-		  </ejb-client-jar>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="2.1"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The version specifies the version of the
-	  EJB specification that the instance document must
-	  comply with. This information enables deployment tools
-	  to validate a particular EJB Deployment
-	  Descriptor with respect to a specific version of the EJB
-	  schema.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-nameType specifies an enterprise bean's name. It is
-	  used by ejb-name elements. This name is assigned by the
-	  ejb-jar file producer to name the enterprise bean in the
-	  ejb-jar file's deployment descriptor. The name must be
-	  unique among the names of the enterprise beans in the same
-	  ejb-jar file.
-
-	  There is no architected relationship between the used
-	  ejb-name in the deployment descriptor and the JNDI name that
-	  the Deployer will assign to the enterprise bean's home.
-
-	  The name for an entity bean must conform to the lexical
-	  rules for an NMTOKEN.
-
-	  Example:
-
-	  <ejb-name>EmployeeService</ejb-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdNMTOKENType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-relationType describes a relationship between two
-	entity beans with container-managed persistence.  It is used
-	by ejb-relation elements. It contains a description; an
-	optional ejb-relation-name element; and exactly two
-	relationship role declarations, defined by the
-	ejb-relationship-role elements. The name of the
-	relationship, if specified, is unique within the ejb-jar
-	file.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation-name"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relation-name element provides a unique name
-	    within the ejb-jar file for a relationship.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-relationship-role"
-		   type="j2ee:ejb-relationship-roleType"/>
-      <xsd:element name="ejb-relationship-role"
-		   type="j2ee:ejb-relationship-roleType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationship-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-relationship-roleType describes a role within a
-	  relationship. There are two roles in each relationship.
-
-	  The ejb-relationship-roleType contains an optional
-	  description; an optional name for the relationship role; a
-	  specification of the multiplicity of the role; an optional
-	  specification of cascade-delete functionality for the role;
-	  the role source; and a declaration of the cmr-field, if any,
-	  by means of which the other side of the relationship is
-	  accessed from the perspective of the role source.
-
-	  The multiplicity and role-source element are mandatory.
-
-	  The relationship-role-source element designates an entity
-	  bean by means of an ejb-name element. For bidirectional
-	  relationships, both roles of a relationship must declare a
-	  relationship-role-source element that specifies a cmr-field
-	  in terms of which the relationship is accessed. The lack of
-	  a cmr-field element in an ejb-relationship-role specifies
-	  that the relationship is unidirectional in navigability and
-	  the entity bean that participates in the relationship is
-	  "not aware" of the relationship.
-
-	  Example:
-
-	  <ejb-relation>
-	      <ejb-relation-name>Product-LineItem</ejb-relation-name>
-	      <ejb-relationship-role>
-		  <ejb-relationship-role-name>product-has-lineitems
-		  </ejb-relationship-role-name>
-		  <multiplicity>One</multiplicity>
-		  <relationship-role-source>
-		  <ejb-name>ProductEJB</ejb-name>
-		  </relationship-role-source>
-	       </ejb-relationship-role>
-	  </ejb-relation>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relationship-role-name"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relationship-role-name element defines a
-	    name for a role that is unique within an
-	    ejb-relation. Different relationships can use the
-	    same name for a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="multiplicity"
-		   type="j2ee:multiplicityType"/>
-      <xsd:element name="cascade-delete"
-		   type="j2ee:emptyType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cascade-delete element specifies that, within a
-	    particular relationship, the lifetime of one or more
-	    entity beans is dependent upon the lifetime of
-	    another entity bean. The cascade-delete element can
-	    only be specified for an ejb-relationship-role
-	    element contained in an ejb-relation element in
-	    which the other ejb-relationship-role
-	    element specifies a multiplicity of One.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="relationship-role-source"
-		   type="j2ee:relationship-role-sourceType"/>
-      <xsd:element name="cmr-field"
-		   type="j2ee:cmr-fieldType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="enterprise-beansType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The enterprise-beansType declares one or more enterprise
-	beans. Each bean can be a session, entity or message-driven
-	bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="session"
-		   type="j2ee:session-beanType">
-	<xsd:unique name="session-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-env-ref"/>
-	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:message-destination-ref"/>
-	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-ref"/>
-	  <xsd:field    xpath="j2ee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:env-entry"/>
-	  <xsd:field    xpath="j2ee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="entity"
-		   type="j2ee:entity-beanType">
-	<xsd:unique name="entity-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-env-ref"/>
-	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:message-destination-ref"/>
-	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-ref"/>
-	  <xsd:field    xpath="j2ee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:env-entry"/>
-	  <xsd:field    xpath="j2ee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="message-driven"
-		   type="j2ee:message-driven-beanType">
-	<xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-local-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:ejb-ref"/>
-	  <xsd:field    xpath="j2ee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-env-ref"/>
-	  <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:message-destination-ref"/>
-	  <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:resource-ref"/>
-	  <xsd:field    xpath="j2ee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:env-entry"/>
-	  <xsd:field    xpath="j2ee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="entity-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The entity-beanType declares an entity bean. The declaration
-	consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a unique name assigned to the enterprise bean
-	      in the deployment descriptor
-	    - the names of the entity bean's remote home
-	      and remote interfaces, if any
-	    - the names of the entity bean's local home and local
-	      interfaces, if any
-	    - the entity bean's implementation class
-	    - the entity bean's persistence management type
-	    - the entity bean's primary key class name
-	    - an indication of the entity bean's reentrancy
-	    - an optional specification of the
-	      entity bean's cmp-version
-	    - an optional specification of the entity bean's
-	      abstract schema name
-	    - an optional list of container-managed fields
-	    - an optional specification of the primary key
-	      field
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB
-	      references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory references
-	    - an optional declaration of the bean's
-	      resource environment references
-	    - an optional declaration of the bean's message
-	      destination references
-	    - an optional set of query declarations
-	      for finder and select methods for an entity
-	      bean with cmp-version 2.x.
-
-	The optional abstract-schema-name element must be specified
-	for an entity bean with container-managed persistence and
-	cmp-version 2.x.
-
-	The optional primkey-field may be present in the descriptor
-	if the entity's persistence-type is Container.
-
-	The optional cmp-version element may be present in the
-	descriptor if the entity's persistence-type is Container. If
-	the persistence-type is Container and the cmp-version
-	element is not specified, its value defaults to 2.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean cmp-version is 1.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean has a remote home and remote interface.
-
-	The optional local-home and local elements must be specified
-	if the entity bean has a local home and local interface.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified.
-
-	The optional query elements must be present if the
-	persistence-type is Container and the cmp-version is 2.x and
-	query methods other than findByPrimaryKey have been defined
-	for the entity bean.
-
-	The other elements that are optional are "optional" in the
-	sense that they are omitted if the lists represented by them
-	are empty.
-
-	At least one cmp-field element must be present in the
-	descriptor if the entity's persistence-type is Container and
-	the cmp-version is 1.x, and none must not be present if the
-	entity's persistence-type is Bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-      <xsd:element name="home"
-		   type="j2ee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="j2ee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="j2ee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="j2ee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-		   type="j2ee:ejb-classType"/>
-      <xsd:element name="persistence-type"
-		   type="j2ee:persistence-typeType"/>
-      <xsd:element name="prim-key-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The prim-key-class element contains the
-	    fully-qualified name of an
-	    entity bean's primary key class.
-
-	    If the definition of the primary key class is
-	    deferred to deployment time, the prim-key-class
-	    element should specify java.lang.Object.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="reentrant"
-		   type="j2ee:true-falseType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The reentrant element specifies whether an entity
-	    bean is reentrant or not.
-
-	    The reentrant element must be one of the two
-	    following: true or false
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-version"
-		   type="j2ee:cmp-versionType"
-		   minOccurs="0"/>
-      <xsd:element name="abstract-schema-name"
-		   type="j2ee:java-identifierType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The abstract-schema-name element specifies the name
-	    of the abstract schema type of an entity bean with
-	    cmp-version 2.x. It is used in EJB QL queries.
-
-	    For example, the abstract-schema-name for an entity
-	    bean whose local interface is
-	    com.acme.commerce.Order might be Order.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-field"
-		   type="j2ee:cmp-fieldType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="primkey-field"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The primkey-field element is used to specify the
-	    name of the primary key field for an entity with
-	    container-managed persistence.
-
-	    The primkey-field must be one of the fields declared
-	    in the cmp-field element, and the type of the field
-	    must be the same as the primary key type.
-
-	    The primkey-field element is not used if the primary
-	    key maps to multiple container-managed fields
-	    (i.e. the key is a compound key). In this case, the
-	    fields of the primary key class must be public, and
-	    their names must correspond to the field names of
-	    the entity bean class that comprise the key.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-		   type="j2ee:security-role-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="security-identity"
-		   type="j2ee:security-identityType"
-		   minOccurs="0"/>
-      <xsd:element name="query"
-		   type="j2ee:queryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="exclude-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The exclude-listType specifies one or more methods which
-	the Assembler marks to be uncallable.
-
-	If the method permission relation contains methods that are
-	in the exclude list, the Deployer should consider those
-	methods to be uncallable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="j2ee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-driven-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-driven element declares a message-driven
-	bean. The declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name.
-	    - a name assigned to the enterprise bean in
-	      the deployment descriptor
-	    - the message-driven bean's implementation class
-	    - an optional declaration of the bean's messaging
-	      type
-	    - the message-driven bean's transaction management type
-	    - an optional declaration of the bean's
-	      message-destination-type
-	    - an optional declaration of the bean's
-	      message-destination-link
-	    - an optional declaration of the message-driven bean's
-	      activation configuration properties
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local EJB
-	      references
-	    - an optional declaration of the bean's web service
-	      references
-	    - an optional declaration of the security
-	      identity to be used for the execution of the bean's
-	      methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory
-	      references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-      <xsd:element name="ejb-class"
-		   type="j2ee:ejb-classType"/>
-      <xsd:element name="messaging-type"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The messaging-type element specifies the message
-	    listener interface of the message-driven bean. If
-	    the messaging-type element is not specified, it is
-	    assumed to be javax.jms.MessageListener.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="transaction-type"
-		   type="j2ee:transaction-typeType"/>
-      <xsd:element name="message-destination-type"
-		   type="j2ee:message-destination-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-		   type="j2ee:message-destination-linkType"
-		   minOccurs="0"/>
-      <xsd:element name="activation-config"
-		   type="j2ee:activation-configType"
-		   minOccurs="0"/>
-      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-identity"
-		   type="j2ee:security-identityType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-intfType">
-
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-intf element allows a method element to
-	differentiate between the methods with the same name and
-	signature that are multiply defined across the home and
-	component interfaces (e.g, in both an enterprise bean's
-	remote and local interfaces or in both an enterprise bean's
-	home and remote interfaces, etc.); the component and web
-	service endpoint interfaces, and so on.
-
-	The method-intf element must be one of the following:
-
-	    Home
-	    Remote
-	    LocalHome
-	    Local
-	    ServiceEndpoint
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Home"/>
-	<xsd:enumeration value="Remote"/>
-	<xsd:enumeration value="LocalHome"/>
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="ServiceEndpoint"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-nameType contains a name of an enterprise
-	bean method or the asterisk (*) character. The asterisk is
-	used when the element denotes all the methods of an
-	enterprise bean's client view interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-paramsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-paramsType defines a list of the
-	fully-qualified Java type names of the method parameters.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-param"
-		   type="j2ee:java-typeType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The method-param element contains a primitive
-	    or a fully-qualified Java type name of a method
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-permissionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-permissionType specifies that one or more
-	security roles are allowed to invoke one or more enterprise
-	bean methods. The method-permissionType consists of an
-	optional description, a list of security role names or an
-	indicator to state that the method is unchecked for
-	authorization, and a list of method elements.
-
-	The security roles used in the method-permissionType
-	must be defined in the security-role elements of the
-	deployment descriptor, and the methods must be methods
-	defined in the enterprise bean's home, component and/or web
-	service endpoint interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="role-name"
-		     type="j2ee:role-nameType"
-		     maxOccurs="unbounded"/>
-	<xsd:element name="unchecked"
-		     type="j2ee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The unchecked element specifies that a method is
-	      not checked for authorization by the container
-	      prior to invocation of the method.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-      <xsd:element name="method"
-		   type="j2ee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The methodType is used to denote a method of an enterprise
-	  bean's home, component, and/or web service endpoint
-	  interface, or, in the case of a message-driven bean, the
-	  bean's message listener method, or a set of such
-	  methods. The ejb-name element must be the name of one of the
-	  enterprise beans declared in the deployment descriptor; the
-	  optional method-intf element allows to distinguish between a
-	  method with the same signature that is multiply defined
-	  across the home, component, and/or web service endpoint
-	  interfaces; the method-name element specifies the method
-	  name; and the optional method-params elements identify a
-	  single method among multiple methods with an overloaded
-	  method name.
-
-	  There are three possible styles of using methodType element
-	  within a method element:
-
-	  1.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	     This style is used to refer to all the methods of the
-	     specified enterprise bean's home, component, and/or web
-	     service endpoint interfaces.
-
-	  2.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	  </method>
-
-	     This style is used to refer to the specified method of
-	     the specified enterprise bean. If there are multiple
-	     methods with the same overloaded name, the element of
-	     this style refers to all the methods with the overloaded
-	     name.
-
-	  3.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	      <method-params>
-		  <method-param>PARAM-1</method-param>
-		  <method-param>PARAM-2</method-param>
-		  ...
-		  <method-param>PARAM-n</method-param>
-	      </method-params>
-	  </method>
-
-	     This style is used to refer to a single method within a
-	     set of methods with an overloaded name. PARAM-1 through
-	     PARAM-n are the fully-qualified Java types of the
-	     method's input parameters (if the method has no input
-	     arguments, the method-params element contains no
-	     method-param elements). Arrays are specified by the
-	     array element's type, followed by one or more pair of
-	     square brackets (e.g. int[][]). If there are multiple
-	     methods with the same overloaded name, this style refers
-	     to all of the overloaded methods.
-
-	  Examples:
-
-	  Style 1: The following method element refers to all the
-	  methods of the EmployeeService bean's home, component,
-	  and/or web service endpoint interfaces:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	  Style 2: The following method element refers to all the
-	  create methods of the EmployeeService bean's home
-	  interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	  </method>
-
-	  Style 3: The following method element refers to the
-	  create(String firstName, String LastName) method of the
-	  EmployeeService bean's home interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The following example illustrates a Style 3 element with
-	  more complex parameter types. The method
-	  foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
-	  mypackage.MyClass[][] myclaar) would be specified as:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>foobar</method-name>
-	      <method-params>
-		  <method-param>char</method-param>
-		  <method-param>int</method-param>
-		  <method-param>int[]</method-param>
-		  <method-param>mypackage.MyClass</method-param>
-		  <method-param>mypackage.MyClass[][]</method-param>
-	      </method-params>
-	  </method>
-
-	  The optional method-intf element can be used when it becomes
-	  necessary to differentiate between a method that is multiply
-	  defined across the enterprise bean's home, component, and/or
-	  web service endpoint interfaces with the same name and
-	  signature.
-
-	  For example, the method element
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Remote</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  can be used to differentiate the create(String, String)
-	  method defined in the remote interface from the
-	  create(String, String) method defined in the remote home
-	  interface, which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  and the create method that is defined in the local home
-	  interface which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>LocalHome</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The method-intf element can be used with all th ree Styles
-	  of the method element usage. For example, the following
-	  method element example could be used to refer to all the
-	  methods of the EmployeeService bean's remote home interface.
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>*</method-name>
-	  </method>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-      <xsd:element name="method-intf"
-		   type="j2ee:method-intfType"
-		   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="method-name"
-		   type="j2ee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="j2ee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="multiplicityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The multiplicityType describes the multiplicity of the
-	role that participates in a relation.
-
-	The value must be one of the two following:
-
-	    One
-	    Many
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="One"/>
-	<xsd:enumeration value="Many"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The persistence-typeType specifies an entity bean's persistence
-	management type.
-
-	The persistence-type element must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="query-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The query-method specifies the method for a finder or select
-	  query.
-
-	  The method-name element specifies the name of a finder or select
-	  method in the entity bean's implementation class.
-
-	  Each method-param must be defined for a query-method using the
-	  method-params element.
-
-	  It is used by the query-method element.
-
-	  Example:
-
-	  <query>
-	      <description>Method finds large orders</description>
-	      <query-method>
-		  <method-name>findLargeOrders</method-name>
-		  <method-params></method-params>
-	      </query-method>
-	      <ejb-ql>
-		SELECT OBJECT(o) FROM Order o
-		  WHERE o.amount &gt; 1000
-	      </ejb-ql>
-	  </query>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="j2ee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="j2ee:method-paramsType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="queryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The queryType defines a finder or select
-	query. It contains
-	    - an optional description of the query
-	    - the specification of the finder or select
-	      method it is used by
-		- an optional specification of the result type
-		  mapping, if the query is for a select method
-		  and entity objects are returned.
-		- the EJB QL query string that defines the query.
-
-	Queries that are expressible in EJB QL must use the ejb-ql
-	element to specify the query. If a query is not expressible
-	in EJB QL, the description element should be used to
-	describe the semantics of the query and the ejb-ql element
-	should be empty.
-
-	The result-type-mapping is an optional element. It can only
-	be present if the query-method specifies a select method
-	that returns entity objects.  The default value for the
-	result-type-mapping element is "Local".
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType" minOccurs="0"/>
-      <xsd:element name="query-method"
-		   type="j2ee:query-methodType"/>
-      <xsd:element name="result-type-mapping"
-		   type="j2ee:result-type-mappingType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-ql"
-		   type="j2ee:xsdStringType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationship-role-sourceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationship-role-sourceType designates the source of a
-	role that participates in a relationship. A
-	relationship-role-sourceType is used by
-	relationship-role-source elements to uniquely identify an
-	entity bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationshipsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationshipsType describes the relationships in
-	which entity beans with container-managed persistence
-	participate. The relationshipsType contains an optional
-	description; and a list of ejb-relation elements, which
-	specify the container managed relationships.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation"
-		   type="j2ee:ejb-relationType"
-		   maxOccurs="unbounded">
-
-	<xsd:unique name="role-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relationship-role-name contains the name of a
-	      relationship role. The name must be unique within
-	      a relationship, but can be reused in different
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector
-	       xpath=".//j2ee:ejb-relationship-role-name"/>
-	  <xsd:field
-	       xpath="."/>
-	</xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="result-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The result-type-mappingType is used in the query element to
-	specify whether an abstract schema type returned by a query
-	for a select method is to be mapped to an EJBLocalObject or
-	EJBObject type.
-
-	The value must be one of the following:
-
-	    Local
-	    Remote
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="Remote"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-identityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-identityType specifies whether the caller's
-	security identity is to be used for the execution of the
-	methods of the enterprise bean or whether a specific run-as
-	identity is to be used. It contains an optional description
-	and a specification of the security identity to be used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="use-caller-identity"
-		     type="j2ee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The use-caller-identity element specifies that
-	      the caller's security identity be used as the
-	      security identity for the execution of the
-	      enterprise bean's methods.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="run-as"
-		     type="j2ee:run-asType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-beanType declares an session bean. The
-	declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a name assigned to the enterprise bean
-	      in the deployment description
-	    - the names of the session bean's remote home and
-	      remote interfaces, if any
-	    - the names of the session bean's local home and
-	      local interfaces, if any
-	    - the name of the session bean's web service endpoint
-	      interface, if any
-	    - the session bean's implementation class
-	    - the session bean's state management type
-	    - the session bean's transaction management type
-	    - an optional declaration of the bean's
-	      environment entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's resource
-	      manager connection factory references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-	The elements that are optional are "optional" in the sense
-	that they are omitted when if lists represented by them are
-	empty.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified for the
-	session bean.
-
-	The service-endpoint element may only be specified if the
-	bean is a stateless session bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="j2ee:ejb-nameType"/>
-      <xsd:element name="home"
-		   type="j2ee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="j2ee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="j2ee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="j2ee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="service-endpoint"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint element contains the
-	    fully-qualified name of the enterprise bean's web
-	    service endpoint interface. The service-endpoint
-	    element may only be specified for a stateless
-	    session bean. The specified interface must be a
-	    valid JAX-RPC service endpoint interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-class"
-		   type="j2ee:ejb-classType"/>
-      <xsd:element name="session-type"
-		   type="j2ee:session-typeType"/>
-      <xsd:element name="transaction-type"
-		   type="j2ee:transaction-typeType"/>
-      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-		   type="j2ee:security-role-refType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="security-identity"
-		   type="j2ee:security-identityType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-typeType describes whether the session bean is a
-	stateful session or stateless session. It is used by
-	session-type elements.
-
-	The value must be one of the two following:
-
-	    Stateful
-	    Stateless
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Stateful"/>
-	<xsd:enumeration value="Stateless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="trans-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The trans-attributeType specifies how the container must
-	manage the transaction boundaries when delegating a method
-	invocation to an enterprise bean's business method.
-
-	The value must be one of the following:
-
-	    NotSupported
-	    Supports
-	    Required
-	    RequiresNew
-	    Mandatory
-	    Never
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="NotSupported"/>
-	<xsd:enumeration value="Supports"/>
-	<xsd:enumeration value="Required"/>
-	<xsd:enumeration value="RequiresNew"/>
-	<xsd:enumeration value="Mandatory"/>
-	<xsd:enumeration value="Never"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transaction-typeType specifies an enterprise bean's
-	transaction management type.
-
-	The transaction-type must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_0.xsd
deleted file mode 100644
index 4828291..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_0.xsd
+++ /dev/null
@@ -1,2706 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="3.0">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)ejb-jar_3_0.xsds	1.51 02/23/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2006 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the EJB 3.0 deployment descriptor.
-	The deployment descriptor must be named "META-INF/ejb-jar.xml" in
-	the EJB's jar file.  All EJB deployment descriptors must indicate
-	the ejb-jar schema by using the Java EE namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-		  http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
-	      version="3.0">
-	      ...
-	    </ejb-jar>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for the
-	Java EE namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="ejb-jar" type="javaee:ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is the root of the ejb-jar deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-name element contains the name of an enterprise
-	  bean. The name must be unique within the ejb-jar file.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:enterprise-beans/*"/>
-      <xsd:field    xpath="javaee:ejb-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="ejb-name-references"
-		refer="javaee:ejb-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  relationship-role-source must be to a specific ejb-name
-	  defined within the scope of enterprise-beans element.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector
-xpath=".//javaee:ejb-relationship-role/javaee:relationship-role-source"/>
-      <xsd:field
-	   xpath="javaee:ejb-name"/>
-    </xsd:keyref>
-
-    <xsd:key name="role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  A role-name-key is specified to allow the references
-	  from the security-role-refs.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:assembly-descriptor/javaee:security-role"/>
-      <xsd:field    xpath="javaee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="role-name-references"
-		refer="javaee:role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  security-role-ref to a specified role-name.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:enterprise-beans/*/javaee:security-role-ref"/>
-      <xsd:field    xpath="javaee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-config-propertyType contains a name/value
-	configuration property pair for a message-driven bean.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="activation-config-property-name"
-		   type="javaee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-name element contains
-	    the name for an activation configuration property of
-	    a message-driven bean.
-
-	    For JMS message-driven beans, the following property
-	    names are recognized: acknowledgeMode,
-	    messageSelector, destinationType, subscriptionDurability
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="activation-config-property-value"
-		   type="javaee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The activation-config-property-value element
-	    contains the value for an activation configuration
-	    property of a message-driven bean.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The activation-configType defines information about the
-	expected configuration properties of the message-driven bean
-	in its operational environment. This may include information
-	about message acknowledgement, message selector, expected
-	destination type, etc.
-
-	The configuration information is expressed in terms of
-	name/value configuration properties.
-
-	The properties that are recognized for a particular
-	message-driven bean are determined by the messaging type.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="activation-config-property"
-		   type="javaee:activation-config-propertyType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="application-exceptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The application-exceptionType declares an application
-        exception. The declaration consists of:
-
-            - the exception class. When the container receives
-              an exception of this type, it is required to
-              forward this exception as an applcation exception
-              to the client regardless of whether it is a checked
-              or unchecked exception.
-            - an optional rollback element. If this element is
-              set to true, the container must rollback the current
-              transaction before forwarding the exception to the
-              client.  If not specified, it defaults to false.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="exception-class"
-		   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="rollback"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="around-invokeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The around-invoke type specifies a method on a
-        class to be called during the around invoke portion of an
-        ejb invocation.  Note that each class may have only one
-        around invoke method and that the method may not be
-        overloaded.
-
-        If the class element is missing then
-        the class defining the callback is assumed to be the
-        interceptor class or component class in scope at the
-        location in the descriptor in which the around invoke
-        definition appears.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"/>
-      <xsd:element name="method-name"
-                   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="assembly-descriptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The assembly-descriptorType defines
-	application-assembly information.
-
-	The application-assembly information consists of the
-	following parts: the definition of security roles, the
-	definition of method permissions, the definition of
-	transaction attributes for enterprise beans with
-	container-managed transaction demarcation, the definition
-        of interceptor bindings, a list of
-	methods to be excluded from being invoked, and a list of
-        exception types that should be treated as application exceptions.
-
-	All the parts are optional in the sense that they are
-	omitted if the lists represented by them are empty.
-
-	Providing an assembly-descriptor in the deployment
-	descriptor is optional for the ejb-jar file producer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="security-role"
-		   type="javaee:security-roleType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method-permission"
-		   type="javaee:method-permissionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="container-transaction"
-		   type="javaee:container-transactionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor-binding"
-                   type="javaee:interceptor-bindingType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination"
-		   type="javaee:message-destinationType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="exclude-list"
-		   type="javaee:exclude-listType"
-		   minOccurs="0"/>
-      <xsd:element name="application-exception"
-                   type="javaee:application-exceptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-fieldType describes a container-managed field. The
-	cmp-fieldType contains an optional description of the field,
-	and the name of the field.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="field-name"
-		   type="javaee:java-identifierType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The field-name element specifies the name of a
-	    container managed field.
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 2.x must begin with a lowercase
-	    letter. This field is accessed by methods whose
-	    names consists of the name of the field specified by
-	    field-name in which the first letter is uppercased,
-	    prefixed by "get" or "set".
-
-	    The name of the cmp-field of an entity bean with
-	    cmp-version 1.x must denote a public field of the
-	    enterprise bean class or one of its superclasses.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmp-versionType specifies the version of an entity bean
-	with container-managed persistence. It is used by
-	cmp-version elements.
-
-	The value must be one of the two following:
-
-	    1.x
-	    2.x
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="1.x"/>
-	<xsd:enumeration value="2.x"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-field-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-field-type element specifies the class of a
-	collection-valued logical relationship field in the entity
-	bean class. The value of an element using cmr-field-typeType
-	must be either: java.util.Collection or java.util.Set.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="java.util.Collection"/>
-	<xsd:enumeration value="java.util.Set"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The cmr-fieldType describes the bean provider's view of
-	a relationship. It consists of an optional description, and
-	the name and the class type of a field in the source of a
-	role of a relationship. The cmr-field-name element
-	corresponds to the name used for the get and set accessor
-	methods for the relationship. The cmr-field-type element is
-	used only for collection-valued cmr-fields. It specifies the
-	type of the collection that is used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="cmr-field-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cmr-field-name element specifies the name of a
-	    logical relationship field in the entity bean
-	    class. The name of the cmr-field must begin with a
-	    lowercase letter. This field is accessed by methods
-	    whose names consist of the name of the field
-	    specified by cmr-field-name in which the first
-	    letter is uppercased, prefixed by "get" or "set".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmr-field-type"
-		   type="javaee:cmr-field-typeType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="container-transactionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The container-transactionType specifies how the container
-	must manage transaction scopes for the enterprise bean's
-	method invocations. It defines an optional description, a
-	list of method elements, and a transaction attribute. The
-	transaction attribute is to be applied to all the specified
-	methods.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="javaee:methodType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="trans-attribute"
-		   type="javaee:trans-attributeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-classType contains the fully-qualified name of the
-	  enterprise bean's class. It is used by ejb-class elements.
-
-	  Example:
-
-	      <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-jarType defines the root element of the EJB
-	deployment descriptor. It contains
-
-	    - an optional description of the ejb-jar file
-	    - an optional display name
-	    - an optional icon that contains a small and a large
-	      icon file name
-	    - structural information about all included
-	      enterprise beans that is not specified through
-              annotations
-            - structural information about interceptor classes
-	    - a descriptor for container managed relationships,
-	      if any.
-	    - an optional application-assembly descriptor
-	    - an optional name of an ejb-client-jar file for the
-	      ejb-jar.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="enterprise-beans"
-		   type="javaee:enterprise-beansType"
-                   minOccurs="0"/>
-      <xsd:element name="interceptors"
-		   type="javaee:interceptorsType"
-                   minOccurs="0"/>
-      <xsd:element name="relationships"
-		   type="javaee:relationshipsType"
-		   minOccurs="0">
-	<xsd:unique name="relationship-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relation-name contains the name of a
-	      relation. The name must be unique within
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-relation"/>
-	  <xsd:field    xpath="javaee:ejb-relation-name"/>
-	</xsd:unique>
-      </xsd:element>
-      <xsd:element name="assembly-descriptor"
-		   type="javaee:assembly-descriptorType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Providing an assembly-descriptor in the deployment
-	    descriptor is optional for the ejb-jar file
-	    producer.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-client-jar"
-		   type="javaee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The optional ejb-client-jar element specifies a JAR
-	      file that contains the class files necessary for a
-	      client program to access the
-	      enterprise beans in the ejb-jar file.
-
-	      Example:
-
-		  <ejb-client-jar>employee_service_client.jar
-		  </ejb-client-jar>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="3.0"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The version specifies the version of the
-	  EJB specification that the instance document must
-	  comply with. This information enables deployment tools
-	  to validate a particular EJB Deployment
-	  Descriptor with respect to a specific version of the EJB
-	  schema.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The metadata-complete attribute defines whether this
-	  deployment descriptor and other related deployment
-	  descriptors for this module (e.g., web service
-	  descriptors) are complete, or whether the class
-	  files available to this module and packaged with
-	  this application should be examined for annotations
-	  that specify deployment information.
-
-	  If metadata-complete is set to "true", the deployment
-	  tool must ignore any annotations that specify deployment
-	  information, which might be present in the class files
-	  of the application.
-
-	  If metadata-complete is not specified or is set to
-	  "false", the deployment tool must examine the class
-	  files of the application for annotations, as
-	  specified by the specifications.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-nameType specifies an enterprise bean's name. It is
-	  used by ejb-name elements. This name is assigned by the
-	  ejb-jar file producer to name the enterprise bean in the
-	  ejb-jar file's deployment descriptor. The name must be
-	  unique among the names of the enterprise beans in the same
-	  ejb-jar file.
-
-	  There is no architected relationship between the used
-	  ejb-name in the deployment descriptor and the JNDI name that
-	  the Deployer will assign to the enterprise bean's home.
-
-	  The name for an entity bean must conform to the lexical
-	  rules for an NMTOKEN.
-
-	  Example:
-
-	  <ejb-name>EmployeeService</ejb-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdNMTOKENType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-relationType describes a relationship between two
-	entity beans with container-managed persistence.  It is used
-	by ejb-relation elements. It contains a description; an
-	optional ejb-relation-name element; and exactly two
-	relationship role declarations, defined by the
-	ejb-relationship-role elements. The name of the
-	relationship, if specified, is unique within the ejb-jar
-	file.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation-name"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relation-name element provides a unique name
-	    within the ejb-jar file for a relationship.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-relationship-role"
-		   type="javaee:ejb-relationship-roleType"/>
-      <xsd:element name="ejb-relationship-role"
-		   type="javaee:ejb-relationship-roleType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationship-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-relationship-roleType describes a role within a
-	  relationship. There are two roles in each relationship.
-
-	  The ejb-relationship-roleType contains an optional
-	  description; an optional name for the relationship role; a
-	  specification of the multiplicity of the role; an optional
-	  specification of cascade-delete functionality for the role;
-	  the role source; and a declaration of the cmr-field, if any,
-	  by means of which the other side of the relationship is
-	  accessed from the perspective of the role source.
-
-	  The multiplicity and role-source element are mandatory.
-
-	  The relationship-role-source element designates an entity
-	  bean by means of an ejb-name element. For bidirectional
-	  relationships, both roles of a relationship must declare a
-	  relationship-role-source element that specifies a cmr-field
-	  in terms of which the relationship is accessed. The lack of
-	  a cmr-field element in an ejb-relationship-role specifies
-	  that the relationship is unidirectional in navigability and
-	  the entity bean that participates in the relationship is
-	  "not aware" of the relationship.
-
-	  Example:
-
-	  <ejb-relation>
-	      <ejb-relation-name>Product-LineItem</ejb-relation-name>
-	      <ejb-relationship-role>
-		  <ejb-relationship-role-name>product-has-lineitems
-		  </ejb-relationship-role-name>
-		  <multiplicity>One</multiplicity>
-		  <relationship-role-source>
-		  <ejb-name>ProductEJB</ejb-name>
-		  </relationship-role-source>
-	       </ejb-relationship-role>
-	  </ejb-relation>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relationship-role-name"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The ejb-relationship-role-name element defines a
-	    name for a role that is unique within an
-	    ejb-relation. Different relationships can use the
-	    same name for a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="multiplicity"
-		   type="javaee:multiplicityType"/>
-      <xsd:element name="cascade-delete"
-		   type="javaee:emptyType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The cascade-delete element specifies that, within a
-	    particular relationship, the lifetime of one or more
-	    entity beans is dependent upon the lifetime of
-	    another entity bean. The cascade-delete element can
-	    only be specified for an ejb-relationship-role
-	    element contained in an ejb-relation element in
-	    which the other ejb-relationship-role
-	    element specifies a multiplicity of One.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="relationship-role-source"
-		   type="javaee:relationship-role-sourceType"/>
-      <xsd:element name="cmr-field"
-		   type="javaee:cmr-fieldType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="enterprise-beansType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The enterprise-beansType declares one or more enterprise
-	beans. Each bean can be a session, entity or message-driven
-	bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="session"
-		   type="javaee:session-beanType">
-	<xsd:unique name="session-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-local-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-env-ref"/>
-	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:message-destination-ref"/>
-	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-ref"/>
-	  <xsd:field    xpath="javaee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="session-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:env-entry"/>
-	  <xsd:field    xpath="javaee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="entity"
-		   type="javaee:entity-beanType">
-	<xsd:unique name="entity-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-local-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-env-ref"/>
-	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:message-destination-ref"/>
-	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-ref"/>
-	  <xsd:field    xpath="javaee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="entity-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:env-entry"/>
-	  <xsd:field    xpath="javaee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-      <xsd:element name="message-driven"
-		   type="javaee:message-driven-beanType">
-	<xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of
-	      an EJB reference. The EJB reference is an entry in
-	      the component's environment and is relative to the
-	      java:comp/env context.  The name must be unique within
-	      the component.
-
-	      It is recommended that name be prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-local-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-ejb-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-ref-name element contains the name of an EJB
-	      reference. The EJB reference is an entry in the
-	      component's environment and is relative to the
-	      java:comp/env context. The name must be unique
-	      within the component.
-
-	      It is recommended that name is prefixed with "ejb/".
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:ejb-ref"/>
-	  <xsd:field    xpath="javaee:ejb-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-resource-env-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The resource-env-ref-name element specifies the name
-	      of a resource environment reference; its value is
-	      the environment entry name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-env-ref"/>
-	  <xsd:field    xpath="javaee:resource-env-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-message-destination-ref-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The message-destination-ref-name element specifies the name
-	      of a message destination reference; its value is
-	      the message destination reference name used in the component
-	      code. The name is a JNDI name relative to the
-	      java:comp/env context and must be unique within an
-	      component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:message-destination-ref"/>
-	  <xsd:field    xpath="javaee:message-destination-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-res-ref-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The res-ref-name element specifies the name of a
-	      resource manager connection factory reference.  The name
-	      is a JNDI name relative to the java:comp/env context.
-	      The name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:resource-ref"/>
-	  <xsd:field    xpath="javaee:res-ref-name"/>
-	</xsd:unique>
-
-	<xsd:unique name="messaged-env-entry-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The env-entry-name element contains the name of a
-	      component's environment entry.  The name is a JNDI
-	      name relative to the java:comp/env context.  The
-	      name must be unique within an component.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:env-entry"/>
-	  <xsd:field    xpath="javaee:env-entry-name"/>
-	</xsd:unique>
-      </xsd:element>
-
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="entity-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The entity-beanType declares an entity bean. The declaration
-	consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a unique name assigned to the enterprise bean
-	      in the deployment descriptor
-            - an optional mapped-name element that can be used to provide
-              vendor-specific deployment information such as the physical
-              jndi-name of the entity bean's remote home interface. This
-              element is not required to be supported by all implementations.
-              Any use of this element is non-portable.
-	    - the names of the entity bean's remote home
-	      and remote interfaces, if any
-	    - the names of the entity bean's local home and local
-	      interfaces, if any
-	    - the entity bean's implementation class
-	    - the optional entity bean's persistence management type. If
-              this element is not specified it is defaulted to Container.
-	    - the entity bean's primary key class name
-	    - an indication of the entity bean's reentrancy
-	    - an optional specification of the
-	      entity bean's cmp-version
-	    - an optional specification of the entity bean's
-	      abstract schema name
-	    - an optional list of container-managed fields
-	    - an optional specification of the primary key
-	      field
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB
-	      references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory references
-	    - an optional declaration of the bean's
-	      resource environment references
-	    - an optional declaration of the bean's message
-	      destination references
-	    - an optional set of query declarations
-	      for finder and select methods for an entity
-	      bean with cmp-version 2.x.
-
-	The optional abstract-schema-name element must be specified
-	for an entity bean with container-managed persistence and
-	cmp-version 2.x.
-
-	The optional primkey-field may be present in the descriptor
-	if the entity's persistence-type is Container.
-
-	The optional cmp-version element may be present in the
-	descriptor if the entity's persistence-type is Container. If
-	the persistence-type is Container and the cmp-version
-	element is not specified, its value defaults to 2.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean cmp-version is 1.x.
-
-	The optional home and remote elements must be specified if
-	the entity bean has a remote home and remote interface.
-
-	The optional local-home and local elements must be specified
-	if the entity bean has a local home and local interface.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified.
-
-	The optional query elements must be present if the
-	persistence-type is Container and the cmp-version is 2.x and
-	query methods other than findByPrimaryKey have been defined
-	for the entity bean.
-
-	The other elements that are optional are "optional" in the
-	sense that they are omitted if the lists represented by them
-	are empty.
-
-	At least one cmp-field element must be present in the
-	descriptor if the entity's persistence-type is Container and
-	the cmp-version is 1.x, and none must not be present if the
-	entity's persistence-type is Bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="javaee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="javaee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="javaee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="javaee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-		   type="javaee:ejb-classType"/>
-      <xsd:element name="persistence-type"
-		   type="javaee:persistence-typeType"/>
-      <xsd:element name="prim-key-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The prim-key-class element contains the
-	    fully-qualified name of an
-	    entity bean's primary key class.
-
-	    If the definition of the primary key class is
-	    deferred to deployment time, the prim-key-class
-	    element should specify java.lang.Object.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="reentrant"
-		   type="javaee:true-falseType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The reentrant element specifies whether an entity
-	    bean is reentrant or not.
-
-	    The reentrant element must be one of the two
-	    following: true or false
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-version"
-		   type="javaee:cmp-versionType"
-		   minOccurs="0"/>
-      <xsd:element name="abstract-schema-name"
-		   type="javaee:java-identifierType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The abstract-schema-name element specifies the name
-	    of the abstract schema type of an entity bean with
-	    cmp-version 2.x. It is used in EJB QL queries.
-
-	    For example, the abstract-schema-name for an entity
-	    bean whose local interface is
-	    com.acme.commerce.Order might be Order.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-field"
-		   type="javaee:cmp-fieldType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="primkey-field"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The primkey-field element is used to specify the
-	    name of the primary key field for an entity with
-	    container-managed persistence.
-
-	    The primkey-field must be one of the fields declared
-	    in the cmp-field element, and the type of the field
-	    must be the same as the primary key type.
-
-	    The primkey-field element is not used if the primary
-	    key maps to multiple container-managed fields
-	    (i.e. the key is a compound key). In this case, the
-	    fields of the primary key class must be public, and
-	    their names must correspond to the field names of
-	    the entity bean class that comprise the key.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-		   type="javaee:security-role-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="security-identity"
-		   type="javaee:security-identityType"
-		   minOccurs="0"/>
-      <xsd:element name="query"
-		   type="javaee:queryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="exclude-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The exclude-listType specifies one or more methods which
-	the Assembler marks to be uncallable.
-
-	If the method permission relation contains methods that are
-	in the exclude list, the Deployer should consider those
-	methods to be uncallable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-		   type="javaee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="init-methodType">
-    <xsd:sequence>
-      <xsd:element name="create-method"
-		   type="javaee:named-methodType"/>
-      <xsd:element name="bean-method"
-		   type="javaee:named-methodType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptor-bindingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptor-bindingType element describes the binding of
-        interceptor classes to beans within the ejb-jar.
-        It consists of :
-
-          - An optional description.
-          - The name of an ejb within the ejb-jar or the wildcard value "*",
-            which is used to define interceptors that are bound to all
-            beans in the ejb-jar.
-          - A list of interceptor classes that are bound to the contents of
-            the ejb-name element or a specification of the total ordering
-            over the interceptors defined for the given level and above.
-          - An optional exclude-default-interceptors element.  If set to true,
-            specifies that default interceptors are not to be applied to
-            a bean-class and/or business method.
-          - An optional exclude-class-interceptors element.  If set to true,
-            specifies that class interceptors are not to be applied to
-            a business method.
-          - An optional set of method elements for describing the name/params
-            of a method-level interceptor.
-
-         Interceptors bound to all classes using the wildcard syntax
-         "*" are default interceptors for the components in the ejb-jar.
-         In addition, interceptors may be bound at the level of the bean
-         class (class-level interceptors) or business methods (method-level
-         interceptors ).
-
-         The binding of interceptors to classes is additive.  If interceptors
-         are bound at the class-level and/or default-level as well as the
-         method-level, both class-level and/or default-level as well as
-         method-level will apply.
-
-         There are four possible styles of the interceptor element syntax :
-
-         1.
-         <interceptor-binding>
-           <ejb-name>*</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-         </interceptor-binding>
-
-         Specifying the ejb-name as the wildcard value "*" designates
-         default interceptors (interceptors that apply to all session and
-         message-driven beans contained in the ejb-jar).
-
-         2.
-         <interceptor-binding>
-           <ejb-name>EJBNAME</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-         </interceptor-binding>
-
-         This style is used to refer to interceptors associated with the
-         specified enterprise bean(class-level interceptors).
-
-         3.
-         <interceptor-binding>
-           <ejb-name>EJBNAME</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-           <method>
-             <method-name>METHOD</method-name>
-           </method>
-         </interceptor-binding>
-
-         This style is used to associate a method-level interceptor with
-         the specified enterprise bean.  If there are multiple methods
-         with the same overloaded name, the element of this style refers
-         to all the methods with the overloaded name.  Method-level
-         interceptors can only be associated with business methods of the
-         bean class.   Note that the wildcard value "*" cannot be used
-         to specify method-level interceptors.
-
-         4.
-         <interceptor-binding>
-           <ejb-name>EJBNAME</ejb-name>
-           <interceptor-class>INTERCEPTOR</interceptor-class>
-           <method>
-             <method-name>METHOD</method-name>
-             <method-params>
-               <method-param>PARAM-1</method-param>
-               <method-param>PARAM-2</method-param>
-               ...
-               <method-param>PARAM-N</method-param>
-             </method-params>
-           </method>
-         </interceptor-binding>
-
-         This style is used to associate a method-level interceptor with
-         the specified method of the specified enterprise bean.  This
-         style is used to refer to a single method within a set of methods
-         with an overloaded name.  The values PARAM-1 through PARAM-N
-         are the fully-qualified Java types of the method's input parameters
-         (if the method has no input arguments, the method-params element
-         contains no method-param elements). Arrays are specified by the
-         array element's type, followed by one or more pair of square
-         brackets (e.g. int[][]).
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:string"/>
-      <xsd:choice>
-        <xsd:element name="interceptor-class"
-                     type="javaee:fully-qualified-classType"
-		     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="interceptor-order"
-		     type="javaee:interceptor-orderType"
-		     minOccurs="1"/>
-      </xsd:choice>
-      <xsd:element name="exclude-default-interceptors"
-		   type="javaee:true-falseType"
-		   minOccurs="0"/>
-      <xsd:element name="exclude-class-interceptors"
-		   type="javaee:true-falseType"
-		   minOccurs="0"/>
-      <xsd:element name="method"
-		   type="javaee:named-methodType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptor-orderType">
-    <xsd:annotation>
-      <xsd:documentation>
-        The interceptor-orderType element describes a total ordering
-        of interceptor classes.
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:element name="interceptor-class"
-                   type="javaee:fully-qualified-classType"
-		   minOccurs="1"
-                   maxOccurs="unbounded"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptorType element declares information about a single
-        interceptor class.  It consists of :
-
-            - An optional description.
-            - The fully-qualified name of the interceptor class.
-            - An optional list of around invoke methods declared on the
-              interceptor class and/or its super-classes.
-            - An optional list environment dependencies for the interceptor
-              class and/or its super-classes.
-            - An optional list of post-activate methods declared on the
-              interceptor class and/or its super-classes.
-            - An optional list of pre-passivate methods declared on the
-              interceptor class and/or its super-classes.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor-class"
-		   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="post-activate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-passivate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptorsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptorsType element declares one or more interceptor
-        classes used by components within this ejb-jar.  The declaration
-        consists of :
-
-            - An optional description.
-            - One or more interceptor elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor"
-		   type="javaee:interceptorType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-driven-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-driven element declares a message-driven
-	bean. The declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name.
-	    - a name assigned to the enterprise bean in
-	      the deployment descriptor
-            - an optional mapped-name element that can be used to provide
-              vendor-specific deployment information such as the physical
-              jndi-name of destination from which this message-driven bean
-              should consume.  This element is not required to be supported
-              by all implementations.  Any use of this element is non-portable.
-	    - the message-driven bean's implementation class
-	    - an optional declaration of the bean's messaging
-	      type
-            - an optional declaration of the bean's timeout method.
-	    - the optional message-driven bean's transaction management
-              type. If it is not defined, it is defaulted to Container.
-	    - an optional declaration of the bean's
-	      message-destination-type
-	    - an optional declaration of the bean's
-	      message-destination-link
-	    - an optional declaration of the message-driven bean's
-	      activation configuration properties
-            - an optional list of the message-driven bean class and/or
-              superclass around-invoke methods.
-	    - an optional declaration of the bean's environment
-	      entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local EJB
-	      references
-	    - an optional declaration of the bean's web service
-	      references
-	    - an optional declaration of the security
-	      identity to be used for the execution of the bean's
-	      methods
-	    - an optional declaration of the bean's
-	      resource manager connection factory
-	      references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-		   type="javaee:ejb-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-             The ejb-class element specifies the fully qualified name
-             of the bean class for this ejb.  It is required unless
-             there is a component-defining annotation for the same
-             ejb-name.
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="messaging-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The messaging-type element specifies the message
-	    listener interface of the message-driven bean.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="transaction-type"
-		   type="javaee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="message-destination-type"
-		   type="javaee:message-destination-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-		   type="javaee:message-destination-linkType"
-		   minOccurs="0"/>
-      <xsd:element name="activation-config"
-		   type="javaee:activation-configType"
-		   minOccurs="0"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-identity"
-		   type="javaee:security-identityType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-intfType">
-
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-intf element allows a method element to
-	differentiate between the methods with the same name and
-	signature that are multiply defined across the home and
-	component interfaces (e.g, in both an enterprise bean's
-	remote and local interfaces or in both an enterprise bean's
-	home and remote interfaces, etc.); the component and web
-	service endpoint interfaces, and so on. The Local applies to
-        both local component interface and local business interface.
-        Similarly, Remote applies to both remote component interface
-        and the remote business interface.
-
-	The method-intf element must be one of the following:
-
-	    Home
-	    Remote
-	    LocalHome
-	    Local
-	    ServiceEndpoint
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Home"/>
-	<xsd:enumeration value="Remote"/>
-	<xsd:enumeration value="LocalHome"/>
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="ServiceEndpoint"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-nameType contains a name of an enterprise
-	bean method or the asterisk (*) character. The asterisk is
-	used when the element denotes all the methods of an
-	enterprise bean's client view interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-paramsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-paramsType defines a list of the
-	fully-qualified Java type names of the method parameters.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-param"
-		   type="javaee:java-typeType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The method-param element contains a primitive
-	    or a fully-qualified Java type name of a method
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-permissionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-permissionType specifies that one or more
-	security roles are allowed to invoke one or more enterprise
-	bean methods. The method-permissionType consists of an
-	optional description, a list of security role names or an
-	indicator to state that the method is unchecked for
-	authorization, and a list of method elements.
-
-	The security roles used in the method-permissionType
-	must be defined in the security-role elements of the
-	deployment descriptor, and the methods must be methods
-	defined in the enterprise bean's business, home, component
-        and/or web service endpoint interfaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="role-name"
-		     type="javaee:role-nameType"
-		     maxOccurs="unbounded"/>
-	<xsd:element name="unchecked"
-		     type="javaee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The unchecked element specifies that a method is
-	      not checked for authorization by the container
-	      prior to invocation of the method.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-      <xsd:element name="method"
-		   type="javaee:methodType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The methodType is used to denote a method of an enterprise
-	  bean's business, home, component, and/or web service endpoint
-	  interface, or, in the case of a message-driven bean, the
-	  bean's message listener method, or a set of such
-	  methods. The ejb-name element must be the name of one of the
-	  enterprise beans declared in the deployment descriptor; the
-	  optional method-intf element allows to distinguish between a
-	  method with the same signature that is multiply defined
-	  across the business, home, component, and/or web service
-          endpoint nterfaces; the method-name element specifies the
-          method name; and the optional method-params elements identify
-          a single method among multiple methods with an overloaded
-	  method name.
-
-	  There are three possible styles of using methodType element
-	  within a method element:
-
-	  1.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	     This style is used to refer to all the methods of the
-	     specified enterprise bean's business, home, component,
-             and/or web service endpoint interfaces.
-
-	  2.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	  </method>
-
-	     This style is used to refer to the specified method of
-	     the specified enterprise bean. If there are multiple
-	     methods with the same overloaded name, the element of
-	     this style refers to all the methods with the overloaded
-	     name.
-
-	  3.
-	  <method>
-	      <ejb-name>EJBNAME</ejb-name>
-	      <method-name>METHOD</method-name>
-	      <method-params>
-		  <method-param>PARAM-1</method-param>
-		  <method-param>PARAM-2</method-param>
-		  ...
-		  <method-param>PARAM-n</method-param>
-	      </method-params>
-	  </method>
-
-	     This style is used to refer to a single method within a
-	     set of methods with an overloaded name. PARAM-1 through
-	     PARAM-n are the fully-qualified Java types of the
-	     method's input parameters (if the method has no input
-	     arguments, the method-params element contains no
-	     method-param elements). Arrays are specified by the
-	     array element's type, followed by one or more pair of
-	     square brackets (e.g. int[][]). If there are multiple
-	     methods with the same overloaded name, this style refers
-	     to all of the overloaded methods.
-
-	  Examples:
-
-	  Style 1: The following method element refers to all the
-	  methods of the EmployeeService bean's business, home,
-          component, and/or web service endpoint interfaces:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>*</method-name>
-	  </method>
-
-	  Style 2: The following method element refers to all the
-	  create methods of the EmployeeService bean's home
-	  interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	  </method>
-
-	  Style 3: The following method element refers to the
-	  create(String firstName, String LastName) method of the
-	  EmployeeService bean's home interface(s).
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The following example illustrates a Style 3 element with
-	  more complex parameter types. The method
-	  foobar(char s, int i, int[] iar, mypackage.MyClass mycl,
-	  mypackage.MyClass[][] myclaar) would be specified as:
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-name>foobar</method-name>
-	      <method-params>
-		  <method-param>char</method-param>
-		  <method-param>int</method-param>
-		  <method-param>int[]</method-param>
-		  <method-param>mypackage.MyClass</method-param>
-		  <method-param>mypackage.MyClass[][]</method-param>
-	      </method-params>
-	  </method>
-
-	  The optional method-intf element can be used when it becomes
-	  necessary to differentiate between a method that is multiply
-	  defined across the enterprise bean's business, home, component,
-          and/or web service endpoint interfaces with the same name and
-	  signature. However, if the same method is a method of both the
-          local business interface, and the local component interface,
-          the same attribute applies to the method for both interfaces.
-          Likewise, if the same method is a method of both the remote
-          business interface and the remote component interface, the same
-          attribute applies to the method for both interfaces.
-
-	  For example, the method element
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Remote</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  can be used to differentiate the create(String, String)
-	  method defined in the remote interface from the
-	  create(String, String) method defined in the remote home
-	  interface, which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  and the create method that is defined in the local home
-	  interface which would be defined as
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>LocalHome</method-intf>
-	      <method-name>create</method-name>
-	      <method-params>
-		  <method-param>java.lang.String</method-param>
-		  <method-param>java.lang.String</method-param>
-	      </method-params>
-	  </method>
-
-	  The method-intf element can be used with all three Styles
-	  of the method element usage. For example, the following
-	  method element example could be used to refer to all the
-	  methods of the EmployeeService bean's remote home interface
-          and the remote business interface.
-
-	  <method>
-	      <ejb-name>EmployeeService</ejb-name>
-	      <method-intf>Home</method-intf>
-	      <method-name>*</method-name>
-	  </method>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="method-intf"
-		   type="javaee:method-intfType"
-		   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="method-name"
-		   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="multiplicityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The multiplicityType describes the multiplicity of the
-	role that participates in a relation.
-
-	The value must be one of the two following:
-
-	    One
-	    Many
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="One"/>
-	<xsd:enumeration value="Many"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="named-methodType">
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="javaee:string"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The persistence-typeType specifies an entity bean's persistence
-	management type.
-
-	The persistence-type element must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="query-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The query-method specifies the method for a finder or select
-	  query.
-
-	  The method-name element specifies the name of a finder or select
-	  method in the entity bean's implementation class.
-
-	  Each method-param must be defined for a query-method using the
-	  method-params element.
-
-	  It is used by the query-method element.
-
-	  Example:
-
-	  <query>
-	      <description>Method finds large orders</description>
-	      <query-method>
-		  <method-name>findLargeOrders</method-name>
-		  <method-params></method-params>
-	      </query-method>
-	      <ejb-ql>
-		SELECT OBJECT(o) FROM Order o
-		  WHERE o.amount &gt; 1000
-	      </ejb-ql>
-	  </query>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-name"
-		   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-		   type="javaee:method-paramsType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="queryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The queryType defines a finder or select
-	query. It contains
-	    - an optional description of the query
-	    - the specification of the finder or select
-	      method it is used by
-		- an optional specification of the result type
-		  mapping, if the query is for a select method
-		  and entity objects are returned.
-		- the EJB QL query string that defines the query.
-
-	Queries that are expressible in EJB QL must use the ejb-ql
-	element to specify the query. If a query is not expressible
-	in EJB QL, the description element should be used to
-	describe the semantics of the query and the ejb-ql element
-	should be empty.
-
-	The result-type-mapping is an optional element. It can only
-	be present if the query-method specifies a select method
-	that returns entity objects.  The default value for the
-	result-type-mapping element is "Local".
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType" minOccurs="0"/>
-      <xsd:element name="query-method"
-		   type="javaee:query-methodType"/>
-      <xsd:element name="result-type-mapping"
-		   type="javaee:result-type-mappingType"
-		   minOccurs="0"/>
-      <xsd:element name="ejb-ql"
-		   type="javaee:xsdStringType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationship-role-sourceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationship-role-sourceType designates the source of a
-	role that participates in a relationship. A
-	relationship-role-sourceType is used by
-	relationship-role-source elements to uniquely identify an
-	entity bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationshipsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The relationshipsType describes the relationships in
-	which entity beans with container-managed persistence
-	participate. The relationshipsType contains an optional
-	description; and a list of ejb-relation elements, which
-	specify the container managed relationships.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation"
-		   type="javaee:ejb-relationType"
-		   maxOccurs="unbounded">
-
-	<xsd:unique name="role-name-uniqueness">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The ejb-relationship-role-name contains the name of a
-	      relationship role. The name must be unique within
-	      a relationship, but can be reused in different
-	      relationships.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector
-	       xpath=".//javaee:ejb-relationship-role-name"/>
-	  <xsd:field
-	       xpath="."/>
-	</xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remove-methodType">
-    <xsd:sequence>
-      <xsd:element name="bean-method"
-		   type="javaee:named-methodType"/>
-      <xsd:element name="retain-if-exception"
-		   type="javaee:true-falseType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="result-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The result-type-mappingType is used in the query element to
-	specify whether an abstract schema type returned by a query
-	for a select method is to be mapped to an EJBLocalObject or
-	EJBObject type.
-
-	The value must be one of the following:
-
-	    Local
-	    Remote
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Local"/>
-	<xsd:enumeration value="Remote"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-identityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-identityType specifies whether the caller's
-	security identity is to be used for the execution of the
-	methods of the enterprise bean or whether a specific run-as
-	identity is to be used. It contains an optional description
-	and a specification of the security identity to be used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="use-caller-identity"
-		     type="javaee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The use-caller-identity element specifies that
-	      the caller's security identity be used as the
-	      security identity for the execution of the
-	      enterprise bean's methods.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="run-as"
-		     type="javaee:run-asType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-beanType declares an session bean. The
-	declaration consists of:
-
-	    - an optional description
-	    - an optional display name
-	    - an optional icon element that contains a small and a large
-	      icon file name
-	    - a name assigned to the enterprise bean
-	      in the deployment description
-            - an optional mapped-name element that can be used to provide
-              vendor-specific deployment information such as the physical
-              jndi-name of the session bean's remote home/business interface.
-              This element is not required to be supported by all
-              implementations. Any use of this element is non-portable.
-            - the names of all the remote or local business interfaces,
-              if any
-	    - the names of the session bean's remote home and
-	      remote interfaces, if any
-	    - the names of the session bean's local home and
-	      local interfaces, if any
-	    - the name of the session bean's web service endpoint
-	      interface, if any
-	    - the session bean's implementation class
-	    - the session bean's state management type
-            - an optional declaration of the session bean's timeout method.
-	    - the optional session bean's transaction management type.
-              If it is not present, it is defaulted to Container.
-            - an optional list of the session bean class and/or
-              superclass around-invoke methods.
-	    - an optional declaration of the bean's
-	      environment entries
-	    - an optional declaration of the bean's EJB references
-	    - an optional declaration of the bean's local
-	      EJB references
-	    - an optional declaration of the bean's web
-	      service references
-	    - an optional declaration of the security role
-	      references
-	    - an optional declaration of the security identity
-	      to be used for the execution of the bean's methods
-	    - an optional declaration of the bean's resource
-	      manager connection factory references
-	    - an optional declaration of the bean's resource
-	      environment references.
-	    - an optional declaration of the bean's message
-	      destination references
-
-	The elements that are optional are "optional" in the sense
-	that they are omitted when if lists represented by them are
-	empty.
-
-	Either both the local-home and the local elements or both
-	the home and the remote elements must be specified for the
-	session bean.
-
-	The service-endpoint element may only be specified if the
-	bean is a stateless session bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-		   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="javaee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="javaee:remoteType"
-		   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="javaee:local-homeType"
-		   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="javaee:localType"
-		   minOccurs="0"/>
-      <xsd:element name="business-local"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="business-remote"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="service-endpoint"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint element contains the
-	    fully-qualified name of the enterprise bean's web
-	    service endpoint interface. The service-endpoint
-	    element may only be specified for a stateless
-	    session bean. The specified interface must be a
-	    valid JAX-RPC service endpoint interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-class"
-		   type="javaee:ejb-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-             The ejb-class element specifies the fully qualified name
-             of the bean class for this ejb.  It is required unless
-             there is a component-defining annotation for the same
-             ejb-name.
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="session-type"
-		   type="javaee:session-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="init-method"
-                   type="javaee:init-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-method element specifies the mappings for
-	    EJB 2.x style create methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="remove-method"
-                   type="javaee:remove-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-	    The remove-method element specifies the mappings for
-	    EJB 2.x style remove methods for an EJB 3.0 bean.
-	    This element can only be specified for stateful
-            session beans.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="transaction-type"
-		   type="javaee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="post-activate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-passivate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="security-role-ref"
-		   type="javaee:security-role-refType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="security-identity"
-		   type="javaee:security-identityType"
-		   minOccurs="0">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-typeType describes whether the session bean is a
-	stateful session or stateless session. It is used by
-	session-type elements.
-
-	The value must be one of the two following:
-
-	    Stateful
-	    Stateless
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Stateful"/>
-	<xsd:enumeration value="Stateless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="trans-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The trans-attributeType specifies how the container must
-	manage the transaction boundaries when delegating a method
-	invocation to an enterprise bean's business method.
-
-	The value must be one of the following:
-
-	    NotSupported
-	    Supports
-	    Required
-	    RequiresNew
-	    Mandatory
-	    Never
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="NotSupported"/>
-	<xsd:enumeration value="Supports"/>
-	<xsd:enumeration value="Required"/>
-	<xsd:enumeration value="RequiresNew"/>
-	<xsd:enumeration value="Mandatory"/>
-	<xsd:enumeration value="Never"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transaction-typeType specifies an enterprise bean's
-	transaction management type.
-
-	The transaction-type must be one of the two following:
-
-	    Bean
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Bean"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_1.xsd
deleted file mode 100644
index 8c09762..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/ejb-jar_3_1.xsd
+++ /dev/null
@@ -1,3247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="3.1">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      This is the XML Schema for the EJB 3.1 deployment descriptor.
-      
-      All EJB deployment descriptors must indicate
-      the schema by using the Java EE namespace:
-      
-      http://java.sun.com/xml/ns/javaee
-      
-      and by indicating the version of the schema by
-      using the version element as shown below:
-      
-      <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-      	  http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
-      version="3.1">
-      ...
-      </ejb-jar>
-      
-      The instance documents may indicate the published version of
-      the schema using the xsi:schemaLocation attribute for the
-      Java EE namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_6.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="ejb-jar"
-               type="javaee:ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This is the root of the ejb-jar deployment descriptor.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:key name="ejb-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The ejb-name element contains the name of an enterprise
-          bean. The name must be unique within the ejb-jar or
-          .war file.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:enterprise-beans/*"/>
-      <xsd:field xpath="javaee:ejb-name"/>
-    </xsd:key>
-    <xsd:keyref name="ejb-name-references"
-                refer="javaee:ejb-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The keyref indicates the references from
-          relationship-role-source must be to a specific ejb-name
-          defined within the scope of enterprise-beans element. 
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath=".//javaee:ejb-relationship-role/javaee:relationship-role-source"/>
-      <xsd:field xpath="javaee:ejb-name"/>
-    </xsd:keyref>
-    <xsd:key name="role-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          A role-name-key is specified to allow the references
-          from the security-role-refs.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:assembly-descriptor/javaee:security-role"/>
-      <xsd:field xpath="javaee:role-name"/>
-    </xsd:key>
-    <xsd:keyref name="role-name-references"
-                refer="javaee:role-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The keyref indicates the references from
-          security-role-ref to a specified role-name.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:enterprise-beans/*/javaee:security-role-ref"/>
-      <xsd:field xpath="javaee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="access-timeoutType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The access-timeoutType represents the maximum amount of
-        time (in a given time unit) that the container should wait for
-        a concurrency lock before throwing a timeout exception to the
-        client.
-        
-        A timeout value of 0 means concurrent access is not permitted.
-        
-        A timeout value of -1 means wait indefinitely to acquire a lock.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="timeout"
-                   type="javaee:xsdIntegerType"/>
-      <xsd:element name="unit"
-                   type="javaee:time-unit-typeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="async-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The async-methodType element specifies that a session
-        bean method has asynchronous invocation semantics.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="method-name"
-                   type="javaee:string"/>
-      <xsd:element name="method-params"
-                   type="javaee:method-paramsType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The activation-configType defines information about the
-        expected configuration properties of the message-driven bean
-        in its operational environment. This may include information
-        about message acknowledgement, message selector, expected
-        destination type, etc.
-        
-        The configuration information is expressed in terms of
-        name/value configuration properties.
-        
-        The properties that are recognized for a particular
-        message-driven bean are determined by the messaging type.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="activation-config-property"
-                   type="javaee:activation-config-propertyType"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="activation-config-propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The activation-config-propertyType contains a name/value
-        configuration property pair for a message-driven bean.
-        
-        The properties that are recognized for a particular
-        message-driven bean are determined by the messaging type.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="activation-config-property-name"
-                   type="javaee:xsdStringType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The activation-config-property-name element contains
-            the name for an activation configuration property of
-            a message-driven bean.
-            
-            For JMS message-driven beans, the following property
-            names are recognized: acknowledgeMode,
-            messageSelector, destinationType, subscriptionDurability
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="activation-config-property-value"
-                   type="javaee:xsdStringType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The activation-config-property-value element
-            contains the value for an activation configuration
-            property of a message-driven bean.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="around-invokeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The around-invoke type specifies a method on a
-        class to be called during the around invoke portion of an 
-        ejb invocation.  Note that each class may have only one
-        around invoke method and that the method may not be
-        overloaded.
-        
-        If the class element is missing then
-        the class defining the callback is assumed to be the
-        interceptor class or component class in scope at the
-        location in the descriptor in which the around invoke
-        definition appears.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"/>
-      <xsd:element name="method-name"
-                   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="around-timeoutType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The around-timeout type specifies a method on a
-        class to be called during the around-timeout portion of
-        a timer timeout callback.  Note that each class may have 
-        only one around-timeout method and that the method may not 
-        be overloaded.
-        
-        If the class element is missing then
-        the class defining the callback is assumed to be the
-        interceptor class or component class in scope at the
-        location in the descriptor in which the around-timeout
-        definition appears.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"/>
-      <xsd:element name="method-name"
-                   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="assembly-descriptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The assembly-descriptorType defines
-        application-assembly information.
-        
-        The application-assembly information consists of the
-        following parts: the definition of security roles, the
-        definition of method permissions, the definition of
-        transaction attributes for enterprise beans with
-        container-managed transaction demarcation, the definition
-        of interceptor bindings, a list of
-        methods to be excluded from being invoked, and a list of
-        exception types that should be treated as application exceptions.
-        
-        All the parts are optional in the sense that they are
-        omitted if the lists represented by them are empty.
-        
-        Providing an assembly-descriptor in the deployment
-        descriptor is optional for the ejb-jar or .war file producer.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="security-role"
-                   type="javaee:security-roleType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="method-permission"
-                   type="javaee:method-permissionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="container-transaction"
-                   type="javaee:container-transactionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor-binding"
-                   type="javaee:interceptor-bindingType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination"
-                   type="javaee:message-destinationType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="exclude-list"
-                   type="javaee:exclude-listType"
-                   minOccurs="0"/>
-      <xsd:element name="application-exception"
-                   type="javaee:application-exceptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The cmp-fieldType describes a container-managed field. The
-        cmp-fieldType contains an optional description of the field,
-        and the name of the field.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="field-name"
-                   type="javaee:java-identifierType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The field-name element specifies the name of a
-            container managed field.
-            
-            The name of the cmp-field of an entity bean with
-            cmp-version 2.x must begin with a lowercase
-            letter. This field is accessed by methods whose
-            names consists of the name of the field specified by
-            field-name in which the first letter is uppercased,
-            prefixed by "get" or "set".
-            
-            The name of the cmp-field of an entity bean with
-            cmp-version 1.x must denote a public field of the
-            enterprise bean class or one of its superclasses.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmp-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The cmp-versionType specifies the version of an entity bean
-        with container-managed persistence. It is used by
-        cmp-version elements.
-        
-        The value must be one of the two following:
-        
-        1.x
-        2.x
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="1.x"/>
-        <xsd:enumeration value="2.x"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-fieldType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The cmr-fieldType describes the bean provider's view of
-        a relationship. It consists of an optional description, and
-        the name and the class type of a field in the source of a
-        role of a relationship. The cmr-field-name element
-        corresponds to the name used for the get and set accessor
-        methods for the relationship. The cmr-field-type element is
-        used only for collection-valued cmr-fields. It specifies the
-        type of the collection that is used.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="cmr-field-name"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The cmr-field-name element specifies the name of a
-            logical relationship field in the entity bean
-            class. The name of the cmr-field must begin with a
-            lowercase letter. This field is accessed by methods
-            whose names consist of the name of the field
-            specified by cmr-field-name in which the first
-            letter is uppercased, prefixed by "get" or "set".
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmr-field-type"
-                   type="javaee:cmr-field-typeType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cmr-field-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The cmr-field-type element specifies the class of a
-        collection-valued logical relationship field in the entity
-        bean class. The value of an element using cmr-field-typeType
-        must be either: java.util.Collection or java.util.Set.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="java.util.Collection"/>
-        <xsd:enumeration value="java.util.Set"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="concurrency-management-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The concurrency-management-typeType specifies the way concurrency
-        is managed for a singleton or stateful session bean.  
-        
-        The concurrency management type must be one of the following:
-        
-        Bean
-        Container
-        
-        Bean managed concurrency can only be specified for a singleton bean.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Bean"/>
-        <xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="concurrent-lock-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The concurrent-lock-typeType specifies how the container must
-        manage concurrent access to a method of a Singleton bean 
-        with container-managed concurrency.
-        
-        The container managed concurrency lock type must be one 
-        of the following :
-        
-        Read
-        Write
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Read"/>
-        <xsd:enumeration value="Write"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="concurrent-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The concurrent-methodType specifies information about a method
-        of a bean with container managed concurrency.
-        
-        The optional lock element specifies the kind of concurrency 
-        lock asssociated with the method.
-        
-        The optional access-timeout element specifies the amount of
-        time (in a given time unit) the container should wait for a
-        concurrency lock before throwing an exception to the client.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="method"
-                   type="javaee:named-methodType"/>
-      <xsd:element name="lock"
-                   type="javaee:concurrent-lock-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="access-timeout"
-                   type="javaee:access-timeoutType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="container-transactionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The container-transactionType specifies how the container
-        must manage transaction scopes for the enterprise bean's
-        method invocations. It defines an optional description, a
-        list of method elements, and a transaction attribute. The
-        transaction attribute is to be applied to all the specified
-        methods.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-                   type="javaee:methodType"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="trans-attribute"
-                   type="javaee:trans-attributeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="depends-onType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The depends-onType is used to express initialization 
-        ordering dependencies between Singleton components.
-        The depends-onType specifies the names of one or more
-        Singleton beans in the same application as the referring
-        Singleton, each of which must be initialized before
-        the referring bean.  
-        
-        Each dependent bean is expressed using ejb-link syntax.
-        The order in which dependent beans are initialized at 
-        runtime is not guaranteed to match the order in which
-        they are listed.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="ejb-name"
-                   type="javaee:ejb-linkType"
-                   minOccurs="1"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The ejb-classType contains the fully-qualified name of the
-        enterprise bean's class. It is used by ejb-class elements. 
-        
-        Example:
-        
-        <ejb-class>com.wombat.empl.EmployeeServiceBean</ejb-class>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-jarType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The ejb-jarType defines the root element of the EJB
-        deployment descriptor. It contains
-        
-        - an optional description of the ejb-jar file
-        - an optional display name
-        - an optional icon that contains a small and a large
-        icon file name
-        - an optional module name. Only applicable to
-        stand-alone ejb-jars or ejb-jars packaged in an ear.
-        Ignored if specified for an ejb-jar.xml within a .war.
-        In that case, standard .war module-name rules apply.
-        - structural information about all included
-        enterprise beans that is not specified through
-        annotations
-        - structural information about interceptor classes
-        - a descriptor for container managed relationships, 
-        if any. 
-        - an optional application-assembly descriptor
-        - an optional name of an ejb-client-jar file for the 
-        ejb-jar.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="module-name"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="enterprise-beans"
-                   type="javaee:enterprise-beansType"
-                   minOccurs="0"/>
-      <xsd:element name="interceptors"
-                   type="javaee:interceptorsType"
-                   minOccurs="0"/>
-      <xsd:element name="relationships"
-                   type="javaee:relationshipsType"
-                   minOccurs="0">
-        <xsd:unique name="relationship-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-relation-name contains the name of a
-              relation. The name must be unique within
-              relationships.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:ejb-relation"/>
-          <xsd:field xpath="javaee:ejb-relation-name"/>
-        </xsd:unique>
-      </xsd:element>
-      <xsd:element name="assembly-descriptor"
-                   type="javaee:assembly-descriptorType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Providing an assembly-descriptor in the deployment
-            descriptor is optional for the ejb-jar or .war file
-            producer.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-client-jar"
-                   type="javaee:pathType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The optional ejb-client-jar element specifies a JAR
-            file that contains the class files necessary for a
-            client program to access the
-            enterprise beans in the ejb-jar file.
-            
-            Example:
-            
-            	  <ejb-client-jar>employee_service_client.jar
-            	  </ejb-client-jar>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="javaee:dewey-versionType"
-                   fixed="3.1"
-                   use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The version specifies the version of the
-          EJB specification that the instance document must 
-          comply with. This information enables deployment tools
-          to validate a particular EJB Deployment
-          Descriptor with respect to a specific version of the EJB
-          schema. 
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="metadata-complete"
-                   type="xsd:boolean">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The metadata-complete attribute defines whether this
-          deployment descriptor and other related deployment
-          descriptors for this module (e.g., web service
-          descriptors) are complete, or whether the class
-          files available to this module and packaged with
-          this application should be examined for annotations
-          that specify deployment information.
-          
-          If metadata-complete is set to "true", the deployment
-          tool must ignore any annotations that specify deployment
-          information, which might be present in the class files
-          of the application.
-          
-          If metadata-complete is not specified or is set to
-          "false", the deployment tool must examine the class
-          files of the application for annotations, as
-          specified by the specifications.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The ejb-nameType specifies an enterprise bean's name. It is
-        used by ejb-name elements. This name is assigned by the
-        file producer to name the enterprise bean in the
-        ejb-jar or .war file's deployment descriptor. The name must be
-        unique among the names of the enterprise beans in the same
-        ejb-jar or .war file.
-        
-        There is no architected relationship between the used
-        ejb-name in the deployment descriptor and the JNDI name that
-        the Deployer will assign to the enterprise bean's home.
-        
-        The name for an entity bean must conform to the lexical
-        rules for an NMTOKEN.
-        
-        Example:
-        
-        <ejb-name>EmployeeService</ejb-name>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdNMTOKENType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The ejb-relationType describes a relationship between two
-        entity beans with container-managed persistence.  It is used
-        by ejb-relation elements. It contains a description; an
-        optional ejb-relation-name element; and exactly two
-        relationship role declarations, defined by the
-        ejb-relationship-role elements. The name of the
-        relationship, if specified, is unique within the ejb-jar
-        file.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The ejb-relation-name element provides a unique name
-            within the ejb-jar file for a relationship.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-relationship-role"
-                   type="javaee:ejb-relationship-roleType"/>
-      <xsd:element name="ejb-relationship-role"
-                   type="javaee:ejb-relationship-roleType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-relationship-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The ejb-relationship-roleType describes a role within a
-        relationship. There are two roles in each relationship.
-        
-        The ejb-relationship-roleType contains an optional
-        description; an optional name for the relationship role; a
-        specification of the multiplicity of the role; an optional
-        specification of cascade-delete functionality for the role;
-        the role source; and a declaration of the cmr-field, if any,
-        by means of which the other side of the relationship is
-        accessed from the perspective of the role source.
-        
-        The multiplicity and role-source element are mandatory.
-        
-        The relationship-role-source element designates an entity
-        bean by means of an ejb-name element. For bidirectional
-        relationships, both roles of a relationship must declare a
-        relationship-role-source element that specifies a cmr-field
-        in terms of which the relationship is accessed. The lack of
-        a cmr-field element in an ejb-relationship-role specifies
-        that the relationship is unidirectional in navigability and
-        the entity bean that participates in the relationship is
-        "not aware" of the relationship.
-        
-        Example:
-        
-        <ejb-relation>
-        <ejb-relation-name>Product-LineItem</ejb-relation-name>
-        <ejb-relationship-role>
-        	  <ejb-relationship-role-name>product-has-lineitems
-        	  </ejb-relationship-role-name>
-        	  <multiplicity>One</multiplicity>
-        	  <relationship-role-source>
-        	  <ejb-name>ProductEJB</ejb-name>
-        	  </relationship-role-source>
-        </ejb-relationship-role>
-        </ejb-relation>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relationship-role-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The ejb-relationship-role-name element defines a
-            name for a role that is unique within an
-            ejb-relation. Different relationships can use the
-            same name for a role.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="multiplicity"
-                   type="javaee:multiplicityType"/>
-      <xsd:element name="cascade-delete"
-                   type="javaee:emptyType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The cascade-delete element specifies that, within a
-            particular relationship, the lifetime of one or more
-            entity beans is dependent upon the lifetime of
-            another entity bean. The cascade-delete element can
-            only be specified for an ejb-relationship-role
-            element contained in an ejb-relation element in
-            which the other ejb-relationship-role
-            element specifies a multiplicity of One.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="relationship-role-source"
-                   type="javaee:relationship-role-sourceType"/>
-      <xsd:element name="cmr-field"
-                   type="javaee:cmr-fieldType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="enterprise-beansType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The enterprise-beansType declares one or more enterprise
-        beans. Each bean can be a session, entity or message-driven
-        bean.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice maxOccurs="unbounded">
-      <xsd:element name="session"
-                   type="javaee:session-beanType">
-        <xsd:unique name="session-ejb-local-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-ref-name element contains the name of
-              an EJB reference. The EJB reference is an entry in
-              the component's environment and is relative to the
-              java:comp/env context.  The name must be unique within
-              the component.
-              
-              It is recommended that name be prefixed with "ejb/".
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:ejb-local-ref"/>
-          <xsd:field xpath="javaee:ejb-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="session-ejb-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-ref-name element contains the name of an EJB
-              reference. The EJB reference is an entry in the
-              component's environment and is relative to the
-              java:comp/env context. The name must be unique
-              within the component.
-              
-              It is recommended that name is prefixed with "ejb/".
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:ejb-ref"/>
-          <xsd:field xpath="javaee:ejb-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="session-resource-env-ref-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The resource-env-ref-name element specifies the name
-              of a resource environment reference; its value is
-              the environment entry name used in the component
-              code. The name is a JNDI name relative to the
-              java:comp/env context and must be unique within an
-              component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:resource-env-ref"/>
-          <xsd:field xpath="javaee:resource-env-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="session-message-destination-ref-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The message-destination-ref-name element specifies the name
-              of a message destination reference; its value is
-              the message destination reference name used in the component
-              code. The name is a JNDI name relative to the
-              java:comp/env context and must be unique within an
-              component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:message-destination-ref"/>
-          <xsd:field xpath="javaee:message-destination-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="session-res-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The res-ref-name element specifies the name of a
-              resource manager connection factory reference.  The name
-              is a JNDI name relative to the java:comp/env context.
-              The name must be unique within an component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:resource-ref"/>
-          <xsd:field xpath="javaee:res-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="session-env-entry-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The env-entry-name element contains the name of a
-              component's environment entry.  The name is a JNDI
-              name relative to the java:comp/env context.  The
-              name must be unique within an component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:env-entry"/>
-          <xsd:field xpath="javaee:env-entry-name"/>
-        </xsd:unique>
-      </xsd:element>
-      <xsd:element name="entity"
-                   type="javaee:entity-beanType">
-        <xsd:unique name="entity-ejb-local-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-ref-name element contains the name of
-              an EJB reference. The EJB reference is an entry in
-              the component's environment and is relative to the
-              java:comp/env context.  The name must be unique within
-              the component.
-              
-              It is recommended that name be prefixed with "ejb/".
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:ejb-local-ref"/>
-          <xsd:field xpath="javaee:ejb-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="entity-ejb-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-ref-name element contains the name of an EJB
-              reference. The EJB reference is an entry in the
-              component's environment and is relative to the
-              java:comp/env context. The name must be unique
-              within the component.
-              
-              It is recommended that name is prefixed with "ejb/".
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:ejb-ref"/>
-          <xsd:field xpath="javaee:ejb-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="entity-resource-env-ref-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The resource-env-ref-name element specifies the name
-              of a resource environment reference; its value is
-              the environment entry name used in the component
-              code. The name is a JNDI name relative to the
-              java:comp/env context and must be unique within an
-              component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:resource-env-ref"/>
-          <xsd:field xpath="javaee:resource-env-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="entity-message-destination-ref-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The message-destination-ref-name element specifies the name
-              of a message destination reference; its value is
-              the message destination reference name used in the component
-              code. The name is a JNDI name relative to the
-              java:comp/env context and must be unique within an
-              component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:message-destination-ref"/>
-          <xsd:field xpath="javaee:message-destination-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="entity-res-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The res-ref-name element specifies the name of a
-              resource manager connection factory reference.  The name
-              is a JNDI name relative to the java:comp/env context.
-              The name must be unique within an component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:resource-ref"/>
-          <xsd:field xpath="javaee:res-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="entity-env-entry-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The env-entry-name element contains the name of a
-              component's environment entry.  The name is a JNDI
-              name relative to the java:comp/env context.  The
-              name must be unique within an component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:env-entry"/>
-          <xsd:field xpath="javaee:env-entry-name"/>
-        </xsd:unique>
-      </xsd:element>
-      <xsd:element name="message-driven"
-                   type="javaee:message-driven-beanType">
-        <xsd:unique name="messaged-ejb-local-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-ref-name element contains the name of
-              an EJB reference. The EJB reference is an entry in
-              the component's environment and is relative to the
-              java:comp/env context.  The name must be unique within
-              the component.
-              
-              It is recommended that name be prefixed with "ejb/".
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:ejb-local-ref"/>
-          <xsd:field xpath="javaee:ejb-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="messaged-ejb-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-ref-name element contains the name of an EJB
-              reference. The EJB reference is an entry in the
-              component's environment and is relative to the
-              java:comp/env context. The name must be unique
-              within the component.
-              
-              It is recommended that name is prefixed with "ejb/".
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:ejb-ref"/>
-          <xsd:field xpath="javaee:ejb-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="messaged-resource-env-ref-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The resource-env-ref-name element specifies the name
-              of a resource environment reference; its value is
-              the environment entry name used in the component
-              code. The name is a JNDI name relative to the
-              java:comp/env context and must be unique within an
-              component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:resource-env-ref"/>
-          <xsd:field xpath="javaee:resource-env-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="messaged-message-destination-ref-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The message-destination-ref-name element specifies the name
-              of a message destination reference; its value is
-              the message destination reference name used in the component
-              code. The name is a JNDI name relative to the
-              java:comp/env context and must be unique within an
-              component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:message-destination-ref"/>
-          <xsd:field xpath="javaee:message-destination-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="messaged-res-ref-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The res-ref-name element specifies the name of a
-              resource manager connection factory reference.  The name
-              is a JNDI name relative to the java:comp/env context.
-              The name must be unique within an component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:resource-ref"/>
-          <xsd:field xpath="javaee:res-ref-name"/>
-        </xsd:unique>
-        <xsd:unique name="messaged-env-entry-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The env-entry-name element contains the name of a
-              component's environment entry.  The name is a JNDI
-              name relative to the java:comp/env context.  The
-              name must be unique within an component.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:env-entry"/>
-          <xsd:field xpath="javaee:env-entry-name"/>
-        </xsd:unique>
-      </xsd:element>
-    </xsd:choice>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="entity-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The entity-beanType declares an entity bean. The declaration
-        consists of:
-        
-        - an optional description
-        - an optional display name
-        - an optional icon element that contains a small and a large 
-        icon file name
-        - a unique name assigned to the enterprise bean
-        in the deployment descriptor
-        - an optional mapped-name element that can be used to provide
-        vendor-specific deployment information such as the physical
-        jndi-name of the entity bean's remote home interface. This 
-        element is not required to be supported by all implementations.
-        Any use of this element is non-portable.
-        - the names of the entity bean's remote home 
-        and remote interfaces, if any
-        - the names of the entity bean's local home and local
-        interfaces, if any
-        - the entity bean's implementation class
-        - the optional entity bean's persistence management type. If 
-        this element is not specified it is defaulted to Container.
-        - the entity bean's primary key class name
-        - an indication of the entity bean's reentrancy
-        - an optional specification of the 
-        entity bean's cmp-version
-        - an optional specification of the entity bean's
-        abstract schema name
-        - an optional list of container-managed fields
-        - an optional specification of the primary key 
-        field
-        - an optional declaration of the bean's environment 
-        entries
-        - an optional declaration of the bean's EJB 
-        references
-        - an optional declaration of the bean's local 
-        EJB references
-        - an optional declaration of the bean's web 
-        service references
-        - an optional declaration of the security role 
-        references
-        - an optional declaration of the security identity
-        to be used for the execution of the bean's methods
-        - an optional declaration of the bean's 
-        resource manager connection factory references
-        - an optional declaration of the bean's
-        resource environment references
-        - an optional declaration of the bean's message 
-        destination references
-        - an optional set of query declarations
-        for finder and select methods for an entity
-        bean with cmp-version 2.x.
-        
-        The optional abstract-schema-name element must be specified
-        for an entity bean with container-managed persistence and
-        cmp-version 2.x.
-        
-        The optional primkey-field may be present in the descriptor
-        if the entity's persistence-type is Container.
-        
-        The optional cmp-version element may be present in the
-        descriptor if the entity's persistence-type is Container. If
-        the persistence-type is Container and the cmp-version
-        element is not specified, its value defaults to 2.x.
-        
-        The optional home and remote elements must be specified if
-        the entity bean cmp-version is 1.x.
-        
-        The optional home and remote elements must be specified if
-        the entity bean has a remote home and remote interface.
-        
-        The optional local-home and local elements must be specified
-        if the entity bean has a local home and local interface.
-        
-        Either both the local-home and the local elements or both
-        the home and the remote elements must be specified.
-        
-        The optional query elements must be present if the
-        persistence-type is Container and the cmp-version is 2.x and
-        query methods other than findByPrimaryKey have been defined
-        for the entity bean.
-        
-        The other elements that are optional are "optional" in the
-        sense that they are omitted if the lists represented by them
-        are empty.
-        
-        At least one cmp-field element must be present in the
-        descriptor if the entity's persistence-type is Container and
-        the cmp-version is 1.x, and none must not be present if the
-        entity's persistence-type is Bean.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-                   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0"/>
-      <xsd:element name="home"
-                   type="javaee:homeType"
-                   minOccurs="0"/>
-      <xsd:element name="remote"
-                   type="javaee:remoteType"
-                   minOccurs="0"/>
-      <xsd:element name="local-home"
-                   type="javaee:local-homeType"
-                   minOccurs="0"/>
-      <xsd:element name="local"
-                   type="javaee:localType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-                   type="javaee:ejb-classType"/>
-      <xsd:element name="persistence-type"
-                   type="javaee:persistence-typeType"/>
-      <xsd:element name="prim-key-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The prim-key-class element contains the
-            fully-qualified name of an
-            entity bean's primary key class.
-            
-            If the definition of the primary key class is
-            deferred to deployment time, the prim-key-class 
-            element should specify java.lang.Object.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="reentrant"
-                   type="javaee:true-falseType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The reentrant element specifies whether an entity
-            bean is reentrant or not.
-            
-            The reentrant element must be one of the two
-            following: true or false
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-version"
-                   type="javaee:cmp-versionType"
-                   minOccurs="0"/>
-      <xsd:element name="abstract-schema-name"
-                   type="javaee:java-identifierType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The abstract-schema-name element specifies the name
-            of the abstract schema type of an entity bean with 
-            cmp-version 2.x. It is used in EJB QL queries. 
-            
-            For example, the abstract-schema-name for an entity 
-            bean whose local interface is 
-            com.acme.commerce.Order might be Order. 
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cmp-field"
-                   type="javaee:cmp-fieldType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="primkey-field"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The primkey-field element is used to specify the
-            name of the primary key field for an entity with
-            container-managed persistence.
-            
-            The primkey-field must be one of the fields declared
-            in the cmp-field element, and the type of the field
-            must be the same as the primary key type.
-            
-            The primkey-field element is not used if the primary
-            key maps to multiple container-managed fields
-            (i.e. the key is a compound key). In this case, the
-            fields of the primary key class must be public, and
-            their names must correspond to the field names of
-            the entity bean class that comprise the key.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-                   type="javaee:security-role-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="security-identity"
-                   type="javaee:security-identityType"
-                   minOccurs="0"/>
-      <xsd:element name="query"
-                   type="javaee:queryType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="exclude-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The exclude-listType specifies one or more methods which
-        the Assembler marks to be uncallable.
-        
-        If the method permission relation contains methods that are
-        in the exclude list, the Deployer should consider those
-        methods to be uncallable.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="method"
-                   type="javaee:methodType"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="application-exceptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The application-exceptionType declares an application
-        exception. The declaration consists of:
-        
-        - the exception class. When the container receives
-        an exception of this type, it is required to 
-        forward this exception as an applcation exception 
-        to the client regardless of whether it is a checked
-        or unchecked exception.
-        - an optional rollback element. If this element is 
-        set to true, the container must rollback the current 
-        transaction before forwarding the exception to the
-        client.  If not specified, it defaults to false.
-        - an optional inherited element. If this element is 
-        set to true, subclasses of the exception class type
-        are also automatically considered application 
-        exceptions (unless overriden at a lower level).
-        If set to false, only the exception class type is
-        considered an application-exception, not its
-        exception subclasses. If not specified, this
-        value defaults to true.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="exception-class"
-                   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="rollback"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-      <xsd:element name="inherited"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptorsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptorsType element declares one or more interceptor
-        classes used by components within this ejb-jar or .war.  The declaration
-        consists of :
-        
-        - An optional description.
-        - One or more interceptor elements.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor"
-                   type="javaee:interceptorType"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptorType element declares information about a single
-        interceptor class.  It consists of :
-        
-        - An optional description.
-        - The fully-qualified name of the interceptor class.
-        - An optional list of around invoke methods declared on the
-        interceptor class and/or its super-classes.
-        - An optional list of around timeout methods declared on the
-        interceptor class and/or its super-classes.
-        - An optional list environment dependencies for the interceptor
-        class and/or its super-classes.
-        - An optional list of post-activate methods declared on the
-        interceptor class and/or its super-classes.
-        - An optional list of pre-passivate methods declared on the
-        interceptor class and/or its super-classes.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="interceptor-class"
-                   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="around-timeout"
-                   type="javaee:around-timeoutType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="post-activate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-passivate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptor-bindingType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The interceptor-bindingType element describes the binding of
-        interceptor classes to beans within the ejb-jar or .war.
-        It consists of :
-        
-        - An optional description.
-        - The name of an ejb within the module or the wildcard value "*",
-        which is used to define interceptors that are bound to all
-        beans in the ejb-jar or .war.
-        - A list of interceptor classes that are bound to the contents of
-        the ejb-name element or a specification of the total ordering
-        over the interceptors defined for the given level and above.
-        - An optional exclude-default-interceptors element.  If set to true,
-        specifies that default interceptors are not to be applied to 
-        a bean-class and/or business method.
-        - An optional exclude-class-interceptors element.  If set to true,
-        specifies that class interceptors are not to be applied to 
-        a business method.
-        - An optional set of method elements for describing the name/params
-        of a method-level interceptor.
-        
-        Interceptors bound to all classes using the wildcard syntax
-        "*" are default interceptors for the components in the ejb-jar or .war. 
-        In addition, interceptors may be bound at the level of the bean
-        class (class-level interceptors) or business methods (method-level
-        interceptors ).
-        
-        The binding of interceptors to classes is additive.  If interceptors
-        are bound at the class-level and/or default-level as well as the
-        method-level, both class-level and/or default-level as well as
-        method-level will apply. 
-        
-        There are four possible styles of the interceptor element syntax :
-        
-        1.
-        <interceptor-binding>
-        <ejb-name>*</ejb-name>
-        <interceptor-class>INTERCEPTOR</interceptor-class>
-        </interceptor-binding>
-        
-        Specifying the ejb-name as the wildcard value "*" designates
-        default interceptors (interceptors that apply to all session and
-        message-driven beans contained in the ejb-jar or .war).
-        
-        2. 
-        <interceptor-binding>
-        <ejb-name>EJBNAME</ejb-name>
-        <interceptor-class>INTERCEPTOR</interceptor-class>
-        </interceptor-binding>
-        
-        This style is used to refer to interceptors associated with the
-        specified enterprise bean(class-level interceptors).
-        
-        3. 
-        <interceptor-binding>
-        <ejb-name>EJBNAME</ejb-name>
-        <interceptor-class>INTERCEPTOR</interceptor-class>
-        <method>
-        <method-name>METHOD</method-name>
-        </method>
-        </interceptor-binding>
-        
-        This style is used to associate a method-level interceptor with 
-        the specified enterprise bean.  If there are multiple methods
-        with the same overloaded name, the element of this style refers
-        to all the methods with the overloaded name.  Method-level
-        interceptors can only be associated with business methods of the
-        bean class.   Note that the wildcard value "*" cannot be used
-        to specify method-level interceptors.
-        
-        4. 
-        <interceptor-binding>
-        <ejb-name>EJBNAME</ejb-name>
-        <interceptor-class>INTERCEPTOR</interceptor-class>
-        <method>
-        <method-name>METHOD</method-name>
-        <method-params>
-        <method-param>PARAM-1</method-param>
-        <method-param>PARAM-2</method-param>
-        ...
-        <method-param>PARAM-N</method-param>
-        </method-params>
-        </method>
-        </interceptor-binding>
-        
-        This style is used to associate a method-level interceptor with 
-        the specified method of the specified enterprise bean.  This 
-        style is used to refer to a single method within a set of methods
-        with an overloaded name.  The values PARAM-1 through PARAM-N
-        are the fully-qualified Java types of the method's input parameters
-        (if the method has no input arguments, the method-params element
-        contains no method-param elements). Arrays are specified by the
-        array element's type, followed by one or more pair of square 
-        brackets (e.g. int[][]).
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-                   type="javaee:string"/>
-      <xsd:choice>
-        <xsd:element name="interceptor-class"
-                     type="javaee:fully-qualified-classType"
-                     minOccurs="0"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="interceptor-order"
-                     type="javaee:interceptor-orderType"
-                     minOccurs="1"/>
-      </xsd:choice>
-      <xsd:element name="exclude-default-interceptors"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-      <xsd:element name="exclude-class-interceptors"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-      <xsd:element name="method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="interceptor-orderType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The interceptor-orderType element describes a total ordering
-        of interceptor classes.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="interceptor-class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="1"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="named-methodType">
-    <xsd:sequence>
-      <xsd:element name="method-name"
-                   type="javaee:string"/>
-      <xsd:element name="method-params"
-                   type="javaee:method-paramsType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="init-methodType">
-    <xsd:sequence>
-      <xsd:element name="create-method"
-                   type="javaee:named-methodType"/>
-      <xsd:element name="bean-method"
-                   type="javaee:named-methodType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remove-methodType">
-    <xsd:sequence>
-      <xsd:element name="bean-method"
-                   type="javaee:named-methodType"/>
-      <xsd:element name="retain-if-exception"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-driven-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The message-driven element declares a message-driven
-        bean. The declaration consists of:
-        
-        - an optional description
-        - an optional display name
-        - an optional icon element that contains a small and a large 
-        icon file name. 
-        - a name assigned to the enterprise bean in
-        the deployment descriptor
-        - an optional mapped-name element that can be used to provide
-        vendor-specific deployment information such as the physical
-        jndi-name of destination from which this message-driven bean
-        should consume.  This element is not required to be supported 
-        by all implementations.  Any use of this element is non-portable.
-        - the message-driven bean's implementation class
-        - an optional declaration of the bean's messaging 
-        type 
-        - an optional declaration of the bean's timeout method for
-        handling programmatically created timers
-        - an optional declaration of timers to be automatically created at
-        deployment time
-        - the optional message-driven bean's transaction management 
-        type. If it is not defined, it is defaulted to Container.
-        - an optional declaration of the bean's 
-        message-destination-type
-        - an optional declaration of the bean's 
-        message-destination-link
-        - an optional declaration of the message-driven bean's
-        activation configuration properties
-        - an optional list of the message-driven bean class and/or
-        superclass around-invoke methods.
-        - an optional list of the message-driven bean class and/or
-        superclass around-timeout methods.
-        - an optional declaration of the bean's environment
-        entries
-        - an optional declaration of the bean's EJB references
-        - an optional declaration of the bean's local EJB
-        references
-        - an optional declaration of the bean's web service
-        references
-        - an optional declaration of the security role 
-        references
-        - an optional declaration of the security
-        identity to be used for the execution of the bean's
-        methods
-        - an optional declaration of the bean's 
-        resource manager connection factory 
-        references
-        - an optional declaration of the bean's resource
-        environment references.
-        - an optional declaration of the bean's message 
-        destination references
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-                   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-class"
-                   type="javaee:ejb-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The ejb-class element specifies the fully qualified name
-            of the bean class for this ejb.  It is required unless
-            there is a component-defining annotation for the same
-            ejb-name.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="messaging-type"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The messaging-type element specifies the message
-            listener interface of the message-driven bean. 
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The timeout-method element specifies the method that
-            will receive callbacks for programmatically
-            created timers.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="timer"
-                   type="javaee:timerType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="transaction-type"
-                   type="javaee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="message-destination-type"
-                   type="javaee:message-destination-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-                   type="javaee:message-destination-linkType"
-                   minOccurs="0"/>
-      <xsd:element name="activation-config"
-                   type="javaee:activation-configType"
-                   minOccurs="0"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="around-timeout"
-                   type="javaee:around-timeoutType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="security-role-ref"
-                   type="javaee:security-role-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="security-identity"
-                   type="javaee:security-identityType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The methodType is used to denote a method of an enterprise
-        bean's business, home, component, and/or web service endpoint
-        interface, or, in the case of a message-driven bean, the
-        bean's message listener method, or a set of such
-        methods. The ejb-name element must be the name of one of the
-        enterprise beans declared in the deployment descriptor; the
-        optional method-intf element allows to distinguish between a
-        method with the same signature that is multiply defined
-        across the business, home, component, and/or web service 
-        endpoint nterfaces; the method-name element specifies the 
-        method name; and the optional method-params elements identify 
-        a single method among multiple methods with an overloaded
-        method name.
-        
-        There are three possible styles of using methodType element
-        within a method element:
-        
-        1.
-        <method>
-        <ejb-name>EJBNAME</ejb-name>
-        <method-name>*</method-name>
-        </method>
-        
-        This style is used to refer to all the methods of the
-        specified enterprise bean's business, home, component, 
-        and/or web service endpoint interfaces.
-        
-        2.
-        <method>
-        <ejb-name>EJBNAME</ejb-name>
-        <method-name>METHOD</method-name>
-        </method>
-        
-        This style is used to refer to the specified method of
-        the specified enterprise bean. If there are multiple
-        methods with the same overloaded name, the element of
-        this style refers to all the methods with the overloaded
-        name.
-        
-        3.
-        <method>
-        <ejb-name>EJBNAME</ejb-name>
-        <method-name>METHOD</method-name>
-        <method-params>
-        	  <method-param>PARAM-1</method-param>
-        	  <method-param>PARAM-2</method-param>
-        	  ...
-        	  <method-param>PARAM-n</method-param>
-        </method-params>
-        </method>
-        
-        This style is used to refer to a single method within a
-        set of methods with an overloaded name. PARAM-1 through
-        PARAM-n are the fully-qualified Java types of the
-        method's input parameters (if the method has no input
-        arguments, the method-params element contains no
-        method-param elements). Arrays are specified by the
-        array element's type, followed by one or more pair of
-        square brackets (e.g. int[][]). If there are multiple
-        methods with the same overloaded name, this style refers
-        to all of the overloaded methods. 
-        
-        Examples:
-        
-        Style 1: The following method element refers to all the
-        methods of the EmployeeService bean's business, home, 
-        component, and/or web service endpoint interfaces:
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-name>*</method-name>
-        </method>
-        
-        Style 2: The following method element refers to all the
-        create methods of the EmployeeService bean's home
-        interface(s).
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-name>create</method-name>
-        </method>
-        
-        Style 3: The following method element refers to the
-        create(String firstName, String LastName) method of the
-        EmployeeService bean's home interface(s).
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-name>create</method-name>
-        <method-params>
-        	  <method-param>java.lang.String</method-param>
-        	  <method-param>java.lang.String</method-param>
-        </method-params>
-        </method>
-        
-        The following example illustrates a Style 3 element with
-        more complex parameter types. The method 
-        foobar(char s, int i, int[] iar, mypackage.MyClass mycl, 
-        mypackage.MyClass[][] myclaar) would be specified as:
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-name>foobar</method-name>
-        <method-params>
-        	  <method-param>char</method-param>
-        	  <method-param>int</method-param>
-        	  <method-param>int[]</method-param>
-        	  <method-param>mypackage.MyClass</method-param>
-        	  <method-param>mypackage.MyClass[][]</method-param>
-        </method-params>
-        </method>
-        
-        The optional method-intf element can be used when it becomes
-        necessary to differentiate between a method that is multiply
-        defined across the enterprise bean's business, home, component,
-        and/or web service endpoint interfaces with the same name and
-        signature. However, if the same method is a method of both the
-        local business interface, and the local component interface, 
-        the same attribute applies to the method for both interfaces.
-        Likewise, if the same method is a method of both the remote 
-        business interface and the remote component interface, the same
-        attribute applies to the method for both interfaces.
-        
-        For example, the method element
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-intf>Remote</method-intf>
-        <method-name>create</method-name>
-        <method-params>
-        	  <method-param>java.lang.String</method-param>
-        	  <method-param>java.lang.String</method-param>
-        </method-params>
-        </method>
-        
-        can be used to differentiate the create(String, String)
-        method defined in the remote interface from the
-        create(String, String) method defined in the remote home
-        interface, which would be defined as
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>create</method-name>
-        <method-params>
-        	  <method-param>java.lang.String</method-param>
-        	  <method-param>java.lang.String</method-param>
-        </method-params>
-        </method>
-        
-        and the create method that is defined in the local home
-        interface which would be defined as
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-intf>LocalHome</method-intf>
-        <method-name>create</method-name>
-        <method-params>
-        	  <method-param>java.lang.String</method-param>
-        	  <method-param>java.lang.String</method-param>
-        </method-params>
-        </method>
-        
-        The method-intf element can be used with all three Styles
-        of the method element usage. For example, the following
-        method element example could be used to refer to all the
-        methods of the EmployeeService bean's remote home interface
-        and the remote business interface.
-        
-        <method>
-        <ejb-name>EmployeeService</ejb-name>
-        <method-intf>Home</method-intf>
-        <method-name>*</method-name>
-        </method>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-                   type="javaee:ejb-nameType"/>
-      <xsd:element name="method-intf"
-                   type="javaee:method-intfType"
-                   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="method-name"
-                   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-                   type="javaee:method-paramsType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-intfType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The method-intf element allows a method element to
-        differentiate between the methods with the same name and
-        signature that are multiply defined across the home and
-        component interfaces (e.g, in both an enterprise bean's
-        remote and local interfaces or in both an enterprise bean's
-        home and remote interfaces, etc.); the component and web
-        service endpoint interfaces, and so on. 
-        
-        Local applies to the local component interface, local business 
-        interfaces, and the no-interface view. 
-        
-        Remote applies to both remote component interface and the remote 
-        business interfaces.  
-        
-        ServiceEndpoint refers to methods exposed through a web service
-        endpoint.
-        
-        Timer refers to the bean's timeout callback methods.
-        
-        MessageEndpoint refers to the methods of a message-driven bean's
-        message-listener interface.
-        
-        The method-intf element must be one of the following:
-        
-        Home
-        Remote
-        LocalHome
-        Local
-        ServiceEndpoint
-        Timer
-        MessageEndpoint
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Home"/>
-        <xsd:enumeration value="Remote"/>
-        <xsd:enumeration value="LocalHome"/>
-        <xsd:enumeration value="Local"/>
-        <xsd:enumeration value="ServiceEndpoint"/>
-        <xsd:enumeration value="Timer"/>
-        <xsd:enumeration value="MessageEndpoint"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The method-nameType contains a name of an enterprise
-        bean method or the asterisk (*) character. The asterisk is
-        used when the element denotes all the methods of an
-        enterprise bean's client view interfaces.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-paramsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The method-paramsType defines a list of the
-        fully-qualified Java type names of the method parameters.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="method-param"
-                   type="javaee:java-typeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The method-param element contains a primitive
-            or a fully-qualified Java type name of a method
-            parameter.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-permissionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The method-permissionType specifies that one or more
-        security roles are allowed to invoke one or more enterprise
-        bean methods. The method-permissionType consists of an
-        optional description, a list of security role names or an
-        indicator to state that the method is unchecked for
-        authorization, and a list of method elements.
-        
-        The security roles used in the method-permissionType
-        must be defined in the security-role elements of the
-        deployment descriptor, and the methods must be methods
-        defined in the enterprise bean's business, home, component 
-        and/or web service endpoint interfaces.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:choice>
-        <xsd:element name="role-name"
-                     type="javaee:role-nameType"
-                     maxOccurs="unbounded"/>
-        <xsd:element name="unchecked"
-                     type="javaee:emptyType">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The unchecked element specifies that a method is
-              not checked for authorization by the container
-              prior to invocation of the method.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-      <xsd:element name="method"
-                   type="javaee:methodType"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="multiplicityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The multiplicityType describes the multiplicity of the
-        role that participates in a relation.
-        
-        The value must be one of the two following:
-        
-        One
-        Many
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="One"/>
-        <xsd:enumeration value="Many"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The persistence-typeType specifies an entity bean's persistence
-        management type.
-        
-        The persistence-type element must be one of the two following:
-        
-        Bean
-        Container
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Bean"/>
-        <xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="queryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The queryType defines a finder or select
-        query. It contains
-        - an optional description of the query
-        - the specification of the finder or select
-        method it is used by
-        	- an optional specification of the result type 
-        	  mapping, if the query is for a select method 
-        	  and entity objects are returned.
-        	- the EJB QL query string that defines the query.
-        
-        Queries that are expressible in EJB QL must use the ejb-ql
-        element to specify the query. If a query is not expressible
-        in EJB QL, the description element should be used to
-        describe the semantics of the query and the ejb-ql element
-        should be empty.
-        
-        The result-type-mapping is an optional element. It can only
-        be present if the query-method specifies a select method
-        that returns entity objects.  The default value for the
-        result-type-mapping element is "Local".
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"/>
-      <xsd:element name="query-method"
-                   type="javaee:query-methodType"/>
-      <xsd:element name="result-type-mapping"
-                   type="javaee:result-type-mappingType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-ql"
-                   type="javaee:xsdStringType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="query-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The query-method specifies the method for a finder or select
-        query.
-        
-        The method-name element specifies the name of a finder or select
-        method in the entity bean's implementation class.
-        
-        Each method-param must be defined for a query-method using the
-        method-params element.
-        
-        It is used by the query-method element. 
-        
-        Example:
-        
-        <query>
-        <description>Method finds large orders</description>
-        <query-method>
-        	  <method-name>findLargeOrders</method-name>
-        	  <method-params></method-params>
-        </query-method>
-        <ejb-ql>
-        	SELECT OBJECT(o) FROM Order o
-        	  WHERE o.amount &gt; 1000
-        </ejb-ql>
-        </query>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="method-name"
-                   type="javaee:method-nameType"/>
-      <xsd:element name="method-params"
-                   type="javaee:method-paramsType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationship-role-sourceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The relationship-role-sourceType designates the source of a
-        role that participates in a relationship. A
-        relationship-role-sourceType is used by
-        relationship-role-source elements to uniquely identify an
-        entity bean.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-name"
-                   type="javaee:ejb-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="relationshipsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The relationshipsType describes the relationships in
-        which entity beans with container-managed persistence
-        participate. The relationshipsType contains an optional
-        description; and a list of ejb-relation elements, which
-        specify the container managed relationships.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-relation"
-                   type="javaee:ejb-relationType"
-                   maxOccurs="unbounded">
-        <xsd:unique name="role-name-uniqueness">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The ejb-relationship-role-name contains the name of a
-              relationship role. The name must be unique within 
-              a relationship, but can be reused in different
-              relationships.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath=".//javaee:ejb-relationship-role-name"/>
-          <xsd:field xpath="."/>
-        </xsd:unique>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="result-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The result-type-mappingType is used in the query element to
-        specify whether an abstract schema type returned by a query
-        for a select method is to be mapped to an EJBLocalObject or
-        EJBObject type.
-        
-        The value must be one of the following:
-        
-        Local
-        Remote
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Local"/>
-        <xsd:enumeration value="Remote"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-identityType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The security-identityType specifies whether the caller's
-        security identity is to be used for the execution of the
-        methods of the enterprise bean or whether a specific run-as
-        identity is to be used. It contains an optional description
-        and a specification of the security identity to be used.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:choice>
-        <xsd:element name="use-caller-identity"
-                     type="javaee:emptyType">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The use-caller-identity element specifies that
-              the caller's security identity be used as the
-              security identity for the execution of the
-              enterprise bean's methods.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="run-as"
-                     type="javaee:run-asType"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The session-beanType declares an session bean. The
-        declaration consists of:
-        
-        - an optional description
-        - an optional display name
-        - an optional icon element that contains a small and a large 
-        icon file name
-        - a name assigned to the enterprise bean
-        in the deployment description
-        - an optional mapped-name element that can be used to provide
-        vendor-specific deployment information such as the physical
-        jndi-name of the session bean's remote home/business interface. 
-        This element is not required to be supported by all 
-        implementations. Any use of this element is non-portable.
-        - the names of all the remote or local business interfaces, 
-        if any
-        - the names of the session bean's remote home and
-        remote interfaces, if any
-        - the names of the session bean's local home and
-        local interfaces, if any
-        - an optional declaration that this bean exposes a
-        no-interface view
-        - the name of the session bean's web service endpoint
-        interface, if any
-        - the session bean's implementation class
-        - the session bean's state management type
-        - an optional declaration of a stateful session bean's timeout value
-        - an optional declaration of the session bean's timeout method for
-        handling programmatically created timers
-        - an optional declaration of timers to be automatically created at
-        deployment time
-        - an optional declaration that a Singleton bean has eager
-        initialization
-        - an optional declaration of a Singleton/Stateful bean's concurrency 
-        management type
-        - an optional declaration of the method locking metadata
-        for a Singleton with container managed concurrency
-        - an optional declaration of the other Singleton beans in the
-        application that must be initialized before this bean
-        - an optional declaration of the session bean's asynchronous 
-        methods
-        - the optional session bean's transaction management type. 
-        If it is not present, it is defaulted to Container.
-        - an optional declaration of a stateful session bean's 
-        afterBegin, beforeCompletion, and/or afterCompletion methods
-        - an optional list of the session bean class and/or
-        superclass around-invoke methods.
-        - an optional list of the session bean class and/or
-        superclass around-timeout methods.
-        - an optional declaration of the bean's 
-        environment entries
-        - an optional declaration of the bean's EJB references
-        - an optional declaration of the bean's local 
-        EJB references
-        - an optional declaration of the bean's web 
-        service references
-        - an optional declaration of the security role 
-        references
-        - an optional declaration of the security identity 
-        to be used for the execution of the bean's methods
-        - an optional declaration of the bean's resource 
-        manager connection factory references
-        - an optional declaration of the bean's resource 
-        environment references.
-        - an optional declaration of the bean's message 
-        destination references
-        
-        The elements that are optional are "optional" in the sense
-        that they are omitted when if lists represented by them are
-        empty.
-        
-        The service-endpoint element may only be specified if the
-        bean is a stateless session bean.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="ejb-name"
-                   type="javaee:ejb-nameType"/>
-      <xsd:element name="mapped-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0"/>
-      <xsd:element name="home"
-                   type="javaee:homeType"
-                   minOccurs="0"/>
-      <xsd:element name="remote"
-                   type="javaee:remoteType"
-                   minOccurs="0"/>
-      <xsd:element name="local-home"
-                   type="javaee:local-homeType"
-                   minOccurs="0"/>
-      <xsd:element name="local"
-                   type="javaee:localType"
-                   minOccurs="0"/>
-      <xsd:element name="business-local"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="business-remote"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="local-bean"
-                   type="javaee:emptyType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The local-bean element declares that this
-            session bean exposes a no-interface Local client view.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-endpoint"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The service-endpoint element contains the
-            fully-qualified name of the enterprise bean's web
-            service endpoint interface. The service-endpoint
-            element may only be specified for a stateless
-            session bean. The specified interface must be a
-            valid JAX-RPC service endpoint interface.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="ejb-class"
-                   type="javaee:ejb-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The ejb-class element specifies the fully qualified name
-            of the bean class for this ejb.  It is required unless
-            there is a component-defining annotation for the same
-            ejb-name.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="session-type"
-                   type="javaee:session-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="stateful-timeout"
-                   type="javaee:stateful-timeoutType"
-                   minOccurs="0"/>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The timeout-method element specifies the method that
-            will receive callbacks for programmatically
-            created timers.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="timer"
-                   type="javaee:timerType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="init-on-startup"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The init-on-startup element specifies that a Singleton
-            bean has eager initialization.
-            This element can only be specified for singleton session
-            beans.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="concurrency-management-type"
-                   type="javaee:concurrency-management-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="concurrent-method"
-                   type="javaee:concurrent-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="depends-on"
-                   type="javaee:depends-onType"
-                   minOccurs="0"/>
-      <xsd:element name="init-method"
-                   type="javaee:init-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The init-method element specifies the mappings for
-            EJB 2.x style create methods for an EJB 3.x bean.
-            This element can only be specified for stateful 
-            session beans. 
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="remove-method"
-                   type="javaee:remove-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The remove-method element specifies the mappings for
-            EJB 2.x style remove methods for an EJB 3.x bean.
-            This element can only be specified for stateful 
-            session beans. 
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="async-method"
-                   type="javaee:async-methodType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="transaction-type"
-                   type="javaee:transaction-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="after-begin-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="before-completion-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="after-completion-method"
-                   type="javaee:named-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="around-invoke"
-                   type="javaee:around-invokeType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="around-timeout"
-                   type="javaee:around-timeoutType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="post-activate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-passivate"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="security-role-ref"
-                   type="javaee:security-role-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="security-identity"
-                   type="javaee:security-identityType"
-                   minOccurs="0">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The session-typeType describes whether the session bean is a
-        singleton, stateful or stateless session. It is used by
-        session-type elements.
-        
-        The value must be one of the three following:
-        
-        Singleton
-        Stateful
-        Stateless
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Singleton"/>
-        <xsd:enumeration value="Stateful"/>
-        <xsd:enumeration value="Stateless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="stateful-timeoutType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The stateful-timeoutType represents the amount of time
-        a stateful session bean can be idle(not receive any client
-        invocations) before it is eligible for removal by the container.
-        
-        A timeout value of 0 means the bean is immediately eligible for removal.
-        
-        A timeout value of -1 means the bean will never be removed due to timeout.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="timeout"
-                   type="javaee:xsdIntegerType"/>
-      <xsd:element name="unit"
-                   type="javaee:time-unit-typeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="time-unit-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The time-unit-typeType represents a time duration at a given
-        unit of granularity.  
-        
-        The time unit type must be one of the following :
-        
-        Days
-        Hours
-        Minutes
-        Seconds
-        Milliseconds
-        Microseconds
-        Nanoseconds
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Days"/>
-        <xsd:enumeration value="Hours"/>
-        <xsd:enumeration value="Minutes"/>
-        <xsd:enumeration value="Seconds"/>
-        <xsd:enumeration value="Milliseconds"/>
-        <xsd:enumeration value="Microseconds"/>
-        <xsd:enumeration value="Nanoseconds"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="timer-scheduleType">
-    <xsd:sequence>
-      <xsd:element name="second"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:element name="minute"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:element name="hour"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:element name="day-of-month"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:element name="month"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:element name="day-of-week"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:element name="year"
-                   type="javaee:string"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="timerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The timerType specifies an enterprise bean timer.  Each
-        timer is automatically created by the container upon
-        deployment.  Timer callbacks occur based on the 
-        schedule attributes.  All callbacks are made to the
-        timeout-method associated with the timer.  
-        
-        A timer can have an optional start and/or end date. If
-        a start date is specified, it takes precedence over the
-        associated timer schedule such that any matching
-        expirations prior to the start time will not occur.
-        Likewise, no matching expirations will occur after any
-        end date.   Start/End dates are specified using the
-        XML Schema dateTime type, which follows the ISO-8601
-        standard for date(and optional time-within-the-day) 
-        representation.
-        
-        An optional flag can be used to control whether
-        this timer has persistent(true) delivery semantics or
-        non-persistent(false) delivery semantics.  If not specified,
-        the value defaults to persistent(true).
-        
-        A time zone can optionally be associated with a timer.
-        If specified, the timer's schedule is evaluated in the context
-        of that time zone, regardless of the default time zone in which
-        the container is executing.   Time zones are specified as an
-        ID string.  The set of required time zone IDs is defined by
-        the Zone Name(TZ) column of the public domain zoneinfo database.
-        
-        An optional info string can be assigned to the timer and 
-        retrieved at runtime through the Timer.getInfo() method.
-        
-        The timerType can only be specified on stateless session
-        beans, singleton session beans, and message-driven beans.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="schedule"
-                   type="javaee:timer-scheduleType"/>
-      <xsd:element name="start"
-                   type="xsd:dateTime"
-                   minOccurs="0"/>
-      <xsd:element name="end"
-                   type="xsd:dateTime"
-                   minOccurs="0"/>
-      <xsd:element name="timeout-method"
-                   type="javaee:named-methodType"/>
-      <xsd:element name="persistent"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-      <xsd:element name="timezone"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:element name="info"
-                   type="javaee:string"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="trans-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The trans-attributeType specifies how the container must
-        manage the transaction boundaries when delegating a method 
-        invocation to an enterprise bean's business method. 
-        
-        The value must be one of the following: 
-        
-        NotSupported 
-        Supports 
-        Required  
-        RequiresNew 
-        Mandatory 
-        Never 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="NotSupported"/>
-        <xsd:enumeration value="Supports"/>
-        <xsd:enumeration value="Required"/>
-        <xsd:enumeration value="RequiresNew"/>
-        <xsd:enumeration value="Mandatory"/>
-        <xsd:enumeration value="Never"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transaction-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The transaction-typeType specifies an enterprise bean's
-        transaction management type.
-        
-        The transaction-type must be one of the two following:
-        
-        Bean
-        Container
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Bean"/>
-        <xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_1_4.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_1_4.xsd
deleted file mode 100644
index 9b2334c..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_1_4.xsd
+++ /dev/null
@@ -1,1608 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="1.4">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_1_4.xsds	1.43 03/09/16
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following definitions that appear in the common
-shareable schema(s) of J2EE deployment descriptors should be
-interpreted with respect to the context they are included:
-
-Deployment Component may indicate one of the following:
-    j2ee application;
-    application client;
-    web application;
-    enterprise bean;
-    resource adapter;
-
-Deployment File may indicate one of the following:
-    ear file;
-    war file;
-    jar file;
-    rar file;
-
-</xsd:documentation>
-</xsd:annotation>
-
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-	      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-  <xsd:include schemaLocation=
-	"http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:group name="descriptionGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained description related
-	elements consistent across J2EE deployment descriptors.
-
-	All elements may occur multiple times with different languages,
-	to support localization of the content.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="display-name"
-		   type="j2ee:display-nameType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="icon"
-		   type="j2ee:iconType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The description type is used by a description element to
-	provide text describing the parent element.  The elements
-	that use this type should include any information that the
-	Deployment Component's Deployment File file producer wants
-	to provide to the consumer of the Deployment Component's
-	Deployment File (i.e., to the Deployer). Typically, the
-	tools used by such a Deployment File consumer will display
-	the description when processing the parent element that
-	contains the description.
-
-	The lang attribute defines the language that the
-	description is provided in. The default value is "en" (English).
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="j2ee:xsdStringType">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="dewey-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines a dewey decimal which is used
-	to describe versions of documents.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:decimal">
-      <xsd:whiteSpace value="collapse"/>
-    </xsd:restriction>
-
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="display-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The display-name type contains a short name that is intended
-	  to be displayed by tools. It is used by display-name
-	  elements.  The display name need not be unique.
-
-	  Example:
-
-	  ...
-	     <display-name xml:lang="en">Employee Self Service</display-name>
-
-	  The value of the xml:lang attribute is "en" (English) by default.
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="j2ee:string">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-linkType is used by ejb-link
-	  elements in the ejb-ref or ejb-local-ref elements to specify
-	  that an EJB reference is linked to enterprise bean.
-
-	  The value of the ejb-link element must be the ejb-name of an
-	  enterprise bean in the same ejb-jar file or in another ejb-jar
-	  file in the same J2EE application unit.
-
-	  Alternatively, the name in the ejb-link element may be
-	  composed of a path name specifying the ejb-jar containing the
-	  referenced enterprise bean with the ejb-name of the target
-	  bean appended and separated from the path name by "#".  The
-	  path name is relative to the Deployment File containing
-	  Deployment Component that is referencing the enterprise
-	  bean.  This allows multiple enterprise beans with the same
-	  ejb-name to be uniquely identified.
-
-	  Examples:
-
-	      <ejb-link>EmployeeRecord</ejb-link>
-
-	      <ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-local-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-local-refType is used by ejb-local-ref elements for
-	the declaration of a reference to an enterprise bean's local
-	home. The declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of the Deployment
-	      Component that's referencing the enterprise bean
-	    - the expected type of the referenced enterprise bean
-	    - the expected local home and local interfaces of the
-	      referenced enterprise bean
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="j2ee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="j2ee:ejb-ref-typeType"/>
-      <xsd:element name="local-home"
-		   type="j2ee:local-homeType"/>
-      <xsd:element name="local"
-		   type="j2ee:localType"/>
-      <xsd:element name="ejb-link"
-		   type="j2ee:ejb-linkType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the
-	  Deployment Component's environment and is relative to the
-	  java:comp/env context.  The name must be unique within the
-	  Deployment Component.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	  Example:
-
-	  <ejb-ref-name>ejb/Payroll</ejb-ref-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:jndi-nameType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-ref-typeType contains the expected type of the
-	referenced enterprise bean.
-
-	The ejb-ref-type designates a value
-	that must be one of the following:
-
-	    Entity
-	    Session
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Entity"/>
-	<xsd:enumeration value="Session"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-refType is used by ejb-ref elements for the
-	declaration of a reference to an enterprise bean's home. The
-	declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of
-	      the Deployment Component that's referencing the enterprise
-	      bean
-	    - the expected type of the referenced enterprise bean
-	    - the expected home and remote interfaces of the referenced
-	      enterprise bean
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="j2ee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="j2ee:ejb-ref-typeType"/>
-
-      <xsd:element name="home"
-		   type="j2ee:homeType"/>
-      <xsd:element name="remote"
-		   type="j2ee:remoteType"/>
-      <xsd:element name="ejb-link"
-		   type="j2ee:ejb-linkType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="emptyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is used to designate an empty
-	element when used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entry-type-valuesType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  This type contains the fully-qualified Java type of the
-	  environment entry value that is expected by the
-	  application's code.
-
-	  The following are the legal values of env-entry-type-valuesType:
-
-	      java.lang.Boolean
-	      java.lang.Byte
-	      java.lang.Character
-	      java.lang.String
-	      java.lang.Short
-	      java.lang.Integer
-	      java.lang.Long
-	      java.lang.Float
-	      java.lang.Double
-
-	  Example:
-
-	  <env-entry-type>java.lang.Boolean</env-entry-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="java.lang.Boolean"/>
-	<xsd:enumeration value="java.lang.Byte"/>
-	<xsd:enumeration value="java.lang.Character"/>
-	<xsd:enumeration value="java.lang.String"/>
-	<xsd:enumeration value="java.lang.Short"/>
-	<xsd:enumeration value="java.lang.Integer"/>
-	<xsd:enumeration value="java.lang.Long"/>
-	<xsd:enumeration value="java.lang.Float"/>
-	<xsd:enumeration value="java.lang.Double"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The env-entryType is used to declare an application's
-	environment entry. The declaration consists of an optional
-	description, the name of the environment entry, and an
-	optional value.  If a value is not specified, one must be
-	supplied during deployment.
-
-	It is used by env-entry elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="env-entry-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-name element contains the name of a
-	      Deployment Component's environment entry.  The name
-	      is a JNDI name relative to the java:comp/env
-	      context.  The name must be unique within a
-	      Deployment Component. The uniqueness
-	      constraints must be defined within the declared
-	      context.
-
-	      Example:
-
-	      <env-entry-name>minAmount</env-entry-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="env-entry-type"
-		   type="j2ee:env-entry-type-valuesType"/>
-
-      <xsd:element name="env-entry-value"
-		   type="j2ee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-value designates the value of a
-	      Deployment Component's environment entry. The value
-	      must be a String that is valid for the
-	      constructor of the specified type that takes a
-	      single String parameter, or for java.lang.Character,
-	      a single character.
-
-	      Example:
-
-	      <env-entry-value>100.00</env-entry-value>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="fully-qualified-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate the name of a
-	Java class or interface.  The name is in the form of a
-	"binary name", as defined in the JLS.  This is the form
-	of name used in Class.forName().  Tools that need the
-	canonical name (the name used in source code) will need
-	to convert this binary name to the canonical name.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="generic-booleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines four different values which can designate
-	boolean values. This includes values yes and no which are
-	not designated by xsd:boolean
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="true"/>
-	<xsd:enumeration value="false"/>
-	<xsd:enumeration value="yes"/>
-	<xsd:enumeration value="no"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The homeType defines the fully-qualified name of
-	  an enterprise bean's home interface.
-
-	  Example:
-
-	      <home>com.aardvark.payroll.PayrollHome</home>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="iconType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The icon type contains small-icon and large-icon elements
-	that specify the file names for small and large GIF or
-	JPEG icon images used to represent the parent element in a
-	GUI tool.
-
-	The xml:lang attribute defines the language that the
-	icon file names are provided in. Its value is "en" (English)
-	by default.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="small-icon" type="j2ee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The small-icon element contains the name of a file
-	      containing a small (16 x 16) icon image. The file
-	      name is a relative path within the Deployment
-	      Component's Deployment File.
-
-	      The image may be either in the JPEG or GIF format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <small-icon>employee-service-icon16x16.jpg</small-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="large-icon" type="j2ee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The large-icon element contains the name of a file
-	      containing a large
-	      (32 x 32) icon image. The file name is a relative
-	      path within the Deployment Component's Deployment
-	      File.
-
-	      The image may be either in the JPEG or GIF format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <large-icon>employee-service-icon32x32.jpg</large-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-
-    <xsd:attribute ref="xml:lang"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-identifierType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The java-identifierType defines a Java identifier.
-	The users of this type should further verify that
-	the content does not contain Java reserved keywords.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a generic type that designates a Java primitive
-	type or a fully qualified name of a Java interface/type,
-	or an array of such types.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:pattern value="[^\p{Z}]*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jndi-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jndi-nameType type designates a JNDI name in the
-	Deployment Component's environment and is relative to the
-	java:comp/env context.  A JNDI name must be unique within the
-	Deployment Component.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="jndiEnvironmentRefsGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained JNDI environment
-	reference elements consistent across J2EE deployment descriptors.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="env-entry"
-		   type="j2ee:env-entryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-		   type="j2ee:ejb-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-local-ref"
-		   type="j2ee:ejb-local-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:group ref="j2ee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-		   type="j2ee:resource-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-		   type="j2ee:resource-env-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-		   type="j2ee:message-destination-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="listenerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The listenerType indicates the deployment properties for a web
-	application listener bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="listener-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The listener-class element declares a class in the
-	    application must be registered as a web
-	    application listener bean. The value is the fully
-	    qualified classname of the listener class.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="local-homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The local-homeType defines the fully-qualified
-	name of an enterprise bean's local home interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="localType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The localType defines the fully-qualified name of an
-	enterprise bean's local interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-linkType is used to link a message
-	destination reference or message-driven bean to a message
-	destination.
-
-	The Assembler sets the value to reflect the flow of messages
-	between producers and consumers in the application.
-
-	The value must be the message-destination-name of a message
-	destination in the same Deployment File or in another
-	Deployment File in the same J2EE application unit.
-
-	Alternatively, the value may be composed of a path name
-	specifying a Deployment File containing the referenced
-	message destination with the message-destination-name of the
-	destination appended and separated from the path name by
-	"#". The path name is relative to the Deployment File
-	containing Deployment Component that is referencing the
-	message destination.  This allows multiple message
-	destinations with the same name to be uniquely identified.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-ref element contains a declaration
-	  of Deployment Component's reference to a message destination
-	  associated with a resource in Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the message destination reference name
-		  - the message destination type
-		  - a specification as to whether the
-		    destination is used for
-		    consuming or producing messages, or both
-		  - a link to the message destination
-
-	  Examples:
-
-	  <message-destination-ref>
-		  <message-destination-ref-name>jms/StockQueue
-		  </message-destination-ref-name>
-		  <message-destination-type>javax.jms.Queue
-		  </message-destination-type>
-		  <message-destination-usage>Consumes
-		  </message-destination-usage>
-		  <message-destination-link>CorporateStocks
-		  </message-destination-link>
-	  </message-destination-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-ref-name element specifies
-	    the name of a message destination reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context and must be
-	    unique within an ejb-jar (for enterprise beans) or a
-	    Deployment File (for others).
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination-type"
-		   type="j2ee:message-destination-typeType"/>
-      <xsd:element name="message-destination-usage"
-		   type="j2ee:message-destination-usageType"/>
-      <xsd:element name="message-destination-link"
-		   type="j2ee:message-destination-linkType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-typeType specifies the type of
-	  the destination. The type is specified by the Java interface
-	  expected to be implemented by the destination.
-
-	  Example:
-
-	    <message-destination-type>javax.jms.Queue
-	    </message-destination-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-usageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-usageType specifies the use of the
-	message destination indicated by the reference.  The value
-	indicates whether messages are consumed from the message
-	destination, produced for the destination, or both.  The
-	Assembler makes use of this information in linking producers
-	of a destination with its consumers.
-
-	The value of the message-destination-usage element must be
-	one of the following:
-	    Consumes
-	    Produces
-	    ConsumesProduces
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Consumes"/>
-	<xsd:enumeration value="Produces"/>
-	<xsd:enumeration value="ConsumesProduces"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destinationType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destinationType specifies a message
-	  destination. The logical destination described by this
-	  element is mapped to a physical destination by the Deployer.
-
-	  The message destination element contains:
-
-		  - an optional description
-		  - an optional display-name
-		  - an optional icon
-		  - a message destination name which must be unique
-		    among message destination names within the same
-		    Deployment File.
-
-	  Example:
-
-	  <message-destination>
-		  <message-destination-name>CorporateStocks
-		  </message-destination-name>
-	  </message-destination>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="message-destination-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-name element specifies a
-	    name for a message destination.  This name must be
-	    unique among the names of message destinations
-	    within the Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="param-valueType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is a general type that can be used to declare
-	parameter/value lists.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="param-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-name element contains the name of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="param-value"
-		   type="j2ee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-value element contains the value of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate either a relative
-	path or an absolute path starting with a "/".
-
-	In elements that specify a pathname to a file within the
-	same Deployment File, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the Deployment File's namespace.  Absolute filenames (i.e.,
-	those starting with "/") also specify names in the root of
-	the Deployment File's namespace.  In general, relative names
-	are preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remoteType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The remote element contains the fully-qualified name
-	  of the enterprise bean's remote interface.
-
-	  Example:
-
-	      <remote>com.wombat.empl.EmployeeService</remote>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-authType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-authType specifies whether the Deployment Component
-	code signs on programmatically to the resource manager, or
-	whether the Container will sign on to the resource manager
-	on behalf of the Deployment Component. In the latter case,
-	the Container uses information that is supplied by the
-	Deployer.
-
-	The value must be one of the two following:
-
-	    Application
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Application"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-sharing-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-sharing-scope type specifies whether connections
-	obtained through the given resource manager connection
-	factory reference can be shared. The value, if specified,
-	must be one of the two following:
-
-	    Shareable
-	    Unshareable
-
-	The default value is Shareable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="Shareable"/>
-	<xsd:enumeration value="Unshareable"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-env-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-env-refType is used to define
-	  resource-env-type elements.  It contains a declaration of a
-	  Deployment Component's reference to an administered object
-	  associated with a resource in the Deployment Component's
-	  environment.  It consists of an optional description, the
-	  resource environment reference name, and an indication of
-	  the resource environment reference type expected by the
-	  Deployment Component code.
-
-	  Example:
-
-	  <resource-env-ref>
-	      <resource-env-ref-name>jms/StockQueue
-	      </resource-env-ref-name>
-	      <resource-env-ref-type>javax.jms.Queue
-	      </resource-env-ref-type>
-	  </resource-env-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-name element specifies the name
-	    of a resource environment reference; its value is
-	    the environment entry name used in
-	    the Deployment Component code.  The name is a JNDI
-	    name relative to the java:comp/env context and must
-	    be unique within a Deployment Component.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="resource-env-ref-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-type element specifies the type
-	    of a resource environment reference.  It is the
-	    fully qualified name of a Java language class or
-	    interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-refType contains a declaration of a
-	  Deployment Component's reference to an external resource. It
-	  consists of an optional description, the resource manager
-	  connection factory reference name, the indication of the
-	  resource manager connection factory type expected by the
-	  Deployment Component code, the type of authentication
-	  (Application or Container), and an optional specification of
-	  the shareability of connections obtained from the resource
-	  (Shareable or Unshareable).
-
-	  Example:
-
-	  <resource-ref>
-	      <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-	      <res-type>javax.sql.DataSource</res-type>
-	      <res-auth>Container</res-auth>
-	      <res-sharing-scope>Shareable</res-sharing-scope>
-	  </resource-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="res-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-ref-name element specifies the name of a
-	    resource manager connection factory reference.
-	    The name is a JNDI name relative to the
-	    java:comp/env context.
-	    The name must be unique within a Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-type element specifies the type of the data
-	    source. The type is specified by the fully qualified
-	    Java language class or interface
-	    expected to be implemented by the data source.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-auth"
-		   type="j2ee:res-authType"/>
-
-      <xsd:element name="res-sharing-scope"
-		   type="j2ee:res-sharing-scopeType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="role-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The role-nameType designates the name of a security role.
-
-	The name must conform to the lexical rules for a token.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="run-asType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The run-asType specifies the run-as identity to be
-	used for the execution of a component. It contains an
-	optional description, and the name of a security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="j2ee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-role-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-role-refType contains the declaration of a
-	security role reference in a component's or a
-	Deployment Component's code. The declaration consists of an
-	optional description, the security role name used in the
-	code, and an optional link to a security role. If the
-	security role is not specified, the Deployer must choose an
-	appropriate security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="j2ee:role-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The value of the role-name element must be the String used
-	    as the parameter to the
-	    EJBContext.isCallerInRole(String roleName) method or the
-	    HttpServletRequest.isUserInRole(String role) method.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="role-link"
-		   type="j2ee:role-nameType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The role-link element is a reference to a defined
-	    security role. The role-link element must contain
-	    the name of one of the security roles defined in the
-	    security-role elements.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The security-roleType contains the definition of a security
-	  role. The definition consists of an optional description of the
-	  security role, and the security role name.
-
-	  Example:
-
-	      <security-role>
-	      <description>
-		  This role includes all employees who are authorized
-		  to access the employee service application.
-	      </description>
-	      <role-name>employee</role-name>
-	      </security-role>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="j2ee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="string">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a special string datatype that is defined by J2EE as
-	a base type for defining collapsed strings. When schemas
-	require trailing/leading space elimination as well as
-	collapsing the existing whitespace, this base type may be
-	used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="true-falseType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This simple type designates a boolean with only two
-	permissible values
-
-	- true
-	- false
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdBooleanType">
-	<xsd:pattern value="(true|false)"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="url-patternType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The url-patternType contains the url pattern of the mapping.
-	It must follow the rules specified in Section 11.2 of the
-	Servlet API Specification. This pattern is assumed to be in
-	URL-decoded form and must not contain CR(#xD) or LF(#xA).
-	If it contains those characters, the container must inform
-	the developer with a descriptive error message.
-	The container must preserve all characters including whitespaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdAnyURIType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:anyURI.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:anyURI">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdBooleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:boolean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:integer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:integer">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNMTOKENType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:NMTOKEN.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:NMTOKEN">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNonNegativeIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:nonNegativeInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:nonNegativeInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdPositiveIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:positiveInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:positiveInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdQNameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:QName.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:QName">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:string.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd
deleted file mode 100644
index 852191c..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd
+++ /dev/null
@@ -1,886 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_jaxrpc_mapping_1_1.xsds	1.11 09/03/03
-
-      Based on j2ee_jaxrpc_mapping_1_0.dtd, Last updated: 09/19/2002 10:26
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	The element describes the Java mapping to a known WSDL document.
-
-	It contains the mapping between package names and XML namespaces,
-	WSDL root types and Java artifacts, and the set of mappings for
-	services.
-
-	All java-wsdl-mapping deployment descriptors must indicate the
-	schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by using the
-	version element as shown below:
-
-	    <java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-		http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
-	      version="1.1">
-	      ...
-	    </java-wsdl-mapping>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for J2EE
-	namespace with the following location:
-
-	http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="java-wsdl-mapping" type="j2ee:java-wsdl-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is the root of the java-wsdl-mapping deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="constructor-parameter-orderType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The constructor-parameter-order element defines the order
-	that complexType element values are applied to a Java
-	exception constructor. Element names are specified for each
-	parameter of the constructor, including element names of
-	inherited types if necessary.
-
-	Used in: exception-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="element-name"
-		   type="j2ee:string"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element-name element defines the name of a complexType
-	    element name attribute value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="exception-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The exception-mapping element defines the mapping between the
-	service specific exception types and wsdl faults and
-	SOAP headerfaults.
-
-	This element should be interpreted with respect to the
-	mapping between a method and an operation which provides the
-	mapping context.
-
-	Used in: service-endpoint-method-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="exception-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The exception-type element defines Java type of the exception.
-	    It may be a service specific exception.
-
-	    It must be a fully qualified class name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-message"
-		   type="j2ee:wsdl-messageType"/>
-      <xsd:element name="wsdl-message-part-name"
-		   type="j2ee:wsdl-message-part-nameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-            The wsdl-message-part-name element is required only
-            when the message referenced by the wsdl-message element
-            has more than one part.
-
-            This only occurs when multiple headerfaults use the
-            same message.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="constructor-parameter-order"
-		   type="j2ee:constructor-parameter-orderType"
-		   minOccurs="0" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-wsdl-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The element describes the Java mapping to a known WSDL document.
-
-	It contains the mapping between package names and XML namespaces,
-	WSDL root types and Java artifacts, and the set of mappings for
-	services.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="package-mapping"
-		   type="j2ee:package-mappingType"
-		   minOccurs="1" maxOccurs="unbounded"/>
-      <xsd:element name="java-xml-type-mapping"
-		   type="j2ee:java-xml-type-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="exception-mapping"
-		   type="j2ee:exception-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:sequence minOccurs="0" maxOccurs="unbounded">
-        <xsd:element name="service-interface-mapping"
-		     type="j2ee:service-interface-mappingType"
-		     minOccurs="0" maxOccurs="1"/>
-        <xsd:element name="service-endpoint-interface-mapping"
-		     type="j2ee:service-endpoint-interface-mappingType"
-		     minOccurs="1" maxOccurs="unbounded"/>
-      </xsd:sequence>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="1.1"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.1.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-xml-type-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The java-xml-type-mapping element contains a java-type that is the
-	fully qualified name of the Java class, primitive type, or array
-	type, QName of the XML root type or anonymous type, the WSDL type
-	scope the QName applies to and the set of variable mappings for
-	each public variable within the Java class.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="java-type"
-		   type="j2ee:java-typeType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-type element is the fully qualified class name of
-	    a Java class, primitive, or array type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <choice>
-        <xsd:element name="root-type-qname"
-		   type="j2ee:xsdQNameType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The root-type-qname identifies the WSDL QName of an XML type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="anonymous-type-qname"
-		   type="j2ee:string">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The anonymous-type-qname identifies the WSDL QName of an
-	      anonymous XML type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-      </choice>
-      <xsd:element name="qname-scope"
-		   type="j2ee:qname-scopeType"/>
-      <xsd:element name="variable-mapping"
-		   type="j2ee:variable-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="method-param-parts-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The method-param-parts-mapping element defines the mapping between a
-	Java method parameters and a wsdl-message.
-
-	Used in: service-endpoint-method-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="param-position"
-		   type="j2ee:xsdNonNegativeIntegerType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-position element defines the position of a
-	    parameter within a Java method.  It must be an integer
-	    starting from 0.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="param-type"
-		   type="j2ee:java-typeType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-type element defines the fully qualified
-	    class name of a Java class, primitive, or array type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-message-mapping"
-		   type="j2ee:wsdl-message-mappingType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="package-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The package-mapping indicates the mapping between java-package-name
-	and XML namespace in the WSDL document.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="package-type"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The package-type indicates the Java package name. It must be a fully
-	    qualified package name, even though the XML schema type is
-	    fully-qualified-classType.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="namespaceURI"
-		   type="j2ee:xsdAnyURIType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The namespaceURI element indicates a URI.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="parameter-modeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The parameter-mode element defines the mode of the parameter.
-	It can have only three values, IN, OUT, INOUT.
-
-	Used in: java-xml-type-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="IN"/>
-	<xsd:enumeration value="OUT"/>
-	<xsd:enumeration value="INOUT"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-mapping defines the mapping of the WSDL port name attribute
-	to the Java name used to generate the Generated Service Interface
-	method get{java-name}.
-
-	Used in: service-interface-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="port-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-mapping defines the mapping of the WSDL port name
-	    attribute to the Java name used to generate the Generated
-	    Service Interface method get{java-name}.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="java-port-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-port-name element is the string to use as the port
-	    name in Java.  It is used in generating the Generated
-	    Service Interface method get{java-port-name}.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="qname-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The qname-scope elements scopes the reference of a QName to the WSDL
-	element type it applies to. The value of qname-scope may be
-	simpleType, complexType, or element.
-
-	Used in: java-xml-type-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="simpleType"/>
-	<xsd:enumeration value="complexType"/>
-	<xsd:enumeration value="element"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-endpoint-interface-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-endpoint-interface-mapping defines a tuple
-	to specify Service Endpoint Interfaces to
-	WSDL port types and WSDL bindings.
-
-	An interface may be mapped to a port-type and binding multiple
-	times. This happens rarely.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="service-endpoint-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint-interface element defines the Java
-	    type for the endpoint interface. The name must be a fully
-	    qualified class name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-port-type"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-port-type element defines the wsdl port type
-	    by a QNAME which uniquely identifies  the port type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-binding"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-binding element defines the wsdl binding
-	    by a QNAME which uniquely identifies  the binding.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-endpoint-method-mapping"
-		   type="j2ee:service-endpoint-method-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-endpoint-method-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-endpoint-method-mapping element defines the mapping of
-	Java methods to operations (which are not uniquely qualified by
-	qnames).
-
-	The wsdl-operation should be interpreted with respect to the
-	portType and binding in which this definition is embedded within.
-	See the definitions for service-endpoint-interface-mapping and
-	service-interface-mapping to acquire the proper context.  The
-	wrapped-element indicator should only be specified when a WSDL
-	message wraps an element type.  The wsdl-return-value-mapping is
-	not specified for one-way operations.
-
-	Used in: service-endpoint-interface-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="java-method-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-method-name element defines the name of a Java method
-	    within an interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-operation"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-operation element defines an operation within a WSDL
-	    document.  It must be interpreted with respect to a port type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wrapped-element"
-		   type="j2ee:emptyType"
-		   minOccurs="0"
-		   maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wrapped-element element is defined when a WSDL message
-	    with a single part is used to wrap an element type and the
-	    element's name matches the operation name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="method-param-parts-mapping"
-		   type="j2ee:method-param-parts-mappingType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="wsdl-return-value-mapping"
-		   type="j2ee:wsdl-return-value-mappingType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-interface-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-interface-mapping element defines how a Java type for
-	the service interface maps to a WSDL service.
-
-	Used in: java-wsdl-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="service-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-interface element defines the Java type for the service.
-	    For static services, it is javax.xml.rpc.Service interface. For
-	    generated service, it would be the generated interface name.
-
-	    The name must be a fully qualified class name.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-service-name"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-service-name element defines the wsdl service name
-	    by a QNAME which uniquely identifies  the service.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-mapping"
-		   type="j2ee:port-mappingType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="variable-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The variable-mapping element defines the correlation between a
-	Java class data member or JavaBeans property to an XML element
-	or attribute name of an XML root type. If the data-member
-	element is present, the Java variable name is a public data
-	member.  If data-member	is not present, the Java variable name
-	is a JavaBeans property.
-
-	Used in: java-xml-type-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="java-variable-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The java-variable-name defines the name of a public data member or
-	    JavaBeans property within a Java class.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="data-member"
-		   type="j2ee:emptyType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The data-member element is a boolean indicator that a Java
-	    variable is a public data member and not a JavaBeans property.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:choice>
-        <xsd:element name="xml-attribute-name"
-		     type="j2ee:string">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The xml-attribute-name element defines name attribute value
-	      of a WSDL attribute element within a root type.  The value
-	      of an xml-attribute-name element must match the value of
-	      the ref attribute if mapping an attribute reference.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="xml-element-name"
-		     type="j2ee:string">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The xml-element-name element defines name attribute value of
-	      a WSDL element within a root type.  The value of an
-	      xml-element-name element must match the value of the ref
-	      attribute if mapping an element reference.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-        </xsd:element>
-        <xsd:element name="xml-wildcard"
-		     type="j2ee:emptyType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The xml-wildcard element associates the variable-mapping with
-	      an xsd:any element within a root type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-message-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The wsdl-message-mapping element defines the mapping to a
-	specific message and its part. Together they define uniquely
-	the mapping for a specific parameter. Parts within a message
-	context are uniquely identified with their names.
-
-	The parameter-mode is defined by the mapping to indicate
-	whether the mapping will be IN, OUT, or INOUT..  The presence
-	of the soap-header element indicates that the parameter is
-	mapped to a soap header only.  When absent, it means that the
-	wsdl-message is mapped to a Java parameter. The soap headers
-	are interpreted in the order they are provided in the mapping.
-
-	Used in: method-param-parts-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="wsdl-message"
-		   type="j2ee:wsdl-messageType"/>
-      <xsd:element name="wsdl-message-part-name"
-		   type="j2ee:wsdl-message-part-nameType"/>
-      <xsd:element name="parameter-mode"
-		   type="j2ee:parameter-modeType"/>
-      <xsd:element name="soap-header"
-		   type="j2ee:emptyType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-header element is a boolean element indicating that
-	    a parameter is mapped to a SOAP header.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-message-part-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Interpretation of the wsdl-message-part-name element depends on
-	whether or not wrapped-element has been defined in the
-	service-endpoint-method-mapping.  If wrapped-element is not
-	specified, wsdl-message-part-name defines a WSDL message part. It
-	should always be interpreted with respect to a wsdl-message
-	element. If wrapped-element is specified, wsdl-message-part-name
-	refers to an element name of the element type.
-
-	Used in: wsdl-message-mapping, wsdl-return-value-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-messageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The wsdl-message element defines a WSDL message by a QNAME.
-
-	Used in: wsdl-message-mapping, wsdl-return-value-mapping,
-	exception-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdQNameType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="wsdl-return-value-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The wsdl-return-value-mapping  element defines the mapping for the
-	method's return value. It defines the mapping to a specific message
-	and its part.  Together they define uniquely the mapping for a
-	specific parameter. Parts within a message context are uniquely
-	identified with their names. The wsdl-message-part-name is not
-	specified if there is no return value or OUT parameters.
-
-	Used in: service-endpoint-method-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="method-return-value"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The method-return-value  element defines a fully qualified
-	    class name or void type for the method's return value
-	    type.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-message"
-		   type="j2ee:wsdl-messageType"/>
-      <xsd:element name="wsdl-message-part-name"
-		   type="j2ee:wsdl-message-part-nameType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_1_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_1_1.xsd
deleted file mode 100644
index 7e2a798..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_1_1.xsd
+++ /dev/null
@@ -1,491 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_web_services_1_1.xsds	1.11 02/11/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the J2EE Application
-	Server and the dependencies they have on container resources and
-	services.  The deployment descriptor must be named
-	"META-INF/webservices.xml" in the web services' jar file.
-
-	Used in: webservices.xml
-
-	All webservices deployment descriptors must indicate the
-	webservices schema by using the J2EE namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by using the version
-	element as shown below:
-
-	    <webservices xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-		http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
-	      version="1.1">
-	      ...
-	    </webservices>
-
-	The instance documents may indicate the published version of the
-	schema using the xsi:schemaLocation attribute for the J2EE
-	namespace with the following location:
-
-	http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="webservices" type="j2ee:webservicesType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the J2EE Application Server
-	and the dependencies they have on container resources and services.
-
-	Used in: webservices.xml
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="webservice-description-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The webservice-description-name identifies the collection of
-	  port-components associated with a WSDL file and JAX-RPC mapping. The
-	  name must be unique within the deployment descriptor.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:webservice-description"/>
-      <xsd:field xpath="j2ee:webservice-description-name"/>
-    </xsd:key>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-componentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component element associates a WSDL port with a web service
-	interface and implementation.  It defines the name of the port as a
-	component, optional description, optional display name, optional iconic
-	representations, WSDL port QName, Service Endpoint Interface, Service
-	Implementation Bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="j2ee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="j2ee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="port-component-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The port-component-name element specifies a port component's
-	      name.  This name is assigned by the module producer to name
-	      the service implementation bean in the module's deployment
-	      descriptor. The name must be unique among the port component
-	      names defined in the same module.
-
-	      Used in: port-component
-
-	      Example:
-		      <port-component-name>EmployeeService
-		      </port-component-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-port"
-		   type="j2ee:xsdQNameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name space and local name part of the WSDL port QName.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-endpoint-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The service-endpoint-interface element contains the
-	      fully-qualified name of the port component's Service Endpoint
-	      Interface.
-
-	      Used in: port-component
-
-	      Example:
-		      <remote>com.wombat.empl.EmployeeService</remote>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-impl-bean"
-		   type="j2ee:service-impl-beanType"/>
-
-      <xsd:element name="handler"
-		   type="j2ee:port-component_handlerType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique within the
-	    module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="j2ee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="j2ee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed by the
-	    handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="soap-role"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that the
-	    Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-impl-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-impl-bean element defines the web service implementation.
-	A service implementation can be an EJB bean class or JAX-RPC web
-	component.  Existing EJB implementations are exposed as a web service
-	using an ejb-link.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="ejb-link"
-		   type="j2ee:ejb-linkType"/>
-      <xsd:element name="servlet-link"
-		   type="j2ee:servlet-linkType"/>
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The servlet-link element is used in the service-impl-bean element
-	  to specify that a Service Implementation Bean is defined as a
-	  JAX-RPC Service Endpoint.
-
-	  The value of the servlet-link element must be the servlet-name of
-	  a JAX-RPC Service Endpoint in the same WAR file.
-
-	  Used in: service-impl-bean
-
-	  Example:
-		  <servlet-link>StockQuoteService</servlet-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservice-descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservice-description element defines a WSDL document file
-	and the set of Port components associated with the WSDL ports
-	defined in the WSDL document.  There may be multiple
-	webservice-descriptions defined within a module.
-
-	All WSDL file ports must have a corresponding port-component element
-	defined.
-
-	Used in: webservices
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="j2ee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="j2ee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="webservice-description-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The webservice-description-name identifies the collection of
-	    port-components associated with a WSDL file and JAX-RPC
-	    mapping. The name must be unique within the deployment descriptor.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-file"
-		   type="j2ee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the name of a WSDL file in the
-	    module.  The file name is a relative path within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="j2ee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-component"
-		   type="j2ee:port-componentType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:handler"/>
-	  <xsd:field xpath="j2ee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservicesType">
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="webservice-description"
-		   type="j2ee:webservice-descriptionType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	      <![CDATA[
-
-		The port-component-name element specifies a port
-		component's name.  This name is assigned by the module
-		producer to name the service implementation bean in the
-		module's deployment descriptor. The name must be unique
-		among the port component names defined in the same module.
-
-		Used in: port-component
-
-		Example:
-			<port-component-name>EmployeeService
-			</port-component-name>
-
-		]]>
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:port-component"/>
-	  <xsd:field xpath="j2ee:port-component-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="1.1"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.1.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_client_1_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_client_1_1.xsd
deleted file mode 100644
index 454a554..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/j2ee_web_services_client_1_1.xsd
+++ /dev/null
@@ -1,345 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)j2ee_web_services_client_1_1.xsds	1.10 02/11/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component-ref element declares a client dependency
-	on the container for resolving a Service Endpoint Interface
-	to a WSDL port. It optionally associates the Service Endpoint
-	Interface with a particular port-component. This is only used
-	by the container for a Service.getPort(Class) method call.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="service-endpoint-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint-interface element defines a fully qualified
-	    Java class that represents the Service Endpoint Interface of a
-	    WSDL port.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-link"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-link element links a port-component-ref
-	    to a specific port-component required to be made available
-	    by a service reference.
-
-	    The value of a port-component-link must be the
-	    port-component-name of a port-component in the same module
-	    or another module in the same application unit. The syntax
-	    for specification follows the syntax defined for ejb-link
-	    in the EJB 2.0 specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="service-refGroup">
-    <xsd:sequence>
-      <xsd:element name="service-ref"
-		   type="j2ee:service-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:key name="service-ref_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="j2ee:handler"/>
-	  <xsd:field xpath="j2ee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-ref element declares a reference to a Web
-	service. It contains optional description, display name and
-	icons, a declaration of the required Service interface,
-	an optional WSDL document location, an optional set
-	of JAX-RPC mappings, an optional QName for the service element,
-	an optional set of Service Endpoint Interfaces to be resolved
-	by the container to a WSDL port, and an optional set of handlers.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="service-ref-name"
-		   type="j2ee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-ref-name element declares logical name that the
-	    components in the module use to look up the Web service. It
-	    is recommended that all service reference names start with
-	    "service/".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-interface"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-interface element declares the fully qualified class
-	    name of the JAX-RPC Service interface the client depends on.
-	    In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	    generated Service Interface class may also be specified.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="wsdl-file"
-		   type="j2ee:xsdAnyURIType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the URI location of a WSDL
-	    file. The location is relative to the root of the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="j2ee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module file.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-qname"
-		   type="j2ee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-qname element declares the specific WSDL service
-	    element that is being refered to.  It is not specified if no
-	    wsdl-file is declared.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-ref"
-		   type="j2ee:port-component-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-ref element declares a client dependency
-	    on the container for resolving a Service Endpoint Interface
-	    to a WSDL port. It optionally associates the Service Endpoint
-	    Interface with a particular port-component. This is only used
-	    by the container for a Service.getPort(Class) method call.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="handler"
-		   type="j2ee:service-ref_handlerType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Declares the handler for a port-component. Handlers can
-	    access the init-param name/value pairs using the
-	    HandlerInfo interface. If port-name is not specified, the
-	    handler is assumed to be associated with all ports of the
-	    service.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface. If
-	port-name is not specified, the handler is assumed to be associated
-	with all ports of the service.
-
-	Used in: service-ref
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique
-	    within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler
-	    implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="j2ee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="j2ee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed
-	    by the handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="soap-role"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that
-	    the Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-name"
-		   type="j2ee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-name element defines the WSDL port-name that a
-	    handler should be associated with.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_5.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_5.xsd
deleted file mode 100644
index db10181..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_5.xsd
+++ /dev/null
@@ -1,2096 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/javaee"
-     xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="5">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)javaee_5.xsds	1.65 06/02/17
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-<xsd:annotation>
-<xsd:documentation>
-
-The following definitions that appear in the common
-shareable schema(s) of J2EE deployment descriptors should be
-interpreted with respect to the context they are included:
-
-Deployment Component may indicate one of the following:
-    j2ee application;
-    application client;
-    web application;
-    enterprise bean;
-    resource adapter;
-
-Deployment File may indicate one of the following:
-    ear file;
-    war file;
-    jar file;
-    rar file;
-
-</xsd:documentation>
-</xsd:annotation>
-
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-	      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-  <xsd:include schemaLocation="javaee_web_services_client_1_2.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:group name="descriptionGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained description related
-	elements consistent across Java EE deployment descriptors.
-
-	All elements may occur multiple times with different languages,
-	to support localization of the content.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The description type is used by a description element to
-	provide text describing the parent element.  The elements
-	that use this type should include any information that the
-	Deployment Component's Deployment File file producer wants
-	to provide to the consumer of the Deployment Component's
-	Deployment File (i.e., to the Deployer). Typically, the
-	tools used by such a Deployment File consumer will display
-	the description when processing the parent element that
-	contains the description.
-
-	The lang attribute defines the language that the
-	description is provided in. The default value is "en" (English).
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:xsdStringType">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="dewey-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines a dewey decimal that is used
-	to describe versions of documents.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="\.?[0-9]+(\.[0-9]+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="display-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The display-name type contains a short name that is intended
-	  to be displayed by tools. It is used by display-name
-	  elements.  The display name need not be unique.
-
-	  Example:
-
-	  ...
-	     <display-name xml:lang="en">
-	       Employee Self Service
-	     </display-name>
-
-	  The value of the xml:lang attribute is "en" (English) by default.
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:string">
-	<xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-linkType is used by ejb-link
-	  elements in the ejb-ref or ejb-local-ref elements to specify
-	  that an EJB reference is linked to enterprise bean.
-
-	  The value of the ejb-link element must be the ejb-name of an
-	  enterprise bean in the same ejb-jar file or in another ejb-jar
-	  file in the same Java EE application unit.
-
-	  Alternatively, the name in the ejb-link element may be
-	  composed of a path name specifying the ejb-jar containing the
-	  referenced enterprise bean with the ejb-name of the target
-	  bean appended and separated from the path name by "#".  The
-	  path name is relative to the Deployment File containing
-	  Deployment Component that is referencing the enterprise
-	  bean.  This allows multiple enterprise beans with the same
-	  ejb-name to be uniquely identified.
-
-	  Examples:
-
-	      <ejb-link>EmployeeRecord</ejb-link>
-
-	      <ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-local-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-local-refType is used by ejb-local-ref elements for
-	the declaration of a reference to an enterprise bean's local
-	home or to the local business interface of a 3.0 bean.
-        The declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of the Deployment
-	      Component that's referencing the enterprise bean.
-	    - the optional expected type of the referenced enterprise bean
-	    - the optional expected local interface of the referenced
-              enterprise bean or the local business interface of the
-              referenced enterprise bean.
-	    - the optional expected local home interface of the referenced
-              enterprise bean. Not applicable if this ejb-local-ref refers
-              to the local business interface of a 3.0 bean.
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-            - optional elements to define injection of the named enterprise
-              bean into a component field or property.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="javaee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="javaee:ejb-ref-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="local-home"
-		   type="javaee:local-homeType"
-                   minOccurs="0"/>
-      <xsd:element name="local"
-		   type="javaee:localType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-link"
-		   type="javaee:ejb-linkType"
-		   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the
-	  Deployment Component's environment and is relative to the
-	  java:comp/env context.  The name must be unique within the
-	  Deployment Component.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	  Example:
-
-	  <ejb-ref-name>ejb/Payroll</ejb-ref-name>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:jndi-nameType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-ref-typeType contains the expected type of the
-	referenced enterprise bean.
-
-	The ejb-ref-type designates a value
-	that must be one of the following:
-
-	    Entity
-	    Session
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Entity"/>
-	<xsd:enumeration value="Session"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The ejb-refType is used by ejb-ref elements for the
-	declaration of a reference to an enterprise bean's home or
-        to the remote business interface of a 3.0 bean.
-	The declaration consists of:
-
-	    - an optional description
-	    - the EJB reference name used in the code of
-	      the Deployment Component that's referencing the enterprise
-	      bean.
-	    - the optional expected type of the referenced enterprise bean
-            - the optional remote interface of the referenced enterprise bean
-              or the remote business interface of the referenced enterprise
-              bean
-	    - the optional expected home interface of the referenced
-              enterprise bean.  Not applicable if this ejb-ref
-              refers to the remote business interface of a 3.0 bean.
-	    - optional ejb-link information, used to specify the
-	      referenced enterprise bean
-            - optional elements to define injection of the named enterprise
-              bean into a component field or property
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-		   type="javaee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-		   type="javaee:ejb-ref-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="home"
-		   type="javaee:homeType"
-		   minOccurs="0"/>
-      <xsd:element name="remote"
-		   type="javaee:remoteType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-link"
-		   type="javaee:ejb-linkType"
-		   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="emptyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is used to designate an empty
-	element when used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entry-type-valuesType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  This type contains the fully-qualified Java type of the
-	  environment entry value that is expected by the
-	  application's code.
-
-	  The following are the legal values of env-entry-type-valuesType:
-
-	      java.lang.Boolean
-	      java.lang.Byte
-	      java.lang.Character
-	      java.lang.String
-	      java.lang.Short
-	      java.lang.Integer
-	      java.lang.Long
-	      java.lang.Float
-	      java.lang.Double
-
-	  Example:
-
-	  <env-entry-type>java.lang.Boolean</env-entry-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="java.lang.Boolean"/>
-	<xsd:enumeration value="java.lang.Byte"/>
-	<xsd:enumeration value="java.lang.Character"/>
-	<xsd:enumeration value="java.lang.String"/>
-	<xsd:enumeration value="java.lang.Short"/>
-	<xsd:enumeration value="java.lang.Integer"/>
-	<xsd:enumeration value="java.lang.Long"/>
-	<xsd:enumeration value="java.lang.Float"/>
-	<xsd:enumeration value="java.lang.Double"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The env-entryType is used to declare an application's
-	environment entry. The declaration consists of an optional
-	description, the name of the environment entry, a type
-	(optional if the value is injected, otherwise required), and
-	an optional value.
-
-	It also includes optional elements to define injection of
-	the named resource into fields or JavaBeans properties.
-
-	If a value is not specified and injection is requested,
-	no injection will occur and no entry of the specified name
-	will be created.  This allows an initial value to be
-	specified in the source code without being incorrectly
-	changed when no override has been specified.
-
-	If a value is not specified and no injection is requested,
-	a value must be supplied during deployment.
-
-	This type is used by env-entry elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="env-entry-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-name element contains the name of a
-	      Deployment Component's environment entry.  The name
-	      is a JNDI name relative to the java:comp/env
-	      context.  The name must be unique within a
-	      Deployment Component. The uniqueness
-	      constraints must be defined within the declared
-	      context.
-
-	      Example:
-
-	      <env-entry-name>minAmount</env-entry-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="env-entry-type"
-		   type="javaee:env-entry-type-valuesType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-type element contains the Java language
-	      type of the environment entry.  If an injection target
-	      is specified for the environment entry, the type may
-	      be omitted, or must match the type of the injection
-	      target.  If no injection target is specified, the type
-	      is required.
-
-	      Example:
-
-	      <env-entry-type>java.lang.Integer</env-entry-type>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="env-entry-value"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The env-entry-value designates the value of a
-	      Deployment Component's environment entry. The value
-	      must be a String that is valid for the
-	      constructor of the specified type that takes a
-	      single String parameter, or for java.lang.Character,
-	      a single character.
-
-	      Example:
-
-	      <env-entry-value>100.00</env-entry-value>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="fully-qualified-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate the name of a
-	Java class or interface.  The name is in the form of a
-	"binary name", as defined in the JLS.  This is the form
-	of name used in Class.forName().  Tools that need the
-	canonical name (the name used in source code) will need
-	to convert this binary name to the canonical name.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="generic-booleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines four different values which can designate
-	boolean values. This includes values yes and no which are
-	not designated by xsd:boolean
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="true"/>
-	<xsd:enumeration value="false"/>
-	<xsd:enumeration value="yes"/>
-	<xsd:enumeration value="no"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The homeType defines the fully-qualified name of
-	  an enterprise bean's home interface.
-
-	  Example:
-
-	      <home>com.aardvark.payroll.PayrollHome</home>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="iconType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The icon type contains small-icon and large-icon elements
-	that specify the file names for small and large GIF, JPEG,
-	or PNG icon images used to represent the parent element in a
-	GUI tool.
-
-	The xml:lang attribute defines the language that the
-	icon file names are provided in. Its value is "en" (English)
-	by default.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="small-icon" type="javaee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The small-icon element contains the name of a file
-	      containing a small (16 x 16) icon image. The file
-	      name is a relative path within the Deployment
-	      Component's Deployment File.
-
-	      The image may be in the GIF, JPEG, or PNG format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <small-icon>employee-service-icon16x16.jpg</small-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="large-icon" type="javaee:pathType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The large-icon element contains the name of a file
-	      containing a large
-	      (32 x 32) icon image. The file name is a relative
-	      path within the Deployment Component's Deployment
-	      File.
-
-	      The image may be in the GIF, JPEG, or PNG format.
-	      The icon can be used by tools.
-
-	      Example:
-
-	      <large-icon>employee-service-icon32x32.jpg</large-icon>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-
-    <xsd:attribute ref="xml:lang"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="injection-targetType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	An injection target specifies a class and a name within
-	that class into which a resource should be injected.
-
-	The injection target class specifies the fully qualified
-	class name that is the target of the injection.  The
-	Java EE specifications describe which classes can be an
-	injection target.
-
-	The injection target name specifies the target within
-	the specified class.  The target is first looked for as a
-	JavaBeans property name.  If not found, the target is
-	looked for as a field name.
-
-	The specified resource will be injected into the target
-	during initialization of the class by either calling the
-	set method for the target property or by setting a value
-	into the named field.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="injection-target-class"
-		   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="injection-target-name"
-		   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-identifierType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The java-identifierType defines a Java identifier.
-	The users of this type should further verify that
-	the content does not contain Java reserved keywords.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a generic type that designates a Java primitive
-	type or a fully qualified name of a Java interface/type,
-	or an array of such types.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:pattern value="[^\p{Z}]*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jndi-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jndi-nameType type designates a JNDI name in the
-	Deployment Component's environment and is relative to the
-	java:comp/env context.  A JNDI name must be unique within the
-	Deployment Component.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="jndiEnvironmentRefsGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group keeps the usage of the contained JNDI environment
-	reference elements consistent across Java EE deployment descriptors.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="env-entry"
-		   type="javaee:env-entryType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-		   type="javaee:ejb-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="ejb-local-ref"
-		   type="javaee:ejb-local-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-		   type="javaee:resource-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-		   type="javaee:resource-env-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-		   type="javaee:message-destination-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="persistence-context-ref"
-		   type="javaee:persistence-context-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref"
-		   type="javaee:persistence-unit-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="post-construct"
-		   type="javaee:lifecycle-callbackType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="pre-destroy"
-		   type="javaee:lifecycle-callbackType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="lifecycle-callbackType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The lifecycle-callback type specifies a method on a
-	class to be called when a lifecycle event occurs.
-	Note that each class may have only one lifecycle callback
-        method for any given event and that the method may not
-	be overloaded.
-
-        If the lifefycle-callback-class element is missing then
-        the class defining the callback is assumed to be the
-        component class in scope at the place in the descriptor
-        in which the callback definition appears.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="lifecycle-callback-class"
-		   type="javaee:fully-qualified-classType"
-                   minOccurs="0"/>
-      <xsd:element name="lifecycle-callback-method"
-		   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="listenerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The listenerType indicates the deployment properties for a web
-	application listener bean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="listener-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The listener-class element declares a class in the
-	    application must be registered as a web
-	    application listener bean. The value is the fully
-	    qualified classname of the listener class.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="local-homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The local-homeType defines the fully-qualified
-	name of an enterprise bean's local home interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="localType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The localType defines the fully-qualified name of an
-	enterprise bean's local interface.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-linkType is used to link a message
-	destination reference or message-driven bean to a message
-	destination.
-
-	The Assembler sets the value to reflect the flow of messages
-	between producers and consumers in the application.
-
-	The value must be the message-destination-name of a message
-	destination in the same Deployment File or in another
-	Deployment File in the same Java EE application unit.
-
-	Alternatively, the value may be composed of a path name
-	specifying a Deployment File containing the referenced
-	message destination with the message-destination-name of the
-	destination appended and separated from the path name by
-	"#". The path name is relative to the Deployment File
-	containing Deployment Component that is referencing the
-	message destination.  This allows multiple message
-	destinations with the same name to be uniquely identified.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-ref element contains a declaration
-	  of Deployment Component's reference to a message destination
-	  associated with a resource in Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the message destination reference name
-		  - an optional message destination type
-		  - an optional specification as to whether
-		    the destination is used for
-		    consuming or producing messages, or both.
-		    if not specified, "both" is assumed.
-		  - an optional link to the message destination
-		  - optional injection targets
-
-	  The message destination type must be supplied unless an
-	  injection target is specified, in which case the type
-	  of the target is used.  If both are specified, the type
-	  must be assignment compatible with the type of the injection
-	  target.
-
-	  Examples:
-
-	  <message-destination-ref>
-		  <message-destination-ref-name>jms/StockQueue
-		  </message-destination-ref-name>
-		  <message-destination-type>javax.jms.Queue
-		  </message-destination-type>
-		  <message-destination-usage>Consumes
-		  </message-destination-usage>
-		  <message-destination-link>CorporateStocks
-		  </message-destination-link>
-	  </message-destination-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-ref-name element specifies
-	    the name of a message destination reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context and must be
-	    unique within an ejb-jar (for enterprise beans) or a
-	    Deployment File (for others).
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination-type"
-		   type="javaee:message-destination-typeType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-usage"
-		   type="javaee:message-destination-usageType"
-		   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-		   type="javaee:message-destination-linkType"
-		   minOccurs="0"/>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destination-typeType specifies the type of
-	  the destination. The type is specified by the Java interface
-	  expected to be implemented by the destination.
-
-	  Example:
-
-	    <message-destination-type>javax.jms.Queue
-	    </message-destination-type>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-usageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The message-destination-usageType specifies the use of the
-	message destination indicated by the reference.  The value
-	indicates whether messages are consumed from the message
-	destination, produced for the destination, or both.  The
-	Assembler makes use of this information in linking producers
-	of a destination with its consumers.
-
-	The value of the message-destination-usage element must be
-	one of the following:
-	    Consumes
-	    Produces
-	    ConsumesProduces
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Consumes"/>
-	<xsd:enumeration value="Produces"/>
-	<xsd:enumeration value="ConsumesProduces"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destinationType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The message-destinationType specifies a message
-	  destination. The logical destination described by this
-	  element is mapped to a physical destination by the Deployer.
-
-	  The message destination element contains:
-
-		  - an optional description
-		  - an optional display-name
-		  - an optional icon
-		  - a message destination name which must be unique
-		    among message destination names within the same
-		    Deployment File.
-		  - an optional mapped name
-
-	  Example:
-
-	  <message-destination>
-		  <message-destination-name>CorporateStocks
-		  </message-destination-name>
-	  </message-destination>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="message-destination-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The message-destination-name element specifies a
-	    name for a message destination.  This name must be
-	    unique among the names of message destinations
-	    within the Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      A product specific name that this message destination
-	      should be mapped to.  Each message-destination-ref
-	      element that references this message destination will
-	      define a name in the namespace of the referencing
-	      component.  (It's a name in the JNDI java:comp/env
-	      namespace.)  Many application servers provide a way to
-	      map these local names to names of resources known to the
-	      application server.  This mapped name is often a global
-	      JNDI name, but may be a name of any form.  Each of the
-	      local names should be mapped to this same global name.
-
-	      Application servers are not required to support any
-	      particular form or type of mapped name, nor the ability
-	      to use mapped names.  The mapped name is
-	      product-dependent and often installation-dependent.  No
-	      use of a mapped name is portable.
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="param-valueType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type is a general type that can be used to declare
-	parameter/value lists.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="param-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-name element contains the name of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="param-value"
-		   type="javaee:xsdStringType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The param-value element contains the value of a
-	    parameter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate either a relative
-	path or an absolute path starting with a "/".
-
-	In elements that specify a pathname to a file within the
-	same Deployment File, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the Deployment File's namespace.  Absolute filenames (i.e.,
-	those starting with "/") also specify names in the root of
-	the Deployment File's namespace.  In general, relative names
-	are preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-context-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The persistence-context-ref element contains a declaration
-	  of Deployment Component's reference to a persistence context
-	  associated within a Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the persistence context reference name
-		  - an optional persistence unit name.  If not specified,
-                    the default persistence unit is assumed.
-		  - an optional specification as to whether
-		    the persistence context type is Transaction or
-		    Extended.  If not specified, Transaction is assumed.
-                  - an optional list of persistence properties
-		  - optional injection targets
-
-	  Examples:
-
-            <persistence-context-ref>
-              <persistence-context-ref-name>myPersistenceContext
-              </persistence-context-ref-name>
-            </persistence-context-ref>
-
-            <persistence-context-ref>
-              <persistence-context-ref-name>myPersistenceContext
-                </persistence-context-ref-name>
-              <persistence-unit-name>PersistenceUnit1
-                </persistence-unit-name>
-              <persistence-context-type>Extended</persistence-context-type>
-            </persistence-context-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-context-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The persistence-context-ref-name element specifies
-	    the name of a persistence context reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="persistence-unit-name"
-		   type="javaee:string"
-		   minOccurs="0">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-            The Application Assembler(or BeanProvider) may use the
-            following syntax to avoid the need to rename persistence
-            units to have unique names within a Java EE application.
-
-            The Application Assembler specifies the pathname of the
-            root of the persistence.xml file for the referenced
-            persistence unit and appends the name of the persistence
-            unit separated from the pathname by #. The pathname is
-            relative to the referencing application component jar file.
-            In this manner, multiple persistence units with the same
-            persistence unit name may be uniquely identified when the
-            Application Assembler cannot change persistence unit names.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="persistence-context-type"
-		   type="javaee:persistence-context-typeType"
-		   minOccurs="0"/>
-
-      <xsd:element name="persistence-property"
-		   type="javaee:propertyType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-            Used to specify properties for the container or persistence
-            provider.  Vendor-specific properties may be included in
-            the set of properties.  Properties that are not recognized
-            by a vendor must be ignored.  Entries that make use of the
-            namespace javax.persistence and its subnamespaces must not
-            be used for vendor-specific properties.  The namespace
-            javax.persistence is reserved for use by the specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-context-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The persistence-context-typeType specifies the transactional
-	nature of a persistence context reference.
-
-	The value of the persistence-context-type element must be
-	one of the following:
-	    Transaction
-            Extended
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Transaction"/>
-	<xsd:enumeration value="Extended"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The persistence-unit-ref element contains a declaration
-	  of Deployment Component's reference to a persistence unit
-	  associated within a Deployment Component's
-	  environment. It consists of:
-
-		  - an optional description
-		  - the persistence unit reference name
-		  - an optional persistence unit name.  If not specified,
-                    the default persistence unit is assumed.
-		  - optional injection targets
-
-	  Examples:
-
-            <persistence-unit-ref>
-              <persistence-unit-ref-name>myPersistenceUnit
-              </persistence-unit-ref-name>
-            </persistence-unit-ref>
-
-            <persistence-unit-ref>
-              <persistence-unit-ref-name>myPersistenceUnit
-                </persistence-unit-ref-name>
-              <persistence-unit-name>PersistenceUnit1
-                </persistence-unit-name>
-            </persistence-unit-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The persistence-unit-ref-name element specifies
-	    the name of a persistence unit reference; its
-	    value is the environment entry name used in
-	    Deployment Component code.  The name is a JNDI name
-	    relative to the java:comp/env context.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="persistence-unit-name"
-		   type="javaee:string"
-		   minOccurs="0">
-        <xsd:annotation>
-	  <xsd:documentation>
-
-            The Application Assembler(or BeanProvider) may use the
-            following syntax to avoid the need to rename persistence
-            units to have unique names within a Java EE application.
-
-            The Application Assembler specifies the pathname of the
-            root of the persistence.xml file for the referenced
-            persistence unit and appends the name of the persistence
-            unit separated from the pathname by #. The pathname is
-            relative to the referencing application component jar file.
-            In this manner, multiple persistence units with the same
-            persistence unit name may be uniquely identified when the
-            Application Assembler cannot change persistence unit names.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Specifies a name/value pair.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="name"
-		   type="javaee:xsdStringType">
-      </xsd:element>
-      <xsd:element name="value"
-		   type="javaee:xsdStringType">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remoteType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The remote element contains the fully-qualified name
-	  of the enterprise bean's remote interface.
-
-	  Example:
-
-	      <remote>com.wombat.empl.EmployeeService</remote>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-authType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-authType specifies whether the Deployment Component
-	code signs on programmatically to the resource manager, or
-	whether the Container will sign on to the resource manager
-	on behalf of the Deployment Component. In the latter case,
-	the Container uses information that is supplied by the
-	Deployer.
-
-	The value must be one of the two following:
-
-	    Application
-	    Container
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Application"/>
-	<xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-sharing-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The res-sharing-scope type specifies whether connections
-	obtained through the given resource manager connection
-	factory reference can be shared. The value, if specified,
-	must be one of the two following:
-
-	    Shareable
-	    Unshareable
-
-	The default value is Shareable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="Shareable"/>
-	<xsd:enumeration value="Unshareable"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-env-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-env-refType is used to define
-	  resource-env-type elements.  It contains a declaration of a
-	  Deployment Component's reference to an administered object
-	  associated with a resource in the Deployment Component's
-	  environment.  It consists of an optional description, the
-	  resource environment reference name, and an optional
-	  indication of the resource environment reference type
-	  expected by the Deployment Component code.
-
-	  It also includes optional elements to define injection of
-	  the named resource into fields or JavaBeans properties.
-
-	  The resource environment type must be supplied unless an
-	  injection target is specified, in which case the type
-	  of the target is used.  If both are specified, the type
-	  must be assignment compatible with the type of the injection
-	  target.
-
-	  Example:
-
-	  <resource-env-ref>
-	      <resource-env-ref-name>jms/StockQueue
-	      </resource-env-ref-name>
-	      <resource-env-ref-type>javax.jms.Queue
-	      </resource-env-ref-type>
-	  </resource-env-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-name element specifies the name
-	    of a resource environment reference; its value is
-	    the environment entry name used in
-	    the Deployment Component code.  The name is a JNDI
-	    name relative to the java:comp/env context and must
-	    be unique within a Deployment Component.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="resource-env-ref-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The resource-env-ref-type element specifies the type
-	    of a resource environment reference.  It is the
-	    fully qualified name of a Java language class or
-	    interface.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The resource-refType contains a declaration of a
-	  Deployment Component's reference to an external resource. It
-	  consists of an optional description, the resource manager
-	  connection factory reference name, an optional indication of
-	  the resource manager connection factory type expected by the
-	  Deployment Component code, an optional type of authentication
-	  (Application or Container), and an optional specification of
-	  the shareability of connections obtained from the resource
-	  (Shareable or Unshareable).
-
-	  It also includes optional elements to define injection of
-	  the named resource into fields or JavaBeans properties.
-
-	  The connection factory type must be supplied unless an
-	  injection target is specified, in which case the type
-	  of the target is used.  If both are specified, the type
-	  must be assignment compatible with the type of the injection
-	  target.
-
-	  Example:
-
-	  <resource-ref>
-	      <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-	      <res-type>javax.sql.DataSource</res-type>
-	      <res-auth>Container</res-auth>
-	      <res-sharing-scope>Shareable</res-sharing-scope>
-	  </resource-ref>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="res-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-ref-name element specifies the name of a
-	    resource manager connection factory reference.
-	    The name is a JNDI name relative to the
-	    java:comp/env context.
-	    The name must be unique within a Deployment File.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The res-type element specifies the type of the data
-	    source. The type is specified by the fully qualified
-	    Java language class or interface
-	    expected to be implemented by the data source.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="res-auth"
-		   type="javaee:res-authType"
-		   minOccurs="0"/>
-
-      <xsd:element name="res-sharing-scope"
-		   type="javaee:res-sharing-scopeType"
-		   minOccurs="0"/>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="resourceGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This group collects elements that are common to all the
-	JNDI resource elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="mapped-name"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      A product specific name that this resource should be
-	      mapped to.  The name of this resource, as defined by the
-	      resource's name element or defaulted, is a name that is
-	      local to the application component using the resource.
-	      (It's a name in the JNDI java:comp/env namespace.)  Many
-	      application servers provide a way to map these local
-	      names to names of resources known to the application
-	      server.  This mapped name is often a global JNDI name,
-	      but may be a name of any form.
-
-	      Application servers are not required to support any
-	      particular form or type of mapped name, nor the ability
-	      to use mapped names.  The mapped name is
-	      product-dependent and often installation-dependent.  No
-	      use of a mapped name is portable.
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="injection-target"
-		   type="javaee:injection-targetType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="role-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The role-nameType designates the name of a security role.
-
-	The name must conform to the lexical rules for a token.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="run-asType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The run-asType specifies the run-as identity to be
-	used for the execution of a component. It contains an
-	optional description, and the name of a security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="javaee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-role-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-role-refType contains the declaration of a
-	security role reference in a component's or a
-	Deployment Component's code. The declaration consists of an
-	optional description, the security role name used in the
-	code, and an optional link to a security role. If the
-	security role is not specified, the Deployer must choose an
-	appropriate security role.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="javaee:role-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The value of the role-name element must be the String used
-	    as the parameter to the
-	    EJBContext.isCallerInRole(String roleName) method or the
-	    HttpServletRequest.isUserInRole(String role) method.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="role-link"
-		   type="javaee:role-nameType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The role-link element is a reference to a defined
-	    security role. The role-link element must contain
-	    the name of one of the security roles defined in the
-	    security-role elements.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The security-roleType contains the definition of a security
-	  role. The definition consists of an optional description of
-	  the security role, and the security role name.
-
-	  Example:
-
-	      <security-role>
-	      <description>
-		  This role includes all employees who are authorized
-		  to access the employee service application.
-	      </description>
-	      <role-name>employee</role-name>
-	      </security-role>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="javaee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="string">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This is a special string datatype that is defined by Java EE as
-	a base type for defining collapsed strings. When schemas
-	require trailing/leading space elimination as well as
-	collapsing the existing whitespace, this base type may be
-	used.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="true-falseType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This simple type designates a boolean with only two
-	permissible values
-
-	- true
-	- false
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdBooleanType">
-	<xsd:pattern value="(true|false)"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="url-patternType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The url-patternType contains the url pattern of the mapping.
-	It must follow the rules specified in Section 11.2 of the
-	Servlet API Specification. This pattern is assumed to be in
-	URL-decoded form and must not contain CR(#xD) or LF(#xA).
-	If it contains those characters, the container must inform
-	the developer with a descriptive error message.
-	The container must preserve all characters including whitespaces.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdAnyURIType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:anyURI.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:anyURI">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdBooleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:boolean.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:integer.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:integer">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNMTOKENType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:NMTOKEN.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:NMTOKEN">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNonNegativeIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:nonNegativeInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:nonNegativeInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdPositiveIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:positiveInteger.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:positiveInteger">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdQNameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:QName.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:QName">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type adds an "id" attribute to xsd:string.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_6.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_6.xsd
deleted file mode 100644
index f165d18..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_6.xsd
+++ /dev/null
@@ -1,2422 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="6">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following definitions that appear in the common
-      shareable schema(s) of Java EE deployment descriptors should be
-      interpreted with respect to the context they are included:
-      
-      Deployment Component may indicate one of the following:
-      java ee application;
-      application client;
-      web application;
-      enterprise bean;
-      resource adapter; 
-      
-      Deployment File may indicate one of the following:
-      ear file;
-      war file;
-      jar file;
-      rar file;
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:import namespace="http://www.w3.org/XML/1998/namespace"
-              schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-
-  <xsd:include schemaLocation="javaee_web_services_client_1_3.xsd"/>
-
-  <xsd:group name="descriptionGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This group keeps the usage of the contained description related
-        elements consistent across Java EE deployment descriptors.
-        
-        All elements may occur multiple times with different languages,
-        to support localization of the content.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="display-name"
-                   type="javaee:display-nameType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="icon"
-                   type="javaee:iconType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-  <xsd:group name="jndiEnvironmentRefsGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This group keeps the usage of the contained JNDI environment
-        reference elements consistent across Java EE deployment descriptors.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="env-entry"
-                   type="javaee:env-entryType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref"
-                   type="javaee:ejb-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-local-ref"
-                   type="javaee:ejb-local-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:group ref="javaee:service-refGroup"/>
-      <xsd:element name="resource-ref"
-                   type="javaee:resource-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref"
-                   type="javaee:resource-env-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref"
-                   type="javaee:message-destination-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-context-ref"
-                   type="javaee:persistence-context-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref"
-                   type="javaee:persistence-unit-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="post-construct"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="pre-destroy"
-                   type="javaee:lifecycle-callbackType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="data-source"
-                   type="javaee:data-sourceType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-  <xsd:group name="resourceGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This group collects elements that are common to most
-        JNDI resource elements.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:resourceBaseGroup"/>
-      <xsd:element name="lookup-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The JNDI name to be looked up to resolve a resource reference.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:group>
-
-  <xsd:group name="resourceBaseGroup">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This group collects elements that are common to all the
-        JNDI resource elements. It does not include the lookup-name
-        element, that is only applicable to some resource elements.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="mapped-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            A product specific name that this resource should be
-            mapped to.  The name of this resource, as defined by the
-            resource's name element or defaulted, is a name that is
-            local to the application component using the resource.
-            (It's a name in the JNDI java:comp/env namespace.)  Many
-            application servers provide a way to map these local
-            names to names of resources known to the application
-            server.  This mapped name is often a global JNDI name,
-            but may be a name of any form.
-            
-            Application servers are not required to support any
-            particular form or type of mapped name, nor the ability
-            to use mapped names.  The mapped name is
-            product-dependent and often installation-dependent.  No
-            use of a mapped name is portable.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="injection-target"
-                   type="javaee:injection-targetType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:group>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="data-sourceType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Configuration of a DataSource.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Description of this DataSource.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The name element specifies the JNDI name of the
-            data source being defined.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="class-name"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            DataSource, XADataSource or ConnectionPoolDataSource
-            implementation class.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="server-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Database server name.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-number"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Port number where a server is listening for requests.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="database-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Name of a database on a server.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="url"
-                   type="javaee:jdbc-urlType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            A JDBC URL. If the <code>url</code> property is specified
-            along with other standard <code>DataSource</code> properties
-            such as <code>serverName</code>, <code>databaseName</code>
-            and <code>portNumber</code>, the more specific properties will
-            take precedence and <code>url</code> will be ignored.
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="user"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            User name to use for connection authentication.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="password"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Password to use for connection authentication.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="property"
-                   type="javaee:propertyType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            JDBC DataSource property.  This may be a vendor-specific
-            property or a less commonly used DataSource property.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="login-timeout"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Sets the maximum time in seconds that this data source
-            will wait while attempting to connect to a database.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="transactional"
-                   type="javaee:xsdBooleanType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Set to false if connections should not participate in
-            transactions.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="isolation-level"
-                   type="javaee:isolation-levelType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Isolation level for connections.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="initial-pool-size"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Number of connections that should be created when a
-            connection pool is initialized.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="max-pool-size"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Maximum number of connections that should be concurrently
-            allocated for a connection pool.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="min-pool-size"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Minimum number of connections that should be concurrently
-            allocated for a connection pool.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="max-idle-time"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The number of seconds that a physical connection should
-            remain unused in the pool before the connection is
-            closed for a connection pool.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="max-statements"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The total number of statements that a connection pool
-            should keep open.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The description type is used by a description element to
-        provide text describing the parent element.  The elements
-        that use this type should include any information that the
-        Deployment Component's Deployment File file producer wants
-        to provide to the consumer of the Deployment Component's
-        Deployment File (i.e., to the Deployer). Typically, the
-        tools used by such a Deployment File consumer will display
-        the description when processing the parent element that
-        contains the description.
-        
-        The lang attribute defines the language that the
-        description is provided in. The default value is "en" (English). 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:xsdStringType">
-        <xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:simpleType name="dewey-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type defines a dewey decimal that is used
-        to describe versions of documents. 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="\.?[0-9]+(\.[0-9]+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="display-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The display-name type contains a short name that is intended
-        to be displayed by tools. It is used by display-name
-        elements.  The display name need not be unique.
-        
-        Example: 
-        
-        ...
-        <display-name xml:lang="en">
-        Employee Self Service
-        </display-name>
-        
-        The value of the xml:lang attribute is "en" (English) by default. 
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:string">
-        <xsd:attribute ref="xml:lang"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The ejb-linkType is used by ejb-link
-        elements in the ejb-ref or ejb-local-ref elements to specify
-        that an EJB reference is linked to enterprise bean.
-        
-        The value of the ejb-link element must be the ejb-name of an
-        enterprise bean in the same ejb-jar file or in another ejb-jar
-        file in the same Java EE application unit. 
-        
-        Alternatively, the name in the ejb-link element may be
-        composed of a path name specifying the ejb-jar containing the
-        referenced enterprise bean with the ejb-name of the target
-        bean appended and separated from the path name by "#".  The
-        path name is relative to the Deployment File containing
-        Deployment Component that is referencing the enterprise
-        bean.  This allows multiple enterprise beans with the same
-        ejb-name to be uniquely identified.
-        
-        Examples:
-        
-        <ejb-link>EmployeeRecord</ejb-link>
-        
-        <ejb-link>../products/product.jar#ProductEJB</ejb-link>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-local-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The ejb-local-refType is used by ejb-local-ref elements for
-        the declaration of a reference to an enterprise bean's local
-        home or to the local business interface of a 3.0 bean.
-        The declaration consists of:
-        
-        - an optional description
-        - the EJB reference name used in the code of the Deployment 
-        Component that's referencing the enterprise bean.
-        - the optional expected type of the referenced enterprise bean
-        - the optional expected local interface of the referenced 
-        enterprise bean or the local business interface of the 
-        referenced enterprise bean.
-        - the optional expected local home interface of the referenced 
-        enterprise bean. Not applicable if this ejb-local-ref refers
-        to the local business interface of a 3.0 bean.
-        - optional ejb-link information, used to specify the 
-        referenced enterprise bean
-        - optional elements to define injection of the named enterprise  
-        bean into a component field or property.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-                   type="javaee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-                   type="javaee:ejb-ref-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="local-home"
-                   type="javaee:local-homeType"
-                   minOccurs="0"/>
-      <xsd:element name="local"
-                   type="javaee:localType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-link"
-                   type="javaee:ejb-linkType"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The ejb-ref-name element contains the name of an EJB
-        reference. The EJB reference is an entry in the
-        Deployment Component's environment and is relative to the
-        java:comp/env context.  The name must be unique within the
-        Deployment Component.
-        
-        It is recommended that name is prefixed with "ejb/".
-        
-        Example:
-        
-        <ejb-ref-name>ejb/Payroll</ejb-ref-name>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:jndi-nameType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The ejb-refType is used by ejb-ref elements for the
-        declaration of a reference to an enterprise bean's home or
-        to the remote business interface of a 3.0 bean.  
-        The declaration consists of:
-        
-        - an optional description
-        - the EJB reference name used in the code of
-        the Deployment Component that's referencing the enterprise
-        bean. 
-        - the optional expected type of the referenced enterprise bean
-        - the optional remote interface of the referenced enterprise bean
-        or the remote business interface of the referenced enterprise 
-        bean
-        - the optional expected home interface of the referenced 
-        enterprise bean.  Not applicable if this ejb-ref
-        refers to the remote business interface of a 3.0 bean.
-        - optional ejb-link information, used to specify the
-        referenced enterprise bean
-        - optional elements to define injection of the named enterprise
-        bean into a component field or property
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="ejb-ref-name"
-                   type="javaee:ejb-ref-nameType"/>
-      <xsd:element name="ejb-ref-type"
-                   type="javaee:ejb-ref-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="home"
-                   type="javaee:homeType"
-                   minOccurs="0"/>
-      <xsd:element name="remote"
-                   type="javaee:remoteType"
-                   minOccurs="0"/>
-      <xsd:element name="ejb-link"
-                   type="javaee:ejb-linkType"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ejb-ref-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The ejb-ref-typeType contains the expected type of the
-        referenced enterprise bean.
-        
-        The ejb-ref-type designates a value
-        that must be one of the following:
-        
-        Entity
-        Session
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Entity"/>
-        <xsd:enumeration value="Session"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="emptyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type is used to designate an empty
-        element when used. 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entryType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The env-entryType is used to declare an application's
-        environment entry. The declaration consists of an optional
-        description, the name of the environment entry, a type
-        (optional if the value is injected, otherwise required), and
-        an optional value.
-        
-        It also includes optional elements to define injection of
-        the named resource into fields or JavaBeans properties.
-        
-        If a value is not specified and injection is requested,
-        no injection will occur and no entry of the specified name
-        will be created.  This allows an initial value to be
-        specified in the source code without being incorrectly
-        changed when no override has been specified.
-        
-        If a value is not specified and no injection is requested,
-        a value must be supplied during deployment. 
-        
-        This type is used by env-entry elements.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="env-entry-name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The env-entry-name element contains the name of a
-            Deployment Component's environment entry.  The name
-            is a JNDI name relative to the java:comp/env
-            context.  The name must be unique within a 
-            Deployment Component. The uniqueness
-            constraints must be defined within the declared
-            context.
-            
-            Example:
-            
-            <env-entry-name>minAmount</env-entry-name>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="env-entry-type"
-                   type="javaee:env-entry-type-valuesType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The env-entry-type element contains the Java language
-            type of the environment entry.  If an injection target
-            is specified for the environment entry, the type may
-            be omitted, or must match the type of the injection
-            target.  If no injection target is specified, the type
-            is required.
-            
-            Example:
-            
-            <env-entry-type>java.lang.Integer</env-entry-type>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="env-entry-value"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The env-entry-value designates the value of a
-            Deployment Component's environment entry. The value
-            must be a String that is valid for the
-            constructor of the specified type that takes a
-            single String parameter, or for java.lang.Character,
-            a single character.
-            
-            Example:
-            
-            <env-entry-value>100.00</env-entry-value>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="env-entry-type-valuesType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        This type contains the fully-qualified Java type of the
-        environment entry value that is expected by the
-        application's code.
-        
-        The following are the legal values of env-entry-type-valuesType:
-        
-        java.lang.Boolean
-        java.lang.Byte
-        java.lang.Character
-        java.lang.String
-        java.lang.Short
-        java.lang.Integer
-        java.lang.Long
-        java.lang.Float
-        java.lang.Double
-        		  java.lang.Class
-        		  any enumeration type (i.e. a subclass of java.lang.Enum)
-        
-        Examples:
-        
-        <env-entry-type>java.lang.Boolean</env-entry-type>
-        <env-entry-type>java.lang.Class</env-entry-type>
-        <env-entry-type>com.example.Color</env-entry-type>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="fully-qualified-classType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The elements that use this type designate the name of a
-        Java class or interface.  The name is in the form of a
-        "binary name", as defined in the JLS.  This is the form
-        of name used in Class.forName().  Tools that need the
-        canonical name (the name used in source code) will need
-        to convert this binary name to the canonical name.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="generic-booleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type defines four different values which can designate
-        boolean values. This includes values yes and no which are 
-        not designated by xsd:boolean
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="true"/>
-        <xsd:enumeration value="false"/>
-        <xsd:enumeration value="yes"/>
-        <xsd:enumeration value="no"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="iconType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The icon type contains small-icon and large-icon elements
-        that specify the file names for small and large GIF, JPEG,
-        or PNG icon images used to represent the parent element in a
-        GUI tool. 
-        
-        The xml:lang attribute defines the language that the
-        icon file names are provided in. Its value is "en" (English)
-        by default. 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="small-icon"
-                   type="javaee:pathType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The small-icon element contains the name of a file
-            containing a small (16 x 16) icon image. The file
-            name is a relative path within the Deployment
-            Component's Deployment File.
-            
-            The image may be in the GIF, JPEG, or PNG format.
-            The icon can be used by tools.
-            
-            Example:
-            
-            <small-icon>employee-service-icon16x16.jpg</small-icon>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="large-icon"
-                   type="javaee:pathType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The large-icon element contains the name of a file
-            containing a large
-            (32 x 32) icon image. The file name is a relative 
-            path within the Deployment Component's Deployment
-            File.
-            
-            The image may be in the GIF, JPEG, or PNG format.
-            The icon can be used by tools.
-            
-            Example:
-            
-            <large-icon>employee-service-icon32x32.jpg</large-icon>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute ref="xml:lang"/>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="injection-targetType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        An injection target specifies a class and a name within
-        that class into which a resource should be injected.
-        
-        The injection target class specifies the fully qualified
-        class name that is the target of the injection.  The
-        Java EE specifications describe which classes can be an
-        injection target.
-        
-        The injection target name specifies the target within
-        the specified class.  The target is first looked for as a
-        JavaBeans property name.  If not found, the target is
-        looked for as a field name.
-        
-        The specified resource will be injected into the target
-        during initialization of the class by either calling the
-        set method for the target property or by setting a value
-        into the named field.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="injection-target-class"
-                   type="javaee:fully-qualified-classType"/>
-      <xsd:element name="injection-target-name"
-                   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <xsd:simpleType name="isolation-levelType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        	The following transaction isolation levels are allowed
-        	(see documentation for the java.sql.Connection interface):
-        TRANSACTION_READ_UNCOMMITTED
-        TRANSACTION_READ_COMMITTED
-        TRANSACTION_REPEATABLE_READ
-        TRANSACTION_SERIALIZABLE
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="TRANSACTION_READ_UNCOMMITTED"/>
-      <xsd:enumeration value="TRANSACTION_READ_COMMITTED"/>
-      <xsd:enumeration value="TRANSACTION_REPEATABLE_READ"/>
-      <xsd:enumeration value="TRANSACTION_SERIALIZABLE"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-identifierType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The java-identifierType defines a Java identifier.
-        The users of this type should further verify that 
-        the content does not contain Java reserved keywords.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:pattern value="($|_|\p{L})(\p{L}|\p{Nd}|_|$)*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="java-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This is a generic type that designates a Java primitive
-        type or a fully qualified name of a Java interface/type,
-        or an array of such types.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:pattern value="[^\p{Z}]*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jdbc-urlType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The jdbc-urlType contains the url pattern of the mapping.
-        It must follow the rules specified in Section 9.3 of the
-        JDBC Specification where the format is:
-        
-        jdbc:<subprotocol>:<subname>
-        
-        Example:
-        
-        <url>jdbc:mysql://localhost:3307/testdb</url>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:pattern value="jdbc:(.*):(.*)"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jndi-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The jndi-nameType type designates a JNDI name in the
-        Deployment Component's environment and is relative to the
-        java:comp/env context.  A JNDI name must be unique within the
-        Deployment Component.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The homeType defines the fully-qualified name of
-        an enterprise bean's home interface. 
-        
-        Example:
-        
-        <home>com.aardvark.payroll.PayrollHome</home>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="lifecycle-callbackType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The lifecycle-callback type specifies a method on a
-        class to be called when a lifecycle event occurs.
-        Note that each class may have only one lifecycle callback
-        method for any given event and that the method may not
-        be overloaded.
-        
-        If the lifefycle-callback-class element is missing then
-        the class defining the callback is assumed to be the
-        component class in scope at the place in the descriptor
-        in which the callback definition appears.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="lifecycle-callback-class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"/>
-      <xsd:element name="lifecycle-callback-method"
-                   type="javaee:java-identifierType"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="listenerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The listenerType indicates the deployment properties for a web
-        application listener bean.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="listener-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The listener-class element declares a class in the
-            application must be registered as a web
-            application listener bean. The value is the fully
-            qualified classname of the listener class.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="localType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The localType defines the fully-qualified name of an
-        enterprise bean's local interface.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="local-homeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The local-homeType defines the fully-qualified
-        name of an enterprise bean's local home interface.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="param-valueType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type is a general type that can be used to declare
-        parameter/value lists.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="param-name"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The param-name element contains the name of a
-            parameter.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="param-value"
-                   type="javaee:xsdStringType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The param-value element contains the value of a
-            parameter.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The elements that use this type designate either a relative
-        path or an absolute path starting with a "/".
-        
-        In elements that specify a pathname to a file within the
-        same Deployment File, relative filenames (i.e., those not
-        starting with "/") are considered relative to the root of
-        the Deployment File's namespace.  Absolute filenames (i.e.,
-        those starting with "/") also specify names in the root of
-        the Deployment File's namespace.  In general, relative names
-        are preferred.  The exception is .war files where absolute
-        names are preferred for consistency with the Servlet API.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-context-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The persistence-context-ref element contains a declaration
-        of Deployment Component's reference to a persistence context
-        associated within a Deployment Component's
-        environment. It consists of:
-        
-        - an optional description
-        - the persistence context reference name
-        - an optional persistence unit name.  If not specified,
-        the default persistence unit is assumed.
-        - an optional specification as to whether
-        the persistence context type is Transaction or
-        Extended.  If not specified, Transaction is assumed.
-        - an optional list of persistence properties
-        - optional injection targets
-        
-        Examples:
-        
-        <persistence-context-ref>
-        <persistence-context-ref-name>myPersistenceContext
-        </persistence-context-ref-name>
-        </persistence-context-ref>
-        
-        <persistence-context-ref>
-        <persistence-context-ref-name>myPersistenceContext
-        </persistence-context-ref-name>
-        <persistence-unit-name>PersistenceUnit1
-        </persistence-unit-name>
-        <persistence-context-type>Extended</persistence-context-type>
-        </persistence-context-ref>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-context-ref-name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The persistence-context-ref-name element specifies
-            the name of a persistence context reference; its
-            value is the environment entry name used in
-            Deployment Component code.  The name is a JNDI name
-            relative to the java:comp/env context.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="persistence-unit-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The Application Assembler(or BeanProvider) may use the
-            following syntax to avoid the need to rename persistence
-            units to have unique names within a Java EE application.
-            
-            The Application Assembler specifies the pathname of the
-            root of the persistence.xml file for the referenced
-            persistence unit and appends the name of the persistence
-            unit separated from the pathname by #. The pathname is
-            relative to the referencing application component jar file. 
-            In this manner, multiple persistence units with the same
-            persistence unit name may be uniquely identified when the 
-            Application Assembler cannot change persistence unit names.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="persistence-context-type"
-                   type="javaee:persistence-context-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="persistence-property"
-                   type="javaee:propertyType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to specify properties for the container or persistence
-            provider.  Vendor-specific properties may be included in
-            the set of properties.  Properties that are not recognized
-            by a vendor must be ignored.  Entries that make use of the 
-            namespace javax.persistence and its subnamespaces must not
-            be used for vendor-specific properties.  The namespace
-            javax.persistence is reserved for use by the specification.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:resourceBaseGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-context-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The persistence-context-typeType specifies the transactional
-        nature of a persistence context reference.  
-        
-        The value of the persistence-context-type element must be
-        one of the following:
-        Transaction
-        Extended
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Transaction"/>
-        <xsd:enumeration value="Extended"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="propertyType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Specifies a name/value pair.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="name"
-                   type="javaee:xsdStringType">
-      </xsd:element>
-      <xsd:element name="value"
-                   type="javaee:xsdStringType">
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The persistence-unit-ref element contains a declaration
-        of Deployment Component's reference to a persistence unit
-        associated within a Deployment Component's
-        environment. It consists of:
-        
-        - an optional description
-        - the persistence unit reference name
-        - an optional persistence unit name.  If not specified,
-        the default persistence unit is assumed.
-        - optional injection targets
-        
-        Examples:
-        
-        <persistence-unit-ref>
-        <persistence-unit-ref-name>myPersistenceUnit
-        </persistence-unit-ref-name>
-        </persistence-unit-ref>
-        
-        <persistence-unit-ref>
-        <persistence-unit-ref-name>myPersistenceUnit
-        </persistence-unit-ref-name>
-        <persistence-unit-name>PersistenceUnit1
-        </persistence-unit-name>
-        </persistence-unit-ref>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="persistence-unit-ref-name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The persistence-unit-ref-name element specifies
-            the name of a persistence unit reference; its
-            value is the environment entry name used in
-            Deployment Component code.  The name is a JNDI name
-            relative to the java:comp/env context.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="persistence-unit-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The Application Assembler(or BeanProvider) may use the
-            following syntax to avoid the need to rename persistence
-            units to have unique names within a Java EE application.
-            
-            The Application Assembler specifies the pathname of the
-            root of the persistence.xml file for the referenced
-            persistence unit and appends the name of the persistence
-            unit separated from the pathname by #. The pathname is
-            relative to the referencing application component jar file. 
-            In this manner, multiple persistence units with the same
-            persistence unit name may be uniquely identified when the 
-            Application Assembler cannot change persistence unit names.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:resourceBaseGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="remoteType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The remote element contains the fully-qualified name
-        of the enterprise bean's remote interface.
-        
-        Example:
-        
-        <remote>com.wombat.empl.EmployeeService</remote>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-env-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The resource-env-refType is used to define
-        resource-env-ref elements.  It contains a declaration of a
-        Deployment Component's reference to an administered object
-        associated with a resource in the Deployment Component's
-        environment.  It consists of an optional description, the
-        resource environment reference name, and an optional
-        indication of the resource environment reference type
-        expected by the Deployment Component code.
-        
-        It also includes optional elements to define injection of
-        the named resource into fields or JavaBeans properties.
-        
-        The resource environment type must be supplied unless an
-        injection target is specified, in which case the type
-        of the target is used.  If both are specified, the type
-        must be assignment compatible with the type of the injection
-        target.
-        
-        Example:
-        
-        <resource-env-ref>
-        <resource-env-ref-name>jms/StockQueue
-        </resource-env-ref-name>
-        <resource-env-ref-type>javax.jms.Queue
-        </resource-env-ref-type>
-        </resource-env-ref>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="resource-env-ref-name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The resource-env-ref-name element specifies the name
-            of a resource environment reference; its value is
-            the environment entry name used in
-            the Deployment Component code.  The name is a JNDI 
-            name relative to the java:comp/env context and must 
-            be unique within a Deployment Component.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="resource-env-ref-type"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The resource-env-ref-type element specifies the type
-            of a resource environment reference.  It is the
-            fully qualified name of a Java language class or
-            interface.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="resource-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The resource-refType contains a declaration of a
-        Deployment Component's reference to an external resource. It
-        consists of an optional description, the resource manager
-        connection factory reference name, an optional indication of
-        the resource manager connection factory type expected by the
-        Deployment Component code, an optional type of authentication
-        (Application or Container), and an optional specification of
-        the shareability of connections obtained from the resource
-        (Shareable or Unshareable).
-        
-        It also includes optional elements to define injection of
-        the named resource into fields or JavaBeans properties.
-        
-        The connection factory type must be supplied unless an
-        injection target is specified, in which case the type
-        of the target is used.  If both are specified, the type
-        must be assignment compatible with the type of the injection
-        target.
-        
-        Example:
-        
-        <resource-ref>
-        <res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-        <res-type>javax.sql.DataSource</res-type>
-        <res-auth>Container</res-auth>
-        <res-sharing-scope>Shareable</res-sharing-scope>
-        </resource-ref>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="res-ref-name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The res-ref-name element specifies the name of a
-            resource manager connection factory reference.
-            The name is a JNDI name relative to the
-            java:comp/env context.  
-            The name must be unique within a Deployment File. 
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="res-type"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The res-type element specifies the type of the data
-            source. The type is specified by the fully qualified
-            Java language class or interface
-            expected to be implemented by the data source.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="res-auth"
-                   type="javaee:res-authType"
-                   minOccurs="0"/>
-      <xsd:element name="res-sharing-scope"
-                   type="javaee:res-sharing-scopeType"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-authType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The res-authType specifies whether the Deployment Component
-        code signs on programmatically to the resource manager, or
-        whether the Container will sign on to the resource manager
-        on behalf of the Deployment Component. In the latter case,
-        the Container uses information that is supplied by the
-        Deployer.
-        
-        The value must be one of the two following:
-        
-        Application
-        Container
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Application"/>
-        <xsd:enumeration value="Container"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="res-sharing-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The res-sharing-scope type specifies whether connections
-        obtained through the given resource manager connection
-        factory reference can be shared. The value, if specified,
-        must be one of the two following:
-        
-        Shareable
-        Unshareable
-        
-        The default value is Shareable.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Shareable"/>
-        <xsd:enumeration value="Unshareable"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="run-asType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The run-asType specifies the run-as identity to be
-        used for the execution of a component. It contains an 
-        optional description, and the name of a security role.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-                   type="javaee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="role-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The role-nameType designates the name of a security role.
-        
-        The name must conform to the lexical rules for a token.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-roleType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The security-roleType contains the definition of a security
-        role. The definition consists of an optional description of
-        the security role, and the security role name.
-        
-        Example:
-        
-        <security-role>
-        <description>
-        This role includes all employees who are authorized
-        to access the employee service application.
-        </description>
-        <role-name>employee</role-name>
-        </security-role>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-                   type="javaee:role-nameType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-role-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The security-role-refType contains the declaration of a
-        security role reference in a component's or a
-        Deployment Component's code. The declaration consists of an
-        optional description, the security role name used in the
-        code, and an optional link to a security role. If the
-        security role is not specified, the Deployer must choose an
-        appropriate security role.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-                   type="javaee:role-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The value of the role-name element must be the String used
-            as the parameter to the 
-            EJBContext.isCallerInRole(String roleName) method or the
-            HttpServletRequest.isUserInRole(String role) method.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="role-link"
-                   type="javaee:role-nameType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The role-link element is a reference to a defined
-            security role. The role-link element must contain
-            the name of one of the security roles defined in the
-            security-role elements.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdQNameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:QName.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:QName">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdBooleanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:boolean.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:boolean">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNMTOKENType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:NMTOKEN.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:NMTOKEN">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdAnyURIType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:anyURI.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:anyURI">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:integer.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:integer">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdPositiveIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:positiveInteger.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:positiveInteger">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdNonNegativeIntegerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:nonNegativeInteger.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:nonNegativeInteger">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="xsdStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type adds an "id" attribute to xsd:string.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="string">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This is a special string datatype that is defined by Java EE as
-        a base type for defining collapsed strings. When schemas
-        require trailing/leading space elimination as well as
-        collapsing the existing whitespace, this base type may be
-        used.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:token">
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:extension>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="true-falseType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This simple type designates a boolean with only two
-        permissible values
-        
-        - true
-        - false
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdBooleanType">
-        <xsd:pattern value="(true|false)"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="url-patternType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The url-patternType contains the url pattern of the mapping.
-        It must follow the rules specified in Section 11.2 of the
-        Servlet API Specification. This pattern is assumed to be in
-        URL-decoded form and must not contain CR(#xD) or LF(#xA).
-        If it contains those characters, the container must inform
-        the developer with a descriptive error message.
-        The container must preserve all characters including whitespaces.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="xsd:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destinationType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The message-destinationType specifies a message
-        destination. The logical destination described by this
-        element is mapped to a physical destination by the Deployer.
-        
-        The message destination element contains: 
-        
-        - an optional description
-        - an optional display-name
-        - an optional icon
-        - a message destination name which must be unique
-        among message destination names within the same 
-        Deployment File. 
-        - an optional mapped name
-        - an optional lookup name
-        
-        Example: 
-        
-        <message-destination>
-        <message-destination-name>CorporateStocks
-        </message-destination-name>
-        </message-destination>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="message-destination-name"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The message-destination-name element specifies a
-            name for a message destination.  This name must be
-            unique among the names of message destinations
-            within the Deployment File.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="mapped-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            A product specific name that this message destination
-            should be mapped to.  Each message-destination-ref
-            element that references this message destination will
-            define a name in the namespace of the referencing
-            component or in one of the other predefined namespaces. 
-            Many application servers provide a way to map these
-            local names to names of resources known to the
-            application server.  This mapped name is often a global
-            JNDI name, but may be a name of any form.  Each of the
-            local names should be mapped to this same global name.
-            
-            Application servers are not required to support any
-            particular form or type of mapped name, nor the ability
-            to use mapped names.  The mapped name is
-            product-dependent and often installation-dependent.  No
-            use of a mapped name is portable.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="lookup-name"
-                   type="javaee:xsdStringType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The JNDI name to be looked up to resolve the message destination.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The message-destination-ref element contains a declaration
-        of Deployment Component's reference to a message destination
-        associated with a resource in Deployment Component's
-        environment. It consists of:
-        
-        - an optional description
-        - the message destination reference name
-        - an optional message destination type
-        - an optional specification as to whether
-        the destination is used for 
-        consuming or producing messages, or both.
-        if not specified, "both" is assumed.
-        - an optional link to the message destination
-        - optional injection targets
-        
-        The message destination type must be supplied unless an
-        injection target is specified, in which case the type
-        of the target is used.  If both are specified, the type
-        must be assignment compatible with the type of the injection
-        target.
-        
-        Examples:
-        
-        <message-destination-ref>
-        <message-destination-ref-name>jms/StockQueue
-        </message-destination-ref-name>
-        <message-destination-type>javax.jms.Queue
-        </message-destination-type>
-        <message-destination-usage>Consumes
-        </message-destination-usage>
-        <message-destination-link>CorporateStocks
-        </message-destination-link>
-        </message-destination-ref>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="message-destination-ref-name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The message-destination-ref-name element specifies
-            the name of a message destination reference; its
-            value is the environment entry name used in
-            Deployment Component code.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="message-destination-type"
-                   type="javaee:message-destination-typeType"
-                   minOccurs="0"/>
-      <xsd:element name="message-destination-usage"
-                   type="javaee:message-destination-usageType"
-                   minOccurs="0"/>
-      <xsd:element name="message-destination-link"
-                   type="javaee:message-destination-linkType"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-usageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The message-destination-usageType specifies the use of the
-        message destination indicated by the reference.  The value
-        indicates whether messages are consumed from the message
-        destination, produced for the destination, or both.  The
-        Assembler makes use of this information in linking producers
-        of a destination with its consumers.
-        
-        The value of the message-destination-usage element must be
-        one of the following:
-        Consumes
-        Produces
-        ConsumesProduces
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="Consumes"/>
-        <xsd:enumeration value="Produces"/>
-        <xsd:enumeration value="ConsumesProduces"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The message-destination-typeType specifies the type of
-        the destination. The type is specified by the Java interface
-        expected to be implemented by the destination.
-        
-        Example: 
-        
-        <message-destination-type>javax.jms.Queue
-        </message-destination-type>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:fully-qualified-classType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="message-destination-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The message-destination-linkType is used to link a message
-        destination reference or message-driven bean to a message
-        destination.
-        
-        The Assembler sets the value to reflect the flow of messages
-        between producers and consumers in the application.
-        
-        The value must be the message-destination-name of a message
-        destination in the same Deployment File or in another
-        Deployment File in the same Java EE application unit.
-        
-        Alternatively, the value may be composed of a path name
-        specifying a Deployment File containing the referenced
-        message destination with the message-destination-name of the
-        destination appended and separated from the path name by
-        "#". The path name is relative to the Deployment File
-        containing Deployment Component that is referencing the
-        message destination.  This allows multiple message
-        destinations with the same name to be uniquely identified.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_2.xsd
deleted file mode 100644
index e28cb1c..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_2.xsd
+++ /dev/null
@@ -1,747 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.2">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)javaee_web_services_1_2.xsds	1.18 02/13/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the Java EE Application
-	Server and the dependencies they have on container resources and
-	services.  The deployment descriptor must be named
-	"META-INF/webservices.xml" in the web services' jar file.
-
-	Used in: webservices.xml
-
-	All webservices deployment descriptors must indicate the
-	webservices schema by using the Java EE namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and by indicating the version of the schema by using the version
-	element as shown below:
-
-	    <webservices xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-		http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
-	      version="1.2">
-	      ...
-	    </webservices>
-
-	The instance documents may indicate the published version of the
-	schema using the xsi:schemaLocation attribute for the Java EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="webservices" type="javaee:webservicesType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservices element is the root element for the web services
-	deployment descriptor.  It specifies the set of web service
-	descriptions that are to be deployed into the Java EE Application Server
-	and the dependencies they have on container resources and services.
-
-	Used in: webservices.xml
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:key name="webservice-description-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The webservice-description-name identifies the collection of
-	  port-components associated with a WSDL file and JAX-RPC mapping. The
-	  name must be unique within the deployment descriptor.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:webservice-description"/>
-      <xsd:field xpath="javaee:webservice-description-name"/>
-    </xsd:key>
-  </xsd:element>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="handler-chainType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chain element defines the handlerchain.
-      Handlerchain can be defined such that the handlers in the
-      handlerchain operate,all ports of a service, on a specific
-      port or on a list of protocol-bindings. The choice of elements
-      service-name-pattern, port-name-pattern and protocol-bindings
-      are used to specify whether the handlers in handler-chain are
-      for a service, port or protocol binding. If none of these
-      choices are specified with the handler-chain element then the
-      handlers specified in the handler-chain will be applied on
-      everything.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:choice minOccurs="0" maxOccurs="1">
-         <xsd:element name="service-name-pattern"
-		      type="javaee:qname-pattern" />
-         <xsd:element name="port-name-pattern"
-		      type="javaee:qname-pattern" />
-         <xsd:element name="protocol-bindings"
-		      type="javaee:protocol-bindingListType"/>
-      </xsd:choice>
-
-      <xsd:element name="handler"
-                   type="javaee:port-component_handlerType"
-		   minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="handler-chainsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chains element defines the handlerchains associated
-      with this service or service endpoint.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="handler-chain"
-                   type="javaee:handler-chainType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-componentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component element associates a WSDL port with a web service
-	interface and implementation.  It defines the name of the port as a
-	component, optional description, optional display name, optional iconic
-	representations, WSDL port QName, Service Endpoint Interface, Service
-	Implementation Bean.
-
-	This element also associates a WSDL service with a JAX-WS Provider
-	implementation.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="port-component-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The port-component-name element specifies a port component's
-	      name.  This name is assigned by the module producer to name
-	      the service implementation bean in the module's deployment
-	      descriptor. The name must be unique among the port component
-	      names defined in the same module.
-
-	      Used in: port-component
-
-	      Example:
-		      <port-component-name>EmployeeService
-		      </port-component-name>
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-service"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name space and local name part of the WSDL
-	    service QName. This is required to be specified for
-	    port components that are JAX-WS Provider implementations.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-port"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name space and local name part of the WSDL
-	    port QName. This is not required to be specified for port
-	    components that are JAX-WS Provider implementations
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="enable-mtom"
-                   type="javaee:true-falseType"
-		   minOccurs="0" maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to enable or disable SOAP MTOM/XOP mechanism for an
-            endpoint implementation.
-
-	    Not to be specified for JAX-RPC runtime
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="protocol-binding"
-                   type="javaee:protocol-bindingType"
-		   minOccurs="0" maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to specify the protocol binding used by the port-component.
-	    If this element is not specified, then the default binding is
-            used (SOAP 1.1 over HTTP)
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-endpoint-interface"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-	    <![CDATA[
-
-	      The service-endpoint-interface element contains the
-	      fully-qualified name of the port component's Service Endpoint
-	      Interface.
-
-	      Used in: port-component
-
-	      Example:
-		      <remote>com.wombat.empl.EmployeeService</remote>
-
-	      This may not be specified in case there is no Service
-	      Enpoint Interface as is the case with directly using an
-	      implementation class with the @WebService annotation.
-
-	      When the port component is a Provider implementation
-	      this is not specified.
-
-	      ]]>
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-impl-bean"
-		   type="javaee:service-impl-beanType"/>
-
-      <xsd:choice>
-	<xsd:element name="handler"
-		     type="javaee:port-component_handlerType"
-		     minOccurs="0" maxOccurs="unbounded">
-	  <xsd:annotation>
-	    <xsd:documentation>
-		 To be used with JAX-RPC based runtime only.
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-	<xsd:element name="handler-chains"
-		     type="javaee:handler-chainsType"
-		     minOccurs="0" maxOccurs="1">
-	  <xsd:annotation>
-	    <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique within the
-	    module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed by the
-	    handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="soap-role"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that the
-	    Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="protocol-URIAliasType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type that is used for specifying tokens that
-	   start with ## which are used to alias existing standard
-	   protocol bindings and support aliases for new standard
-	   binding URIs that are introduced in future specifications.
-
-	   The following tokens alias the standard protocol binding
-	   URIs:
-
-	   ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
-	   ##SOAP11_HTTP_MTOM =
-                 "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
-           ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-           ##SOAP12_HTTP_MTOM =
-		 "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
-           ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="##.+"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="protocol-bindingListType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying a list of
-	   protocol-bindingType(s). For e.g.
-
-	    ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:list itemType="javaee:protocol-bindingType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="protocol-bindingType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying the URI for the
-	   protocol binding used by the port-component.  For
-	   portability one could use one of the following tokens that
-	   alias the standard binding types:
-
-	    ##SOAP11_HTTP
-	    ##SOAP11_HTTP_MTOM
-	    ##SOAP12_HTTP
-	    ##SOAP12_HTTP_MTOM
-	    ##XML_HTTP
-
-	   Other specifications could define tokens that start with ##
-	   to alias new standard binding URIs that are introduced.
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="qname-pattern">
-     <xsd:annotation>
-        <xsd:documentation>
-	     This is used to specify the QName pattern in the
-	     attribute service-name-pattern and port-name-pattern in
-	     the handler-chain element
-
-	     For example, the various forms acceptable here for
-	     service-name-pattern attribute in handler-chain element
-	     are :
-
-	     Exact Name: service-name-pattern="ns1:EchoService"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports with
-		 this exact service name. The namespace prefix must
-		 have been declared in a namespace declaration
-		 attribute in either the start-tag of the element
-		 where the prefix is used or in an an ancestor
-		 element (i.e. an element in whose content the
-		 prefixed markup occurs)
-
-	     Pattern : service-name-pattern="ns1:EchoService*"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports whose
-		 Service names are like EchoService1, EchoServiceFoo
-		 etc. The namespace prefix must have been declared in
-		 a namespace declaration attribute in either the
-		 start-tag of the element where the prefix is used or
-		 in an an ancestor element (i.e. an element in whose
-		 content the prefixed markup occurs)
-
-	     Wild Card : service-name-pattern="*"
-
-		In this case, handlers specified in this handler-chain
-		element will apply to ports of all service names.
-
-	    The same can be applied to port-name attribute in
-	    handler-chain element.
-
-        </xsd:documentation>
-     </xsd:annotation>
-
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/>
-     </xsd:restriction>
-
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-impl-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-impl-bean element defines the web service implementation.
-	A service implementation can be an EJB bean class or JAX-RPC web
-	component.  Existing EJB implementations are exposed as a web service
-	using an ejb-link.
-
-	Used in: port-component
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="ejb-link"
-		   type="javaee:ejb-linkType"/>
-      <xsd:element name="servlet-link"
-		   type="javaee:servlet-linkType"/>
-    </xsd:choice>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-	<![CDATA[
-
-	  The servlet-link element is used in the service-impl-bean element
-	  to specify that a Service Implementation Bean is defined as a
-	  JAX-RPC Service Endpoint.
-
-	  The value of the servlet-link element must be the servlet-name of
-	  a JAX-RPC Service Endpoint in the same WAR file.
-
-	  Used in: service-impl-bean
-
-	  Example:
-		  <servlet-link>StockQuoteService</servlet-link>
-
-	  ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservice-descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The webservice-description element defines a WSDL document file
-	and the set of Port components associated with the WSDL ports
-	defined in the WSDL document.  There may be multiple
-	webservice-descriptions defined within a module.
-
-	All WSDL file ports must have a corresponding port-component element
-	defined.
-
-	Used in: webservices
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="icon"
-		   type="javaee:iconType"
-		   minOccurs="0" maxOccurs="1"/>
-      <xsd:element name="webservice-description-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The webservice-description-name identifies the collection of
-	    port-components associated with a WSDL file and JAX-RPC
-	    mapping. The name must be unique within the deployment descriptor.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-file"
-		   type="javaee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the name of a WSDL file in the
-	    module.  The file name is a relative path within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="javaee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module.
-
-	    This is not required when JAX-WS based runtime is used.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-component"
-		   type="javaee:port-componentType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:handler"/>
-	  <xsd:field xpath="javaee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservicesType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="webservice-description"
-		   type="javaee:webservice-descriptionType"
-		   minOccurs="1" maxOccurs="unbounded">
-	<xsd:key name="port-component-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-	      <![CDATA[
-
-		The port-component-name element specifies a port
-		component's name.  This name is assigned by the module
-		producer to name the service implementation bean in the
-		module's deployment descriptor. The name must be unique
-		among the port component names defined in the same module.
-
-		Used in: port-component
-
-		Example:
-			<port-component-name>EmployeeService
-			</port-component-name>
-
-		]]>
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:port-component"/>
-	  <xsd:field xpath="javaee:port-component-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="1.2"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The required value for the version is 1.2.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_3.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_3.xsd
deleted file mode 100644
index 7daf23e..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_1_3.xsd
+++ /dev/null
@@ -1,572 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="1.3">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      The webservices element is the root element for the web services
-      deployment descriptor.  It specifies the set of web service
-      descriptions that are to be deployed into the Java EE Application
-      Server and the dependencies they have on container resources and
-      services.  The deployment descriptor must be named
-      "META-INF/webservices.xml" in the web services' jar file.
-      
-      Used in: webservices.xml
-      
-      All webservices deployment descriptors must indicate the
-      webservices schema by using the Java EE namespace:
-      
-      http://java.sun.com/xml/ns/javaee
-      
-      and by indicating the version of the schema by using the version
-      element as shown below:
-      
-      <webservices xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
-      	http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd"
-      version="1.3">
-      ...
-      </webservices>
-      
-      The instance documents may indicate the published version of the
-      schema using the xsi:schemaLocation attribute for the Java EE
-      namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_6.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="webservices"
-               type="javaee:webservicesType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The webservices element is the root element for the web services
-        deployment descriptor.  It specifies the set of web service
-        descriptions that are to be deployed into the Java EE Application Server
-        and the dependencies they have on container resources and services.
-        
-        Used in: webservices.xml
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:key name="webservice-description-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The webservice-description-name identifies the collection of
-          port-components associated with a WSDL file and JAX-RPC mapping. The
-          name must be unique within the deployment descriptor.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:webservice-description"/>
-      <xsd:field xpath="javaee:webservice-description-name"/>
-    </xsd:key>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-componentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The port-component element associates a WSDL port with a web service
-        interface and implementation.  It defines the name of the port as a
-        component, optional description, optional display name, optional iconic
-        representations, WSDL port QName, Service Endpoint Interface, Service
-        Implementation Bean.
-        
-        This element also associates a WSDL service with a JAX-WS Provider
-        implementation.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="display-name"
-                   type="javaee:display-nameType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="icon"
-                   type="javaee:iconType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="port-component-name"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The port-component-name element specifies a port component's
-            name.  This name is assigned by the module producer to name
-            the service implementation bean in the module's deployment
-            descriptor. The name must be unique among the port component
-            names defined in the same module.
-            
-            Used in: port-component
-            
-            Example:
-            	      <port-component-name>EmployeeService
-            	      </port-component-name>
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-service"
-                   type="javaee:xsdQNameType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Defines the name space and local name part of the WSDL
-            service QName. This is required to be specified for
-            port components that are JAX-WS Provider implementations.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-port"
-                   type="javaee:xsdQNameType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Defines the name space and local name part of the WSDL
-            port QName. This is not required to be specified for port
-            components that are JAX-WS Provider implementations
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="enable-mtom"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to enable or disable SOAP MTOM/XOP mechanism for an
-            endpoint implementation.
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="mtom-threshold"
-                   type="javaee:xsdNonNegativeIntegerType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            When MTOM is enabled, binary data above this size in bytes
-            will be XOP encoded or sent as attachment. Default value is 0.
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="addressing"
-                   type="javaee:addressingType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            This specifies the WS-Addressing requirements for a JAX-WS
-            web service. It corresponds to javax.xml.ws.soap.Addressing
-            annotation or its feature javax.xml.ws.soap.AddressingFeature.
-            
-            See the addressingType for more information.
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="respect-binding"
-                   type="javaee:respect-bindingType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Corresponds to the javax.xml.ws.RespectBinding annotation
-            or its corresponding javax.xml.ws.RespectBindingFeature web
-            service feature. This is used to control whether a JAX-WS
-            implementation must respect/honor the contents of the
-            wsdl:binding in the WSDL that is associated with the service.
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="protocol-binding"
-                   type="javaee:protocol-bindingType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to specify the protocol binding used by the port-component.
-            If this element is not specified, then the default binding is
-            used (SOAP 1.1 over HTTP)
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-endpoint-interface"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-            <![CDATA[[
-            The service-endpoint-interface element contains the
-            fully-qualified name of the port component's Service Endpoint
-            Interface.
-            
-            Used in: port-component
-            
-            Example:
-            	      <remote>com.wombat.empl.EmployeeService</remote>
-            
-            This may not be specified in case there is no Service
-            Enpoint Interface as is the case with directly using an
-            implementation class with the @WebService annotation.
-            
-            When the port component is a Provider implementation
-            this is not specified.
-            
-            ]]>
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-impl-bean"
-                   type="javaee:service-impl-beanType"/>
-      <xsd:choice>
-        <xsd:element name="handler"
-                     type="javaee:handlerType"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              	 To be used with JAX-RPC based runtime only.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="handler-chains"
-                     type="javaee:handler-chainsType"
-                     minOccurs="0"
-                     maxOccurs="1">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              	 To be used with JAX-WS based runtime only.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-impl-beanType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The service-impl-bean element defines the web service implementation.
-        A service implementation can be an EJB bean class or JAX-RPC web
-        component.  Existing EJB implementations are exposed as a web service
-        using an ejb-link.
-        
-        Used in: port-component
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice>
-      <xsd:element name="ejb-link"
-                   type="javaee:ejb-linkType"/>
-      <xsd:element name="servlet-link"
-                   type="javaee:servlet-linkType"/>
-    </xsd:choice>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-linkType">
-    <xsd:annotation>
-      <xsd:documentation>
-        <![CDATA[[
-        The servlet-link element is used in the service-impl-bean element
-        to specify that a Service Implementation Bean is defined as a
-        JAX-RPC Service Endpoint.
-        
-        The value of the servlet-link element must be the servlet-name of
-        a JAX-RPC Service Endpoint in the same WAR file.
-        
-        Used in: service-impl-bean
-        
-        Example:
-        	  <servlet-link>StockQuoteService</servlet-link>
-        
-        ]]>
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservice-descriptionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The webservice-description element defines a WSDL document file
-        and the set of Port components associated with the WSDL ports
-        defined in the WSDL document.  There may be multiple
-        webservice-descriptions defined within a module.
-        
-        All WSDL file ports must have a corresponding port-component element
-        defined.
-        
-        Used in: webservices
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="display-name"
-                   type="javaee:display-nameType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="icon"
-                   type="javaee:iconType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="webservice-description-name"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The webservice-description-name identifies the collection of
-            port-components associated with a WSDL file and JAX-RPC
-            mapping. The name must be unique within the deployment descriptor.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-file"
-                   type="javaee:pathType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The wsdl-file element contains the name of a WSDL file in the
-            module.  The file name is a relative path within the module.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="jaxrpc-mapping-file"
-                   type="javaee:pathType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The jaxrpc-mapping-file element contains the name of a file that
-            describes the JAX-RPC mapping between the Java interaces used by
-            the application and the WSDL description in the wsdl-file.  The
-            file name is a relative path within the module.
-            
-            This is not required when JAX-WS based runtime is used.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-component"
-                   type="javaee:port-componentType"
-                   minOccurs="1"
-                   maxOccurs="unbounded">
-        <xsd:key name="port-component_handler-name-key">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              Defines the name of the handler. The name must be unique
-              within the module.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:handler"/>
-          <xsd:field xpath="javaee:handler-name"/>
-        </xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="webservicesType">
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="webservice-description"
-                   type="javaee:webservice-descriptionType"
-                   minOccurs="1"
-                   maxOccurs="unbounded">
-        <xsd:key name="port-component-name-key">
-          <xsd:annotation>
-            <xsd:documentation>
-              <![CDATA[[
-              	The port-component-name element specifies a port
-              	component's name.  This name is assigned by the module
-              	producer to name the service implementation bean in the
-              	module's deployment descriptor. The name must be unique
-              	among the port component names defined in the same module.
-              
-              	Used in: port-component
-              
-              	Example:
-              		<port-component-name>EmployeeService
-              		</port-component-name>
-              
-              	
-              
-              ]]>
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:port-component"/>
-          <xsd:field xpath="javaee:port-component-name"/>
-        </xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-                   type="javaee:dewey-versionType"
-                   fixed="1.3"
-                   use="required">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The required value for the version is 1.3.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_2.xsd
deleted file mode 100644
index 3df0dd6..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_2.xsd
+++ /dev/null
@@ -1,578 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="1.2">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)javaee_web_services_client_1_2.xsds	1.19 02/13/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The port-component-ref element declares a client dependency
-	on the container for resolving a Service Endpoint Interface
-	to a WSDL port. It optionally associates the Service Endpoint
-	Interface with a particular port-component. This is only used
-	by the container for a Service.getPort(Class) method call.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="service-endpoint-interface"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-endpoint-interface element defines a fully qualified
-	    Java class that represents the Service Endpoint Interface of a
-	    WSDL port.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="enable-mtom"
-                   type="javaee:true-falseType"
-		   minOccurs="0" maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to enable or disable SOAP MTOM/XOP mechanism on the client
-	    side for a port-component.
-
-	    Not to be specified for JAX-RPC runtime
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-link"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-link element links a port-component-ref
-	    to a specific port-component required to be made available
-	    by a service reference.
-
-	    The value of a port-component-link must be the
-	    port-component-name of a port-component in the same module
-	    or another module in the same application unit. The syntax
-	    for specification follows the syntax defined for ejb-link
-	    in the EJB 2.0 specification.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:group name="service-refGroup">
-    <xsd:sequence>
-      <xsd:element name="service-ref"
-		   type="javaee:service-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:key name="service-ref_handler-name-key">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      Defines the name of the handler. The name must be unique
-	      within the module.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	  <xsd:selector xpath="javaee:handler"/>
-	  <xsd:field xpath="javaee:handler-name"/>
-	</xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:group>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The service-ref element declares a reference to a Web
-	service. It contains optional description, display name and
-	icons, a declaration of the required Service interface,
-	an optional WSDL document location, an optional set
-	of JAX-RPC mappings, an optional QName for the service element,
-	an optional set of Service Endpoint Interfaces to be resolved
-	by the container to a WSDL port, and an optional set of handlers.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="service-ref-name"
-		   type="javaee:jndi-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-ref-name element declares logical name that the
-	    components in the module use to look up the Web service. It
-	    is recommended that all service reference names start with
-	    "service/".
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-interface"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-interface element declares the fully qualified class
-	    name of the JAX-RPC Service interface the client depends on.
-	    In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-	    generated Service Interface class may also be specified.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-ref-type"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-ref-type element declares the type of the service-ref
-	    element that is injected or returned when a JNDI lookup is done.
-	    This must be either a fully qualified name of Service class or
-	    the fully qualified name of service endpoint interface class.
-	    This is only used with JAX-WS runtime where the corresponding
-	    @WebServiceRef annotation can be used to denote both a Service
-	    or a Port.
-
-	    If this is not specified, then the type of service-ref element
-	    that is injected or returned when a JNDI lookup is done is
-	    always a Service interface/class.
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="wsdl-file"
-		   type="javaee:xsdAnyURIType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The wsdl-file element contains the URI location of a WSDL
-	    file. The location is relative to the root of the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="jaxrpc-mapping-file"
-		   type="javaee:pathType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The jaxrpc-mapping-file element contains the name of a file that
-	    describes the JAX-RPC mapping between the Java interaces used by
-	    the application and the WSDL description in the wsdl-file.  The
-	    file name is a relative path within the module file.
-
-	    This is not required when JAX-WS based runtime is used.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="service-qname"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="1">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The service-qname element declares the specific WSDL service
-	    element that is being refered to.  It is not specified if no
-	    wsdl-file is declared.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-component-ref"
-		   type="javaee:port-component-refType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-component-ref element declares a client dependency
-	    on the container for resolving a Service Endpoint Interface
-	    to a WSDL port. It optionally associates the Service Endpoint
-	    Interface with a particular port-component. This is only used
-	    by the container for a Service.getPort(Class) method call.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:choice>
-	  <xsd:element name="handler"
-		       type="javaee:service-ref_handlerType"
-		       minOccurs="0" maxOccurs="unbounded">
-	    <xsd:annotation>
-	      <xsd:documentation>
-
-		Declares the handler for a port-component. Handlers can
-		access the init-param name/value pairs using the
-		HandlerInfo interface. If port-name is not specified, the
-		handler is assumed to be associated with all ports of the
-		service.
-
-		To be used with JAX-RPC based runtime only.
-
-	      </xsd:documentation>
-	    </xsd:annotation>
-	  </xsd:element>
-	  <xsd:element name="handler-chains"
-		       type="javaee:service-ref_handler-chainsType"
-		       minOccurs="0" maxOccurs="1">
-	    <xsd:annotation>
-	      <xsd:documentation>
-		 To be used with JAX-WS based runtime only.
-	      </xsd:documentation>
-	    </xsd:annotation>
-	  </xsd:element>
-      </xsd:choice>
-
-      <xsd:group ref="javaee:resourceGroup"/>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handler-chainType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chain element defines the handlerchain.
-      Handlerchain can be defined such that the handlers in the
-      handlerchain operate,all ports of a service, on a specific
-      port or on a list of protocol-bindings. The choice of elements
-      service-name-pattern, port-name-pattern and protocol-bindings
-      are used to specify whether the handlers in handler-chain are
-      for a service, port or protocol binding. If none of these
-      choices are specified with the handler-chain element then the
-      handlers specified in the handler-chain will be applied on
-      everything.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:choice minOccurs="0" maxOccurs="1">
-         <xsd:element name="service-name-pattern"
-		      type="javaee:service-ref_qname-pattern" />
-         <xsd:element name="port-name-pattern"
-	              type="javaee:service-ref_qname-pattern" />
-         <xsd:element name="protocol-bindings"
-	              type="javaee:service-ref_protocol-bindingListType"/>
-      </xsd:choice>
-
-      <xsd:element name="handler"
-                   type="javaee:service-ref_handlerType"
-		   minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handler-chainsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-      The handler-chains element defines the handlerchains associated with this
-      service or service endpoint.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="handler-chain"
-                   type="javaee:service-ref_handler-chainType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-ref_handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declares the handler for a port-component. Handlers can access the
-	init-param name/value pairs using the HandlerInfo interface. If
-	port-name is not specified, the handler is assumed to be associated
-	with all ports of the service.
-
-	Used in: service-ref
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the name of the handler. The name must be unique
-	    within the module.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a fully qualified class name for the handler
-	    implementation.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-
-      <xsd:element name="soap-header"
-		   type="javaee:xsdQNameType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the QName of a SOAP header that will be processed
-	    by the handler.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="soap-role"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The soap-role element contains a SOAP actor definition that
-	    the Handler will play as a role.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="port-name"
-		   type="javaee:string"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The port-name element defines the WSDL port-name that a
-	    handler should be associated with.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_protocol-URIAliasType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type that is used for specifying tokens that
-	   start with ## which are used to alias existing standard
-	   protocol bindings and support aliases for new standard
-	   binding URIs that are introduced in future specifications.
-
-	   The following tokens alias the standard protocol binding
-	   URIs:
-
-	   ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
-	   ##SOAP11_HTTP_MTOM =
-                 "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
-           ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-           ##SOAP12_HTTP_MTOM =
-                 "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
-           ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="##.+"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_protocol-bindingListType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying a list of
-	   protocol-bindingType(s). For e.g.
-
-	    ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:list itemType="javaee:service-ref_protocol-bindingType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_protocol-bindingType">
-     <xsd:annotation>
-        <xsd:documentation>
-	   Defines the type used for specifying the URI for the
-	   protocol binding used by the port-component.  For
-	   portability one could use one of the following tokens that
-	   alias the standard binding types:
-
-	    ##SOAP11_HTTP
-	    ##SOAP11_HTTP_MTOM
-            ##SOAP12_HTTP
-            ##SOAP12_HTTP_MTOM
-            ##XML_HTTP
-
-	   Other specifications could define tokens that start with ##
-	   to alias new standard binding URIs that are introduced.
-
-        </xsd:documentation>
-     </xsd:annotation>
-     <xsd:union memberTypes="xsd:anyURI javaee:service-ref_protocol-URIAliasType"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="service-ref_qname-pattern">
-     <xsd:annotation>
-        <xsd:documentation>
-	     This is used to specify the QName pattern in the
-	     attribute service-name-pattern and port-name-pattern in
-	     the handler-chain element
-
-	     For example, the various forms acceptable here for
-	     service-name-pattern attribute in handler-chain element
-	     are :
-
-	     Exact Name: service-name-pattern="ns1:EchoService"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports with
-		 this exact service name. The namespace prefix must
-		 have been declared in a namespace declaration
-		 attribute in either the start-tag of the element
-		 where the prefix is used or in an an ancestor
-		 element (i.e. an element in whose content the
-		 prefixed markup occurs)
-
-	     Pattern : service-name-pattern="ns1:EchoService*"
-
-		 In this case, handlers specified in this
-		 handler-chain element will apply to all ports whose
-		 Service names are like EchoService1, EchoServiceFoo
-		 etc. The namespace prefix must have been declared in
-		 a namespace declaration attribute in either the
-		 start-tag of the element where the prefix is used or
-		 in an an ancestor element (i.e. an element in whose
-		 content the prefixed markup occurs)
-
-	     Wild Card : service-name-pattern="*"
-
-		In this case, handlers specified in this handler-chain
-		element will apply to ports of all service names.
-
-	    The same can be applied to port-name attribute in
-	    handler-chain element.
-
-        </xsd:documentation>
-     </xsd:annotation>
-
-     <xsd:restriction base="xsd:token">
-        <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/>
-     </xsd:restriction>
-
-  </xsd:simpleType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_3.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_3.xsd
deleted file mode 100644
index 5c673ae..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/javaee_web_services_client_1_3.xsd
+++ /dev/null
@@ -1,737 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="1.3">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      (C) Copyright International Business Machines Corporation 2002
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="service-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The service-ref element declares a reference to a Web
-        service. It contains optional description, display name and
-        icons, a declaration of the required Service interface,
-        an optional WSDL document location, an optional set
-        of JAX-RPC mappings, an optional QName for the service element,
-        an optional set of Service Endpoint Interfaces to be resolved 
-        by the container to a WSDL port, and an optional set of handlers.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="service-ref-name"
-                   type="javaee:jndi-nameType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The service-ref-name element declares logical name that the
-            components in the module use to look up the Web service. It 
-            is recommended that all service reference names start with 
-            "service/".
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-interface"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The service-interface element declares the fully qualified class
-            name of the JAX-RPC Service interface the client depends on. 
-            In most cases the value will be javax.xml.rpc.Service.  A JAX-RPC
-            generated Service Interface class may also be specified.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-ref-type"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The service-ref-type element declares the type of the service-ref 
-            element that is injected or returned when a JNDI lookup is done.
-            This must be either a fully qualified name of Service class or 
-            the fully qualified name of service endpoint interface class. 
-            This is only used with JAX-WS runtime where the corresponding 
-            @WebServiceRef annotation can be used to denote both a Service
-            or a Port.
-            
-            If this is not specified, then the type of service-ref element 
-            that is injected or returned when a JNDI lookup is done is 
-            always a Service interface/class.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="wsdl-file"
-                   type="javaee:xsdAnyURIType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The wsdl-file element contains the URI location of a WSDL
-            file. The location is relative to the root of the module.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="jaxrpc-mapping-file"
-                   type="javaee:pathType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The jaxrpc-mapping-file element contains the name of a file that
-            describes the JAX-RPC mapping between the Java interaces used by
-            the application and the WSDL description in the wsdl-file.  The 
-            file name is a relative path within the module file.
-            
-            This is not required when JAX-WS based runtime is used.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="service-qname"
-                   type="javaee:xsdQNameType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The service-qname element declares the specific WSDL service
-            element that is being refered to.  It is not specified if no
-            wsdl-file is declared.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-component-ref"
-                   type="javaee:port-component-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The port-component-ref element declares a client dependency
-            on the container for resolving a Service Endpoint Interface
-            to a WSDL port. It optionally associates the Service Endpoint
-            Interface with a particular port-component. This is only used
-            by the container for a Service.getPort(Class) method call.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:choice>
-        <xsd:element name="handler"
-                     type="javaee:handlerType"
-                     minOccurs="0"
-                     maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              	Declares the handler for a port-component. Handlers can
-              	access the init-param name/value pairs using the
-              	HandlerInfo interface. If port-name is not specified, the
-              	handler is assumed to be associated with all ports of the
-              	service.
-              
-              	To be used with JAX-RPC based runtime only.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="handler-chains"
-                     type="javaee:handler-chainsType"
-                     minOccurs="0"
-                     maxOccurs="1">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              	 To be used with JAX-WS based runtime only.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-      <xsd:group ref="javaee:resourceGroup"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="port-component-refType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The port-component-ref element declares a client dependency
-        on the container for resolving a Service Endpoint Interface
-        to a WSDL port. It optionally associates the Service Endpoint
-        Interface with a particular port-component. This is only used
-        by the container for a Service.getPort(Class) method call.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="service-endpoint-interface"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The service-endpoint-interface element defines a fully qualified
-            Java class that represents the Service Endpoint Interface of a
-            WSDL port.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="enable-mtom"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Used to enable or disable SOAP MTOM/XOP mechanism on the client
-            side for a port-component. 
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="mtom-threshold"
-                   type="javaee:xsdNonNegativeIntegerType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            When MTOM is enabled, binary data above this size in bytes
-            should be XOP encoded or sent as attachment. Default value is 0.
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="addressing"
-                   type="javaee:addressingType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            This specifies the WS-Addressing requirements for a JAX-WS
-            web service. It corresponds to javax.xml.ws.soap.Addressing
-            annotation or its feature javax.xml.ws.soap.AddressingFeature.
-            
-            See the addressingType for more information.
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="respect-binding"
-                   type="javaee:respect-bindingType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Corresponds to the javax.xml.ws.RespectBinding annotation
-            or its corresponding javax.xml.ws.RespectBindingFeature web
-            service feature. This is used to control whether a JAX-WS
-            implementation must respect/honor the contents of the
-            wsdl:binding in the WSDL that is associated with the service.
-            
-            Not to be specified for JAX-RPC runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-component-link"
-                   type="javaee:string"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The port-component-link element links a port-component-ref
-            to a specific port-component required to be made available
-            by a service reference.
-            
-            The value of a port-component-link must be the
-            port-component-name of a port-component in the same module
-            or another module in the same application unit. The syntax
-            for specification follows the syntax defined for ejb-link
-            in the EJB 2.0 specification.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="handler-chainsType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The handler-chains element defines the handlerchains associated with this
-        service or service endpoint.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="handler-chain"
-                   type="javaee:handler-chainType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="handler-chainType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The handler-chain element defines the handlerchain. 
-        Handlerchain can be defined such that the handlers in the
-        handlerchain operate,all ports of a service, on a specific
-        port or on a list of protocol-bindings. The choice of elements
-        service-name-pattern, port-name-pattern and protocol-bindings
-        are used to specify whether the handlers in handler-chain are
-        for a service, port or protocol binding. If none of these 
-        choices are specified with the handler-chain element then the
-        handlers specified in the handler-chain will be applied on 
-        everything.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice minOccurs="0"
-                  maxOccurs="1">
-        <xsd:element name="service-name-pattern"
-                     type="javaee:qname-pattern"/>
-        <xsd:element name="port-name-pattern"
-                     type="javaee:qname-pattern"/>
-        <xsd:element name="protocol-bindings"
-                     type="javaee:protocol-bindingListType"/>
-      </xsd:choice>
-      <xsd:element name="handler"
-                   type="javaee:handlerType"
-                   minOccurs="1"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:simpleType name="protocol-bindingListType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the type used for specifying a list of
-        protocol-bindingType(s). For e.g.
-        
-        ##SOAP11_HTTP ##SOAP12_HTTP ##XML_HTTP
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:list itemType="javaee:protocol-bindingType"/>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="protocol-bindingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the type used for specifying the URI for the
-        protocol binding used by the port-component.  For
-        portability one could use one of the following tokens that
-        alias the standard binding types: 
-        
-        ##SOAP11_HTTP
-        ##SOAP11_HTTP_MTOM
-        ##SOAP12_HTTP
-        ##SOAP12_HTTP_MTOM
-        ##XML_HTTP
-        
-        Other specifications could define tokens that start with ##
-        to alias new standard binding URIs that are introduced.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:union memberTypes="xsd:anyURI javaee:protocol-URIAliasType"/>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="protocol-URIAliasType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the type that is used for specifying tokens that
-        start with ## which are used to alias existing standard
-        protocol bindings and support aliases for new standard
-        binding URIs that are introduced in future specifications.
-        
-        The following tokens alias the standard protocol binding
-        URIs:
-        
-        ##SOAP11_HTTP = "http://schemas.xmlsoap.org/wsdl/soap/http"
-        ##SOAP11_HTTP_MTOM = 
-        "http://schemas.xmlsoap.org/wsdl/soap/http?mtom=true"
-        ##SOAP12_HTTP = "http://www.w3.org/2003/05/soap/bindings/HTTP/"
-        ##SOAP12_HTTP_MTOM = 
-        "http://www.w3.org/2003/05/soap/bindings/HTTP/?mtom=true"
-        ##XML_HTTP = "http://www.w3.org/2004/08/wsdl/http"
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="##.+"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="qname-pattern">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This is used to specify the QName pattern in the
-        attribute service-name-pattern and port-name-pattern in
-        the handler-chain element
-        
-        For example, the various forms acceptable here for
-        service-name-pattern attribute in handler-chain element
-        are :
-        
-        Exact Name: service-name-pattern="ns1:EchoService"
-        
-        	 In this case, handlers specified in this
-        	 handler-chain element will apply to all ports with
-        	 this exact service name. The namespace prefix must
-        	 have been declared in a namespace declaration
-        	 attribute in either the start-tag of the element
-        	 where the prefix is used or in an an ancestor 
-        	 element (i.e. an element in whose content the 
-        	 prefixed markup occurs)
-        	 
-        
-        Pattern : service-name-pattern="ns1:EchoService*"
-        
-        	 In this case, handlers specified in this
-        	 handler-chain element will apply to all ports whose
-        	 Service names are like EchoService1, EchoServiceFoo
-        	 etc. The namespace prefix must have been declared in
-        	 a namespace declaration attribute in either the
-        	 start-tag of the element where the prefix is used or
-        	 in an an ancestor element (i.e. an element in whose 
-        	 content the prefixed markup occurs)
-        
-        Wild Card : service-name-pattern="*"
-        
-        	In this case, handlers specified in this handler-chain
-        	element will apply to ports of all service names.
-        
-        The same can be applied to port-name attribute in
-        handler-chain element.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="\*|([\i-[:]][\c-[:]]*:)?[\i-[:]][\c-[:]]*\*?"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="addressingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This specifies the WS-Addressing requirements for a JAX-WS web service.
-        It corresponds to javax.xml.ws.soap.Addressing annotation or its
-        feature javax.xml.ws.soap.AddressingFeature.
-        
-        If the "enabled" element is "true", WS-Addressing is enabled.
-        It means that the endpoint supports WS-Addressing but does not require
-        its use. The default value for "enabled" is "true".
-        
-        If the WS-Addressing is enabled and the "required" element is "true",
-        it means that the endpoint requires WS-Addressing. The default value
-        for "required" is "false".
-        
-        If WS-Addressing is enabled, the "responses" element determines
-        if an endpoint requires the use of only anonymous responses,
-        or only non-anonymous responses, or all. The value of the "responses"
-        element must be one of the following:
-        
-        ANONYMOUS
-        NON_ANONYMOUS
-        ALL
-        
-        The default value for the "responses" is ALL.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="enabled"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="required"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="responses"
-                   type="javaee:addressing-responsesType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="addressing-responsesType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        If WS-Addressing is enabled, this type determines if an endpoint
-        requires the use of only anonymous responses, or only non-anonymous
-        responses, or all.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="ANONYMOUS"/>
-        <xsd:enumeration value="NON_ANONYMOUS"/>
-        <xsd:enumeration value="ALL"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="respect-bindingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Corresponds to the javax.xml.ws.RespectBinding annotation
-        or its corresponding javax.xml.ws.RespectBindingFeature web
-        service feature. This is used to control whether a JAX-WS
-        implementation must respect/honor the contents of the
-        wsdl:binding in the WSDL that is associated with the service.
-        
-        If the "enabled" element is "true", wsdl:binding in the
-        associated WSDL, if any, must be respected/honored.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="enabled"
-                   type="javaee:true-falseType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="handlerType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Declares the handler for a port-component, service-ref. Handlers can
-        access the init-param name/value pairs using the HandlerInfo interface.
-        
-        Used in: port-component, service-ref
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="handler-name"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Defines the name of the handler. The name must be unique within the
-            module.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="handler-class"
-                   type="javaee:fully-qualified-classType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Defines a fully qualified class name for the handler implementation.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-                   type="javaee:param-valueType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Not to be specified for JAX-WS runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="soap-header"
-                   type="javaee:xsdQNameType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Defines the QName of a SOAP header that will be processed by the
-            handler.
-            
-            Not to be specified for JAX-WS runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="soap-role"
-                   type="javaee:string"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The soap-role element contains a SOAP actor definition that the
-            Handler will play as a role.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="port-name"
-                   type="javaee:string"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The port-name element defines the WSDL port-name that a
-            handler should be associated with. If port-name is not
-            specified, the handler is assumed to be associated with
-            all ports of the service.
-            
-            Not to be specified for JAX-WS runtime
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:group name="service-refGroup">
-    <xsd:sequence>
-      <xsd:element name="service-ref"
-                   type="javaee:service-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:key name="service-ref_handler-name-key">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              Defines the name of the handler. The name must be unique
-              within the module.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-          <xsd:selector xpath="javaee:handler"/>
-          <xsd:field xpath="javaee:handler-name"/>
-        </xsd:key>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:group>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_0.xsd
deleted file mode 100644
index 970a76d..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_0.xsd
+++ /dev/null
@@ -1,308 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="2.0">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)jsp_2_0.xsds	1.17 03/18/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      This is the XML Schema for the JSP 2.0 deployment descriptor
-      types.  The JSP 2.0 schema contains all the special
-      structures and datatypes that are necessary to use JSP files
-      from a web application.
-
-      The contents of this schema is used by the web-app_2_4.xsd
-      file to define JSP specific content.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-configType is used to provide global configuration
-	information for the JSP files in a web application. It has
-	two subelements, taglib and jsp-property-group.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib"
-		   type="j2ee:taglibType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="jsp-property-group"
-		   type="j2ee:jsp-property-groupType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-fileType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-file element contains the full path to a JSP file
-	within the web application beginning with a `/'.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:pathType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-property-groupType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-property-groupType is used to group a number of
-	files so they can be given global property information.
-	All files so described are deemed to be JSP files.  The
-	following additional properties can be described:
-
-	    - Control whether EL is ignored
-	    - Control whether scripting elements are invalid
-	    - Indicate pageEncoding information.
-	    - Indicate that a resource is a JSP document (XML)
-	    - Prelude and Coda automatic includes.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="url-pattern"
-		   type="j2ee:url-patternType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="el-ignored"
-		   type="j2ee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily set the isELIgnored
-	    property of a group of JSP pages.  By default, the
-	    EL evaluation is enabled for Web Applications using
-	    a Servlet 2.4 or greater web.xml, and disabled
-	    otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="page-encoding"
-		   type="j2ee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The valid values of page-encoding are those of the
-	    pageEncoding page directive.  It is a
-	    translation-time error to name different encodings
-	    in the pageEncoding attribute of the page directive
-	    of a JSP page and in a JSP configuration element
-	    matching the page.  It is also a translation-time
-	    error to name different encodings in the prolog
-	    or text declaration of a document in XML syntax and
-	    in a JSP configuration element matching the document.
-	    It is legal to name the same encoding through
-	    mulitple mechanisms.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="scripting-invalid"
-		   type="j2ee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily disable scripting in a
-	    group of JSP pages.  By default, scripting is
-	    enabled.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="is-xml"
-		   type="j2ee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    If true, denotes that the group of resources
-	    that match the URL pattern are JSP documents,
-	    and thus must be interpreted as XML documents.
-	    If false, the resources are assumed to not
-	    be JSP documents, unless there is another
-	    property group that indicates otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-prelude"
-		   type="j2ee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-prelude element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the beginning of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-coda"
-		   type="j2ee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-coda element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the end of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="taglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglibType defines the syntax for declaring in
-	the deployment descriptor that a tag library is
-	available to the application.  This can be done
-	to override implicit map entries from TLD files and
-	from the container.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib-uri"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    A taglib-uri element describes a URI identifying a
-	    tag library used in the web application.  The body
-	    of the taglib-uri element may be either an
-	    absolute URI specification, or a relative URI.
-	    There should be no entries in web.xml with the
-	    same taglib-uri value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="taglib-location"
-		   type="j2ee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    the taglib-location element contains the location
-	    (as a resource relative to the root of the web
-	    application) where to find the Tag Library
-	    Description file for the tag library.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_1.xsd
deleted file mode 100644
index ab63388..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_1.xsd
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="2.1">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)jsp_2_1.xsds	1.5 08/11/05
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      This is the XML Schema for the JSP 2.1 deployment descriptor
-      types.  The JSP 2.1 schema contains all the special
-      structures and datatypes that are necessary to use JSP files
-      from a web application.
-
-      The contents of this schema is used by the web-app_2_5.xsd
-      file to define JSP specific content.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-configType is used to provide global configuration
-	information for the JSP files in a web application. It has
-	two subelements, taglib and jsp-property-group.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib"
-		   type="javaee:taglibType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="jsp-property-group"
-		   type="javaee:jsp-property-groupType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-fileType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-file element contains the full path to a JSP file
-	within the web application beginning with a `/'.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:pathType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-property-groupType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The jsp-property-groupType is used to group a number of
-	files so they can be given global property information.
-	All files so described are deemed to be JSP files.  The
-	following additional properties can be described:
-
-	    - Control whether EL is ignored.
-	    - Control whether scripting elements are invalid.
-	    - Indicate pageEncoding information.
-	    - Indicate that a resource is a JSP document (XML).
-	    - Prelude and Coda automatic includes.
-            - Control whether the character sequence #{ is allowed
-              when used as a String literal.
-            - Control whether template text containing only
-              whitespaces must be removed from the response output.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="url-pattern"
-		   type="javaee:url-patternType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="el-ignored"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily set the isELIgnored
-	    property of a group of JSP pages.  By default, the
-	    EL evaluation is enabled for Web Applications using
-	    a Servlet 2.4 or greater web.xml, and disabled
-	    otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="page-encoding"
-		   type="javaee:string"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The valid values of page-encoding are those of the
-	    pageEncoding page directive.  It is a
-	    translation-time error to name different encodings
-	    in the pageEncoding attribute of the page directive
-	    of a JSP page and in a JSP configuration element
-	    matching the page.  It is also a translation-time
-	    error to name different encodings in the prolog
-	    or text declaration of a document in XML syntax and
-	    in a JSP configuration element matching the document.
-	    It is legal to name the same encoding through
-	    mulitple mechanisms.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="scripting-invalid"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Can be used to easily disable scripting in a
-	    group of JSP pages.  By default, scripting is
-	    enabled.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="is-xml"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    If true, denotes that the group of resources
-	    that match the URL pattern are JSP documents,
-	    and thus must be interpreted as XML documents.
-	    If false, the resources are assumed to not
-	    be JSP documents, unless there is another
-	    property group that indicates otherwise.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-prelude"
-		   type="javaee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-prelude element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the beginning of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-coda"
-		   type="javaee:pathType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The include-coda element is a context-relative
-	    path that must correspond to an element in the
-	    Web Application.  When the element is present,
-	    the given path will be automatically included (as
-	    in an include directive) at the end of each
-	    JSP page in this jsp-property-group.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="deferred-syntax-allowed-as-literal"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-             The character sequence #{ is reserved for EL expressions.
-             Consequently, a translation error occurs if the #{
-             character sequence is used as a String literal, unless
-             this element is enabled (true). Disabled (false) by
-             default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="trim-directive-whitespaces"
-		   type="javaee:true-falseType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-             Indicates that template text containing only whitespaces
-             must be removed from the response output. It has no
-             effect on JSP documents (XML syntax). Disabled (false)
-             by default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="taglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglibType defines the syntax for declaring in
-	the deployment descriptor that a tag library is
-	available to the application.  This can be done
-	to override implicit map entries from TLD files and
-	from the container.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="taglib-uri"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    A taglib-uri element describes a URI identifying a
-	    tag library used in the web application.  The body
-	    of the taglib-uri element may be either an
-	    absolute URI specification, or a relative URI.
-	    There should be no entries in web.xml with the
-	    same taglib-uri value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="taglib-location"
-		   type="javaee:pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    the taglib-location element contains the location
-	    (as a resource relative to the root of the web
-	    application) where to find the Tag Library
-	    Description file for the tag library.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_2.xsd
deleted file mode 100644
index fa41e42..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/jsp_2_2.xsd
+++ /dev/null
@@ -1,389 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="2.2">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      This is the XML Schema for the JSP 2.2 deployment descriptor
-      types.  The JSP 2.2 schema contains all the special
-      structures and datatypes that are necessary to use JSP files
-      from a web application. 
-      
-      The contents of this schema is used by the web-common_3_0.xsd 
-      file to define JSP specific content. 
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_6.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The jsp-configType is used to provide global configuration
-        information for the JSP files in a web application. It has
-        two subelements, taglib and jsp-property-group.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="taglib"
-                   type="javaee:taglibType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="jsp-property-group"
-                   type="javaee:jsp-property-groupType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-fileType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The jsp-file element contains the full path to a JSP file
-        within the web application beginning with a `/'.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:pathType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="jsp-property-groupType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The jsp-property-groupType is used to group a number of
-        files so they can be given global property information.
-        All files so described are deemed to be JSP files.  The
-        following additional properties can be described:
-        
-        - Control whether EL is ignored.
-        - Control whether scripting elements are invalid.
-        - Indicate pageEncoding information.
-        - Indicate that a resource is a JSP document (XML).
-        - Prelude and Coda automatic includes.
-        - Control whether the character sequence #{ is allowed
-        when used as a String literal.
-        - Control whether template text containing only
-        whitespaces must be removed from the response output.
-        - Indicate the default contentType information.
-        - Indicate the default buffering model for JspWriter
-        - Control whether error should be raised for the use of
-        undeclared namespaces in a JSP page.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="url-pattern"
-                   type="javaee:url-patternType"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="el-ignored"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Can be used to easily set the isELIgnored
-            property of a group of JSP pages.  By default, the
-            EL evaluation is enabled for Web Applications using
-            a Servlet 2.4 or greater web.xml, and disabled
-            otherwise.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="page-encoding"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The valid values of page-encoding are those of the
-            pageEncoding page directive.  It is a
-            translation-time error to name different encodings
-            in the pageEncoding attribute of the page directive
-            of a JSP page and in a JSP configuration element
-            matching the page.  It is also a translation-time
-            error to name different encodings in the prolog
-            or text declaration of a document in XML syntax and
-            in a JSP configuration element matching the document.
-            It is legal to name the same encoding through
-            mulitple mechanisms.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="scripting-invalid"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Can be used to easily disable scripting in a
-            group of JSP pages.  By default, scripting is
-            enabled.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="is-xml"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            If true, denotes that the group of resources
-            that match the URL pattern are JSP documents,
-            and thus must be interpreted as XML documents.
-            If false, the resources are assumed to not
-            be JSP documents, unless there is another
-            property group that indicates otherwise.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-prelude"
-                   type="javaee:pathType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The include-prelude element is a context-relative
-            path that must correspond to an element in the
-            Web Application.  When the element is present,
-            the given path will be automatically included (as
-            in an include directive) at the beginning of each
-            JSP page in this jsp-property-group.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="include-coda"
-                   type="javaee:pathType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The include-coda element is a context-relative
-            path that must correspond to an element in the
-            Web Application.  When the element is present,
-            the given path will be automatically included (as
-            in an include directive) at the end of each
-            JSP page in this jsp-property-group.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="deferred-syntax-allowed-as-literal"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The character sequence #{ is reserved for EL expressions.
-            Consequently, a translation error occurs if the #{
-            character sequence is used as a String literal, unless
-            this element is enabled (true). Disabled (false) by
-            default.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="trim-directive-whitespaces"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Indicates that template text containing only whitespaces
-            must be removed from the response output. It has no
-            effect on JSP documents (XML syntax). Disabled (false)
-            by default.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="default-content-type"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The valid values of default-content-type are those of the
-            contentType page directive.  It specifies the default
-            response contentType if the page directive does not include
-            a contentType attribute.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="buffer"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The valid values of buffer are those of the
-            buffer page directive.  It specifies if buffering should be
-            used for the output to response, and if so, the size of the
-            buffer to use.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="error-on-undeclared-namespace"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The default behavior when a tag with unknown namespace is used
-            in a JSP page (regular syntax) is to silently ignore it.  If
-            set to true, then an error must be raised during the translation
-            time when an undeclared tag is used in a JSP page.  Disabled
-            (false) by default.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="taglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The taglibType defines the syntax for declaring in
-        the deployment descriptor that a tag library is
-        available to the application.  This can be done
-        to override implicit map entries from TLD files and
-        from the container.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="taglib-uri"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            A taglib-uri element describes a URI identifying a
-            tag library used in the web application.  The body
-            of the taglib-uri element may be either an
-            absolute URI specification, or a relative URI.
-            There should be no entries in web.xml with the
-            same taglib-uri value.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="taglib-location"
-                   type="javaee:pathType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            the taglib-location element contains the location
-            (as a resource relative to the root of the web
-            application) where to find the Tag Library
-            Description file for the tag library.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/orm_1_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/orm_1_0.xsd
deleted file mode 100644
index bfd9c75..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/orm_1_0.xsd
+++ /dev/null
@@ -1,1562 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Java Persistence API object-relational mapping file schema -->
-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence/orm" 
-  xmlns:orm="http://java.sun.com/xml/ns/persistence/orm" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-  elementFormDefault="qualified" 
-  attributeFormDefault="unqualified" 
-  version="1.0">
-
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)orm_1_0.xsd 1.0  Feb 14 2006
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-      Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
-
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-
-      Contributor(s):
-
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-
-      The Eclipse Foundation elects to include this software in this
-      distribution under the CDDL license.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-     <xsd:documentation><![CDATA[
-
-       This is the XML Schema for the persistence object-relational 
-       mapping file.
-       The file may be named "META-INF/orm.xml" in the persistence 
-       archive or it may be named some other name which would be 
-       used to locate the file as resource on the classpath.
-
-     ]]></xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:complexType name="emptyType"/>
-
-  <xsd:simpleType name="versionType">
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[0-9]+(\.[0-9]+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:element name="entity-mappings">
-    <xsd:complexType>
-      <xsd:annotation>
-        <xsd:documentation>
-
-        The entity-mappings element is the root element of an mapping
-        file. It contains the following four types of elements:
-
-        1. The persistence-unit-metadata element contains metadata
-        for the entire persistence unit. It is undefined if this element
-        occurs in multiple mapping files within the same persistence unit.
-        
-        2. The package, schema, catalog and access elements apply to all of
-        the entity, mapped-superclass and embeddable elements defined in
-        the same file in which they occur.
-
-        3. The sequence-generator, table-generator, named-query,
-        named-native-query and sql-result-set-mapping elements are global
-        to the persistence unit. It is undefined to have more than one
-        sequence-generator or table-generator of the same name in the same
-        or different mapping files in a persistence unit. It is also 
-        undefined to have more than one named-query or named-native-query
-        of the same name in the same or different mapping files in a 
-        persistence unit.
-
-        4. The entity, mapped-superclass and embeddable elements each define
-        the mapping information for a managed persistent class. The mapping
-        information contained in these elements may be complete or it may
-        be partial.
-
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:sequence>
-        <xsd:element name="description" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="persistence-unit-metadata" 
-                     type="orm:persistence-unit-metadata"
-                     minOccurs="0"/>
-        <xsd:element name="package" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="schema" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="catalog" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="access" type="orm:access-type"
-                     minOccurs="0"/>
-        <xsd:element name="sequence-generator" type="orm:sequence-generator"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="table-generator" type="orm:table-generator" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="named-query" type="orm:named-query" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="named-native-query" type="orm:named-native-query"
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="sql-result-set-mapping" 
-                     type="orm:sql-result-set-mapping" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="mapped-superclass" type="orm:mapped-superclass" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="entity" type="orm:entity" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="embeddable" type="orm:embeddable" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:sequence>
-      <xsd:attribute name="version" type="orm:versionType" 
-                     fixed="1.0" use="required"/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-metadata">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Metadata that applies to the persistence unit and not just to 
-        the mapping file in which it is contained. 
-
-        If the xml-mapping-metadata-complete element is specified then 
-        the complete set of mapping metadata for the persistence unit 
-        is contained in the XML mapping files for the persistence unit.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="xml-mapping-metadata-complete" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="persistence-unit-defaults" 
-                   type="orm:persistence-unit-defaults"
-                   minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="persistence-unit-defaults">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        These defaults are applied to the persistence unit as a whole 
-        unless they are overridden by local annotation or XML 
-        element settings. 
-        
-        schema - Used as the schema for all tables or secondary tables
-            that apply to the persistence unit
-        catalog - Used as the catalog for all tables or secondary tables
-            that apply to the persistence unit
-        access - Used as the access type for all managed classes in
-            the persistence unit
-        cascade-persist - Adds cascade-persist to the set of cascade options
-            in entity relationships of the persistence unit
-        entity-listeners - List of default entity listeners to be invoked 
-            on each entity in the persistence unit. 
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-        <xsd:element name="schema" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="catalog" type="xsd:string"
-                     minOccurs="0"/>
-        <xsd:element name="access" type="orm:access-type"
-                     minOccurs="0"/>
-        <xsd:element name="cascade-persist" type="orm:emptyType" 
-                     minOccurs="0"/>
-        <xsd:element name="entity-listeners" type="orm:entity-listeners"
-                     minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for an entity. Is allowed to be
-        sparsely populated and used in conjunction with the annotations.
-        Alternatively, the metadata-complete attribute can be used to 
-        indicate that no annotations on the entity class (and its fields
-        or properties) are to be processed. If this is the case then 
-        the defaulting rules for the entity and its subelements will 
-        be recursively applied.
-
-        @Target(TYPE) @Retention(RUNTIME)
-          public @interface Entity {
-          String name() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="table" type="orm:table" 
-                   minOccurs="0"/>
-      <xsd:element name="secondary-table" type="orm:secondary-table" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="primary-key-join-column" 
-                   type="orm:primary-key-join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/>
-      <xsd:element name="inheritance" type="orm:inheritance" minOccurs="0"/>
-      <xsd:element name="discriminator-value" type="orm:discriminator-value" 
-                   minOccurs="0"/>
-      <xsd:element name="discriminator-column" 
-                   type="orm:discriminator-column" 
-                   minOccurs="0"/>
-      <xsd:element name="sequence-generator" type="orm:sequence-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="table-generator" type="orm:table-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="named-query" type="orm:named-query" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="named-native-query" type="orm:named-native-query" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="sql-result-set-mapping" 
-                   type="orm:sql-result-set-mapping" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="exclude-default-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="entity-listeners" type="orm:entity-listeners" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="association-override" 
-                   type="orm:association-override"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-    <xsd:attribute name="access" type="orm:access-type"/>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="attributes">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element contains the entity field or property mappings.
-        It may be sparsely populated to include only a subset of the
-        fields or properties. If metadata-complete for the entity is true
-        then the remainder of the attributes will be defaulted according
-        to the default rules.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="id" type="orm:id" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="embedded-id" type="orm:embedded-id" 
-                     minOccurs="0"/>
-      </xsd:choice>
-      <xsd:element name="basic" type="orm:basic"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="version" type="orm:version"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="many-to-one" type="orm:many-to-one"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="one-to-many" type="orm:one-to-many"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="one-to-one" type="orm:one-to-one"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="many-to-many" type="orm:many-to-many" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="embedded" type="orm:embedded"
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="transient" type="orm:transient"
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="access-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element determines how the persistence provider accesses the
-        state of an entity or embedded object.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="PROPERTY"/>
-      <xsd:enumeration value="FIELD"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-listeners">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface EntityListeners {
-          Class[] value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="entity-listener" type="orm:entity-listener" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-listener">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines an entity listener to be invoked at lifecycle events
-        for the entities that list this listener.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-persist">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PrePersist {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-persist">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostPersist {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-remove">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PreRemove {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-remove">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostRemove {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="pre-update">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PreUpdate {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-update">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostUpdate {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="post-load">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD}) @Retention(RUNTIME)
-        public @interface PostLoad {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="method-name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="query-hint">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME) 
-        public @interface QueryHint {
-          String name();
-          String value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="value" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="named-query">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface NamedQuery {
-          String name();
-          String query();
-          QueryHint[] hints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="query" type="xsd:string"/>
-      <xsd:element name="hint" type="orm:query-hint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="named-native-query">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface NamedNativeQuery {
-          String name();
-          String query();
-          QueryHint[] hints() default {};
-          Class resultClass() default void.class;
-          String resultSetMapping() default ""; //named SqlResultSetMapping
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="query" type="xsd:string"/>
-      <xsd:element name="hint" type="orm:query-hint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="result-class" type="xsd:string"/>
-    <xsd:attribute name="result-set-mapping" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="sql-result-set-mapping">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface SqlResultSetMapping {
-          String name();
-          EntityResult[] entities() default {};
-          ColumnResult[] columns() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="entity-result" type="orm:entity-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="column-result" type="orm:column-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="entity-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface EntityResult {
-          Class entityClass();
-          FieldResult[] fields() default {};
-          String discriminatorColumn() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="field-result" type="orm:field-result" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="entity-class" type="xsd:string" use="required"/>
-    <xsd:attribute name="discriminator-column" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="field-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface FieldResult {
-          String name();
-          String column();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="column" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="column-result">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface ColumnResult {
-          String name();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Table {
-          String name() default "";
-          String catalog() default "";
-          String schema() default "";
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="secondary-table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface SecondaryTable {
-          String name();
-          String catalog() default "";
-          String schema() default "";
-          PrimaryKeyJoinColumn[] pkJoinColumns() default {};
-          UniqueConstraint[] uniqueConstraints() default {};
-         }
-
-       </xsd:documentation>
-     </xsd:annotation>
-     <xsd:sequence>
-       <xsd:element name="primary-key-join-column" 
-                    type="orm:primary-key-join-column" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-       <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="unique-constraint">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({}) @Retention(RUNTIME)
-        public @interface UniqueConstraint {
-          String[] columnNames();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column-name" type="xsd:string" 
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Column {
-          String name() default "";
-          boolean unique() default false;
-          boolean nullable() default true;
-          boolean insertable() default true;
-          boolean updatable() default true;
-          String columnDefinition() default "";
-          String table() default "";
-          int length() default 255;
-          int precision() default 0; // decimal precision
-          int scale() default 0; // decimal scale
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="unique" type="xsd:boolean"/>
-    <xsd:attribute name="nullable" type="xsd:boolean"/>
-    <xsd:attribute name="insertable" type="xsd:boolean"/>
-    <xsd:attribute name="updatable" type="xsd:boolean"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-    <xsd:attribute name="length" type="xsd:int"/>
-    <xsd:attribute name="precision" type="xsd:int"/>
-    <xsd:attribute name="scale" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="join-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface JoinColumn {
-          String name() default "";
-          String referencedColumnName() default "";
-          boolean unique() default false;
-          boolean nullable() default true;
-          boolean insertable() default true;
-          boolean updatable() default true;
-          String columnDefinition() default "";
-          String table() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="referenced-column-name" type="xsd:string"/>
-    <xsd:attribute name="unique" type="xsd:boolean"/>
-    <xsd:attribute name="nullable" type="xsd:boolean"/>
-    <xsd:attribute name="insertable" type="xsd:boolean"/>
-    <xsd:attribute name="updatable" type="xsd:boolean"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="generation-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum GenerationType { TABLE, SEQUENCE, IDENTITY, AUTO };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="TABLE"/>
-      <xsd:enumeration value="SEQUENCE"/>
-      <xsd:enumeration value="IDENTITY"/>
-      <xsd:enumeration value="AUTO"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="attribute-override">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface AttributeOverride {
-          String name();
-          Column column();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="association-override">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface AssociationOverride {
-          String name();
-          JoinColumn[] joinColumns();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="join-column" type="orm:join-column"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="id-class">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface IdClass {
-          Class value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="id">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Id {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" 
-                   minOccurs="0"/>
-      <xsd:element name="generated-value" type="orm:generated-value"
-                   minOccurs="0"/>
-      <xsd:element name="temporal" type="orm:temporal" 
-                   minOccurs="0"/>
-      <xsd:element name="table-generator" type="orm:table-generator" 
-                   minOccurs="0"/>
-      <xsd:element name="sequence-generator" type="orm:sequence-generator"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embedded-id">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface EmbeddedId {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="transient">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Transient {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="version">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Version {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" minOccurs="0"/>
-      <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="basic">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Basic {
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="column" type="orm:column" minOccurs="0"/>
-      <xsd:choice>
-        <xsd:element name="lob" type="orm:lob" minOccurs="0"/>
-        <xsd:element name="temporal" type="orm:temporal" minOccurs="0"/>
-        <xsd:element name="enumerated" type="orm:enumerated" minOccurs="0"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="fetch-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum FetchType { LAZY, EAGER };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="LAZY"/>
-      <xsd:enumeration value="EAGER"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="lob">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Lob {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="temporal">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Temporal {
-          TemporalType value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="orm:temporal-type"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="temporal-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum TemporalType {
-          DATE, // java.sql.Date
-          TIME, // java.sql.Time
-          TIMESTAMP // java.sql.Timestamp
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-      <xsd:restriction base="xsd:token">
-        <xsd:enumeration value="DATE"/>
-        <xsd:enumeration value="TIME"/>
-        <xsd:enumeration value="TIMESTAMP"/>
-     </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="enumerated">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Enumerated {
-          EnumType value() default ORDINAL;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="orm:enum-type"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="enum-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum EnumType {
-          ORDINAL,
-          STRING
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="ORDINAL"/>
-      <xsd:enumeration value="STRING"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="many-to-one">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface ManyToOne {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>       
-        <xsd:element name="join-column" type="orm:join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-table" type="orm:join-table" 
-                     minOccurs="0"/>
-      </xsd:choice>       
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="cascade-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum CascadeType { ALL, PERSIST, MERGE, REMOVE, REFRESH};
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="cascade-all" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-persist" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-merge" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-remove" type="orm:emptyType"
-                   minOccurs="0"/>
-      <xsd:element name="cascade-refresh" type="orm:emptyType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="one-to-one">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OneToOne {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default EAGER;
-          boolean optional() default true;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice>
-        <xsd:element name="primary-key-join-column" 
-                     type="orm:primary-key-join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-column" type="orm:join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-        <xsd:element name="join-table" type="orm:join-table" 
-                     minOccurs="0"/>
-      </xsd:choice>
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="optional" type="xsd:boolean"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="one-to-many">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OneToMany {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default LAZY;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="order-by" type="orm:order-by" 
-                   minOccurs="0"/>
-      <xsd:element name="map-key" type="orm:map-key" 
-                   minOccurs="0"/>
-      <xsd:choice>       
-        <xsd:element name="join-table" type="orm:join-table" 
-                     minOccurs="0"/>
-        <xsd:element name="join-column" type="orm:join-column" 
-                     minOccurs="0" maxOccurs="unbounded"/>
-      </xsd:choice>       
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="join-table">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface JoinTable {
-          String name() default "";
-          String catalog() default "";
-          String schema() default "";
-          JoinColumn[] joinColumns() default {};
-          JoinColumn[] inverseJoinColumns() default {};
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="join-column" type="orm:join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="inverse-join-column" type="orm:join-column" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="many-to-many">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface ManyToMany {
-          Class targetEntity() default void.class;
-          CascadeType[] cascade() default {};
-          FetchType fetch() default LAZY;
-          String mappedBy() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="order-by" type="orm:order-by" 
-                   minOccurs="0"/>
-      <xsd:element name="map-key" type="orm:map-key" 
-                   minOccurs="0"/>
-      <xsd:element name="join-table" type="orm:join-table" 
-                   minOccurs="0"/>
-      <xsd:element name="cascade" type="orm:cascade-type" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="target-entity" type="xsd:string"/>
-    <xsd:attribute name="fetch" type="orm:fetch-type"/>
-    <xsd:attribute name="mapped-by" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="generated-value">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface GeneratedValue {
-          GenerationType strategy() default AUTO;
-          String generator() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="strategy" type="orm:generation-type"/>
-    <xsd:attribute name="generator" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="map-key">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface MapKey {
-          String name() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="order-by">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface OrderBy {
-          String value() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="inheritance">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Inheritance {
-          InheritanceType strategy() default SINGLE_TABLE;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="strategy" type="orm:inheritance-type"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="inheritance-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum InheritanceType
-          { SINGLE_TABLE, JOINED, TABLE_PER_CLASS};
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="SINGLE_TABLE"/>
-      <xsd:enumeration value="JOINED"/>
-      <xsd:enumeration value="TABLE_PER_CLASS"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="discriminator-value">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface DiscriminatorValue {
-          String value();
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string"/>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="discriminator-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum DiscriminatorType { STRING, CHAR, INTEGER };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="STRING"/>
-      <xsd:enumeration value="CHAR"/>
-      <xsd:enumeration value="INTEGER"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="primary-key-join-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface PrimaryKeyJoinColumn {
-          String name() default "";
-          String referencedColumnName() default "";
-          String columnDefinition() default "";
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="referenced-column-name" type="xsd:string"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="discriminator-column">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface DiscriminatorColumn {
-          String name() default "DTYPE";
-          DiscriminatorType discriminatorType() default STRING;
-          String columnDefinition() default "";
-          int length() default 31;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string"/>
-    <xsd:attribute name="discriminator-type" type="orm:discriminator-type"/>
-    <xsd:attribute name="column-definition" type="xsd:string"/>
-    <xsd:attribute name="length" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embeddable">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for embeddable objects. Is 
-        allowed to be sparsely populated and used in conjunction with 
-        the annotations. Alternatively, the metadata-complete attribute 
-        can be used to indicate that no annotations are to be processed 
-        in the class. If this is the case then the defaulting rules will 
-        be recursively applied.
-
-        @Target({TYPE}) @Retention(RUNTIME)
-        public @interface Embeddable {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="attributes" type="orm:embeddable-attributes" 
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-    <xsd:attribute name="access" type="orm:access-type"/>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embeddable-attributes">
-    <xsd:sequence>
-      <xsd:element name="basic" type="orm:basic" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="transient" type="orm:transient" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="embedded">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface Embedded {}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="attribute-override" type="orm:attribute-override" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="mapped-superclass">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines the settings and mappings for a mapped superclass. Is 
-        allowed to be sparsely populated and used in conjunction with 
-        the annotations. Alternatively, the metadata-complete attribute 
-        can be used to indicate that no annotations are to be processed 
-        If this is the case then the defaulting rules will be recursively 
-        applied.
-
-        @Target(TYPE) @Retention(RUNTIME)
-        public @interface MappedSuperclass{}
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description" type="xsd:string" minOccurs="0"/>
-      <xsd:element name="id-class" type="orm:id-class" minOccurs="0"/>
-      <xsd:element name="exclude-default-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="exclude-superclass-listeners" type="orm:emptyType" 
-                   minOccurs="0"/>
-      <xsd:element name="entity-listeners" type="orm:entity-listeners" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-persist" type="orm:pre-persist" minOccurs="0"/>
-      <xsd:element name="post-persist" type="orm:post-persist" 
-                   minOccurs="0"/>
-      <xsd:element name="pre-remove" type="orm:pre-remove" minOccurs="0"/>
-      <xsd:element name="post-remove" type="orm:post-remove" minOccurs="0"/>
-      <xsd:element name="pre-update" type="orm:pre-update" minOccurs="0"/>
-      <xsd:element name="post-update" type="orm:post-update" minOccurs="0"/>
-      <xsd:element name="post-load" type="orm:post-load" minOccurs="0"/>
-      <xsd:element name="attributes" type="orm:attributes" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="class" type="xsd:string" use="required"/>
-    <xsd:attribute name="access" type="orm:access-type"/>
-    <xsd:attribute name="metadata-complete" type="xsd:boolean"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="sequence-generator">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface SequenceGenerator {
-          String name();
-          String sequenceName() default "";
-          int initialValue() default 1;
-          int allocationSize() default 50;
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="sequence-name" type="xsd:string"/>
-    <xsd:attribute name="initial-value" type="xsd:int"/>
-    <xsd:attribute name="allocation-size" type="xsd:int"/>
-  </xsd:complexType>
-
-  <!-- **************************************************** -->
-
-  <xsd:complexType name="table-generator">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        @Target({TYPE, METHOD, FIELD}) @Retention(RUNTIME)
-        public @interface TableGenerator {
-          String name();
-          String table() default "";
-          String catalog() default "";
-          String schema() default "";
-          String pkColumnName() default "";
-          String valueColumnName() default "";
-          String pkColumnValue() default "";
-          int initialValue() default 0;
-          int allocationSize() default 50;
-          UniqueConstraint[] uniqueConstraints() default {};
-        }
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="unique-constraint" type="orm:unique-constraint" 
-                   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="table" type="xsd:string"/>
-    <xsd:attribute name="catalog" type="xsd:string"/>
-    <xsd:attribute name="schema" type="xsd:string"/>
-    <xsd:attribute name="pk-column-name" type="xsd:string"/>
-    <xsd:attribute name="value-column-name" type="xsd:string"/>
-    <xsd:attribute name="pk-column-value" type="xsd:string"/>
-    <xsd:attribute name="initial-value" type="xsd:int"/>
-    <xsd:attribute name="allocation-size" type="xsd:int"/>
-  </xsd:complexType>
-
-</xsd:schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/persistence_1_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/persistence_1_0.xsd
deleted file mode 100644
index a3a157d..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/persistence_1_0.xsd
+++ /dev/null
@@ -1,307 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- persistence.xml schema -->
-<xsd:schema targetNamespace="http://java.sun.com/xml/ns/persistence" 
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:persistence="http://java.sun.com/xml/ns/persistence"
-  elementFormDefault="qualified" 
-  attributeFormDefault="unqualified" 
-  version="1.0">
-
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)persistence_1_0.xsd  1.0  Feb 9 2006
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
-      Copyright 2005-2007 Sun Microsystems, Inc. All rights reserved.
-
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-
-      Contributor(s):
-
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-
-      The Eclipse Foundation elects to include this software in this
-      distribution under the CDDL license.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-   <xsd:annotation>
-     <xsd:documentation><![CDATA[
-
-     This is the XML Schema for the persistence configuration file.
-     The file must be named "META-INF/persistence.xml" in the 
-     persistence archive.
-     Persistence configuration files must indicate
-     the persistence schema by using the persistence namespace:
-
-     http://java.sun.com/xml/ns/persistence
-
-     and indicate the version of the schema by
-     using the version element as shown below:
-
-      <persistence xmlns="http://java.sun.com/xml/ns/persistence"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/persistence
-          http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-        version="1.0">
-          ...
-      </persistence>
-
-    ]]></xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:simpleType name="versionType">
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[0-9]+(\.[0-9]+)*"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <!-- **************************************************** -->
-
-  <xsd:element name="persistence">
-    <xsd:complexType>
-      <xsd:sequence>
-
-        <!-- **************************************************** -->
-
-        <xsd:element name="persistence-unit" 
-                     minOccurs="0" maxOccurs="unbounded">
-          <xsd:complexType>
-            <xsd:annotation>
-              <xsd:documentation>
-
-                Configuration of a persistence unit.
-
-              </xsd:documentation>
-            </xsd:annotation>
-            <xsd:sequence>
-
-            <!-- **************************************************** -->
-
-              <xsd:element name="description" type="xsd:string" 
-                           minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    Textual description of this persistence unit.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="provider" type="xsd:string" 
-                           minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    Provider class that supplies EntityManagers for this 
-                    persistence unit.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="jta-data-source" type="xsd:string" 
-                           minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    The container-specific name of the JTA datasource to use.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="non-jta-data-source" type="xsd:string" 
-                           minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    The container-specific name of a non-JTA datasource to use.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="mapping-file" type="xsd:string" 
-                           minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    File containing mapping information. Loaded as a resource 
-                    by the persistence provider.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="jar-file" type="xsd:string" 
-                           minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    Jar file that should be scanned for entities. 
-                    Not applicable to Java SE persistence units.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="class" type="xsd:string" 
-                           minOccurs="0" maxOccurs="unbounded">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    Class to scan for annotations.  It should be annotated 
-                    with either @Entity, @Embeddable or @MappedSuperclass.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="exclude-unlisted-classes" type="xsd:boolean" 
-                           default="false" minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    When set to true then only listed classes and jars will 
-                    be scanned for persistent classes, otherwise the enclosing 
-                    jar or directory will also be scanned. Not applicable to 
-                    Java SE persistence units.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-              </xsd:element>
-
-              <!-- **************************************************** -->
-
-              <xsd:element name="properties" minOccurs="0">
-                <xsd:annotation>
-                  <xsd:documentation>
-
-                    A list of vendor-specific properties.
-
-                  </xsd:documentation>
-                </xsd:annotation>
-                <xsd:complexType>
-                  <xsd:sequence>
-                    <xsd:element name="property" 
-                                 minOccurs="0" maxOccurs="unbounded">
-                      <xsd:annotation>
-                        <xsd:documentation>
-                          A name-value pair.
-                        </xsd:documentation>
-                      </xsd:annotation>
-                      <xsd:complexType>
-                        <xsd:attribute name="name" type="xsd:string" 
-                                       use="required"/>
-                        <xsd:attribute name="value" type="xsd:string" 
-                                       use="required"/>
-                      </xsd:complexType>
-                    </xsd:element>
-                  </xsd:sequence>
-                </xsd:complexType>
-              </xsd:element>
-
-            </xsd:sequence>
-
-            <!-- **************************************************** -->
-
-            <xsd:attribute name="name" type="xsd:string" use="required">
-              <xsd:annotation>
-                <xsd:documentation>
-
-                  Name used in code to reference this persistence unit.
-
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:attribute>
-
-            <!-- **************************************************** -->
-
-            <xsd:attribute name="transaction-type" 
-                           type="persistence:persistence-unit-transaction-type">
-              <xsd:annotation>
-                <xsd:documentation>
-
-                  Type of transactions used by EntityManagers from this 
-                  persistence unit.
-
-                </xsd:documentation>
-              </xsd:annotation>
-            </xsd:attribute>
-
-          </xsd:complexType>
-        </xsd:element>
-      </xsd:sequence>
-      <xsd:attribute name="version" type="persistence:versionType" 
-                     fixed="1.0" use="required"/>
-    </xsd:complexType>
-  </xsd:element>
-
-  <!-- **************************************************** -->
-
-  <xsd:simpleType name="persistence-unit-transaction-type">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        public enum TransactionType { JTA, RESOURCE_LOCAL };
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="JTA"/>
-      <xsd:enumeration value="RESOURCE_LOCAL"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_2.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_2.dtd
deleted file mode 100644
index 5f439f4..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_2.dtd
+++ /dev/null
@@ -1,639 +0,0 @@
-<!--
-Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road,
-Palo Alto, CA  94303, U.S.A.  All rights reserved.
- 
-This product or document is protected by copyright and distributed
-under licenses restricting its use, copying, distribution, and
-decompilation.  No part of this product or documentation may be
-reproduced in any form by any means without prior written authorization
-of Sun and its licensors, if any.  
-
-Third party software, including font technology, is copyrighted and 
-licensed from Sun suppliers. 
-
-Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, 
-are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. 
-and other countries.
-
-All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc.
-in the U.S. and other countries. Products bearing SPARC
-trademarks are based upon an architecture developed by Sun Microsystems, Inc. 
-
-PostScript is a registered trademark of Adobe Systems, Inc. 
-
- 
-Federal Acquisitions: Commercial Software - Government Users Subject to 
-Standard License Terms and Conditions.
-
-
- 
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
-TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-_________________________________________________________________________
-Copyright 1999 Sun Microsystems, Inc., 
-901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis. 
-Tous droits re'serve's.
- 
-
-Ce produit ou document est prote'ge' par un copyright et distribue' avec 
-des licences qui en restreignent l'utilisation, la copie, la distribution,
-et la de'compilation.  Aucune partie de ce produit ou de sa documentation
-associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen 
-que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses 
-bailleurs de licence, s'il y en a.  
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie 
-relative aux polices de caracte`res, est prote'ge' par un copyright 
-et licencie' par des fournisseurs de Sun.
- 
-Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,  
-sont des marques de fabrique ou des marques de'pose'es de Sun 
-Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
- 
-Toutes les marques SPARC sont utilise'es sous licence et sont
-des marques de fabrique ou des marques de'pose'es de SPARC
-International, Inc. aux Etats-Unis et  dans
-d'autres pays. Les produits portant les marques SPARC sont
-base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.  
-
-Postcript est une marque enregistre'e d'Adobe Systems Inc. 
- 
-LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
-DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
-TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
-A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
--->
-
-<!--
-The web-app element is the root of the deployment descriptor for
-a web application
--->
-
-<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
-context-param*, servlet*, servlet-mapping*, session-config?,
-mime-mapping*, welcome-file-list?, error-page*, taglib*,
-resource-ref*, security-constraint*, login-config?, security-role*,
-env-entry*, ejb-ref*)>
-
-<!--
-The icon element contains a small-icon and a large-icon element
-which specify the location within the web application for a small and
-large image used to represent the web application in a GUI tool. At a
-minimum, tools must accept GIF and JPEG format images.
--->
-
-<!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The small-icon element contains the location within the web
-application of a file containing a small (16x16 pixel) icon image.
--->
-
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The large-icon element contains the location within the web
-application of a file containing a large (32x32 pixel) icon image.
--->
-
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended
-to be displayed by GUI tools
--->
-
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The description element is used to provide descriptive text about
-the parent element.
--->
-
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The distributable element, by its presence in a web application
-deployment descriptor, indicates that this web application is
-programmed appropriately to be deployed into a distributed servlet
-container
--->
-
-<!ELEMENT distributable EMPTY>
-
-<!--
-The context-param element contains the declaration of a web
-application's servlet context initialization parameters.
--->
-
-<!ELEMENT context-param (param-name, param-value, description?)>
-
-<!--
-The param-name element contains the name of a parameter.
--->
-
-<!ELEMENT param-name (#PCDATA)>
-
-<!--
-The param-value element contains the value of a parameter.
--->
-
-<!ELEMENT param-value (#PCDATA)>
-
-<!--
-The servlet element contains the declarative data of a
-servlet. If a jsp-file is specified and the load-on-startup element is
-present, then the JSP should be precompiled and loaded.
--->
-
-<!ELEMENT servlet (icon?, servlet-name, display-name?, description?,
-(servlet-class|jsp-file), init-param*, load-on-startup?, security-role-ref*)>
-
-<!--
-The servlet-name element contains the canonical name of the
-servlet.
--->
-
-<!ELEMENT servlet-name (#PCDATA)>
-
-<!--
-The servlet-class element contains the fully qualified class name
-of the servlet.
--->
-
-<!ELEMENT servlet-class (#PCDATA)>
-
-<!--
-The jsp-file element contains the full path to a JSP file within
-the web application.
--->
-
-<!ELEMENT jsp-file (#PCDATA)>
-
-<!--
-The init-param element contains a name/value pair as an
-initialization param of the servlet
--->
-
-<!ELEMENT init-param (param-name, param-value, description?)>
-
-<!--
-The load-on-startup element indicates that this servlet should be
-loaded on the startup of the web application. The optional contents of
-these element must be a positive integer indicating the order in which
-the servlet should be loaded. Lower integers are loaded before higher
-integers. If no value is specified, or if the value specified is not a
-positive integer, the container is free to load it at any time in the
-startup sequence.
--->
-
-<!ELEMENT load-on-startup (#PCDATA)>
-
-<!--
-The servlet-mapping element defines a mapping between a servlet
-and a url pattern
--->
-
-<!ELEMENT servlet-mapping (servlet-name, url-pattern)>
-
-<!--
-The url-pattern element contains the url pattern of the
-mapping. Must follow the rules specified in Section 10 of the Servlet
-API Specification.
--->
-
-<!ELEMENT url-pattern (#PCDATA)>
-
-<!--
-The session-config element defines the session parameters for
-this web application.
--->
-
-<!ELEMENT session-config (session-timeout?)>
-
-<!--
-The session-timeout element defines the default session timeout
-interval for all sessions created in this web application. The
-specified timeout must be expressed in a whole number of minutes.
--->
-
-<!ELEMENT session-timeout (#PCDATA)>
-
-<!--
-The mime-mapping element defines a mapping between an extension
-and a mime type.
--->
-
-<!ELEMENT mime-mapping (extension, mime-type)>
-
-<!--
-The extension element contains a string describing an
-extension. example: "txt"
--->
-
-<!ELEMENT extension (#PCDATA)>
-
-<!--
-The mime-type element contains a defined mime type. example:
-"text/plain"
--->
-
-<!ELEMENT mime-type (#PCDATA)>
-
-<!--
-The welcome-file-list contains an ordered list of welcome files
-elements.
--->
-
-<!ELEMENT welcome-file-list (welcome-file+)>
-
-<!--
-The welcome-file element contains file name to use as a default
-welcome file, such as index.html
--->
-
-<!ELEMENT welcome-file (#PCDATA)>
-
-<!--
-The taglib element is used to describe a JSP tag library.
--->
-
-<!ELEMENT taglib (taglib-uri, taglib-location)>
-
-<!--
-The taglib-uri element describes a URI, relative to the location
-of the web.xml document, identifying a Tag Library used in the Web
-Application.
--->
-
-<!ELEMENT taglib-uri (#PCDATA)>
-
-<!--
-the taglib-location element contains the location (as a resource
-relative to the root of the web application) where to find the Tag
-Libary Description file for the tag library.
--->
-
-<!ELEMENT taglib-location (#PCDATA)>
-
-<!--
-The error-page element contains a mapping between an error code
-or exception type to the path of a resource in the web application
--->
-
-<!ELEMENT error-page ((error-code | exception-type), location)>
-
-<!--
-The error-code contains an HTTP error code, ex: 404
--->
-
-<!ELEMENT error-code (#PCDATA)>
-
-<!--
-The exception type contains a fully qualified class name of a
-Java exception type.
--->
-
-<!ELEMENT exception-type (#PCDATA)>
-
-<!--
-The location element contains the location of the resource in the
-web application
--->
-
-<!ELEMENT location (#PCDATA)>
-
-<!--
-The resource-ref element contains a declaration of a Web
-Application's reference to an external resource.
--->
-
-<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth)>
-
-<!--
-The res-ref-name element specifies the name of the resource
-factory reference name.
--->
-
-<!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-The res-type element specifies the (Java class) type of the data
-source.
--->
-
-<!ELEMENT res-type (#PCDATA)>
-
-<!--
-The res-auth element indicates whether the application component
-code performs resource signon programmatically or whether the
-container signs onto the resource based on the principle mapping
-information supplied by the deployer. Must be CONTAINER or SERVLET
--->
-
-<!ELEMENT res-auth (#PCDATA)>
-
-<!--
-The security-constraint element is used to associate security
-constraints with one or more web resource collections
--->
-
-<!ELEMENT security-constraint (web-resource-collection+,
-auth-constraint?, user-data-constraint?)>
-
-<!--
-The web-resource-collection element is used to identify a subset
-of the resources and HTTP methods on those resources within a web
-application to which a security constraint applies. If no HTTP methods
-are specified, then the security constraint applies to all HTTP
-methods.
--->
-
-<!ELEMENT web-resource-collection (web-resource-name, description?,
-url-pattern*, http-method*)>
-
-<!--
-The web-resource-name contains the name of this web resource
-collection
--->
-
-<!ELEMENT web-resource-name (#PCDATA)>
-
-<!--
-The http-method contains an HTTP method (GET | POST |...)
--->
-
-<!ELEMENT http-method (#PCDATA)>
-
-<!--
-The user-data-constraint element is used to indicate how data
-communicated between the client and container should be protected
--->
-
-<!ELEMENT user-data-constraint (description?, transport-guarantee)>
-
-<!--
-The transport-guarantee element specifies that the communication
-between client and server should be NONE, INTEGRAL, or
-CONFIDENTIAL. NONE means that the application does not require any
-transport guarantees. A value of INTEGRAL means that the application
-requires that the data sent between the client and server be sent in
-such a way that it can't be changed in transit. CONFIDENTIAL means
-that the application requires that the data be transmitted in a
-fashion that prevents other entities from observing the contents of
-the transmission. In most cases, the presence of the INTEGRAL or
-CONFIDENTIAL flag will indicate that the use of SSL is required.
--->
-
-<!ELEMENT transport-guarantee (#PCDATA)>
-
-<!--
-The auth-constraint element indicates the user roles that should
-be permitted access to this resource collection. The role used here
-must appear in a security-role-ref element.
--->
-
-<!ELEMENT auth-constraint (description?, role-name*)>
-
-<!--
-The role-name element contains the name of a security role.
--->
-
-<!ELEMENT role-name (#PCDATA)>
-
-<!--
-The login-config element is used to configure the authentication
-method that should be used, the realm name that should be used for
-this application, and the attributes that are needed by the form login
-mechanism.
--->
-
-<!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-
-<!--
-The realm name element specifies the realm name to use in HTTP
-Basic authorization
--->
-
-<!ELEMENT realm-name (#PCDATA)>
-
-<!--
-The form-login-config element specifies the login and error pages
-that should be used in form based login. If form based authentication
-is not used, these elements are ignored.
--->
-
-<!ELEMENT form-login-config (form-login-page, form-error-page)>
-
-<!--
-The form-login-page element defines the location in the web app
-where the page that can be used for login can be found
--->
-
-<!ELEMENT form-login-page (#PCDATA)>
-
-<!--
-The form-error-page element defines the location in the web app
-where the error page that is displayed when login is not successful
-can be found
--->
-
-<!ELEMENT form-error-page (#PCDATA)>
-
-<!--
-The auth-method element is used to configure the authentication
-mechanism for the web application. As a prerequisite to gaining access
-to any web resources which are protected by an authorization
-constraint, a user must have authenticated using the configured
-mechanism. Legal values for this element are "BASIC", "DIGEST",
-"FORM", or "CLIENT-CERT".
--->
-
-<!ELEMENT auth-method (#PCDATA)>
-
-<!--
-The security-role element contains the declaration of a security
-role which is used in the security-constraints placed on the web
-application.
--->
-
-<!ELEMENT security-role (description?, role-name)>
-
-<!--
-The role-name element contains the name of a role. This element
-must contain a non-empty string.
--->
-
-<!ELEMENT security-role-ref (description?, role-name, role-link)>
-
-<!--
-The role-link element is used to link a security role reference
-to a defined security role. The role-link element must contain the
-name of one of the security roles defined in the security-role
-elements.
--->
-
-<!ELEMENT role-link (#PCDATA)>
-
-<!--
-The env-entry element contains the declaration of an
-application's environment entry. This element is required to be
-honored on in J2EE compliant servlet containers.
--->
-
-<!ELEMENT env-entry (description?, env-entry-name, env-entry-value?,
-env-entry-type)>
-
-<!--
-The env-entry-name contains the name of an application's
-environment entry
--->
-
-<!ELEMENT env-entry-name (#PCDATA)>
-
-<!--
-The env-entry-value element contains the value of an
-application's environment entry
--->
-
-<!ELEMENT env-entry-value (#PCDATA)>
-
-<!--
-The env-entry-type element contains the fully qualified Java type
-of the environment entry value that is expected by the application
-code. The following are the legal values of env-entry-type:
-java.lang.Boolean, java.lang.String, java.lang.Integer,
-java.lang.Double, java.lang.Float.
--->
-
-<!ELEMENT env-entry-type (#PCDATA)>
-
-<!--
-The ejb-ref element is used to declare a reference to an
-enterprise bean. 
--->
-
-<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type, home, remote,
-ejb-link?)>
-
-<!--
-The ejb-ref-name element contains the name of an EJB
-reference. This is the JNDI name that the servlet code uses to get a
-reference to the enterprise bean.
--->
-
-<!ELEMENT ejb-ref-name (#PCDATA)>
-
-<!--
-The ejb-ref-type element contains the expected java class type of
-the referenced EJB.
--->
-
-<!ELEMENT ejb-ref-type (#PCDATA)>
-
-<!--
-The ejb-home element contains the fully qualified name of the
-EJB's home interface
--->
-
-<!ELEMENT home (#PCDATA)>
-
-<!--
-The ejb-remote element contains the fully qualified name of the
-EJB's remote interface
--->
-
-<!ELEMENT remote (#PCDATA)>
-
-<!--
-The ejb-link element is used in the ejb-ref element to specify
-that an EJB reference is linked to an EJB in an encompassing Java2
-Enterprise Edition (J2EE) application package. The value of the
-ejb-link element must be the ejb-name of and EJB in the J2EE
-application package.
--->
-
-<!ELEMENT ejb-link (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools to easily make tool-specific
-references to the elements of the deployment descriptor. This allows
-tools that produce additional deployment information (i.e information
-beyond the standard deployment descriptor information) to store the
-non-standard information in a separate file, and easily refer from
-these tools-specific files to the information in the standard web-app
-deployment descriptor.
--->
-
-<!ATTLIST web-app id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST distributable id ID #IMPLIED>
-<!ATTLIST context-param id ID #IMPLIED>
-<!ATTLIST param-name id ID #IMPLIED>
-<!ATTLIST param-value id ID #IMPLIED>
-<!ATTLIST servlet id ID #IMPLIED>
-<!ATTLIST servlet-name id ID #IMPLIED>
-<!ATTLIST servlet-class id ID #IMPLIED>
-<!ATTLIST jsp-file id ID #IMPLIED>
-<!ATTLIST init-param id ID #IMPLIED>
-<!ATTLIST load-on-startup id ID #IMPLIED>
-<!ATTLIST servlet-mapping id ID #IMPLIED>
-<!ATTLIST url-pattern id ID #IMPLIED>
-<!ATTLIST session-config id ID #IMPLIED>
-<!ATTLIST session-timeout id ID #IMPLIED>
-<!ATTLIST mime-mapping id ID #IMPLIED>
-<!ATTLIST extension id ID #IMPLIED>
-<!ATTLIST mime-type id ID #IMPLIED>
-<!ATTLIST welcome-file-list id ID #IMPLIED>
-<!ATTLIST welcome-file id ID #IMPLIED>
-<!ATTLIST taglib id ID #IMPLIED>
-<!ATTLIST taglib-uri id ID #IMPLIED>
-<!ATTLIST taglib-location id ID #IMPLIED>
-<!ATTLIST error-page id ID #IMPLIED>
-<!ATTLIST error-code id ID #IMPLIED>
-<!ATTLIST exception-type id ID #IMPLIED>
-<!ATTLIST location id ID #IMPLIED>
-<!ATTLIST resource-ref id ID #IMPLIED>
-<!ATTLIST res-ref-name id ID #IMPLIED>
-<!ATTLIST res-type id ID #IMPLIED>
-<!ATTLIST res-auth id ID #IMPLIED>
-<!ATTLIST security-constraint id ID #IMPLIED>
-<!ATTLIST web-resource-collection id ID #IMPLIED>
-<!ATTLIST web-resource-name id ID #IMPLIED>
-<!ATTLIST http-method id ID #IMPLIED>
-<!ATTLIST user-data-constraint id ID #IMPLIED>
-<!ATTLIST transport-guarantee id ID #IMPLIED>
-<!ATTLIST auth-constraint id ID #IMPLIED>
-<!ATTLIST role-name id ID #IMPLIED>
-<!ATTLIST login-config id ID #IMPLIED>
-<!ATTLIST realm-name id ID #IMPLIED>
-<!ATTLIST form-login-config id ID #IMPLIED>
-<!ATTLIST form-login-page id ID #IMPLIED>
-<!ATTLIST form-error-page id ID #IMPLIED>
-<!ATTLIST auth-method id ID #IMPLIED>
-<!ATTLIST security-role id ID #IMPLIED>
-<!ATTLIST security-role-ref id ID #IMPLIED>
-<!ATTLIST role-link id ID #IMPLIED>
-<!ATTLIST env-entry id ID #IMPLIED>
-<!ATTLIST env-entry-name id ID #IMPLIED>
-<!ATTLIST env-entry-value id ID #IMPLIED>
-<!ATTLIST env-entry-type id ID #IMPLIED>
-<!ATTLIST ejb-ref id ID #IMPLIED>
-<!ATTLIST ejb-ref-name id ID #IMPLIED>
-<!ATTLIST ejb-ref-type id ID #IMPLIED>
-<!ATTLIST home id ID #IMPLIED>
-<!ATTLIST remote id ID #IMPLIED>
-<!ATTLIST ejb-link id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_3.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_3.dtd
deleted file mode 100644
index 5e3ab01..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_3.dtd
+++ /dev/null
@@ -1,1063 +0,0 @@
-<!--
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, U.S.A.
-All rights reserved.
-
-Sun Microsystems, Inc. has intellectual property rights relating to
-technology embodied in the product that is described in this document.
-In particular, and without limitation, these intellectual property
-rights may include one or more of the U.S. patents listed at
-http://www.sun.com/patents and one or more additional patents or
-pending patent applications in the U.S. and in other countries.
-
-This document and the product to which it pertains are distributed
-under licenses restricting their use, copying, distribution, and
-decompilation.  This document may be reproduced and distributed but may
-not be changed without prior written authorization of Sun and its
-licensors, if any.
-
-Third-party software, including font technology, is copyrighted and
-licensed from Sun suppliers.
-
-Sun,  Sun Microsystems,  the Sun logo,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail and  and
-Enterprise JavaBeans are trademarks or registered trademarks of Sun
-Microsystems, Inc. in the U.S. and other countries.
-
-Federal Acquisitions: Commercial Software - Government Users Subject to
-Standard License Terms and Conditions.
-
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
-
-
-_________________________________________________________________________
-
-Copyright (c) 2000 Sun Microsystems, Inc.,
-901 San Antonio Road,
-Palo Alto, California 94303, E'tats-Unis.
-Tous droits re'serve's.
-
-Sun Microsystems, Inc. a les droits de proprie'te' intellectuels
-relatants a` la technologie incorpore'e dans le produit qui est de'crit
-dans ce document. En particulier, et sans la limitation, ces droits de
-proprie'te' intellectuels peuvent inclure un ou plus des brevets
-ame'ricains e'nume're's a` http://www.sun.com/patents et un ou les
-brevets plus supple'mentaires ou les applications de brevet en attente
-dans les E'tats-Unis et dans les autres pays.
-
-Ce produit ou document est prote'ge' par un copyright et distribue'
-avec des licences qui en restreignent l'utilisation, la copie, la
-distribution, et la de'compilation.  Ce documention associe n peut
-e^tre reproduite et distribuer, par quelque moyen que ce soit, sans
-l'autorisation pre'alable et e'crite de Sun et de ses bailleurs de
-licence, le cas e'che'ant.
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie
-relative aux polices de caracte`res, est prote'ge' par un copyright et
-licencie' par des fournisseurs de Sun.
-
-Sun,  Sun Microsystems,  le logo Sun,  Java,  JavaServer Pages,  Java
-Naming and Directory Interface,  JDBC,  JDK,  JavaMail et  and
-Enterprise JavaBeans sont des marques de fabrique ou des marques
-de'pose'es de Sun Microsystems, Inc. aux E'tats-Unis et dans d'autres
-pays.
-
-LA DOCUMENTATION EST FOURNIE "EN L'E'TAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT
-EXCLUES, DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS
-NOTAMMENT TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A
-L'APTITUDE A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE
-CONTREFAC,ON.
--->
-
-<!--
-This is the XML DTD for the Servlet 2.3 deployment descriptor.
-All Servlet 2.3 deployment descriptors must include a DOCTYPE
-of the following form:
-
-  <!DOCTYPE web-app PUBLIC
-	"-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-	"http://java.sun.com/dtd/web-app_2_3.dtd">
-
--->
-
-<!--
-The following conventions apply to all J2EE deployment descriptor
-elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace
-  in the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is
-  case sensitive.
-
-- In elements that specify a pathname to a file within the same
-  JAR file, relative filenames (i.e., those not starting with "/")
-  are considered relative to the root of the JAR file's namespace.
-  Absolute filenames (i.e., those starting with "/") also specify
-  names in the root of the JAR file's namespace.  In general, relative
-  names are preferred.  The exception is .war files where absolute
-  names are preferred for consistency with the servlet API.
--->
-
-
-<!--
-The web-app element is the root of the deployment descriptor for
-a web application.
--->
-<!ELEMENT web-app (icon?, display-name?, description?, distributable?,
-context-param*, filter*, filter-mapping*, listener*, servlet*,
-servlet-mapping*, session-config?, mime-mapping*, welcome-file-list?,
-error-page*, taglib*, resource-env-ref*, resource-ref*, security-constraint*,
-login-config?, security-role*, env-entry*, ejb-ref*,  ejb-local-ref*)>
-
-<!--
-The auth-constraint element indicates the user roles that should
-be permitted access to this resource collection. The role-name
-used here must either correspond to the role-name of one of the
-security-role elements defined for this web application, or be
-the specially reserved role-name "*" that is a compact syntax for
-indicating all roles in the web application. If both "*" and
-rolenames appear, the container interprets this as all roles.
-If no roles are defined, no user is allowed access to the portion of
-the web application described by the containing security-constraint.
-The container matches role names case sensitively when determining
-access.
-
-
-Used in: security-constraint
--->
-<!ELEMENT auth-constraint (description?, role-name*)>
-
-<!--
-The auth-method element is used to configure the authentication
-mechanism for the web application. As a prerequisite to gaining access to any web resources which are protected by an authorization
-constraint, a user must have authenticated using the configured
-mechanism. Legal values for this element are "BASIC", "DIGEST",
-"FORM", or "CLIENT-CERT".
-
-Used in: login-config
--->
-<!ELEMENT auth-method (#PCDATA)>
-
-<!--
-The context-param element contains the declaration of a web
-application's servlet context initialization parameters.
-
-Used in: web-app
--->
-<!ELEMENT context-param (param-name, param-value, description?)>
-
-<!--
-The description element is used to provide text describing the parent
-element.  The description element should include any information that
-the web application war file producer wants to provide to the consumer of
-the web application war file (i.e., to the Deployer). Typically, the tools
-used by the web application war file consumer will display the description
-when processing the parent element that contains the description.
-
-Used in: auth-constraint, context-param, ejb-local-ref, ejb-ref,
-env-entry, filter, init-param, resource-env-ref, resource-ref, run-as,
-security-role, security-role-ref, servlet, user-data-constraint,
-web-app, web-resource-collection
--->
-<!ELEMENT description (#PCDATA)>
-
-<!--
-The display-name element contains a short name that is intended to be
-displayed by tools.  The display name need not be unique.
-
-Used in: filter, security-constraint, servlet, web-app
-
-Example:
-
-<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-
-<!--
-The distributable element, by its presence in a web application
-deployment descriptor, indicates that this web application is
-programmed appropriately to be deployed into a distributed servlet
-container
-
-Used in: web-app
--->
-<!ELEMENT distributable EMPTY>
-
-<!--
-The ejb-link element is used in the ejb-ref or ejb-local-ref
-elements to specify that an EJB reference is linked to an
-enterprise bean.
-
-The name in the ejb-link element is composed of a
-path name specifying the ejb-jar containing the referenced enterprise
-bean with the ejb-name of the target bean appended and separated from
-the path name by "#".  The path name is relative to the war file
-containing the web application that is referencing the enterprise bean.
-This allows multiple enterprise beans with the same ejb-name to be
-uniquely identified.
-
-Used in: ejb-local-ref, ejb-ref
-
-Examples:
-
-	<ejb-link>EmployeeRecord</ejb-link>
-
-	<ejb-link>../products/product.jar#ProductEJB</ejb-link>
-
--->
-<!ELEMENT ejb-link (#PCDATA)>
-
-<!--
-The ejb-local-ref element is used for the declaration of a reference to
-an enterprise bean's local home. The declaration consists of:
-
-	- an optional description
-	- the EJB reference name used in the code of the web application
-	  that's referencing the enterprise bean
-	- the expected type of the referenced enterprise bean
-	- the expected local home and local interfaces of the referenced
-	  enterprise bean
-	- optional ejb-link information, used to specify the referenced
-	  enterprise bean
-
-Used in: web-app
--->
-<!ELEMENT ejb-local-ref (description?, ejb-ref-name, ejb-ref-type,
-		local-home, local, ejb-link?)>
-
-<!--
-The ejb-ref element is used for the declaration of a reference to
-an enterprise bean's home. The declaration consists of:
-
-	- an optional description
-	- the EJB reference name used in the code of
-	  the web application that's referencing the enterprise bean
-	- the expected type of the referenced enterprise bean
-	- the expected home and remote interfaces of the referenced
-	  enterprise bean
-	- optional ejb-link information, used to specify the referenced
-	  enterprise bean
-
-Used in: web-app
--->
-<!ELEMENT ejb-ref (description?, ejb-ref-name, ejb-ref-type,
-		home, remote, ejb-link?)>
-
-<!--
-The ejb-ref-name element contains the name of an EJB reference. The
-EJB reference is an entry in the web application's environment and is
-relative to the java:comp/env context.  The name must be unique
-within the web application.
-
-It is recommended that name is prefixed with "ejb/".
-
-Used in: ejb-local-ref, ejb-ref
-
-Example:
-
-<ejb-ref-name>ejb/Payroll</ejb-ref-name>
--->
-<!ELEMENT ejb-ref-name (#PCDATA)>
-
-<!--
-The ejb-ref-type element contains the expected type of the
-referenced enterprise bean.
-
-The ejb-ref-type element must be one of the following:
-
-	<ejb-ref-type>Entity</ejb-ref-type>
-	<ejb-ref-type>Session</ejb-ref-type>
-
-Used in: ejb-local-ref, ejb-ref
--->
-<!ELEMENT ejb-ref-type (#PCDATA)>
-
-<!--
-The env-entry element contains the declaration of a web application's
-environment entry. The declaration consists of an optional
-description, the name of the environment entry, and an optional
-value.  If a value is not specified, one must be supplied
-during deployment.
--->
-<!ELEMENT env-entry (description?, env-entry-name, env-entry-value?,
-env-entry-type)>
-
-<!--
-The env-entry-name element contains the name of a web applications's
-environment entry.  The name is a JNDI name relative to the
-java:comp/env context.  The name must be unique within a web application.
-
-Example:
-
-<env-entry-name>minAmount</env-entry-name>
-
-Used in: env-entry
--->
-<!ELEMENT env-entry-name (#PCDATA)>
-
-<!--
-The env-entry-type element contains the fully-qualified Java type of
-the environment entry value that is expected by the web application's
-code.
-
-The following are the legal values of env-entry-type:
-
-	java.lang.Boolean
-	java.lang.Byte
-	java.lang.Character
-	java.lang.String
-	java.lang.Short
-	java.lang.Integer
-	java.lang.Long
-	java.lang.Float
-	java.lang.Double
-
-Used in: env-entry
--->
-<!ELEMENT env-entry-type (#PCDATA)>
-
-<!--
-The env-entry-value element contains the value of a web application's
-environment entry. The value must be a String that is valid for the
-constructor of the specified type that takes a single String
-parameter, or for java.lang.Character, a single character.
-
-Example:
-
-<env-entry-value>100.00</env-entry-value>
-
-Used in: env-entry
--->
-<!ELEMENT env-entry-value (#PCDATA)>
-
-<!--
-The error-code contains an HTTP error code, ex: 404
-
-Used in: error-page
--->
-<!ELEMENT error-code (#PCDATA)>
-
-<!--
-The error-page element contains a mapping between an error code
-or exception type to the path of a resource in the web application
-
-Used in: web-app
--->
-<!ELEMENT error-page ((error-code | exception-type), location)>
-
-<!--
-The exception type contains a fully qualified class name of a
-Java exception type.
-
-Used in: error-page
--->
-<!ELEMENT exception-type (#PCDATA)>
-
-<!--
-The extension element contains a string describing an
-extension. example: "txt"
-
-Used in: mime-mapping
--->
-<!ELEMENT extension (#PCDATA)>
-
-<!--
-Declares a filter in the web application. The filter is mapped to
-either a servlet or a URL pattern in the filter-mapping element, using
-the filter-name value to reference. Filters can access the
-initialization parameters declared in the deployment descriptor at
-runtime via the FilterConfig interface.
-
-Used in: web-app
--->
-<!ELEMENT filter (icon?, filter-name, display-name?, description?,
-filter-class, init-param*)>
-
-<!--
-The fully qualified classname of the filter.
-
-Used in: filter
--->
-<!ELEMENT filter-class (#PCDATA)>
-
-<!--
-Declaration of the filter mappings in this web application. The
-container uses the filter-mapping declarations to decide which filters
-to apply to a request, and in what order. The container matches the
-request URI to a Servlet in the normal way. To determine which filters
-to apply it matches filter-mapping declarations either on servlet-name,
-or on url-pattern for each filter-mapping element, depending on which
-style is used. The order in which filters are invoked is the order in
-which filter-mapping declarations that match a request URI for a
-servlet appear in the list of filter-mapping elements.The filter-name
-value must be the value of the <filter-name> sub-elements of one of the
-<filter> declarations in the deployment descriptor.
-
-Used in: web-app
--->
-<!ELEMENT filter-mapping (filter-name, (url-pattern | servlet-name))>
-
-<!--
-The logical name of the filter. This name is used to map the filter.
-Each filter name is unique within the web application.
-
-Used in: filter, filter-mapping
--->
-<!ELEMENT filter-name (#PCDATA)>
-
-<!--
-The form-error-page element defines the location in the web app
-where the error page that is displayed when login is not successful
-can be found. The path begins with a leading / and is interpreted
-relative to the root of the WAR.
-
-Used in: form-login-config
--->
-<!ELEMENT form-error-page (#PCDATA)>
-
-<!--
-The form-login-config element specifies the login and error pages
-that should be used in form based login. If form based authentication
-is not used, these elements are ignored.
-
-Used in: login-config
--->
-<!ELEMENT form-login-config (form-login-page, form-error-page)>
-
-<!--
-The form-login-page element defines the location in the web app
-where the page that can be used for login can be found. The path
-begins with a leading / and is interpreted relative to the root of the WAR.
-
-Used in: form-login-config
--->
-<!ELEMENT form-login-page (#PCDATA)>
-
-<!--
-The home element contains the fully-qualified name of the enterprise
-bean's home interface.
-
-Used in: ejb-ref
-
-Example:
-
-<home>com.aardvark.payroll.PayrollHome</home>
--->
-<!ELEMENT home (#PCDATA)>
-
-<!--
-The http-method contains an HTTP method (GET | POST |...).
-
-Used in: web-resource-collection
--->
-<!ELEMENT http-method (#PCDATA)>
-
-<!--
-The icon element contains small-icon and large-icon elements that
-specify the file names for small and a large GIF or JPEG icon images
-used to represent the parent element in a GUI tool.
-
-Used in: filter, servlet, web-app
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-
-<!--
-The init-param element contains a name/value pair as an
-initialization param of the servlet
-
-Used in: filter, servlet
--->
-<!ELEMENT init-param (param-name, param-value, description?)>
-
-<!--
-The jsp-file element contains the full path to a JSP file within
-the web application beginning with a `/'.
-
-Used in: servlet
--->
-<!ELEMENT jsp-file (#PCDATA)>
-
-<!--
-The large-icon element contains the name of a file
-containing a large (32 x 32) icon image. The file
-name is a relative path within the web application's
-war file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The listener element indicates the deployment properties for a web
-application listener bean.
-
-Used in: web-app
--->
-<!ELEMENT listener (listener-class)>
-
-<!--
-The listener-class element declares a class in the application must be
-registered as a web application listener bean. The value is the fully qualified classname of the listener class.
-
-
-Used in: listener
--->
-<!ELEMENT listener-class (#PCDATA)>
-
-<!--
-The load-on-startup element indicates that this servlet should be
-loaded (instantiated and have its init() called) on the startup
-of the web application. The optional contents of
-these element must be an integer indicating the order in which
-the servlet should be loaded. If the value is a negative integer,
-or the element is not present, the container is free to load the
-servlet whenever it chooses. If the value is a positive integer
-or 0, the container must load and initialize the servlet as the
-application is deployed. The container must guarantee that
-servlets marked with lower integers are loaded before servlets
-marked with higher integers. The container may choose the order
-of loading of servlets with the same load-on-start-up value.
-
-Used in: servlet
--->
-<!ELEMENT load-on-startup (#PCDATA)>
-
-<!--
-
-The local element contains the fully-qualified name of the
-enterprise bean's local interface.
-
-Used in: ejb-local-ref
-
--->
-<!ELEMENT local (#PCDATA)>
-
-<!--
-
-The local-home element contains the fully-qualified name of the
-enterprise bean's local home interface.
-
-Used in: ejb-local-ref
--->
-<!ELEMENT local-home (#PCDATA)>
-
-<!--
-The location element contains the location of the resource in the web
-application relative to the root of the web application. The value of
-the location must have a leading `/'.
-
-Used in: error-page
--->
-<!ELEMENT location (#PCDATA)>
-
-<!--
-The login-config element is used to configure the authentication
-method that should be used, the realm name that should be used for
-this application, and the attributes that are needed by the form login
-mechanism.
-
-Used in: web-app
--->
-<!ELEMENT login-config (auth-method?, realm-name?, form-login-config?)>
-
-<!--
-The mime-mapping element defines a mapping between an extension
-and a mime type.
-
-Used in: web-app
--->
-<!ELEMENT mime-mapping (extension, mime-type)>
-
-<!--
-The mime-type element contains a defined mime type. example:
-"text/plain"
-
-Used in: mime-mapping
--->
-<!ELEMENT mime-type (#PCDATA)>
-
-<!--
-The param-name element contains the name of a parameter. Each parameter
-name must be unique in the web application.
-
-
-Used in: context-param, init-param
--->
-<!ELEMENT param-name (#PCDATA)>
-
-<!--
-The param-value element contains the value of a parameter.
-
-Used in: context-param, init-param
--->
-<!ELEMENT param-value (#PCDATA)>
-
-<!--
-The realm name element specifies the realm name to use in HTTP
-Basic authorization.
-
-Used in: login-config
--->
-<!ELEMENT realm-name (#PCDATA)>
-
-<!--
-The remote element contains the fully-qualified name of the enterprise
-bean's remote interface.
-
-Used in: ejb-ref
-
-Example:
-
-<remote>com.wombat.empl.EmployeeService</remote>
--->
-<!ELEMENT remote (#PCDATA)>
-
-<!--
-The res-auth element specifies whether the web application code signs
-on programmatically to the resource manager, or whether the Container
-will sign on to the resource manager on behalf of the web application. In the
-latter case, the Container uses information that is supplied by the
-Deployer.
-
-The value of this element must be one of the two following:
-
-	<res-auth>Application</res-auth>
-	<res-auth>Container</res-auth>
-
-Used in: resource-ref
--->
-<!ELEMENT res-auth (#PCDATA)>
-
-<!--
-The res-ref-name element specifies the name of a resource manager
-connection factory reference.  The name is a JNDI name relative to the
-java:comp/env context.  The name must be unique within a web application.
-
-Used in: resource-ref
--->
-<!ELEMENT res-ref-name (#PCDATA)>
-
-<!--
-The res-sharing-scope element specifies whether connections obtained
-through the given resource manager connection factory reference can be
-shared. The value of this element, if specified, must be one of the
-two following:
-
-	<res-sharing-scope>Shareable</res-sharing-scope>
-	<res-sharing-scope>Unshareable</res-sharing-scope>
-
-The default value is Shareable.
-
-Used in: resource-ref
--->
-<!ELEMENT res-sharing-scope (#PCDATA)>
-
-<!--
-The res-type element specifies the type of the data source. The type
-is specified by the fully qualified Java language class or interface
-expected to be implemented by the data source.
-
-Used in: resource-ref
--->
-<!ELEMENT res-type (#PCDATA)>
-
-<!--
-The resource-env-ref element contains a declaration of a web application's
-reference to an administered object associated with a resource
-in the web application's environment.  It consists of an optional
-description, the resource environment reference name, and an
-indication of the resource environment reference type expected by
-the web application code.
-
-Used in: web-app
-
-Example:
-
-<resource-env-ref>
-    <resource-env-ref-name>jms/StockQueue</resource-env-ref-name>
-    <resource-env-ref-type>javax.jms.Queue</resource-env-ref-type>
-</resource-env-ref>
--->
-<!ELEMENT resource-env-ref (description?, resource-env-ref-name,
-		resource-env-ref-type)>
-
-<!--
-The resource-env-ref-name element specifies the name of a resource
-environment reference; its value is the environment entry name used in
-the web application code.  The name is a JNDI name relative to the
-java:comp/env context and must be unique within a web application.
-
-Used in: resource-env-ref
--->
-<!ELEMENT resource-env-ref-name (#PCDATA)>
-
-<!--
-The resource-env-ref-type element specifies the type of a resource
-environment reference.  It is the fully qualified name of a Java
-language class or interface.
-
-Used in: resource-env-ref
--->
-<!ELEMENT resource-env-ref-type (#PCDATA)>
-
-<!--
-The resource-ref element contains a declaration of a web application's
-reference to an external resource. It consists of an optional
-description, the resource manager connection factory reference name,
-the indication of the resource manager connection factory type
-expected by the web application code, the type of authentication
-(Application or Container), and an optional specification of the
-shareability of connections obtained from the resource (Shareable or
-Unshareable).
-
-Used in: web-app
-
-Example:
-
-    <resource-ref>
-	<res-ref-name>jdbc/EmployeeAppDB</res-ref-name>
-	<res-type>javax.sql.DataSource</res-type>
-	<res-auth>Container</res-auth>
-	<res-sharing-scope>Shareable</res-sharing-scope>
-    </resource-ref>
--->
-<!ELEMENT resource-ref (description?, res-ref-name, res-type, res-auth,
-		res-sharing-scope?)>
-
-<!--
-The role-link element is a reference to a defined security role. The
-role-link element must contain the name of one of the security roles
-defined in the security-role elements.
-
-Used in: security-role-ref
--->
-<!ELEMENT role-link (#PCDATA)>
-
-<!--
-The role-name element contains the name of a security role.
-
-The name must conform to the lexical rules for an NMTOKEN.
-
-Used in: auth-constraint, run-as, security-role, security-role-ref
--->
-<!ELEMENT role-name (#PCDATA)>
-
-<!--
-The run-as element specifies the run-as identity to be used for the
-execution of the web application. It contains an optional description, and
-the name of a security role.
-
-Used in: servlet
--->
-<!ELEMENT run-as (description?, role-name)>
-
-<!--
-The security-constraint element is used to associate security
-constraints with one or more web resource collections
-
-Used in: web-app
--->
-<!ELEMENT security-constraint (display-name?, web-resource-collection+,
-auth-constraint?, user-data-constraint?)>
-
-<!--
-The security-role element contains the definition of a security
-role. The definition consists of an optional description of the
-security role, and the security role name.
-
-Used in: web-app
-
-Example:
-
-    <security-role>
-	<description>
-	    This role includes all employees who are authorized
-	    to access the employee service application.
-	</description>
-	<role-name>employee</role-name>
-    </security-role>
--->
-<!ELEMENT security-role (description?, role-name)>
-
-<!--
-The security-role-ref element contains the declaration of a security
-role reference in the web application's code. The declaration consists
-of an optional description, the security role name used in the code,
-and an optional link to a security role. If the security role is not
-specified, the Deployer must choose an appropriate security role.
-
-The value of the role-name element must be the String used as the
-parameter to the EJBContext.isCallerInRole(String roleName) method
-or the HttpServletRequest.isUserInRole(String role) method.
-
-Used in: servlet
-
--->
-<!ELEMENT security-role-ref (description?, role-name, role-link?)>
-
-<!--
-The servlet element contains the declarative data of a
-servlet. If a jsp-file is specified and the load-on-startup element is
-present, then the JSP should be precompiled and loaded.
-
-Used in: web-app
--->
-<!ELEMENT servlet (icon?, servlet-name, display-name?, description?,
-(servlet-class|jsp-file), init-param*, load-on-startup?, run-as?, security-role-ref*)>
-
-<!--
-The servlet-class element contains the fully qualified class name
-of the servlet.
-
-Used in: servlet
--->
-<!ELEMENT servlet-class (#PCDATA)>
-
-<!--
-The servlet-mapping element defines a mapping between a servlet
-and a url pattern
-
-Used in: web-app
--->
-<!ELEMENT servlet-mapping (servlet-name, url-pattern)>
-
-<!--
-The servlet-name element contains the canonical name of the
-servlet. Each servlet name is unique within the web application.
-
-Used in: filter-mapping, servlet, servlet-mapping
--->
-<!ELEMENT servlet-name (#PCDATA)>
-
-<!--
-The session-config element defines the session parameters for
-this web application.
-
-Used in: web-app
--->
-<!ELEMENT session-config (session-timeout?)>
-
-<!--
-The session-timeout element defines the default session timeout
-interval for all sessions created in this web application. The
-specified timeout must be expressed in a whole number of minutes.
-If the timeout is 0 or less, the container ensures the default
-behaviour of sessions is never to time out.
-
-Used in: session-config
--->
-<!ELEMENT session-timeout (#PCDATA)>
-
-<!--
-The small-icon element contains the name of a file
-containing a small (16 x 16) icon image. The file
-name is a relative path within the web application's
-war file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The taglib element is used to describe a JSP tag library.
-
-Used in: web-app
--->
-<!ELEMENT taglib (taglib-uri, taglib-location)>
-
-<!--
-the taglib-location element contains the location (as a resource
-relative to the root of the web application) where to find the Tag
-Libary Description file for the tag library.
-
-Used in: taglib
--->
-<!ELEMENT taglib-location (#PCDATA)>
-
-<!--
-The taglib-uri element describes a URI, relative to the location
-of the web.xml document, identifying a Tag Library used in the Web
-Application.
-
-Used in: taglib
--->
-<!ELEMENT taglib-uri (#PCDATA)>
-
-<!--
-The transport-guarantee element specifies that the communication
-between client and server should be NONE, INTEGRAL, or
-CONFIDENTIAL. NONE means that the application does not require any
-transport guarantees. A value of INTEGRAL means that the application
-requires that the data sent between the client and server be sent in
-such a way that it can't be changed in transit. CONFIDENTIAL means
-that the application requires that the data be transmitted in a
-fashion that prevents other entities from observing the contents of
-the transmission. In most cases, the presence of the INTEGRAL or
-CONFIDENTIAL flag will indicate that the use of SSL is required.
-
-Used in: user-data-constraint
--->
-<!ELEMENT transport-guarantee (#PCDATA)>
-
-<!--
-The url-pattern element contains the url pattern of the mapping. Must
-follow the rules specified in Section 11.2 of the Servlet API
-Specification.
-
-Used in: filter-mapping, servlet-mapping, web-resource-collection
--->
-<!ELEMENT url-pattern (#PCDATA)>
-
-<!--
-The user-data-constraint element is used to indicate how data
-communicated between the client and container should be protected.
-
-Used in: security-constraint
--->
-<!ELEMENT user-data-constraint (description?, transport-guarantee)>
-
-<!--
-The web-resource-collection element is used to identify a subset
-of the resources and HTTP methods on those resources within a web
-application to which a security constraint applies. If no HTTP methods
-are specified, then the security constraint applies to all HTTP
-methods.
-
-Used in: security-constraint
--->
-<!ELEMENT web-resource-collection (web-resource-name, description?,
-url-pattern*, http-method*)>
-
-<!--
-The web-resource-name contains the name of this web resource
-collection.
-
-Used in: web-resource-collection
--->
-<!ELEMENT web-resource-name (#PCDATA)>
-
-<!--
-The welcome-file element contains file name to use as a default
-welcome file, such as index.html
-
-Used in: welcome-file-list
--->
-<!ELEMENT welcome-file (#PCDATA)>
-
-<!--
-The welcome-file-list contains an ordered list of welcome files
-elements.
-
-Used in: web-app
--->
-<!ELEMENT welcome-file-list (welcome-file+)>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e., information beyond the standard deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tool-specific files to the
-information in the standard deployment descriptor.
-
-Tools are not allowed to add the non-standard information into the
-standard deployment descriptor.
--->
-
-<!ATTLIST auth-constraint id ID #IMPLIED>
-<!ATTLIST auth-method id ID #IMPLIED>
-<!ATTLIST context-param id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST distributable id ID #IMPLIED>
-<!ATTLIST ejb-link id ID #IMPLIED>
-<!ATTLIST ejb-local-ref id ID #IMPLIED>
-<!ATTLIST ejb-ref id ID #IMPLIED>
-<!ATTLIST ejb-ref-name id ID #IMPLIED>
-<!ATTLIST ejb-ref-type id ID #IMPLIED>
-<!ATTLIST env-entry id ID #IMPLIED>
-<!ATTLIST env-entry-name id ID #IMPLIED>
-<!ATTLIST env-entry-type id ID #IMPLIED>
-<!ATTLIST env-entry-value id ID #IMPLIED>
-<!ATTLIST error-code id ID #IMPLIED>
-<!ATTLIST error-page id ID #IMPLIED>
-<!ATTLIST exception-type id ID #IMPLIED>
-<!ATTLIST extension id ID #IMPLIED>
-<!ATTLIST filter id ID #IMPLIED>
-<!ATTLIST filter-class id ID #IMPLIED>
-<!ATTLIST filter-mapping id ID #IMPLIED>
-<!ATTLIST filter-name id ID #IMPLIED>
-<!ATTLIST form-error-page id ID #IMPLIED>
-<!ATTLIST form-login-config id ID #IMPLIED>
-<!ATTLIST form-login-page id ID #IMPLIED>
-<!ATTLIST home id ID #IMPLIED>
-<!ATTLIST http-method id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST init-param id ID #IMPLIED>
-<!ATTLIST jsp-file id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST listener id ID #IMPLIED>
-<!ATTLIST listener-class id ID #IMPLIED>
-<!ATTLIST load-on-startup id ID #IMPLIED>
-<!ATTLIST local id ID #IMPLIED>
-<!ATTLIST local-home id ID #IMPLIED>
-<!ATTLIST location id ID #IMPLIED>
-<!ATTLIST login-config id ID #IMPLIED>
-<!ATTLIST mime-mapping id ID #IMPLIED>
-<!ATTLIST mime-type id ID #IMPLIED>
-<!ATTLIST param-name id ID #IMPLIED>
-<!ATTLIST param-value id ID #IMPLIED>
-<!ATTLIST realm-name id ID #IMPLIED>
-<!ATTLIST remote id ID #IMPLIED>
-<!ATTLIST res-auth id ID #IMPLIED>
-<!ATTLIST res-ref-name id ID #IMPLIED>
-<!ATTLIST res-sharing-scope id ID #IMPLIED>
-<!ATTLIST res-type id ID #IMPLIED>
-<!ATTLIST resource-env-ref id ID #IMPLIED>
-<!ATTLIST resource-env-ref-name id ID #IMPLIED>
-<!ATTLIST resource-env-ref-type id ID #IMPLIED>
-<!ATTLIST resource-ref id ID #IMPLIED>
-<!ATTLIST role-link id ID #IMPLIED>
-<!ATTLIST role-name id ID #IMPLIED>
-<!ATTLIST run-as id ID #IMPLIED>
-<!ATTLIST security-constraint id ID #IMPLIED>
-<!ATTLIST security-role id ID #IMPLIED>
-<!ATTLIST security-role-ref id ID #IMPLIED>
-<!ATTLIST servlet id ID #IMPLIED>
-<!ATTLIST servlet-class id ID #IMPLIED>
-<!ATTLIST servlet-mapping id ID #IMPLIED>
-<!ATTLIST servlet-name id ID #IMPLIED>
-<!ATTLIST session-config id ID #IMPLIED>
-<!ATTLIST session-timeout id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST taglib id ID #IMPLIED>
-<!ATTLIST taglib-location id ID #IMPLIED>
-<!ATTLIST taglib-uri id ID #IMPLIED>
-<!ATTLIST transport-guarantee id ID #IMPLIED>
-<!ATTLIST url-pattern id ID #IMPLIED>
-<!ATTLIST user-data-constraint id ID #IMPLIED>
-<!ATTLIST web-app id ID #IMPLIED>
-<!ATTLIST web-resource-collection id ID #IMPLIED>
-<!ATTLIST web-resource-name id ID #IMPLIED>
-<!ATTLIST welcome-file id ID #IMPLIED>
-<!ATTLIST welcome-file-list id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_4.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_4.xsd
deleted file mode 100644
index 79a2513..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_4.xsd
+++ /dev/null
@@ -1,1234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="2.4">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)web-app_2_4.xsds	1.60 03/08/26
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2004 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the Servlet 2.4 deployment descriptor.
-	The deployment descriptor must be named "WEB-INF/web.xml" in the
-	web application's war file.  All Servlet deployment descriptors
-	must indicate the web application schema by using the J2EE
-	namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="..."
-	      version="2.4">
-	      ...
-	    </web-app>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for J2EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all J2EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-  <xsd:include schemaLocation="jsp_2_0.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="web-app" type="j2ee:web-appType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The web-app element is the root of the deployment
-	descriptor for a web application.  Note that the sub-elements
-	of this element can be in the arbitrary order. Because of
-	that, the multiplicity of the elements of distributable,
-	session-config, welcome-file-list, jsp-config, login-config,
-	and locale-encoding-mapping-list was changed from "?" to "*"
-	in this schema.  However, the deployment descriptor instance
-	file must not contain multiple elements of session-config,
-	jsp-config, and login-config. When there are multiple elements of
-	welcome-file-list or locale-encoding-mapping-list, the container
-	must concatinate the element contents.  The multiple occurance
-	of the element distributable is redundant and the container
-	treats that case exactly in the same way when there is only
-	one distributable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="web-app-servlet-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The servlet element contains the name of a servlet.
-	  The name must be unique within the web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:servlet"/>
-      <xsd:field    xpath="j2ee:servlet-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-filter-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The filter element contains the name of a filter.
-	  The name must be unique within the web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:filter"/>
-      <xsd:field    xpath="j2ee:filter-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-local-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the web
-	  application's environment and is relative to the
-	  java:comp/env context.  The name must be unique within
-	  the web application.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:ejb-local-ref"/>
-      <xsd:field    xpath="j2ee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-ejb-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the web
-	  application's environment and is relative to the
-	  java:comp/env context.  The name must be unique within
-	  the web application.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:ejb-ref"/>
-      <xsd:field    xpath="j2ee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-resource-env-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The resource-env-ref-name element specifies the name of
-	  a resource environment reference; its value is the
-	  environment entry name used in the web application code.
-	  The name is a JNDI name relative to the java:comp/env
-	  context and must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:resource-env-ref"/>
-      <xsd:field    xpath="j2ee:resource-env-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-message-destination-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The message-destination-ref-name element specifies the name of
-	  a message destination reference; its value is the
-	  environment entry name used in the web application code.
-	  The name is a JNDI name relative to the java:comp/env
-	  context and must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:message-destination-ref"/>
-      <xsd:field    xpath="j2ee:message-destination-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-res-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The res-ref-name element specifies the name of a
-	  resource manager connection factory reference.  The name
-	  is a JNDI name relative to the java:comp/env context.
-	  The name must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:resource-ref"/>
-      <xsd:field    xpath="j2ee:res-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-env-entry-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The env-entry-name element contains the name of a web
-	  application's environment entry.  The name is a JNDI
-	  name relative to the java:comp/env context.  The name
-	  must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-      <xsd:selector xpath="j2ee:env-entry"/>
-      <xsd:field    xpath="j2ee:env-entry-name"/>
-    </xsd:unique>
-
-    <xsd:key name="web-app-role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  A role-name-key is specified to allow the references
-	  from the security-role-refs.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:security-role"/>
-      <xsd:field    xpath="j2ee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="web-app-role-name-references"
-		refer="j2ee:web-app-role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  security-role-ref to a specified role-name.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:servlet/j2ee:security-role-ref"/>
-      <xsd:field    xpath="j2ee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="auth-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The auth-constraintType indicates the user roles that
-	should be permitted access to this resource
-	collection. The role-name used here must either correspond
-	to the role-name of one of the security-role elements
-	defined for this web application, or be the specially
-	reserved role-name "*" that is a compact syntax for
-	indicating all roles in the web application. If both "*"
-	and rolenames appear, the container interprets this as all
-	roles.  If no roles are defined, no user is allowed access
-	to the portion of the web application described by the
-	containing security-constraint.  The container matches
-	role names case sensitively when determining access.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="j2ee:role-nameType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="auth-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The auth-methodType is used to configure the authentication
-	mechanism for the web application. As a prerequisite to
-	gaining access to any web resources which are protected by
-	an authorization constraint, a user must have authenticated
-	using the configured mechanism. Legal values are "BASIC",
-	"DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
-	authentication scheme.
-
-	Used in: login-config
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="dispatcherType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
-	and ERROR. A value of FORWARD means the Filter will be applied
-	under RequestDispatcher.forward() calls.  A value of REQUEST
-	means the Filter will be applied under ordinary client calls to
-	the path or servlet. A value of INCLUDE means the Filter will be
-	applied under RequestDispatcher.include() calls.  A value of
-	ERROR means the Filter will be applied under the error page
-	mechanism.  The absence of any dispatcher elements in a
-	filter-mapping indicates a default of applying filters only under
-	ordinary client calls to the path or servlet.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="FORWARD"/>
-	<xsd:enumeration value="INCLUDE"/>
-	<xsd:enumeration value="REQUEST"/>
-	<xsd:enumeration value="ERROR"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="encodingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The encodingType defines IANA character sets.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[^\s]+"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="error-codeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The error-code contains an HTTP error code, ex: 404
-
-	Used in: error-page
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdPositiveIntegerType">
-	<xsd:pattern value="\d{3}"/>
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="error-pageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The error-pageType contains a mapping between an error code
-	or exception type to the path of a resource in the web
-	application.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:choice>
-	<xsd:element name="error-code"
-		     type="j2ee:error-codeType"/>
-
-	<xsd:element name="exception-type"
-		     type="j2ee:fully-qualified-classType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The exception-type contains a fully qualified class
-	      name of a Java exception type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-
-      <xsd:element name="location"
-		   type="j2ee:war-pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The location element contains the location of the
-	    resource in the web application relative to the root of
-	    the web application. The value of the location must have
-	    a leading `/'.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filter-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declaration of the filter mappings in this web
-	application is done by using filter-mappingType.
-	The container uses the filter-mapping
-	declarations to decide which filters to apply to a request,
-	and in what order. The container matches the request URI to
-	a Servlet in the normal way. To determine which filters to
-	apply it matches filter-mapping declarations either on
-	servlet-name, or on url-pattern for each filter-mapping
-	element, depending on which style is used. The order in
-	which filters are invoked is the order in which
-	filter-mapping declarations that match a request URI for a
-	servlet appear in the list of filter-mapping elements.The
-	filter-name value must be the value of the filter-name
-	sub-elements of one of the filter declarations in the
-	deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="filter-name"
-		   type="j2ee:filter-nameType"/>
-      <xsd:choice>
-	<xsd:element name="url-pattern"
-		     type="j2ee:url-patternType"/>
-	<xsd:element name="servlet-name"
-		     type="j2ee:servlet-nameType"/>
-      </xsd:choice>
-      <xsd:element name="dispatcher"
-		   type="j2ee:dispatcherType"
-		   minOccurs="0" maxOccurs="4"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filter-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The logical name of the filter is declare
-	by using filter-nameType. This name is used to map the
-	filter.  Each filter name is unique within the web
-	application.
-
-	Used in: filter, filter-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:extension base="j2ee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The filterType is used to declare a filter in the web
-	application. The filter is mapped to either a servlet or a
-	URL pattern in the filter-mapping element, using the
-	filter-name value to reference. Filters can access the
-	initialization parameters declared in the deployment
-	descriptor at runtime via the FilterConfig interface.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="filter-name"
-		   type="j2ee:filter-nameType"/>
-      <xsd:element name="filter-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The fully qualified classname of the filter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="init-param"
-		   type="j2ee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-param element contains a name/value pair as
-	    an initialization param of a servlet filter
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="form-login-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The form-login-configType specifies the login and error
-	pages that should be used in form based login. If form based
-	authentication is not used, these elements are ignored.
-
-	Used in: login-config
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:element name="form-login-page"
-		   type="j2ee:war-pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The form-login-page element defines the location in the web
-	    app where the page that can be used for login can be
-	    found.  The path begins with a leading / and is interpreted
-	    relative to the root of the WAR.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="form-error-page"
-		   type="j2ee:war-pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The form-error-page element defines the location in
-	    the web app where the error page that is displayed
-	    when login is not successful can be found.
-	    The path begins with a leading / and is interpreted
-	    relative to the root of the WAR.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="http-methodType">
-    <xsd:annotation>
-
-      <xsd:documentation>
-
-	The http-method contains an HTTP method recognized by the
-	web-app, for example GET, POST, ...
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="GET"/>
-	<xsd:enumeration value="POST"/>
-	<xsd:enumeration value="PUT"/>
-	<xsd:enumeration value="DELETE"/>
-	<xsd:enumeration value="HEAD"/>
-	<xsd:enumeration value="OPTIONS"/>
-	<xsd:enumeration value="TRACE"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="locale-encoding-mapping-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The locale-encoding-mapping-list contains one or more
-	locale-encoding-mapping(s).
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="locale-encoding-mapping"
-		   type="j2ee:locale-encoding-mappingType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="locale-encoding-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The locale-encoding-mapping contains locale name and
-	encoding name. The locale name must be either "Language-code",
-	such as "ja", defined by ISO-639 or "Language-code_Country-code",
-	such as "ja_JP".  "Country code" is defined by ISO-3166.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="locale"
-		   type="j2ee:localeType"/>
-      <xsd:element name="encoding"
-		   type="j2ee:encodingType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="localeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The localeType defines valid locale defined by ISO-639-1
-	and ISO-3166.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="login-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The login-configType is used to configure the authentication
-	method that should be used, the realm name that should be
-	used for this application, and the attributes that are
-	needed by the form login mechanism.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="auth-method"
-		   type="j2ee:auth-methodType"
-		   minOccurs="0"/>
-      <xsd:element name="realm-name"
-		   type="j2ee:string" minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The realm name element specifies the realm name to
-	    use in HTTP Basic authorization.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="form-login-config"
-		   type="j2ee:form-login-configType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="mime-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The mime-mappingType defines a mapping between an extension
-	and a mime type.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The extension element contains a string describing an
-	  extension. example: "txt"
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-      <xsd:element name="extension"
-		   type="j2ee:string"/>
-      <xsd:element name="mime-type"
-		   type="j2ee:mime-typeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="mime-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The mime-typeType is used to indicate a defined mime type.
-
-	Example:
-	"text/plain"
-
-	Used in: mime-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-        <xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="nonEmptyStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-	This type defines a string which contains at least one
-	character.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:minLength value="1"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-constraintType is used to associate
-	security constraints with one or more web resource
-	collections
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="display-name"
-		   type="j2ee:display-nameType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="web-resource-collection"
-		   type="j2ee:web-resource-collectionType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="auth-constraint"
-		   type="j2ee:auth-constraintType"
-		   minOccurs="0"/>
-      <xsd:element name="user-data-constraint"
-		   type="j2ee:user-data-constraintType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The servlet-mappingType defines a mapping between a
-	servlet and a url pattern.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="servlet-name"
-		   type="j2ee:servlet-nameType"/>
-      <xsd:element name="url-pattern"
-		   type="j2ee:url-patternType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The servlet-name element contains the canonical name of the
-	servlet. Each servlet name is unique within the web
-	application.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:extension base="j2ee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servletType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The servletType is used to declare a servlet.
-	It contains the declarative data of a
-	servlet. If a jsp-file is specified and the load-on-startup
-	element is present, then the JSP should be precompiled and
-	loaded.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="servlet-name"
-		   type="j2ee:servlet-nameType"/>
-      <xsd:choice>
-	<xsd:element name="servlet-class"
-		     type="j2ee:fully-qualified-classType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The servlet-class element contains the fully
-	      qualified class name of the servlet.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-
-	<xsd:element name="jsp-file"
-		     type="j2ee:jsp-fileType"/>
-
-      </xsd:choice>
-
-      <xsd:element name="init-param"
-		   type="j2ee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="load-on-startup"
-		   type="j2ee:xsdIntegerType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The load-on-startup element indicates that this
-	    servlet should be loaded (instantiated and have
-	    its init() called) on the startup of the web
-	    application. The optional contents of these
-	    element must be an integer indicating the order in
-	    which the servlet should be loaded. If the value
-	    is a negative integer, or the element is not
-	    present, the container is free to load the servlet
-	    whenever it chooses. If the value is a positive
-	    integer or 0, the container must load and
-	    initialize the servlet as the application is
-	    deployed. The container must guarantee that
-	    servlets marked with lower integers are loaded
-	    before servlets marked with higher integers. The
-	    container may choose the order of loading of
-	    servlets with the same load-on-start-up value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="run-as"
-		   type="j2ee:run-asType"
-		   minOccurs="0"/>
-      <xsd:element name="security-role-ref"
-		   type="j2ee:security-role-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-configType defines the session parameters
-	for this web application.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="session-timeout"
-		   type="j2ee:xsdIntegerType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The session-timeout element defines the default
-	    session timeout interval for all sessions created
-	    in this web application. The specified timeout
-	    must be expressed in a whole number of minutes.
-	    If the timeout is 0 or less, the container ensures
-	    the default behaviour of sessions is never to time
-	    out. If this element is not specified, the container
-	    must set its default timeout period.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transport-guaranteeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transport-guaranteeType specifies that the communication
-	between client and server should be NONE, INTEGRAL, or
-	CONFIDENTIAL. NONE means that the application does not
-	require any transport guarantees. A value of INTEGRAL means
-	that the application requires that the data sent between the
-	client and server be sent in such a way that it can't be
-	changed in transit. CONFIDENTIAL means that the application
-	requires that the data be transmitted in a fashion that
-	prevents other entities from observing the contents of the
-	transmission. In most cases, the presence of the INTEGRAL or
-	CONFIDENTIAL flag will indicate that the use of SSL is
-	required.
-
-	Used in: user-data-constraint
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="NONE"/>
-	<xsd:enumeration value="INTEGRAL"/>
-	<xsd:enumeration value="CONFIDENTIAL"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="user-data-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The user-data-constraintType is used to indicate how
-	data communicated between the client and container should be
-	protected.
-
-	Used in: security-constraint
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="transport-guarantee"
-		   type="j2ee:transport-guaranteeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="war-pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate a path starting
-	with a "/" and interpreted relative to the root of a WAR
-	file.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:pattern value="/.*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="web-app-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type contains the recognized versions of
-	web-application supported. It is used to designate the
-	version of the web application.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="2.4"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="web-appType">
-
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="distributable"
-		   type="j2ee:emptyType"/>
-      <xsd:element name="context-param"
-		   type="j2ee:param-valueType">
-
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The context-param element contains the declaration
-	    of a web application's servlet context
-	    initialization parameters.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="filter"
-		   type="j2ee:filterType"/>
-      <xsd:element name="filter-mapping"
-		   type="j2ee:filter-mappingType"/>
-      <xsd:element name="listener"
-		   type="j2ee:listenerType"/>
-      <xsd:element name="servlet"
-		   type="j2ee:servletType"/>
-      <xsd:element name="servlet-mapping"
-		   type="j2ee:servlet-mappingType"/>
-      <xsd:element name="session-config"
-		   type="j2ee:session-configType"/>
-      <xsd:element name="mime-mapping"
-		   type="j2ee:mime-mappingType"/>
-      <xsd:element name="welcome-file-list"
-		   type="j2ee:welcome-file-listType"/>
-      <xsd:element name="error-page"
-		   type="j2ee:error-pageType"/>
-      <xsd:element name="jsp-config"
-		   type="j2ee:jsp-configType"/>
-      <xsd:element name="security-constraint"
-		   type="j2ee:security-constraintType"/>
-      <xsd:element name="login-config"
-		   type="j2ee:login-configType"/>
-      <xsd:element name="security-role"
-		   type="j2ee:security-roleType"/>
-      <xsd:group ref="j2ee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="message-destination"
-		   type="j2ee:message-destinationType"/>
-      <xsd:element name="locale-encoding-mapping-list"
-		   type="j2ee:locale-encoding-mapping-listType"/>
-    </xsd:choice>
-
-    <xsd:attribute name="version"
-		   type="j2ee:web-app-versionType"
-		   use="required"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="web-resource-collectionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The web-resource-collectionType is used to identify a subset
-	of the resources and HTTP methods on those resources within
-	a web application to which a security constraint applies. If
-	no HTTP methods are specified, then the security constraint
-	applies to all HTTP methods.
-
-	Used in: security-constraint
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="web-resource-name"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The web-resource-name contains the name of this web
-	    resource collection.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="url-pattern"
-		   type="j2ee:url-patternType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="http-method"
-		   type="j2ee:http-methodType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="welcome-file-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The welcome-file-list contains an ordered list of welcome
-	files elements.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="welcome-file"
-		   type="xsd:string"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The welcome-file element contains file name to use
-	    as a default welcome file, such as index.html
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_5.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_5.xsd
deleted file mode 100644
index 8c0902e..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_2_5.xsd
+++ /dev/null
@@ -1,1271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-	    targetNamespace="http://java.sun.com/xml/ns/javaee"
-	    xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-	    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	    elementFormDefault="qualified"
-	    attributeFormDefault="unqualified"
-	    version="2.5">
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)web-app_2_5.xsds	1.62 05/08/06
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the Servlet 2.5 deployment descriptor.
-	The deployment descriptor must be named "WEB-INF/web.xml" in the
-	web application's war file.  All Servlet deployment descriptors
-	must indicate the web application schema by using the Java EE
-	namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="..."
-	      version="2.5">
-	      ...
-	    </web-app>
-
-	The instance documents may indicate the published version of
-	the schema using the xsi:schemaLocation attribute for Java EE
-	namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-
-      - In elements that specify a pathname to a file within the
-	same JAR file, relative filenames (i.e., those not
-	starting with "/") are considered relative to the root of
-	the JAR file's namespace.  Absolute filenames (i.e., those
-	starting with "/") also specify names in the root of the
-	JAR file's namespace.  In general, relative names are
-	preferred.  The exception is .war files where absolute
-	names are preferred for consistency with the Servlet API.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-  <xsd:include schemaLocation="jsp_2_1.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="web-app" type="javaee:web-appType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The web-app element is the root of the deployment
-	descriptor for a web application.  Note that the sub-elements
-	of this element can be in the arbitrary order. Because of
-	that, the multiplicity of the elements of distributable,
-	session-config, welcome-file-list, jsp-config, login-config,
-	and locale-encoding-mapping-list was changed from "?" to "*"
-	in this schema.  However, the deployment descriptor instance
-	file must not contain multiple elements of session-config,
-	jsp-config, and login-config. When there are multiple elements of
-	welcome-file-list or locale-encoding-mapping-list, the container
-	must concatenate the element contents.  The multiple occurence
-	of the element distributable is redundant and the container
-	treats that case exactly in the same way when there is only
-	one distributable.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:unique name="web-app-servlet-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The servlet element contains the name of a servlet.
-	  The name must be unique within the web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:servlet"/>
-      <xsd:field    xpath="javaee:servlet-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-filter-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The filter element contains the name of a filter.
-	  The name must be unique within the web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:filter"/>
-      <xsd:field    xpath="javaee:filter-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-ejb-local-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-local-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the web
-	  application's environment and is relative to the
-	  java:comp/env context.  The name must be unique within
-	  the web application.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-local-ref"/>
-      <xsd:field    xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-ejb-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The ejb-ref-name element contains the name of an EJB
-	  reference. The EJB reference is an entry in the web
-	  application's environment and is relative to the
-	  java:comp/env context.  The name must be unique within
-	  the web application.
-
-	  It is recommended that name is prefixed with "ejb/".
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-ref"/>
-      <xsd:field    xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-resource-env-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The resource-env-ref-name element specifies the name of
-	  a resource environment reference; its value is the
-	  environment entry name used in the web application code.
-	  The name is a JNDI name relative to the java:comp/env
-	  context and must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-env-ref"/>
-      <xsd:field    xpath="javaee:resource-env-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-message-destination-ref-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The message-destination-ref-name element specifies the name of
-	  a message destination reference; its value is the
-	  environment entry name used in the web application code.
-	  The name is a JNDI name relative to the java:comp/env
-	  context and must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:message-destination-ref"/>
-      <xsd:field    xpath="javaee:message-destination-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-res-ref-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The res-ref-name element specifies the name of a
-	  resource manager connection factory reference.  The name
-	  is a JNDI name relative to the java:comp/env context.
-	  The name must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-ref"/>
-      <xsd:field    xpath="javaee:res-ref-name"/>
-    </xsd:unique>
-
-    <xsd:unique name="web-app-env-entry-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The env-entry-name element contains the name of a web
-	  application's environment entry.  The name is a JNDI
-	  name relative to the java:comp/env context.  The name
-	  must be unique within a web application.
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-      <xsd:selector xpath="javaee:env-entry"/>
-      <xsd:field    xpath="javaee:env-entry-name"/>
-    </xsd:unique>
-
-    <xsd:key name="web-app-role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  A role-name-key is specified to allow the references
-	  from the security-role-refs.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:security-role"/>
-      <xsd:field    xpath="javaee:role-name"/>
-    </xsd:key>
-
-    <xsd:keyref name="web-app-role-name-references"
-		refer="javaee:web-app-role-name-key">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The keyref indicates the references from
-	  security-role-ref to a specified role-name.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
-      <xsd:field    xpath="javaee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="auth-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The auth-constraintType indicates the user roles that
-	should be permitted access to this resource
-	collection. The role-name used here must either correspond
-	to the role-name of one of the security-role elements
-	defined for this web application, or be the specially
-	reserved role-name "*" that is a compact syntax for
-	indicating all roles in the web application. If both "*"
-	and rolenames appear, the container interprets this as all
-	roles.  If no roles are defined, no user is allowed access
-	to the portion of the web application described by the
-	containing security-constraint.  The container matches
-	role names case sensitively when determining access.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-		   type="javaee:role-nameType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="auth-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The auth-methodType is used to configure the authentication
-	mechanism for the web application. As a prerequisite to
-	gaining access to any web resources which are protected by
-	an authorization constraint, a user must have authenticated
-	using the configured mechanism. Legal values are "BASIC",
-	"DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
-	authentication scheme.
-
-	Used in: login-config
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="dispatcherType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The dispatcher has four legal values: FORWARD, REQUEST, INCLUDE,
-	and ERROR. A value of FORWARD means the Filter will be applied
-	under RequestDispatcher.forward() calls.  A value of REQUEST
-	means the Filter will be applied under ordinary client calls to
-	the path or servlet. A value of INCLUDE means the Filter will be
-	applied under RequestDispatcher.include() calls.  A value of
-	ERROR means the Filter will be applied under the error page
-	mechanism.  The absence of any dispatcher elements in a
-	filter-mapping indicates a default of applying filters only under
-	ordinary client calls to the path or servlet.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="FORWARD"/>
-	<xsd:enumeration value="INCLUDE"/>
-	<xsd:enumeration value="REQUEST"/>
-	<xsd:enumeration value="ERROR"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="encodingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The encodingType defines IANA character sets.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[^\s]+"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="error-codeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The error-code contains an HTTP error code, ex: 404
-
-	Used in: error-page
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdPositiveIntegerType">
-	<xsd:pattern value="\d{3}"/>
-	<xsd:attribute name="id" type="xsd:ID"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="error-pageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The error-pageType contains a mapping between an error code
-	or exception type to the path of a resource in the web
-	application.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:choice>
-	<xsd:element name="error-code"
-		     type="javaee:error-codeType"/>
-
-	<xsd:element name="exception-type"
-		     type="javaee:fully-qualified-classType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The exception-type contains a fully qualified class
-	      name of a Java exception type.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-
-      <xsd:element name="location"
-		   type="javaee:war-pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The location element contains the location of the
-	    resource in the web application relative to the root of
-	    the web application. The value of the location must have
-	    a leading `/'.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filter-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Declaration of the filter mappings in this web
-	application is done by using filter-mappingType.
-	The container uses the filter-mapping
-	declarations to decide which filters to apply to a request,
-	and in what order. The container matches the request URI to
-	a Servlet in the normal way. To determine which filters to
-	apply it matches filter-mapping declarations either on
-	servlet-name, or on url-pattern for each filter-mapping
-	element, depending on which style is used. The order in
-	which filters are invoked is the order in which
-	filter-mapping declarations that match a request URI for a
-	servlet appear in the list of filter-mapping elements.The
-	filter-name value must be the value of the filter-name
-	sub-elements of one of the filter declarations in the
-	deployment descriptor.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="filter-name"
-		   type="javaee:filter-nameType"/>
-      <xsd:choice minOccurs="1" maxOccurs="unbounded">
-	<xsd:element name="url-pattern"
-		     type="javaee:url-patternType"/>
-	<xsd:element name="servlet-name"
-		     type="javaee:servlet-nameType"/>
-      </xsd:choice>
-      <xsd:element name="dispatcher"
-		   type="javaee:dispatcherType"
-		   minOccurs="0" maxOccurs="4"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filter-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The logical name of the filter is declare
-	by using filter-nameType. This name is used to map the
-	filter.  Each filter name is unique within the web
-	application.
-
-	Used in: filter, filter-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The filterType is used to declare a filter in the web
-	application. The filter is mapped to either a servlet or a
-	URL pattern in the filter-mapping element, using the
-	filter-name value to reference. Filters can access the
-	initialization parameters declared in the deployment
-	descriptor at runtime via the FilterConfig interface.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="filter-name"
-		   type="javaee:filter-nameType"/>
-      <xsd:element name="filter-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The fully qualified classname of the filter.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-param element contains a name/value pair as
-	    an initialization param of a servlet filter
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="form-login-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The form-login-configType specifies the login and error
-	pages that should be used in form based login. If form based
-	authentication is not used, these elements are ignored.
-
-	Used in: login-config
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-
-      <xsd:element name="form-login-page"
-		   type="javaee:war-pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The form-login-page element defines the location in the web
-	    app where the page that can be used for login can be
-	    found.  The path begins with a leading / and is interpreted
-	    relative to the root of the WAR.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="form-error-page"
-		   type="javaee:war-pathType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The form-error-page element defines the location in
-	    the web app where the error page that is displayed
-	    when login is not successful can be found.
-	    The path begins with a leading / and is interpreted
-	    relative to the root of the WAR.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="http-methodType">
-    <xsd:annotation>
-
-      <xsd:documentation>
-
-	A HTTP method type as defined in HTTP 1.1 section 2.2.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-     <xsd:restriction base="xsd:token">
-         <xsd:pattern value="[&#33;-&#126;-[\(\)&#60;&#62;@,;:&#34;/\[\]?=\{\}\\\p{Z}]]+"/>
-     </xsd:restriction>
-
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="load-on-startupType">
-    <xsd:union memberTypes="javaee:null-charType xsd:integer"/>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="locale-encoding-mapping-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The locale-encoding-mapping-list contains one or more
-	locale-encoding-mapping(s).
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="locale-encoding-mapping"
-		   type="javaee:locale-encoding-mappingType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="locale-encoding-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The locale-encoding-mapping contains locale name and
-	encoding name. The locale name must be either "Language-code",
-	such as "ja", defined by ISO-639 or "Language-code_Country-code",
-	such as "ja_JP".  "Country code" is defined by ISO-3166.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="locale"
-		   type="javaee:localeType"/>
-      <xsd:element name="encoding"
-		   type="javaee:encodingType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="localeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The localeType defines valid locale defined by ISO-639-1
-	and ISO-3166.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="login-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The login-configType is used to configure the authentication
-	method that should be used, the realm name that should be
-	used for this application, and the attributes that are
-	needed by the form login mechanism.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="auth-method"
-		   type="javaee:auth-methodType"
-		   minOccurs="0"/>
-      <xsd:element name="realm-name"
-		   type="javaee:string" minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The realm name element specifies the realm name to
-	    use in HTTP Basic authorization.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="form-login-config"
-		   type="javaee:form-login-configType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="mime-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The mime-mappingType defines a mapping between an extension
-	and a mime type.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The extension element contains a string describing an
-	  extension. example: "txt"
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-      <xsd:element name="extension"
-		   type="javaee:string"/>
-      <xsd:element name="mime-type"
-		   type="javaee:mime-typeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="mime-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The mime-typeType is used to indicate a defined mime type.
-
-	Example:
-	"text/plain"
-
-	Used in: mime-mapping
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="nonEmptyStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-	This type defines a string which contains at least one
-	character.
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:minLength value="1"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="null-charType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value=""/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The security-constraintType is used to associate
-	security constraints with one or more web resource
-	collections
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="display-name"
-		   type="javaee:display-nameType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="web-resource-collection"
-		   type="javaee:web-resource-collectionType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="auth-constraint"
-		   type="javaee:auth-constraintType"
-		   minOccurs="0"/>
-      <xsd:element name="user-data-constraint"
-		   type="javaee:user-data-constraintType"
-		   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The servlet-mappingType defines a mapping between a
-	servlet and a url pattern.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="servlet-name"
-		   type="javaee:servlet-nameType"/>
-      <xsd:element name="url-pattern"
-		   type="javaee:url-patternType"
-           minOccurs="1" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The servlet-name element contains the canonical name of the
-	servlet. Each servlet name is unique within the web
-	application.
-        The special servlet name of "*" may be used to reference all
-        servlets.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servletType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The servletType is used to declare a servlet.
-	It contains the declarative data of a
-	servlet. If a jsp-file is specified and the load-on-startup
-	element is present, then the JSP should be precompiled and
-	loaded.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="servlet-name"
-		   type="javaee:servlet-nameType"/>
-      <xsd:choice>
-	<xsd:element name="servlet-class"
-		     type="javaee:fully-qualified-classType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The servlet-class element contains the fully
-	      qualified class name of the servlet.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-
-	<xsd:element name="jsp-file"
-		     type="javaee:jsp-fileType"/>
-
-      </xsd:choice>
-
-      <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="load-on-startup"
-		   type="javaee:load-on-startupType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The load-on-startup element indicates that this
-	    servlet should be loaded (instantiated and have
-	    its init() called) on the startup of the web
-	    application. The optional contents of these
-	    element must be an integer indicating the order in
-	    which the servlet should be loaded. If the value
-	    is a negative integer, or the element is not
-	    present, the container is free to load the servlet
-	    whenever it chooses. If the value is a positive
-	    integer or 0, the container must load and
-	    initialize the servlet as the application is
-	    deployed. The container must guarantee that
-	    servlets marked with lower integers are loaded
-	    before servlets marked with higher integers. The
-	    container may choose the order of loading of
-	    servlets with the same load-on-start-up value.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="run-as"
-		   type="javaee:run-asType"
-		   minOccurs="0"/>
-      <xsd:element name="security-role-ref"
-		   type="javaee:security-role-refType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The session-configType defines the session parameters
-	for this web application.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="session-timeout"
-		   type="javaee:xsdIntegerType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The session-timeout element defines the default
-	    session timeout interval for all sessions created
-	    in this web application. The specified timeout
-	    must be expressed in a whole number of minutes.
-	    If the timeout is 0 or less, the container ensures
-	    the default behaviour of sessions is never to time
-	    out. If this element is not specified, the container
-	    must set its default timeout period.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transport-guaranteeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The transport-guaranteeType specifies that the communication
-	between client and server should be NONE, INTEGRAL, or
-	CONFIDENTIAL. NONE means that the application does not
-	require any transport guarantees. A value of INTEGRAL means
-	that the application requires that the data sent between the
-	client and server be sent in such a way that it can't be
-	changed in transit. CONFIDENTIAL means that the application
-	requires that the data be transmitted in a fashion that
-	prevents other entities from observing the contents of the
-	transmission. In most cases, the presence of the INTEGRAL or
-	CONFIDENTIAL flag will indicate that the use of SSL is
-	required.
-
-	Used in: user-data-constraint
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="NONE"/>
-	<xsd:enumeration value="INTEGRAL"/>
-	<xsd:enumeration value="CONFIDENTIAL"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="user-data-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The user-data-constraintType is used to indicate how
-	data communicated between the client and container should be
-	protected.
-
-	Used in: security-constraint
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="transport-guarantee"
-		   type="javaee:transport-guaranteeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="war-pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The elements that use this type designate a path starting
-	with a "/" and interpreted relative to the root of a WAR
-	file.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:pattern value="/.*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:simpleType name="web-app-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type contains the recognized versions of
-	web-application supported. It is used to designate the
-	version of the web application.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="2.5"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="web-appType">
-
-    <xsd:choice minOccurs="0" maxOccurs="unbounded">
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="distributable"
-		   type="javaee:emptyType"/>
-      <xsd:element name="context-param"
-		   type="javaee:param-valueType">
-
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The context-param element contains the declaration
-	    of a web application's servlet context
-	    initialization parameters.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:element name="filter"
-		   type="javaee:filterType"/>
-      <xsd:element name="filter-mapping"
-		   type="javaee:filter-mappingType"/>
-      <xsd:element name="listener"
-		   type="javaee:listenerType"/>
-      <xsd:element name="servlet"
-		   type="javaee:servletType"/>
-      <xsd:element name="servlet-mapping"
-		   type="javaee:servlet-mappingType"/>
-      <xsd:element name="session-config"
-		   type="javaee:session-configType"/>
-      <xsd:element name="mime-mapping"
-		   type="javaee:mime-mappingType"/>
-      <xsd:element name="welcome-file-list"
-		   type="javaee:welcome-file-listType"/>
-      <xsd:element name="error-page"
-		   type="javaee:error-pageType"/>
-      <xsd:element name="jsp-config"
-		   type="javaee:jsp-configType"/>
-      <xsd:element name="security-constraint"
-		   type="javaee:security-constraintType"/>
-      <xsd:element name="login-config"
-		   type="javaee:login-configType"/>
-      <xsd:element name="security-role"
-		   type="javaee:security-roleType"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="message-destination"
-		   type="javaee:message-destinationType"/>
-      <xsd:element name="locale-encoding-mapping-list"
-		   type="javaee:locale-encoding-mapping-listType"/>
-    </xsd:choice>
-
-    <xsd:attribute name="version"
-		   type="javaee:web-app-versionType"
-		   use="required"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-    <xsd:attribute name="metadata-complete" type="xsd:boolean">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The metadata-complete attribute defines whether this
-	  deployment descriptor and other related deployment
-	  descriptors for this module (e.g., web service
-	  descriptors) are complete, or whether the class
-	  files available to this module and packaged with
-	  this application should be examined for annotations
-	  that specify deployment information.
-
-	  If metadata-complete is set to "true", the deployment
-	  tool must ignore any annotations that specify deployment
-	  information, which might be present in the class files
-	  of the application.
-
-	  If metadata-complete is not specified or is set to
-	  "false", the deployment tool must examine the class
-	  files of the application for annotations, as
-	  specified by the specifications.
-
-	</xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="web-resource-collectionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The web-resource-collectionType is used to identify a subset
-	of the resources and HTTP methods on those resources within
-	a web application to which a security constraint applies. If
-	no HTTP methods are specified, then the security constraint
-	applies to all HTTP methods.
-
-	Used in: security-constraint
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="web-resource-name"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The web-resource-name contains the name of this web
-	    resource collection.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="url-pattern"
-		   type="javaee:url-patternType"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="http-method"
-		   type="javaee:http-methodType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="welcome-file-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The welcome-file-list contains an ordered list of welcome
-	files elements.
-
-	Used in: web-app
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="welcome-file"
-		   type="xsd:string"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The welcome-file element contains file name to use
-	    as a default welcome file, such as index.html
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_3_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_3_0.xsd
deleted file mode 100644
index bbcdf43..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-app_3_0.xsd
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="3.0">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      This is the XML Schema for the Servlet 3.0 deployment descriptor.
-      The deployment descriptor must be named "WEB-INF/web.xml" in the
-      web application's war file.  All Servlet deployment descriptors
-      must indicate the web application schema by using the Java EE
-      namespace:
-      
-      http://java.sun.com/xml/ns/javaee 
-      
-      and by indicating the version of the schema by 
-      using the version element as shown below: 
-      
-      <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="..."
-      version="3.0"> 
-      ...
-      </web-app>
-      
-      The instance documents may indicate the published version of
-      the schema using the xsi:schemaLocation attribute for Java EE
-      namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="web-common_3_0.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="web-app"
-               type="javaee:web-appType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The web-app element is the root of the deployment
-        descriptor for a web application.  Note that the sub-elements
-        of this element can be in the arbitrary order. Because of
-        that, the multiplicity of the elements of distributable,
-        session-config, welcome-file-list, jsp-config, login-config,
-        and locale-encoding-mapping-list was changed from "?" to "*"
-        in this schema.  However, the deployment descriptor instance
-        file must not contain multiple elements of session-config,
-        jsp-config, and login-config. When there are multiple elements of
-        welcome-file-list or locale-encoding-mapping-list, the container
-        must concatenate the element contents.  The multiple occurence
-        of the element distributable is redundant and the container
-        treats that case exactly in the same way when there is only
-        one distributable. 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:unique name="web-common-servlet-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The servlet element contains the name of a servlet.
-          The name must be unique within the web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:servlet"/>
-      <xsd:field xpath="javaee:servlet-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-filter-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The filter element contains the name of a filter.
-          The name must be unique within the web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:filter"/>
-      <xsd:field xpath="javaee:filter-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-ejb-local-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The ejb-local-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
-          application's environment and is relative to the
-          java:comp/env context.  The name must be unique within
-          the web application.
-          
-          It is recommended that name is prefixed with "ejb/".
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-local-ref"/>
-      <xsd:field xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-ejb-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The ejb-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
-          application's environment and is relative to the
-          java:comp/env context.  The name must be unique within
-          the web application.
-          
-          It is recommended that name is prefixed with "ejb/".
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-ref"/>
-      <xsd:field xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-resource-env-ref-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The resource-env-ref-name element specifies the name of
-          a resource environment reference; its value is the
-          environment entry name used in the web application code.
-          The name is a JNDI name relative to the java:comp/env
-          context and must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-env-ref"/>
-      <xsd:field xpath="javaee:resource-env-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-message-destination-ref-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The message-destination-ref-name element specifies the name of
-          a message destination reference; its value is the
-          environment entry name used in the web application code.
-          The name is a JNDI name relative to the java:comp/env
-          context and must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:message-destination-ref"/>
-      <xsd:field xpath="javaee:message-destination-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-res-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The res-ref-name element specifies the name of a
-          resource manager connection factory reference.  The name
-          is a JNDI name relative to the java:comp/env context.
-          The name must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-ref"/>
-      <xsd:field xpath="javaee:res-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-env-entry-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The env-entry-name element contains the name of a web
-          application's environment entry.  The name is a JNDI
-          name relative to the java:comp/env context.  The name
-          must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:env-entry"/>
-      <xsd:field xpath="javaee:env-entry-name"/>
-    </xsd:unique>
-    <xsd:key name="web-common-role-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          A role-name-key is specified to allow the references
-          from the security-role-refs.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:security-role"/>
-      <xsd:field xpath="javaee:role-name"/>
-    </xsd:key>
-    <xsd:keyref name="web-common-role-name-references"
-                refer="javaee:web-common-role-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The keyref indicates the references from
-          security-role-ref to a specified role-name.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
-      <xsd:field xpath="javaee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-common_3_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-common_3_0.xsd
deleted file mode 100644
index f994bc2..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-common_3_0.xsd
+++ /dev/null
@@ -1,1575 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="3.0">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      This is the common XML Schema for the Servlet 3.0 deployment descriptor.
-      This file is in turn used by web.xml and web-fragment.xml
-      web application's war file.  All Servlet deployment descriptors
-      must indicate the web common schema by using the Java EE
-      namespace:
-      
-      http://java.sun.com/xml/ns/javaee 
-      
-      and by indicating the version of the schema by 
-      using the version element as shown below: 
-      
-      <web-app xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="..."
-      version="3.0"> 
-      ...
-      </web-app>
-      
-      The instance documents may indicate the published version of
-      the schema using the xsi:schemaLocation attribute for Java EE
-      namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_6.xsd"/>
-
-  <xsd:include schemaLocation="jsp_2_2.xsd"/>
-
-  <xsd:group name="web-commonType">
-    <xsd:choice>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="distributable"
-                   type="javaee:emptyType"/>
-      <xsd:element name="context-param"
-                   type="javaee:param-valueType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The context-param element contains the declaration
-            of a web application's servlet context
-            initialization parameters.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="filter"
-                   type="javaee:filterType"/>
-      <xsd:element name="filter-mapping"
-                   type="javaee:filter-mappingType"/>
-      <xsd:element name="listener"
-                   type="javaee:listenerType"/>
-      <xsd:element name="servlet"
-                   type="javaee:servletType"/>
-      <xsd:element name="servlet-mapping"
-                   type="javaee:servlet-mappingType"/>
-      <xsd:element name="session-config"
-                   type="javaee:session-configType"/>
-      <xsd:element name="mime-mapping"
-                   type="javaee:mime-mappingType"/>
-      <xsd:element name="welcome-file-list"
-                   type="javaee:welcome-file-listType"/>
-      <xsd:element name="error-page"
-                   type="javaee:error-pageType"/>
-      <xsd:element name="jsp-config"
-                   type="javaee:jsp-configType"/>
-      <xsd:element name="security-constraint"
-                   type="javaee:security-constraintType"/>
-      <xsd:element name="login-config"
-                   type="javaee:login-configType"/>
-      <xsd:element name="security-role"
-                   type="javaee:security-roleType"/>
-      <xsd:group ref="javaee:jndiEnvironmentRefsGroup"/>
-      <xsd:element name="message-destination"
-                   type="javaee:message-destinationType"/>
-      <xsd:element name="locale-encoding-mapping-list"
-                   type="javaee:locale-encoding-mapping-listType"/>
-    </xsd:choice>
-  </xsd:group>
-
-  <xsd:attributeGroup name="web-common-attributes">
-    <xsd:attribute name="version"
-                   type="javaee:web-app-versionType"
-                   use="required"/>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-    <xsd:attribute name="metadata-complete"
-                   type="xsd:boolean">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The metadata-complete attribute defines whether this
-          deployment descriptor and other related deployment
-          descriptors for this module (e.g., web service
-          descriptors) are complete, or whether the class
-          files available to this module and packaged with
-          this application should be examined for annotations
-          that specify deployment information.
-          
-          If metadata-complete is set to "true", the deployment
-          tool must ignore any annotations that specify deployment
-          information, which might be present in the class files
-          of the application.
-          
-          If metadata-complete is not specified or is set to
-          "false", the deployment tool must examine the class
-          files of the application for annotations, as
-          specified by the specifications.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-    </xsd:attribute>
-  </xsd:attributeGroup>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="web-appType">
-    <xsd:choice minOccurs="0"
-                maxOccurs="unbounded">
-      <xsd:element name="module-name"
-                   type="javaee:string"
-                   minOccurs="0"/>
-      <xsd:group ref="javaee:web-commonType"/>
-      <xsd:element name="absolute-ordering"
-                   type="javaee:absoluteOrderingType"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="javaee:web-common-attributes"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="web-fragmentType">
-    <xsd:choice minOccurs="0"
-                maxOccurs="unbounded">
-      <xsd:element name="name"
-                   type="javaee:java-identifierType"/>
-      <xsd:group ref="javaee:web-commonType"/>
-      <xsd:element name="ordering"
-                   type="javaee:orderingType"/>
-    </xsd:choice>
-    <xsd:attributeGroup ref="javaee:web-common-attributes"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="auth-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The auth-constraintType indicates the user roles that
-        should be permitted access to this resource
-        collection. The role-name used here must either correspond
-        to the role-name of one of the security-role elements
-        defined for this web application, or be the specially
-        reserved role-name "*" that is a compact syntax for
-        indicating all roles in the web application. If both "*"
-        and rolenames appear, the container interprets this as all
-        roles.  If no roles are defined, no user is allowed access
-        to the portion of the web application described by the
-        containing security-constraint.  The container matches
-        role names case sensitively when determining access.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="role-name"
-                   type="javaee:role-nameType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="auth-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The auth-methodType is used to configure the authentication
-        mechanism for the web application. As a prerequisite to
-        gaining access to any web resources which are protected by
-        an authorization constraint, a user must have authenticated
-        using the configured mechanism. Legal values are "BASIC",
-        "DIGEST", "FORM", "CLIENT-CERT", or a vendor-specific
-        authentication scheme.
-        
-        Used in: login-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="dispatcherType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The dispatcher has five legal values: FORWARD, REQUEST,
-        INCLUDE, ASYNC, and ERROR.
-        
-        A value of FORWARD means the Filter will be applied under
-        RequestDispatcher.forward() calls.
-        A value of REQUEST means the Filter will be applied under
-        ordinary client calls to the path or servlet.
-        A value of INCLUDE means the Filter will be applied under
-        RequestDispatcher.include() calls.
-        A value of ASYNC means the Filter will be applied under
-        calls dispatched from an AsyncContext.
-        A value of ERROR means the Filter will be applied under the
-        error page mechanism.
-        
-        The absence of any dispatcher elements in a filter-mapping
-        indicates a default of applying filters only under ordinary
-        client calls to the path or servlet.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="FORWARD"/>
-        <xsd:enumeration value="INCLUDE"/>
-        <xsd:enumeration value="REQUEST"/>
-        <xsd:enumeration value="ASYNC"/>
-        <xsd:enumeration value="ERROR"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="error-codeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The error-code contains an HTTP error code, ex: 404
-        
-        Used in: error-page
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdPositiveIntegerType">
-        <xsd:pattern value="\d{3}"/>
-        <xsd:attribute name="id"
-                       type="xsd:ID"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="error-pageType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The error-pageType contains a mapping between an error code
-        or exception type to the path of a resource in the web
-        application.
-        
-        Error-page declarations using the exception-type element in
-        the deployment descriptor must be unique up to the class name of
-        the exception-type. Similarly, error-page declarations using the
-        status-code element must be unique in the deployment descriptor
-        up to the status code.
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:choice minOccurs="0"
-                  maxOccurs="1">
-        <xsd:element name="error-code"
-                     type="javaee:error-codeType"/>
-        <xsd:element name="exception-type"
-                     type="javaee:fully-qualified-classType">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The exception-type contains a fully qualified class
-              name of a Java exception type.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-      <xsd:element name="location"
-                   type="javaee:war-pathType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The location element contains the location of the
-            resource in the web application relative to the root of
-            the web application. The value of the location must have
-            a leading `/'.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filterType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The filterType is used to declare a filter in the web
-        application. The filter is mapped to either a servlet or a
-        URL pattern in the filter-mapping element, using the
-        filter-name value to reference. Filters can access the
-        initialization parameters declared in the deployment
-        descriptor at runtime via the FilterConfig interface.
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="filter-name"
-                   type="javaee:filter-nameType"/>
-      <xsd:element name="filter-class"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The fully qualified classname of the filter.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="async-supported"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-      <xsd:element name="init-param"
-                   type="javaee:param-valueType"
-                   minOccurs="0"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The init-param element contains a name/value pair as
-            an initialization param of a servlet filter
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filter-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Declaration of the filter mappings in this web
-        application is done by using filter-mappingType. 
-        The container uses the filter-mapping
-        declarations to decide which filters to apply to a request,
-        and in what order. The container matches the request URI to
-        a Servlet in the normal way. To determine which filters to
-        apply it matches filter-mapping declarations either on
-        servlet-name, or on url-pattern for each filter-mapping
-        element, depending on which style is used. The order in
-        which filters are invoked is the order in which
-        filter-mapping declarations that match a request URI for a
-        servlet appear in the list of filter-mapping elements.The
-        filter-name value must be the value of the filter-name
-        sub-elements of one of the filter declarations in the
-        deployment descriptor.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="filter-name"
-                   type="javaee:filter-nameType"/>
-      <xsd:choice minOccurs="1"
-                  maxOccurs="unbounded">
-        <xsd:element name="url-pattern"
-                     type="javaee:url-patternType"/>
-        <xsd:element name="servlet-name"
-                     type="javaee:servlet-nameType"/>
-      </xsd:choice>
-      <xsd:element name="dispatcher"
-                   type="javaee:dispatcherType"
-                   minOccurs="0"
-                   maxOccurs="5"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="nonEmptyStringType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type defines a string which contains at least one
-        character.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:minLength value="1"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="filter-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The logical name of the filter is declare
-        by using filter-nameType. This name is used to map the
-        filter.  Each filter name is unique within the web
-        application.
-        
-        Used in: filter, filter-mapping
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="form-login-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The form-login-configType specifies the login and error
-        pages that should be used in form based login. If form based
-        authentication is not used, these elements are ignored.
-        
-        Used in: login-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="form-login-page"
-                   type="javaee:war-pathType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The form-login-page element defines the location in the web
-            app where the page that can be used for login can be
-            found.  The path begins with a leading / and is interpreted
-            relative to the root of the WAR.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="form-error-page"
-                   type="javaee:war-pathType">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The form-error-page element defines the location in
-            the web app where the error page that is displayed
-            when login is not successful can be found. 
-            The path begins with a leading / and is interpreted
-            relative to the root of the WAR.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:simpleType name="http-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        A HTTP method type as defined in HTTP 1.1 section 2.2.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:pattern value="[!-~-[\(\)&#60;&#62;@,;:&#34;/\[\]?=\{\}\\\p{Z}]]+"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="load-on-startupType">
-    <xsd:union memberTypes="javaee:null-charType xsd:integer"/>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="null-charType">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value=""/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="login-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The login-configType is used to configure the authentication
-        method that should be used, the realm name that should be
-        used for this application, and the attributes that are
-        needed by the form login mechanism.
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="auth-method"
-                   type="javaee:auth-methodType"
-                   minOccurs="0"/>
-      <xsd:element name="realm-name"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The realm name element specifies the realm name to
-            use in HTTP Basic authorization.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="form-login-config"
-                   type="javaee:form-login-configType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="mime-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The mime-mappingType defines a mapping between an extension
-        and a mime type.
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The extension element contains a string describing an
-          extension. example: "txt"
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:element name="extension"
-                   type="javaee:string"/>
-      <xsd:element name="mime-type"
-                   type="javaee:mime-typeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="mime-typeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The mime-typeType is used to indicate a defined mime type.
-        
-        Example:
-        "text/plain"
-        
-        Used in: mime-mapping
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:pattern value="[^\p{Cc}^\s]+/[^\p{Cc}^\s]+"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="security-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The security-constraintType is used to associate
-        security constraints with one or more web resource
-        collections
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="display-name"
-                   type="javaee:display-nameType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="web-resource-collection"
-                   type="javaee:web-resource-collectionType"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="auth-constraint"
-                   type="javaee:auth-constraintType"
-                   minOccurs="0"/>
-      <xsd:element name="user-data-constraint"
-                   type="javaee:user-data-constraintType"
-                   minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servletType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The servletType is used to declare a servlet.
-        It contains the declarative data of a
-        servlet. If a jsp-file is specified and the load-on-startup
-        element is present, then the JSP should be precompiled and
-        loaded.
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="servlet-name"
-                   type="javaee:servlet-nameType"/>
-      <xsd:choice minOccurs="0"
-                  maxOccurs="1">
-        <xsd:element name="servlet-class"
-                     type="javaee:fully-qualified-classType">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              The servlet-class element contains the fully
-              qualified class name of the servlet.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="jsp-file"
-                     type="javaee:jsp-fileType"/>
-      </xsd:choice>
-      <xsd:element name="init-param"
-                   type="javaee:param-valueType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="load-on-startup"
-                   type="javaee:load-on-startupType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The load-on-startup element indicates that this
-            servlet should be loaded (instantiated and have
-            its init() called) on the startup of the web
-            application. The optional contents of these
-            element must be an integer indicating the order in
-            which the servlet should be loaded. If the value
-            is a negative integer, or the element is not
-            present, the container is free to load the servlet
-            whenever it chooses. If the value is a positive
-            integer or 0, the container must load and
-            initialize the servlet as the application is
-            deployed. The container must guarantee that
-            servlets marked with lower integers are loaded
-            before servlets marked with higher integers. The
-            container may choose the order of loading of
-            servlets with the same load-on-start-up value.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="enabled"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-      <xsd:element name="async-supported"
-                   type="javaee:true-falseType"
-                   minOccurs="0"/>
-      <xsd:element name="run-as"
-                   type="javaee:run-asType"
-                   minOccurs="0"/>
-      <xsd:element name="security-role-ref"
-                   type="javaee:security-role-refType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="multipart-config"
-                   type="javaee:multipart-configType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The servlet-mappingType defines a mapping between a
-        servlet and a url pattern. 
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="servlet-name"
-                   type="javaee:servlet-nameType"/>
-      <xsd:element name="url-pattern"
-                   type="javaee:url-patternType"
-                   minOccurs="1"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="servlet-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The servlet-name element contains the canonical name of the
-        servlet. Each servlet name is unique within the web
-        application.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="session-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The session-configType defines the session parameters
-        for this web application.
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="session-timeout"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The session-timeout element defines the default
-            session timeout interval for all sessions created
-            in this web application. The specified timeout
-            must be expressed in a whole number of minutes.
-            If the timeout is 0 or less, the container ensures
-            the default behaviour of sessions is never to time
-            out. If this element is not specified, the container
-            must set its default timeout period.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="cookie-config"
-                   type="javaee:cookie-configType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The cookie-config element defines the configuration of the
-            session tracking cookies created by this web application.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="tracking-mode"
-                   type="javaee:tracking-modeType"
-                   minOccurs="0"
-                   maxOccurs="3">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The tracking-mode element defines the tracking modes
-            for sessions created by this web application
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cookie-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The cookie-configType defines the configuration for the
-        session tracking cookies of this web application.
-        
-        Used in: session-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="name"
-                   type="javaee:cookie-nameType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The name that will be assigned to any session tracking
-            cookies created by this web application.
-            The default is JSESSIONID
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="domain"
-                   type="javaee:cookie-domainType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The domain name that will be assigned to any session tracking
-            cookies created by this web application.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="path"
-                   type="javaee:cookie-pathType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The path that will be assigned to any session tracking
-            cookies created by this web application.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="comment"
-                   type="javaee:cookie-commentType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The comment that will be assigned to any session tracking
-            cookies created by this web application.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="http-only"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Specifies whether any session tracking cookies created 
-            by this web application will be marked as HttpOnly
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="secure"
-                   type="javaee:true-falseType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Specifies whether any session tracking cookies created 
-            by this web application will be marked as secure
-            even if the request that initiated the corresponding session
-            is using plain HTTP instead of HTTPS
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="max-age"
-                   type="javaee:xsdIntegerType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The lifetime (in seconds) that will be assigned to any
-            session tracking cookies created by this web application.
-            Default is -1
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cookie-nameType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The name that will be assigned to any session tracking
-        cookies created by this web application.
-        The default is JSESSIONID
-        
-        Used in: cookie-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cookie-domainType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The domain name that will be assigned to any session tracking
-        cookies created by this web application.
-        
-        Used in: cookie-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cookie-pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The path that will be assigned to any session tracking
-        cookies created by this web application.
-        
-        Used in: cookie-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="cookie-commentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The comment that will be assigned to any session tracking
-        cookies created by this web application.
-        
-        Used in: cookie-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:extension base="javaee:nonEmptyStringType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tracking-modeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The tracking modes for sessions created by this web
-        application
-        
-        Used in: session-config
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="COOKIE"/>
-        <xsd:enumeration value="URL"/>
-        <xsd:enumeration value="SSL"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="transport-guaranteeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The transport-guaranteeType specifies that the communication
-        between client and server should be NONE, INTEGRAL, or
-        CONFIDENTIAL. NONE means that the application does not
-        require any transport guarantees. A value of INTEGRAL means
-        that the application requires that the data sent between the
-        client and server be sent in such a way that it can't be
-        changed in transit. CONFIDENTIAL means that the application
-        requires that the data be transmitted in a fashion that
-        prevents other entities from observing the contents of the
-        transmission. In most cases, the presence of the INTEGRAL or
-        CONFIDENTIAL flag will indicate that the use of SSL is
-        required.
-        
-        Used in: user-data-constraint
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:enumeration value="NONE"/>
-        <xsd:enumeration value="INTEGRAL"/>
-        <xsd:enumeration value="CONFIDENTIAL"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="user-data-constraintType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The user-data-constraintType is used to indicate how
-        data communicated between the client and container should be
-        protected.
-        
-        Used in: security-constraint
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="transport-guarantee"
-                   type="javaee:transport-guaranteeType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="war-pathType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The elements that use this type designate a path starting
-        with a "/" and interpreted relative to the root of a WAR
-        file.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-        <xsd:pattern value="/.*"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-  <xsd:simpleType name="web-app-versionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This type contains the recognized versions of
-        web-application supported. It is used to designate the
-        version of the web application.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="3.0"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="web-resource-collectionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The web-resource-collectionType is used to identify the
-        resources and HTTP methods on those resources to which a
-        security constraint applies. If no HTTP methods are specified,
-        then the security constraint applies to all HTTP methods.
-        If HTTP methods are specified by http-method-omission
-        elements, the security constraint applies to all methods
-        except those identified in the collection.
-        http-method-omission and http-method elements are never
-        mixed in the same collection. 
-        
-        Used in: security-constraint
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="web-resource-name"
-                   type="javaee:string">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The web-resource-name contains the name of this web
-            resource collection.
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="description"
-                   type="javaee:descriptionType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="url-pattern"
-                   type="javaee:url-patternType"
-                   maxOccurs="unbounded"/>
-      <xsd:choice minOccurs="0"
-                  maxOccurs="1">
-        <xsd:element name="http-method"
-                     type="javaee:http-methodType"
-                     minOccurs="1"
-                     maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              Each http-method names an HTTP method to which the
-              constraint applies.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-        <xsd:element name="http-method-omission"
-                     type="javaee:http-methodType"
-                     minOccurs="1"
-                     maxOccurs="unbounded">
-          <xsd:annotation>
-            <xsd:documentation>
-
-              Each http-method-omission names an HTTP method to
-              which the constraint does not apply.
-              
-            </xsd:documentation>
-          </xsd:annotation>
-        </xsd:element>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="welcome-file-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The welcome-file-list contains an ordered list of welcome
-        files elements.
-        
-        Used in: web-app
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="welcome-file"
-                   type="xsd:string"
-                   maxOccurs="unbounded">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The welcome-file element contains file name to use
-            as a default welcome file, such as index.html
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-  <xsd:simpleType name="localeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The localeType defines valid locale defined by ISO-639-1
-        and ISO-3166.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:simpleType name="encodingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The encodingType defines IANA character sets.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:restriction base="xsd:string">
-      <xsd:pattern value="[^\s]+"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="locale-encoding-mapping-listType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The locale-encoding-mapping-list contains one or more
-        locale-encoding-mapping(s).
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="locale-encoding-mapping"
-                   type="javaee:locale-encoding-mappingType"
-                   maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="locale-encoding-mappingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The locale-encoding-mapping contains locale name and
-        encoding name. The locale name must be either "Language-code",
-        such as "ja", defined by ISO-639 or "Language-code_Country-code",
-        such as "ja_JP".  "Country code" is defined by ISO-3166.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="locale"
-                   type="javaee:localeType"/>
-      <xsd:element name="encoding"
-                   type="javaee:encodingType"/>
-    </xsd:sequence>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ordering-othersType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element indicates that the ordering sub-element in which
-        it was placed should take special action regarding the ordering
-        of this application resource relative to other application
-        configuration resources.
-        See section 8.2.2 of the specification for details.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id"
-                   type="xsd:ID"/>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="absoluteOrderingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Please see section 8.2.2 of the specification for details.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:choice minOccurs="0"
-                maxOccurs="unbounded">
-      <xsd:element name="name"
-                   type="javaee:java-identifierType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="others"
-                   type="javaee:ordering-othersType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-    </xsd:choice>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="orderingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Please see section 8.2.2 of the specification for details.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="after"
-                   type="javaee:ordering-orderingType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-      <xsd:element name="before"
-                   type="javaee:ordering-orderingType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="ordering-orderingType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element contains a sequence of "name" elements, each of
-        which
-        refers to an application configuration resource by the "name"
-        declared on its web.xml fragment.  This element can also contain
-        a single "others" element which specifies that this document
-        comes
-        before or after other documents within the application.
-        See section 8.2.2 of the specification for details.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="name"
-                   type="javaee:java-identifierType"
-                   minOccurs="0"
-                   maxOccurs="unbounded"/>
-      <xsd:element name="others"
-                   type="javaee:ordering-othersType"
-                   minOccurs="0"
-                   maxOccurs="1"/>
-    </xsd:sequence>
-  </xsd:complexType>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="multipart-configType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        This element specifies configuration information related to the
-        handling of multipart/form-data requests.
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="location"
-                   type="javaee:string"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The directory location where uploaded files will be stored
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="max-file-size"
-                   type="xsd:long"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The maximum size limit of uploaded files
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="max-request-size"
-                   type="xsd:long"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The maximum size limit of multipart/form-data requests
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-      <xsd:element name="file-size-threshold"
-                   type="xsd:integer"
-                   minOccurs="0"
-                   maxOccurs="1">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The size threshold after which an uploaded file will be
-            written to disk
-            
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-  </xsd:complexType>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_0.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_0.dtd
deleted file mode 100644
index 3e1c998..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_0.dtd
+++ /dev/null
@@ -1,874 +0,0 @@
-<!--
-    DTD for the JavaServer Faces Application Configuration File (Version 1.0)
-
-    To support validation of your configuration file(s), include the following
-    DOCTYPE element at the beginning (after the "xml" declaration):
-
-    <!DOCTYPE faces-config PUBLIC
-     "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-     "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
-
-    $Id: web-facesconfig_1_0.dtd,v 1.1 2007/05/25 21:12:49 david_williams Exp $
-
--->
-
-
-<!-- ==================== Defined Types =================================== -->
-
-
-<!--
-    An "Action" is a String that represents a method binding
-    expression that points at a method with no arguments that returns a
-    String.  It must be bracketed with "#{}", for example,
-    "#{cardemo.buyCar}".
--->
-<!ENTITY % Action "CDATA">
-
-
-<!--
-    A "ClassName" is the fully qualified name of a Java class that is
-    instantiated to provide the functionality of the enclosing element.
--->
-<!ENTITY % ClassName "CDATA">
-
-
-<!--
-    An "Identifier" is a string of characters that conforms to the variable
-    naming conventions of the Java programming language (JLS Section ?.?.?).
--->
-<!ENTITY % Identifier "CDATA">
-
-
-<!--
-    A "JavaType" is either the fully qualified name of a Java class that is
-    instantiated to provide the functionality of the enclosing element, or
-    the name of a Java primitive type (such as int or char).  The class name
-    or primitive type may optionally be followed by "[]" to indicate that
-    the underlying data must be an array, rather than a scalar variable.
--->
-<!ENTITY % JavaType "CDATA">
-
-
-<!--
-    A "Language" is a lower case two-letter code for a language as defined
-    by ISL-639.
--->
-<!ENTITY % Language "CDATA">
-
-
-<!--
-    A "ResourcePath" is the relative or absolute path to a resource file
-    (such as a logo image).
--->
-<!ENTITY % ResourcePath "CDATA">
-
-
-<!--
-    A "Scope" is the well-known name of a scope in which managed beans may
-    optionally be defined to be created in.
--->
-<!ENTITY % Scope "(request|session|application)">
-
-
-
-<!--
-    A "ScopeOrNone" element defines the legal values for the
-    <managed-bean-scope> element's body content, which includes
-    all of the scopes respresented by the "Scope" type, plus the
-    "none" value indicating that a created bean should not be
-    stored into any scope.
--->
-<!ENTITY % ScopeOrNone "(request|session|application|none)">
-
-
-<!--
-    A "ViewIdPattern" is a pattern for matching view identifiers in
-    order to determine whether a particular navigation rule should be
-    fired.  It must contain one of the following values:
-
-    - The exact match for a view identifier that is recognized
-      by the the ViewHandler implementation being used (such as
-      "/index.jsp" if you are using the default ViewHandler).
-
-    - A proper prefix of a view identifier, plus a trailing "*"
-      character.  This pattern indicates that all view identifiers that
-      match the portion of the pattern up to the asterisk will match the
-      surrounding rule.  When more than one match exists, the match with
-      the longest pattern is selected.
-
-    - An "*" character, which means that this pattern applies to all
-      view identifiers.
--->
-<!ENTITY % ViewIdPattern "CDATA">
-
-
-<!-- ==================== Top Level Elements ============================== -->
-
-
-<!--
-    The "faces-config" element is the root of the configuration information
-    hierarchy, and contains nested elements for all of the other configuration
-    settings.
--->
-<!ELEMENT faces-config    ((application|factory|component|converter|managed-bean|navigation-rule|referenced-bean|render-kit|lifecycle|validator)*)>
-<!ATTLIST faces-config
-       xmlns CDATA #FIXED "http://java.sun.com/JSF/Configuration">
-
-
-
-<!-- ==================== Definition Elements ============================= -->
-
-
-<!--
-    The "application" element provides a mechanism to define the various
-    per-application-singleton implementation artifacts for a particular web
-    application that is utilizing JavaServer Faces.  For nested elements
-    that are not specified, the JSF implementation must provide a suitable
-    default.
--->
-<!ELEMENT application     ((action-listener|default-render-kit-id|message-bundle|navigation-handler|view-handler|state-manager|property-resolver|variable-resolver|locale-config)*)>
-
-
-<!--
-    The "factory" element provides a mechanism to define the various
-    Factories that comprise parts of the implementation of JavaServer
-    Faces.  For nested elements that are not specified, the JSF
-    implementation must provide a suitable default.
--->
-<!ELEMENT factory     ((application-factory|faces-context-factory|lifecycle-factory|render-kit-factory)*)>
-
-
-<!--
-    The "attribute" element represents a named, typed, value associated with
-    the parent UIComponent via the generic attributes mechanism.
-
-    Attribute names must be unique within the scope of the parent (or related)
-    component.
--->
-<!ELEMENT attribute       (description*, display-name*, icon*, attribute-name, attribute-class, default-value?, suggested-value?, attribute-extension*)>
-
-<!-- 
-    Extension element for attribute.  May contain implementation
-    specific content.
--->
-<!ELEMENT attribute-extension ANY>
-
-
-<!--
-    The "component" element represents a concrete UIComponent implementation
-    class that should be registered under the specified type identifier,
-    along with its associated properties and attributes.  Component types must
-    be unique within the entire web application.
-
-    Nested "attribute" elements identify generic attributes that are recognized
-    by the implementation logic of this component.  Nested "property" elements
-    identify JavaBeans properties of the component class that may be exposed
-    for manipulation via tools.
--->
-<!ELEMENT component       (description*, display-name*, icon*, component-type, component-class, attribute*, property*, component-extension*)>
-
-<!-- 
-    Extension element for component.  May contain implementation
-    specific content.
--->
-<!ELEMENT component-extension ANY>
-
-
-
-<!--
-    The "converter" element represents a concrete Converter implementation
-    class that should be registered under the specified converter identifier.
-    Converter identifiers must be unique within the entire web application.
-
-    Nested "attribute" elements identify generic attributes that may be
-    configured on the corresponding UIComponent in order to affect the
-    operation of the Converter.  Nested "property" elements identify JavaBeans
-    properties of the Converter implementation class that may be configured
-    to affect the operation of the Converter.
--->
-<!ELEMENT converter       (description*, display-name*, icon*, (converter-id | converter-for-class), converter-class, attribute*, property*)>
-
-
-<!--
-    The "icon" element contains "small-icon" and "large-icon" elements that
-    specify the resoruce paths for small and large GIF or JPG icon images
-    used to represent the parent element in a GUI tool.
--->
-<!ELEMENT icon            (small-icon?, large-icon?)>
-<!ATTLIST icon            xml:lang        %Language;      #IMPLIED>
-
-<!--
-    The "lifecycle" element provides a mechanism to specify
-    modifications to the behaviour of the default Lifecycle
-    implementation for this web application.
--->
-<!ELEMENT lifecycle       (phase-listener*)>
-
-<!--
-     The "locale-config" element allows the app developer to declare the
-     supported locales for this application.  
--->
-<!ELEMENT locale-config (default-locale?, supported-locale*)>
-
-<!--
-    The "managed-bean" element represents a JavaBean, of a particular class,
-    that will be dynamically instantiated at runtime (by the default
-    VariableResolver implementation) if it is referenced as the first element
-    of a value binding expression, and no corresponding bean can be
-    identified in any scope.  In addition to the creation of the managed bean,
-    and the optional storing of it into the specified scope, the nested
-    managed-property elements can be used to initialize the contents of
-    settable JavaBeans properties of the created instance.
--->
-<!ELEMENT managed-bean (description*, display-name*, icon*, managed-bean-name, managed-bean-class, managed-bean-scope, (managed-property* | map-entries | list-entries))>
-
-
-<!--
-    The "managed-property" element represents an individual property of a
-    managed bean that will be configured to the specified value (or value set)
-    if the corresponding managed bean is automatically created.
--->
-<!ELEMENT managed-property (description*, display-name*, icon*, property-name, property-class?, (map-entries|null-value|value|list-entries))>
-
-
-<!--
-    The "map-entry" element reprsents a single key-entry pair that
-    will be added to the computed value of a managed property of type
-    java.util.Map.
--->
-<!ELEMENT map-entry (key, (null-value|value))>
-
-
-<!--
-    The "map-entries' element represents a set of key-entry pairs that
-    will be added to the computed value of a managed property of type
-    java.util.Map.  In addition, the Java class types of the key and entry
-    values may be optionally declared.
--->
-<!ELEMENT map-entries (key-class?, value-class?, map-entry*)>
-
-
-<!--
-    The base name of a resource bundle representing the message resources
-    for this application.  See the JavaDocs for the "java.util.ResourceBundle"
-    class for more information on the syntax of resource bundle names.
--->
-
-<!ELEMENT message-bundle (#PCDATA)>
-
-
-<!--
-    The "navigation-case" element describes a particular combination of
-    conditions that must match for this case to be executed, and the
-    view id of the component tree that should be selected next.
--->
-<!ELEMENT navigation-case (description*, display-name*, icon*, from-action?, from-outcome?, to-view-id, redirect?)>
-
-
-<!--
-    The "navigation-rule" element represents an individual decision rule
-    that will be utilized by the default NavigationHandler
-    implementation to make decisions on what view should be displayed
-    next, based on the view id being processed.
--->
-<!ELEMENT navigation-rule (description*, display-name*, icon*, from-view-id?, navigation-case*)>
-
-
-<!--
-    The "property" element represents a JavaBean property of the Java class
-    represented by our parent element.
-
-    Property names must be unique within the scope of the Java class
-    that is represented by the parent element, and must correspond to
-    property names that will be recognized when performing introspection
-    against that class via java.beans.Introspector.
--->
-<!ELEMENT property        (description*, display-name*, icon*, property-name, property-class, default-value?, suggested-value?, property-extension*)>
-
-<!-- 
-    Extension element for property.  May contain implementation
-    specific content.
--->
-<!ELEMENT property-extension ANY>
-
-<!--
-    The "referenced-bean" element represents at design time the promise
-    that a Java object of the specified type will exist at runtime in some
-    scope, under the specified key.  This can be used by design time tools
-    to construct user interface dialogs based on the properties of the
-    specified class.  The presence or absence of a referenced bean
-    element has no impact on the JavaServer Faces runtime environment
-    inside a web application.
--->
-<!ELEMENT referenced-bean (description*, display-name*, icon*, referenced-bean-name, referenced-bean-class)>
-
-
-<!--
-    The "render-kit" element represents a concrete RenderKit implementation
-    that should be registered under the specified render-kit-id.  If no
-    render-kit-id is specified, the identifier of the default RenderKit
-    (RenderKitFactory.DEFAULT_RENDER_KIT) is assumed.
--->
-<!ELEMENT render-kit      (description*, display-name*, icon*, render-kit-id?, render-kit-class?, renderer*)>
-
-
-<!--
-    The "renderer" element represents a concrete Renderer implementation
-    class that should be registered under the specified component family
-    and renderer type identifiers, in the RenderKit associated with the
-    parent "render-kit" element.  Combinations of component family and renderer
-    type must be unique within the RenderKit associated with the parent
-    "render-kit" element.
-
-    Nested "attribute" elements identify generic component attributes that
-    are recognized by this renderer.
--->
-<!ELEMENT renderer        (description*, display-name*, icon*, component-family, renderer-type, renderer-class, attribute*, renderer-extension*)>
-
-<!-- 
-    Extension element for renderer.  May contain implementation
-    specific content.
--->
-<!ELEMENT renderer-extension ANY>
-
-<!--
-    The "validator" element represents a concrete Validator implementation
-    class that should be registered under the specified validator identifier.
-    Validator identifiers must be unique within the entire web application.
-
-    Nested "attribute" elements identify generic attributes that may be
-    configured on the corresponding UIComponent in order to affect the
-    operation of the Validator.  Nested "property" elements identify JavaBeans
-    properties of the Validator implementation class that may be configured
-    to affect the operation of the Validator.
--->
-<!ELEMENT validator       (description*, display-name*, icon*, validator-id, validator-class, attribute*, property*)>
-
-
-<!--
-    The "list-entries" element represents a set of initialization
-    elements for a managed property that is a java.util.List or an
-    array.  In the former case, the "value-class" element can optionally
-    be used to declare the Java type to which each value should be
-    converted before adding it to the Collection.
--->
-<!ELEMENT list-entries    (value-class?, (null-value|value)*)>
-
-
-<!-- ==================== Subordinate Elements ============================ -->
-
-
-<!--
-    The "action-listener" element contains the fully qualified class name
-    of the concrete ActionListener implementation class that will be called
-    during the Invoke Application phase of the request processing lifecycle.
-    It must be of type "ClassName".
--->
-<!ELEMENT action-listener (#PCDATA)>
-
-<!--
-    The "application-factory" element contains the fully qualified class
-    name of the concrete ApplicationFactory implementation class that
-    will be called when FactoryFinder.getFactory(APPLICATION_FACTORY) is
-    called. It must be of type "ClassName".
--->
-<!ELEMENT application-factory (#PCDATA)>
-
-<!--
-    The "attribute-class" element represents the Java type of the value
-    associated with this attribute name.  It must be of type "ClassName".
--->
-<!ELEMENT attribute-class (#PCDATA)>
-
-
-<!--
-    The "attribute-name" element represents the name under which the
-    corresponding value will be stored, in the generic attributes of the
-    UIComponent we are related to.
--->
-<!ELEMENT attribute-name  (#PCDATA)>
-
-
-<!--
-    The "component-class" element represents the fully qualified class name
-    of a concrete UIComponent implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT component-class (#PCDATA)>
-
-
-<!--
-    The "component-family" element represents the component family for
-    which the Renderer represented by the parent "renderer" element will be
-    used.
--->
-<!ELEMENT component-family (#PCDATA)>
-
-<!--
-    The "component-type" element represents the name under which the
-    corresponding UIComponent class should be registered.
--->
-<!ELEMENT component-type  (#PCDATA)>
-
-
-<!--
-    The "converter-class" element represents the fully qualified class name
-    of a concrete Converter implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT converter-class (#PCDATA)>
-
-
-<!--
-    The "converter-for-class" element represents the fully qualified class name
-    for which a Converter class will be registered.  It must be of
-    type "ClassName".
--->
-<!ELEMENT converter-for-class (#PCDATA)>
-
-
-<!--
-    The "converter-id" element represents the identifier under which the
-    corresponding Converter class should be registered.
--->
-<!ELEMENT converter-id    (#PCDATA)>
-
-<!--
-    The "default-render-kit-id" element allows the application to define
-    a renderkit to be used other than the standard one. 
--->
-<!ELEMENT default-render-kit-id   (#PCDATA)>
-
-<!--
-     The "default-locale" element declares the default locale for this
-     application instance.  It must be specified as
-     :language:[_:country:[_:variant:]] without the colons, for example
-     "ja_JP_SJIS".  The separators between the segments may be '-' or
-     '_'.
--->
-<!ELEMENT default-locale (#PCDATA)>
-
-<!--
-    The "default-value" contains the value for the property or attribute
-    in which this element resides.  This value differs from the
-    "suggested-value" in that the property or attribute must take the
-    value, whereas in "suggested-value" taking the value is optional.
--->
-<!ELEMENT default-value (#PCDATA)>
-
-<!--
-    The "description" element contains a textual description of the element
-    it is nested in, optionally flagged with a language code using the
-    "xml:lang" attribute.
--->
-<!ELEMENT description     ANY>
-<!ATTLIST description     xml:lang        %Language;      #IMPLIED>
-
-
-<!--
-    The "display-name" element is a short descriptive name describing the
-    entity associated with the element it is nested in, intended to be
-    displayed by tools, and optionally flagged with a language code using
-    the "xml:lang" attribute.
--->
-<!ELEMENT display-name    (#PCDATA)>
-<!ATTLIST display-name    xml:lang        %Language;      #IMPLIED>
-
-<!--
-    The "faces-context-factory" element contains the fully qualified
-    class name of the concrete FacesContextFactory implementation class
-    that will be called when
-    FactoryFinder.getFactory(FACES_CONTEXT_FACTORY) is called. It must
-    be of type "ClassName".
--->
-<!ELEMENT faces-context-factory (#PCDATA)>
-
-<!--
-    The "from-action" element contains an action reference expression
-    that must have been executed (by the default ActionListener for handling
-    application level events) in order to select this navigation rule.  If
-    not specified, this rule will be relevant no matter which action reference
-    was executed (or if no action reference was executed).
-
-    This value must be of type "Action".
--->
-<!ELEMENT from-action (#PCDATA)>
-
-
-<!--
-    The "from-outcome" element contains a logical outcome string returned
-    by the execution of an application action method selected via an
-    "actionRef" property (or a literal value specified by an "action"
-    property) of a UICommand component.  If specified, this rule will be
-    relevant only if the outcome value matches this element's value.  If
-    not specified, this rule will be relevant no matter what the outcome
-    value was.
--->
-<!ELEMENT from-outcome    (#PCDATA)>
-
-
-<!--
-    The "from-view-id" element contains the view identifier of the view
-    for which the containing navigation rule is relevant.  If no
-    "from-view" element is specified, this rule applies to navigation
-    decisions on all views.  If this element is not specified, a value
-    of "*" is assumed, meaning that this navigation rule applies to all
-    views.
-
-    This value must be of type "ViewIdPattern".
--->
-<!ELEMENT from-view-id    (#PCDATA)>
-
-
-<!--
-    The "key" element is the String representation of a map key that
-    will be stored in a managed property of type java.util.Map.  
--->
-<!ELEMENT key             (#PCDATA)>
-
-
-<!--
-    The "key-class" element defines the Java type to which each "key"
-    element in a set of "map-entry" elements will be converted to.  It
-    must be of type "ClassName".  If omitted, "java.lang.String"
-    is assumed.
--->
-<!ELEMENT key-class       (#PCDATA)>
-
-
-<!--
-    The "large-icon" element contains the resource path to a large (32x32)
-    icon image.  The image may be in either GIF or JPG format.
--->
-<!ELEMENT large-icon      (#PCDATA)>
-
-<!--
-    The "lifecycle-factory" element contains the fully qualified class name
-    of the concrete LifecycleFactory implementation class that will be called
-    when FactoryFinder.getFactory(LIFECYCLE_FACTORY) is called. It must be 
-    of type "ClassName".
--->
-<!ELEMENT lifecycle-factory (#PCDATA)>
-
-<!--
-    The "managed-bean-class" element represents the fully qualified class
-    name of the Java class that will be used to instantiate a new instance
-    if creation of the specified managed bean is requested.  It must be of
-    type "ClassName".
-
-    The specified class must conform to standard JavaBeans conventions.
-    In particular, it must have a public zero-arguments constructor, and
-    zero or more public property setters.
--->
-<!ELEMENT managed-bean-class  (#PCDATA)>
-
-
-<!--
-    The "managed-bean-name" element represents the attribute name under
-    which a managed bean will be searched for, as well as stored (unless
-    the "managed-bean-scope" value is "none").  It must be of type
-    "Identifier".
--->
-<!ELEMENT managed-bean-name (#PCDATA)>
-
-
-<!--
-    The "managed-bean-scope" element represents the scope into which a newly
-    created instance of the specified managed bean will be stored (unless
-    the value is "none").  It must be of type "ScopeOrNone".
--->
-<!ELEMENT managed-bean-scope (#PCDATA)>
-
-<!--
-    The "navigation-handler" element contains the fully qualified class name
-    of the concrete NavigationHandler implementation class that will be called
-    during the Invoke Application phase of the request processing lifecycle,
-    if the default ActionListener (provided by the JSF implementation) is used.
-    It must be of type "ClassName".
--->
-<!ELEMENT navigation-handler (#PCDATA)>
-
-<!--
-The "phase-listener" element contains the fully qualified class
-name of the concrete PhaseListener implementation class that will be
-registered on the Lifecycle. It must be of type "ClassName".
--->
-<!ELEMENT phase-listener (#PCDATA)>
-
-<!--
-    The "redirect" element indicates that navigation to the specified
-    "to-view-id" should be accomplished by performing an HTTP redirect
-    rather than the usual ViewHandler mechanisms.
--->
-<!ELEMENT redirect EMPTY>
-
-<!--
-    The "suggested-value" contains the value for the property or
-    attribute in which this element resides.  This value is advisory
-    only and is intended for tools to use when populating pallettes.
--->
-<!ELEMENT suggested-value (#PCDATA)>
-
-
-<!--
-
-    The "view-handler" element contains the fully qualified class name
-    of the concrete ViewHandler implementation class that will be called
-    during the Restore View and Render Response phases of the request
-    processing lifecycle.  The faces implementation must provide a
-    default implementation of this class
--->
-<!ELEMENT view-handler (#PCDATA)>
-
-<!--
-
-    The "state-manager" element contains the fully qualified class name
-    of the concrete StateManager implementation class that will be called
-    during the Restore View and Render Response phases of the request
-    processing lifecycle.  The faces implementation must provide a
-    default implementation of this class
--->
-<!ELEMENT state-manager (#PCDATA)>
-
-<!--
-    The "null-value" element indicates that the managed property in which we
-    are nested will be explicitly set to null if our managed bean is
-    automatically created.  This is different from omitting the managed
-    property element entirely, which will cause no property setter to be
-    called for this property.
-
-    The "null-value" element can only be used when the associated
-    "property-class" identifies a Java class, not a Java primitive.
--->
-<!ELEMENT null-value EMPTY>
-
-
-<!--
-    The "property-class" element represents the Java type of the value
-    associated with this property name.  It must be of type "JavaType".
-    If not specified, it can be inferred from existing classes; however,
-    this element should be specified if the configuration file is going
-    to be the source for generating the corresponding classes.
--->
-<!ELEMENT property-class  (#PCDATA)>
-
-
-<!--
-    The "property-name" element represents the JavaBeans property name
-    under which the corresponding value may be stored.
--->
-<!ELEMENT property-name   (#PCDATA)>
-
-
-<!--
-    The "property-resolver" element contains the fully qualified class name
-    of the concrete PropertyResolver implementation class that will be used
-    during the processing of value binding expressions.
-    It must be of type "ClassName".
--->
-<!ELEMENT property-resolver (#PCDATA)>
-
-
-<!--
-    The "referenced-bean-class" element represents the fully qualified class
-    name of the Java class (either abstract or concrete) or Java interface
-    implemented by the corresponding referenced bean.  It must be of type
-    "ClassName".
--->
-<!ELEMENT referenced-bean-class  (#PCDATA)>
-
-
-<!--
-    The "referenced-bean-name" element represents the attribute name under
-    which the corresponding referenced bean may be assumed to be stored,
-    in one of the scopes defined by the "Scope" type.  It must be of type
-    "Identifier".
--->
-<!ELEMENT referenced-bean-name (#PCDATA)>
-
-
-<!--
-    The "render-kit-id" element represents an identifier for the
-    RenderKit represented by the parent "render-kit" element.
--->
-<!ELEMENT render-kit-id   (#PCDATA)>
-
-
-<!--
-    The "render-kit-class" element represents the fully qualified class name
-    of a concrete RenderKit implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT render-kit-class (#PCDATA)>
-
-
-<!--
-    The "renderer-class" element represents the fully qualified class name
-    of a concrete Renderer implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT renderer-class  (#PCDATA)>
-
-<!--
-    The "render-kit-factory" element contains the fully qualified class name
-    of the concrete RenderKitFactory implementation class that will be called
-    when FactoryFinder.getFactory(RENDER_KIT_FACTORY) is called. It must be 
-    of type "ClassName".
--->
-<!ELEMENT render-kit-factory (#PCDATA)>
-
-<!--
-    The "renderer-type" element represents a renderer type identifier for the
-    Renderer represented by the parent "renderer" element.
--->
-<!ELEMENT renderer-type   (#PCDATA)>
-
-<!--
-    The "small-icon" element contains the resource path to a large (16x16)
-    icon image.  The image may be in either GIF or JPG format.
--->
-<!ELEMENT small-icon      (#PCDATA)>
-
-<!--
-     The "supported-locale" element allows authors to declare which
-     locales are supported in this application instance.
-
-     It must be specified as :language:[_:country:[_:variant:]] without
-     the colons, for example "ja_JP_SJIS".  The separators between the
-     segments may be '-' or '_'.
--->
-<!ELEMENT supported-locale (#PCDATA)>
-
-<!--
-    The "to-view" element contains the view identifier of the next view
-    that should be displayed if this navigation rule is matched.  It
-    must be of type "ViewId".
--->
-<!ELEMENT to-view-id      (#PCDATA)>
-
-
-<!--
-    The "validator-class" element represents the fully qualified class name
-    of a concrete Validator implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT validator-class (#PCDATA)>
-
-
-<!--
-    The "validator-id" element represents the identifier under which the
-    corresponding Validator class should be registered.
--->
-<!ELEMENT validator-id    (#PCDATA)>
-
-
-<!--
-    The "value" element is the String representation of a literal
-    value to which a scalar managed property will be set, or a value
-    binding expression ("#{...}") that will be used to calculate the
-    required value.  It will be converted as specified for the actual
-    property type.
--->
-<!ELEMENT value (#PCDATA)>
-
-
-<!--
-    The "value-class" element defines the Java type to which each
-    "value" element's value will be converted to, prior to adding it to
-    the "list-entries" list for a managed property that is a
-    java.util.List, or a "map-entries" map for a managed property that
-    is a java.util.Map.  It must be of type "ClassName".  If omitted,
-    "java.lang.String" is assumed.
--->
-<!ELEMENT value-class (#PCDATA)>
-
-<!--
-    The "variable-resolver" element contains the fully qualified class name
-    of the concrete VariableResolver implementation class that will be used
-    during the processing of value binding expressions.
-    It must be of type "ClassName".
--->
-<!ELEMENT variable-resolver (#PCDATA)>
-
-
-<!-- ============================ Identifier Attributes ==================== -->
-
-
-<!ATTLIST action-listener                   id ID #IMPLIED>
-<!ATTLIST application                       id ID #IMPLIED>
-<!ATTLIST application-factory               id ID #IMPLIED>
-<!ATTLIST attribute                         id ID #IMPLIED>
-<!ATTLIST attribute-class                   id ID #IMPLIED>
-<!ATTLIST attribute-extension               id ID #IMPLIED>
-<!ATTLIST attribute-name                    id ID #IMPLIED>
-<!ATTLIST component                         id ID #IMPLIED>
-<!ATTLIST component-class                   id ID #IMPLIED>
-<!ATTLIST component-extension               id ID #IMPLIED>
-<!ATTLIST component-family                  id ID #IMPLIED>
-<!ATTLIST component-type                    id ID #IMPLIED>
-<!ATTLIST converter                         id ID #IMPLIED>
-<!ATTLIST converter-class                   id ID #IMPLIED>
-<!ATTLIST converter-for-class               id ID #IMPLIED>
-<!ATTLIST converter-id                      id ID #IMPLIED>
-<!ATTLIST default-locale                    id ID #IMPLIED>
-<!ATTLIST default-render-kit-id             id ID #IMPLIED>
-<!ATTLIST default-value                     id ID #IMPLIED>
-<!ATTLIST description                       id ID #IMPLIED>
-<!ATTLIST display-name                      id ID #IMPLIED>
-<!ATTLIST faces-config                      id ID #IMPLIED>
-<!ATTLIST faces-context-factory             id ID #IMPLIED>
-<!ATTLIST factory                           id ID #IMPLIED>
-<!ATTLIST from-action                       id ID #IMPLIED>
-<!ATTLIST from-outcome                      id ID #IMPLIED>
-<!ATTLIST from-view-id                      id ID #IMPLIED>
-<!ATTLIST icon                              id ID #IMPLIED>
-<!ATTLIST key                               id ID #IMPLIED>
-<!ATTLIST key-class                         id ID #IMPLIED>
-<!ATTLIST large-icon                        id ID #IMPLIED>
-<!ATTLIST lifecycle                         id ID #IMPLIED>
-<!ATTLIST lifecycle-factory                 id ID #IMPLIED>
-<!ATTLIST list-entries                      id ID #IMPLIED>
-<!ATTLIST locale-config                     id ID #IMPLIED>
-<!ATTLIST managed-bean                      id ID #IMPLIED>
-<!ATTLIST managed-bean-class                id ID #IMPLIED>
-<!ATTLIST managed-bean-name                 id ID #IMPLIED>
-<!ATTLIST managed-bean-scope                id ID #IMPLIED>
-<!ATTLIST managed-property                  id ID #IMPLIED>
-<!ATTLIST map-entries                       id ID #IMPLIED>
-<!ATTLIST map-entry                         id ID #IMPLIED>
-<!ATTLIST message-bundle                    id ID #IMPLIED>
-<!ATTLIST navigation-case                   id ID #IMPLIED>
-<!ATTLIST navigation-handler                id ID #IMPLIED>
-<!ATTLIST navigation-rule                   id ID #IMPLIED>
-<!ATTLIST null-value                        id ID #IMPLIED>
-<!ATTLIST phase-listener                    id ID #IMPLIED>
-<!ATTLIST property                          id ID #IMPLIED>
-<!ATTLIST property-class                    id ID #IMPLIED>
-<!ATTLIST property-extension                id ID #IMPLIED>
-<!ATTLIST property-name                     id ID #IMPLIED>
-<!ATTLIST property-resolver                 id ID #IMPLIED>
-<!ATTLIST redirect                          id ID #IMPLIED>
-<!ATTLIST referenced-bean                   id ID #IMPLIED>
-<!ATTLIST referenced-bean-class             id ID #IMPLIED>
-<!ATTLIST referenced-bean-name              id ID #IMPLIED>
-<!ATTLIST render-kit                        id ID #IMPLIED>
-<!ATTLIST render-kit-class                  id ID #IMPLIED>
-<!ATTLIST render-kit-factory                id ID #IMPLIED>
-<!ATTLIST render-kit-id                     id ID #IMPLIED>
-<!ATTLIST renderer                          id ID #IMPLIED>
-<!ATTLIST renderer-class                    id ID #IMPLIED>
-<!ATTLIST renderer-extension                id ID #IMPLIED>
-<!ATTLIST renderer-type                     id ID #IMPLIED>
-<!ATTLIST small-icon                        id ID #IMPLIED>
-<!ATTLIST state-manager                     id ID #IMPLIED>
-<!ATTLIST suggested-value                   id ID #IMPLIED>
-<!ATTLIST supported-locale                  id ID #IMPLIED>
-<!ATTLIST to-view-id                        id ID #IMPLIED>
-<!ATTLIST validator                         id ID #IMPLIED>
-<!ATTLIST validator-class                   id ID #IMPLIED>
-<!ATTLIST validator-id                      id ID #IMPLIED>
-<!ATTLIST value                             id ID #IMPLIED>
-<!ATTLIST value-class                       id ID #IMPLIED>
-<!ATTLIST variable-resolver                 id ID #IMPLIED>
-<!ATTLIST view-handler                      id ID #IMPLIED>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_1.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_1.dtd
deleted file mode 100644
index 03dad8e..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_1.dtd
+++ /dev/null
@@ -1,895 +0,0 @@
-<!--
-    DTD for the JavaServer Faces Application Configuration File (Version 1.1)
-
-    To support validation of your configuration file(s), include the following
-    DOCTYPE element at the beginning (after the "xml" declaration):
-
-    <!DOCTYPE faces-config PUBLIC
-     "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-     "http://java.sun.com/dtd/web-facesconfig_1_1.dtd">
-
-    $Id: web-facesconfig_1_1.dtd,v 1.1 2007/05/25 21:12:48 david_williams Exp $
-
--->
-
-
-<!-- ==================== Defined Types =================================== -->
-
-
-<!--
-    An "Action" is a String that represents a method binding
-    expression that points at a method with no arguments that returns a
-    String.  It must be bracketed with "#{}", for example,
-    "#{cardemo.buyCar}".
--->
-<!ENTITY % Action "CDATA">
-
-
-<!--
-    A "ClassName" is the fully qualified name of a Java class that is
-    instantiated to provide the functionality of the enclosing element.
--->
-<!ENTITY % ClassName "CDATA">
-
-
-<!--
-    An "Identifier" is a string of characters that conforms to the variable
-    naming conventions of the Java programming language (JLS Section ?.?.?).
--->
-<!ENTITY % Identifier "CDATA">
-
-
-<!--
-    A "JavaType" is either the fully qualified name of a Java class that is
-    instantiated to provide the functionality of the enclosing element, or
-    the name of a Java primitive type (such as int or char).  The class name
-    or primitive type may optionally be followed by "[]" to indicate that
-    the underlying data must be an array, rather than a scalar variable.
--->
-<!ENTITY % JavaType "CDATA">
-
-
-<!--
-    A "Language" is a lower case two-letter code for a language as defined
-    by ISL-639.
--->
-<!ENTITY % Language "CDATA">
-
-
-<!--
-    A "ResourcePath" is the relative or absolute path to a resource file
-    (such as a logo image).
--->
-<!ENTITY % ResourcePath "CDATA">
-
-
-<!--
-    A "Scope" is the well-known name of a scope in which managed beans may
-    optionally be defined to be created in.
--->
-<!ENTITY % Scope "(request|session|application)">
-
-
-
-<!--
-    A "ScopeOrNone" element defines the legal values for the
-    <managed-bean-scope> element's body content, which includes
-    all of the scopes respresented by the "Scope" type, plus the
-    "none" value indicating that a created bean should not be
-    stored into any scope.
--->
-<!ENTITY % ScopeOrNone "(request|session|application|none)">
-
-
-<!--
-    A "ViewIdPattern" is a pattern for matching view identifiers in
-    order to determine whether a particular navigation rule should be
-    fired.  It must contain one of the following values:
-
-    - The exact match for a view identifier that is recognized
-      by the the ViewHandler implementation being used (such as
-      "/index.jsp" if you are using the default ViewHandler).
-
-    - A proper prefix of a view identifier, plus a trailing "*"
-      character.  This pattern indicates that all view identifiers that
-      match the portion of the pattern up to the asterisk will match the
-      surrounding rule.  When more than one match exists, the match with
-      the longest pattern is selected.
-
-    - An "*" character, which means that this pattern applies to all
-      view identifiers.
--->
-<!ENTITY % ViewIdPattern "CDATA">
-
-
-<!-- ==================== Top Level Elements ============================== -->
-
-
-<!--
-    The "faces-config" element is the root of the configuration information
-    hierarchy, and contains nested elements for all of the other configuration
-    settings.
--->
-<!ELEMENT faces-config    ((application|factory|component|converter|managed-bean|navigation-rule|referenced-bean|render-kit|lifecycle|validator)*)>
-<!ATTLIST faces-config
-       xmlns CDATA #FIXED "http://java.sun.com/JSF/Configuration">
-
-
-
-<!-- ==================== Definition Elements ============================= -->
-
-
-<!--
-    The "application" element provides a mechanism to define the various
-    per-application-singleton implementation artifacts for a particular web
-    application that is utilizing JavaServer Faces.  For nested elements
-    that are not specified, the JSF implementation must provide a suitable
-    default.
--->
-<!ELEMENT application     ((action-listener|default-render-kit-id|message-bundle|navigation-handler|view-handler|state-manager|property-resolver|variable-resolver|locale-config)*)>
-
-
-<!--
-    The "factory" element provides a mechanism to define the various
-    Factories that comprise parts of the implementation of JavaServer
-    Faces.  For nested elements that are not specified, the JSF
-    implementation must provide a suitable default.
--->
-<!ELEMENT factory     ((application-factory|faces-context-factory|lifecycle-factory|render-kit-factory)*)>
-
-
-<!--
-    The "attribute" element represents a named, typed, value associated with
-    the parent UIComponent via the generic attributes mechanism.
-
-    Attribute names must be unique within the scope of the parent (or related)
-    component.
--->
-<!ELEMENT attribute       (description*, display-name*, icon*, attribute-name, attribute-class, default-value?, suggested-value?, attribute-extension*)>
-
-<!-- 
-    Extension element for attribute.  May contain implementation
-    specific content.
--->
-<!ELEMENT attribute-extension ANY>
-
-
-<!--
-    The "component" element represents a concrete UIComponent implementation
-    class that should be registered under the specified type identifier,
-    along with its associated properties and attributes.  Component types must
-    be unique within the entire web application.
-
-    Nested "attribute" elements identify generic attributes that are recognized
-    by the implementation logic of this component.  Nested "property" elements
-    identify JavaBeans properties of the component class that may be exposed
-    for manipulation via tools.
--->
-<!ELEMENT component       (description*, display-name*, icon*, component-type, component-class, facet*, attribute*, property*, component-extension*)>
-
-<!-- 
-    Extension element for component.  May contain implementation
-    specific content.
--->
-<!ELEMENT component-extension ANY>
-
-<!--
-   Define the name and other design-time information for a facet that is
-   associated with a renderer or a component.
--->
-
-<!ELEMENT facet       (description*, display-name*, icon*, facet-name, facet-extension*)>
-
-<!-- 
-    Extension element for facet.  May contain implementation
-    specific content.
--->
-<!ELEMENT facet-extension ANY>
-
-<!--
-    The "facet-name" element represents the facet name under which a
-    UIComponent will be added to its parent.  It must be of type
-    "Identifier".
--->
-<!ELEMENT facet-name (#PCDATA)>
-
-<!--
-    The "converter" element represents a concrete Converter implementation
-    class that should be registered under the specified converter identifier.
-    Converter identifiers must be unique within the entire web application.
-
-    Nested "attribute" elements identify generic attributes that may be
-    configured on the corresponding UIComponent in order to affect the
-    operation of the Converter.  Nested "property" elements identify JavaBeans
-    properties of the Converter implementation class that may be configured
-    to affect the operation of the Converter.
--->
-<!ELEMENT converter       (description*, display-name*, icon*, (converter-id | converter-for-class), converter-class, attribute*, property*)>
-
-
-<!--
-    The "icon" element contains "small-icon" and "large-icon" elements that
-    specify the resoruce paths for small and large GIF or JPG icon images
-    used to represent the parent element in a GUI tool.
--->
-<!ELEMENT icon            (small-icon?, large-icon?)>
-<!ATTLIST icon            xml:lang        %Language;      #IMPLIED>
-
-<!--
-    The "lifecycle" element provides a mechanism to specify
-    modifications to the behaviour of the default Lifecycle
-    implementation for this web application.
--->
-<!ELEMENT lifecycle       (phase-listener*)>
-
-<!--
-     The "locale-config" element allows the app developer to declare the
-     supported locales for this application.  
--->
-<!ELEMENT locale-config (default-locale?, supported-locale*)>
-
-<!--
-    The "managed-bean" element represents a JavaBean, of a particular class,
-    that will be dynamically instantiated at runtime (by the default
-    VariableResolver implementation) if it is referenced as the first element
-    of a value binding expression, and no corresponding bean can be
-    identified in any scope.  In addition to the creation of the managed bean,
-    and the optional storing of it into the specified scope, the nested
-    managed-property elements can be used to initialize the contents of
-    settable JavaBeans properties of the created instance.
--->
-<!ELEMENT managed-bean (description*, display-name*, icon*, managed-bean-name, managed-bean-class, managed-bean-scope, (managed-property* | map-entries | list-entries))>
-
-
-<!--
-    The "managed-property" element represents an individual property of a
-    managed bean that will be configured to the specified value (or value set)
-    if the corresponding managed bean is automatically created.
--->
-<!ELEMENT managed-property (description*, display-name*, icon*, property-name, property-class?, (map-entries|null-value|value|list-entries))>
-
-
-<!--
-    The "map-entry" element reprsents a single key-entry pair that
-    will be added to the computed value of a managed property of type
-    java.util.Map.
--->
-<!ELEMENT map-entry (key, (null-value|value))>
-
-
-<!--
-    The "map-entries' element represents a set of key-entry pairs that
-    will be added to the computed value of a managed property of type
-    java.util.Map.  In addition, the Java class types of the key and entry
-    values may be optionally declared.
--->
-<!ELEMENT map-entries (key-class?, value-class?, map-entry*)>
-
-
-<!--
-    The base name of a resource bundle representing the message resources
-    for this application.  See the JavaDocs for the "java.util.ResourceBundle"
-    class for more information on the syntax of resource bundle names.
--->
-
-<!ELEMENT message-bundle (#PCDATA)>
-
-
-<!--
-    The "navigation-case" element describes a particular combination of
-    conditions that must match for this case to be executed, and the
-    view id of the component tree that should be selected next.
--->
-<!ELEMENT navigation-case (description*, display-name*, icon*, from-action?, from-outcome?, to-view-id, redirect?)>
-
-
-<!--
-    The "navigation-rule" element represents an individual decision rule
-    that will be utilized by the default NavigationHandler
-    implementation to make decisions on what view should be displayed
-    next, based on the view id being processed.
--->
-<!ELEMENT navigation-rule (description*, display-name*, icon*, from-view-id?, navigation-case*)>
-
-
-<!--
-    The "property" element represents a JavaBean property of the Java class
-    represented by our parent element.
-
-    Property names must be unique within the scope of the Java class
-    that is represented by the parent element, and must correspond to
-    property names that will be recognized when performing introspection
-    against that class via java.beans.Introspector.
--->
-<!ELEMENT property        (description*, display-name*, icon*, property-name, property-class, default-value?, suggested-value?, property-extension*)>
-
-<!-- 
-    Extension element for property.  May contain implementation
-    specific content.
--->
-<!ELEMENT property-extension ANY>
-
-<!--
-    The "referenced-bean" element represents at design time the promise
-    that a Java object of the specified type will exist at runtime in some
-    scope, under the specified key.  This can be used by design time tools
-    to construct user interface dialogs based on the properties of the
-    specified class.  The presence or absence of a referenced bean
-    element has no impact on the JavaServer Faces runtime environment
-    inside a web application.
--->
-<!ELEMENT referenced-bean (description*, display-name*, icon*, referenced-bean-name, referenced-bean-class)>
-
-
-<!--
-    The "render-kit" element represents a concrete RenderKit implementation
-    that should be registered under the specified render-kit-id.  If no
-    render-kit-id is specified, the identifier of the default RenderKit
-    (RenderKitFactory.DEFAULT_RENDER_KIT) is assumed.
--->
-<!ELEMENT render-kit      (description*, display-name*, icon*, render-kit-id?, render-kit-class?, renderer*)>
-
-
-<!--
-    The "renderer" element represents a concrete Renderer implementation
-    class that should be registered under the specified component family
-    and renderer type identifiers, in the RenderKit associated with the
-    parent "render-kit" element.  Combinations of component family and renderer
-    type must be unique within the RenderKit associated with the parent
-    "render-kit" element.
-
-    Nested "attribute" elements identify generic component attributes that
-    are recognized by this renderer.
--->
-<!ELEMENT renderer        (description*, display-name*, icon*, component-family, renderer-type, renderer-class, facet*, attribute*, renderer-extension*)>
-
-<!-- 
-    Extension element for renderer.  May contain implementation
-    specific content.
--->
-<!ELEMENT renderer-extension ANY>
-
-<!--
-    The "validator" element represents a concrete Validator implementation
-    class that should be registered under the specified validator identifier.
-    Validator identifiers must be unique within the entire web application.
-
-    Nested "attribute" elements identify generic attributes that may be
-    configured on the corresponding UIComponent in order to affect the
-    operation of the Validator.  Nested "property" elements identify JavaBeans
-    properties of the Validator implementation class that may be configured
-    to affect the operation of the Validator.
--->
-<!ELEMENT validator       (description*, display-name*, icon*, validator-id, validator-class, attribute*, property*)>
-
-
-<!--
-    The "list-entries" element represents a set of initialization
-    elements for a managed property that is a java.util.List or an
-    array.  In the former case, the "value-class" element can optionally
-    be used to declare the Java type to which each value should be
-    converted before adding it to the Collection.
--->
-<!ELEMENT list-entries    (value-class?, (null-value|value)*)>
-
-
-<!-- ==================== Subordinate Elements ============================ -->
-
-
-<!--
-    The "action-listener" element contains the fully qualified class name
-    of the concrete ActionListener implementation class that will be called
-    during the Invoke Application phase of the request processing lifecycle.
-    It must be of type "ClassName".
--->
-<!ELEMENT action-listener (#PCDATA)>
-
-<!--
-    The "application-factory" element contains the fully qualified class
-    name of the concrete ApplicationFactory implementation class that
-    will be called when FactoryFinder.getFactory(APPLICATION_FACTORY) is
-    called. It must be of type "ClassName".
--->
-<!ELEMENT application-factory (#PCDATA)>
-
-<!--
-    The "attribute-class" element represents the Java type of the value
-    associated with this attribute name.  It must be of type "ClassName".
--->
-<!ELEMENT attribute-class (#PCDATA)>
-
-
-<!--
-    The "attribute-name" element represents the name under which the
-    corresponding value will be stored, in the generic attributes of the
-    UIComponent we are related to.
--->
-<!ELEMENT attribute-name  (#PCDATA)>
-
-
-<!--
-    The "component-class" element represents the fully qualified class name
-    of a concrete UIComponent implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT component-class (#PCDATA)>
-
-
-<!--
-    The "component-family" element represents the component family for
-    which the Renderer represented by the parent "renderer" element will be
-    used.
--->
-<!ELEMENT component-family (#PCDATA)>
-
-<!--
-    The "component-type" element represents the name under which the
-    corresponding UIComponent class should be registered.
--->
-<!ELEMENT component-type  (#PCDATA)>
-
-
-<!--
-    The "converter-class" element represents the fully qualified class name
-    of a concrete Converter implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT converter-class (#PCDATA)>
-
-
-<!--
-    The "converter-for-class" element represents the fully qualified class name
-    for which a Converter class will be registered.  It must be of
-    type "ClassName".
--->
-<!ELEMENT converter-for-class (#PCDATA)>
-
-
-<!--
-    The "converter-id" element represents the identifier under which the
-    corresponding Converter class should be registered.
--->
-<!ELEMENT converter-id    (#PCDATA)>
-
-<!--
-    The "default-render-kit-id" element allows the application to define
-    a renderkit to be used other than the standard one. 
--->
-<!ELEMENT default-render-kit-id   (#PCDATA)>
-
-<!--
-     The "default-locale" element declares the default locale for this
-     application instance.  It must be specified as
-     :language:[_:country:[_:variant:]] without the colons, for example
-     "ja_JP_SJIS".  The separators between the segments may be '-' or
-     '_'.
--->
-<!ELEMENT default-locale (#PCDATA)>
-
-<!--
-    The "default-value" contains the value for the property or attribute
-    in which this element resides.  This value differs from the
-    "suggested-value" in that the property or attribute must take the
-    value, whereas in "suggested-value" taking the value is optional.
--->
-<!ELEMENT default-value (#PCDATA)>
-
-<!--
-    The "description" element contains a textual description of the element
-    it is nested in, optionally flagged with a language code using the
-    "xml:lang" attribute.
--->
-<!ELEMENT description     ANY>
-<!ATTLIST description     xml:lang        %Language;      #IMPLIED>
-
-
-<!--
-    The "display-name" element is a short descriptive name describing the
-    entity associated with the element it is nested in, intended to be
-    displayed by tools, and optionally flagged with a language code using
-    the "xml:lang" attribute.
--->
-<!ELEMENT display-name    (#PCDATA)>
-<!ATTLIST display-name    xml:lang        %Language;      #IMPLIED>
-
-<!--
-    The "faces-context-factory" element contains the fully qualified
-    class name of the concrete FacesContextFactory implementation class
-    that will be called when
-    FactoryFinder.getFactory(FACES_CONTEXT_FACTORY) is called. It must
-    be of type "ClassName".
--->
-<!ELEMENT faces-context-factory (#PCDATA)>
-
-<!--
-    The "from-action" element contains an action reference expression
-    that must have been executed (by the default ActionListener for handling
-    application level events) in order to select this navigation rule.  If
-    not specified, this rule will be relevant no matter which action reference
-    was executed (or if no action reference was executed).
-
-    This value must be of type "Action".
--->
-<!ELEMENT from-action (#PCDATA)>
-
-
-<!--
-    The "from-outcome" element contains a logical outcome string returned
-    by the execution of an application action method selected via an
-    "actionRef" property (or a literal value specified by an "action"
-    property) of a UICommand component.  If specified, this rule will be
-    relevant only if the outcome value matches this element's value.  If
-    not specified, this rule will be relevant no matter what the outcome
-    value was.
--->
-<!ELEMENT from-outcome    (#PCDATA)>
-
-
-<!--
-    The "from-view-id" element contains the view identifier of the view
-    for which the containing navigation rule is relevant.  If no
-    "from-view" element is specified, this rule applies to navigation
-    decisions on all views.  If this element is not specified, a value
-    of "*" is assumed, meaning that this navigation rule applies to all
-    views.
-
-    This value must be of type "ViewIdPattern".
--->
-<!ELEMENT from-view-id    (#PCDATA)>
-
-
-<!--
-    The "key" element is the String representation of a map key that
-    will be stored in a managed property of type java.util.Map.  
--->
-<!ELEMENT key             (#PCDATA)>
-
-
-<!--
-    The "key-class" element defines the Java type to which each "key"
-    element in a set of "map-entry" elements will be converted to.  It
-    must be of type "ClassName".  If omitted, "java.lang.String"
-    is assumed.
--->
-<!ELEMENT key-class       (#PCDATA)>
-
-
-<!--
-    The "large-icon" element contains the resource path to a large (32x32)
-    icon image.  The image may be in either GIF or JPG format.
--->
-<!ELEMENT large-icon      (#PCDATA)>
-
-<!--
-    The "lifecycle-factory" element contains the fully qualified class name
-    of the concrete LifecycleFactory implementation class that will be called
-    when FactoryFinder.getFactory(LIFECYCLE_FACTORY) is called. It must be 
-    of type "ClassName".
--->
-<!ELEMENT lifecycle-factory (#PCDATA)>
-
-<!--
-    The "managed-bean-class" element represents the fully qualified class
-    name of the Java class that will be used to instantiate a new instance
-    if creation of the specified managed bean is requested.  It must be of
-    type "ClassName".
-
-    The specified class must conform to standard JavaBeans conventions.
-    In particular, it must have a public zero-arguments constructor, and
-    zero or more public property setters.
--->
-<!ELEMENT managed-bean-class  (#PCDATA)>
-
-
-<!--
-    The "managed-bean-name" element represents the attribute name under
-    which a managed bean will be searched for, as well as stored (unless
-    the "managed-bean-scope" value is "none").  It must be of type
-    "Identifier".
--->
-<!ELEMENT managed-bean-name (#PCDATA)>
-
-
-<!--
-    The "managed-bean-scope" element represents the scope into which a newly
-    created instance of the specified managed bean will be stored (unless
-    the value is "none").  It must be of type "ScopeOrNone".
--->
-<!ELEMENT managed-bean-scope (#PCDATA)>
-
-<!--
-    The "navigation-handler" element contains the fully qualified class name
-    of the concrete NavigationHandler implementation class that will be called
-    during the Invoke Application phase of the request processing lifecycle,
-    if the default ActionListener (provided by the JSF implementation) is used.
-    It must be of type "ClassName".
--->
-<!ELEMENT navigation-handler (#PCDATA)>
-
-<!--
-The "phase-listener" element contains the fully qualified class
-name of the concrete PhaseListener implementation class that will be
-registered on the Lifecycle. It must be of type "ClassName".
--->
-<!ELEMENT phase-listener (#PCDATA)>
-
-<!--
-    The "redirect" element indicates that navigation to the specified
-    "to-view-id" should be accomplished by performing an HTTP redirect
-    rather than the usual ViewHandler mechanisms.
--->
-<!ELEMENT redirect EMPTY>
-
-<!--
-    The "suggested-value" contains the value for the property or
-    attribute in which this element resides.  This value is advisory
-    only and is intended for tools to use when populating pallettes.
--->
-<!ELEMENT suggested-value (#PCDATA)>
-
-
-<!--
-
-    The "view-handler" element contains the fully qualified class name
-    of the concrete ViewHandler implementation class that will be called
-    during the Restore View and Render Response phases of the request
-    processing lifecycle.  The faces implementation must provide a
-    default implementation of this class
--->
-<!ELEMENT view-handler (#PCDATA)>
-
-<!--
-
-    The "state-manager" element contains the fully qualified class name
-    of the concrete StateManager implementation class that will be called
-    during the Restore View and Render Response phases of the request
-    processing lifecycle.  The faces implementation must provide a
-    default implementation of this class
--->
-<!ELEMENT state-manager (#PCDATA)>
-
-<!--
-    The "null-value" element indicates that the managed property in which we
-    are nested will be explicitly set to null if our managed bean is
-    automatically created.  This is different from omitting the managed
-    property element entirely, which will cause no property setter to be
-    called for this property.
-
-    The "null-value" element can only be used when the associated
-    "property-class" identifies a Java class, not a Java primitive.
--->
-<!ELEMENT null-value EMPTY>
-
-
-<!--
-    The "property-class" element represents the Java type of the value
-    associated with this property name.  It must be of type "JavaType".
-    If not specified, it can be inferred from existing classes; however,
-    this element should be specified if the configuration file is going
-    to be the source for generating the corresponding classes.
--->
-<!ELEMENT property-class  (#PCDATA)>
-
-
-<!--
-    The "property-name" element represents the JavaBeans property name
-    under which the corresponding value may be stored.
--->
-<!ELEMENT property-name   (#PCDATA)>
-
-
-<!--
-    The "property-resolver" element contains the fully qualified class name
-    of the concrete PropertyResolver implementation class that will be used
-    during the processing of value binding expressions.
-    It must be of type "ClassName".
--->
-<!ELEMENT property-resolver (#PCDATA)>
-
-
-<!--
-    The "referenced-bean-class" element represents the fully qualified class
-    name of the Java class (either abstract or concrete) or Java interface
-    implemented by the corresponding referenced bean.  It must be of type
-    "ClassName".
--->
-<!ELEMENT referenced-bean-class  (#PCDATA)>
-
-
-<!--
-    The "referenced-bean-name" element represents the attribute name under
-    which the corresponding referenced bean may be assumed to be stored,
-    in one of the scopes defined by the "Scope" type.  It must be of type
-    "Identifier".
--->
-<!ELEMENT referenced-bean-name (#PCDATA)>
-
-
-<!--
-    The "render-kit-id" element represents an identifier for the
-    RenderKit represented by the parent "render-kit" element.
--->
-<!ELEMENT render-kit-id   (#PCDATA)>
-
-
-<!--
-    The "render-kit-class" element represents the fully qualified class name
-    of a concrete RenderKit implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT render-kit-class (#PCDATA)>
-
-
-<!--
-    The "renderer-class" element represents the fully qualified class name
-    of a concrete Renderer implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT renderer-class  (#PCDATA)>
-
-<!--
-    The "render-kit-factory" element contains the fully qualified class name
-    of the concrete RenderKitFactory implementation class that will be called
-    when FactoryFinder.getFactory(RENDER_KIT_FACTORY) is called. It must be 
-    of type "ClassName".
--->
-<!ELEMENT render-kit-factory (#PCDATA)>
-
-<!--
-    The "renderer-type" element represents a renderer type identifier for the
-    Renderer represented by the parent "renderer" element.
--->
-<!ELEMENT renderer-type   (#PCDATA)>
-
-<!--
-    The "small-icon" element contains the resource path to a large (16x16)
-    icon image.  The image may be in either GIF or JPG format.
--->
-<!ELEMENT small-icon      (#PCDATA)>
-
-<!--
-     The "supported-locale" element allows authors to declare which
-     locales are supported in this application instance.
-
-     It must be specified as :language:[_:country:[_:variant:]] without
-     the colons, for example "ja_JP_SJIS".  The separators between the
-     segments may be '-' or '_'.
--->
-<!ELEMENT supported-locale (#PCDATA)>
-
-<!--
-    The "to-view" element contains the view identifier of the next view
-    that should be displayed if this navigation rule is matched.  It
-    must be of type "ViewId".
--->
-<!ELEMENT to-view-id      (#PCDATA)>
-
-
-<!--
-    The "validator-class" element represents the fully qualified class name
-    of a concrete Validator implementation class.  It must be of
-    type "ClassName".
--->
-<!ELEMENT validator-class (#PCDATA)>
-
-
-<!--
-    The "validator-id" element represents the identifier under which the
-    corresponding Validator class should be registered.
--->
-<!ELEMENT validator-id    (#PCDATA)>
-
-
-<!--
-    The "value" element is the String representation of a literal
-    value to which a scalar managed property will be set, or a value
-    binding expression ("#{...}") that will be used to calculate the
-    required value.  It will be converted as specified for the actual
-    property type.
--->
-<!ELEMENT value (#PCDATA)>
-
-
-<!--
-    The "value-class" element defines the Java type to which each
-    "value" element's value will be converted to, prior to adding it to
-    the "list-entries" list for a managed property that is a
-    java.util.List, or a "map-entries" map for a managed property that
-    is a java.util.Map.  It must be of type "ClassName".  If omitted,
-    "java.lang.String" is assumed.
--->
-<!ELEMENT value-class (#PCDATA)>
-
-<!--
-    The "variable-resolver" element contains the fully qualified class name
-    of the concrete VariableResolver implementation class that will be used
-    during the processing of value binding expressions.
-    It must be of type "ClassName".
--->
-<!ELEMENT variable-resolver (#PCDATA)>
-
-
-<!-- ============================ Identifier Attributes ==================== -->
-
-
-<!ATTLIST action-listener                   id ID #IMPLIED>
-<!ATTLIST application                       id ID #IMPLIED>
-<!ATTLIST application-factory               id ID #IMPLIED>
-<!ATTLIST attribute                         id ID #IMPLIED>
-<!ATTLIST attribute-class                   id ID #IMPLIED>
-<!ATTLIST attribute-extension               id ID #IMPLIED>
-<!ATTLIST attribute-name                    id ID #IMPLIED>
-<!ATTLIST component                         id ID #IMPLIED>
-<!ATTLIST component-class                   id ID #IMPLIED>
-<!ATTLIST component-extension               id ID #IMPLIED>
-<!ATTLIST component-family                  id ID #IMPLIED>
-<!ATTLIST component-type                    id ID #IMPLIED>
-<!ATTLIST converter                         id ID #IMPLIED>
-<!ATTLIST converter-class                   id ID #IMPLIED>
-<!ATTLIST converter-for-class               id ID #IMPLIED>
-<!ATTLIST converter-id                      id ID #IMPLIED>
-<!ATTLIST default-locale                    id ID #IMPLIED>
-<!ATTLIST default-render-kit-id             id ID #IMPLIED>
-<!ATTLIST default-value                     id ID #IMPLIED>
-<!ATTLIST description                       id ID #IMPLIED>
-<!ATTLIST display-name                      id ID #IMPLIED>
-<!ATTLIST faces-config                      id ID #IMPLIED>
-<!ATTLIST faces-context-factory             id ID #IMPLIED>
-<!ATTLIST facet                             id ID #IMPLIED>
-<!ATTLIST facet-extension                   id ID #IMPLIED>
-<!ATTLIST facet-name                        id ID #IMPLIED>
-<!ATTLIST factory                           id ID #IMPLIED>
-<!ATTLIST from-action                       id ID #IMPLIED>
-<!ATTLIST from-outcome                      id ID #IMPLIED>
-<!ATTLIST from-view-id                      id ID #IMPLIED>
-<!ATTLIST icon                              id ID #IMPLIED>
-<!ATTLIST key                               id ID #IMPLIED>
-<!ATTLIST key-class                         id ID #IMPLIED>
-<!ATTLIST large-icon                        id ID #IMPLIED>
-<!ATTLIST lifecycle                         id ID #IMPLIED>
-<!ATTLIST lifecycle-factory                 id ID #IMPLIED>
-<!ATTLIST list-entries                      id ID #IMPLIED>
-<!ATTLIST locale-config                     id ID #IMPLIED>
-<!ATTLIST managed-bean                      id ID #IMPLIED>
-<!ATTLIST managed-bean-class                id ID #IMPLIED>
-<!ATTLIST managed-bean-name                 id ID #IMPLIED>
-<!ATTLIST managed-bean-scope                id ID #IMPLIED>
-<!ATTLIST managed-property                  id ID #IMPLIED>
-<!ATTLIST map-entries                       id ID #IMPLIED>
-<!ATTLIST map-entry                         id ID #IMPLIED>
-<!ATTLIST message-bundle                    id ID #IMPLIED>
-<!ATTLIST navigation-case                   id ID #IMPLIED>
-<!ATTLIST navigation-handler                id ID #IMPLIED>
-<!ATTLIST navigation-rule                   id ID #IMPLIED>
-<!ATTLIST null-value                        id ID #IMPLIED>
-<!ATTLIST phase-listener                    id ID #IMPLIED>
-<!ATTLIST property                          id ID #IMPLIED>
-<!ATTLIST property-class                    id ID #IMPLIED>
-<!ATTLIST property-extension                id ID #IMPLIED>
-<!ATTLIST property-name                     id ID #IMPLIED>
-<!ATTLIST property-resolver                 id ID #IMPLIED>
-<!ATTLIST redirect                          id ID #IMPLIED>
-<!ATTLIST referenced-bean                   id ID #IMPLIED>
-<!ATTLIST referenced-bean-class             id ID #IMPLIED>
-<!ATTLIST referenced-bean-name              id ID #IMPLIED>
-<!ATTLIST render-kit                        id ID #IMPLIED>
-<!ATTLIST render-kit-class                  id ID #IMPLIED>
-<!ATTLIST render-kit-factory                id ID #IMPLIED>
-<!ATTLIST render-kit-id                     id ID #IMPLIED>
-<!ATTLIST renderer                          id ID #IMPLIED>
-<!ATTLIST renderer-class                    id ID #IMPLIED>
-<!ATTLIST renderer-extension                id ID #IMPLIED>
-<!ATTLIST renderer-type                     id ID #IMPLIED>
-<!ATTLIST small-icon                        id ID #IMPLIED>
-<!ATTLIST state-manager                     id ID #IMPLIED>
-<!ATTLIST suggested-value                   id ID #IMPLIED>
-<!ATTLIST supported-locale                  id ID #IMPLIED>
-<!ATTLIST to-view-id                        id ID #IMPLIED>
-<!ATTLIST validator                         id ID #IMPLIED>
-<!ATTLIST validator-class                   id ID #IMPLIED>
-<!ATTLIST validator-id                      id ID #IMPLIED>
-<!ATTLIST value                             id ID #IMPLIED>
-<!ATTLIST value-class                       id ID #IMPLIED>
-<!ATTLIST variable-resolver                 id ID #IMPLIED>
-<!ATTLIST view-handler                      id ID #IMPLIED>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_2.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_2.xsd
deleted file mode 100644
index de857f0..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-facesconfig_1_2.xsd
+++ /dev/null
@@ -1,2071 +0,0 @@
-<?xml version = "1.0" encoding = "UTF-8"?>
-
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/javaee"
-     xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     xmlns:xml="http://www.w3.org/XML/1998/namespace"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="1.2">
-
-    <xsd:annotation>
-        <xsd:documentation>
-            $Id: web-facesconfig_1_2.xsd,v 1.1 2007/05/25 21:12:49 david_williams Exp $
-        </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:annotation>
-        <xsd:documentation>
-
-            Copyright 2005 Sun Microsystems, Inc., 
-            901 San Antonio Road, 
-            Palo Alto, California 94303, U.S.A. 
-            All rights reserved.
-
-            Sun Microsystems, Inc. has intellectual property 
-            rights relating to technology described in this document. In
-            particular, and without limitation, these intellectual
-            property rights may include one or more of the U.S. patents
-            listed at http://www.sun.com/patents and one or more
-            additional patents or pending patent applications in the
-            U.S. and other countries.
-
-            This document and the technology which it describes are
-            distributed under licenses restricting their use, copying,
-            distribution, and decompilation. No part of this document
-            may be reproduced in any form by any means without prior
-            written authorization of Sun and its licensors, if any.
-
-            Third-party software, including font technology, is
-            copyrighted and licensed from Sun suppliers.
-
-            Sun, Sun Microsystems, the Sun logo, Solaris, Java, Java EE,
-            JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-            Cup logo are trademarks or registered trademarks of Sun
-            Microsystems, Inc. in the U.S. and other countries.
-
-            Federal Acquisitions: Commercial Software - Government Users
-            Subject to Standard License Terms and Conditions.
-
-        </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:annotation>
-        <xsd:documentation>
-
-            <![CDATA[
-
-            The XML Schema for the JavaServer Faces Application
-            Configuration File (Version 1.2).
-
-            All JavaServer Faces configuration files must indicate
-            the JavaServer Faces schema by indicating the JavaServer
-            Faces namespace:
-
-            http://java.sun.com/xml/ns/javaee
-
-            and by indicating the version of the schema by
-            using the version element as shown below:
-
-            <faces-config xmlns="http://java.sun.com/xml/ns/javaee"
-                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                    xsi:schemaLocation="..."
-                    version="1.2">
-                ...
-            </faces-config>
-
-            The instance documents may indicate the published
-            version of the schema using xsi:schemaLocation attribute
-            for javaee namespace with the following location:
-
-            http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd
-
-            ]]>
-
-        </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:include schemaLocation="javaee_5.xsd"/>
-
-    <!-- **************************************************** -->
-
-    <xsd:element name = "faces-config" type="javaee:faces-configType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "faces-config" element is the root of the configuration
-                information hierarchy, and contains nested elements for all
-                of the other configuration settings.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:unique name="faces-config-converter-ID-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
-
-                    Converter IDs must be unique within a document.
-
-                </xsd:documentation>
-            </xsd:annotation>
-
-            <xsd:selector xpath="javaee:converter"/>
-            <xsd:field    xpath="javaee:converter-id"/>
-        </xsd:unique>
-
-        <xsd:unique name="faces-config-converter-for-class-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
-
-                    'converter-for-class' element values must be unique
-                    within a document.
-
-                </xsd:documentation>
-            </xsd:annotation>
-
-            <xsd:selector xpath="javaee:converter"/>
-            <xsd:field    xpath="javaee:converter-for-class"/>
-        </xsd:unique>
-
-        <xsd:unique name="faces-config-validator-ID-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
-
-                    Validator IDs must be unique within a document.
-
-                </xsd:documentation>
-            </xsd:annotation>
-
-            <xsd:selector xpath="javaee:validator"/>
-            <xsd:field    xpath="javaee:validator-id"/>
-        </xsd:unique>
-
-        <xsd:unique name="faces-config-managed-bean-name-uniqueness">
-            <xsd:annotation>
-                <xsd:documentation>
-
-                    Managed bean names must be unique within a document.
-
-                </xsd:documentation>
-            </xsd:annotation>
-
-            <xsd:selector xpath="javaee:managed-bean"/>
-            <xsd:field    xpath="javaee:managed-bean-name"/>
-        </xsd:unique>
-    </xsd:element>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-configType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "faces-config" element is the root of the configuration
-                information hierarchy, and contains nested elements for all
-                of the other configuration settings.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="application"
-                         type="javaee:faces-config-applicationType"/>
-            <xsd:element name="factory"
-                         type="javaee:faces-config-factoryType"/>
-            <xsd:element name="component"
-                         type="javaee:faces-config-componentType"/>
-            <xsd:element name="converter"
-                         type="javaee:faces-config-converterType"/>
-            <xsd:element name="managed-bean"
-                         type="javaee:faces-config-managed-beanType"/>
-            <xsd:element name="navigation-rule"
-                         type="javaee:faces-config-navigation-ruleType"/>
-            <xsd:element name="referenced-bean"
-                         type="javaee:faces-config-referenced-beanType"/>
-            <xsd:element name="render-kit"
-                         type="javaee:faces-config-render-kitType"/>
-            <xsd:element name="lifecycle"
-                         type="javaee:faces-config-lifecycleType"/>
-            <xsd:element name="validator"
-                         type="javaee:faces-config-validatorType"/>
-            <xsd:element name="faces-config-extension"
-                         type="javaee:faces-config-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:choice>
-            <xsd:attribute name = "id" type = "xsd:ID"/>
-            <xsd:attribute name="version"
-                type="javaee:faces-config-versionType"
-                use="required"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for faces-config.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-applicationType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "application" element provides a mechanism to define the
-                various per-application-singleton implementation artifacts for
-                a particular web application that is utilizing 
-                JavaServer Faces.  For nested elements that are not specified, 
-                the JSF implementation must provide a suitable default.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="action-listener"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The "action-listener" element contains the fully 
-                            qualified class name of the concrete 
-                            ActionListener implementation class that will be 
-                            called during the Invoke Application phase of the 
-                            request processing lifecycle.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="default-render-kit-id"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The "default-render-kit-id" element allows the 
-                            application to define a renderkit to be used other 
-                            than the standard one. 
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="message-bundle"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The base name of a resource bundle representing 
-                            the message resources for this application.  See 
-                            the JavaDocs for the "java.util.ResourceBundle" 
-                            class for more information on the syntax of 
-                            resource bundle names.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="navigation-handler"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The "navigation-handler" element contains the 
-                            fully qualified class name of the concrete 
-                            NavigationHandler implementation class that will 
-                            be called during the Invoke Application phase 
-                            of the request processing lifecycle, if the 
-                            default ActionListener (provided by the JSF 
-                            implementation) is used.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="view-handler"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The "view-handler" element contains the fully 
-                            qualified class name of the concrete ViewHandler 
-                            implementation class that will be called during 
-                            the Restore View and Render Response phases of the 
-                            request processing lifecycle.  The faces 
-                            implementation must provide a default 
-                            implementation of this class.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="state-manager"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The "state-manager" element contains the fully 
-                            qualified class name of the concrete StateManager 
-                            implementation class that will be called during 
-                            the Restore View and Render Response phases of the 
-                            request processing lifecycle.  The faces 
-                            implementation must provide a default 
-                            implementation of this class.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="el-resolver"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The "el-resolver" element contains the fully
-                            qualified class name of the concrete
-                            javax.el.ELResolver implementation class
-                            that will be used during the processing of
-                            EL expressions.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="property-resolver"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                            The "property-resolver" element contains the fully 
-                            qualified class name of the concrete 
-                            PropertyResolver implementation class that will 
-                            be used during the processing of value binding 
-                            expressions.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="variable-resolver"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                            The "variable-resolver" element contains the fully
-                            qualified class name of the concrete 
-                            VariableResolver implementation class that will 
-                            be used during the processing of value binding 
-                            expressions.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element 
-                name="locale-config"
-                type="javaee:faces-config-locale-configType"/>
-            <xsd:element 
-                name="resource-bundle"
-                type="javaee:faces-config-application-resource-bundleType"/>
-            <xsd:element name="application-extension"
-                         type="javaee:faces-config-application-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            </xsd:choice>
-        <xsd:attribute name = "id" type = "xsd:ID"/>
-    </xsd:complexType>
-
-    <xsd:complexType name="faces-config-application-resource-bundleType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-              The resource-bundle element inside the application element
-              references a java.util.ResourceBundle instance by name
-              using the var element.  ResourceBundles referenced in this
-              manner may be returned by a call to
-              Application.getResourceBundle() passing the current
-              FacesContext for this request and the value of the var
-              element below.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="base-name"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The fully qualified class name of the
-                        java.util.ResourceBundle instance.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="var"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The name by which this ResourceBundle instance
-                        is retrieved by a call to
-                        Application.getResourceBundle().
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-application-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for application.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-factoryType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "factory" element provides a mechanism to define the 
-                various Factories that comprise parts of the implementation 
-                of JavaServer Faces.  For nested elements that are not 
-                specified, the JSF implementation must provide a suitable 
-                default.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:choice minOccurs="0" maxOccurs="unbounded">
-            <xsd:element name="application-factory"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                        The "application-factory" element contains the 
-                        fully qualified class name of the concrete 
-                        ApplicationFactory implementation class that will 
-                        be called when 
-                        FactoryFinder.getFactory(APPLICATION_FACTORY) is
-                        called.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="faces-context-factory"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                        The "faces-context-factory" element contains the
-                        fully qualified class name of the concrete
-                        FacesContextFactory implementation class that will
-                        be called when 
-                        FactoryFinder.getFactory(FACES_CONTEXT_FACTORY) 
-                        is called.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="lifecycle-factory"
-                        type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                            
-                        The "lifecycle-factory" element contains the fully
-                        qualified class name of the concrete LifecycleFactory
-                        implementation class that will be called when
-                        FactoryFinder.getFactory(LIFECYCLE_FACTORY) is called.
-                            
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="render-kit-factory"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "render-kit-factory" element contains the fully
-                        qualified class name of the concrete RenderKitFactory
-                        implementation class that will be called when
-                        FactoryFinder.getFactory(RENDER_KIT_FACTORY) is 
-                        called.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="factory-extension"
-                         type="javaee:faces-config-factory-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:choice>
-        <xsd:attribute name = "id" type = "xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-factory-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for factory.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-attributeType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "attribute" element represents a named, typed, value
-                associated with the parent UIComponent via the generic
-                attributes mechanism.
-
-                Attribute names must be unique within the scope of the parent
-                (or related) component.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="attribute-name"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "attribute-name" element represents the name under 
-                        which the corresponding value will be stored, in the 
-                        generic attributes of the UIComponent we are related 
-                        to.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="attribute-class"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "attribute-class" element represents the Java type
-                        of the value associated with this attribute name.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="default-value"
-                         type="javaee:faces-config-default-valueType"
-                         minOccurs="0"/>
-            <xsd:element name="suggested-value"
-                         type="javaee:faces-config-suggested-valueType"
-                         minOccurs="0"/>
-            <xsd:element name="attribute-extension"
-                         type="javaee:faces-config-attribute-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name = "id" type = "xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-attribute-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for attribute.  It may contain 
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-componentType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "component" element represents a concrete UIComponent
-                implementation class that should be registered under the
-                specified type identifier, along with its associated 
-                properties and attributes.  Component types must be unique 
-                within the entire web application.
-
-                Nested "attribute" elements identify generic attributes that 
-                are recognized by the implementation logic of this component.
-                Nested "property" elements identify JavaBeans properties of 
-                the component class that may be exposed for manipulation 
-                via tools.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="component-type"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "component-type" element represents the name under 
-                        which the corresponding UIComponent class should be 
-                        registered.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="component-class"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "component-class" element represents the fully 
-                        qualified class name of a concrete UIComponent 
-                        implementation class.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="facet"
-                         type="javaee:faces-config-facetType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            <xsd:element name="attribute"
-                         type="javaee:faces-config-attributeType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            <xsd:element name="property"
-                         type="javaee:faces-config-propertyType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            <xsd:element name="component-extension"
-                         type="javaee:faces-config-component-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-component-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-                Extension element for component.  It may contain 
-                implementation specific content.
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-default-localeType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "default-locale" element declares the default locale 
-                for this application instance.
-
-                It must be specified as :language:[_:country:[_:variant:]]
-                without the colons, for example "ja_JP_SJIS".  The
-                separators between the segments may be '-' or '_'.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-localeType">
-                <xsd:attribute name="id" type="xsd:ID"/>                
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-
-    <xsd:complexType name="faces-config-default-valueType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "default-value" contains the value for the property or
-                attribute in which this element resides.  This value differs
-                from the "suggested-value" in that the property or attribute
-                must take the value, whereas in "suggested-value" taking the
-                value is optional.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:simpleType name="faces-config-el-expressionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                EL expressions present within a faces config file
-                must start with the character sequence of '#{' and
-                end with '}'.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:restriction base="xsd:string">
-            <xsd:pattern value="#\{.*\}"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-facetType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Define the name and other design-time information for a facet
-                that is associated with a renderer or a component.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="facet-name"
-                         type="javaee:java-identifierType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "facet-name" element represents the facet name 
-                        under which a UIComponent will be added to its parent.  
-                        It must be of type "Identifier".
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="facet-extension"
-                         type="javaee:faces-config-facet-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-facet-extensionType">
-         <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for facet.  It may contain implementation
-                specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-from-view-idType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The value of from-view-id must contain one of the following 
-                values:
-
-                  - The exact match for a view identifier that is recognized
-                    by the the ViewHandler implementation being used (such as
-                    "/index.jsp" if you are using the default ViewHandler).
-
-                  - A proper prefix of a view identifier, plus a trailing 
-                    "*" character.  This pattern indicates that all view 
-                    identifiers that match the portion of the pattern up to 
-                    the asterisk will match the surrounding rule.  When more 
-                    than one match exists, the match with the longest pattern 
-                    is selected.
-
-                  - An "*" character, which means that this pattern applies 
-                    to all view identifiers.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-from-actionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "from-action" element contains an action reference 
-                expression that must have been executed (by the default 
-                ActionListener for handling application level events) 
-                in order to select the navigation rule.  If not specified, 
-                this rule will be relevant no matter which action reference 
-                was executed (or if no action reference was executed).
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-el-expressionType">
-                <xsd:attribute name="id" type="xsd:ID"/>
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-converterType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "converter" element represents a concrete Converter
-                implementation class that should be registered under the
-                specified converter identifier.  Converter identifiers must 
-                be unique within the entire web application.
-
-                Nested "attribute" elements identify generic attributes that
-                may be configured on the corresponding UIComponent in order 
-                to affect the operation of the Converter.  Nested "property"
-                elements identify JavaBeans properties of the Converter
-                implementation class that may be configured to affect the
-                operation of the Converter.  "attribute" and "property" 
-                elements are intended to allow component developers to 
-                more completely describe their components to tools and users.
-                These elements have no required runtime semantics.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:choice>
-                <xsd:element name="converter-id"
-                             type="javaee:string">
-                    <xsd:annotation>
-                        <xsd:documentation>
-
-                            The "converter-id" element represents the 
-                            identifier under which the corresponding 
-                            Converter class should be registered.
-
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-                
-                <xsd:element name="converter-for-class"
-                             type="javaee:fully-qualified-classType">
-                    <xsd:annotation>
-                        <xsd:documentation>
-
-                            The "converter-for-class" element represents the 
-                            fully qualified class name for which a Converter 
-                            class will be registered.
-
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:element>
-            </xsd:choice>
-            
-            <xsd:element name="converter-class"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "converter-class" element represents the fully
-                        qualified class name of a concrete Converter 
-                        implementation class.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="attribute"
-                         type="javaee:faces-config-attributeType"
-                         minOccurs="0"
-                         maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                       Nested "attribute" elements identify generic
-                       attributes that may be configured on the
-                       corresponding UIComponent in order to affect the
-                       operation of the Converter.  This attribute is
-                       primarily for design-time tools and is not
-                       specified to have any meaning at runtime.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="property"
-                         type="javaee:faces-config-propertyType"
-                         minOccurs="0"
-                         maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                       Nested "property" elements identify JavaBeans
-                       properties of the Converter implementation class
-                       that may be configured to affect the operation of
-                       the Converter.  This attribute is primarily for
-                       design-time tools and is not specified to have
-                       any meaning at runtime.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="converter-extension"
-                         type="javaee:faces-config-converter-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-converter-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for converter.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-lifecycleType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "lifecycle" element provides a mechanism to specify
-                modifications to the behaviour of the default Lifecycle
-                implementation for this web application.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="phase-listener"
-                         type="javaee:fully-qualified-classType"
-                         minOccurs="0" 
-                         maxOccurs="unbounded">
-                
-                <xsd:annotation>
-                    <xsd:documentation>
-                    
-                        The "phase-listener" element contains the fully 
-                        qualified class name of the concrete PhaseListener 
-                        implementation class that will be registered on 
-                        the Lifecycle.
-                    
-                    </xsd:documentation>
-            </xsd:annotation>                
-            </xsd:element>
-            <xsd:element name="lifecycle-extension"
-                         type="javaee:faces-config-lifecycle-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-lifecycle-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for lifecycle.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    
-    <!-- **************************************************** -->
-    
-    <xsd:simpleType name="faces-config-localeType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The localeType defines valid locale defined by ISO-639-1
-                and ISO-3166.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:restriction base="xsd:string">
-            <xsd:pattern value="[a-z]{2}(_|-)?([\p{L}\-\p{Nd}]{2})?"/>
-        </xsd:restriction>
-  </xsd:simpleType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-locale-configType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "locale-config" element allows the app developer to 
-                declare the supported locales for this application.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        
-        <xsd:sequence>
-            <xsd:element name="default-locale"
-                         type="javaee:faces-config-default-localeType"
-                         minOccurs="0">
-            </xsd:element>
-            <xsd:element name="supported-locale"
-                         type="javaee:faces-config-supported-localeType"
-                         minOccurs="0" 
-                         maxOccurs="unbounded">                
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-managed-beanType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "managed-bean" element represents a JavaBean, of a 
-                particular class, that will be dynamically instantiated 
-                at runtime (by the default VariableResolver implementation) 
-                if it is referenced as the first element of a value binding 
-                expression, and no corresponding bean can be identified in 
-                any scope.  In addition to the creation of the managed bean, 
-                and the optional storing of it into the specified scope, 
-                the nested managed-property elements can be used to 
-                initialize the contents of settable JavaBeans properties of 
-                the created instance.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="managed-bean-name"
-                         type="javaee:java-identifierType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "managed-bean-name" element represents the 
-                        attribute name under which a managed bean will 
-                        be searched for, as well as stored (unless the 
-                        "managed-bean-scope" value is "none").
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="managed-bean-class"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "managed-bean-class" element represents the fully
-                        qualified class name of the Java class that will be 
-                        used`to instantiate a new instance if creation of the 
-                        specified`managed bean is requested.
-
-                        The specified class must conform to standard JavaBeans
-                        conventions.  In particular, it must have a public
-                        zero-arguments constructor, and zero or more public
-                        property setters.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element 
-                name="managed-bean-scope"
-                type="javaee:faces-config-managed-bean-scopeOrNoneType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "managed-bean-scope" element represents the scope 
-                        into which a newly created instance of the specified 
-                        managed bean will be stored (unless the value is 
-                        "none").
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:choice>
-                <xsd:element name="managed-property"
-                             type="javaee:faces-config-managed-propertyType"
-                             minOccurs="0"
-                             maxOccurs="unbounded"/>
-                <xsd:element name="map-entries"
-                             type="javaee:faces-config-map-entriesType"/>
-                <xsd:element name="list-entries"
-                             type="javaee:faces-config-list-entriesType"/>
-            </xsd:choice>
-            <xsd:element name="managed-bean-extension"
-                         type="javaee:faces-config-managed-bean-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-managed-bean-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for managed-bean.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-
-    <!-- **************************************************** -->
-    
-    <xsd:complexType name="faces-config-managed-bean-scopeOrNoneType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                <![CDATA[
-                Defines the legal values for the <managed-bean-scope>
-                element's body content, which includes all of the scopes
-                normally used in a web application, plus the "none" value
-                indicating that a created bean should not be stored into
-                any scope.
-                ]]>
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:string">
-                <xsd:enumeration value="request"/>
-                <xsd:enumeration value="session"/>
-                <xsd:enumeration value="application"/>
-                <xsd:enumeration value="none"/>
-            </xsd:restriction>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-managed-propertyType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "managed-property" element represents an individual 
-                property of a managed bean that will be configured to the 
-                specified value (or value set) if the corresponding 
-                managed bean is automatically created.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="property-name"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "property-name" element represents the JavaBeans 
-                        property name under which the corresponding value may 
-                        be stored.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="property-class"
-                         type="javaee:java-typeType"
-                         minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                    
-                        The "property-class" element represents the Java type 
-                        of the value associated with this property name.  
-                        If not specified, it can be inferred from existing 
-                        classes; however, this element should be specified 
-                        if the configuration file is going to be the source 
-                        for generating the corresponding classes.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:choice>
-                <xsd:element name="map-entries"
-                             type="javaee:faces-config-map-entriesType"/>
-                <xsd:element name="null-value"
-                             type="javaee:faces-config-null-valueType">
-                </xsd:element>
-                <xsd:element name="value"
-                             type="javaee:faces-config-valueType"/>
-                <xsd:element name="list-entries"
-                             type="javaee:faces-config-list-entriesType"/>
-            </xsd:choice>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-map-entryType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "map-entry" element reprsents a single key-entry pair 
-                that will be added to the computed value of a managed 
-                property of type java.util.Map.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="key"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "key" element is the String representation of a 
-                        map key that will be stored in a managed property of 
-                        type java.util.Map.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:choice>
-                <xsd:element name="null-value"
-                             type="javaee:faces-config-null-valueType"/>
-                <xsd:element name="value"
-                             type="javaee:faces-config-valueType"/>
-            </xsd:choice>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-map-entriesType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "map-entries' element represents a set of key-entry pairs 
-                that will be added to the computed value of a managed property 
-                of type java.util.Map.  In addition, the Java class types 
-                of the key and entry values may be optionally declared.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:element name="key-class"
-                         type="javaee:fully-qualified-classType"
-                         minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "key-class" element defines the Java type to which 
-                        each "key" element in a set of "map-entry" elements 
-                        will be converted to.  If omitted, "java.lang.String" 
-                        is assumed.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="value-class"
-                         type="javaee:faces-config-value-classType"
-                         minOccurs="0"/>                
-            <xsd:element name="map-entry"
-                         type="javaee:faces-config-map-entryType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-navigation-caseType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "navigation-case" element describes a particular 
-                combination of conditions that must match for this case to 
-                be executed, and the view id of the component tree that 
-                should be selected next.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="from-action"
-                         type="javaee:faces-config-from-actionType"
-                         minOccurs="0">
-            </xsd:element>
-            <xsd:element name="from-outcome"
-                         type="javaee:string" minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "from-outcome" element contains a logical outcome
-                        string returned by the execution of an application
-                        action method selected via an "actionRef" property
-                        (or a literal value specified by an "action" property)
-                        of a UICommand component.  If specified, this rule 
-                        will be relevant only if the outcome value matches 
-                        this element's value.  If not specified, this rule 
-                        will be relevant no matter what the outcome value was.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="to-view-id"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "to-view-id" element contains the view identifier 
-                        of the next view that should be displayed if this
-                        navigation rule is matched.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element 
-                name="redirect"
-                type="javaee:faces-config-redirectType" minOccurs="0"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-navigation-ruleType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "navigation-rule" element represents an individual 
-                decision rule that will be utilized by the default 
-                NavigationHandler implementation to make decisions on 
-                what view should be displayed next, based on the 
-                view id being processed.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="from-view-id"
-                         type="javaee:faces-config-from-view-idType"
-                         minOccurs="0"/>
-            <xsd:element name="navigation-case"
-                         type="javaee:faces-config-navigation-caseType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            <xsd:element 
-                name="navigation-rule-extension"
-                type="javaee:faces-config-navigation-rule-extensionType"
-                minOccurs="0"
-                maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-navigation-rule-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for navigation-rule.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-null-valueType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "null-value" element indicates that the managed
-                property in which we are nested will be explicitly
-                set to null if our managed bean is automatically
-                created.  This is different from omitting the managed
-                property element entirely, which will cause no
-                property setter to be called for this property.
-
-                The "null-value" element can only be used when the
-                associated "property-class" identifies a Java class,
-                not a Java primitive.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-    
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-propertyType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "property" element represents a JavaBean property of the 
-                Java class represented by our parent element.
-
-                Property names must be unique within the scope of the Java 
-                class that is represented by the parent element, and must 
-                correspond to property names that will be recognized when 
-                performing introspection against that class via 
-                java.beans.Introspector.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="property-name"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "property-name" element represents the JavaBeans 
-                        property name under which the corresponding value 
-                        may be stored.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="property-class"
-                         type="javaee:java-typeType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "property-class" element represents the Java type 
-                        of the value associated with this property name.  
-                        If not specified, it can be inferred from existing 
-                        classes; however, this element should be specified if 
-                        the configuration file is going to be the source for 
-                        generating the corresponding classes.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="default-value"
-                         type="javaee:faces-config-default-valueType"
-                         minOccurs="0"/>               
-            <xsd:element name="suggested-value"
-                         type="javaee:faces-config-suggested-valueType"
-                         minOccurs="0"/>
-            <xsd:element name="property-extension"
-                         type="javaee:faces-config-property-extensionType"
-                         minOccurs="0" 
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-property-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for property.  It may contain 
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-redirectType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                    The "redirect" element indicates that navigation to the
-                    specified "to-view-id" should be accomplished by 
-                    performing an HTTP redirect rather than the usual 
-                    ViewHandler mechanisms.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-referenced-beanType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "referenced-bean" element represents at design time the 
-                promise that a Java object of the specified type will exist at 
-                runtime in some scope, under the specified key.  This can be 
-                used by design time tools to construct user interface dialogs 
-                based on the properties of the specified class.  The presence 
-                or absence of a referenced bean element has no impact on the 
-                JavaServer Faces runtime environment inside a web application.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="referenced-bean-name"
-                         type="javaee:java-identifierType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "referenced-bean-name" element represents the 
-                        attribute name under which the corresponding 
-                        referenced bean may be assumed to be stored, in one 
-                        of 'request', 'session', or 'application' scopes.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="referenced-bean-class"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "referenced-bean-class" element represents the 
-                        fully qualified class name of the Java class 
-                        (either abstract or concrete) or Java interface 
-                        implemented by the corresponding referenced bean. 
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-render-kitType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "render-kit" element represents a concrete RenderKit 
-                implementation that should be registered under the specified 
-                render-kit-id.  If no render-kit-id is specified, the 
-                identifier of the default RenderKit 
-                (RenderKitFactory.DEFAULT_RENDER_KIT) is assumed.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="render-kit-id"
-                         type="javaee:string"
-                         minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "render-kit-id" element represents an identifier 
-                        for the RenderKit represented by the parent 
-                        "render-kit" element.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="render-kit-class"
-                         type="javaee:fully-qualified-classType"
-                         minOccurs="0">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "render-kit-class" element represents the fully 
-                        qualified class name of a concrete RenderKit 
-                        implementation class.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="renderer"
-                         type="javaee:faces-config-rendererType"
-                         minOccurs="0" 
-                         maxOccurs="unbounded"/>
-            <xsd:element name="render-kit-extension"
-                         type="javaee:faces-config-render-kit-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-rendererType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "renderer" element represents a concrete Renderer 
-                implementation class that should be registered under the 
-                specified component family and renderer type identifiers, 
-                in the RenderKit associated with the parent "render-kit" 
-                element.  Combinations of component family and 
-                renderer type must be unique within the RenderKit 
-                associated with the parent "render-kit" element.
-
-                Nested "attribute" elements identify generic component 
-                attributes that are recognized by this renderer.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="component-family"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "component-family" element represents the 
-                        component family for which the Renderer represented 
-                        by the parent "renderer" element will be used.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>                    
-            </xsd:element>
-            <xsd:element name="renderer-type"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "renderer-type" element represents a renderer type 
-                        identifier for the Renderer represented by the parent 
-                        "renderer" element.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="renderer-class"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                        The "renderer-class" element represents the fully
-                        qualified class name of a concrete Renderer
-                        implementation class.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="facet"
-                         type="javaee:faces-config-facetType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            <xsd:element name="attribute"
-                         type="javaee:faces-config-attributeType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-            <xsd:element name="renderer-extension"
-                         type="javaee:faces-config-renderer-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-renderer-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for renderer.  It may contain implementation
-                specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-render-kit-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for render-kit.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-suggested-valueType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "suggested-value" contains the value for the property or
-                attribute in which this element resides.  This value is 
-                advisory only and is intended for tools to use when 
-                populating pallettes.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:string"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-supported-localeType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "supported-locale" element allows authors to declare
-                which locales are supported in this application instance.
-
-                It must be specified as :language:[_:country:[_:variant:]]
-                without the colons, for example "ja_JP_SJIS".  The
-                separators between the segments may be '-' or '_'.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:extension base="javaee:faces-config-localeType">
-                <xsd:attribute name="id" type="xsd:ID"/> 
-            </xsd:extension>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-validatorType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "validator" element represents a concrete Validator
-                implementation class that should be registered under the
-                specified validator identifier.  Validator identifiers must 
-                be unique within the entire web application.
-
-                Nested "attribute" elements identify generic attributes that 
-                may be configured on the corresponding UIComponent in order 
-                to affect the operation of the Validator.  Nested "property"
-                elements identify JavaBeans properties of the Validator
-                implementation class that may be configured to affect the
-                operation of the Validator.  "attribute" and "property" 
-                elements are intended to allow component developers to 
-                more completely describe their components to tools and users.
-                These elements have no required runtime semantics.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:group ref="javaee:descriptionGroup"/>
-            <xsd:element name="validator-id"
-                         type="javaee:string">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "validator-id" element represents the identifier 
-                        under which the corresponding Validator class should 
-                        be registered.
-                        
-                    </xsd:documentation>
-                </xsd:annotation>                
-            </xsd:element>
-            <xsd:element name="validator-class"
-                         type="javaee:fully-qualified-classType">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                        The "validator-class" element represents the fully 
-                        qualified class name of a concrete Validator 
-                        implementation class.  
-                        
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="attribute"
-                         type="javaee:faces-config-attributeType"
-                         minOccurs="0" 
-                         maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-                        
-                       Nested "attribute" elements identify generic
-                       attributes that may be configured on the
-                       corresponding UIComponent in order to affect the
-                       operation of the Validator.  This attribute is
-                       primarily for design-time tools and is not
-                       specified to have any meaning at runtime.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-
-            </xsd:element>
-            <xsd:element name="property"
-                         type="javaee:faces-config-propertyType"
-                         minOccurs="0" 
-                         maxOccurs="unbounded">
-                <xsd:annotation>
-                    <xsd:documentation>
-
-                       Nested "property" elements identify JavaBeans
-                       properties of the Validator implementation class
-                       that may be configured to affect the operation of
-                       the Validator.  This attribute is primarily for
-                       design-time tools and is not specified to have
-                       any meaning at runtime.
-
-                    </xsd:documentation>
-                </xsd:annotation>
-            </xsd:element>
-            <xsd:element name="validator-extension"
-                         type="javaee:faces-config-validator-extensionType"
-                         minOccurs="0"
-                         maxOccurs="unbounded"/>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name = "faces-config-validator-extensionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                Extension element for validator.  It may contain
-                implementation specific content.
-
-            </xsd:documentation>
-        </xsd:annotation>
-
-        <xsd:sequence>
-            <xsd:any namespace="##any"
-                     processContents="lax"
-                     minOccurs="0"
-                     maxOccurs="unbounded" />
-         </xsd:sequence>
-         <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:simpleType name="faces-config-valueType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                The "value" element is the String representation of
-                a literal value to which a scalar managed property
-                will be set, or a value binding expression ("#{...}")
-                that will be used to calculate the required value.
-                It will be converted as specified for the actual
-                property type.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:union 
-            memberTypes="javaee:faces-config-el-expressionType xsd:string"/>
-    </xsd:simpleType>
-    
-    <!-- **************************************************** -->
-    
-    <xsd:complexType name="faces-config-value-classType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "value-class" element defines the Java type to which each
-                "value" element's value will be converted to, prior to adding 
-                it to the "list-entries" list for a managed property that is 
-                a java.util.List, or a "map-entries" map for a managed 
-                property that is a java.util.Map.  
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:simpleContent>
-            <xsd:restriction base="javaee:fully-qualified-classType"/>
-        </xsd:simpleContent>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:complexType name="faces-config-list-entriesType">
-        <xsd:annotation>
-            <xsd:documentation>
-                
-                The "list-entries" element represents a set of initialization
-                elements for a managed property that is a java.util.List or an
-                array.  In the former case, the "value-class" element can 
-                optionally be used to declare the Java type to which each 
-                value should be converted before adding it to the Collection.
-                
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:sequence>
-            <xsd:element name="value-class"
-                         type="javaee:faces-config-value-classType"
-                         minOccurs="0"/>
-            <xsd:choice minOccurs="0" maxOccurs="unbounded">
-                <xsd:element name="null-value"
-                             type="javaee:faces-config-null-valueType"/>
-                <xsd:element name="value"
-                             type="javaee:faces-config-valueType"/>
-            </xsd:choice>
-        </xsd:sequence>
-        <xsd:attribute name="id" type="xsd:ID"/>
-    </xsd:complexType>
-
-    <!-- **************************************************** -->
-
-    <xsd:simpleType name="faces-config-versionType">
-        <xsd:annotation>
-            <xsd:documentation>
-
-                This type contains the recognized versions of
-                faces-config supported.
-
-            </xsd:documentation>
-        </xsd:annotation>
-        <xsd:restriction base="xsd:token">
-            <xsd:enumeration value="1.2"/>
-        </xsd:restriction>
-    </xsd:simpleType>
-
-    <!-- **************************************************** -->
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-fragment_3_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-fragment_3_0.xsd
deleted file mode 100644
index fdd422d..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-fragment_3_0.xsd
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
-            targetNamespace="http://java.sun.com/xml/ns/javaee"
-            xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            elementFormDefault="qualified"
-            attributeFormDefault="unqualified"
-            version="3.0">
-  <xsd:annotation>
-    <xsd:documentation>
-
-      DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-      
-      Copyright 2003-2009 Sun Microsystems, Inc. All rights reserved.
-      
-      The contents of this file are subject to the terms of either the
-      GNU General Public License Version 2 only ("GPL") or the Common
-      Development and Distribution License("CDDL") (collectively, the
-      "License").  You may not use this file except in compliance with
-      the License. You can obtain a copy of the License at
-      https://glassfish.dev.java.net/public/CDDL+GPL.html or
-      glassfish/bootstrap/legal/LICENSE.txt.  See the License for the
-      specific language governing permissions and limitations under the
-      License.
-      
-      When distributing the software, include this License Header
-      Notice in each file and include the License file at
-      glassfish/bootstrap/legal/LICENSE.txt.  Sun designates this
-      particular file as subject to the "Classpath" exception as
-      provided by Sun in the GPL Version 2 section of the License file
-      that accompanied this code.  If applicable, add the following
-      below the License Header, with the fields enclosed by brackets []
-      replaced by your own identifying information:
-      "Portions Copyrighted [year] [name of copyright owner]"
-      
-      Contributor(s):
-      
-      If you wish your version of this file to be governed by only the
-      CDDL or only the GPL Version 2, indicate your decision by adding
-      "[Contributor] elects to include this software in this
-      distribution under the [CDDL or GPL Version 2] license."  If you
-      don't indicate a single choice of license, a recipient has the
-      option to distribute your version of this file under either the
-      CDDL, the GPL Version 2 or to extend the choice of license to its
-      licensees as provided above.  However, if you add GPL Version 2
-      code and therefore, elected the GPL Version 2 license, then the
-      option applies only if the new code is made subject to such
-      option by the copyright holder.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[[
-      This is the XML Schema for the Servlet 3.0 deployment descriptor.
-      The deployment descriptor must be named "META-INF/web-fragment.xml"
-      in the web fragment's jar file.  All Servlet deployment descriptors
-      must indicate the web application schema by using the Java EE
-      namespace:
-      
-      http://java.sun.com/xml/ns/javaee 
-      
-      and by indicating the version of the schema by 
-      using the version element as shown below: 
-      
-      <web-fragment xmlns="http://java.sun.com/xml/ns/javaee"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="..."
-      version="3.0"> 
-      ...
-      </web-fragment>
-      
-      The instance documents may indicate the published version of
-      the schema using the xsi:schemaLocation attribute for Java EE
-      namespace with the following location:
-      
-      http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd
-      
-      ]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      The following conventions apply to all Java EE
-      deployment descriptor elements unless indicated otherwise.
-      
-      - In elements that specify a pathname to a file within the
-      same JAR file, relative filenames (i.e., those not
-      starting with "/") are considered relative to the root of
-      the JAR file's namespace.  Absolute filenames (i.e., those
-      starting with "/") also specify names in the root of the
-      JAR file's namespace.  In general, relative names are
-      preferred.  The exception is .war files where absolute
-      names are preferred for consistency with the Servlet API.
-      
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="web-common_3_0.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="web-fragment"
-               type="javaee:web-fragmentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        The web-fragment element is the root of the deployment
-        descriptor for a web fragment.  Note that the sub-elements
-        of this element can be in the arbitrary order. Because of
-        that, the multiplicity of the elements of distributable,
-        session-config, welcome-file-list, jsp-config, login-config,
-        and locale-encoding-mapping-list was changed from "?" to "*"
-        in this schema.  However, the deployment descriptor instance
-        file must not contain multiple elements of session-config,
-        jsp-config, and login-config. When there are multiple elements of
-        welcome-file-list or locale-encoding-mapping-list, the container
-        must concatenate the element contents.  The multiple occurence
-        of the element distributable is redundant and the container
-        treats that case exactly in the same way when there is only
-        one distributable. 
-        
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:unique name="web-common-servlet-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The servlet element contains the name of a servlet.
-          The name must be unique within the web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:servlet"/>
-      <xsd:field xpath="javaee:servlet-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-filter-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The filter element contains the name of a filter.
-          The name must be unique within the web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:filter"/>
-      <xsd:field xpath="javaee:filter-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-ejb-local-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The ejb-local-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
-          application's environment and is relative to the
-          java:comp/env context.  The name must be unique within
-          the web application.
-          
-          It is recommended that name is prefixed with "ejb/".
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-local-ref"/>
-      <xsd:field xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-ejb-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The ejb-ref-name element contains the name of an EJB
-          reference. The EJB reference is an entry in the web
-          application's environment and is relative to the
-          java:comp/env context.  The name must be unique within
-          the web application.
-          
-          It is recommended that name is prefixed with "ejb/".
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:ejb-ref"/>
-      <xsd:field xpath="javaee:ejb-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-resource-env-ref-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The resource-env-ref-name element specifies the name of
-          a resource environment reference; its value is the
-          environment entry name used in the web application code.
-          The name is a JNDI name relative to the java:comp/env
-          context and must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-env-ref"/>
-      <xsd:field xpath="javaee:resource-env-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-message-destination-ref-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The message-destination-ref-name element specifies the name of
-          a message destination reference; its value is the
-          environment entry name used in the web application code.
-          The name is a JNDI name relative to the java:comp/env
-          context and must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:message-destination-ref"/>
-      <xsd:field xpath="javaee:message-destination-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-res-ref-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The res-ref-name element specifies the name of a
-          resource manager connection factory reference.  The name
-          is a JNDI name relative to the java:comp/env context.
-          The name must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:resource-ref"/>
-      <xsd:field xpath="javaee:res-ref-name"/>
-    </xsd:unique>
-    <xsd:unique name="web-common-env-entry-name-uniqueness">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The env-entry-name element contains the name of a web
-          application's environment entry.  The name is a JNDI
-          name relative to the java:comp/env context.  The name
-          must be unique within a web application.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:env-entry"/>
-      <xsd:field xpath="javaee:env-entry-name"/>
-    </xsd:unique>
-    <xsd:key name="web-common-role-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          A role-name-key is specified to allow the references
-          from the security-role-refs.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:security-role"/>
-      <xsd:field xpath="javaee:role-name"/>
-    </xsd:key>
-    <xsd:keyref name="web-common-role-name-references"
-                refer="javaee:web-common-role-name-key">
-      <xsd:annotation>
-        <xsd:documentation>
-
-          The keyref indicates the references from
-          security-role-ref to a specified role-name.
-          
-        </xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:servlet/javaee:security-role-ref"/>
-      <xsd:field xpath="javaee:role-link"/>
-    </xsd:keyref>
-  </xsd:element>
-
-</xsd:schema>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_1_1.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_1_1.dtd
deleted file mode 100644
index 25c8e87..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_1_1.dtd
+++ /dev/null
@@ -1,265 +0,0 @@
-<!--
-Copyright 1999 Sun Microsystems, Inc. 901 San Antonio Road,
-Palo Alto, CA  94303, U.S.A.  All rights reserved.
- 
-This product or document is protected by copyright and distributed
-under licenses restricting its use, copying, distribution, and
-decompilation.  No part of this product or documentation may be
-reproduced in any form by any means without prior written authorization
-of Sun and its licensors, if any.  
-
-Third party software, including font technology, is copyrighted and 
-licensed from Sun suppliers. 
-
-Sun, Sun Microsystems, the Sun Logo, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail and Enterprise JavaBeans, 
-are trademarks or registered trademarks of Sun Microsystems, Inc in the U.S. 
-and other countries.
-
-All SPARC trademarks are used under license and are trademarks
-or registered trademarks of SPARC International, Inc.
-in the U.S. and other countries. Products bearing SPARC
-trademarks are based upon an architecture developed by Sun Microsystems, Inc. 
-
-PostScript is a registered trademark of Adobe Systems, Inc. 
-
- 
-Federal Acquisitions: Commercial Software - Government Users Subject to 
-Standard License Terms and Conditions.
-
-
- 
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
-IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE OR NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT
-TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD TO BE LEGALLY
-INVALID.
-
-_________________________________________________________________________
-Copyright 1999 Sun Microsystems, Inc., 
-901 San Antonio Road, Palo Alto, CA  94303, Etats-Unis. 
-Tous droits re'serve's.
- 
-
-Ce produit ou document est prote'ge' par un copyright et distribue' avec 
-des licences qui en restreignent l'utilisation, la copie, la distribution,
-et la de'compilation.  Aucune partie de ce produit ou de sa documentation
-associe'e ne peut e^tre reproduite sous aucune forme, par quelque moyen 
-que ce soit, sans l'autorisation pre'alable et e'crite de Sun et de ses 
-bailleurs de licence, s'il y en a.  
-
-Le logiciel de'tenu par des tiers, et qui comprend la technologie 
-relative aux polices de caracte`res, est prote'ge' par un copyright 
-et licencie' par des fournisseurs de Sun.
- 
-Sun, Sun Microsystems, le logo Sun, Solaris, Java, JavaServer Pages, Java 
-Naming and Directory Interface, JDBC, JDK, JavaMail, et Enterprise JavaBeans,  
-sont des marques de fabrique ou des marques de'pose'es de Sun 
-Microsystems, Inc. aux Etats-Unis et dans d'autres pays.
- 
-Toutes les marques SPARC sont utilise'es sous licence et sont
-des marques de fabrique ou des marques de'pose'es de SPARC
-International, Inc. aux Etats-Unis et  dans
-d'autres pays. Les produits portant les marques SPARC sont
-base's sur une architecture de'veloppe'e par Sun Microsystems, Inc.  
-
-Postcript est une marque enregistre'e d'Adobe Systems Inc. 
- 
-LA DOCUMENTATION EST FOURNIE "EN L'ETAT" ET TOUTES AUTRES CONDITIONS,
-DECLARATIONS ET GARANTIES EXPRESSES OU TACITES SONT FORMELLEMENT EXCLUES,
-DANS LA MESURE AUTORISEE PAR LA LOI APPLICABLE, Y COMPRIS NOTAMMENT
-TOUTE GARANTIE IMPLICITE RELATIVE A LA QUALITE MARCHANDE, A L'APTITUDE
-A UNE UTILISATION PARTICULIERE OU A L'ABSENCE DE CONTREFACON.
--->
-
-<!--
-
-   This is the DTD defining the JavaServer Pages 1.1 Tag Library
-   descriptor (.tld) (XML) file format/syntax.
-
-   A Tag Library is a JAR file containing a valid instance of a Tag Library
-   Descriptor (taglib.tld) file in the META-INF subdirectory, along with the
-   appropriate implementing classes, and other resources required to
-   implement the tags defined therein.
-
-  -->
-
-<!--
-The taglib tag is the document root, it defines:
-
-tlibversion	the version of the tag library implementation
-jspversion	the version of JSP the tag library depends upon
-
-shortname	a simple default short name that could be used by
-		a JSP authoring tool to create names with a mnemonic
-		value; for example, the it may be used as the prefered
-		prefix value in taglib directives
-uri		a uri uniquely identifying this taglib
-info		a simple string describing the "use" of this taglib,
-		should be user discernable
--->
-
-<!ELEMENT taglib (tlibversion, jspversion?, shortname, uri?, info?, tag+) >
-<!ATTLIST taglib id ID #IMPLIED
-	  xmlns CDATA #FIXED
-		"http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"
->
-
-<!--
-Describes this version (number) of the taglibrary (dewey decimal)
-
-#PCDATA ::= [0-9]*{ "."[0-9] }0..3
--->
-
-<!ELEMENT tlibversion (#PCDATA) >
-
-<!--
-Describes the JSP version (number) this taglibrary requires in
-order to function (dewey decimal)
-
-The default is 1.1
-
-#PCDATA ::= [0-9]*{ "."[0-9] }0..3
--->
-
-<!ELEMENT jspversion  (#PCDATA) >
-
-<!--
-Defines a short (default) shortname to be used for tags and
-variable names used/created by this tag library.  Do not use
-white space, and do not start with digits or underscore.
-
-#PCDATA ::= NMTOKEN
--->
-
-<!ELEMENT shortname      (#PCDATA) >
-
-<!--
-Defines a public URI that uniquely identifies this version of
-the taglibrary Leave it empty if it does not apply.
--->
-
-<!ELEMENT uri	 (#PCDATA) >
-
-<!--
-Defines an arbitrary text string descirbing the tag library
--->
-
-<!ELEMENT info	(#PCDATA) >
-
-<!--
-The tag defines a unique tag in this tag library, defining:
-
-- the unique tag/element name
-- the subclass of javax.servlet.jsp.tagext.Tag implementation class
-- an optional subclass of javax.servlet.jsp.tagext.TagExtraInfo
-- the body content type (hint)
-- optional tag-specific information
-- any attributes
--->
-
-<!ELEMENT tag (name, tagclass, teiclass?, bodycontent?, info?, attribute*) >
-
-<!--
-Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
-the request time semantics for this tag. (required)
-
-#PCDATA ::= fully qualified Java class name
--->
-
-<!ELEMENT tagclass (#PCDATA) >
-
-<!--
-Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo for
-this tag. (optional)
-
-If this is not given, the class is not consulted at translation time.
-
-#PCDATA ::= fully qualified Java class name
--->
-
-<!ELEMENT teiclass (#PCDATA) >
-
-<!--
-Provides a hint as to the content of the body of this tag. Primarily
-intended for use by page composition tools.
-
-There are currently three values specified:
-
-tagdependent	The body of the tag is interpreted by the tag
-		implementation itself, and is most likely in a
-		different "langage", e.g embedded SQL statements.
-
-JSP		The body of the tag contains nested JSP syntax
-
-empty		The body must be empty
-
-The default (if not defined) is JSP
-
-#PCDATA ::=  tagdependent | JSP | empty
-
--->
-
-<!ELEMENT bodycontent (#PCDATA) >
-
-<!--
-The attribute tag defines an attribute for the nesting tag
-
-An attribute definition is composed of:
-
-- the attributes name (required)
-- if the attribute is required or optional (optional)
-- if the attributes value may be dynamically calculated at runtime
-  by a scriptlet expression (optional)
-
--->
-
-<!ELEMENT attribute (name, required? , rtexprvalue?) >
-
-<!--
-Defines the canonical name of a tag or attribute being defined
-
-#PCDATA ::= NMTOKEN
--->
-
-<!ELEMENT name	(#PCDATA) >
-
-<!--
-Defines if the nesting attribute is required or optional.
-
-#PCDATA ::= true | false | yes | no
-
-If not present then the default is "false", i.e the attribute
-is optional.
--->
-
-<!ELEMENT required    (#PCDATA) >
-
-<!--
-Defines if the nesting attribute can have scriptlet expressions as
-a value, i.e the value of the attribute may be dynamically calculated
-at request time, as opposed to a static value determined at translation
-time.
-
-#PCDATA ::= true | false | yes | no
-
-If not present then the default is "false", i.e the attribute
-has a static value
--->
-
-<!ELEMENT rtexprvalue (#PCDATA) >
-
-<!ATTLIST tlibversion id ID #IMPLIED>
-<!ATTLIST jspversion id ID #IMPLIED>
-<!ATTLIST shortname id ID #IMPLIED>
-<!ATTLIST uri id ID #IMPLIED>
-<!ATTLIST info id ID #IMPLIED>
-<!ATTLIST tag id ID #IMPLIED>
-<!ATTLIST tagclass id ID #IMPLIED>
-<!ATTLIST teiclass id ID #IMPLIED>
-<!ATTLIST bodycontent id ID #IMPLIED>
-<!ATTLIST attribute id ID #IMPLIED>
-<!ATTLIST name id ID #IMPLIED>
-<!ATTLIST required id ID #IMPLIED>
-<!ATTLIST rtexprvalue id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_1_2.dtd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_1_2.dtd
deleted file mode 100644
index 602eb5c..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_1_2.dtd
+++ /dev/null
@@ -1,468 +0,0 @@
-
-<!--
-   Copyright 2002 Sun Microsystems, Inc.  All rights reserved.
-   Use is subject to license terms.
-  -->
-
-<!--
-
-   This is the DTD defining the JavaServer Pages 1.2 Tag Library
-   descriptor (.tld) (XML) file format/syntax.
-
-   A Tag Library is a JAR file containing a valid instance of a Tag Library
-   Descriptor (taglib.tld) file in the META-INF subdirectory, along with the
-   appropriate implementing classes, and other resources required to
-   implement the tags defined therein.
-
-   Use is subject to license terms.
-  -->
-  
-<!NOTATION WEB-JSPTAGLIB.1_2 PUBLIC
-          "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN">
-
-<!--
-This is the XML DTD for the JSP 1.2 Tag Library Descriptor.
-All JSP 1.2 tag library descriptors must include a DOCTYPE
-of the following form:
-
-  <!DOCTYPE taglib
-        PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-	"http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd">
-
--->
-
-<!--
-The taglib tag is the document root, it defines:
-
-tlib-version	the version of the tag library implementation
-
-jsp-version	the version of JSP the tag library depends upon
-
-short-name	a simple default short name that could be used by
-		a JSP authoring tool to create names with a mnemonic
-		value; for example, the it may be used as the prefered
-		prefix value in taglib directives
-
-uri		a uri uniquely identifying this taglib
-
-display-name    the display-name element contains a short name that
-                is intended to be displayed by tools
-small-icon      optional small-icon that can be used by tools
-
-large-icon      optional large-icon that can be used by tools
-
-description	a simple string describing the "use" of this taglib,
-		should be user discernable
-
-validator       optional TagLibraryValidator information
-
-listener        optional event listener specification
-
-
--->
-
-<!ELEMENT taglib (tlib-version, jsp-version, short-name, uri?,
-                  display-name?, small-icon?, large-icon?, description?,
-                  validator?, listener*, tag+) >
-
-<!ATTLIST taglib id ID #IMPLIED
-	  xmlns CDATA #FIXED
-		"http://java.sun.com/JSP/TagLibraryDescriptor"
->
-
-<!--
-Describes this version (number) of the taglibrary (dewey decimal)
-
-#PCDATA ::= [0-9]*{ "."[0-9] }0..3
--->
-
-<!ELEMENT tlib-version (#PCDATA) >
-
-<!--
-Describes the JSP version (number) this taglibrary requires in
-order to function (dewey decimal)
-
-The default is 1.2
-
-#PCDATA ::= [0-9]*{ "."[0-9] }0..3
--->
-
-<!ELEMENT jsp-version  (#PCDATA) >
-
-<!--
-Defines a short (default) short-name to be used for tags and
-variable names used/created by this tag library.  Do not use
-white space, and do not start with digits or underscore.
-
-#PCDATA ::= NMTOKEN
--->
-
-<!ELEMENT short-name      (#PCDATA) >
-
-<!--
-Defines a public URI that uniquely identifies this version of
-the taglibrary.  Leave it empty if it does not apply.
--->
-
-<!ELEMENT uri	 (#PCDATA) >
-
-<!--
-Defines an arbitrary text string descirbing the tag library
--->
-
-<!ELEMENT description	(#PCDATA) >
-
-<!--
-
-Defines an optional validator that can be used to
-validate the conformance of a JSP page to using this tag library.
--->
-
-<!ELEMENT validator (validator-class, init-param*, description?) >
-
-
-<!--
-
-Defines the TagLibraryValidator class that can be used to
-validate the conformance of a JSP page to using this tag library.
--->
-
-<!ELEMENT validator-class (#PCDATA) >
-
-
-<!--
-
-The init-param element contains a name/value pair as an
-initialization param
--->
-
-<!ELEMENT init-param (param-name, param-value, description?)>
-
-<!--
-
-The param-name element contains the name of a parameter.
--->
-
-<!ELEMENT param-name (#PCDATA)>
-
-<!--
-
-The param-value element contains the value of a parameter.
--->
-
-<!ELEMENT param-value (#PCDATA)>
-
-
-<!--
-
-Defines an optional event listener object to be instantiated and
-registered automatically.
--->
-
-<!ELEMENT listener (listener-class) >
-
-<!--
-
-The listener-class element declares a class in the application that
-must be registered as a web application listener bean.  See the
-Servlet 2.3 specification for details.
--->
-
-<!ELEMENT listener-class (#PCDATA) >
-
-
-<!--
-The tag defines a unique tag in this tag library.  It has one
-attribute, id.
-
-The tag element may have several subelements defining:
-
-name              The unique action name
-
-tag-class         The tag handler class implementing
-                  javax.servlet.jsp.tagext.Tag
-
-tei-class         An optional subclass of
-                  javax.servlet.jsp.tagext.TagExtraInfo
-
-body-content      The body content type
-
-display-name      A short name that is intended to be displayed
-                  by tools
-
-small-icon        Optional small-icon that can be used by tools
-
-large-icon        Optional large-icon that can be used by tools
-
-description       Optional tag-specific information
-
-variable          Optional scripting variable information
-
-attribute         All attributes of this action
-
-example           Optional informal description of an example of a
-                  use of this tag
-
--->
-
-<!ELEMENT tag (name, tag-class, tei-class?, body-content?, display-name?,
-               small-icon?, large-icon?, description?, variable*, attribute*,
-               example?) >
-
-<!--
-Defines the subclass of javax.serlvet.jsp.tagext.Tag that implements
-the request time semantics for this tag. (required)
-
-#PCDATA ::= fully qualified Java class name
--->
-
-<!ELEMENT tag-class (#PCDATA) >
-
-<!--
-Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo for
-this tag. (optional)
-
-If this is not given, the class is not consulted at translation time.
-
-#PCDATA ::= fully qualified Java class name
--->
-
-<!ELEMENT tei-class (#PCDATA) >
-
-<!--
-Provides a hint as to the content of the body of this tag. Primarily
-intended for use by page composition tools.
-
-There are currently three values specified:
-
-tagdependent	The body of the tag is interpreted by the tag
-		implementation itself, and is most likely in a
-		different "langage", e.g embedded SQL statements.
-
-JSP		The body of the tag contains nested JSP syntax
-
-empty		The body must be empty
-
-The default (if not defined) is JSP
-
-#PCDATA ::=  tagdependent | JSP | empty
-
--->
-
-<!ELEMENT body-content (#PCDATA) >
-
-<!--
-
-The display-name element contains a short name that is intended
-to be displayed by tools.
--->
-
-<!ELEMENT display-name (#PCDATA) >
-
-
-<!--
-
-The large-icon element contains the name of a file containing a large
-(32 x 32) icon image.  The file name is a relative path within the
-tag library.  The image must be either in the JPEG or GIF format, and
-the file name must end with the suffix ".jpg" or ".gif" respectively.
-The icon can be used by tools.
--->
-
-<!ELEMENT large-icon (#PCDATA) >
-
-<!--
-
-The small-icon element contains the name of a file containing a large
-(32 x 32) icon image.  The file name is a relative path within the
-tag library.  The image must be either in the JPEG or GIF format, and
-the file name must end with the suffix ".jpg" or ".gif" respectively.
-The icon can be used by tools.
--->
-
-<!ELEMENT small-icon (#PCDATA) >
-
-<!--
-
-The example element contains an informal description of an example
-of the use of a tag.
--->
-
-<!ELEMENT example (#PCDATA) >
-
-<!--
-
-The variable tag provides information on the scripting variables
-defined by this tag.  It is a (translation time) error for a tag
-that has one or more variable subelements to have a TagExtraInfo
-class that returns a non-null object.
-
-The subelements of variable are of the form:
-
-name-given               The variable name as a constant
-
-name-from-attribute      The name of an attribute whose (translation
-                         time) value will give the name of the
-                         variable.  One of name-given or
-                         name-from-attribute is required.
-
-variable-class           Name of the class of the variable.
-                         java.lang.String is default.
-
-declare                  Whether the variable is declared or not.
-                         True is the default.
-
-scope                    The scope of the scripting varaible
-                         defined.  NESTED is default.
-
-description              Optional description of this variable
-
--->
-
-<!ELEMENT variable ( (name-given | name-from-attribute), variable-class?,
-                    declare?, scope?, description?) >
-
-<!--
-
-The name for the scripting variable.  One of name-given or
-name-from-attribute is required.
--->
-
-<!ELEMENT name-given (#PCDATA) >
-
-<!--
-
-The name of an attribute whose (translation-time) value will give
-the name of the variable.  One of name-given or name-from-attribute
-is required.
--->
-
-<!ELEMENT name-from-attribute (#PCDATA) >
-
-<!--
-
-The optional name of the class for the scripting variable.  The
-default is java.lang.String.
--->
-
-<!ELEMENT variable-class (#PCDATA) >
-
-<!--
-
-Whether the scripting variable is to be defined or not.  See
-TagExtraInfo for details.  This element is optional and "true"
-is the default.
--->
-
-<!ELEMENT declare (#PCDATA) >
-
-<!--
-
-The scope of the scripting variable.  See TagExtraInfo for details.
-The element is optional and "NESTED" is the default.  Other legal
-values are "AT_BEGIN" and "AT_END".
--->
-
-<!ELEMENT scope (#PCDATA) >
-
-<!--
-
-The attribute tag defines an attribute for the nesting tag
-
-An attribute definition is composed of:
-	
-- the attributes name (required)
-- if the attribute is required or optional (optional)
-- if the attributes value may be dynamically calculated at runtime
-  by a scriptlet expression (optional)
-- the type of the attributes value (optional)
-- an informal description of the meaning of the attribute (optional)
-
--->
-
-
-<!--
-The attribute tag defines an attribute for the nesting tag
-
-An attribute definition is composed of:
-
-- the attributes name (required)
-
-- if the attribute is required or optional (optional)
-
-- if the attributes value may be dynamically calculated at runtime
-  by a scriptlet expression (optional)
-
-- the type of the attributes value (optional)
-
-- an informal description of the meaning of the attribute (optional)
--->
-
-<!ELEMENT attribute (name, required? , rtexprvalue?, type?, description?) >
-
-<!--
-Defines the canonical name of a tag or attribute being defined
-
-#PCDATA ::= NMTOKEN
--->
-
-<!ELEMENT name	(#PCDATA) >
-
-<!--
-Defines if the nesting attribute is required or optional.
-
-#PCDATA ::= true | false | yes | no
-
-If not present then the default is "false", i.e the attribute
-is optional.
--->
-
-<!ELEMENT required    (#PCDATA) >
-
-<!--
-Defines if the nesting attribute can have scriptlet expressions as
-a value, i.e the value of the attribute may be dynamically calculated
-at request time, as opposed to a static value determined at translation
-time.
-
-#PCDATA ::= true | false | yes | no
-
-If not present then the default is "false", i.e the attribute
-has a static value
--->
-
-<!ELEMENT rtexprvalue (#PCDATA) >
-
-
-<!--
-
-Defines the Java type of the attributes value.  For static values
-(those determined at translation time) the type is always
-java.lang.String.
--->
-
-<!ELEMENT type (#PCDATA) >
-
-
-<!-- ID attributes -->
-
-<!ATTLIST tlib-version id ID #IMPLIED>
-<!ATTLIST jsp-version id ID #IMPLIED>
-<!ATTLIST short-name id ID #IMPLIED>
-<!ATTLIST uri id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST example id ID #IMPLIED>
-<!ATTLIST tag id ID #IMPLIED>
-<!ATTLIST tag-class id ID #IMPLIED>
-<!ATTLIST tei-class id ID #IMPLIED>
-<!ATTLIST body-content id ID #IMPLIED>
-<!ATTLIST attribute id ID #IMPLIED>
-<!ATTLIST name id ID #IMPLIED>
-<!ATTLIST required id ID #IMPLIED>
-<!ATTLIST rtexprvalue id ID #IMPLIED>
-
-
-<!ATTLIST param-name id ID #IMPLIED>
-<!ATTLIST param-value id ID #IMPLIED>
-<!ATTLIST listener id ID #IMPLIED>
-<!ATTLIST listener-class id ID #IMPLIED>
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_2_0.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_2_0.xsd
deleted file mode 100644
index eb58641..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_2_0.xsd
+++ /dev/null
@@ -1,1010 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/j2ee"
-     xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     xmlns:xml="http://www.w3.org/XML/1998/namespace"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="2.0">
-
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)web-jsptaglibrary_2_0.xsds	1.36 08/18/03
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
-      Road, Palo Alto, California 94303, U.S.A. All rights
-      reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the JSP Taglibrary
-	descriptor.  All Taglibrary descriptors must
-	indicate the tag library schema by using the Taglibrary
-	namespace:
-
-	http://java.sun.com/xml/ns/j2ee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="..."
-	      version="2.0">
-	      ...
-	    </taglib>
-
-	The instance documents may indicate the published
-	version of the schema using xsi:schemaLocation attribute
-	for J2EE namespace with the following location:
-
-	http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
-  <xsd:element name="taglib" type="j2ee:tldTaglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglib tag is the document root.
-	The definition of taglib is provided
-	by the tldTaglibType.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:unique name="tag-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The taglib element contains, among other things, tag and
-	  tag-file elements.
-	  The name subelements of these elements must each be unique.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:tag|j2ee:tag-file"/>
-      <xsd:field    xpath="j2ee:name"/>
-    </xsd:unique>
-
-    <xsd:unique name="function-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The taglib element contains function elements.
-	  The name subelements of these elements must each be unique.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="j2ee:function"/>
-      <xsd:field    xpath="j2ee:name"/>
-    </xsd:unique>
-
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="body-contentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Specifies the type of body that is valid for a tag.
-	This value is used by the JSP container to validate
-	that a tag invocation has the correct body syntax and
-	by page composition tools to assist the page author
-	in providing a valid tag body.
-
-	There are currently four values specified:
-
-	tagdependent    The body of the tag is interpreted by the tag
-			implementation itself, and is most likely
-			in a different "language", e.g embedded SQL
-			statements.
-
-	JSP             The body of the tag contains nested JSP
-			syntax.
-
-	empty           The body must be empty
-
-	scriptless      The body accepts only template text, EL
-			Expressions, and JSP action elements.  No
-			scripting elements are allowed.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="tagdependent"/>
-	<xsd:enumeration value="JSP"/>
-	<xsd:enumeration value="empty"/>
-	<xsd:enumeration value="scriptless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="extensibleType" abstract="true">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The extensibleType is an abstract base type that is used to
-	define the type of extension-elements. Instance documents
-	must substitute a known type to define the extension by
-	using xsi:type attribute to define the actual type of
-	extension-elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="functionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The function element is used to provide information on each
-	function in the tag library that is to be exposed to the EL.
-
-	The function element may have several subelements defining:
-
-	description         Optional tag-specific information
-
-	display-name        A short name that is intended to be
-			    displayed by tools
-
-	icon                Optional icon element that can be used
-			    by tools
-
-	name                A unique name for this function
-
-	function-class      Provides the name of the Java class that
-			    implements the function
-
-	function-signature  Provides the signature, as in the Java
-			    Language Specification, of the Java
-			    method that is to be used to implement
-			    the function.
-
-	example             Optional informal description of an
-			    example of a use of this function
-
-	function-extension  Zero or more extensions that provide extra
-			    information about this function, for tool
-			    consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="name"
-		   type="j2ee:tld-canonical-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    A unique name for this function.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="function-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Provides the fully-qualified class name of the Java
-	    class containing the static method that implements
-	    the function.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="function-signature"
-		   type="j2ee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Provides the signature, of the static Java method that is
-	    to be used to implement the function.  The syntax of the
-	    function-signature element is as follows:
-
-		FunctionSignature ::= ReturnType S MethodName S?
-				      '(' S? Parameters? S? ')'
-
-                ReturnType        ::= Type
-
-		MethodName        ::= Identifier
-
-		Parameters        ::=   Parameter
-				      | ( Parameter S? ',' S? Parameters )
-
-                Parameter         ::= Type
-
-		Where:
-
- 		    * Type is a basic type or a fully qualified Java class name
-		      (including package name), as per the 'Type' production
-		      in the Java Language Specification, Second Edition,
-		      Chapter 18.
-
-                    * Identifier is a Java identifier, as per the 'Identifier'
-		      production in the Java Language Specification, Second
-		      Edition, Chapter 18.
-
-	    Example:
-
-	    java.lang.String nickName( java.lang.String, int )
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="example"
-		   type="j2ee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The example element contains an informal description
-	    of an example of the use of this function.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="function-extension"
-		   type="j2ee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Function extensions are for tool use only and must not affect
-	    the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tagFileType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Defines an action in this tag library that is implemented
-	as a .tag file.
-
-	The tag-file element has two required subelements:
-
-	description       Optional tag-specific information
-
-	display-name      A short name that is intended to be
-			  displayed by tools
-
-	icon              Optional icon element that can be used
-			  by tools
-
-	name              The unique action name
-
-	path              Where to find the .tag file implementing this
-			  action, relative to the root of the web
-			  application or the root of the JAR file for a
-			  tag library packaged in a JAR.  This must
-			  begin with /WEB-INF/tags if the .tag file
-			  resides in the WAR, or /META-INF/tags if the
-			  .tag file resides in a JAR.
-
-	example           Optional informal description of an
-			  example of a use of this tag
-
-	tag-extension     Zero or more extensions that provide extra
-			  information about this tag, for tool
-			  consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="name"
-		   type="j2ee:tld-canonical-nameType"/>
-      <xsd:element name="path"
-		   type="j2ee:pathType"/>
-      <xsd:element name="example"
-		   type="j2ee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The example element contains an informal description
-	    of an example of the use of a tag.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="tag-extension"
-		   type="j2ee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Tag extensions are for tool use only and must not affect
-	    the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tagType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The tag defines a unique tag in this tag library.  It has one
-	attribute, id.
-
-	The tag element may have several subelements defining:
-
-	description       Optional tag-specific information
-
-	display-name      A short name that is intended to be
-			  displayed by tools
-
-	icon              Optional icon element that can be used
-			  by tools
-
-	name              The unique action name
-
-	tag-class         The tag handler class implementing
-			  javax.servlet.jsp.tagext.JspTag
-
-	tei-class         An optional subclass of
-			  javax.servlet.jsp.tagext.TagExtraInfo
-
-	body-content      The body content type
-
-	variable          Optional scripting variable information
-
-	attribute         All attributes of this action that are
-			  evaluated prior to invocation.
-
-	dynamic-attributes Whether this tag supports additional
-			   attributes with dynamic names.  If
-			   true, the tag-class must implement the
-			   javax.servlet.jsp.tagext.DynamicAttributes
-			   interface.  Defaults to false.
-
-	example           Optional informal description of an
-			  example of a use of this tag
-
-	tag-extension     Zero or more extensions that provide extra
-			  information about this tag, for tool
-			  consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="name"
-		   type="j2ee:tld-canonical-nameType"/>
-      <xsd:element name="tag-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the subclass of javax.serlvet.jsp.tagext.JspTag
-	    that implements the request time semantics for
-	    this tag. (required)
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="tei-class"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo
-	    for this tag. (optional)
-
-	    If this is not given, the class is not consulted at
-	    translation time.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="body-content"
-		   type="j2ee:body-contentType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Specifies the format for the body of this tag.
-	    The default in JSP 1.2 was "JSP" but because this
-	    is an invalid setting for simple tag handlers, there
-	    is no longer a default in JSP 2.0.  A reasonable
-	    default for simple tag handlers is "scriptless" if
-	    the tag can have a body.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="variable"
-		   type="j2ee:variableType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attribute"
-		   type="j2ee:tld-attributeType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="dynamic-attributes"
-		   type="j2ee:generic-booleanType"
-		   minOccurs="0"/>
-      <xsd:element name="example"
-		   type="j2ee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The example element contains an informal description
-	    of an example of the use of a tag.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="tag-extension"
-		   type="j2ee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Tag extensions are for tool use only and must not affect
-	    the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The attribute element defines an attribute for the nesting
-	tag.  The attributre element may have several subelements
-	defining:
-
-	description     a description of the attribute
-
-	name            the name of the attribute
-
-	required        whether the attribute is required or
-			optional
-
-	rtexprvalue     whether the attribute is a runtime attribute
-
-	type            the type of the attributes
-
-	fragment        whether this attribute is a fragment
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="name"
-		   type="j2ee:java-identifierType"/>
-      <xsd:element name="required"
-		   type="j2ee:generic-booleanType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines if the nesting attribute is required or
-	    optional.
-
-	    If not present then the default is "false", i.e
-	    the attribute is optional.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-
-      <xsd:choice>
-	<xsd:sequence>
-	  <xsd:element name="rtexprvalue"
-		       type="j2ee:generic-booleanType"
-		       minOccurs="0">
-	    <xsd:annotation>
-	      <xsd:documentation>
-
-		Defines if the nesting attribute can have scriptlet
-		expressions as a value, i.e the value of the
-		attribute may be dynamically calculated at request
-		time, as opposed to a static value determined at
-		translation time.
-
-		If not present then the default is "false", i.e the
-		attribute has a static value
-
-	      </xsd:documentation>
-	    </xsd:annotation>
-
-	  </xsd:element>
-	  <xsd:element name="type"
-		       type="j2ee:fully-qualified-classType"
-		       minOccurs="0">
-	    <xsd:annotation>
-	      <xsd:documentation>
-
-		Defines the Java type of the attributes value.  For
-		static values (those determined at translation time)
-		the type is always java.lang.String.
-
-	      </xsd:documentation>
-	    </xsd:annotation>
-	  </xsd:element>
-	</xsd:sequence>
-	<xsd:element name="fragment"
-		     type="j2ee:generic-booleanType"
-		     minOccurs="0">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      "true" if this attribute is of type
-	      javax.jsp.tagext.JspFragment, representing dynamic
-	      content that can be re-evaluated as many times
-	      as needed by the tag handler.  If omitted or "false",
-	      the default is still type="java.lang.String"
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-canonical-nameType">
-
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Defines the canonical name of a tag or attribute being
-	defined.
-
-	The name must conform to the lexical rules for an NMTOKEN.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:xsdNMTOKENType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-extensionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The tld-extensionType is used to indicate
-	extensions to a specific TLD element.
-
-	It is used by elements to designate an extension block
-	that is targeted to a specific extension designated by
-	a set of extension elements that are declared by a
-	namespace. The namespace identifies the extension to
-	the tool that processes the extension.
-
-	The type of the extension-element is abstract. Therefore,
-	a concrete type must be specified by the TLD using
-	xsi:type attribute for each extension-element.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="extension-element"
-		   type="j2ee:extensibleType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="namespace"
-		   use="required"
-		   type="xsd:anyURI"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tldTaglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglib tag is the document root, it defines:
-
-	description     a simple string describing the "use" of this taglib,
-			should be user discernable
-
-	display-name    the display-name element contains a
-			short name that is intended to be displayed
-			by tools
-
-	icon            optional icon that can be used by tools
-
-	tlib-version    the version of the tag library implementation
-
-	short-name      a simple default short name that could be
-			used by a JSP authoring tool to create
-			names with a mnemonic value; for example,
-			the it may be used as the prefered prefix
-			value in taglib directives
-
-	uri             a uri uniquely identifying this taglib
-
-	validator       optional TagLibraryValidator information
-
-	listener        optional event listener specification
-
-	tag             tags in this tag library
-
-	tag-file        tag files in this tag library
-
-	function        zero or more EL functions defined in this
-			tag library
-
-	taglib-extension zero or more extensions that provide extra
-			information about this taglib, for tool
-			consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="j2ee:descriptionGroup"/>
-      <xsd:element name="tlib-version"
-		   type="j2ee:dewey-versionType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Describes this version (number) of the taglibrary.
-	    It is described as a dewey decimal.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-
-      <xsd:element name="short-name"
-		   type="j2ee:tld-canonical-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a simple default name that could be used by
-	    a JSP authoring tool to create names with a
-	    mnemonicvalue; for example, it may be used as the
-	    preferred prefix value in taglib directives.  Do
-	    not use white space, and do not start with digits
-	    or underscore.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="uri"
-		   type="j2ee:xsdAnyURIType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a public URI that uniquely identifies this
-	    version of the taglibrary.  Leave it empty if it
-	    does not apply.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="validator"
-		   type="j2ee:validatorType"
-		   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="listener"
-		   type="j2ee:listenerType"
-		   minOccurs="0" maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="tag"
-		   type="j2ee:tagType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="tag-file"
-		   type="j2ee:tagFileType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="function"
-		   type="j2ee:functionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="taglib-extension"
-		   type="j2ee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Taglib extensions are for tool use only and must not affect
-	    the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="j2ee:dewey-versionType"
-		   fixed="2.0"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  Describes the JSP version (number) this taglibrary
-	  requires in order to function (dewey decimal)
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="validatorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	A validator that can be used to validate
-	the conformance of a JSP page to using this tag library is
-	defined by a validatorType.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="validator-class"
-		   type="j2ee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the TagLibraryValidator class that can be used
-	    to validate the conformance of a JSP page to using this
-	    tag library.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="j2ee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-param element contains a name/value pair as an
-	    initialization param.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="variable-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines scope of the scripting variable.  See
-	TagExtraInfo for details.  The allowed values are,
-	"NESTED", "AT_BEGIN" and "AT_END".
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="j2ee:string">
-	<xsd:enumeration value="NESTED"/>
-	<xsd:enumeration value="AT_BEGIN"/>
-	<xsd:enumeration value="AT_END"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="variableType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The variableType provides information on the scripting
-	variables defined by using this tag.  It is a (translation
-	time) error for a tag that has one or more variable
-	subelements to have a TagExtraInfo class that returns a
-	non-null value from a call to getVariableInfo().
-
-	The subelements of variableType are of the form:
-
-	description              Optional description of this
-				 variable
-
-	name-given               The variable name as a constant
-
-	name-from-attribute      The name of an attribute whose
-				 (translation time) value will
-				 give the name of the
-				 variable.  One of name-given or
-				 name-from-attribute is required.
-
-	variable-class           Name of the class of the variable.
-				 java.lang.String is default.
-
-	declare                  Whether the variable is declared
-				 or not.  True is the default.
-
-	scope                    The scope of the scripting varaible
-				 defined.  NESTED is default.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="j2ee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="name-given"
-		     type="j2ee:java-identifierType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The name for the scripting variable.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-
-	<xsd:element name="name-from-attribute"
-		     type="j2ee:java-identifierType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The name of an attribute whose
-	      (translation-time) value will give the name of
-	      the variable.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-      <xsd:element name="variable-class"
-		   type="j2ee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The optional name of the class for the scripting
-	    variable.  The default is java.lang.String.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-
-      <xsd:element name="declare"
-		   type="j2ee:generic-booleanType"
-		   minOccurs="0">
-
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Whether the scripting variable is to be defined
-	    or not.  See TagExtraInfo for details.  This
-	    element is optional and "true" is the default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="scope"
-		   type="j2ee:variable-scopeType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element is optional and "NESTED" is the default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_2_1.xsd b/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_2_1.xsd
deleted file mode 100644
index bea8e9b..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/dtdsAndSchemas/web-jsptaglibrary_2_1.xsd
+++ /dev/null
@@ -1,1144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xsd:schema
-     targetNamespace="http://java.sun.com/xml/ns/javaee"
-     xmlns:javaee="http://java.sun.com/xml/ns/javaee"
-     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-     elementFormDefault="qualified"
-     attributeFormDefault="unqualified"
-     version="2.1">
-
-  <xsd:annotation>
-    <xsd:documentation>
-      @(#)web-jsptaglibrary_2_1.xsds	1.1
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-
-      Copyright 2003-2005 Sun Microsystems, Inc.
-      4150 Network Circle
-      Santa Clara, California 95054
-      U.S.A
-      All rights reserved.
-
-      Sun Microsystems, Inc. has intellectual property rights
-      relating to technology described in this document. In
-      particular, and without limitation, these intellectual
-      property rights may include one or more of the U.S. patents
-      listed at http://www.sun.com/patents and one or more
-      additional patents or pending patent applications in the
-      U.S. and other countries.
-
-      This document and the technology which it describes are
-      distributed under licenses restricting their use, copying,
-      distribution, and decompilation. No part of this document
-      may be reproduced in any form by any means without prior
-      written authorization of Sun and its licensors, if any.
-
-      Third-party software, including font technology, is
-      copyrighted and licensed from Sun suppliers.
-
-      Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
-      JavaServer Pages, Enterprise JavaBeans and the Java Coffee
-      Cup logo are trademarks or registered trademarks of Sun
-      Microsystems, Inc. in the U.S. and other countries.
-
-      Federal Acquisitions: Commercial Software - Government Users
-      Subject to Standard License Terms and Conditions.
-
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:annotation>
-    <xsd:documentation>
-      <![CDATA[
-
-	This is the XML Schema for the JSP Taglibrary
-	descriptor.  All Taglibrary descriptors must
-	indicate the tag library schema by using the Taglibrary
-	namespace:
-
-	http://java.sun.com/xml/ns/javaee
-
-	and by indicating the version of the schema by
-	using the version element as shown below:
-
-	    <taglib xmlns="http://java.sun.com/xml/ns/javaee"
-	      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	      xsi:schemaLocation="..."
-	      version="2.1">
-	      ...
-	    </taglib>
-
-	The instance documents may indicate the published
-	version of the schema using xsi:schemaLocation attribute
-	for Java EE namespace with the following location:
-
-	http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd
-
-	]]>
-    </xsd:documentation>
-  </xsd:annotation>
-
-  <xsd:include schemaLocation="javaee_5.xsd"/>
-
-
-<!-- **************************************************** -->
-
-  <xsd:element name="taglib" type="javaee:tldTaglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglib tag is the document root.
-	The definition of taglib is provided
-	by the tldTaglibType.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:unique name="tag-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The taglib element contains, among other things, tag and
-	  tag-file elements.
-	  The name subelements of these elements must each be unique.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:tag|javaee:tag-file"/>
-      <xsd:field    xpath="javaee:name"/>
-    </xsd:unique>
-
-    <xsd:unique name="function-name-uniqueness">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  The taglib element contains function elements.
-	  The name subelements of these elements must each be unique.
-
-	</xsd:documentation>
-      </xsd:annotation>
-      <xsd:selector xpath="javaee:function"/>
-      <xsd:field    xpath="javaee:name"/>
-    </xsd:unique>
-
-  </xsd:element>
-
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="body-contentType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Specifies the type of body that is valid for a tag.
-	This value is used by the JSP container to validate
-	that a tag invocation has the correct body syntax and
-	by page composition tools to assist the page author
-	in providing a valid tag body.
-
-	There are currently four values specified:
-
-	tagdependent    The body of the tag is interpreted by the tag
-			implementation itself, and is most likely
-			in a different "language", e.g embedded SQL
-			statements.
-
-	JSP             The body of the tag contains nested JSP
-			syntax.
-
-	empty           The body must be empty
-
-	scriptless      The body accepts only template text, EL
-			Expressions, and JSP action elements.  No
-			scripting elements are allowed.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="tagdependent"/>
-	<xsd:enumeration value="JSP"/>
-	<xsd:enumeration value="empty"/>
-	<xsd:enumeration value="scriptless"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="extensibleType" abstract="true">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The extensibleType is an abstract base type that is used to
-	define the type of extension-elements. Instance documents
-	must substitute a known type to define the extension by
-	using xsi:type attribute to define the actual type of
-	extension-elements.
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="functionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The function element is used to provide information on each
-	function in the tag library that is to be exposed to the EL.
-
-	The function element may have several subelements defining:
-
-	description         Optional tag-specific information
-
-	display-name        A short name that is intended to be
-			    displayed by tools
-
-	icon                Optional icon element that can be used
-			    by tools
-
-	name                A unique name for this function
-
-	function-class      Provides the name of the Java class that
-			    implements the function
-
-	function-signature  Provides the signature, as in the Java
-			    Language Specification, of the Java
-			    method that is to be used to implement
-			    the function.
-
-	example             Optional informal description of an
-			    example of a use of this function
-
-	function-extension  Zero or more extensions that provide extra
-			    information about this function, for tool
-			    consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="name"
-		   type="javaee:tld-canonical-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    A unique name for this function.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="function-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Provides the fully-qualified class name of the Java
-	    class containing the static method that implements
-	    the function.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="function-signature"
-		   type="javaee:string">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Provides the signature, of the static Java method that is
-	    to be used to implement the function.  The syntax of the
-	    function-signature element is as follows:
-
-		FunctionSignature ::= ReturnType S MethodName S?
-				      '(' S? Parameters? S? ')'
-
-                ReturnType        ::= Type
-
-		MethodName        ::= Identifier
-
-		Parameters        ::=   Parameter
-				      | ( Parameter S? ',' S? Parameters )
-
-                Parameter         ::= Type
-
-		Where:
-
- 		    * Type is a basic type or a fully qualified
-		      Java class name (including package name),
-		      as per the 'Type' production in the Java
-		      Language Specification, Second Edition,
-		      Chapter 18.
-
-                    * Identifier is a Java identifier, as per
-		      the 'Identifier' production in the Java
-		      Language Specification, Second
-		      Edition, Chapter 18.
-
-	    Example:
-
-	    java.lang.String nickName( java.lang.String, int )
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="example"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The example element contains an informal description
-	    of an example of the use of this function.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="function-extension"
-		   type="javaee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Function extensions are for tool use only and must not
-            affect the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tagFileType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Defines an action in this tag library that is implemented
-	as a .tag file.
-
-	The tag-file element has two required subelements:
-
-	description       Optional tag-specific information
-
-	display-name      A short name that is intended to be
-			  displayed by tools
-
-	icon              Optional icon element that can be used
-			  by tools
-
-	name              The unique action name
-
-	path              Where to find the .tag file implementing this
-			  action, relative to the root of the web
-			  application or the root of the JAR file for a
-			  tag library packaged in a JAR.  This must
-			  begin with /WEB-INF/tags if the .tag file
-			  resides in the WAR, or /META-INF/tags if the
-			  .tag file resides in a JAR.
-
-	example           Optional informal description of an
-			  example of a use of this tag
-
-	tag-extension     Zero or more extensions that provide extra
-			  information about this tag, for tool
-			  consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="name"
-		   type="javaee:tld-canonical-nameType"/>
-      <xsd:element name="path"
-		   type="javaee:pathType"/>
-      <xsd:element name="example"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The example element contains an informal description
-	    of an example of the use of a tag.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="tag-extension"
-		   type="javaee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Tag extensions are for tool use only and must not affect
-	    the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tagType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The tag defines a unique tag in this tag library.  It has one
-	attribute, id.
-
-	The tag element may have several subelements defining:
-
-	description       Optional tag-specific information
-
-	display-name      A short name that is intended to be
-			  displayed by tools
-
-	icon              Optional icon element that can be used
-			  by tools
-
-	name              The unique action name
-
-	tag-class         The tag handler class implementing
-			  javax.servlet.jsp.tagext.JspTag
-
-	tei-class         An optional subclass of
-			  javax.servlet.jsp.tagext.TagExtraInfo
-
-	body-content      The body content type
-
-	variable          Optional scripting variable information
-
-	attribute         All attributes of this action that are
-			  evaluated prior to invocation.
-
-	dynamic-attributes Whether this tag supports additional
-			   attributes with dynamic names.  If
-			   true, the tag-class must implement the
-			   javax.servlet.jsp.tagext.DynamicAttributes
-			   interface.  Defaults to false.
-
-	example           Optional informal description of an
-			  example of a use of this tag
-
-	tag-extension     Zero or more extensions that provide extra
-			  information about this tag, for tool
-			  consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="name"
-		   type="javaee:tld-canonical-nameType"/>
-      <xsd:element name="tag-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the subclass of javax.serlvet.jsp.tagext.JspTag
-	    that implements the request time semantics for
-	    this tag. (required)
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="tei-class"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the subclass of javax.servlet.jsp.tagext.TagExtraInfo
-	    for this tag. (optional)
-
-	    If this is not given, the class is not consulted at
-	    translation time.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="body-content"
-		   type="javaee:body-contentType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Specifies the format for the body of this tag.
-	    The default in JSP 1.2 was "JSP" but because this
-	    is an invalid setting for simple tag handlers, there
-	    is no longer a default in JSP 2.0.  A reasonable
-	    default for simple tag handlers is "scriptless" if
-	    the tag can have a body.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="variable"
-		   type="javaee:variableType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="attribute"
-		   type="javaee:tld-attributeType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="dynamic-attributes"
-		   type="javaee:generic-booleanType"
-		   minOccurs="0"/>
-      <xsd:element name="example"
-		   type="javaee:xsdStringType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The example element contains an informal description
-	    of an example of the use of a tag.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="tag-extension"
-		   type="javaee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Tag extensions are for tool use only and must not affect
-	    the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-attributeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The attribute element defines an attribute for the nesting
-	tag.  The attribute element may have several subelements
-	defining:
-
-	description     a description of the attribute
-
-	name            the name of the attribute
-
-	required        whether the attribute is required or
-			optional
-
-	rtexprvalue     whether the attribute is a runtime attribute
-
-	type            the type of the attributes
-
-	fragment        whether this attribute is a fragment
-
-        deferred-value  present if this attribute is to be parsed as a
-                        javax.el.ValueExpression
-
-        deferred-method present if this attribute is to be parsed as a
-                        javax.el.MethodExpression
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:element name="name"
-		   type="javaee:java-identifierType"/>
-      <xsd:element name="required"
-		   type="javaee:generic-booleanType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines if the nesting attribute is required or
-	    optional.
-
-	    If not present then the default is "false", i.e
-	    the attribute is optional.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:choice>
-	<xsd:sequence>
-          <xsd:sequence minOccurs="0">
-	    <xsd:element name="rtexprvalue"
-		         type="javaee:generic-booleanType">
-	      <xsd:annotation>
-	        <xsd:documentation>
-
-		  Defines if the nesting attribute can have scriptlet
-		  expressions as a value, i.e the value of the
-		  attribute may be dynamically calculated at request
-		  time, as opposed to a static value determined at
-		  translation time.
-		  If not present then the default is "false", i.e the
-		  attribute has a static value
-
-	        </xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:element>
-	    <xsd:element name="type"
-		         type="javaee:fully-qualified-classType"
-		         minOccurs="0">
-	      <xsd:annotation>
-	        <xsd:documentation>
-
-		  Defines the Java type of the attributes value.
-                  If this element is omitted, the expected type is
-                  assumed to be "java.lang.Object".
-
-	        </xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:element>
-	  </xsd:sequence>
-
-          <xsd:choice>
-	    <xsd:element name="deferred-value"
-		         type="javaee:tld-deferred-valueType"
-		         minOccurs="0">
-	      <xsd:annotation>
-	        <xsd:documentation>
-
-                  Present if the value for this attribute is to be
-                  passed to the tag handler as a
-                  javax.el.ValueExpression. This allows for deferred
-                  evaluation of EL expressions. An optional subelement
-                  will contain the expected type that the value will
-                  be coerced to after evaluation of the expression.
-                  The type defaults to Object if one is not provided.
-
-	        </xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:element>
-	    <xsd:element name="deferred-method"
-		       type="javaee:tld-deferred-methodType"
-		       minOccurs="0">
-	      <xsd:annotation>
-	        <xsd:documentation>
-
-                Present if the value for this attribute is to be
-                passed to the tag handler as a
-                javax.el.MethodExpression. This allows for deferred
-                evaluation of an EL expression that identifies a
-                method to be invoked on an Object. An optional
-                subelement will contain the expected method
-                signature. The signature defaults to "void method()"
-                if one is not provided.
-
-	        </xsd:documentation>
-	      </xsd:annotation>
-	    </xsd:element>
-          </xsd:choice>
-        </xsd:sequence>
-
-	<xsd:element name="fragment"
-		     type="javaee:generic-booleanType"
-		     minOccurs="0">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      "true" if this attribute is of type
-	      javax.jsp.tagext.JspFragment, representing dynamic
-	      content that can be re-evaluated as many times
-	      as needed by the tag handler.  If omitted or "false",
-	      the default is still type="java.lang.String"
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-canonical-nameType">
-
-    <xsd:annotation>
-      <xsd:documentation>
-
-	Defines the canonical name of a tag or attribute being
-	defined.
-
-	The name must conform to the lexical rules for an NMTOKEN.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:xsdNMTOKENType"/>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-deferred-methodType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines information about how to provide the value for a
-        tag handler attribute that accepts a javax.el.MethodExpression.
-
-	The deferred-method element has one optional subelement:
-
-	method-signature  Provides the signature, as in the Java
-                          Language Specifies, that is expected for
-                          the method being identified by the
-                          expression.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="method-signature"
-                   type="javaee:string"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            Provides the expected signature of the method identified
-            by the javax.el.MethodExpression.
-
-            This disambiguates overloaded methods and ensures that
-            the return value is of the expected type.
-
-            The syntax of the method-signature element is identical
-            to that of the function-signature element.  See the
-            documentation for function-signature for more details.
-
-	    The name of the method is for documentation purposes only
-	    and is ignored by the JSP container.
-
-            Example:
-
-              boolean validate(java.lang.String)
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-deferred-valueType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-        Defines information about how to provide the value for a
-        tag handler attribute that accepts a javax.el.ValueExpression.
-
-	The deferred-value element has one optional subelement:
-
-	type            the expected type of the attribute
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="type"
-                   type="javaee:fully-qualified-classType"
-                   minOccurs="0">
-        <xsd:annotation>
-          <xsd:documentation>
-
-            The fully-qualified name of the Java type that is the
-            expected type for this deferred expression.  If this
-            element is omitted, the expected type is assumed to be
-            "java.lang.Object".
-
-          </xsd:documentation>
-        </xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tld-extensionType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The tld-extensionType is used to indicate
-	extensions to a specific TLD element.
-
-	It is used by elements to designate an extension block
-	that is targeted to a specific extension designated by
-	a set of extension elements that are declared by a
-	namespace. The namespace identifies the extension to
-	the tool that processes the extension.
-
-	The type of the extension-element is abstract. Therefore,
-	a concrete type must be specified by the TLD using
-	xsi:type attribute for each extension-element.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="extension-element"
-		   type="javaee:extensibleType"
-		   maxOccurs="unbounded"/>
-    </xsd:sequence>
-
-    <xsd:attribute name="namespace"
-		   use="required"
-		   type="xsd:anyURI"/>
-    <xsd:attribute name="id" type="xsd:ID"/>
-
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="tldTaglibType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The taglib tag is the document root, it defines:
-
-	description     a simple string describing the "use" of this
-			taglib, should be user discernable
-
-	display-name    the display-name element contains a
-			short name that is intended to be displayed
-			by tools
-
-	icon            optional icon that can be used by tools
-
-	tlib-version    the version of the tag library implementation
-
-	short-name      a simple default short name that could be
-			used by a JSP authoring tool to create
-			names with a mnemonic value; for example,
-			the it may be used as the prefered prefix
-			value in taglib directives
-
-	uri             a uri uniquely identifying this taglib
-
-	validator       optional TagLibraryValidator information
-
-	listener        optional event listener specification
-
-	tag             tags in this tag library
-
-	tag-file        tag files in this tag library
-
-	function        zero or more EL functions defined in this
-			tag library
-
-	taglib-extension zero or more extensions that provide extra
-			information about this taglib, for tool
-			consumption
-
-      </xsd:documentation>
-    </xsd:annotation>
-    <xsd:sequence>
-      <xsd:group ref="javaee:descriptionGroup"/>
-      <xsd:element name="tlib-version"
-		   type="javaee:dewey-versionType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Describes this version (number) of the taglibrary.
-	    It is described as a dewey decimal.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-
-      <xsd:element name="short-name"
-		   type="javaee:tld-canonical-nameType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a simple default name that could be used by
-	    a JSP authoring tool to create names with a
-	    mnemonicvalue; for example, it may be used as the
-	    preferred prefix value in taglib directives.  Do
-	    not use white space, and do not start with digits
-	    or underscore.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="uri"
-		   type="javaee:xsdAnyURIType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines a public URI that uniquely identifies this
-	    version of the taglibrary.  Leave it empty if it
-	    does not apply.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-      <xsd:element name="validator"
-		   type="javaee:validatorType"
-		   minOccurs="0">
-      </xsd:element>
-      <xsd:element name="listener"
-		   type="javaee:listenerType"
-		   minOccurs="0" maxOccurs="unbounded">
-      </xsd:element>
-      <xsd:element name="tag"
-		   type="javaee:tagType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="tag-file"
-		   type="javaee:tagFileType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="function"
-		   type="javaee:functionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="taglib-extension"
-		   type="javaee:tld-extensionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Taglib extensions are for tool use only and must not
-            affect the behavior of a container.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="version"
-		   type="javaee:dewey-versionType"
-		   fixed="2.1"
-		   use="required">
-      <xsd:annotation>
-	<xsd:documentation>
-
-	  Describes the JSP version (number) this taglibrary
-	  requires in order to function (dewey decimal)
-
-	</xsd:documentation>
-      </xsd:annotation>
-
-    </xsd:attribute>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="validatorType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	A validator that can be used to validate
-	the conformance of a JSP page to using this tag library is
-	defined by a validatorType.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0"
-		   maxOccurs="unbounded"/>
-      <xsd:element name="validator-class"
-		   type="javaee:fully-qualified-classType">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Defines the TagLibraryValidator class that can be used
-	    to validate the conformance of a JSP page to using this
-	    tag library.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="init-param"
-		   type="javaee:param-valueType"
-		   minOccurs="0" maxOccurs="unbounded">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The init-param element contains a name/value pair as an
-	    initialization param.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="variable-scopeType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	This type defines scope of the scripting variable.  See
-	TagExtraInfo for details.  The allowed values are,
-	"NESTED", "AT_BEGIN" and "AT_END".
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:simpleContent>
-      <xsd:restriction base="javaee:string">
-	<xsd:enumeration value="NESTED"/>
-	<xsd:enumeration value="AT_BEGIN"/>
-	<xsd:enumeration value="AT_END"/>
-      </xsd:restriction>
-    </xsd:simpleContent>
-  </xsd:complexType>
-
-<!-- **************************************************** -->
-
-  <xsd:complexType name="variableType">
-    <xsd:annotation>
-      <xsd:documentation>
-
-	The variableType provides information on the scripting
-	variables defined by using this tag.  It is a (translation
-	time) error for a tag that has one or more variable
-	subelements to have a TagExtraInfo class that returns a
-	non-null value from a call to getVariableInfo().
-
-	The subelements of variableType are of the form:
-
-	description              Optional description of this
-				 variable
-
-	name-given               The variable name as a constant
-
-	name-from-attribute      The name of an attribute whose
-				 (translation time) value will
-				 give the name of the
-				 variable.  One of name-given or
-				 name-from-attribute is required.
-
-	variable-class           Name of the class of the variable.
-				 java.lang.String is default.
-
-	declare                  Whether the variable is declared
-				 or not.  True is the default.
-
-	scope                    The scope of the scripting varaible
-				 defined.  NESTED is default.
-
-      </xsd:documentation>
-    </xsd:annotation>
-
-    <xsd:sequence>
-      <xsd:element name="description"
-		   type="javaee:descriptionType"
-		   minOccurs="0" maxOccurs="unbounded"/>
-      <xsd:choice>
-	<xsd:element name="name-given"
-		     type="javaee:java-identifierType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The name for the scripting variable.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-
-	<xsd:element name="name-from-attribute"
-		     type="javaee:java-identifierType">
-	  <xsd:annotation>
-	    <xsd:documentation>
-
-	      The name of an attribute whose
-	      (translation-time) value will give the name of
-	      the variable.
-
-	    </xsd:documentation>
-	  </xsd:annotation>
-	</xsd:element>
-      </xsd:choice>
-      <xsd:element name="variable-class"
-		   type="javaee:fully-qualified-classType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The optional name of the class for the scripting
-	    variable.  The default is java.lang.String.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-
-      </xsd:element>
-
-      <xsd:element name="declare"
-		   type="javaee:generic-booleanType"
-		   minOccurs="0">
-
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    Whether the scripting variable is to be defined
-	    or not.  See TagExtraInfo for details.  This
-	    element is optional and "true" is the default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-      <xsd:element name="scope"
-		   type="javaee:variable-scopeType"
-		   minOccurs="0">
-	<xsd:annotation>
-	  <xsd:documentation>
-
-	    The element is optional and "NESTED" is the default.
-
-	  </xsd:documentation>
-	</xsd:annotation>
-      </xsd:element>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-</xsd:schema>
-
diff --git a/bundles/org.eclipse.jst.standard.schemas/plugin.properties b/bundles/org.eclipse.jst.standard.schemas/plugin.properties
deleted file mode 100644
index 1497b9f..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.jst.standard.schemas
-Bundle-Name.0 = Java EE Related Schemas
-Bundle-Vendor.0 = Eclipse Web Tools Platform
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.standard.schemas/plugin.xml b/bundles/org.eclipse.jst.standard.schemas/plugin.xml
deleted file mode 100644
index 1cade77..0000000
--- a/bundles/org.eclipse.jst.standard.schemas/plugin.xml
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-    <!--==========================================-->
-    <!-- Catalog Contributions                    -->
-    <!-- Register well known Web DTDs and XSDs    -->
-    <!--==========================================-->
-
-    <extension point="org.eclipse.wst.xml.core.catalogContributions">
-        <catalogContribution id="default">
-
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN"
-                uri="dtdsAndSchemas/application_1_2.dtd"
-                webURL="http://java.sun.com/j2ee/dtds/application_1_2.dtd" />
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN"
-                uri="dtdsAndSchemas/application_1_3.dtd"
-                webURL="http://java.sun.com/dtd/application_1_3.dtd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/application_1_4.xsd"
-                uri="dtdsAndSchemas/application_1_4.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/application_5.xsd"
-                uri="dtdsAndSchemas/application_5.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/application_6.xsd"
-                uri="dtdsAndSchemas/application_6.xsd" />
-
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN"
-                uri="dtdsAndSchemas/application-client_1_2.dtd"
-                webURL="http://java.sun.com/j2ee/dtds/application-client_1_2.dtd" />
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"
-                uri="dtdsAndSchemas/application-client_1_3.dtd"
-                webURL="http://java.sun.com/dtd/application-client_1_3.dtd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd"
-                uri="dtdsAndSchemas/application-client_1_4.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/application-client_5.xsd"
-                uri="dtdsAndSchemas/application-client_5.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/application-client_6.xsd"
-                uri="dtdsAndSchemas/application-client_6.xsd" />
-
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"
-                uri="dtdsAndSchemas/connector_1_0.dtd"
-                webURL="http://java.sun.com/dtd/connector_1_0.dtd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
-                uri="dtdsAndSchemas/connector_1_5.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
-                uri="dtdsAndSchemas/connector_1_6.xsd" />
-
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
-                uri="dtdsAndSchemas/ejb-jar_1_1.dtd"
-                webURL="http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd" />
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN"
-                uri="dtdsAndSchemas/ejb-jar_2_0.dtd"
-                webURL="http://java.sun.com/dtd/ejb-jar_2_0.dtd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
-                uri="dtdsAndSchemas/ejb-jar_2_1.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"
-                uri="dtdsAndSchemas/ejb-jar_3_0.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd"
-                uri="dtdsAndSchemas/ejb-jar_3_1.xsd" />
-
-
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/"
-                uri="dtdsAndSchemas/j2ee_1_4.xsd" />
-
-
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/j2ee_jaxrpc_mapping_1_1.xsd"
-                uri="dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/j2ee_web_services_1_1.xsd"
-                uri="dtdsAndSchemas/j2ee_web_services_1_1.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/j2ee_web_services_client_1_1.xsd"
-                uri="dtdsAndSchemas/j2ee_web_services_client_1_1.xsd" />
-
-            <uri
-                name="http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
-                uri="dtdsAndSchemas/j2ee_jaxrpc_mapping_1_1.xsd" />
-            <uri
-                name="http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
-                uri="dtdsAndSchemas/j2ee_web_services_1_1.xsd" />
-            <uri
-                name="http://www.ibm.com/webservices/xsd/j2ee_web_services_client_1_1.xsd"
-                uri="dtdsAndSchemas/j2ee_web_services_client_1_1.xsd" />
-
-
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/javaee_5.xsd"
-                uri="dtdsAndSchemas/javaee_5.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/javaee_6.xsd"
-                uri="dtdsAndSchemas/javaee_6.xsd" />
-
-
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
-                uri="dtdsAndSchemas/javaee_web_services_1_2.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd"
-                uri="dtdsAndSchemas/javaee_web_services_1_3.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_2.xsd"
-                uri="dtdsAndSchemas/javaee_web_services_client_1_2.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/javaee_web_services_client_1_3.xsd"
-                uri="dtdsAndSchemas/javaee_web_services_client_1_3.xsd" />
-
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/jsp_2_0.xsd"
-                uri="dtdsAndSchemas/jsp_2_0.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/jsp_2_1.xsd"
-                uri="dtdsAndSchemas/jsp_2_1.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/jsp_2_2.xsd"
-                uri="dtdsAndSchemas/jsp_2_2.xsd" />
-
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN"
-                uri="dtdsAndSchemas/web-app_2_2.dtd"
-                webURL="http://java.sun.com/j2ee/dtds/web-app_2.2.dtd" />
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                uri="dtdsAndSchemas/web-app_2_3.dtd"
-                webURL="http://java.sun.com/dtd/web-app_2_3.dtd" />
-
-
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-                uri="dtdsAndSchemas/web-app_2_4.xsd" />
-
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-                uri="dtdsAndSchemas/web-app_2_5.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-                uri="dtdsAndSchemas/web-app_3_0.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/web-common_3_0.xsd"
-                uri="dtdsAndSchemas/web-common_3_0.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"
-                uri="dtdsAndSchemas/web-fragment_3_0.xsd" />
-
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
-                uri="dtdsAndSchemas/web-jsptaglibrary_1_1.dtd"
-                webURL="http://java.sun.com/dtd/web-jsptaglibrary_1_1.dtd" />
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-                uri="dtdsAndSchemas/web-jsptaglibrary_1_2.dtd"
-                webURL="http://java.sun.com/dtd/web-jsptaglibrary_1_2.dtd" />
-            <uri
-                name="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-                uri="dtdsAndSchemas/web-jsptaglibrary_2_0.xsd" />
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd"
-                uri="dtdsAndSchemas/web-jsptaglibrary_2_1.xsd" />
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-                uri="dtdsAndSchemas/web-facesconfig_1_0.dtd"
-                webURL="http://java.sun.com/dtd/web-facesconfig_1_0.dtd" />
-
-            <public
-                publicId="-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.1//EN"
-                uri="dtdsAndSchemas/web-facesconfig_1_1.dtd"
-                webURL="http://java.sun.com/dtd/web-facesconfig_1_1.dtd" />
-
-                
-            <uri
-                name="http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
-                uri="dtdsAndSchemas/web-facesconfig_1_2.xsd" />
-                
-            <uri
-                name="http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
-                uri="dtdsAndSchemas/orm_1_0.xsd" />
-   
-            <uri
-                name="http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
-                uri="dtdsAndSchemas/persistence_1_0.xsd" />   
-                          
-        </catalogContribution>
-
-    </extension>
-
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.css.ui/.classpath b/bundles/org.eclipse.wst.css.ui/.classpath
deleted file mode 100644
index 8c86292..0000000
--- a/bundles/org.eclipse.wst.css.ui/.classpath
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible"
-				pattern="org/w3c/dom/css/**/*" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/sse/core/**" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/css/core/**" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/xml/core/**" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/sse/ui/**" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/xml/ui/**" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/html/core/**" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/html/core/internal/htmlcss/StyleAdapterFactory" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/sse/internal/contentproperties/IContentSettings" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/componentcore/internal/util/IModuleConstants" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/jem/internal/util/emf/workbench/nls/EMFWorkbenchResourceHandler" />
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4" />
-	<classpathentry kind="output" path="bin" />
-</classpath>
diff --git a/bundles/org.eclipse.wst.css.ui/.cvsignore b/bundles/org.eclipse.wst.css.ui/.cvsignore
deleted file mode 100644
index 1037f8b..0000000
--- a/bundles/org.eclipse.wst.css.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-csseditor.jar
-temp.folder
-build.xml
-dev.properties
-bin
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.css.ui/.options b/bundles/org.eclipse.wst.css.ui/.options
deleted file mode 100644
index 1af0b58..0000000
--- a/bundles/org.eclipse.wst.css.ui/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.css.ui/projectionperf=false
diff --git a/bundles/org.eclipse.wst.css.ui/.project b/bundles/org.eclipse.wst.css.ui/.project
deleted file mode 100644
index d42035f..0000000
--- a/bundles/org.eclipse.wst.css.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.css.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4174c19..0000000
--- a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Wed Mar 28 03:20:41 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index a552d54..0000000
--- a/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,51 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.css.ui; singleton:=true
-Bundle-Version: 1.0.500.qualifier
-Bundle-Activator: org.eclipse.wst.css.ui.internal.CSSUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.css.ui,
- org.eclipse.wst.css.ui.internal;x-internal:=true,
- org.eclipse.wst.css.ui.internal.autoedit;x-internal:=true,
- org.eclipse.wst.css.ui.internal.contentassist;x-internal:=true,
- org.eclipse.wst.css.ui.internal.contentoutline;x-internal:=true,
- org.eclipse.wst.css.ui.internal.contentproperties;x-internal:=true,
- org.eclipse.wst.css.ui.internal.contentproperties.ui;x-internal:=true,
- org.eclipse.wst.css.ui.internal.edit.ui;x-internal:=true,
- org.eclipse.wst.css.ui.internal.editor;x-internal:=true,
- org.eclipse.wst.css.ui.internal.handlers;x-internal:=true,
- org.eclipse.wst.css.ui.internal.image;x-internal:=true,
- org.eclipse.wst.css.ui.internal.preferences;x-internal:=true,
- org.eclipse.wst.css.ui.internal.preferences.ui;x-internal:=true,
- org.eclipse.wst.css.ui.internal.projection;x-internal:=true,
- org.eclipse.wst.css.ui.internal.properties;x-internal:=true,
- org.eclipse.wst.css.ui.internal.registry;x-internal:=true,
- org.eclipse.wst.css.ui.internal.selection;x-internal:=true,
- org.eclipse.wst.css.ui.internal.style;x-internal:=true,
- org.eclipse.wst.css.ui.internal.templates;x-internal:=true,
- org.eclipse.wst.css.ui.internal.text;x-internal:=true,
- org.eclipse.wst.css.ui.internal.wizard;x-internal:=true,
- org.eclipse.wst.css.ui.views.contentoutline,
- org.eclipse.wst.css.ui.views.properties
-Import-Package: com.ibm.icu.util; version="3.8",
- com.ibm.icu.text; version="3.8"
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.views;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.1.100,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.wst.css.core;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)";resolution:=optional,
- org.eclipse.wst.common.modulecore;bundle-version="[1.2.0,2.0.0)";resolution:=optional
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.css.ui/about.html b/bundles/org.eclipse.wst.css.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.css.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.css.ui/build.properties b/bundles/org.eclipse.wst.css.ui/build.properties
deleted file mode 100644
index 73f9b41..0000000
--- a/bundles/org.eclipse.wst.css.ui/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               .options,\
-               templates/,\
-               about.html
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-source.. = src/
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/dtool16/newcss_wiz.gif b/bundles/org.eclipse.wst.css.ui/icons/full/dtool16/newcss_wiz.gif
deleted file mode 100644
index d94f752..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/dtool16/newcss_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/etool16/newcss_wiz.gif b/bundles/org.eclipse.wst.css.ui/icons/full/etool16/newcss_wiz.gif
deleted file mode 100644
index ab287a5..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/etool16/newcss_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/aural_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/aural_props.gif
deleted file mode 100644
index df1704e..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/aural_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/boxmodel_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/boxmodel_props.gif
deleted file mode 100644
index 7c050f5..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/boxmodel_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/charset_rule.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/charset_rule.gif
deleted file mode 100644
index 0e93844..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/charset_rule.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/class_selector.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/class_selector.gif
deleted file mode 100644
index f924d7a..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/class_selector.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/colback_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/colback_props.gif
deleted file mode 100644
index 5ca230b..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/colback_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/content_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/content_props.gif
deleted file mode 100644
index 2133ded..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/content_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyname.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyname.gif
deleted file mode 100644
index ede58ab..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyname.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_function.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_function.gif
deleted file mode 100644
index 6cd12da..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_function.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_identifier.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_identifier.gif
deleted file mode 100644
index 2adbdd8..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_identifier.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_unit.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_unit.gif
deleted file mode 100644
index 308a3ae..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/css_propertyvalue_unit.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/font_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/font_props.gif
deleted file mode 100644
index aca5f89..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/font_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/fontface_rule.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/fontface_rule.gif
deleted file mode 100644
index 71f59e8..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/fontface_rule.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/id_selector.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/id_selector.gif
deleted file mode 100644
index f0857d2..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/id_selector.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/link_rule.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/link_rule.gif
deleted file mode 100644
index 94d89cd..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/link_rule.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/link_selector.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/link_selector.gif
deleted file mode 100644
index d85b78f..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/link_selector.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/media_rule.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/media_rule.gif
deleted file mode 100644
index 3391f19..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/media_rule.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/other_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/other_props.gif
deleted file mode 100644
index 920c228..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/other_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/page_rule.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/page_rule.gif
deleted file mode 100644
index 525f64b..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/page_rule.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/pagedmedia_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/pagedmedia_props.gif
deleted file mode 100644
index 6b635b0..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/pagedmedia_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/pseudo.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/pseudo.gif
deleted file mode 100644
index 1b6a6dc..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/pseudo.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/sort.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/sort.gif
deleted file mode 100644
index 23c5d0b..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/sort.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/sourceEditor.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/style_rule.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/style_rule.gif
deleted file mode 100644
index 3176ff8..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/style_rule.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/stylesheet.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/stylesheet.gif
deleted file mode 100644
index d8fde00..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/stylesheet.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/table_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/table_props.gif
deleted file mode 100644
index bcc76cd..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/table_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/tag-template.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/tag-template.gif
deleted file mode 100644
index 5d1f81b..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/tag-template.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/tag_selector.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/tag_selector.gif
deleted file mode 100644
index 69850fa..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/tag_selector.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/text_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/text_props.gif
deleted file mode 100644
index abf63f8..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/text_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/ui_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/ui_props.gif
deleted file mode 100644
index 99a8b96..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/ui_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/unknown_rule.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/unknown_rule.gif
deleted file mode 100644
index 857e4e5..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/unknown_rule.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/visual_props.gif b/bundles/org.eclipse.wst.css.ui/icons/full/obj16/visual_props.gif
deleted file mode 100644
index c1a8b34..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/obj16/visual_props.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/icons/full/wizban/newcssfile_wiz.png b/bundles/org.eclipse.wst.css.ui/icons/full/wizban/newcssfile_wiz.png
deleted file mode 100644
index c88e63f..0000000
--- a/bundles/org.eclipse.wst.css.ui/icons/full/wizban/newcssfile_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.css.ui/plugin.properties b/bundles/org.eclipse.wst.css.ui/plugin.properties
deleted file mode 100644
index a911ee2..0000000
--- a/bundles/org.eclipse.wst.css.ui/plugin.properties
+++ /dev/null
@@ -1,70 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-providerName=Eclipse.org
-pluginName=SSE CSS Source Editor
-CSS_Source_Page_Editor.name=CSS Editor
-CSS_Files.name=CSS Files
-CSS_Source.name=Editor
-CSS_Styles.name=Styles
-CSS_Templates.name=Templates
-CSS_Syntax_Coloring=Syntax Coloring
-WebContentSettings.name=Web Content Settings
-###############################################################################
-# The following property keys maybe unused. Commented out on 12/7/2004. Uncomment if needed.
-#CSS_Annotations.name=CSS Annotations
-
-
-#org.eclipse.ui.newWizards extension point
-_UI_WIZARD_NAME = CSS File
-_UI_WIZARD_CREATE_NEW_FILE = Create a new CSS file
-##
-AddTask.label=Add &Task...
-AddTask.tooltip=Add Task...
-AddBookmark.label=Add Boo&kmark...
-AddBookmark.tooltip=Add Bookmark...
-SelectRuler.label=Select Ruler
-##
-CleanupDocument_label=Cleanup Document...
-CleanupDocument_tooltip=Cleanup Document
-StructureSelectEnclosing_label=Enclosing Element
-StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
-StructureSelectNext_label=Next Element
-StructureSelectNext_tooltip=Expand selection to include next sibling
-StructureSelectPrevious_label=Previous Element
-StructureSelectPrevious_tooltip=Expand selection to include previous sibling
-StructureSelectHistory_label=Restore Last Selection
-StructureSelectHistory_tooltip=Restore last selection
-##
-All_CSS_context_type_Extension_Element.name=All CSS
-CSS_New_context_type_Extension_Element.name=New CSS
-##
-preferenceKeywords.files=editor css creating saving files suffix specified encoding iana
-preferenceKeywords.source=editor css source formatting line width insert break properties wrapping style attribute html indent tabs spaces size capitalization identifier property name value uppercase lowercase
-preferenceKeywords.templates=editor css templates snippet macros
-preferenceKeywords.styles=editor css style customize syntax highlighting type text content foreground background bold color
-preferenceKeywords.webcontent=editor css web content settings profile style
-
-scope.structured.text.editor.css.name=Editing CSS Source
-scope.structured.text.editor.css.description=Editing CSS Source
-
-command.toggle.comment.mnemonic=T
-command.remove.block.comment.mnemonic=R
-command.add.block.comment.mnemonic=A
-
-Colors.atmarkRule=At Mark Rule
-Colors.selector=Selector
-Colors.media=Media
-Colors.comment=Comment
-Colors.propertyName=Property Name
-Colors.propertyValue=Property Value
-Colors.uri=URI
-Colors.string=String
-Colors.error=Error
diff --git a/bundles/org.eclipse.wst.css.ui/plugin.xml b/bundles/org.eclipse.wst.css.ui/plugin.xml
deleted file mode 100644
index 9be8cde..0000000
--- a/bundles/org.eclipse.wst.css.ui/plugin.xml
+++ /dev/null
@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%CSS_Source_Page_Editor.name"
-			icon="$nl$/icons/full/obj16/sourceEditor.gif"
-			contributorClass="org.eclipse.wst.css.ui.internal.ActionContributorCSS"
-			class="org.eclipse.wst.sse.ui.StructuredTextEditor"
-			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-			id="org.eclipse.wst.css.core.csssource.source">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.css.core.csssource" />
-		</editor>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<contentOutlineConfiguration
-			class="org.eclipse.wst.css.ui.views.contentoutline.CSSContentOutlineConfiguration"
-			target="org.eclipse.wst.css.core.csssource" />
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS"
-			target="org.eclipse.wst.css.core.csssource" />
-		<propertySheetConfiguration
-			class="org.eclipse.wst.css.ui.views.properties.CSSPropertySheetConfiguration"
-			target="org.eclipse.wst.css.core.csssource" />
-		<provisionalConfiguration
-			type="characterpairmatcher"
-			class="org.eclipse.wst.css.ui.internal.text.CSSDocumentRegionEdgeMatcher"
-			target="org.eclipse.wst.css.core.csssource" />
-		<provisionalConfiguration
-			type="foldingstrategy"
-			class="org.eclipse.wst.css.ui.internal.projection.CSSFoldingStrategy"
-			target="org.eclipse.wst.css.core.csssource" />
-		<provisionalConfiguration
-			type="autoeditstrategy"
-			class="org.eclipse.wst.css.ui.internal.autoedit.StructuredAutoEditStrategyCSS"
-			target="org.eclipse.wst.css.STYLE" />
-		<provisionalDefinition
-			type="preferencepages"
-			value="org.eclipse.wst.css.ui.preferences.css org.eclipse.wst.sse.ui.preferences.css.source, org.eclipse.wst.css.ui.preferences.templates, org.eclipse.wst.sse.ui.preferences.css.styles"
-			target="org.eclipse.wst.css.core.csssource" />
-		<provisionalDefinition
-			type="spellingregions"
-			value="COMMENT"
-			target="org.eclipse.wst.css.core.csssource" />
-		<provisionalDefinition
-			type="activecontexts"
-			value="org.eclipse.wst.css.core.csssource"
-			target="org.eclipse.wst.css.core.csssource" />
-	</extension>
-	
-	<extension point="org.eclipse.ui.contexts">
-		<context
-			name="%scope.structured.text.editor.css.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.css.description"
-			id="org.eclipse.wst.css.core.csssource">
-		</context>
-	</extension>
-	
-	<extension
-		point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
-		<adapterFactoryDescription
-			class="org.eclipse.wst.css.ui.internal.registry.AdapterFactoryProviderCSS">
-			<contentType id="org.eclipse.wst.css.core.csssource" />
-		</adapterFactoryDescription>
-	</extension>
-
-	<extension
-		point="org.eclipse.core.filebuffers.annotationModelCreation">
-		<factory
-			contentTypeId="org.eclipse.wst.css.core.csssource"
-			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
-	</extension>
-
-	<extension point="org.eclipse.ui.preferencePages">
-		<page
-			name="%CSS_Files.name"
-			category="org.eclipse.wst.html.ui.preferences.web"
-			class="org.eclipse.wst.css.ui.internal.preferences.ui.CSSFilesPreferencePage"
-			id="org.eclipse.wst.css.ui.preferences.css">
-			<keywordReference id="org.eclipse.wst.css.ui.files"/>
-		</page>
-		<page
-			name="%CSS_Source.name"
-			category="org.eclipse.wst.css.ui.preferences.css"
-			class="org.eclipse.wst.css.ui.internal.preferences.ui.CSSSourcePreferencePage"
-			id="org.eclipse.wst.sse.ui.preferences.css.source">
-			<keywordReference id="org.eclipse.wst.css.ui.source"/>
-		</page>
-		<page
-			name="%CSS_Templates.name"
-			category="org.eclipse.wst.sse.ui.preferences.css.source"
-			class="org.eclipse.wst.css.ui.internal.preferences.ui.CSSTemplatePreferencePage"
-			id="org.eclipse.wst.css.ui.preferences.templates">
-			<keywordReference id="org.eclipse.wst.css.ui.templates"/>
-		</page>
-		<page
-			name="%CSS_Syntax_Coloring"
-			category="org.eclipse.wst.sse.ui.preferences.css.source"
-			class="org.eclipse.wst.css.ui.internal.preferences.ui.CSSSyntaxColoringPage"
-			id="org.eclipse.wst.sse.ui.preferences.css.styles">
-         	<keywordReference id="org.eclipse.wst.css.ui.styles"/>
-		</page>
-	</extension>
-
-	<!-- CSS Content Settings Property Page -->
-	<extension point="org.eclipse.ui.propertyPages">
-		<page
-			name="%WebContentSettings.name"
-			class="org.eclipse.wst.css.ui.internal.contentproperties.ui.CSSWebContentSettingsPropertyPage"
-			id="org.eclipse.wst.css.ui.internal.contentproperties.CSSWebContentSettingsPropertyPage.css">
-         	<enabledWhen>
-               	<and>
-					<adapt type="org.eclipse.core.resources.IFile">
-						<or> 
-							<test 
-								forcePluginActivation="true"
-								property="org.eclipse.core.resources.contentTypeId"
-								value="org.eclipse.wst.css.core.csssource" />
-						</or>
-					</adapt>
-				</and> 
-			</enabledWhen>
-         	<keywordReference id="org.eclipse.wst.css.ui.webcontent"/>
-		</page>
-	</extension>
-
-	<!-- Keywords for preference and properties pages -->
-	<extension point="org.eclipse.ui.keywords">
-		<keyword
-			label="%preferenceKeywords.files"
-			id="org.eclipse.wst.css.ui.files"/>
-		<keyword
-			label="%preferenceKeywords.source"
-			id="org.eclipse.wst.css.ui.source"/>
-		<keyword
-			label="%preferenceKeywords.templates"
-			id="org.eclipse.wst.css.ui.templates"/>
-		<keyword
-			label="%preferenceKeywords.styles"
-			id="org.eclipse.wst.css.ui.styles"/>
-		<keyword
-			label="%preferenceKeywords.webcontent"
-			id="org.eclipse.wst.css.ui.webcontent"/>
-    </extension>
-
-	<!-- Editor actionsets -->
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part id="org.eclipse.wst.css.core.csssource.source"></part>
-		</actionSetPartAssociation>
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.NavigateActionSet">
-			<part id="org.eclipse.wst.css.core.csssource.source"></part>
-		</actionSetPartAssociation>
-	</extension>
-
-	<!-- initialize css ui preferences -->
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.css.ui.internal.preferences.CSSUIPreferenceInitializer" />
-	</extension>
-
-	<!-- New CSS wizard -->
-	<extension point="org.eclipse.ui.newWizards">
-		<wizard
-			id="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard"
-			name="%_UI_WIZARD_NAME"
-			class="org.eclipse.wst.css.ui.internal.wizard.NewCSSWizard"
-			category="org.eclipse.wst.web.ui"
-			icon="$nl$/icons/full/etool16/newcss_wiz.gif">
-			<description>%_UI_WIZARD_CREATE_NEW_FILE</description>
-			<selection class="org.eclipse.core.resources.IResource" />
-		</wizard>
-	</extension>
-	
-	<extension point="org.eclipse.ui.menus">
-		<menuContribution locationURI="menu:edit?after=additions">
-			<command commandId="org.eclipse.ui.edit.text.contentAssist.proposals" id="CSSContentAssist" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"></reference>
-				</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-
-	<extension point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="org.eclipse.wst.css.core.csssource.source.RulerContext"
-			id="org.eclipse.ui.texteditor.ruler.context.actions">
-			<action
-				label="%AddTask.label"
-				helpContextId="org.eclipse.ui.AddTask_action_context"
-				class="org.eclipse.ui.texteditor.TaskRulerAction"
-				tooltip="%AddTask.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.TaskRulerAction">
-			</action>
-			<action
-				label="%AddBookmark.label"
-				helpContextId="org.eclipse.ui.bookmark_action_context"
-				class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-				tooltip="%AddBookmark.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-			</action>
-		</viewerContribution>
-	</extension>
-
-	<!-- Templates -->
-	<extension point="org.eclipse.ui.editors.templates">
-		<contextType
-			name="%All_CSS_context_type_Extension_Element.name"
-			class="org.eclipse.wst.css.ui.internal.templates.TemplateContextTypeCSS"
-			id="css_all">
-		</contextType>
-		<contextType
-			name="%CSS_New_context_type_Extension_Element.name"
-			class="org.eclipse.wst.css.ui.internal.templates.TemplateContextTypeCSS"
-			id="css_new">
-		</contextType>
-		<include
-			file="templates/cssdefault-templates.xml"
-			translations="$nl$/templates/cssdefault-templates.properties">
-		</include>
-	</extension>
-
-	<extension
- 		point="org.eclipse.ui.handlers">
-		<handler
-			class="org.eclipse.wst.css.ui.internal.handlers.CleanupDocumentHandler"
-			commandId="org.eclipse.wst.sse.ui.cleanup.document">
-			<activeWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
-		</handler>
-		<handler
-             class="org.eclipse.wst.css.ui.internal.handlers.ToggleCommentHandler"
-             commandId="org.eclipse.wst.sse.ui.toggle.comment">
-             <activeWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition">
-             	</reference>
-             </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition">
-             	</reference>
-             </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.css.ui.internal.handlers.AddBlockCommentHandler"
-             commandId="org.eclipse.wst.sse.ui.add.block.comment">
-             <activeWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition">
-             	</reference>
-             </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition">
-             	</reference>
-             </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.css.ui.internal.handlers.RemoveBlockCommentHandler"
-             commandId="org.eclipse.wst.sse.ui.remove.block.comment">
-             <activeWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition">
-             	</reference>
-             </activeWhen>
-             <enabledWhen>
-             	<reference
-                    definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition">
-             	</reference>
-             </enabledWhen>
-       </handler>
-		<handler
-			class="org.eclipse.wst.css.ui.internal.handlers.StructuredSelectEnclosingHandler"
-			commandId="org.eclipse.wst.sse.ui.structure.select.enclosing">
-			<activeWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
-		</handler>
-		<handler
-			class="org.eclipse.wst.css.ui.internal.handlers.StructuredSelectNextHandler"
-			commandId="org.eclipse.wst.sse.ui.structure.select.next">
-			<activeWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
-		</handler>
-		<handler
-			class="org.eclipse.wst.css.ui.internal.handlers.StructuredSelectPreviousHandler"
-			commandId="org.eclipse.wst.sse.ui.structure.select.previous">
-			<activeWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
-		</handler>
-		<!-- TODO Use the handler from SSE or XML's declaration -->
-		<handler
-			class="org.eclipse.wst.sse.ui.internal.handlers.StructuredSelectHistoryHandler"
-			commandId="org.eclipse.wst.sse.ui.structure.select.last">
-			<activeWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-			</enabledWhen>
-		</handler>
-	</extension>
-
-	<extension point="org.eclipse.ui.menus">
-		<menuContribution
-	       locationURI="popup:sourcePopupMenuId?before=sourceBegin">
-			<command commandId="org.eclipse.wst.sse.ui.toggle.comment" id="ToggleComment" style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.wst.sse.ui.add.block.comment" id="AddBlockComment" style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition" />
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.wst.sse.ui.remove.block.comment" id="RemoveBlockComment" style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition" />
-				</visibleWhen>
-			</command>
-		</menuContribution>
-
-		<menuContribution locationURI="menu:sourceMenuId?before=sourceBegin">
-			<command commandId="org.eclipse.wst.sse.ui.toggle.comment"
-			         id="ToggleComment"
-			         mnemonic="%command.toggle.comment.mnemonic"
-			         style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.wst.sse.ui.add.block.comment"
-			         id="AddBlockComment"
-			         mnemonic="%command.add.block.comment.mnemonic"
-			         style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.wst.sse.ui.remove.block.comment"
-			         id="RemoveBlockComment"
-			         mnemonic="%command.remove.block.comment.mnemonic"
-			         style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.css.ui.cssSourceContributions.definition"/>
-				</visibleWhen>
-			</command>
-		</menuContribution>
-	</extension>
-	<!-- CSS editor actions -->
-	<extension point="org.eclipse.ui.editorActions">
-		<!--<editorContribution
-			id="org.eclipse.wst.css.core.csssource.source.editorActions"
-			targetID="org.eclipse.wst.css.core.csssource.source">
-			<action
-				id="CleanupDocument"
-				label="%CleanupDocument_label"
-				definitionId="org.eclipse.wst.sse.ui.cleanup.document"
-				tooltip="%CleanupDocument_tooltip"
-				class="org.eclipse.wst.css.ui.internal.edit.ui.CleanupActionCSSDelegate"
-				actionID="CleanupDocument">
-			</action>
-			<action
-				id="StructureSelectEnclosing"
-				label="%StructureSelectEnclosing_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
-				tooltip="%StructureSelectEnclosing_tooltip"
-				class="org.eclipse.wst.css.ui.internal.selection.StructuredSelectEnclosingCSSActionDelegate"
-				actionID="StructureSelectEnclosing">
-			</action>
-			<action
-				id="StructureSelectNext"
-				label="%StructureSelectNext_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.next"
-				tooltip="%StructureSelectNext_tooltip"
-				class="org.eclipse.wst.css.ui.internal.selection.StructuredSelectNextCSSActionDelegate"
-				actionID="StructureSelectNext">
-			</action>
-			<action
-				id="StructureSelectPrevious"
-				label="%StructureSelectPrevious_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
-				tooltip="%StructureSelectPrevious_tooltip"
-				class="org.eclipse.wst.css.ui.internal.selection.StructuredSelectPreviousCSSActionDelegate"
-				actionID="StructureSelectPrevious">
-			</action>
-			<action
-				id="StructureSelectHistory"
-				label="%StructureSelectHistory_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.last"
-				tooltip="%StructureSelectHistory_tooltip"
-				class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
-				actionID="StructureSelectHistory">
-			</action>
-		</editorContribution>-->
-        <editorContribution
-            targetID="org.eclipse.wst.css.core.csssource.source"
-            id="org.eclipse.wst.css.core.csssource.ruler.actions">
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%SelectRuler.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.css.ui.cssSourceContributions.definition">
-            <with variable="activeContexts">
-	           <iterate operator="or">
-	              <equals value="org.eclipse.wst.css.core.csssource"/>
-	           </iterate>
-            </with>
-		</definition>
-	</extension>
-	
-	<!-- Define theme -->
-	<extension
-		point="org.eclipse.ui.themes">
-		<theme
-			id="org.eclipse.ui.ide.systemDefault">
-			<colorOverride
-				id="ATMARK_RULE"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="SELECTOR"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="MEDIA"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="COMMENT"
-				value="COLOR_LIST_SELECTION">
-			</colorOverride>
-			<colorOverride
-				id="PROPERTY_NAME"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="PROPERTY_VALUE"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="URI"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="STRING"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="ERROR"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-		</theme>
-		<colorDefinition
-			id="ATMARK_RULE"
-			isEditable="false"
-			label="%Colors.atmarkRule"
-			value="63, 127, 127">
-		</colorDefinition>
-		<colorDefinition
-			id="SELECTOR"
-			isEditable="false"
-			label="%Colors.selector"
-			value="63, 127, 127">
-		</colorDefinition>
-		<colorDefinition
-			id="MEDIA"
-			isEditable="false"
-			label="%Colors.media"
-			value="42, 0, 225">
-		</colorDefinition>
-		<colorDefinition
-			id="COMMENT"
-			isEditable="false"
-			label="%Colors.comment"
-			value="63, 95, 191">
-		</colorDefinition>
-		<colorDefinition
-			id="PROPERTY_NAME"
-			isEditable="false"
-			label="%Colors.propertyName"
-			value="127, 0, 127">
-		</colorDefinition>
-		<colorDefinition
-			id="PROPERTY_VALUE"
-			isEditable="false"
-			label="%Colors.propertyValue"
-			value="42, 0, 225">
-		</colorDefinition>
-		<colorDefinition
-			id="URI"
-			isEditable="false"
-			label="%Colors.uri"
-			value="42, 0, 225">
-		</colorDefinition>
-		<colorDefinition
-			id="STRING"
-			isEditable="false"
-			label="%Colors.string"
-			value="42, 0, 225">
-		</colorDefinition>
-		<colorDefinition
-			id="ERROR"
-			isEditable="false"
-			label="%Colors.error"
-			value="191, 63, 63">
-		</colorDefinition>
-	</extension>
-	
-	<!-- Enable the FormatHandler for CSS Content Type -->
-	<extension point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.eclipse.wst.sse.ui.internal.handlers.FormatHandler"
-			commandId="org.eclipse.wst.sse.ui.format">
-			<activeWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssContentType.definition"></reference>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.css.ui.cssContentType.definition"></reference>
-			</enabledWhen>
-		</handler>
-	</extension>
-	
-	<!-- Set up a definition for CSS Content Types -->
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.css.ui.cssContentType.definition">
-			<iterate ifEmpty="false">
-				<adapt type="org.eclipse.core.resources.IFile">
-					<!-- Force property tester to load, should not cause entire plug-in to start -->
-					<test property="org.eclipse.wst.sse.core.resources.contentTypeId"
-						value="org.eclipse.wst.css.core.csssource" forcePluginActivation="true"/>
-				</adapt>
-			</iterate>
-		</definition>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.characterPairing">
-		<inserter class="org.eclipse.wst.css.ui.internal.text.CSSCharacterPairInserter" id="org.eclipse.wst.html.css.ui.inserter">
-			<contentTypeIdentifier
-				id="org.eclipse.wst.html.core.htmlsource"
-				partitions="org.eclipse.wst.css.STYLE">
-			</contentTypeIdentifier>
-		</inserter>
-		<inserter class="org.eclipse.wst.css.ui.internal.text.CSSCharacterPairInserter" id="org.eclipse.wst.css.ui.inserter">
-			<contentTypeIdentifier
-				id="org.eclipse.wst.css.core.csssource"
-				partitions="org.eclipse.wst.css.STYLE">
-			</contentTypeIdentifier>
-		</inserter>
-	</extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java
deleted file mode 100644
index 0fef179..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/StructuredTextViewerConfigurationCSS.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.format.FormatProcessorCSS;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.text.ICSSPartitions;
-import org.eclipse.wst.css.ui.internal.contentassist.CSSContentAssistProcessor;
-import org.eclipse.wst.css.ui.internal.style.LineStyleProviderForCSS;
-import org.eclipse.wst.sse.core.text.IStructuredPartitions;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.format.StructuredFormattingStrategy;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * Configuration for a source viewer which shows CSS.
- * <p>
- * Clients can subclass and override just those methods which must be specific
- * to their needs.
- * </p>
- * 
- * @see org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration
- * @since 1.0
- */
-public class StructuredTextViewerConfigurationCSS extends StructuredTextViewerConfiguration {
-	/*
-	 * One instance per configuration because not sourceviewer-specific and
-	 * it's a String array
-	 */
-	private String[] fConfiguredContentTypes;
-	/*
-	 * One instance per configuration
-	 */
-	private LineStyleProvider fLineStyleProviderForCSS;
-
-	/**
-	 * Create new instance of StructuredTextViewerConfigurationCSS
-	 */
-	public StructuredTextViewerConfigurationCSS() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-
-	public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) {
-		List allStrategies = new ArrayList(0);
-
-		IAutoEditStrategy[] superStrategies = super.getAutoEditStrategies(sourceViewer, contentType);
-		for (int i = 0; i < superStrategies.length; i++) {
-			allStrategies.add(superStrategies[i]);
-		}
-
-		return (IAutoEditStrategy[]) allStrategies.toArray(new IAutoEditStrategy[0]);
-	}
-
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		if (fConfiguredContentTypes == null) {
-			fConfiguredContentTypes = new String[]{ICSSPartitions.STYLE, ICSSPartitions.COMMENT, IStructuredPartitions.DEFAULT_PARTITION, IStructuredPartitions.UNKNOWN_PARTITION};
-		}
-		return fConfiguredContentTypes;
-	}
-
-	protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
-		IContentAssistProcessor[] processors = null;
-
-		if ((partitionType == ICSSPartitions.STYLE) || (partitionType == IStructuredPartitions.UNKNOWN_PARTITION)) {
-			processors = new IContentAssistProcessor[]{new CSSContentAssistProcessor()};
-		}
-
-		return processors;
-	}
-
-	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		IContentFormatter formatter = super.getContentFormatter(sourceViewer);
-		// super was unable to create a formatter, probably because
-		// sourceViewer does not have document set yet, so just create a
-		// generic one
-		if (!(formatter instanceof MultiPassContentFormatter))
-			formatter = new MultiPassContentFormatter(getConfiguredDocumentPartitioning(sourceViewer), ICSSPartitions.STYLE);
-
-		((MultiPassContentFormatter) formatter).setMasterStrategy(new StructuredFormattingStrategy(new FormatProcessorCSS()));
-
-		return formatter;
-	}
-
-	public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
-		Vector vector = new Vector();
-
-		// prefix[0] is either '\t' or ' ' x tabWidth, depending on preference
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		int indentationWidth = preferences.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-		String indentCharPref = preferences.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-		boolean useSpaces = CSSCorePreferenceNames.SPACE.equals(indentCharPref);
-
-		for (int i = 0; i <= indentationWidth; i++) {
-			StringBuffer prefix = new StringBuffer();
-			boolean appendTab = false;
-
-			if (useSpaces) {
-				for (int j = 0; j + i < indentationWidth; j++)
-					prefix.append(' ');
-
-				if (i != 0)
-					appendTab = true;
-			}
-			else {
-				for (int j = 0; j < i; j++)
-					prefix.append(' ');
-
-				if (i != indentationWidth)
-					appendTab = true;
-			}
-
-			if (appendTab) {
-				prefix.append('\t');
-				vector.add(prefix.toString());
-				// remove the tab so that indentation - tab is also an indent
-				// prefix
-				prefix.deleteCharAt(prefix.length() - 1);
-			}
-			vector.add(prefix.toString());
-		}
-
-		vector.add(""); //$NON-NLS-1$
-
-		return (String[]) vector.toArray(new String[vector.size()]);
-	}
-
-	public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-		LineStyleProvider[] providers = null;
-
-		if (partitionType == ICSSPartitions.STYLE || partitionType == ICSSPartitions.COMMENT) {
-			providers = new LineStyleProvider[]{getLineStyleProviderForCSS()};
-		}
-
-		return providers;
-	}
-
-	private LineStyleProvider getLineStyleProviderForCSS() {
-		if (fLineStyleProviderForCSS == null) {
-			fLineStyleProviderForCSS = new LineStyleProviderForCSS();
-		}
-		return fLineStyleProviderForCSS;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/ActionContributorCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/ActionContributorCSS.java
deleted file mode 100644
index d7b45af..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/ActionContributorCSS.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
-import org.eclipse.ui.texteditor.RetargetTextEditorAction;
-import org.eclipse.wst.sse.ui.internal.actions.ActionContributor;
-import org.eclipse.wst.sse.ui.internal.actions.ActionDefinitionIds;
-import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants;
-
-/**
- * ActionContributorCSS
- * 
- * This class should not be used inside multi page editor's
- * ActionBarContributor, since cascaded init() call from the
- * ActionBarContributor will causes exception and it leads to lose whole
- * toolbars.
- * 
- * Instead, use SourcePageActionContributor for source page contributor of
- * multi page editor.
- * 
- * Note that this class is still valid for single page editor.
- */
-public class ActionContributorCSS extends ActionContributor {
-	private static final String[] EDITOR_IDS = {"org.eclipse.wst.css.core.csssource.source", "org.eclipse.wst.sse.ui.StructuredTextEditor"}; //$NON-NLS-1$ //$NON-NLS-2$
-
-	protected RetargetTextEditorAction fContentAssist = null;
-	protected RetargetTextEditorAction fCleanupDocument = null;
-	protected RetargetTextEditorAction fFormatDocument = null;
-	protected RetargetTextEditorAction fFormatActiveElements = null;
-
-	public ActionContributorCSS() {
-		super();
-
-		ResourceBundle resourceBundle = CSSUIMessages.getResourceBundle();
-
-		// edit commands
-		fContentAssist = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fContentAssist.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
-
-		// source commands
-		fCleanupDocument = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fCleanupDocument.setActionDefinitionId(ActionDefinitionIds.CLEANUP_DOCUMENT);
-
-		fFormatDocument = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fFormatDocument.setActionDefinitionId(ActionDefinitionIds.FORMAT_DOCUMENT);
-
-		fFormatActiveElements = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fFormatActiveElements.setActionDefinitionId(ActionDefinitionIds.FORMAT_ACTIVE_ELEMENTS);
-	}
-
-	protected String[] getExtensionIDs() {
-		return EDITOR_IDS;
-	}
-
-	protected void addToMenu(IMenuManager menu) {
-		// edit commands
-		IMenuManager editMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
-		if (editMenu != null) {
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fToggleInsertModeAction);
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fExpandSelectionToMenu);
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fContentAssist);
-			editMenu.add(fMenuAdditionsGroupMarker);
-		}
-
-		// source commands
-		String sourceMenuLabel = CSSUIMessages.SourceMenu_label;
-		String sourceMenuId = "sourceMenuId"; //$NON-NLS-1$
-		IMenuManager sourceMenu = new MenuManager(sourceMenuLabel, sourceMenuId);
-		menu.insertAfter(IWorkbenchActionConstants.M_EDIT, sourceMenu);
-		if (sourceMenu != null) {
-			sourceMenu.add(fCommandsSeparator);
-			sourceMenu.add(fShiftRight);
-			sourceMenu.add(fShiftLeft);
-			sourceMenu.add(fCleanupDocument);
-			sourceMenu.add(fFormatDocument);
-			sourceMenu.add(fFormatActiveElements);
-			sourceMenu.add(fCommandsSeparator);
-		}
-		IMenuManager navigateMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_NAVIGATE);
-		if (navigateMenu != null) {
-			IMenuManager gotoGroup = navigateMenu.findMenuUsingPath(IWorkbenchActionConstants.GO_TO);
-			if (gotoGroup != null) {
-				gotoGroup.add(fGotoMatchingBracketAction);
-			}
-		}
-	}
-
-	public void setActiveEditor(IEditorPart activeEditor) {
-		super.setActiveEditor(activeEditor);
-
-		ITextEditor textEditor = getTextEditor(activeEditor);
-
-		fContentAssist.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_PROPOSALS));
-
-		fCleanupDocument.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_CLEANUP_DOCUMENT));
-		fFormatDocument.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_DOCUMENT));
-		fFormatActiveElements.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_ACTIVE_ELEMENTS));
-		fCleanupDocument.setEnabled(textEditor != null && textEditor.isEditable());
-		fFormatDocument.setEnabled(textEditor != null && textEditor.isEditable());
-		fFormatActiveElements.setEnabled(textEditor != null && textEditor.isEditable());
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIMessages.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIMessages.java
deleted file mode 100644
index 56040a5..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIMessages.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-public class CSSUIMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.css.ui.internal.CSSUIPluginResources";//$NON-NLS-1$
-	private static ResourceBundle fResourceBundle;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, CSSUIMessages.class);
-	}
-
-	public static ResourceBundle getResourceBundle() {
-		try {
-			if (fResourceBundle == null)
-				fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
-		}
-		catch (MissingResourceException x) {
-			fResourceBundle = null;
-		}
-		return fResourceBundle;
-	}
-	
-	public static String INFO_Not_Categorized_1;
-	public static String PrefsLabel_WrappingWithoutAttr;
-	public static String PrefsLabel_WrappingInsertLineBreak;
-	public static String PrefsLabel_CaseGroup;
-	public static String PrefsLabel_CaseIdent;
-	public static String PrefsLabel_CasePropName;
-	public static String PrefsLabel_CasePropValue;
-	public static String PrefsLabel_CaseIdentUpper;
-	public static String PrefsLabel_CaseIdentLower;
-	public static String PrefsLabel_SelectorTagName;
-	public static String PrefsLabel_CasePropNameUpper;
-	public static String PrefsLabel_CasePropNameLower;
-	public static String PrefsLabel_CasePropValueUpper;
-	public static String PrefsLabel_CasePropValueLower;
-	public static String PrefsLabel_SelectorTagNameUpper;
-	public static String PrefsLabel_SelectorTagNameLower;
-	public static String PrefsLabel_ColorSample;
-	public static String PrefsLabel_ColorNormal;
-	public static String PrefsLabel_ColorAtmarkRule;
-	public static String PrefsLabel_ColorSelector;
-	public static String PrefsLabel_ColorCombinator;
-	public static String PrefsLabel_ColorUniversal;
-	public static String PrefsLabel_ColorId;
-	public static String PrefsLabel_ColorPseudoClass;
-	public static String PrefsLabel_ColorClass;
-	public static String PrefsLabel_ColorMedia;
-	public static String PrefsLabel_ColorComment;
-	public static String PrefsLabel_ColorPropertyName;
-	public static String PrefsLabel_ColorPropertyValue;
-	public static String PrefsLabel_ColorUri;
-	public static String PrefsLabel_ColorString;
-	public static String PrefsLabel_ColorColon;
-	public static String PrefsLabel_ColorSemiColon;
-	public static String PrefsLabel_ColorCurlyBrace;
-	public static String PrefsLabel_ColorError;
-	public static String PrefsLabel_ColorAttrDelimiter;
-	public static String PrefsLabel_ColorAttrName;
-	public static String PrefsLabel_ColorAttrValue;
-	public static String PrefsLabel_ColorAttrOperator;
-	public static String SortAction_0;
-	public static String _UI_WIZARD_NEW_TITLE;
-	public static String _UI_WIZARD_NEW_HEADING;
-	public static String _UI_WIZARD_NEW_DESCRIPTION;
-	public static String _ERROR_FILENAME_MUST_END_CSS;
-	public static String _WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT;
-	public static String Title_InvalidValue;
-	public static String Message_InvalidValue;
-	public static String FormatMenu_label;
-	public static String CleanupDocument_label; // resource bundle
-	public static String CleanupDocument_tooltip; // resource bundle
-	public static String CleanupDocument_description; // resource bundle
-	public static String UI_none;
-	public static String Cleanup_UI_;
-	public static String CSS_Cleanup_UI_;
-	public static String ToggleComment_tooltip;
-	public static String AddBlockComment_tooltip;
-	public static String RemoveBlockComment_tooltip;
-	public static String Identifier_case__UI_;
-	public static String Property_name_case__UI_;
-	public static String Property_value_case__UI_;
-	public static String Selector_tag_name_case__UI_;
-	public static String Quote_values_UI_;
-	public static String Format_source_UI_;
-	public static String As_is_UI_;
-	public static String Lower_UI_;
-	public static String Upper_UI_;
-	public static String SourceMenu_label;
-	public static String Formatting_UI_;
-	public static String Line_width__UI_;
-	public static String Indent_using_tabs_;
-	public static String Indent_using_spaces;
-	public static String Indentation_size;
-	public static String Indentation_size_tip;
-	public static String StructureSelectEnclosing_label;
-	public static String StructureSelectEnclosing_tooltip;
-	public static String StructureSelectEnclosing_description;
-	public static String StructureSelectNext_label;
-	public static String StructureSelectNext_tooltip;
-	public static String StructureSelectNext_description;
-	public static String StructureSelectPrevious_label;
-	public static String StructureSelectPrevious_tooltip;
-	public static String StructureSelectPrevious_description;
-	public static String Creating_files_encoding;
-	public static String ResourceGroup_nameExists;
-	public static String NewCSSTemplatesWizardPage_0;
-	public static String NewCSSTemplatesWizardPage_1;
-	public static String NewCSSTemplatesWizardPage_2;
-	public static String NewCSSTemplatesWizardPage_3;
-	public static String NewCSSTemplatesWizardPage_4;
-	public static String NewCSSTemplatesWizardPage_5;
-	public static String NewCSSTemplatesWizardPage_6;
-	public static String NewCSSTemplatesWizardPage_7;
-	public static String CSSContentSettingsPropertyPage_0;
-	public static String CSSContentSettingsPropertyPage_1;
-	public static String SyntaxColoringPage_0;
-	public static String SyntaxColoringPage_2;
-	public static String SyntaxColoringPage_3;
-	public static String SyntaxColoringPage_4;
-	public static String SyntaxColoringPage_5;
-	public static String SyntaxColoringPage_6;
-	public static String _UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK;
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPlugin.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPlugin.java
deleted file mode 100644
index 1fcef91..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPlugin.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.css.ui.internal.preferences.CSSUIPreferenceNames;
-import org.eclipse.wst.css.ui.internal.templates.TemplateContextTypeIdsCSS;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CSSUIPlugin extends AbstractUIPlugin {
-	public final static String ID = "org.eclipse.wst.css.ui"; //$NON-NLS-1$
-	//The shared instance.
-	private static CSSUIPlugin plugin;	
-	
-	/**
-	 * The template store for the css ui.
-	 */
-	private TemplateStore fTemplateStore;
-
-	/**
-	 * The template context type registry for css ui.
-	 */
-	private ContextTypeRegistry fContextTypeRegistry;
-
-	/**
-	 * The constructor.
-	 */
-	public CSSUIPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static CSSUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-	
-	/**
-	 * Returns the template store for the css editor templates.
-	 * 
-	 * @return the template store for the css editor templates
-	 */
-	public TemplateStore getTemplateStore() {
-		if (fTemplateStore == null) {
-			fTemplateStore = new ContributionTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), CSSUIPreferenceNames.TEMPLATES_KEY);
-
-			try {
-				fTemplateStore.load();
-			} catch (IOException e) {
-				Logger.logException(e);
-			}
-		}
-		return fTemplateStore;
-	}
-
-	/**
-	 * Returns the template context type registry for the css plugin.
-	 * 
-	 * @return the template context type registry for the css plugin
-	 */
-	public ContextTypeRegistry getTemplateContextRegistry() {
-		if (fContextTypeRegistry == null) {
-			ContributionContextTypeRegistry registry = new ContributionContextTypeRegistry();
-			registry.addContextType(TemplateContextTypeIdsCSS.ALL);
-			registry.addContextType(TemplateContextTypeIdsCSS.NEW);
-
-			fContextTypeRegistry = registry;
-		}
-
-		return fContextTypeRegistry;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPluginResources.properties b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPluginResources.properties
deleted file mode 100644
index a29d6c2..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/CSSUIPluginResources.properties
+++ /dev/null
@@ -1,128 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-INFO_Not_Categorized_1=Not Categorized
-
-## CSS Preferences -- source ##
-PrefsLabel_WrappingWithoutAttr=Disable wrapping in style &attribute of HTML
-PrefsLabel_WrappingInsertLineBreak=Insert &line break between properties
-
-PrefsLabel_CaseGroup=Capitalization style
-PrefsLabel_CaseIdent=Identifier:
-PrefsLabel_CasePropName=Property name:
-PrefsLabel_CasePropValue=Property value:
-PrefsLabel_SelectorTagName=Selector tag name:
-
-PrefsLabel_CaseIdentUpper=&Uppercase
-PrefsLabel_CaseIdentLower=L&owercase
-PrefsLabel_CasePropNameUpper=U&ppercase
-PrefsLabel_CasePropNameLower=Lo&wercase
-PrefsLabel_CasePropValueUpper=Upp&ercase
-PrefsLabel_CasePropValueLower=Lowe&rcase
-PrefsLabel_SelectorTagNameUpper=Upper&case
-PrefsLabel_SelectorTagNameLower=Lowerca&se
-
-## CSS Preferences -- color ##
-
-## The following line is a sample CSS document.  Please translate only the following parts:
-## Sample Styles
-PrefsLabel_ColorSample=@import url("../sample2.css");\n\n/* Sample Styles */\n\nBODY {\n\tcolor : black;\n\tbackground-color : rgb(181, 253, 211);\n\ttext-align : center;\n\tfont-family : "Heisei Mincho W3", serif\n}\n\n#content > div *.links a[href~="http://"]:hover {\n\ttext-decoration : underline;\n}\n\n@page :left { margin-left : 4cm }\n\n@media aural {\n\tP.heidi {\n\t\tazimuth : center-left;\n\t\televation : 12.3deg;\n\t\tpause : 30ms 1.6s\n\t}\n}\n
-
-PrefsLabel_ColorNormal=Default
-PrefsLabel_ColorAtmarkRule=At-Rule
-PrefsLabel_ColorSelector=Type Selector
-PrefsLabel_ColorCombinator=Combinator
-PrefsLabel_ColorUniversal=Universal Selector
-PrefsLabel_ColorId=Id Selector
-PrefsLabel_ColorPseudoClass=Pseudo-class
-PrefsLabel_ColorClass=Class Selector
-PrefsLabel_ColorMedia=Media Name
-PrefsLabel_ColorComment=Comment
-PrefsLabel_ColorPropertyName=Property Name
-PrefsLabel_ColorPropertyValue=Property Value
-PrefsLabel_ColorUri=URI
-PrefsLabel_ColorString=Quoted String
-PrefsLabel_ColorColon=Property Delimiter
-PrefsLabel_ColorSemiColon=Semicolon
-PrefsLabel_ColorCurlyBrace=Curly Brace
-PrefsLabel_ColorError=Error
-PrefsLabel_ColorAttrDelimiter=Attribute Selector Delimiter
-PrefsLabel_ColorAttrName=Attribute Name
-PrefsLabel_ColorAttrValue=Attribute Value
-PrefsLabel_ColorAttrOperator=Attribute Selector Operator
-#
-SortAction_0=Sort
-#
-_UI_WIZARD_NEW_TITLE = New CSS File
-_UI_WIZARD_NEW_HEADING = CSS
-_UI_WIZARD_NEW_DESCRIPTION = Create a new CSS file.
-_ERROR_FILENAME_MUST_END_CSS = The file name must end in one of the following extensions {0}.
-_WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT = Files created outside of the Web Content folder will not be included in your deployed Web application. 
-#
-Title_InvalidValue=Invalid Value
-Message_InvalidValue=Invalid property value.
-# Copied from sse.ui
-FormatMenu_label=F&ormat
-CleanupDocument_label=C&leanup Document...
-CleanupDocument_tooltip=Cleanup Document
-CleanupDocument_description=Cleanup Document
-UI_none=none
-Cleanup_UI_=Cleanup
-CSS_Cleanup_UI_=CSS Cleanup
-AddBlockComment_tooltip=Add Block Comment
-RemoveBlockComment_tooltip=Remove Block Comment
-ToggleComment_tooltip=Toggle Comment
-Identifier_case__UI_=Identifier case:
-Property_name_case__UI_=Property name case:
-Property_value_case__UI_=Property value case:
-Selector_tag_name_case__UI_=Selector tag name case:
-Quote_values_UI_=Quote values
-Format_source_UI_=&Format source
-As_is_UI_=As-is
-Lower_UI_=Lower
-Upper_UI_=Upper
-SourceMenu_label=&Source
-Formatting_UI_=Formatting
-Line_width__UI_=Line &width:
-Indent_using_tabs_=&Indent using tabs
-Indent_using_spaces=I&ndent using spaces
-Indentation_size=In&dentation size:
-Indentation_size_tip=Indentation size
-StructureSelectEnclosing_label=&Enclosing Element
-StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
-StructureSelectEnclosing_description=Expand selection to include enclosing element
-StructureSelectNext_label=&Next Element
-StructureSelectNext_tooltip=Expand selection to include next sibling
-StructureSelectNext_description=Expand selection to include next sibling
-StructureSelectPrevious_label=&Previous Element
-StructureSelectPrevious_tooltip=Expand selection to include previous sibling
-StructureSelectPrevious_description=Expand selection to include previous sibling
-##
-Creating_files_encoding=Creating files encoding preference
-ResourceGroup_nameExists = The same name already exists.
-NewCSSTemplatesWizardPage_0=Select CSS Template
-NewCSSTemplatesWizardPage_1=Select a template as initial content in the CSS page.
-NewCSSTemplatesWizardPage_2=Name
-NewCSSTemplatesWizardPage_3=Description
-NewCSSTemplatesWizardPage_4=&Use CSS Template
-NewCSSTemplatesWizardPage_5=&Preview:
-NewCSSTemplatesWizardPage_6=Templates are 'New CSS' templates found in the <a>CSS Templates</a> preference page.
-NewCSSTemplatesWizardPage_7=&Templates:
-# CSS Content Settings
-CSSContentSettingsPropertyPage_0=The type of CSS to use.  The project setting is used if you specify "none."
-CSSContentSettingsPropertyPage_1=CSS Profile:
-SyntaxColoringPage_0=Syntax Element:
-SyntaxColoringPage_2=Enable
-SyntaxColoringPage_3=&Bold
-SyntaxColoringPage_4=&Italic
-SyntaxColoringPage_5=&Strikethrough
-SyntaxColoringPage_6=&Underline
-_UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK=CSS editing preferences.  Note that some preferences may be set on the <a>{0}</a> preference page.
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/Logger.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/Logger.java
deleted file mode 100644
index 73eba5e..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/Logger.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal;
-
-
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.css.ui"; //$NON-NLS-1$
-	
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-
-	public static final int OK = IStatus.OK; // 0
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int ERROR = IStatus.ERROR; // 4
-
-	public static final int OK_DEBUG = 200 + OK;
-	public static final int INFO_DEBUG = 200 + INFO;
-	public static final int WARNING_DEBUG = 200 + WARNING;
-	public static final int ERROR_DEBUG = 200 + ERROR;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-	
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/autoedit/StructuredAutoEditStrategyCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/autoedit/StructuredAutoEditStrategyCSS.java
deleted file mode 100644
index 43e9c53..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/autoedit/StructuredAutoEditStrategyCSS.java
+++ /dev/null
@@ -1,596 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.autoedit;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorExtension3;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-public class StructuredAutoEditStrategyCSS implements IAutoEditStrategy {
-	protected IStructuredDocument structuredDocument = null;
-
-	class CompoundRegion {
-
-		/* textRegion can be null if the offset is at the end of the document */
-		CompoundRegion(IStructuredDocumentRegion documentRegion, ITextRegion textRegion) {
-			super();
-			this.documentRegion = documentRegion;
-			this.textRegion = textRegion;
-		}
-
-		IStructuredDocumentRegion getDocumentRegion() {
-			return documentRegion;
-		}
-
-		ITextRegion getTextRegion() {
-			return textRegion;
-		}
-
-		int getStart() {
-			return (textRegion != null) ? textRegion.getStart() : documentRegion.getStart();
-		}
-
-		int getEnd() {
-			return (textRegion != null) ? textRegion.getEnd() : documentRegion.getEnd();
-		}
-
-		String getType() {
-			return (textRegion != null) ? textRegion.getType() : CSSRegionContexts.CSS_UNKNOWN;
-		}
-
-		String getText() {
-			return (textRegion != null) ? documentRegion.getText(textRegion) : ""; //$NON-NLS-1$
-		}
-
-		int getStartOffset() {
-			return (textRegion != null) ? documentRegion.getStartOffset(textRegion) : documentRegion.getStartOffset();
-		}
-
-		int getEndOffset() {
-			return (textRegion != null) ? documentRegion.getEndOffset(textRegion) : documentRegion.getEndOffset();
-		}
-
-		private IStructuredDocumentRegion documentRegion;
-		private ITextRegion textRegion;
-
-	}
-
-	/**
-	 */
-	protected void autoIndentAfterClose(DocumentCommand command, String regionType) {
-		if (!setRangeForClose(command))
-			return;
-
-		int position = command.offset + command.length;
-
-		if (position == -1 || structuredDocument.getLength() == 0) {
-			return;
-		}
-
-		// get open brace region
-		CompoundRegion region = prevCorrespondence(position, regionType);
-
-		// get indentation
-		String str = getIndentFor(region, false);
-
-		// append to input
-		if (str != null)
-			command.text = str + command.text;
-	}
-
-	/**
-	 * Copies the indentation of the previous line.
-	 */
-	protected void autoIndentAfterNewLine(DocumentCommand command) {
-		// select nearest white spaces to replace with new-line
-		setRangeForNewLine(command);
-
-		// get position
-		int position = command.offset;
-
-		if (position == -1 || structuredDocument.getLength() == 0) {
-			return;
-		}
-
-		// get current region
-		CompoundRegion currentRegion = getRegion(command.offset + command.length);
-
-		// get key region
-		CompoundRegion keyRegion = getPrevKeyRegion(position, currentRegion);
-
-		// get indent string
-		String str = getIndentFor(keyRegion, true);
-
-		// check another indentation
-		int shift = needShift(keyRegion, command.offset + command.length);
-
-		// create text to replace
-		StringBuffer buf = new StringBuffer(command.text);
-		if (str != null)
-			buf.append(str);
-		while (shift-- != 0)
-			buf.append(getIndentString());
-		command.text = buf.toString();
-
-	}
-
-	/**
-	 */
-	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		Object textEditor = getActiveTextEditor();
-		if (!(textEditor instanceof ITextEditorExtension3 && ((ITextEditorExtension3) textEditor).getInsertMode() == ITextEditorExtension3.SMART_INSERT))
-			return;
-
-		// return;
-		// /*
-		structuredDocument = (IStructuredDocument) document;
-
-		if (command.length == 0 && command.text != null) {
-			if (endsWith(document.getLegalLineDelimiters(), command.text) != -1) {
-				autoIndentAfterNewLine(command);
-			} else if (command.text.equals("}")) {//$NON-NLS-1$
-				autoIndentAfterClose(command, CSSRegionContexts.CSS_RBRACE);
-			} else if (command.text.equals("]")) {//$NON-NLS-1$
-				autoIndentAfterClose(command, CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END);
-			} else if (command.text.equals(")")) {//$NON-NLS-1$
-				autoIndentAfterClose(command, CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE);
-			}
-		}
-		// */
-		
-		// spaces for tab character
-		if (command.text != null && command.text.length() > 0 && command.text.charAt(0) == '\t')
-			smartInsertForTab(command, document);
-	}
-
-	/**
-	 */
-	protected String getIndentFor(CompoundRegion region, boolean indentForNextRegion) {
-		if (region == null)
-			return null;
-		IStructuredDocumentRegion flatNode = region.getDocumentRegion();
-		if (flatNode == null)
-			return null;
-
-		try {
-			if (region.getType() == CSSRegionContexts.CSS_LBRACE || region.getType() == CSSRegionContexts.CSS_DELIMITER || region.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-				// get meanful flat node
-				RegionIterator it = new RegionIterator(flatNode, region.getTextRegion());
-				it.prev();
-				while (it.hasPrev()) {
-					ITextRegion r = it.prev();
-					region = new CompoundRegion(it.getStructuredDocumentRegion(), r);
-					if (region.getType() != CSSRegionContexts.CSS_S)
-						break;
-				}
-				flatNode = region.getDocumentRegion();
-				// get indent string
-				int position = flatNode.getStart();
-				int line = structuredDocument.getLineOfOffset(position);
-				int start = structuredDocument.getLineOffset(line);
-				int end = findEndOfWhiteSpace(structuredDocument, start, position);
-				return structuredDocument.get(start, end - start);
-			} else if (region.getType() == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START ||
-			// region.getType() == CSSRegionContexts.CSS_PARENTHESIS_OPEN ||
-						region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION || region.getType() == CSSRegionContexts.CSS_DECLARATION_SEPARATOR) {
-				int position = flatNode.getStart() + region.getStart();
-				int line = structuredDocument.getLineOfOffset(position);
-				int start = structuredDocument.getLineOffset(line);
-				int end = findEndOfWhiteSpace(structuredDocument, start, position);
-				StringBuffer buf = new StringBuffer(structuredDocument.get(start, end - start));
-				position += region.getText().length();
-				if (indentForNextRegion) {
-					int tokenStart = findEndOfWhiteSpace(structuredDocument, position, structuredDocument.getLineOffset(line) + structuredDocument.getLineLength(line) - 1);
-					if (tokenStart < structuredDocument.getLineOffset(line) + structuredDocument.getLineLength(line) - 1) {
-						position = tokenStart;
-					}
-				}
-				while (position - end > 0) {
-					buf.append(" ");//$NON-NLS-1$
-					end++;
-				}
-				return buf.toString();
-			} else
-				return "";//$NON-NLS-1$
-		} catch (BadLocationException excp) {
-			Logger.logException(excp);
-		}
-		return null;
-	}
-
-	/**
-	 */
-	protected CompoundRegion getPrevKeyRegion(int position, CompoundRegion currentRegion) {
-		if (currentRegion == null) {
-			if (structuredDocument.getLastStructuredDocumentRegion() == null)
-				return null;
-		}
-
-		if (currentRegion != null && (currentRegion.getType() == CSSRegionContexts.CSS_RBRACE || currentRegion.getType() == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END || currentRegion.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)) {
-			return prevCorrespondence(currentRegion);
-		}
-
-		RegionIterator it = new RegionIterator(structuredDocument, position - 1);
-		while (it.hasPrev()) {
-			ITextRegion r = it.prev();
-			CompoundRegion region = new CompoundRegion(it.getStructuredDocumentRegion(), r);
-			if (region.getType() == CSSRegionContexts.CSS_LBRACE ||
-			// region.getType() == CSSRegionContexts.CSS_RBRACE ||
-						region.getType() == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START ||
-						// region.getType() ==
-						// CSSRegionContexts.CSS_BRACKET_CLOSE ||
-						// // region.getType() ==
-						// CSSRegionContexts.CSS_PARENTHESIS_OPEN ||
-						// region.getType() ==
-						// CSSRegionContexts.CSS_PARENTHESIS_CLOSE ||
-						region.getType() == CSSRegionContexts.CSS_DELIMITER || region.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER ||
-						// region.getType() == CSSRegionContexts.CSS_COLON ||
-						// region.getType() == CSSRegionContexts.CSS_COMMENT
-						// ||
-						region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION) {
-				return region;
-			} else if (region.getType() == CSSRegionContexts.CSS_RBRACE || region.getType() == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END || region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE) {
-				// skip to LBRACE
-				CompoundRegion pc = prevCorrespondence(region);
-				// guard for NPE
-				//https://bugs.eclipse.org/bugs/show_bug.cgi?id=111318
-				if (pc == null) break;
-				it.reset(pc.getDocumentRegion(), pc.getTextRegion());
-				it.prev();
-			} else if (region.getType() == CSSRegionContexts.CSS_STRING) {
-				RegionIterator itTmp = new RegionIterator(structuredDocument, position);
-				if (region == itTmp.prev())
-					return region; // position is inside of string
-			} else if (region.getType() == CSSRegionContexts.CSS_COMMENT) {
-				RegionIterator itTmp = new RegionIterator(structuredDocument, position);
-				if (region == itTmp.prev())
-					return region; // position is inside of comment
-			} else if (region.getType() == CSSRegionContexts.CSS_UNKNOWN) {
-				String str = region.getText();
-				if (str.charAt(str.length() - 1) == '\\')
-					return region;
-			} else if (region.getType() == CSSRegionContexts.CSS_DECLARATION_SEPARATOR) {
-				RegionIterator itPrev = new RegionIterator(region.getDocumentRegion(), region.getTextRegion());
-				while (itPrev.hasPrev()) {
-					ITextRegion regionPrev = itPrev.prev();
-					if (regionPrev.getType() == CSSRegionContexts.CSS_RBRACE) {
-						break;
-					} else if (regionPrev.getType() == CSSRegionContexts.CSS_DELIMITER || regionPrev.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-						return region;
-					} else if (regionPrev.getType() == CSSRegionContexts.CSS_LBRACE) {
-						while (itPrev.hasPrev()) {
-							regionPrev = itPrev.prev();
-							if (regionPrev.getType() == CSSRegionContexts.CSS_MEDIA)
-								break;
-							if (regionPrev.getType() == CSSRegionContexts.CSS_LBRACE || regionPrev.getType() == CSSRegionContexts.CSS_RBRACE || regionPrev.getType() == CSSRegionContexts.CSS_DELIMITER || regionPrev.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER)
-								return region;
-						}
-						if (regionPrev.getType() == CSSRegionContexts.CSS_MEDIA)
-							break;
-						else
-							return region;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 */
-	protected CompoundRegion getRegion(int position) {
-		IStructuredDocumentRegion flatNode = structuredDocument.getRegionAtCharacterOffset(position);
-		if (flatNode != null)
-			return new CompoundRegion(flatNode, flatNode.getRegionAtCharacterOffset(position));
-		return null;
-	}
-
-	/**
-	 */
-	protected int needShift(CompoundRegion region, int position) {
-		int shift = 0;
-		if (region == null || region.getType() == CSSRegionContexts.CSS_DELIMITER || region.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER || region.getType() == CSSRegionContexts.CSS_LBRACE) {
-			// get non space region
-			CompoundRegion cr = getRegion(position - 1);
-			RegionIterator it = new RegionIterator(cr.getDocumentRegion(), cr.getTextRegion());
-			ITextRegion nearestRegion = null;
-			while (it.hasPrev()) {
-				nearestRegion = it.prev();
-				if (nearestRegion.getType() != CSSRegionContexts.CSS_S && nearestRegion.getType() != CSSRegionContexts.CSS_COMMENT)
-					break;
-			}
-			if (nearestRegion != null && (nearestRegion.getType() == CSSRegionContexts.CSS_LBRACE || nearestRegion.getType() == CSSRegionContexts.CSS_RBRACE || nearestRegion.getType() == CSSRegionContexts.CSS_DELIMITER || nearestRegion.getType() == CSSRegionContexts.CSS_DECLARATION_DELIMITER))
-				shift--;
-			else if (region == null)
-				shift--;
-			shift++;
-		}
-		if (region != null && region.getType() == CSSRegionContexts.CSS_LBRACE) {
-			RegionIterator it = new RegionIterator(structuredDocument, position);
-			if (!it.hasPrev() || it.prev().getType() != CSSRegionContexts.CSS_RBRACE)
-				shift++;
-			else
-				shift = 0;
-		}
-		return shift;
-	}
-
-	/**
-	 */
-	protected CompoundRegion prevCorrespondence(int position, String regionType) {
-		RegionIterator it = new RegionIterator(structuredDocument, position - 1);
-		ITextRegion region = null;
-		int nest = 1;
-		if (regionType == CSSRegionContexts.CSS_RBRACE) {
-			// skip to LBRACE
-			while (it.hasPrev()) {
-				region = it.prev();
-				if (region.getType() == CSSRegionContexts.CSS_LBRACE)
-					nest--;
-				else if (region.getType() == CSSRegionContexts.CSS_RBRACE)
-					nest++;
-				if (nest <= 0)
-					break;
-			}
-			if (nest == 0)
-				return new CompoundRegion(it.getStructuredDocumentRegion(), region);
-		}
-		if (regionType == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END) {
-			// skip to BRACKET_OPEN
-			while (it.hasPrev()) {
-				region = it.prev();
-				if (region.getType() == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START)
-					nest--;
-				else if (region.getType() == CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END)
-					nest++;
-				if (nest <= 0)
-					break;
-			}
-			if (nest == 0)
-				return new CompoundRegion(it.getStructuredDocumentRegion(), region);
-		}
-		if (regionType == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE) {
-			// skip to PARENTHESIS_OPEN
-			while (it.hasPrev()) {
-				region = it.prev();
-				if (// region.getType() ==
-				// CSSRegionContexts.CSS_PARENTHESIS_OPEN ||
-				region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION)
-					nest--;
-				else if (region.getType() == CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE)
-					nest++;
-				if (nest <= 0)
-					break;
-			}
-			if (nest == 0)
-				return new CompoundRegion(it.getStructuredDocumentRegion(), region);
-		}
-		return null;
-	}
-
-	/**
-	 */
-	protected CompoundRegion prevCorrespondence(CompoundRegion region) {
-		if (region == null)
-			return null;
-
-		IStructuredDocumentRegion flatNode = region.getDocumentRegion();
-		int position = flatNode.getStart() + region.getStart();
-		return prevCorrespondence(position, region.getType());
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * 
-	 * @return boolean
-	 * @param command
-	 *            org.eclipse.jface.text.DocumentCommand
-	 */
-	protected boolean setRangeForClose(DocumentCommand command) {
-		int position = command.offset;
-
-		if (position == -1 || structuredDocument.getLength() == 0) {
-			return false;
-		}
-
-		try {
-			// find start of line
-			int p = (position == structuredDocument.getLength() ? position - 1 : position);
-
-			int line = structuredDocument.getLineOfOffset(p);
-			int start = structuredDocument.getLineOffset(line);
-			RegionIterator it = new RegionIterator(structuredDocument, start);
-			boolean allWhiteSpace = false;
-			// check whether the text from lStart to position is white space
-			// or not
-			while (it.hasNext()) {
-				ITextRegion region = it.next();
-				if (region.getType() != CSSRegionContexts.CSS_S)
-					break;
-				if (it.getStructuredDocumentRegion().getEndOffset(region) > p) {
-					allWhiteSpace = true;
-					break;
-				}
-			}
-			if (allWhiteSpace) {
-				command.length = command.length - (start - command.offset);
-				command.offset = start;
-				return true;
-			}
-		} catch (BadLocationException excp) {
-			Logger.logException(excp);
-		}
-		return false;
-	}
-
-	/**
-	 */
-	protected void setRangeForNewLine(DocumentCommand command) {
-		int position = command.offset;
-
-		if (position == -1 || structuredDocument.getLength() == 0) {
-			return;
-		}
-
-		try {
-			// add pre-nearest white spaces to replace target
-			if (position > 0) {
-				IStructuredDocumentRegion flatNode = structuredDocument.getRegionAtCharacterOffset(position - 1);
-				if (flatNode != null) {
-					ITextRegion region = flatNode.getRegionAtCharacterOffset(position - 1);
-					if (region.getType() == CSSRegionContexts.CSS_S) {
-						int end = command.offset + command.length;
-						int nLine = structuredDocument.getLineOfOffset(position);
-						int nStartPos = structuredDocument.getLineOffset(nLine);
-						if (nStartPos < flatNode.getStartOffset(region))
-							nStartPos = flatNode.getStartOffset(region);
-						command.offset = nStartPos;
-						command.length = end - command.offset;
-					}
-				}
-			}
-
-			// add post-nearest white spaces to replace target
-			if (position < structuredDocument.getLength()) {
-				IStructuredDocumentRegion flatNode = structuredDocument.getRegionAtCharacterOffset(position);
-				if (flatNode != null) {
-					ITextRegion region = flatNode.getRegionAtCharacterOffset(position);
-					if (region.getType() == CSSRegionContexts.CSS_S) {
-						int nLine = structuredDocument.getLineOfOffset(position);
-						String currentLineDelim = structuredDocument.getLineDelimiter(nLine);
-						int nEndPos = structuredDocument.getLineOffset(nLine) + structuredDocument.getLineLength(nLine) - ((currentLineDelim != null) ? currentLineDelim.length() : 0);
-						if (nEndPos > flatNode.getEndOffset(region))
-							nEndPos = flatNode.getEndOffset(region);
-						command.length = nEndPos - command.offset;
-					}
-				}
-			}
-		} catch (BadLocationException e) {
-			// do not customize command
-		}
-
-	}
-
-	private static int endsWith(String[] searchStrings, String text) {
-		for (int i = 0; i < searchStrings.length; i++) {
-			if (text.endsWith(searchStrings[i]))
-				return i;
-		}
-		return -1;
-	}
-
-	private static int findEndOfWhiteSpace(IDocument document, int offset, int end) throws BadLocationException {
-		while (offset < end) {
-			char c = document.getChar(offset);
-			if (c != ' ' && c != '\t') {
-				return offset;
-			}
-			offset++;
-		}
-		return end;
-	}
-
-
-	private String getIndentString() {
-		StringBuffer indent = new StringBuffer();
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (preferences != null) {
-			char indentChar = ' ';
-			String indentCharPref = preferences.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-			if (CSSCorePreferenceNames.TAB.equals(indentCharPref)) {
-				indentChar = '\t';
-			}
-			int indentationWidth = preferences.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
-			for (int i = 0; i < indentationWidth; i++) {
-				indent.append(indentChar);
-			}
-		}
-		return indent.toString();
-	}
-	
-	/**
-	 * Return the active text editor if possible, otherwise the active editor
-	 * part.
-	 * 
-	 * @return
-	 */
-	private Object getActiveTextEditor() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				IEditorPart editor = page.getActiveEditor();
-				if (editor != null) {
-					if (editor instanceof ITextEditor)
-						return editor;
-					ITextEditor textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-					if (textEditor != null)
-						return textEditor;
-					return editor;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Insert spaces for tabs
-	 * 
-	 * @param command
-	 */
-	private void smartInsertForTab(DocumentCommand command, IDocument document) {
-		// tab key was pressed. now check preferences to see if need to insert
-		// spaces instead of tab
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (CSSCorePreferenceNames.SPACE.equals(preferences.getString(CSSCorePreferenceNames.INDENTATION_CHAR))) {
-			int indentationWidth = preferences.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
-			StringBuffer indent = new StringBuffer();
-			if (indentationWidth != 0) {
-				int indentSize = indentationWidth;
-				try {
-					IRegion firstLine = document.getLineInformationOfOffset(command.offset);
-					int offsetInLine = command.offset - firstLine.getOffset();
-					int remainder = offsetInLine % indentationWidth;
-
-					indentSize = indentationWidth - remainder;
-				} catch (BadLocationException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-
-				for (int i = 0; i < indentSize; i++)
-					indent.append(' ');
-			}
-
-			// replace \t characters with spaces
-			command.text = indent.toString();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSCACandidate.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSCACandidate.java
deleted file mode 100644
index 8b6f4e2..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSCACandidate.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import org.eclipse.wst.css.ui.internal.image.CSSImageType;
-
-class CSSCACandidate {
-
-	private String fReplacementString = null;
-	private int fCursorPosition = 0;
-	private String fDisplayString = null;
-	private CSSImageType fImageType = null;
-
-	/**
-	 * CSSCACandidate constructor comment.
-	 */
-	CSSCACandidate() {
-		super();
-	}
-
-	/**
-	 *  
-	 */
-	int getCursorPosition() {
-		return fCursorPosition;
-	}
-
-	/**
-	 *  
-	 */
-	String getDisplayString() {
-		return fDisplayString;
-	}
-
-	/**
-	 *  
-	 */
-	CSSImageType getImageType() {
-		return fImageType;
-	}
-
-	/**
-	 *  
-	 */
-	String getReplacementString() {
-		return fReplacementString;
-	}
-
-	/**
-	 *  
-	 */
-	void setCursorPosition(int cursorPosition) {
-		fCursorPosition = cursorPosition;
-	}
-
-	/**
-	 *  
-	 */
-	void setDisplayString(String displayString) {
-		fDisplayString = displayString;
-	}
-
-	/**
-	 *  
-	 */
-	void setImageType(CSSImageType imageType) {
-		fImageType = imageType;
-	}
-
-	/**
-	 *  
-	 */
-	void setReplacementString(String replacementString) {
-		fReplacementString = replacementString;
-	}
-
-	/**
-	 * Returns a String that represents the value of this object.
-	 * 
-	 * @return a string representation of the receiver
-	 */
-	public String toString() {
-		StringBuffer buf = new StringBuffer();
-		buf.append(getReplacementString());
-		buf.append("\"");//$NON-NLS-1$
-		buf.append(getDisplayString());
-		buf.append("\"");//$NON-NLS-1$
-		buf.append("(");//$NON-NLS-1$
-		buf.append(getCursorPosition());
-		buf.append(")");//$NON-NLS-1$
-
-		return buf.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSContentAssistContext.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSContentAssistContext.java
deleted file mode 100644
index bfa859d..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSContentAssistContext.java
+++ /dev/null
@@ -1,416 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelFinder;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-class CSSContentAssistContext {
-
-	private int fReplaceBegin = -1;
-	private String fTextToReplace = null;
-	private String fTextToCompare = null;
-	private int fTargetPos = -1;
-	private ICSSNode fTargetNode = null;
-	private int fCursorPos = -1;
-	private IStructuredDocument fStructuredDocument = null;
-	private int fDocumentOffset = 0;
-	private char fQuote = 0;
-	private ICSSModel fModel = null;
-	private boolean fSelected = false;
-
-	/**
-	 *  
-	 */
-	private CSSContentAssistContext() {
-		super();
-	}
-
-	/**
-	 *  
-	 */
-	CSSContentAssistContext(int documentPosition, ICSSNode node, int documentOffset, char quote) {
-		this();
-		fCursorPos = documentPosition;
-		fDocumentOffset = documentOffset;
-		fQuote = quote;
-		initialize(node.getOwnerDocument());
-	}
-	
-	CSSContentAssistContext(int documentPosition, ICSSNode node, int documentOffset, char quote, boolean selected) {
-		this();
-		fCursorPos = documentPosition;
-		fDocumentOffset = documentOffset;
-		fQuote = quote;
-		fSelected = selected;
-		initialize(node.getOwnerDocument());
-	}
-
-	/**
-	 * @return int
-	 */
-	int getCursorPos() {
-		return fCursorPos;
-	}
-
-	/**
-	 * @return int
-	 */
-	int getDocumentOffset() {
-		return fDocumentOffset;
-	}
-
-	IStructuredDocument getStructuredDocument() {
-		return fStructuredDocument;
-	}
-
-	ICSSModel getModel() {
-		return fModel;
-	}
-
-	private ICSSNode getNodeAt(int offset) {
-		return (ICSSNode) ((fModel != null) ? fModel.getIndexedRegion(offset) : null);
-	}
-
-	/**
-	 * 
-	 * @return char
-	 */
-	char getQuoteOfStyleAttribute() {
-		return fQuote;
-	}
-
-	ITextRegion getRegionByOffset(int offset) {
-		ITextRegion region = null;
-		if (fStructuredDocument != null) {
-			IStructuredDocumentRegion flatNode = fStructuredDocument.getRegionAtCharacterOffset(offset);
-			if (flatNode != null) {
-				region = flatNode.getRegionAtCharacterOffset(offset);
-			}
-		}
-		return region;
-	}
-
-	/**
-	 *  
-	 */
-	//	String getRegionText() {
-	//		ITextRegion targetRegion = getTargetRegion();
-	//		if (targetRegion != null) {
-	//			return targetRegion.getText();
-	//		} else {
-	//			return ""; //$NON-NLS-1$
-	//		}
-	//	}
-	/**
-	 *  
-	 */
-	int getReplaceBegin() {
-		return fReplaceBegin;
-	}
-
-	ICSSNode getTargetNode() {
-		return fTargetNode;
-	}
-
-	private int getTargetPos() {
-		return fTargetPos;
-	}
-
-	ITextRegion getTargetRegion() {
-		return getRegionByOffset(getTargetPos());
-	}
-
-	private IStructuredDocumentRegion getTargetDocumentRegion() {
-		return getDocumentRegionByOffset(getTargetPos());
-	}
-
-	private IStructuredDocumentRegion getDocumentRegionByOffset(int offset) {
-		return (fStructuredDocument != null) ? fStructuredDocument.getRegionAtCharacterOffset(offset) : null;
-	}
-
-	ITextRegion getTargetRegionPrevious() {
-		ITextRegion previousRegion = null;
-		ITextRegion targetRegion = getTargetRegion();
-		RegionIterator iterator = null;
-		if (targetRegion == null) {
-			if (0 < fCursorPos) {
-				iterator = new RegionIterator(fStructuredDocument, fCursorPos - 1);
-			}
-		} else {
-			iterator = getRegionIterator();
-			if (iterator.hasPrev()) {
-				iterator.prev();
-			} else {
-				iterator = null;
-			}
-		}
-		if (iterator != null) {
-			while (iterator.hasPrev()) {
-				ITextRegion region = iterator.prev();
-				String type = region.getType();
-				if (type != CSSRegionContexts.CSS_S && type != CSSRegionContexts.CSS_COMMENT && type != CSSRegionContexts.CSS_CDO && type != CSSRegionContexts.CSS_CDC) {
-					previousRegion = region;
-					break;
-				}
-			}
-		}
-
-		return previousRegion;
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	String getTextToCompare() {
-		return fTextToCompare;
-	}
-
-	/**
-	 *  
-	 */
-	String getTextToReplace() {
-		return fTextToReplace;
-	}
-
-	/**
-	 *  
-	 */
-	private void initialize(ICSSDocument doc) {
-		if (doc == null) {
-			return;
-		}
-		ICSSModel model = doc.getModel();
-		fModel = model;
-		fStructuredDocument = model.getStructuredDocument();
-
-		initializeTargetPos();
-		initializeTargetText();
-		initializeTargetNode();
-	}
-
-	/**
-	 *  
-	 */
-	private void initializeTargetNode() {
-		if (fCursorPos == 0) {
-			fTargetNode = fModel.getDocument();
-			return;
-		}
-
-		// find edge of tree node
-		ICSSNode cursorNode = getNodeAt(fCursorPos);
-		if (cursorNode == null) { // end of document
-			cursorNode = fModel.getDocument();
-		}
-		ICSSNode node = null;
-		IStructuredDocumentRegion flatNode = fStructuredDocument.getRegionAtCharacterOffset(fCursorPos - 1);
-		while (flatNode != null && (node = getNodeAt(flatNode.getStartOffset())) == cursorNode && ((IndexedRegion) node).getStartOffset() != flatNode.getStartOffset()) {
-			flatNode = flatNode.getPrevious();
-		}
-		if (flatNode == null) { // top of document
-			fTargetNode = (node == null) ? fModel.getDocument() : node;
-			return;
-		}
-		//   v<--|
-		//   AAAAAA
-		// BBBBBBBBBB cursorNode:A , node:B -> target is A
-		if (cursorNode != null) {
-			for (ICSSNode parent = cursorNode.getParentNode(); parent != null; parent = parent.getParentNode()) {
-				if (parent == cursorNode) {
-					fTargetNode = cursorNode;
-					return;
-				}
-			}
-		}
-		//     v<--|
-		//   AAA
-		// BBBBBBBBBB cursorNode:B , node:A -> depend on A's node type
-		short nodeType = node.getNodeType();
-		if (nodeType == ICSSNode.STYLEDECLITEM_NODE || nodeType == ICSSNode.CHARSETRULE_NODE || nodeType == ICSSNode.IMPORTRULE_NODE) {
-			String type = CSSUtil.getStructuredDocumentRegionType(flatNode);
-			if (type == CSSRegionContexts.CSS_DELIMITER || type == CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-				fTargetNode = node.getParentNode();
-			} else {
-				fTargetNode = node;
-			}
-			//			fTargetNode = (bOverSemiColon) ? node.getParentNode() : node;
-		} else if (CSSUtil.getStructuredDocumentRegionType(flatNode) == CSSRegionContexts.CSS_RBRACE) {
-			fTargetNode = node.getParentNode();
-		} else {
-			fTargetNode = node;
-		}
-
-		return;
-	}
-
-	/**
-	 *  
-	 */
-	private void initializeTargetPos() {
-		if (fCursorPos == 0 || isSpecialDelimiterRegion(fCursorPos - 1)) {
-			fTargetPos = fCursorPos;
-		} else {
-			fTargetPos = fCursorPos - 1;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void initializeTargetText() {
-		ITextRegion targetRegion = getTargetRegion();
-		IStructuredDocumentRegion documentRegion = getTargetDocumentRegion();
-		if (targetRegion == null) {
-			fReplaceBegin = fCursorPos;
-			fTextToReplace = ""; //$NON-NLS-1$
-			fTextToCompare = ""; //$NON-NLS-1$
-		} else {
-			String regionText = documentRegion.getText(targetRegion);
-			int regionStart = documentRegion.getStartOffset(targetRegion);
-			if (!fSelected && (regionStart == fCursorPos || regionText.trim().length() == 0 || regionStart + regionText.length() - 1 < fTargetPos)) {
-				// to insertion
-				fReplaceBegin = fCursorPos;
-				fTextToReplace = ""; //$NON-NLS-1$
-				fTextToCompare = ""; //$NON-NLS-1$
-			} else {
-				// to replace
-				fReplaceBegin = regionStart;
-				fTextToReplace = regionText;
-				if(fCursorPos >= fReplaceBegin && regionText.trim().length() >= (fCursorPos - fReplaceBegin))
-					fTextToCompare = regionText.substring(0, fCursorPos - fReplaceBegin);
-				else
-					fTextToCompare = ""; //$NON-NLS-1$
-			}
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private boolean isSpecialDelimiterRegion(int pos) {
-		ITextRegion region = getRegionByOffset(pos);
-		String type = region.getType();
-		return (type == CSSRegionContexts.CSS_LBRACE || type == CSSRegionContexts.CSS_RBRACE || type == CSSRegionContexts.CSS_DELIMITER || type == CSSRegionContexts.CSS_DECLARATION_SEPARATOR || type == CSSRegionContexts.CSS_DECLARATION_DELIMITER || type == CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR || type == CSSRegionContexts.CSS_S);
-	}
-
-	/**
-	 *  
-	 */
-	boolean isTargetPosAfterOf(String regionType) {
-		int start = ((IndexedRegion) fTargetNode).getStartOffset();
-		if (start < 0 || ((IndexedRegion) fTargetNode).getEndOffset() <= 0) {
-			return false;
-		}
-
-		RegionIterator iRegion = new RegionIterator(fStructuredDocument, start);
-		while (iRegion.hasNext()) {
-			ITextRegion region = iRegion.next();
-			if (fTargetPos < iRegion.getStructuredDocumentRegion().getTextEndOffset(region)) {
-				break;
-			}
-			if (region.getType() == regionType) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 *  
-	 */
-	boolean isTargetPosBeforeOf(String regionType) {
-		return !isTargetPosAfterOf(regionType);
-	}
-
-	/**
-	 * @return boolean
-	 * @param regionType
-	 *            java.lang.String
-	 */
-	boolean targetFollows(String regionType) {
-		RegionIterator iRegion;
-		ITextRegion region = null;
-		if (fStructuredDocument.getLength() <= fTargetPos) {
-			iRegion = new RegionIterator(fStructuredDocument, fStructuredDocument.getLength() - 1);
-		} else {
-			iRegion = new RegionIterator(fStructuredDocument, fTargetPos);
-			try {
-				if (!Character.isWhitespace(fStructuredDocument.getChar(fTargetPos)) && iRegion.hasPrev()) {
-					region = iRegion.prev();
-				}
-			} catch (BadLocationException e) {
-				iRegion = new RegionIterator(fStructuredDocument, fStructuredDocument.getLength() - 1);
-			}
-		}
-		while (iRegion.hasPrev()) {
-			region = iRegion.prev();
-			String type = region.getType();
-			if (type == CSSRegionContexts.CSS_S || type == CSSRegionContexts.CSS_COMMENT) {
-				continue;
-			} else {
-				break;
-			}
-		}
-		if (region != null && region.getType() == regionType) {
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	boolean targetHas(String regionType) {
-		int end = ((IndexedRegion) fTargetNode).getEndOffset();
-		if (getTargetPos() < 0 || end <= 0) {
-			return false;
-		}
-		RegionIterator iRegion = new RegionIterator(fStructuredDocument, getTargetPos());
-		while (iRegion.hasNext()) {
-			ITextRegion region = iRegion.next();
-			if (end <= iRegion.getStructuredDocumentRegion().getStartOffset(region)) {
-				break;
-			}
-			if (region.getType() == regionType) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	RegionIterator getRegionIterator() {
-		return new RegionIterator(getStructuredDocument(), getTargetPos());
-	}
-
-	/**
-	 *  
-	 */
-	CSSMetaModel getMetaModel() {
-		CSSMetaModelFinder finder = CSSMetaModelFinder.getInstance();
-		return finder.findMetaModelFor(getModel());
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSContentAssistProcessor.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSContentAssistProcessor.java
deleted file mode 100644
index 3923117..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSContentAssistProcessor.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.wst.css.core.internal.provisional.adapters.ICSSModelAdapter;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.ui.internal.templates.TemplateContextTypeIdsCSS;
-import org.eclipse.wst.html.core.internal.htmlcss.StyleAdapterFactory;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistUtilities;
-import org.eclipse.wst.xml.ui.internal.util.SharedXMLEditorPluginImageHelper;
-
-public class CSSContentAssistProcessor implements IContentAssistProcessor {
-
-	private int fDocumentOffset = 0;
-	private char fQuote = 0;
-	private CSSTemplateCompletionProcessor fTemplateProcessor = null;
-
-	/**
-	 * Return a list of proposed code completions based on the specified
-	 * location within the document that corresponds to the current cursor
-	 * position within the text-editor control.
-	 * 
-	 * @param documentPosition
-	 *            a location within the document
-	 * @return an array of code-assist items
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentPosition) {
-
-		IndexedRegion indexedNode = ContentAssistUtils.getNodeAt(viewer, documentPosition + fDocumentOffset);
-		IDOMNode xNode = null;
-		IDOMNode parent = null;
-		CSSProposalArranger arranger = null;
-		boolean isEmptyDocument = false;
-		// If there is a selected region, we'll need to replace the text
-		ITextSelection selection = (ITextSelection) viewer.getSelectionProvider().getSelection();
-		boolean selected = (selection != null && selection.getText() != null && selection.getText().trim().length() > 0);
-		
-		// bail if we couldn't get an indexed node
-		// if(indexedNode == null) return new ICompletionProposal[0];
-		if (indexedNode instanceof IDOMNode) {
-			xNode = (IDOMNode) indexedNode;
-			parent = (IDOMNode) xNode.getParentNode();
-		}
-		// need to get in here if there in the no 0 region <style>|</style>
-		// case
-		if ((xNode != null) && xNode.getNodeName().equalsIgnoreCase(HTML40Namespace.ElementName.STYLE)) {
-			// now we know the cursor is in a <style> tag w/out region
-			IStructuredModel cssModel = getCSSModel(xNode);
-			if (cssModel != null) {
-				// adjust offsets for embedded style
-				int offset = documentPosition + fDocumentOffset;
-				int pos = 0;
-				IndexedRegion keyIndexedNode = cssModel.getIndexedRegion(pos);
-				if (keyIndexedNode == null) {
-					keyIndexedNode = (IndexedRegion) ((ICSSModel) cssModel).getDocument();
-				}
-				arranger = new CSSProposalArranger(pos, (ICSSNode) keyIndexedNode, offset, (char) 0, selected);
-			}
-		} else if ((parent != null) && parent.getNodeName().equalsIgnoreCase(HTML40Namespace.ElementName.STYLE)) {
-			// now we know the cursor is in a <style> tag with a region
-			// use the parent because that will be the <style> tag
-			IStructuredModel cssModel = getCSSModel(parent);
-			if (cssModel != null) {
-				// adjust offsets for embedded style
-				int offset = indexedNode.getStartOffset();
-				int pos = documentPosition - offset;
-				IndexedRegion keyIndexedNode = cssModel.getIndexedRegion(pos);
-				if (keyIndexedNode == null) {
-					keyIndexedNode = (IndexedRegion) ((ICSSModel) cssModel).getDocument();
-				}
-				arranger = new CSSProposalArranger(pos, (ICSSNode) keyIndexedNode, offset, (char) 0, selected);
-			}
-		} else if (indexedNode instanceof IDOMNode) {
-			// get model for node w/ style attribute
-			IStructuredModel cssModel = getCSSModel((IDOMNode) indexedNode);
-			if (cssModel != null) {
-				IndexedRegion keyIndexedNode = cssModel.getIndexedRegion(documentPosition - fDocumentOffset);
-				if (keyIndexedNode == null) {
-					keyIndexedNode = (IndexedRegion) ((ICSSModel) cssModel).getDocument();
-				}
-				if (keyIndexedNode instanceof ICSSNode) {
-					// inline style for a tag, not embedded
-					arranger = new CSSProposalArranger(documentPosition, (ICSSNode) keyIndexedNode, fDocumentOffset, fQuote, selected);
-				}
-			}
-		} else if (indexedNode instanceof ICSSNode) {
-			// when editing external CSS using CSS Designer, ICSSNode is
-			// passed.
-			ICSSDocument cssdoc = ((ICSSNode) indexedNode).getOwnerDocument();
-			if (cssdoc != null) {
-				IStructuredModel cssModel = cssdoc.getModel();
-				if (cssModel != null) {
-					IndexedRegion keyIndexedNode = cssModel.getIndexedRegion(documentPosition - fDocumentOffset);
-					if (keyIndexedNode == null) {
-						keyIndexedNode = (IndexedRegion) ((ICSSModel) cssModel).getDocument();
-					}
-					if (keyIndexedNode instanceof ICSSNode) {
-						// inline style for a tag, not embedded
-						arranger = new CSSProposalArranger(documentPosition, (ICSSNode) keyIndexedNode, fDocumentOffset, fQuote, selected);
-					}
-				}
-			}
-		} else if ((indexedNode == null) && isViewerEmpty(viewer)) {
-			isEmptyDocument = true;
-			// the top of empty CSS Document
-			IStructuredModel cssModel = null;
-			try {
-				cssModel = StructuredModelManager.getModelManager().getExistingModelForRead(viewer.getDocument());
-				if (cssModel instanceof ICSSModel) {
-					IndexedRegion keyIndexedNode = cssModel.getIndexedRegion(documentPosition - fDocumentOffset);
-					if (keyIndexedNode == null) {
-						keyIndexedNode = (IndexedRegion) ((ICSSModel) cssModel).getDocument();
-					}
-					if (keyIndexedNode instanceof ICSSNode) {
-						// inline style for a tag, not embedded
-						arranger = new CSSProposalArranger(documentPosition, (ICSSNode) keyIndexedNode, fDocumentOffset, fQuote);
-					}
-				}
-			} finally {
-				if (cssModel != null)
-					cssModel.releaseFromRead();
-			}
-		}
-
-		ICompletionProposal[] proposals = new ICompletionProposal[0];
-		if (arranger != null) {
-			fDocumentOffset = 0;
-			proposals = arranger.getProposals();
-
-			ICompletionProposal[] newfileproposals = new ICompletionProposal[0];
-			ICompletionProposal[] anyproposals = new ICompletionProposal[0];
-			// add template proposals
-			if (getTemplateCompletionProcessor() != null) {
-				if (isEmptyDocument) {
-					getTemplateCompletionProcessor().setContextType(TemplateContextTypeIdsCSS.NEW);
-					newfileproposals = getTemplateCompletionProcessor().computeCompletionProposals(viewer, documentPosition);
-				}
-				getTemplateCompletionProcessor().setContextType(TemplateContextTypeIdsCSS.ALL);
-				anyproposals = getTemplateCompletionProcessor().computeCompletionProposals(viewer, documentPosition);
-			}
-
-			// add end tag if parent is not closed
-			ICompletionProposal endTag = XMLContentAssistUtilities.computeXMLEndTagProposal(viewer, documentPosition, indexedNode, HTML40Namespace.ElementName.STYLE, SharedXMLEditorPluginImageHelper.IMG_OBJ_TAG_GENERIC); 
-
-			// add the additional proposals
-			int additionalLength = newfileproposals.length + anyproposals.length;
-			additionalLength = (endTag != null) ? ++additionalLength : additionalLength;
-			if (additionalLength > 0) {
-				ICompletionProposal[] plusOnes = new ICompletionProposal[proposals.length + additionalLength];
-				int appendPos = proposals.length;
-				// add end tag proposal
-				if (endTag != null) {
-					System.arraycopy(proposals, 0, plusOnes, 1, proposals.length);
-					plusOnes[0] = endTag;
-					++appendPos;
-				} else {
-					System.arraycopy(proposals, 0, plusOnes, 0, proposals.length);
-				}
-				// add items in newfileproposals
-				for (int i = 0; i < newfileproposals.length; ++i) {
-					plusOnes[appendPos + i] = newfileproposals[i];
-				}
-				// add items in anyproposals
-				appendPos = appendPos + newfileproposals.length;
-				for (int i = 0; i < anyproposals.length; ++i) {
-					plusOnes[appendPos + i] = anyproposals[i];
-				}
-				proposals = plusOnes;
-			}
-		}
-		return proposals;
-	}
-
-	/**
-	 * Returns true if there is no text or it's all white space, otherwise
-	 * returns false
-	 * 
-	 * @param treeNode
-	 * @param textViewer
-	 * @return boolean
-	 */
-	private boolean isViewerEmpty(ITextViewer textViewer) {
-		boolean isEmpty = false;
-		String text = textViewer.getTextWidget().getText();
-		if ((text == null) || ((text != null) && text.trim().equals(""))) //$NON-NLS-1$
-			isEmpty = true;
-		return isEmpty;
-	}
-
-	/**
-	 * Get CSSModel for an indexed node
-	 * 
-	 * @param indexedNode
-	 * @return IStructuredModel
-	 */
-	// private IStructuredModel getCSSModel(IndexedRegion indexedNode) {
-	// if (indexedNode == null) return null;
-	// Node node = (Node)indexedNode;
-	// INodeNotifier notifier = (INodeNotifier)node.getParentNode();
-	// if (notifier == null) return null;
-	// INodeAdapter adapter =
-	// StyleAdapterFactory.getInstance().adapt(notifier);
-	// if (adapter == null || !(adapter instanceof CSSModelAdapter)) return
-	// null;
-	// CSSModelAdapter modelAdapter = (CSSModelAdapter)adapter;
-	// return modelAdapter.getModel();
-	// }
-	/**
-	 * Returns the CSSmodel for a given XML node.
-	 * 
-	 * @param element
-	 * @return IStructuredModel
-	 */
-	private IStructuredModel getCSSModel(IDOMNode element) {
-		if (element == null)
-			return null;
-		INodeAdapter adapter = StyleAdapterFactory.getInstance().adapt(element);
-		if ((adapter == null) || !(adapter instanceof ICSSModelAdapter))
-			return null;
-		ICSSModelAdapter modelAdapter = (ICSSModelAdapter) adapter;
-		return modelAdapter.getModel();
-	}
-
-	/**
-	 * Returns information about possible contexts based on the specified
-	 * location within the document that corresponds to the current cursor
-	 * position within the text viewer.
-	 * 
-	 * @param viewer
-	 *            the viewer whose document is used to compute the possible
-	 *            contexts
-	 * @param documentPosition
-	 *            an offset within the document for which context information
-	 *            should be computed
-	 * @return an array of context information objects or <code>null</code>
-	 *         if no context could be found
-	 */
-	public org.eclipse.jface.text.contentassist.IContextInformation[] computeContextInformation(org.eclipse.jface.text.ITextViewer viewer, int documentOffset) {
-		return null;
-	}
-
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of possible completions.
-	 * 
-	 * @return the auto activation characters for completion proposal or
-	 *         <code>null</code> if no auto activation is desired
-	 */
-	public char[] getCompletionProposalAutoActivationCharacters() {
-		return null;
-	}
-
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of context information.
-	 * 
-	 * @return the auto activation characters for presenting context
-	 *         information or <code>null</code> if no auto activation is
-	 *         desired
-	 */
-	public char[] getContextInformationAutoActivationCharacters() {
-		return null;
-	}
-
-	/**
-	 * Returns a validator used to determine when displayed context
-	 * information should be dismissed. May only return <code>null</code> if
-	 * the processor is incapable of computing context information.
-	 * 
-	 * @return a context information validator, or <code>null</code> if the
-	 *         processor is incapable of computing context information
-	 */
-	public org.eclipse.jface.text.contentassist.IContextInformationValidator getContextInformationValidator() {
-		return null;
-	}
-
-	/**
-	 * Return the reason why computeProposals was not able to find any
-	 * completions.
-	 * 
-	 * @return an error message or null if no error occurred
-	 */
-	public String getErrorMessage() {
-		return null;
-	}
-
-	/**
-	 * Insert the method's description here. Creation date: (2001/05/22
-	 * 10:37:05)
-	 * 
-	 * @param offset
-	 *            int
-	 */
-	public void setDocumentOffset(int offset) {
-		fDocumentOffset = offset;
-	}
-
-	/**
-	 * 
-	 * @param quote
-	 *            char
-	 */
-	public void setQuoteCharOfStyleAttribute(char quote) {
-		fQuote = quote;
-	}
-
-	private CSSTemplateCompletionProcessor getTemplateCompletionProcessor() {
-		if (fTemplateProcessor == null) {
-			fTemplateProcessor = new CSSTemplateCompletionProcessor();
-		}
-		return fTemplateProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalArranger.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalArranger.java
deleted file mode 100644
index 348f717..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalArranger.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.w3c.dom.css.CSSFontFaceRule;
-
-class CSSProposalArranger {
-
-	private List fProposals = new ArrayList();
-	private CSSContentAssistContext fContext = null;
-
-	/**
-	 * CSSProposalArranger constructor comment.
-	 */
-	private CSSProposalArranger() {
-		super();
-	}
-
-	/**
-	 * CSSProposalArranger constructor comment.
-	 */
-	CSSProposalArranger(int documentPosition, ICSSNode node, int documentOffset, char quote) {
-		this();
-		fContext = new CSSContentAssistContext(documentPosition, node, documentOffset, quote);
-	}
-	
-	CSSProposalArranger(int documentPosition, ICSSNode node, int documentOffset, char quote, boolean selected) {
-		this();
-		fContext = new CSSContentAssistContext(documentPosition, node, documentOffset, quote, selected);
-	}
-
-	/**
-	 *  
-	 */
-	void buildProposals() {
-		fProposals.clear();
-
-		/*
-		 * String text; ICompletionProposal item; text = "---- Test
-		 * Information ----"; item = new CompletionProposal("",
-		 * fContext.getReplaceBegin(), 0, 0, null, text, null, null);
-		 * fProposals.add(item);
-		 * 
-		 * text = "Target: \"" + fContext.getRegionText() + "\"";
-		 * 
-		 * item = new CompletionProposal("", fContext.getReplaceBegin(), 0, 0,
-		 * null, text, null, null); fProposals.add(item);
-		 * 
-		 * text = fContext.getTargetNode().getClass().toString(); int
-		 * lastPeriodPos = text.lastIndexOf('.'); text = "Node: " +
-		 * text.substring(lastPeriodPos + 1); item = new
-		 * CompletionProposal("", fContext.getReplaceBegin(), 0, 0, null,
-		 * text, null, null); fProposals.add(item);
-		 */
-
-		ICSSNode targetNode = fContext.getTargetNode();
-		//int targetPos = fContext.getTargetPos();
-		if (targetNode instanceof ICSSStyleSheet) {
-			buildProposalsForAnyRule();
-		} else if ((targetNode instanceof ICSSMediaRule && fContext.isTargetPosAfterOf(CSSRegionContexts.CSS_LBRACE)) || (targetNode instanceof ICSSStyleRule && fContext.isTargetPosBeforeOf(CSSRegionContexts.CSS_LBRACE))) {
-			buildProposalsForAnyRule();
-			//		buildProposalsForStyleRule();
-		} else if ((targetNode instanceof ICSSPageRule && fContext.isTargetPosBeforeOf(CSSRegionContexts.CSS_LBRACE))) {
-			buildProposalsForPageRulePseudoClass();
-		} else if ((targetNode instanceof ICSSStyleRule || targetNode instanceof CSSFontFaceRule || targetNode instanceof ICSSPageRule || targetNode instanceof ICSSStyleDeclaration) && (targetNode.getOwnerDocument() instanceof ICSSStyleDeclaration || fContext.targetFollows(CSSRegionContexts.CSS_DECLARATION_DELIMITER) || fContext.targetFollows(CSSRegionContexts.CSS_LBRACE))) {
-			buildProposalsForDeclarationName();
-		} else if (targetNode instanceof ICSSStyleDeclItem) {
-			if (fContext.isTargetPosAfterOf(CSSRegionContexts.CSS_DECLARATION_SEPARATOR)) {
-				buildProposalsForDeclarationValue();
-			} else {
-				buildProposalsForDeclarationName();
-			}
-		} else if (targetNode instanceof ICSSPrimitiveValue) {
-			buildProposalsForDeclarationValue();
-		}
-		/*
-		 * else if (targetNode instanceof ICSSPrimitiveValue || ((targetNode
-		 * instanceof ICSSStyleRule || targetNode instanceof CSSFontFaceRule ||
-		 * targetNode instanceof ICSSStyleDeclaration || targetNode instanceof
-		 * ICSSStyleDeclItem) &&
-		 * fContext.isTargetPosAfterOf(CSSRegionContexts.COLON))) {
-		 * buildProposalsForDeclarationValue(); }
-		 */
-
-		// for Test
-	}
-
-	/**
-	 *  
-	 */
-	void buildProposalsForAnyRule() {
-		CSSProposalGenerator generator;
-		generator = new CSSProposalGeneratorForAtmarkRule(fContext);
-		fProposals.addAll(generator.getProposals());
-		generator = new CSSProposalGeneratorForHTMLTag(fContext);
-		fProposals.addAll(generator.getProposals());
-		generator = new CSSProposalGeneratorForPseudoSelector(fContext);
-		fProposals.addAll(generator.getProposals());
-	}
-
-	/**
-	 *  
-	 */
-	void buildProposalsForDeclarationName() {
-		CSSProposalGenerator generator;
-		generator = new CSSProposalGeneratorForDeclarationName(fContext);
-		fProposals.addAll(generator.getProposals());
-	}
-
-	/**
-	 *  
-	 */
-	void buildProposalsForDeclarationValue() {
-		CSSProposalGenerator generator;
-		generator = new CSSProposalGeneratorForDeclarationValue(fContext);
-		fProposals.addAll(generator.getProposals());
-	}
-
-	/**
-	 *  
-	 */
-	void buildProposalsForPageRulePseudoClass() {
-		CSSProposalGenerator generator;
-		generator = new CSSProposalGeneratorForPseudoSelector(fContext);
-		fProposals.addAll(generator.getProposals());
-	}
-
-	/**
-	 *  
-	 */
-	void buildProposalsForStyleRule() {
-		CSSProposalGenerator generator;
-		generator = new CSSProposalGeneratorForHTMLTag(fContext);
-		fProposals.addAll(generator.getProposals());
-		generator = new CSSProposalGeneratorForPseudoSelector(fContext);
-		fProposals.addAll(generator.getProposals());
-	}
-
-	/**
-	 *  
-	 */
-	ICompletionProposal[] getProposals() {
-		buildProposals();
-		ICompletionProposal[] proposalArray = new CompletionProposal[fProposals.size()];
-		Iterator iItem = fProposals.iterator();
-		for (int i = 0; iItem.hasNext(); i++) {
-			proposalArray[i] = (ICompletionProposal) iItem.next();
-		}
-		return proposalArray;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGenerator.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGenerator.java
deleted file mode 100644
index da5214e..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGenerator.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.ui.internal.image.CSSImageHelper;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-abstract class CSSProposalGenerator {
-
-
-	protected class StringAndOffset {
-		StringAndOffset(String string, int offset) {
-			this.fString = string;
-			this.fOffset = offset;
-		}
-
-		String fString;
-		int fOffset;
-	}
-
-	protected CSSContentAssistContext fContext = null;
-
-	/**
-	 * CSSProposalGenerator constructor comment.
-	 */
-	private CSSProposalGenerator() {
-		super();
-	}
-
-	CSSProposalGenerator(CSSContentAssistContext context) {
-		this();
-		fContext = context;
-	}
-
-	/**
-	 * 
-	 */
-	protected boolean checkLeadingColon() {
-		boolean hasLeadingColon = false;
-		ITextRegion targetRegion = fContext.getTargetRegion();
-		if (targetRegion == null && 0 < fContext.getCursorPos()) {
-			targetRegion = fContext.getRegionByOffset(fContext.getCursorPos() - 1);
-			if (targetRegion != null && targetRegion.getType() == CSSRegionContexts.CSS_SELECTOR_PSEUDO) {
-				hasLeadingColon = true;
-			}
-		}
-		else if (targetRegion != null) {
-			// BUG 92848 - Changed how pseudo-selectors are defined in the
-			// tokenizer
-			// The target region should be the CSS_SELECTOR_PSEUDO now
-			if (targetRegion.getType() == CSSRegionContexts.CSS_SELECTOR_PSEUDO) {
-				hasLeadingColon = true;
-			}
-		}
-		return hasLeadingColon;
-	}
-
-	/**
-	 * 
-	 */
-	protected StringAndOffset generateBraces() {
-		StringBuffer buf = new StringBuffer();
-		String lineDelimiter = fContext.getStructuredDocument().getLineDelimiter();
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		String indentStr = getIndentString();
-		if (preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_NEWLINE_ON_OPEN_BRACE)) {
-			buf.append(lineDelimiter);
-		}
-		buf.append("{");//$NON-NLS-1$
-		if (preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE)) {
-			buf.append(lineDelimiter);
-			buf.append(indentStr);
-		} else {
-			buf.append(" ");//$NON-NLS-1$
-		}
-		int offset = buf.length();
-		if (preferences.getBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE)) {
-			buf.append(lineDelimiter);
-		} else {
-			buf.append(" ");//$NON-NLS-1$
-		}
-		buf.append("}");//$NON-NLS-1$
-		return new StringAndOffset(buf.toString(), offset);
-	}
-
-	/**
-	 * 
-	 */
-	protected StringAndOffset generateParenthesis() {
-		StringBuffer buf = new StringBuffer();
-		int offset;
-		buf.append("(");//$NON-NLS-1$
-		offset = 1;
-		buf.append(")");//$NON-NLS-1$
-		return new StringAndOffset(buf.toString(), offset);
-	}
-
-	/**
-	 * 
-	 */
-	protected StringAndOffset generateQuotes() {
-		StringBuffer buf = new StringBuffer();
-		char quoteChar = getQuoteChar();
-		buf.append(quoteChar);
-		buf.append(quoteChar);
-		return new StringAndOffset(buf.toString(), 1);
-	}
-
-	/**
-	 * 
-	 */
-	protected StringAndOffset generateSemicolon() {
-		StringBuffer buf = new StringBuffer();
-		int offset;
-		buf.append(";");//$NON-NLS-1$
-		offset = 0;
-		return new StringAndOffset(buf.toString(), offset);
-	}
-
-	/**
-	 * 
-	 */
-	protected StringAndOffset generateURI() {
-		StringBuffer buf = new StringBuffer();
-
-		boolean isQuoteInURI = CSSCorePlugin.getDefault().getPluginPreferences().getBoolean(CSSCorePreferenceNames.FORMAT_QUOTE_IN_URI);
-		char quoteChar = getQuoteChar();
-		buf.append("url(");//$NON-NLS-1$
-		if (isQuoteInURI) {
-			buf.append(quoteChar);
-		}
-		int offset = buf.length();
-		if (isQuoteInURI) {
-			buf.append(quoteChar);
-		}
-		buf.append(")");//$NON-NLS-1$
-		return new StringAndOffset(buf.toString(), offset);
-	}
-
-	abstract protected Iterator getCandidates();
-
-	List getProposals() {
-		List proposals = new ArrayList();
-
-		CSSImageHelper imageHelper = CSSImageHelper.getInstance();
-		Iterator i = getCandidates();
-		while (i.hasNext()) {
-			CSSCACandidate candidate = (CSSCACandidate) i.next();
-			Image image = imageHelper.getImage(candidate.getImageType());
-			ICompletionProposal item = new CompletionProposal(candidate.getReplacementString(), fContext.getReplaceBegin() + fContext.getDocumentOffset(), fContext.getTextToReplace().length(), candidate.getCursorPosition(), image, candidate.getDisplayString(), null, null);
-			proposals.add(item);
-		}
-
-		return proposals;
-	}
-
-	/**
-	 * 
-	 * @return char
-	 */
-	private char getQuoteChar() {
-
-		String quoteStr = CSSCorePlugin.getDefault().getPluginPreferences().getString(CSSCorePreferenceNames.FORMAT_QUOTE);
-		char quoteChar = (quoteStr != null && 0 < quoteStr.length()) ? quoteStr.charAt(0) : '"';
-		char attrQuote = fContext.getQuoteOfStyleAttribute();
-		if (attrQuote != 0) {
-			if (attrQuote == '"' && quoteChar == '"') {
-				quoteChar = '\'';
-			} else if (attrQuote == '\'' && quoteChar == '\'') {
-				quoteChar = '"';
-			}
-		}
-		return quoteChar;
-	}
-
-	/**
-	 * 
-	 */
-	protected boolean isMatch(String text) {
-		String textToCompare = fContext.getTextToCompare();
-		if (textToCompare.length() == 0) {
-			return true;
-		} else {
-			return (text.toUpperCase().indexOf(textToCompare.toUpperCase()) == 0);
-		}
-		/*
-		 * String textToReplace = fContext.getTextToReplace(); if
-		 * (textToReplace.length() == 0) { return true; } else { return
-		 * (text.toUpperCase().indexOf(textToReplace.toUpperCase()) == 0); }
-		 */
-	}
-
-
-	private String getIndentString() {
-		StringBuffer indent = new StringBuffer();
-
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		if (preferences != null) {
-			char indentChar = ' ';
-			String indentCharPref = preferences.getString(CSSCorePreferenceNames.INDENTATION_CHAR);
-			if (CSSCorePreferenceNames.TAB.equals(indentCharPref)) {
-				indentChar = '\t';
-			}
-			int indentationWidth = preferences.getInt(CSSCorePreferenceNames.INDENTATION_SIZE);
-
-			for (int i = 0; i < indentationWidth; i++) {
-				indent.append(indentChar);
-			}
-		}
-		return indent.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForAtmarkRule.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForAtmarkRule.java
deleted file mode 100644
index 87ba013..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForAtmarkRule.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSCharsetRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSImportRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.SelectionCollector;
-import org.eclipse.wst.css.ui.internal.image.CSSImageType;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-class CSSProposalGeneratorForAtmarkRule extends CSSProposalGenerator {
-
-	private boolean fUseUpperCase = false;
-	private static final String CHARSET = "@charset";//$NON-NLS-1$
-	private static final String FONT_FACE = "@font-face";//$NON-NLS-1$
-	private static final String IMPORT = "@import";//$NON-NLS-1$
-	private static final String MEDIA = "@media";//$NON-NLS-1$
-	private static final String PAGE = "@page";//$NON-NLS-1$
-
-	/**
-	 * CSSAtmarkRuleProposalGenerator constructor comment.
-	 * 
-	 */
-	CSSProposalGeneratorForAtmarkRule(CSSContentAssistContext context) {
-		super(context);
-		fUseUpperCase = CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER;
-	}
-
-	/**
-	 *  
-	 */
-	private CSSCACandidate getCandidateCharsetRule() {
-		// check content model
-		CSSMetaModelUtil util = new CSSMetaModelUtil(fContext.getMetaModel());
-		if (!util.collectNodesByType(CSSMMNode.TYPE_CHARSET_RULE).hasNext()) {
-			return null;
-		}
-
-		// check if embedded or not
-		if (fContext.getModel().getStyleSheetType() == ICSSModel.EMBEDDED) {
-			return null;
-		}
-
-		// check if caret precede all other rules.
-		int offset = fContext.getCursorPos();
-		if (0 < offset) {
-			SelectionCollector trav = new SelectionCollector();
-			trav.setRegion(0, offset - 1);
-			trav.apply(fContext.getModel().getDocument());
-			Iterator i = trav.getSelectedNodes().iterator();
-			while (i.hasNext()) {
-				Object obj = i.next();
-				if (obj instanceof ICSSNode && !(obj instanceof ICSSDocument)) {
-					return null;
-				}
-			}
-		}
-
-		int cursorPos = 0;
-		String ident = (fUseUpperCase) ? CHARSET.toUpperCase() : CHARSET.toLowerCase();
-		StringBuffer buf = new StringBuffer();
-		buf.append(ident);
-		buf.append(" ");//$NON-NLS-1$
-		cursorPos = buf.length();
-		StringAndOffset sao;
-		sao = generateQuotes();
-		buf.append(sao.fString);
-		cursorPos += sao.fOffset;
-		sao = generateSemicolon();
-		buf.append(sao.fString);
-
-		String text = buf.toString();
-
-		if (isMatch(text)) {
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(text);
-			item.setCursorPosition(cursorPos);
-			item.setDisplayString(ident);
-			item.setImageType(CSSImageType.RULE_CHARSET);
-			return item;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private CSSCACandidate getCandidateFontFaceRule() {
-		CSSMetaModelUtil util = new CSSMetaModelUtil(fContext.getMetaModel());
-		if (!util.collectNodesByType(CSSMMNode.TYPE_FONT_FACE_RULE).hasNext()) {
-			return null;
-		}
-
-		int cursorPos = 0;
-		String ident = (fUseUpperCase) ? FONT_FACE.toUpperCase() : FONT_FACE.toLowerCase();
-		StringBuffer buf = new StringBuffer();
-		buf.append(ident);
-		buf.append(" ");//$NON-NLS-1$
-		cursorPos = buf.length();
-		StringAndOffset sao;
-		sao = generateBraces();
-		buf.append(sao.fString);
-		cursorPos += sao.fOffset;
-
-		String text = buf.toString();
-
-		if (isMatch(text)) {
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(buf.toString());
-			item.setCursorPosition(cursorPos);
-			item.setDisplayString(ident);
-			item.setImageType(CSSImageType.RULE_FONTFACE);
-			return item;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private CSSCACandidate getCandidateImportRule() {
-		// check content model
-		CSSMetaModelUtil util = new CSSMetaModelUtil(fContext.getMetaModel());
-		if (!util.collectNodesByType(CSSMMNode.TYPE_IMPORT_RULE).hasNext()) {
-			return null;
-		}
-
-		// charset and import can precede import rule.
-		int offset = fContext.getCursorPos();
-		if (0 < offset) {
-			SelectionCollector trav = new SelectionCollector();
-			trav.setRegion(0, offset - 1);
-			trav.apply(fContext.getModel().getDocument());
-			Iterator i = trav.getSelectedNodes().iterator();
-			while (i.hasNext()) {
-				Object obj = i.next();
-				if (obj instanceof ICSSNode && !(obj instanceof ICSSDocument || obj instanceof ICSSCharsetRule || obj instanceof ICSSImportRule)) {
-					return null;
-				}
-			}
-		}
-
-		int cursorPos = 0;
-		String ident = (fUseUpperCase) ? IMPORT.toUpperCase() : IMPORT.toLowerCase();
-		StringBuffer buf = new StringBuffer();
-		buf.append(ident);
-		buf.append(" ");//$NON-NLS-1$
-		cursorPos = buf.length();
-		StringAndOffset sao;
-		sao = generateURI();
-		buf.append(sao.fString);
-		cursorPos += sao.fOffset;
-		sao = generateSemicolon();
-		buf.append(sao.fString);
-
-		String text = buf.toString();
-
-		if (isMatch(text)) {
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(buf.toString());
-			item.setCursorPosition(cursorPos);
-			item.setDisplayString(ident);
-			item.setImageType(CSSImageType.RULE_IMPORT);
-			return item;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private CSSCACandidate getCandidateMediaRule() {
-		CSSMetaModelUtil util = new CSSMetaModelUtil(fContext.getMetaModel());
-		if (!util.collectNodesByType(CSSMMNode.TYPE_MEDIA_RULE).hasNext()) {
-			return null;
-		}
-
-		int cursorPos = 0;
-		String ident = (fUseUpperCase) ? MEDIA.toUpperCase() : MEDIA.toLowerCase();
-		StringBuffer buf = new StringBuffer();
-		buf.append(ident);
-		buf.append("  ");//$NON-NLS-1$
-		cursorPos = buf.length() - 1;
-		StringAndOffset sao;
-		sao = generateBraces();
-		buf.append(sao.fString);
-
-		String text = buf.toString();
-
-		if (isMatch(text)) {
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(buf.toString());
-			item.setCursorPosition(cursorPos);
-			item.setDisplayString(ident);
-			item.setImageType(CSSImageType.RULE_MEDIA);
-			return item;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private CSSCACandidate getCandidatePageRule() {
-		CSSMetaModelUtil util = new CSSMetaModelUtil(fContext.getMetaModel());
-		if (!util.collectNodesByType(CSSMMNode.TYPE_PAGE_RULE).hasNext()) {
-			return null;
-		}
-
-		int cursorPos = 0;
-		String ident = (fUseUpperCase) ? PAGE.toUpperCase() : PAGE.toLowerCase();
-		StringBuffer buf = new StringBuffer();
-		buf.append(ident);
-		buf.append(" ");//$NON-NLS-1$
-		cursorPos = buf.length();
-		StringAndOffset sao;
-		sao = generateBraces();
-		buf.append(sao.fString);
-		cursorPos += sao.fOffset;
-
-		String text = buf.toString();
-
-		if (isMatch(text)) {
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(buf.toString());
-			item.setCursorPosition(cursorPos);
-			item.setDisplayString(ident);
-			item.setImageType(CSSImageType.RULE_PAGE);
-			return item;
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 * getCandidates method comment.
-	 */
-	protected Iterator getCandidates() {
-		List candidates = new ArrayList();
-
-		ITextRegion region = fContext.getTargetRegionPrevious();
-		//	ITextRegion region = fContext.getSignificantTargetRegion();
-		if (region != null) {
-			String type = region.getType();
-			if (type != CSSRegionContexts.CSS_RBRACE && type != CSSRegionContexts.CSS_DELIMITER) {
-				return candidates.iterator();
-			}
-		}
-
-		CSSCACandidate item;
-		if ((item = getCandidateImportRule()) != null) {
-			candidates.add(item);
-		}
-		if ((item = getCandidateCharsetRule()) != null) {
-			candidates.add(item);
-		}
-		if ((item = getCandidateMediaRule()) != null) {
-			candidates.add(item);
-		}
-		if ((item = getCandidatePageRule()) != null) {
-			candidates.add(item);
-		}
-		if ((item = getCandidateFontFaceRule()) != null) {
-			candidates.add(item);
-		}
-		return candidates.iterator();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForDeclarationName.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForDeclarationName.java
deleted file mode 100644
index 4cf8901..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForDeclarationName.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.ui.internal.image.CSSImageType;
-
-class CSSProposalGeneratorForDeclarationName extends CSSProposalGenerator {
-
-	/**
-	 * CSSProposalGeneratorForDeclaration constructor comment.
-	 * 
-	 */
-	CSSProposalGeneratorForDeclarationName(CSSContentAssistContext context) {
-		super(context);
-	}
-
-	/**
-	 * getCandidates method comment.
-	 */
-	protected Iterator getCandidates() {
-		List candidates = new ArrayList();
-		Preferences preferences = CSSCorePlugin.getDefault().getPluginPreferences();
-		String preDelim = "";//$NON-NLS-1$
-		for (int i = 0; i < preferences.getInt(CSSCorePreferenceNames.FORMAT_PROP_PRE_DELIM); i++) {
-			preDelim += ' ';//$NON-NLS-1$
-		}
-		String postDelim = "";//$NON-NLS-1$
-		for (int i = 0; i < preferences.getInt(CSSCorePreferenceNames.FORMAT_PROP_POST_DELIM); i++) {
-			postDelim += ' ';//$NON-NLS-1$
-		}
-
-		ICSSNode targetNode = fContext.getTargetNode();
-		boolean bFontRule = false;
-		for (ICSSNode node = targetNode; node != null; node = node.getParentNode()) {
-			if (node instanceof org.w3c.dom.css.CSSFontFaceRule) {
-				bFontRule = true;
-				break;
-			}
-		}
-
-		List names = new ArrayList();
-		CSSMetaModelUtil util = new CSSMetaModelUtil(fContext.getMetaModel());
-		Iterator iNames = util.collectNodesByType((bFontRule) ? CSSMMNode.TYPE_DESCRIPTOR : CSSMMNode.TYPE_PROPERTY);
-		while (iNames.hasNext()) {
-			CSSMMNode node = (CSSMMNode) iNames.next();
-			names.add(node);
-		}
-		sortNames(names);
-		// Collections.sort(names);
-
-		boolean bAddColon = true;
-		if ((targetNode instanceof ICSSStyleRule || targetNode instanceof ICSSStyleDeclItem || targetNode instanceof ICSSStyleDeclaration) && fContext.targetHas(CSSRegionContexts.CSS_DECLARATION_SEPARATOR)) {
-			bAddColon = false;
-		}
-
-		Iterator i = names.iterator();
-		while (i.hasNext()) {
-			CSSMMNode node = (CSSMMNode) i.next();
-			String text = node.getName();
-			text = (preferences.getInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.UPPER) ? text.toUpperCase() : text.toLowerCase();
-			if (!isMatch(text)) {
-				continue;
-			}
-
-			int cursorPos = 0;
-			StringBuffer buf = new StringBuffer();
-			buf.append(text);
-			buf.append(preDelim);
-			cursorPos = buf.length();
-			if (bAddColon) {
-				buf.append(':');//$NON-NLS-1$
-				buf.append(postDelim);
-				cursorPos += 1 + postDelim.length();
-			}
-			// if (! (targetNode instanceof ICSSStyleDeclItem)) {
-			// buf.append(';');//$NON-NLS-1$
-			// }
-
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(buf.toString());
-			item.setCursorPosition(cursorPos);
-			item.setDisplayString(text);
-			item.setImageType(getCategoryImageType(node));
-			candidates.add(item);
-		}
-
-		return candidates.iterator();
-	}
-
-	void sortNames(List names) {
-		Collections.sort(names, new Comparator() {
-			public int compare(Object o1, Object o2) {
-				CSSMMNode node1 = (CSSMMNode) o1;
-				CSSMMNode node2 = (CSSMMNode) o2;
-				if (node1 == null) {
-					return 1;
-				} else if (node2 == null) {
-					return -1;
-				}
-				int diff = 0;
-				String category1 = node1.getAttribute("category"); //$NON-NLS-1$
-				String category2 = node2.getAttribute("category"); //$NON-NLS-1$
-				if (category1 == null) {
-					if (category2 == null) {
-						diff = 0;
-					} else {
-						return 1;
-					}
-				} else if (category2 == null) {
-					return -1;
-				} else {
-					diff = category1.compareTo(category2);
-				}
-				if (diff == 0) {
-					String name = node1.getName();
-					if (name == null) {
-						return 1;
-					} else {
-						return name.compareTo(node2.getName());
-					}
-				} else {
-					return diff;
-				}
-			}
-		});
-	}
-
-	/*
-	 * retrieve default category icon name TODO: if node has "icon"(?), use
-	 * it.
-	 */
-	CSSImageType getCategoryImageType(CSSMMNode node) {
-		CSSImageType imageType = null;
-		if (node != null) {
-			String category = node.getAttribute("category"); //$NON-NLS-1$
-			if (category != null) {
-				imageType = CSSImageType.getImageType(category);
-			}
-		}
-		return (imageType == null) ? CSSImageType.CATEGORY_DEFAULT : imageType;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForDeclarationValue.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForDeclarationValue.java
deleted file mode 100644
index e9d993d..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForDeclarationValue.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMDescriptor;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMFunction;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNumber;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMUnit;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSFunctionID;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.util.CSSUtil;
-import org.eclipse.wst.css.core.internal.util.RegionIterator;
-import org.eclipse.wst.css.ui.internal.image.CSSImageType;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.w3c.dom.css.CSSFontFaceRule;
-
-class CSSProposalGeneratorForDeclarationValue extends CSSProposalGenerator {
-
-	private static final String IMPORTANT = "!important"; //$NON-NLS-1$
-	private boolean fUseUpperCase;
-	private boolean fAppendSemiColon;
-
-	/**
-	 * CSSProposalGeneratorForDeclarationValue constructor comment.
-	 * 
-	 */
-	CSSProposalGeneratorForDeclarationValue(CSSContentAssistContext context) {
-		super(context);
-		fUseUpperCase = CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER;
-	}
-
-	/**
-	 *  
-	 */
-	private void addFunction(List candidates, CSSMMFunction prop) {
-		String text = prop.toString();
-		if (!isMatch(text)) {
-			return;
-		}
-
-		int cursorPos = 0;
-		StringBuffer buf = new StringBuffer();
-		if (prop.getName().equals(CSSFunctionID.F_URI)) {
-			StringAndOffset sao = generateURI();
-			buf.append(sao.fString);
-			cursorPos = sao.fOffset;
-		} else {
-			buf.append(prop.toString());
-			cursorPos = buf.length();
-			StringAndOffset sao = generateParenthesis();
-			buf.append(sao.fString);
-			cursorPos += sao.fOffset;
-		}
-
-		text = buf.toString();
-		text = (fUseUpperCase) ? text.toUpperCase() : text.toLowerCase();
-
-		CSSCACandidate item = new CSSCACandidate();
-		item.setReplacementString(text);
-		item.setCursorPosition(cursorPos);
-		item.setDisplayString(text);
-		item.setImageType(CSSImageType.VALUE_FUNCTION);
-		appendSemiColon(item);
-		candidates.add(item);
-	}
-
-	/**
-	 *  
-	 */
-	private void addNumber(List candidates, CSSMMNumber prop) {
-		String fullText = fContext.getTextToReplace();
-		// skip number
-		int unitIndex = -1;
-		for (int i = 0; i < fullText.length(); i++) {
-			if (Character.isDigit(fullText.charAt(i))) {
-				unitIndex = i + 1;
-			} else {
-				break;
-			}
-		}
-
-		String unitSubText = ""; //$NON-NLS-1$
-		String numSubText = ""; //$NON-NLS-1$
-		if (0 <= unitIndex) {
-			numSubText = fullText.substring(0, unitIndex);
-			if (unitIndex < fullText.length()) {
-				unitSubText = fullText.substring(unitIndex);
-			}
-		} else {
-			unitSubText = fullText;
-		}
-
-		Iterator i = prop.getDescendants();
-		while (i.hasNext()) {
-			CSSMMUnit unit = (CSSMMUnit) i.next();
-			String unitString = unit.getUnitString();
-			if ((0 < unitSubText.length() && unitString.indexOf(unitSubText) != 0) || (0 < numSubText.length() && unitString.equals("#"))) { //$NON-NLS-1$
-				continue;
-			}
-
-			String text = numSubText + unitString;
-			text = (fUseUpperCase) ? text.toUpperCase() : text.toLowerCase();
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(text);
-			if (0 < numSubText.length() || text.equals("#")) { //$NON-NLS-1$
-				item.setCursorPosition(text.length());
-			} else {
-				item.setCursorPosition(0);
-			}
-			item.setDisplayString(text);
-			item.setImageType(CSSImageType.VALUE_NUMBER);
-			appendSemiColon(item);
-			candidates.add(item);
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void checkSemiColon() {
-		fAppendSemiColon = false;
-
-		ITextRegion targetRegion = fContext.getTargetRegion();
-		if (targetRegion != null && targetRegion.getType() != CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-			// find trailing ":" or ";"
-			// if ":" before ";" is found, add ";"
-			RegionIterator iterator = fContext.getRegionIterator();
-			IStructuredDocumentRegion container = iterator.getStructuredDocumentRegion();
-			while (iterator.hasNext()) {
-				ITextRegion region = iterator.next();
-				if (iterator.getStructuredDocumentRegion() != container) {
-					break;
-				}
-				if (region.getType() == CSSRegionContexts.CSS_DECLARATION_SEPARATOR) {
-					fAppendSemiColon = true;
-					break;
-				}
-			}
-			if (!fAppendSemiColon) {
-				// second chance:
-				// leading IStructuredDocumentRegion is not ";"
-				IStructuredDocumentRegion nextStructuredDocumentRegion = CSSUtil.findNextSignificantNode(container);
-				if (CSSUtil.getStructuredDocumentRegionType(nextStructuredDocumentRegion) != CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-					fAppendSemiColon = true;
-				}
-			}
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void appendSemiColon(CSSCACandidate item) {
-		if (fAppendSemiColon) {
-			String replacementString = item.getReplacementString();
-			item.setReplacementString(replacementString + ";"); //$NON-NLS-1$
-			int cursorPosition = item.getCursorPosition();
-			if (replacementString.length() <= cursorPosition) {
-				// cursorpos is tail of string
-				cursorPosition++;
-				item.setCursorPosition(cursorPosition);
-			}
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void addSemiColon(List candidates) {
-		ICSSNode targetNode = fContext.getTargetNode();
-		if (targetNode instanceof ICSSStyleDeclItem) {
-			ICSSNode firstChild = targetNode.getFirstChild();
-			if (firstChild == null) {
-				return;
-			}
-			if (firstChild instanceof IndexedRegion) {
-				int startOffset = ((IndexedRegion) firstChild).getStartOffset();
-				if (fContext.getCursorPos() <= startOffset) {
-					return;
-				}
-			}
-		}
-
-		boolean bAddCloser = false;
-
-		ITextRegion targetRegion = fContext.getTargetRegion();
-		if (targetRegion != null && targetRegion.getType() != CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-			// find trailing ":" or ";"
-			// if ":" before ";" is found, add ";"
-			RegionIterator iterator = fContext.getRegionIterator();
-			IStructuredDocumentRegion container = iterator.getStructuredDocumentRegion();
-			while (iterator.hasNext()) {
-				ITextRegion region = iterator.next();
-				if (iterator.getStructuredDocumentRegion() != container) {
-					break;
-				}
-				if (region.getType() == CSSRegionContexts.CSS_DECLARATION_SEPARATOR) {
-					bAddCloser = true;
-					break;
-				}
-			}
-			if (!bAddCloser) {
-				// second chance:
-				// leading IStructuredDocumentRegion is not ";"
-				IStructuredDocumentRegion nextStructuredDocumentRegion = CSSUtil.findNextSignificantNode(container);
-				if (CSSUtil.getStructuredDocumentRegionType(nextStructuredDocumentRegion) != CSSRegionContexts.CSS_DECLARATION_DELIMITER) {
-					bAddCloser = true;
-				}
-			}
-		}
-
-		if (bAddCloser) {
-			CSSCACandidate item = new CSSCACandidate();
-			String text = fContext.getTextToReplace() + ";";//$NON-NLS-1$
-			item.setReplacementString(text);
-			item.setCursorPosition(text.length());
-			item.setDisplayString(";");//$NON-NLS-1$
-			item.setImageType(null);
-			candidates.add(item);
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private void addString(List candidates, String text) {
-		if (!isMatch(text)) {
-			return;
-		}
-
-		text = (fUseUpperCase) ? text.toUpperCase() : text.toLowerCase();
-
-		CSSCACandidate item = new CSSCACandidate();
-		item.setReplacementString(text);
-		item.setCursorPosition(text.length());
-		item.setDisplayString(text);
-		item.setImageType(CSSImageType.VALUE_STRING);
-		appendSemiColon(item);
-		candidates.add(item);
-	}
-
-	private void addImportant(List candidates) {
-		ICSSNode targetNode = fContext.getTargetNode();
-		while (targetNode instanceof ICSSPrimitiveValue) {
-			targetNode = targetNode.getParentNode();
-		}
-		if (!(targetNode instanceof ICSSStyleDeclItem)) {
-			return;
-		}
-		// 1. has no priority region
-		// 2. cursor position is after of last child
-		// 3. normal isMatch method
-		String priority = ((ICSSStyleDeclItem) targetNode).getPriority();
-		if (priority == null || priority.length() == 0) {
-			ICSSNode lastChild = targetNode.getLastChild();
-			if (lastChild instanceof IndexedRegion) {
-				int startOffset = ((IndexedRegion) lastChild).getStartOffset();
-				//	int endOffset = ((IndexedRegion)lastChild).getEndOffset();
-				if (startOffset < fContext.getCursorPos() && isMatch(IMPORTANT)) {
-					CSSCACandidate item = new CSSCACandidate();
-					item.setReplacementString(IMPORTANT);
-					item.setCursorPosition(IMPORTANT.length());
-					item.setDisplayString(IMPORTANT);
-					item.setImageType(CSSImageType.VALUE_STRING);
-					appendSemiColon(item);
-					candidates.add(item);
-				}
-			}
-		}
-	}
-
-	/**
-	 * getCandidates method comment.
-	 */
-	protected Iterator getCandidates() {
-		List candidates = new ArrayList();
-
-		checkSemiColon(); // check should add semi-colon or not
-
-		String name = getPropertyName();
-		if (name != null) {
-			CSSMetaModelUtil util = new CSSMetaModelUtil(fContext.getMetaModel());
-			Iterator i = Collections.EMPTY_LIST.iterator();
-			if (isFontFaceRule()) {
-				CSSMMDescriptor desc = util.getDescriptor(name);
-				if (desc != null) {
-					i = desc.getValues();
-				}
-			} else {
-				CSSMMProperty prop = util.getProperty(name);
-				if (prop != null) {
-					i = prop.getValues();
-				}
-			}
-			while (i.hasNext()) {
-				CSSMMNode val = (CSSMMNode) i.next();
-				String valueType = val.getType();
-				if (valueType == CSSMMNode.TYPE_KEYWORD) {
-					addString(candidates, val.toString());
-				} else if (valueType == CSSMMNode.TYPE_NUMBER) {
-					addNumber(candidates, (CSSMMNumber) val);
-				} else if (valueType == CSSMMNode.TYPE_FUNCTION) {
-					addFunction(candidates, (CSSMMFunction) val);
-				}
-			}
-		}
-
-		addImportant(candidates);
-		addSemiColon(candidates);
-
-		return candidates.iterator();
-	}
-
-	/**
-	 * @return java.lang.String
-	 */
-	private String getPropertyName() {
-		ICSSNode targetNode = fContext.getTargetNode();
-		while (targetNode instanceof ICSSPrimitiveValue) {
-			targetNode = targetNode.getParentNode();
-		}
-		if (targetNode instanceof ICSSStyleDeclItem) {
-			return ((ICSSStyleDeclItem) targetNode).getPropertyName();
-		} else {
-			return null;
-		}
-	}
-
-	/**
-	 *  
-	 */
-	private boolean isFontFaceRule() {
-		ICSSNode targetNode = fContext.getTargetNode();
-		while (targetNode instanceof ICSSPrimitiveValue) {
-			targetNode = targetNode.getParentNode();
-		}
-		if (targetNode instanceof ICSSStyleDeclItem) {
-			targetNode = targetNode.getParentNode(); // get Declaration
-			if (targetNode != null) {
-				// inline style has no rule node
-				targetNode = targetNode.getParentNode(); // get rule
-			}
-		}
-		return (targetNode instanceof CSSFontFaceRule);
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForHTMLTag.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForHTMLTag.java
deleted file mode 100644
index 6302cb1..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForHTMLTag.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.ui.internal.image.CSSImageType;
-import org.eclipse.wst.html.core.internal.contentmodel.HTMLCMDocumentFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.contentmodel.CMDocType;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-class CSSProposalGeneratorForHTMLTag extends CSSProposalGenerator {
-
-	/**
-	 * CSSStyleRuleProposalGenerator constructor comment.
-	 * 
-	 */
-	CSSProposalGeneratorForHTMLTag(CSSContentAssistContext context) {
-		super(context);
-
-		if (fHTMLTags == null) {
-			fHTMLTags = setupHTMLTags();
-		}
-	}
-
-	/**
-	 * getCandidates method comment.
-	 */
-	protected Iterator getCandidates() {
-		List candidates = new ArrayList();
-
-		if (checkLeadingColon()) {
-			return candidates.iterator();
-		}
-
-		boolean bLowerCase = CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_SELECTOR) == CSSCorePreferenceNames.LOWER;
-		// XHTML requires lower case
-		if (fContext.getModel().getStyleSheetType() == ICSSModel.EMBEDDED) {
-			Node domNode = fContext.getModel().getOwnerDOMNode();
-			if (domNode != null && !(domNode instanceof Document)) {
-				domNode = domNode.getOwnerDocument();
-				if (domNode instanceof IDOMDocument) {
-					DocumentTypeAdapter adapter = (DocumentTypeAdapter) ((IDOMDocument) domNode).getAdapterFor(DocumentTypeAdapter.class);
-					if (adapter != null)
-						bLowerCase = (adapter.getTagNameCase() == DocumentTypeAdapter.LOWER_CASE);
-				}
-			}
-		}
-
-
-		int length = fHTMLTags.length;
-		for (int i = 0; i < length; i++) {
-			String tagText = fHTMLTags[i];
-			if (bLowerCase) {
-				tagText = tagText.toLowerCase();
-			}
-			if (!isMatch(tagText)) {
-				continue;
-			}
-
-			int cursorPos = 0;
-			StringBuffer buf = new StringBuffer();
-			buf.append(tagText);
-			cursorPos += tagText.length();
-			boolean inRule = (fContext.getTargetNode() instanceof ICSSStyleRule);
-			if (!inRule || fContext.getTextToReplace().length() == 0) {
-				buf.append(" ");//$NON-NLS-1$
-				cursorPos += 1;
-			}
-			if (!inRule) {
-				StringAndOffset sao = generateBraces();
-				buf.append(sao.fString);
-				cursorPos += sao.fOffset;
-			}
-
-			CSSCACandidate item = new CSSCACandidate();
-			item.setReplacementString(buf.toString());
-			item.setCursorPosition(cursorPos);
-			item.setDisplayString(tagText);
-			item.setImageType(CSSImageType.SELECTOR_TAG);
-			candidates.add(item);
-		}
-
-		return candidates.iterator();
-	}
-
-	/**
-	 *  
-	 */
-	private static String[] setupHTMLTags() {
-		CMDocument cmdoc = HTMLCMDocumentFactory.getCMDocument(CMDocType.HTML_DOC_TYPE);
-		CMNamedNodeMap elements = cmdoc.getElements();
-		Vector names = new Vector();
-		int nElements = elements.getLength();
-		for (int i = 0; i < nElements; i++) {
-			CMElementDeclaration edec = (CMElementDeclaration) elements.item(i);
-			if (isAttrDefined(edec, HTML40Namespace.ATTR_NAME_STYLE)) {
-				names.add(edec.getElementName());
-			}
-		}
-		Collections.sort(names);
-		String[] tags = new String[names.size()];
-		Iterator iNames = names.iterator();
-		for (int i = 0; iNames.hasNext(); i++) {
-			tags[i] = (String) iNames.next();
-		}
-		return tags;
-	}
-
-	/**
-	 *  
-	 */
-	private static boolean isAttrDefined(CMElementDeclaration edec, String attrName) {
-		if (edec == null) {
-			return false;
-		}
-		CMNamedNodeMap attrs = edec.getAttributes();
-		if (attrs == null) {
-			return false;
-		}
-		for (int i = 0; i < attrs.getLength(); i++) {
-			CMAttributeDeclaration attr = (CMAttributeDeclaration) attrs.item(i);
-			if (attr == null) {
-				continue;
-			}
-			if (attr.getAttrName().equalsIgnoreCase(attrName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	private static String[] fHTMLTags = null;
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForPseudoSelector.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForPseudoSelector.java
deleted file mode 100644
index e0af646..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSProposalGeneratorForPseudoSelector.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMSelector;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMMTypeCollector;
-import org.eclipse.wst.css.core.internal.parser.CSSRegionUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPageRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.ui.internal.image.CSSImageType;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-/**
- *  
- */
-class CSSProposalGeneratorForPseudoSelector extends CSSProposalGenerator {
-
-	/**
-	 * CSSProposalGeneratorForPseudoSelector constructor comment.
-	 * 
-	 */
-	CSSProposalGeneratorForPseudoSelector(CSSContentAssistContext context) {
-		super(context);
-	}
-
-	/**
-	 * getCandidates method comment.
-	 */
-	protected Iterator getCandidates() {
-		List candidates = new ArrayList();
-
-		boolean hasLeadingColon = checkLeadingColon();
-		String textToReplace = fContext.getTextToReplace();
-		if (!hasLeadingColon && 0 < textToReplace.length() && !textToReplace.equals(fContext.getTextToCompare())) {
-			// cursor placed midpoint of the region
-			return candidates.iterator();
-		}
-		ITextRegion region = fContext.getTargetRegion();
-		if (region != null) {
-			String type = region.getType();
-			if (type != CSSRegionContexts.CSS_S && !CSSRegionUtil.isSelectorBegginingType(type)) {
-				return candidates.iterator();
-			}
-		}
-
-		boolean useUpperCase = CSSCorePlugin.getDefault().getPluginPreferences().getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER;
-
-		List tags = getSelectorTags();
-		Collections.sort(tags);
-		Iterator i = tags.iterator();
-		while (i.hasNext()) {
-			String text = (String) i.next();
-			if (hasLeadingColon && !isMatch(text)) {
-				continue;
-			}
-			text = (useUpperCase) ? text.toUpperCase() : text.toLowerCase();
-
-			int cursorPos = 0;
-			StringBuffer buf = new StringBuffer();
-			
-			if (!hasLeadingColon)
-				buf.append(textToReplace);
-			
-			buf.append(text);
-			cursorPos += buf.length();
-
-			if (0 < buf.length()) {
-				boolean inRule = (fContext.getTargetNode() instanceof ICSSStyleRule || fContext.getTargetNode() instanceof ICSSPageRule);
-				if (!inRule || (textToReplace.length() == 0 && !hasLeadingColon)) {
-					buf.append(" ");//$NON-NLS-1$
-					cursorPos += 1;
-				}
-				if (!inRule) {
-					StringAndOffset sao = generateBraces();
-					buf.append(sao.fString);
-					cursorPos += sao.fOffset;
-				}
-				CSSCACandidate item = new CSSCACandidate();
-				item.setReplacementString(buf.toString());
-				item.setCursorPosition(cursorPos);
-				item.setDisplayString(text);
-				item.setImageType(CSSImageType.SELECTOR_PSEUDO);
-				candidates.add(item);
-			}
-		}
-
-		return candidates.iterator();
-	}
-
-	/**
-	 *  
-	 */
-	List getSelectorTags() {
-		List tagList = new ArrayList();
-		ICSSNode targetNode = fContext.getTargetNode();
-		String rootType = (targetNode instanceof ICSSPageRule) ? CSSMMNode.TYPE_PAGE_RULE : CSSMMNode.TYPE_STYLE_RULE;
-
-		CSSMMTypeCollector collector = new CSSMMTypeCollector();
-		collector.collectNestedType(false);
-		collector.apply(fContext.getMetaModel(), rootType);
-		Iterator i;
-		i = collector.getNodes();
-		if (!i.hasNext()) {
-			return tagList;
-		}
-		CSSMMNode node = (CSSMMNode) i.next();
-		i = node.getChildNodes();
-		while (i.hasNext()) {
-			CSSMMNode child = (CSSMMNode) i.next();
-			if (child.getType() == CSSMMNode.TYPE_SELECTOR) {
-				String selType = ((CSSMMSelector) child).getSelectorType();
-				if (selType == CSSMMSelector.TYPE_PSEUDO_CLASS || selType == CSSMMSelector.TYPE_PSEUDO_ELEMENT) {
-					tagList.add(((CSSMMSelector) child).getSelectorString());
-				}
-			}
-		}
-		return tagList;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSTemplateCompletionProcessor.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSTemplateCompletionProcessor.java
deleted file mode 100644
index 6605bdb..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/CSSTemplateCompletionProcessor.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.CSSEditorPluginImages;
-import org.eclipse.wst.css.ui.internal.image.CSSImageHelper;
-
-
-/**
- * Completion processor for CSS Templates. Most of the work is already done
- * by the CSS Content Assist processor, so by the time the
- * CSSTemplateCompletionProcessor is asked for content assist proposals, the
- * CSS content assist processor has already set the context type for
- * templates.
- */
-class CSSTemplateCompletionProcessor extends TemplateCompletionProcessor {
-	private String fContextTypeId = null;
-
-	protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
-		TemplateContextType type = null;
-
-		ContextTypeRegistry registry = getTemplateContextRegistry();
-		if (registry != null)
-			type = registry.getContextType(fContextTypeId);
-
-		return type;
-	}
-
-	protected Image getImage(Template template) {
-		// just return the same image for now
-		return CSSImageHelper.getInstance().getImage(CSSEditorPluginImages.IMG_OBJ_TEMPLATE);
-	}
-
-	private ContextTypeRegistry getTemplateContextRegistry() {
-		return CSSUIPlugin.getDefault().getTemplateContextRegistry();
-	}
-
-	protected Template[] getTemplates(String contextTypeId) {
-		Template templates[] = null;
-
-		TemplateStore store = getTemplateStore();
-		if (store != null)
-			templates = store.getTemplates(contextTypeId);
-
-		return templates;
-	}
-
-	private TemplateStore getTemplateStore() {
-		return CSSUIPlugin.getDefault().getTemplateStore();
-	}
-
-	void setContextType(String contextTypeId) {
-		fContextTypeId = contextTypeId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/HTML40Namespace.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/HTML40Namespace.java
deleted file mode 100644
index c8c0e30..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentassist/HTML40Namespace.java
+++ /dev/null
@@ -1,890 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*nlsXXX*/
-package org.eclipse.wst.css.ui.internal.contentassist;
-
-
-
-/**
- * Provide all names defined in the HTML 4.0? specification.
- */
-public interface HTML40Namespace {
-
-	// Element names
-	public static interface ElementName {
-		public static final String A = "A"; //$NON-NLS-1$
-		public static final String ABBR = "ABBR"; //$NON-NLS-1$
-		public static final String ACRONYM = "ACRONYM"; //$NON-NLS-1$
-		public static final String ADDRESS = "ADDRESS"; //$NON-NLS-1$
-		public static final String APPLET = "APPLET"; //$NON-NLS-1$
-		public static final String AREA = "AREA"; //$NON-NLS-1$
-		public static final String B = "B"; //$NON-NLS-1$
-		public static final String BASE = "BASE"; //$NON-NLS-1$
-		public static final String BASEFONT = "BASEFONT"; //$NON-NLS-1$
-		public static final String BDO = "BDO"; //$NON-NLS-1$
-		public static final String BGSOUND = "BGSOUND"; // D205513
-														// //$NON-NLS-1$
-		public static final String BIG = "BIG"; //$NON-NLS-1$
-		public static final String BLINK = "BLINK"; //$NON-NLS-1$
-		public static final String BLOCKQUOTE = "BLOCKQUOTE"; //$NON-NLS-1$
-		public static final String BODY = "BODY"; //$NON-NLS-1$
-		public static final String BR = "BR"; //$NON-NLS-1$
-		public static final String BUTTON = "BUTTON"; //$NON-NLS-1$
-		public static final String CAPTION = "CAPTION"; //$NON-NLS-1$
-		public static final String CENTER = "CENTER"; //$NON-NLS-1$
-		public static final String CITE = "CITE"; //$NON-NLS-1$
-		public static final String CODE = "CODE"; //$NON-NLS-1$
-		public static final String COL = "COL"; //$NON-NLS-1$
-		public static final String COLGROUP = "COLGROUP"; //$NON-NLS-1$
-		public static final String DD = "DD"; //$NON-NLS-1$
-		public static final String DEL = "DEL"; //$NON-NLS-1$
-		public static final String DFN = "DFN"; //$NON-NLS-1$
-		public static final String DIR = "DIR"; //$NON-NLS-1$
-		public static final String DIV = "DIV"; //$NON-NLS-1$
-		public static final String DL = "DL"; //$NON-NLS-1$
-		public static final String DT = "DT"; //$NON-NLS-1$
-		public static final String EM = "EM"; //$NON-NLS-1$
-		public static final String EMBED = "EMBED"; //$NON-NLS-1$
-		public static final String FIELDSET = "FIELDSET"; //$NON-NLS-1$
-		public static final String FONT = "FONT"; //$NON-NLS-1$
-		public static final String FORM = "FORM"; //$NON-NLS-1$
-		public static final String FRAME = "FRAME"; //$NON-NLS-1$
-		public static final String FRAMESET = "FRAMESET"; //$NON-NLS-1$
-		public static final String H1 = "H1"; //$NON-NLS-1$
-		public static final String H2 = "H2"; //$NON-NLS-1$
-		public static final String H3 = "H3"; //$NON-NLS-1$
-		public static final String H4 = "H4"; //$NON-NLS-1$
-		public static final String H5 = "H5"; //$NON-NLS-1$
-		public static final String H6 = "H6"; //$NON-NLS-1$
-		public static final String HEAD = "HEAD"; //$NON-NLS-1$
-		public static final String HR = "HR"; //$NON-NLS-1$
-		public static final String HTML = "HTML"; //$NON-NLS-1$
-		public static final String I = "I"; //$NON-NLS-1$
-		public static final String IFRAME = "IFRAME"; //$NON-NLS-1$
-		public static final String IMG = "IMG"; //$NON-NLS-1$
-		public static final String INPUT = "INPUT"; //$NON-NLS-1$
-		public static final String INS = "INS"; //$NON-NLS-1$
-		public static final String ISINDEX = "ISINDEX"; //$NON-NLS-1$
-		public static final String KBD = "KBD"; //$NON-NLS-1$
-		public static final String LABEL = "LABEL"; //$NON-NLS-1$
-		public static final String LEGEND = "LEGEND"; //$NON-NLS-1$
-		public static final String LI = "LI"; //$NON-NLS-1$
-		public static final String LINK = "LINK"; //$NON-NLS-1$
-		public static final String MAP = "MAP"; //$NON-NLS-1$
-		public static final String MENU = "MENU"; //$NON-NLS-1$
-		public static final String META = "META"; //$NON-NLS-1$
-		public static final String NOBR = "NOBR"; // D205513 //$NON-NLS-1$
-		public static final String NOEMBED = "NOEMBED"; //$NON-NLS-1$
-		public static final String NOFRAMES = "NOFRAMES"; //$NON-NLS-1$
-		public static final String NOSCRIPT = "NOSCRIPT"; //$NON-NLS-1$
-		public static final String OBJECT = "OBJECT"; //$NON-NLS-1$
-		public static final String OL = "OL"; //$NON-NLS-1$
-		public static final String OPTGROUP = "OPTGROUP"; //$NON-NLS-1$
-		public static final String OPTION = "OPTION"; //$NON-NLS-1$
-		public static final String P = "P"; //$NON-NLS-1$
-		public static final String PARAM = "PARAM"; //$NON-NLS-1$
-		public static final String PRE = "PRE"; //$NON-NLS-1$
-		public static final String Q = "Q"; //$NON-NLS-1$
-		public static final String S = "S"; //$NON-NLS-1$
-		public static final String SAMP = "SAMP"; //$NON-NLS-1$
-		public static final String SCRIPT = "SCRIPT"; //$NON-NLS-1$
-		public static final String SELECT = "SELECT"; //$NON-NLS-1$
-		public static final String SMALL = "SMALL"; //$NON-NLS-1$
-		public static final String SPAN = "SPAN"; //$NON-NLS-1$
-		public static final String STRIKE = "STRIKE"; //$NON-NLS-1$
-		public static final String STRONG = "STRONG"; //$NON-NLS-1$
-		public static final String STYLE = "STYLE"; //$NON-NLS-1$
-		public static final String SUB = "SUB"; //$NON-NLS-1$
-		public static final String SUP = "SUP"; //$NON-NLS-1$
-		public static final String TABLE = "TABLE"; //$NON-NLS-1$
-		public static final String TBODY = "TBODY"; //$NON-NLS-1$
-		public static final String TD = "TD"; //$NON-NLS-1$
-		public static final String TEXTAREA = "TEXTAREA"; //$NON-NLS-1$
-		public static final String TFOOT = "TFOOT"; //$NON-NLS-1$
-		public static final String TH = "TH"; //$NON-NLS-1$
-		public static final String THEAD = "THEAD"; //$NON-NLS-1$
-		public static final String TITLE = "TITLE"; //$NON-NLS-1$
-		public static final String TR = "TR"; //$NON-NLS-1$
-		public static final String TT = "TT"; //$NON-NLS-1$
-		public static final String U = "U"; //$NON-NLS-1$
-		public static final String UL = "UL"; //$NON-NLS-1$
-		public static final String VAR = "VAR"; //$NON-NLS-1$
-		public static final String WBR = "WBR"; // D205513 //$NON-NLS-1$
-		public static final String MARQUEE = "MARQUEE"; //$NON-NLS-1$
-		public static final String SSI_CONFIG = "SSI:CONFIG"; // D210393
-															  // //$NON-NLS-1$
-		public static final String SSI_ECHO = "SSI:ECHO"; //$NON-NLS-1$
-		public static final String SSI_EXEC = "SSI:EXEC"; //$NON-NLS-1$
-		public static final String SSI_FSIZE = "SSI:FSIZE"; //$NON-NLS-1$
-		public static final String SSI_FLASTMOD = "SSI:FLASTMOD"; //$NON-NLS-1$
-		public static final String SSI_INCLUDE = "SSI:INCLUDE"; //$NON-NLS-1$
-		public static final String SSI_PRINTENV = "SSI:PRINTENV"; //$NON-NLS-1$
-		public static final String SSI_SET = "SSI:SET"; //$NON-NLS-1$
-		public static final String WML_WML = "wml"; //$NON-NLS-1$
-		public static final String WML_CARD = "card"; //$NON-NLS-1$
-		public static final String WML_TEMPLATE = "template"; //$NON-NLS-1$
-		public static final String WML_ACCESS = "access"; //$NON-NLS-1$
-		public static final String WML_DO = "do"; //$NON-NLS-1$
-		public static final String WML_ONEVENT = "onevent"; //$NON-NLS-1$
-		public static final String WML_TIMER = "timer"; //$NON-NLS-1$
-		public static final String WML_ANCHOR = "anchor"; //$NON-NLS-1$
-		public static final String WML_PREV = "prev"; //$NON-NLS-1$
-		public static final String WML_REFRESH = "refresh"; //$NON-NLS-1$
-		public static final String WML_GO = "go"; //$NON-NLS-1$
-		public static final String WML_NOOP = "noop"; //$NON-NLS-1$
-		public static final String WML_SETVAR = "setvar"; //$NON-NLS-1$
-		public static final String WML_POSTFIELD = "postfield"; //$NON-NLS-1$
-	}
-
-	// Character Entities
-	public static interface EntityName {
-		public static final String AACUTE_U = "Aacute"; //$NON-NLS-1$
-		public static final String AACUTE_L = "aacute"; //$NON-NLS-1$
-		public static final String ACIRC_U = "Acirc"; //$NON-NLS-1$
-		public static final String ACIRC_L = "acirc"; //$NON-NLS-1$
-		public static final String ACUTE = "acute"; //$NON-NLS-1$
-		public static final String AELIG_U = "AElig"; //$NON-NLS-1$
-		public static final String AELIG_L = "aelig"; //$NON-NLS-1$
-		public static final String AGRAVE_U = "Agrave"; //$NON-NLS-1$
-		public static final String AGRAVE_L = "agrave"; //$NON-NLS-1$
-		public static final String ALEFSYM = "alefsym"; //$NON-NLS-1$
-		public static final String ALPHA_U = "Alpha"; //$NON-NLS-1$
-		public static final String ALPHA_L = "alpha"; //$NON-NLS-1$
-		public static final String AMP = "amp"; //$NON-NLS-1$
-		public static final String AND = "and"; //$NON-NLS-1$
-		public static final String ANG = "ang"; //$NON-NLS-1$
-		public static final String ARING_U = "Aring"; //$NON-NLS-1$
-		public static final String ARING_L = "aring"; //$NON-NLS-1$
-		public static final String ASYMP = "asymp"; //$NON-NLS-1$
-		public static final String ATILDE_U = "Atilde"; //$NON-NLS-1$
-		public static final String ATILDE_L = "atilde"; //$NON-NLS-1$
-		public static final String AUML_U = "Auml"; //$NON-NLS-1$
-		public static final String AUML_L = "auml"; //$NON-NLS-1$
-		public static final String BDQUO = "bdquo"; //$NON-NLS-1$
-		public static final String BETA_U = "Beta"; //$NON-NLS-1$
-		public static final String BETA_L = "beta"; //$NON-NLS-1$
-		public static final String BRVBAR = "brvbar"; //$NON-NLS-1$
-		public static final String BULL = "bull"; //$NON-NLS-1$
-		public static final String CAP = "cap"; //$NON-NLS-1$
-		public static final String CCEDIL_U = "Ccedil"; //$NON-NLS-1$
-		public static final String CCEDIL_L = "ccedil"; //$NON-NLS-1$
-		public static final String CEDIL = "cedil"; //$NON-NLS-1$
-		public static final String CENT = "cent"; //$NON-NLS-1$
-		public static final String CHI_U = "Chi"; //$NON-NLS-1$
-		public static final String CHI_L = "chi"; //$NON-NLS-1$
-		public static final String CIRC = "circ"; //$NON-NLS-1$
-		public static final String CLUBS = "clubs"; //$NON-NLS-1$
-		public static final String CONG = "cong"; //$NON-NLS-1$
-		public static final String COPY = "copy"; //$NON-NLS-1$
-		public static final String CRARR = "crarr"; //$NON-NLS-1$
-		public static final String CUP = "cup"; //$NON-NLS-1$
-		public static final String CURREN = "curren"; //$NON-NLS-1$
-		public static final String DAGGER_U = "Dagger"; //$NON-NLS-1$
-		public static final String DAGGER_L = "dagger"; //$NON-NLS-1$
-		public static final String DARR_U = "dArr"; //$NON-NLS-1$
-		public static final String DARR_L = "darr"; //$NON-NLS-1$
-		public static final String DEG = "deg"; //$NON-NLS-1$
-		public static final String DELTA_U = "Delta"; //$NON-NLS-1$
-		public static final String DELTA_L = "delta"; //$NON-NLS-1$
-		public static final String DIAMS = "diams"; //$NON-NLS-1$
-		public static final String DIVIDE = "divide"; //$NON-NLS-1$
-		public static final String EACUTE_U = "Eacute"; //$NON-NLS-1$
-		public static final String EACUTE_L = "eacute"; //$NON-NLS-1$
-		public static final String ECIRC_U = "Ecirc"; //$NON-NLS-1$
-		public static final String ECIRC_L = "ecirc"; //$NON-NLS-1$
-		public static final String EGRAVE_U = "Egrave"; //$NON-NLS-1$
-		public static final String EGRAVE_L = "egrave"; //$NON-NLS-1$
-		public static final String EMPTY = "empty"; //$NON-NLS-1$
-		public static final String EMSP = "emsp"; //$NON-NLS-1$
-		public static final String ENSP = "ensp"; //$NON-NLS-1$
-		public static final String EPSILON_U = "Epsilon"; //$NON-NLS-1$
-		public static final String EPSILON_L = "epsilon"; //$NON-NLS-1$
-		public static final String EQUIV = "equiv"; //$NON-NLS-1$
-		public static final String ETA_U = "Eta"; //$NON-NLS-1$
-		public static final String ETA_L = "eta"; //$NON-NLS-1$
-		public static final String ETH_U = "ETH"; //$NON-NLS-1$
-		public static final String ETH_L = "eth"; //$NON-NLS-1$
-		public static final String EUML_U = "Euml"; //$NON-NLS-1$
-		public static final String EUML_L = "euml"; //$NON-NLS-1$
-		public static final String EURO = "euro"; //$NON-NLS-1$
-		public static final String EXIST = "exist"; //$NON-NLS-1$
-		public static final String FNOF = "fnof"; //$NON-NLS-1$
-		public static final String FORALL = "forall"; //$NON-NLS-1$
-		public static final String FRAC12 = "frac12"; //$NON-NLS-1$
-		public static final String FRAC14 = "frac14"; //$NON-NLS-1$
-		public static final String FRAC34 = "frac34"; //$NON-NLS-1$
-		public static final String FRASL = "frasl"; //$NON-NLS-1$
-		public static final String GAMMA_U = "Gamma"; //$NON-NLS-1$
-		public static final String GAMMA_L = "gamma"; //$NON-NLS-1$
-		public static final String GE = "ge"; //$NON-NLS-1$
-		public static final String GT = "gt"; //$NON-NLS-1$
-		public static final String HARR_U = "hArr"; //$NON-NLS-1$
-		public static final String HARR_L = "harr"; //$NON-NLS-1$
-		public static final String HEARTS = "hearts"; //$NON-NLS-1$
-		public static final String HELLIP = "hellip"; //$NON-NLS-1$
-		public static final String IACUTE_U = "Iacute"; //$NON-NLS-1$
-		public static final String IACUTE_L = "iacute"; //$NON-NLS-1$
-		public static final String ICIRC_U = "Icirc"; //$NON-NLS-1$
-		public static final String ICIRC_L = "icirc"; //$NON-NLS-1$
-		public static final String IEXCL = "iexcl"; //$NON-NLS-1$
-		public static final String IGRAVE_U = "Igrave"; //$NON-NLS-1$
-		public static final String IGRAVE_L = "igrave"; //$NON-NLS-1$
-		public static final String IMAGE = "image"; //$NON-NLS-1$
-		public static final String INFIN = "infin"; //$NON-NLS-1$
-		public static final String INT = "int"; //$NON-NLS-1$
-		public static final String IOTA_U = "Iota"; //$NON-NLS-1$
-		public static final String IOTA_L = "iota"; //$NON-NLS-1$
-		public static final String IQUEST = "iquest"; //$NON-NLS-1$
-		public static final String ISIN = "isin"; //$NON-NLS-1$
-		public static final String IUML_U = "Iuml"; //$NON-NLS-1$
-		public static final String IUML_L = "iuml"; //$NON-NLS-1$
-		public static final String KAPPA_U = "Kappa"; //$NON-NLS-1$
-		public static final String KAPPA_L = "kappa"; //$NON-NLS-1$
-		public static final String LAMBDA_U = "Lambda"; //$NON-NLS-1$
-		public static final String LAMBDA_L = "lambda"; //$NON-NLS-1$
-		public static final String LANG = "lang"; //$NON-NLS-1$
-		public static final String LAQUO = "laquo"; //$NON-NLS-1$
-		public static final String LARR_U = "lArr"; //$NON-NLS-1$
-		public static final String LARR_L = "larr"; //$NON-NLS-1$
-		public static final String LCEIL = "lceil"; //$NON-NLS-1$
-		public static final String LDQUO = "ldquo"; //$NON-NLS-1$
-		public static final String LE = "le"; //$NON-NLS-1$
-		public static final String LFLOOR = "lfloor"; //$NON-NLS-1$
-		public static final String LOWAST = "lowast"; //$NON-NLS-1$
-		public static final String LOZ = "loz"; //$NON-NLS-1$
-		public static final String LRM = "lrm"; //$NON-NLS-1$
-		public static final String LSAQUO = "lsaquo"; //$NON-NLS-1$
-		public static final String LSQUO = "lsquo"; //$NON-NLS-1$
-		public static final String LT = "lt"; //$NON-NLS-1$
-		public static final String MACR = "macr"; //$NON-NLS-1$
-		public static final String MDASH = "mdash"; //$NON-NLS-1$
-		public static final String MICRO = "micro"; //$NON-NLS-1$
-		public static final String MIDDOT = "middot"; //$NON-NLS-1$
-		public static final String MINUS = "minus"; //$NON-NLS-1$
-		public static final String MU_U = "Mu"; //$NON-NLS-1$
-		public static final String MU_L = "mu"; //$NON-NLS-1$
-		public static final String NABLA = "nabla"; //$NON-NLS-1$
-		public static final String NBSP = "nbsp"; //$NON-NLS-1$
-		public static final String NDASH = "ndash"; //$NON-NLS-1$
-		public static final String NE = "ne"; //$NON-NLS-1$
-		public static final String NI = "ni"; //$NON-NLS-1$
-		public static final String NOT = "not"; //$NON-NLS-1$
-		public static final String NOTIN = "notin"; //$NON-NLS-1$
-		public static final String NSUB = "nsub"; //$NON-NLS-1$
-		public static final String NTILDE_U = "Ntilde"; //$NON-NLS-1$
-		public static final String NTILDE_L = "ntilde"; //$NON-NLS-1$
-		public static final String NU_U = "Nu"; //$NON-NLS-1$
-		public static final String NU_L = "nu"; //$NON-NLS-1$
-		public static final String OACUTE_U = "Oacute"; //$NON-NLS-1$
-		public static final String OACUTE_L = "oacute"; //$NON-NLS-1$
-		public static final String OCIRC_U = "Ocirc"; //$NON-NLS-1$
-		public static final String OCIRC_L = "ocirc"; //$NON-NLS-1$
-		public static final String OELIG_U = "OElig"; //$NON-NLS-1$
-		public static final String OELIG_L = "oelig"; //$NON-NLS-1$
-		public static final String OGRAVE_U = "Ograve"; //$NON-NLS-1$
-		public static final String OGRAVE_L = "ograve"; //$NON-NLS-1$
-		public static final String OLINE = "oline"; //$NON-NLS-1$
-		public static final String OMEGA_U = "Omega"; //$NON-NLS-1$
-		public static final String OMEGA_L = "omega"; //$NON-NLS-1$
-		public static final String OMICRON_U = "Omicron"; //$NON-NLS-1$
-		public static final String OMICRON_L = "omicron"; //$NON-NLS-1$
-		public static final String OPLUS = "oplus"; //$NON-NLS-1$
-		public static final String OR = "or"; //$NON-NLS-1$
-		public static final String ORDF = "ordf"; //$NON-NLS-1$
-		public static final String ORDM = "ordm"; //$NON-NLS-1$
-		public static final String OSLASH_U = "Oslash"; //$NON-NLS-1$
-		public static final String OSLASH_L = "oslash"; //$NON-NLS-1$
-		public static final String OTILDE_U = "Otilde"; //$NON-NLS-1$
-		public static final String OTILDE_L = "otilde"; //$NON-NLS-1$
-		public static final String OTIMES = "otimes"; //$NON-NLS-1$
-		public static final String OUML_U = "Ouml"; //$NON-NLS-1$
-		public static final String OUML_L = "ouml"; //$NON-NLS-1$
-		public static final String PARA = "para"; //$NON-NLS-1$
-		public static final String PART = "part"; //$NON-NLS-1$
-		public static final String PERMIL = "permil"; //$NON-NLS-1$
-		public static final String PERP = "perp"; //$NON-NLS-1$
-		public static final String PHI_U = "Phi"; //$NON-NLS-1$
-		public static final String PHI_L = "phi"; //$NON-NLS-1$
-		public static final String PI_U = "Pi"; //$NON-NLS-1$
-		public static final String PI_L = "pi"; //$NON-NLS-1$
-		public static final String PIV = "piv"; //$NON-NLS-1$
-		public static final String PLUSMN = "plusmn"; //$NON-NLS-1$
-		public static final String POUND = "pound"; //$NON-NLS-1$
-		public static final String PRIME_U = "Prime"; //$NON-NLS-1$
-		public static final String PRIME_L = "prime"; //$NON-NLS-1$
-		public static final String PROD = "prod"; //$NON-NLS-1$
-		public static final String PROP = "prop"; //$NON-NLS-1$
-		public static final String PSI_U = "Psi"; //$NON-NLS-1$
-		public static final String PSI_L = "psi"; //$NON-NLS-1$
-		public static final String QUOT = "quot"; //$NON-NLS-1$
-		public static final String RADIC = "radic"; //$NON-NLS-1$
-		public static final String RANG = "rang"; //$NON-NLS-1$
-		public static final String RAQUO = "raquo"; //$NON-NLS-1$
-		public static final String RARR_U = "rArr"; //$NON-NLS-1$
-		public static final String RARR_L = "rarr"; //$NON-NLS-1$
-		public static final String RCEIL = "rceil"; //$NON-NLS-1$
-		public static final String RDQUO = "rdquo"; //$NON-NLS-1$
-		public static final String REAL = "real"; //$NON-NLS-1$
-		public static final String REG = "reg"; //$NON-NLS-1$
-		public static final String RFLOOR = "rfloor"; //$NON-NLS-1$
-		public static final String RHO_U = "Rho"; //$NON-NLS-1$
-		public static final String RHO_L = "rho"; //$NON-NLS-1$
-		public static final String RLM = "rlm"; //$NON-NLS-1$
-		public static final String RSAQUO = "rsaquo"; //$NON-NLS-1$
-		public static final String RSQUO = "rsquo"; //$NON-NLS-1$
-		public static final String SBQUO = "sbquo"; //$NON-NLS-1$
-		public static final String SCARON_U = "Scaron"; //$NON-NLS-1$
-		public static final String SCARON_L = "scaron"; //$NON-NLS-1$
-		public static final String SDOT = "sdot"; //$NON-NLS-1$
-		public static final String SECT = "sect"; //$NON-NLS-1$
-		public static final String SHY = "shy"; //$NON-NLS-1$
-		public static final String SIGMA_U = "Sigma"; //$NON-NLS-1$
-		public static final String SIGMA_L = "sigma"; //$NON-NLS-1$
-		public static final String SIGMAF = "sigmaf"; //$NON-NLS-1$
-		public static final String SIM = "sim"; //$NON-NLS-1$
-		public static final String SPADES = "spades"; //$NON-NLS-1$
-		public static final String SUB = "sub"; //$NON-NLS-1$
-		public static final String SUBE = "sube"; //$NON-NLS-1$
-		public static final String SUM = "sum"; //$NON-NLS-1$
-		public static final String SUP = "sup"; //$NON-NLS-1$
-		public static final String SUP1 = "sup1"; //$NON-NLS-1$
-		public static final String SUP2 = "sup2"; //$NON-NLS-1$
-		public static final String SUP3 = "sup3"; //$NON-NLS-1$
-		public static final String SUPE = "supe"; //$NON-NLS-1$
-		public static final String SZLIG = "szlig"; //$NON-NLS-1$
-		public static final String TAU_U = "Tau"; //$NON-NLS-1$
-		public static final String TAU_L = "tau"; //$NON-NLS-1$
-		public static final String THERE4 = "there4"; //$NON-NLS-1$
-		public static final String THETA_U = "Theta"; //$NON-NLS-1$
-		public static final String THETA_L = "theta"; //$NON-NLS-1$
-		public static final String THETASYM = "thetasym"; //$NON-NLS-1$
-		public static final String THINSP = "thinsp"; //$NON-NLS-1$
-		public static final String THORN_U = "THORN"; //$NON-NLS-1$
-		public static final String THORN_L = "thorn"; //$NON-NLS-1$
-		public static final String TILDE = "tilde"; //$NON-NLS-1$
-		public static final String TIMES = "times"; //$NON-NLS-1$
-		public static final String TRADE = "trade"; //$NON-NLS-1$
-		public static final String UACUTE_U = "Uacute"; //$NON-NLS-1$
-		public static final String UACUTE_L = "uacute"; //$NON-NLS-1$
-		public static final String UARR_U = "uArr"; //$NON-NLS-1$
-		public static final String UARR_L = "uarr"; //$NON-NLS-1$
-		public static final String UCIRC_U = "Ucirc"; //$NON-NLS-1$
-		public static final String UCIRC_L = "ucirc"; //$NON-NLS-1$
-		public static final String UGRAVE_U = "Ugrave"; //$NON-NLS-1$
-		public static final String UGRAVE_L = "ugrave"; //$NON-NLS-1$
-		public static final String UML = "uml"; //$NON-NLS-1$
-		public static final String UPSIH = "upsih"; //$NON-NLS-1$
-		public static final String UPSILON_U = "Upsilon"; //$NON-NLS-1$
-		public static final String UPSILON_L = "upsilon"; //$NON-NLS-1$
-		public static final String UUML_U = "Uuml"; //$NON-NLS-1$
-		public static final String UUML_L = "uuml"; //$NON-NLS-1$
-		public static final String WEIERP = "weierp"; //$NON-NLS-1$
-		public static final String XI_U = "Xi"; //$NON-NLS-1$
-		public static final String XI_L = "xi"; //$NON-NLS-1$
-		public static final String YACUTE_U = "Yacute"; //$NON-NLS-1$
-		public static final String YACUTE_L = "yacute"; //$NON-NLS-1$
-		public static final String YEN = "yen"; //$NON-NLS-1$
-		public static final String YUML_U = "Yuml"; //$NON-NLS-1$
-		public static final String YUML_L = "yuml"; //$NON-NLS-1$
-		public static final String ZETA_U = "Zeta"; //$NON-NLS-1$
-		public static final String ZETA_L = "zeta"; //$NON-NLS-1$
-		public static final String ZWJ = "zwj"; //$NON-NLS-1$
-		public static final String ZWNJ = "zwnj"; //$NON-NLS-1$
-	}
-
-	public static final String HTML40_URI = "http://www.w3.org/TR/REC-html40/frameset.dtd"; //$NON-NLS-1$
-	public static final String HTML40_TAG_PREFIX = ""; //$NON-NLS-1$
-	// global attribute names
-	public static final String ATTR_NAME_ID = "id"; // %coreattrs;
-													// //$NON-NLS-1$
-	public static final String ATTR_NAME_CLASS = "class"; // %coreattrs;
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_STYLE = "style"; // %coreattrs;
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_TITLE = "title"; // %coreattrs;
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_LANG = "lang"; // %i18n;
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_DIR = "dir"; // %i18n; //$NON-NLS-1$
-	public static final String ATTR_NAME_ONCLICK = "onclick"; // %events;
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONDBLCLICK = "ondblclick"; // %events;
-																	// //$NON-NLS-1$
-	public static final String ATTR_NAME_ONMOUSEDOWN = "onmousedown"; // %events;
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONMOUSEUP = "onmouseup"; // %events;
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONMOUSEOVER = "onmouseover"; // %events;
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONMOUSEMOVE = "onmousemove"; // %events;
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONMOUSEOUT = "onmouseout"; // %events;
-																	// //$NON-NLS-1$
-	public static final String ATTR_NAME_ONKEYPRESS = "onkeypress"; // %events;
-																	// //$NON-NLS-1$
-	public static final String ATTR_NAME_ONKEYDOWN = "onkeydown"; // %events;
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONKEYUP = "onkeyup"; // %events;
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONHELP = "onhelp"; // %events;
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_BGCOLOR = "bgcolor"; // %bodycolor;,
-															  // TABLE
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_TEXT = "text"; // %bodycolor;
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_LINK = "link"; // %bodycolor;
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_VLINK = "vlink"; // %bodycolor;
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ALINK = "alink"; // %bodycolor;
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_VERSION = "version"; // HTML
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_PROFILE = "profile"; // HEAD
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONLOAD = "onload"; // BODY
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_ONUNLOAD = "onunload"; // BODY
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_BACKGROUND = "background"; // BODY,
-																	// TABLE
-																	// //$NON-NLS-1$
-	public static final String ATTR_NAME_SRC = "src"; // IMG //$NON-NLS-1$
-	public static final String ATTR_NAME_ALT = "alt"; // IMG,AREA
-													  // //$NON-NLS-1$
-	public static final String ATTR_NAME_LONGDESC = "longdesc"; // IMG
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_NAME = "name"; // IMG //$NON-NLS-1$
-	public static final String ATTR_NAME_HEIGHT = "height"; // IMG, TABLE
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_WIDTH = "width"; // IMG, TABLE,HR
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_USEMAP = "usemap"; // IMG
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_ISMAP = "ismap"; // IMG //$NON-NLS-1$
-	public static final String ATTR_NAME_ALIGN = "align"; // IMG, TABLE,HR
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_BORDER = "border"; // IMG, TABLE
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_HSPACE = "hspace"; // IMG
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_VSPACE = "vspace"; // IMG
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_MAPFILE = "mapfile"; // IMG
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_SUMMARY = "summary"; // TABLE
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_FRAME = "frame"; // TABLE
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_RULES = "rules"; // TABLE
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CELLSPACING = "cellspacing"; // TABLE
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CELLPADDING = "cellpadding"; // TABLE
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_DATAPAGESIZE = "datapagesize"; // TABLE,HR
-																		// //$NON-NLS-1$
-	public static final String ATTR_NAME_COLOR = "color"; // BASEFONT,FONT
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_FACE = "face"; // BASEFONT,FONT
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_SIZE = "size"; // BASEFONT,FONT
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_CLEAR = "clear"; // BR //$NON-NLS-1$
-	public static final String ATTR_NAME_SHAPE = "shape"; // AREA
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_COORDS = "coords"; // AREA
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_HREF = "href"; // AREA //$NON-NLS-1$
-	public static final String ATTR_NAME_TARGET = "target"; // AREA
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_NOHREF = "nohref"; // AREA
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_TABINDEX = "tabindex"; // AREA
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_ACCESSKEY = "accesskey"; // AREA
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONFOCUS = "onfocus"; // AREA
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONBLUR = "onblur"; // AREA
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_CHARSET = "charset"; // LINK
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_HREFLANG = "hreflang"; // LINK
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_TYPE = "type"; // LINK //$NON-NLS-1$
-	public static final String ATTR_NAME_REL = "rel"; // LINK //$NON-NLS-1$
-	public static final String ATTR_NAME_REV = "rev"; // LINK //$NON-NLS-1$
-	public static final String ATTR_NAME_MEDIA = "media"; // LINK
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_VALUE = "value"; // PARAM
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_VALUETYPE = "valuetype"; // PARAM
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_NOSHADE = "noshade"; // HR
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CHECKED = "checked"; // INPUT
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_DISABLED = "disabled"; // INPUT
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_READONLY = "readonly"; // INPUT
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_MAXLENGTH = "maxlength"; // INPUT
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONSELECT = "onselect"; // INPUT
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_ONCHANGE = "onchange"; // INPUT
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_ACCEPT = "accept"; // INPUT
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_ISTYLE = "istyle"; // INPUT
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_CHAR = "char"; // COL //$NON-NLS-1$
-	public static final String ATTR_NAME_CHAROFF = "charoff"; // COL
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_VALIGN = "valign"; // COL
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_SPAN = "span"; // COL //$NON-NLS-1$
-	public static final String ATTR_NAME_FRAMEBORDER = "frameborder"; // FRAME
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_MARGINWIDTH = "marginwidth"; // FRAME
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_MARGINHEIGHT = "marginheight"; // FRAME
-																		// //$NON-NLS-1$
-	public static final String ATTR_NAME_NORESIZE = "noresize"; // FRAME
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_SCROLLING = "scrolling"; // FRAME
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_PROMPT = "prompt"; // ISINDEX
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_HTTP_EQUIV = "http-equiv"; // META
-																	// //$NON-NLS-1$
-	public static final String ATTR_NAME_CONTENT = "content"; // META
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_SCHEME = "scheme"; // META
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_ERRMSG = "errmsg"; // ssi:config
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_SIZEFMT = "sizefmt"; // ssi:config
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_TIMEFMT = "timefmt"; // ssi:config
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_VAR = "var"; // ssi:echo
-													  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CGI = "cgi"; // ssi:exec
-													  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CMD = "cmd"; // ssi:exec
-													  // //$NON-NLS-1$
-	public static final String ATTR_NAME_FILE = "file"; // ssi:fsize
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_VIRTUAL = "virtual"; // ssi:fsize
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_SELECTED = "selected"; // OPTION
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_LABEL = "label"; // OPTION
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ROWS = "rows"; // TEXTAREA
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_COLS = "cols"; // TEXTAREA
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_LANGUAGE = "language"; // SCRIPT
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_DEFER = "defer"; // SCRIPT
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_EVENT = "event"; // SCRIPT
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_FOR = "for"; // SCRIPT //$NON-NLS-1$
-	public static final String ATTR_NAME_COMPACT = "compact"; // OL/UL
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_START = "start"; // OL/UL
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_DIRECTKEY = "directkey"; // A
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CODEBASE = "codebase"; // APPLET
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_ARCHIVE = "archive"; // APPLET
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CODE = "code"; // APPLET
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_OBJECT = "object"; // APPLET
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_MAYSCRIPT = "mayscript"; // APPLET
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CITE = "cite"; // BLOCKQUOTE
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_MACRO = "macro"; // D2W //$NON-NLS-1$
-	public static final String ATTR_NAME_DATETIME = "datetime"; // INS/DEL
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_LOOP = "loop"; // EMBED //$NON-NLS-1$
-	public static final String ATTR_NAME_HIDDEN = "hidden"; // EMBED
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_VOLUME = "volume"; // EMBED
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_AUTOSTART = "autostart"; // EMBED
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_AUTOPLAY = "autoplay"; // EMBED
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_AUTOSIZE = "autosize"; // EMBED
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_CONTROLLER = "controller";// EMBED
-																   // //$NON-NLS-1$
-	public static final String ATTR_NAME_SCALE = "scale"; // EMBED
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_SHOWCONTROLS = "showcontrols";// EMBED
-																	   // //$NON-NLS-1$
-	public static final String ATTR_NAME_PLAYCOUNT = "playcount"; // EMBED
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_REPEAT = "repeat"; // EMBED
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_PANEL = "panel"; // EMBED
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_PALETTE = "palette"; // EMBED
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_TEXTFOCUS = "textfocus"; // EMBED
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ACTION = "action"; // FORM
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_METHOD = "method"; // FORM
-															// //$NON-NLS-1$
-	public static final String ATTR_NAME_ENCTYPE = "enctype"; // FORM
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ONSUBMIT = "onsubmit"; // FORM
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_ONRESET = "onreset"; // FORM
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ACCEPT_CHARSET = "accept-charset";// FORM
-																		   // //$NON-NLS-1$
-	public static final String ATTR_NAME_BEHAVIOR = "behavior"; // MARQUEE
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_DIRECTION = "direction"; // MARQUEE
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_SCROLLAMOUNT = "scrollamount";// MARQUEE
-																	   // //$NON-NLS-1$
-	public static final String ATTR_NAME_SCROLLDELAY = "scrolldelay";// MARQUEE
-																	 // //$NON-NLS-1$
-	public static final String ATTR_NAME_TRUESPEED = "truespeed"; // MARQUEE
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_DECLARE = "declare"; // OBJECT
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_CLASSID = "classid"; // OBJECT
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_DATA = "data"; // OBJECT
-														// //$NON-NLS-1$
-	public static final String ATTR_NAME_CODETYPE = "codetype"; // OBJECT
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_STANDBY = "standby"; // OBJECT
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_MULTIPLE = "multiple"; // SELECT
-																// //$NON-NLS-1$
-	public static final String ATTR_NAME_ABBR = "abbr"; // TH/TD //$NON-NLS-1$
-	public static final String ATTR_NAME_AXIS = "axis"; // TH/TD //$NON-NLS-1$
-	public static final String ATTR_NAME_HEADERS = "headers"; // TH/TD
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_SCOPE = "scope"; // TH/TD
-														  // //$NON-NLS-1$
-	public static final String ATTR_NAME_ROWSPAN = "rowspan"; // TH/TD
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_COLSPAN = "colspan"; // TH/TD
-															  // //$NON-NLS-1$
-	public static final String ATTR_NAME_NOWRAP = "nowrap"; // TH/TD
-															// //$NON-NLS-1$
-	// <<D205514
-	public static final String ATTR_NAME_TOPMARGIN = "topmargin"; // BODY
-																  // //$NON-NLS-1$
-	public static final String ATTR_NAME_BOTTOMMARGIN = "bottommargin"; // BODY
-																		// //$NON-NLS-1$
-	public static final String ATTR_NAME_LEFTMARGIN = "leftmargin"; // BODY
-																	// //$NON-NLS-1$
-	public static final String ATTR_NAME_RIGHTMARGIN = "rightmargin"; // BODY
-																	  // //$NON-NLS-1$
-	public static final String ATTR_NAME_BORDERCOLOR = "bordercolor"; // TABLE/TR/TH/TD/FRAMESET/FRAME
-																	  // //$NON-NLS-1$
-	// for WML
-	public static final String WML_ATTR_NAME_TITLE = "title"; // card
-															  // //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_DOMAIN = "domain"; // access
-																// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_PATH = "path"; // access
-															// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_ONENTERFORWARD = "onenterforward"; // template,card
-																				// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_ONENTERBACKWARD = "onenterbackward"; // template,card
-																				  // //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_ONPICK = "onpick"; // option
-																// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_ONTIMER = "ontimer"; // template,card
-																  // //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_NEWCONTEXT = "newcontext"; // card
-																		// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_ORDERED = "ordered"; // card
-																  // //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_OPTIONAL = "optional"; // do
-																	// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_CACHE_CONTROL = "cache-control"; // go
-																			  // //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_SENDREFERER = "sendreferer"; // go
-																		  // //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_METHOD = "method"; // go
-																// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_ENCTYPE = "enctype"; // go
-																  // //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_ACCEPT_CHARSET = "accept-charset"; // go
-																				// //$NON-NLS-1$
-	public static final String WML_ATTR_NAME_COLUMNS = "columns"; // table
-																  // //$NON-NLS-1$
-	// D205514
-	//<<D215684
-	public static final String ATTR_NAME_FRAMESPACING = "framespacing"; // FRAMESET
-																		// //$NON-NLS-1$
-	//D215684
-	// global attribute values; mainly used in enumeration.
-	public static final String ATTR_VALUE_VERSION_TRANSITIONAL = "-//W3C//DTD HTML 4.01 Transitional//EN"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_VERSION_FRAMESET = "-//W3C//DTD HTML 4.01 Frameset//EN"; //$NON-NLS-1$
-	public static final String ATTR_VALUE_LTR = "ltr"; // dir //$NON-NLS-1$
-	public static final String ATTR_VALUE_RTL = "rtl"; // dir //$NON-NLS-1$
-	//   for align (top|middle|bottom|left|right)
-	public static final String ATTR_VALUE_TOP = "top"; // align //$NON-NLS-1$
-	public static final String ATTR_VALUE_MIDDLE = "middle"; // align
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_BOTTOM = "bottom"; // align
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_LEFT = "left"; // align
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_CENTER = "center"; // align
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_RIGHT = "right"; // align
-														   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_JUSTIFY = "justify"; // align
-															   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_CHAR = "char"; // align
-														 // //$NON-NLS-1$
-	//   for valign (baseline)
-	public static final String ATTR_VALUE_BASELINE = "baseline"; // valign
-																 // //$NON-NLS-1$
-	//   for clear (left|all|right|none): left and right are already defined
-	// above.
-	public static final String ATTR_VALUE_ALL = "all"; // clear //$NON-NLS-1$
-	public static final String ATTR_VALUE_NONE = "none"; // clear
-														 // //$NON-NLS-1$
-	//   for shape (rect|circle|poly|default)
-	public static final String ATTR_VALUE_RECT = "rect"; // shape
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_CIRCLE = "circle"; // shape
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_POLY = "poly"; // shape
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_DEFAULT = "default"; // shape
-															   // //$NON-NLS-1$
-	//   for valuetype (data|ref|object)
-	public static final String ATTR_VALUE_DATA = "data"; // valuetype
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_REF = "ref"; // valuetype
-													   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_OBJECT = "object"; // valuetype
-															 // //$NON-NLS-1$
-	//   for type of INPUT
-	//       (text | password | checkbox | radio | submit | reset |
-	//        file | hidden | image | button)
-	public static final String ATTR_VALUE_TEXT = "text"; // INPUT:type
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_PASSWORD = "password"; // INPUT:type
-																 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_CHECKBOX = "checkbox"; // INPUT:type
-																 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_RADIO = "radio"; // INPUT:type
-														   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_SUBMIT = "submit"; // INPUT:type
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_RESET = "reset"; // INPUT:type
-														   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_FILE = "file"; // INPUT:type
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_HIDDEN = "hidden"; // INPUT:type
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_IMAGE = "image"; // INPUT:type
-														   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_BUTTON = "button"; // INPUT:type
-															 // //$NON-NLS-1$
-	//   for span, colspan, rowspan
-	public static final String ATTR_VALUE_1 = "1"; // span //$NON-NLS-1$
-	//   for frameborder
-	public static final String ATTR_VALUE_0 = "0"; // FRAME //$NON-NLS-1$
-	//   for scrolling
-	public static final String ATTR_VALUE_YES = "yes"; // FRAME //$NON-NLS-1$
-	public static final String ATTR_VALUE_NO = "no"; // FRAME //$NON-NLS-1$
-	public static final String ATTR_VALUE_AUTO = "auto"; // FRAME
-														 // //$NON-NLS-1$
-	//   for UL
-	public static final String ATTR_VALUE_DISC = "disc"; // UL:type
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_SQUARE = "square"; // UL:type
-															 // //$NON-NLS-1$
-	//   for frame of TABLE
-	public static final String ATTR_VALUE_VOID = "void"; // TABLE:frame
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_ABOVE = "above"; // TABLE:frame
-														   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_BELOW = "below"; // TABLE:frame
-														   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_HSIDES = "hsides"; // TABLE:frame
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_LHS = "lhs"; // TABLE:frame
-													   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_RHS = "rhs"; // TABLE:frame
-													   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_VSIDES = "vsides"; // TABLE:frame
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_BOX = "box"; // TABLE:frame
-													   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_BORDER = "border"; // TABLE:frame
-															 // //$NON-NLS-1$
-	//   for rules of TABLE
-	public static final String ATTR_VALUE_GROUPS = "groups"; // TABLE:rules
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_ROWS = "rows"; // TEXTAREA
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_COLS = "cols"; // TEXTAREA
-														 // //$NON-NLS-1$
-	//   for method of FORM
-	public static final String ATTR_VALUE_GET = "get"; // FORM //$NON-NLS-1$
-	public static final String ATTR_VALUE_POST = "post"; // FORM //$NON-NLS-1$
-	public static final String ATTR_VALUE_WWW_FORM_URLENCODED = "application/x-www-form-urlencoded"; //$NON-NLS-1$
-	//   for scope of (TH | TD)
-	public static final String ATTR_VALUE_ROW = "row"; // (TH|TD):scope
-													   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_COL = "col"; // (TH|TD):scope
-													   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_ROWGROUP = "rowgroup";// (TH|TD):scope
-																// //$NON-NLS-1$
-	public static final String ATTR_VALUE_COLGROUP = "colgroup";// (TH|TD):scope
-																// //$NON-NLS-1$
-	//   for auto?? of EMBED
-	public static final String ATTR_VALUE_TRUE = "true"; // EMBED
-														 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_FALSE = "false"; // EMBED
-														   // //$NON-NLS-1$
-	//   for behaviro of MARQUEE
-	public static final String ATTR_VALUE_SCROLL = "scroll"; // MARQUEE
-															 // //$NON-NLS-1$
-	public static final String ATTR_VALUE_SLIDE = "slide"; // MARQUEE
-														   // //$NON-NLS-1$
-	public static final String ATTR_VALUE_ALTERNATE = "alternate"; // MARQUEE
-																   // //$NON-NLS-1$
-	//   for direction of MARQUEE
-	public static final String ATTR_VALUE_UP = "up"; // MARQUEE //$NON-NLS-1$
-	public static final String ATTR_VALUE_DOWN = "down"; // MARQUEE
-														 // //$NON-NLS-1$
-	//   for type of LI (D19924)
-	public static final String ATTR_VALUE_NUMBER = "1"; // LI //$NON-NLS-1$
-	public static final String ATTR_VALUE_LOWER_ALPHA = "a"; // LI
-															 // //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/CSSNodeAdapter.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/CSSNodeAdapter.java
deleted file mode 100644
index e2860fd..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/CSSNodeAdapter.java
+++ /dev/null
@@ -1,606 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentoutline;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.wst.css.core.internal.document.CSSStructuredDocumentRegionContainer;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSMediaRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclaration;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleSheet;
-import org.eclipse.wst.css.ui.internal.image.CSSImageHelper;
-import org.eclipse.wst.css.ui.internal.image.CSSImageType;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapterFactory;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSRule;
-import org.w3c.dom.stylesheets.MediaList;
-
-/**
- * Adapts the CSS DOM node to a JFace viewer.
- */
-class CSSNodeAdapter implements IJFaceNodeAdapter, INodeAdapter, Runnable {
-	class NotifyContext {
-		NotifyContext(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-			this.notifier = notifier;
-			this.eventType = eventType;
-			this.changedFeature = changedFeature;
-			this.oldValue = oldValue;
-			this.newValue = newValue;
-			this.pos = pos;
-		}
-
-		void fire() {
-			internalNotifyChanged(notifier, eventType, changedFeature, oldValue, newValue, pos);
-		}
-
-		INodeNotifier notifier;
-		int eventType;
-		Object changedFeature;
-		Object oldValue;
-		Object newValue;
-		int pos;
-	}
-
-	class StyleViewUpdater implements Runnable {
-		public void run() {
-			if (lastUpdater == this) {
-				internalActionPerformed();
-				lastUpdater = null;
-			}
-		}
-	}
-
-	protected INodeAdapterFactory adapterFactory;
-	private Vector notifyQueue;
-	StyleViewUpdater lastUpdater;
-	protected int delayMSecs = 500;
-	final static Class ADAPTER_KEY = IJFaceNodeAdapter.class;
-
-	public CSSNodeAdapter(INodeAdapterFactory adapterFactory) {
-		super();
-		this.adapterFactory = adapterFactory;
-	}
-
-	/**
-	 * Insert the method's description here.
-	 */
-	protected void internalActionPerformed() {
-		if (notifyQueue == null) {
-			return;
-		}
-		boolean refresh_all = false;
-		boolean refresh_rule = false;
-		int pos_all = 0;
-		List targets = new ArrayList();
-		for (int i = 0; i < notifyQueue.size(); i++) {
-			NotifyContext context = (NotifyContext) notifyQueue.get(i);
-			if (context.notifier instanceof ICSSStyleSheet) {
-				refresh_all = true;
-				pos_all = i;
-			}
-			if (context.notifier instanceof ICSSStyleDeclaration) {
-				refresh_rule = true;
-				targets.add(context);
-				// pos_rule = i;
-			}
-			// ((NotifyContext) notifyQueue.get(i)).fire();
-		}
-		if (refresh_all) {
-			((NotifyContext) notifyQueue.get(pos_all)).fire();
-		}
-		else if (refresh_rule) {
-			Iterator i = targets.iterator();
-			while (i.hasNext()) {
-				((NotifyContext) i.next()).fire();
-			}
-			// else if (refresh_rule) internalRefreshAll();
-		}
-		else {
-			for (int i = 0; i < notifyQueue.size(); i++) {
-				((NotifyContext) notifyQueue.get(i)).fire();
-			}
-		}
-		notifyQueue.clear();
-	}
-
-	/**
-	 * Called by the object being adapter (the notifier) when something has
-	 * changed.
-	 */
-	public void internalNotifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		Iterator iterator = ((IJFaceNodeAdapterFactory) adapterFactory).getListeners().iterator();
-		while (iterator.hasNext()) {
-			Object listener = iterator.next();
-			if (listener instanceof StructuredViewer) {
-				notifyChangedForStructuredViewer((StructuredViewer) listener, notifier, eventType, changedFeature, oldValue, newValue, pos);
-			}
-			else if (listener instanceof PropertySheetPage) {
-				notifyChangedForPropertySheetPage((PropertySheetPage) listener, notifier, eventType, changedFeature, oldValue, newValue, pos);
-			}
-		}
-	}
-
-	private void notifyChangedForPropertySheetPage(PropertySheetPage page, INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (page.getControl() == null || page.getControl().isDisposed()) {
-			return;
-		}
-		if (eventType == INodeNotifier.CHANGE || eventType == INodeNotifier.ADD || eventType == INodeNotifier.REMOVE) {
-			page.refresh();
-		}
-	}
-
-	private void notifyChangedForStructuredViewer(StructuredViewer viewer, INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (viewer.getControl() == null || viewer.getControl().isDisposed()) {
-			return;
-		}
-		if (eventType == INodeNotifier.CHANGE) {
-			if (notifier instanceof ICSSStyleSheet) {
-				ICSSNode temp = (changedFeature != null) ? (ICSSNode) changedFeature : (ICSSNode) newValue;
-				if (temp instanceof ICSSStyleRule) {
-					viewer.refresh();
-				}
-				else {
-					for (;;) {
-						if (temp instanceof ICSSStyleRule) {
-							break;
-						}
-						temp = temp.getParentNode();
-						if (temp == null) {
-							break;
-						}
-					}
-					if (temp == null || temp instanceof ICSSStyleSheet) {
-						viewer.refresh();
-					}
-					else {
-						viewer.refresh(temp);
-					}
-				}
-			}
-			else {
-				ICSSNode temp = (ICSSNode) notifier;
-				if (temp != null) {
-					temp = temp.getParentNode();
-				}
-				if (temp == null || temp instanceof ICSSStyleSheet) {
-					viewer.refresh();
-				}
-				else {
-					viewer.refresh(temp);
-				}
-			}
-		}
-		if (eventType == INodeNotifier.ADD) {
-			if (notifier instanceof ICSSStyleSheet) {
-				ICSSNode temp = (changedFeature != null) ? (ICSSNode) changedFeature : (ICSSNode) newValue;
-				if (temp instanceof ICSSStyleRule) {
-					viewer.refresh();
-				}
-				else {
-					for (;;) {
-						if (temp instanceof ICSSStyleRule) {
-							break;
-						}
-						temp = temp.getParentNode();
-						if (temp == null) {
-							break;
-						}
-					}
-				}
-				if (temp == null || (temp instanceof ICSSStyleSheet)) {
-					viewer.refresh();
-				}
-				else {
-					viewer.refresh(temp);
-				}
-			}
-			else {
-				if (newValue != null && (newValue instanceof ICSSStyleDeclItem)) {
-					viewer.refresh(((ICSSNode) newValue).getParentNode());
-				}
-				else {
-					ICSSNode temp = (ICSSNode) notifier;
-					if (temp != null) {
-						temp = temp.getParentNode();
-					}
-					if (temp == null || (temp instanceof ICSSStyleSheet)) {
-						viewer.refresh();
-					}
-					else {
-						viewer.refresh(temp);
-					}
-				}
-			}
-		}
-		else if (eventType == INodeNotifier.REMOVE) {
-			if (notifier instanceof ICSSStyleSheet) {
-				ICSSNode temp = (changedFeature != null) ? (ICSSNode) changedFeature : (ICSSNode) newValue;
-				if (temp instanceof ICSSStyleRule) {
-					viewer.refresh();
-				}
-				else {
-					for (;;) {
-						if (temp instanceof ICSSStyleRule) {
-							break;
-						}
-						temp = temp.getParentNode();
-						if (temp == null) {
-							break;
-						}
-					}
-					if (temp == null || (temp instanceof ICSSStyleSheet)) {
-						viewer.refresh();
-					}
-					else {
-						viewer.refresh(temp);
-					}
-				}
-			}
-			else {
-				// viewer.refresh(notifier);
-				ICSSNode temp = (ICSSNode) notifier;
-				if (temp != null) {
-					temp = temp.getParentNode();
-				}
-				if (temp == null || (temp instanceof ICSSStyleSheet)) {
-					viewer.refresh();
-				}
-				else {
-					viewer.refresh(temp);
-				}
-			}
-		}
-		// }
-	}
-
-	/**
-	 * 
-	 */
-	public void internalRefreshAll() {
-		Collection listeners = ((JFaceNodeAdapterFactoryCSS) adapterFactory).getListeners();
-		Iterator iterator = listeners.iterator();
-		while (iterator.hasNext()) {
-			Object listener = iterator.next();
-			if (listener instanceof StructuredViewer) {
-				StructuredViewer viewer = (StructuredViewer) listener;
-				if (viewer.getControl() != null && !viewer.getControl().isDisposed()) {
-					viewer.refresh();
-				}
-			}
-			else if (listener instanceof PropertySheetPage) {
-				PropertySheetPage page = (PropertySheetPage) listener;
-				if (page.getControl() != null && !page.getControl().isDisposed()) {
-					page.refresh();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return type.equals(ADAPTER_KEY);
-	}
-
-	/**
-	 * Called by the object being adapter (the notifier) when something has
-	 * changed.
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		if (notifyQueue == null)
-			notifyQueue = new Vector();
-		notifyQueue.add(new NotifyContext(notifier, eventType, changedFeature, oldValue, newValue, pos));
-		// TODO-future: there's probably a better way than relying on async
-		// exec
-		if (Thread.currentThread() == getDisplay().getThread())
-			getDisplay().timerExec(delayMSecs, this);
-		else
-			getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					if (getDisplay() != null) {
-						getDisplay().timerExec(delayMSecs, this);
-					}
-				}
-			});
-	}
-
-	Display getDisplay() {
-		return PlatformUI.getWorkbench().getDisplay();
-	}
-
-	/**
-	 * this method is intended only for timerExec()
-	 */
-	public void run() {
-		lastUpdater = new StyleViewUpdater();
-		getDisplay().asyncExec(lastUpdater);
-	}
-
-	/**
-	 * Returns an enumeration containing all child nodes of the given element,
-	 * which represents a node in a tree. The difference to
-	 * <code>IStructuredContentProvider.getElements(Object)</code> is as
-	 * follows: <code>getElements</code> is called to obtain the tree
-	 * viewer's root elements. Method <code>getChildren</code> is used to
-	 * obtain the children of a given node in the tree, which can can be a
-	 * root node, too.
-	 */
-	public Object[] getChildren(Object object) {
-		if (object instanceof ICSSNode) {
-			ICSSNode node = (ICSSNode) object;
-
-			short nodeType = node.getNodeType();
-			if (nodeType == ICSSNode.STYLERULE_NODE || nodeType == ICSSNode.PAGERULE_NODE || nodeType == ICSSNode.FONTFACERULE_NODE) {
-				for (node = node.getFirstChild(); node != null && !(node instanceof ICSSStyleDeclaration); node.getNextSibling()) {
-					// nop
-				}
-			}
-			List children = new ArrayList();
-			ICSSNode child = (node != null) ? node.getFirstChild() : null;
-			while (child != null) {
-				if (!(child instanceof ICSSPrimitiveValue) && !(child instanceof MediaList)) {
-					children.add(child);
-				}
-				/*
-				 * Required to correctly connect the refreshing behavior to
-				 * the tree
-				 */
-				if (child instanceof INodeNotifier) {
-					((INodeNotifier) child).getAdapterFor(IJFaceNodeAdapter.class);
-				}
-				child = child.getNextSibling();
-			}
-			return children.toArray();
-		}
-		return new Object[0];
-	}
-
-	/**
-	 * Returns an enumeration with the elements belonging to the passed
-	 * element. These elements can be presented as rows in a table, items in a
-	 * list etc.
-	 */
-	public Object[] getElements(Object object) {
-		// The root is usually an instance of an XMLStructuredModel in
-		// which case we want to extract the document.
-
-		if (object instanceof ICSSModel) {
-			ArrayList v = new ArrayList();
-			// internalGetElements(object, v);
-			addElements(object, v);
-			Object[] elements = v.toArray();
-
-			for (int i = 0; i < elements.length; i++) {
-				/*
-				 * Required to correctly connect the refreshing behavior to
-				 * the tree
-				 */
-				if (elements[i] instanceof INodeNotifier) {
-					((INodeNotifier) elements[i]).getAdapterFor(IJFaceNodeAdapter.class);
-				}
-			}
-
-			return elements;
-		}
-		return new Object[0];
-
-	}
-
-	/**
-	 * Returns the image for the label of the given element, for use in the
-	 * given viewer.
-	 * 
-	 * @param viewer
-	 *            The viewer that displays the element.
-	 * @param element
-	 *            The element for which to provide the label image. Element
-	 *            can be <code>null</code> indicating no input object is set
-	 *            to the viewer.
-	 */
-	public Image getLabelImage(Object element) {
-		if (element instanceof ICSSNode) {
-			CSSImageHelper helper = CSSImageHelper.getInstance();
-			return helper.getImage(CSSImageType.getImageType((ICSSNode) element));
-			// Image image = getCSSNodeImage(element);
-			// return image;
-			// return getAdapter(element).getLabelImage((ICSSNode) element);
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the text for the label of the given element, for use in the
-	 * given viewer.
-	 * 
-	 * @param viewer
-	 *            The viewer that displays the element.
-	 * @param element
-	 *            The element for which to provide the label text. Element can
-	 *            be <code>null</code> indicating no input object is set to
-	 *            the viewer.
-	 */
-	public String getLabelText(Object element) {
-		// This was returning null, on occasion ... probably should not be,
-		// but
-		// took the quick and easy way out for now. (dmw 3/8/01)
-
-		String result = "";//$NON-NLS-1$
-		String mediaText;
-		if (element instanceof ICSSNode) {
-			switch (((ICSSNode) element).getNodeType()) {
-				case ICSSNode.STYLERULE_NODE :
-					result = ((ICSSStyleRule) element).getSelectors().getString();
-					break;
-				case ICSSNode.FONTFACERULE_NODE :
-					result = "@font-face";//$NON-NLS-1$
-					break;
-				case ICSSNode.IMPORTRULE_NODE :
-					result = ((CSSImportRule) element).getHref();
-					mediaText = getMediaText((CSSImportRule) element);
-					if (mediaText != null && 0 < mediaText.length()) {
-						result += " (" + mediaText + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-					}
-					break;
-				case ICSSNode.PAGERULE_NODE :
-					result = "@page";//$NON-NLS-1$
-					break;
-				case ICSSNode.STYLEDECLARATION_NODE :
-					result = "properties";//$NON-NLS-1$
-					break;
-				case ICSSNode.STYLEDECLITEM_NODE :
-					result = ((ICSSStyleDeclItem) element).getPropertyName();
-					break;
-				case ICSSNode.PRIMITIVEVALUE_NODE :
-					result = ((ICSSPrimitiveValue) element).getStringValue();
-					break;
-				case ICSSNode.MEDIARULE_NODE :
-					result = "@media";//$NON-NLS-1$
-					mediaText = getMediaText((ICSSMediaRule) element);
-					if (mediaText != null && 0 < mediaText.length()) {
-						result += " (" + mediaText + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-					}
-					break;
-				case ICSSNode.CHARSETRULE_NODE :
-					result = "@charset";//$NON-NLS-1$
-					break;
-				case ICSSNode.MEDIALIST_NODE :
-					result = ((MediaList) element).getMediaText();
-					break;
-				default :
-					break;
-			}
-		}
-
-		// if (element instanceof ICSSNode) {
-		// ICSSNode node = ((ICSSNode)element);
-		// result = getAdapter(element).getLabelText((ICSSNode) element);
-		// }
-		return result;
-	}
-
-	/**
-	 * Returns the parent for the given element. This method can return
-	 * <code>null</code> indicating that the parent can't be computed. In
-	 * this case the tree viewer can't expand a given node correctly if
-	 * requested.
-	 */
-	public Object getParent(Object object) {
-		if (object instanceof ICSSNode) {
-			ICSSNode node = ((ICSSNode) object).getParentNode();
-			if (node != null && node.getNodeType() == ICSSNode.STYLEDECLARATION_NODE) {
-				/*
-				 * Required to also correctly connect style declaration to the
-				 * refreshing behavior in the tree
-				 */
-				if (node instanceof INodeNotifier) {
-					((INodeNotifier) node).getAdapterFor(IJFaceNodeAdapter.class);
-				}
-				node = node.getParentNode();
-			}
-			return node;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns <code>true</code> if the given element has children.
-	 * Otherwise <code>false</code> is returned.
-	 */
-	public boolean hasChildren(Object object) {
-		// return getAdapter(object).hasChildren((ICSSNode) object);
-		if (object instanceof ICSSNode) {
-			/*
-			 * Required to correctly connect the refreshing behavior to the
-			 * tree
-			 */
-			if (object instanceof INodeNotifier) {
-				((INodeNotifier) object).getAdapterFor(IJFaceNodeAdapter.class);
-			}
-
-			if (object instanceof ICSSStyleDeclItem)
-				return false;
-			else {
-				if(((ICSSNode) object).hasChildNodes()) {
-					ICSSNode child = ((ICSSNode) object).getFirstChild();
-					
-					while(child != null) {
-						if(child instanceof CSSStructuredDocumentRegionContainer) {
-							String childText = ((CSSStructuredDocumentRegionContainer) child).getCssText();
-							if(childText != null && childText.length() > 0)
-								return true;
-						}
-						child = child.getNextSibling();
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	private void addElements(Object element, ArrayList v) {
-
-		ICSSNode node;
-
-		if (element instanceof ICSSModel) {
-			ICSSModel model = (ICSSModel) element;
-			ICSSDocument doc = model.getDocument();
-			node = doc.getFirstChild();
-		}
-		else if (element instanceof ICSSNode) {
-			node = ((ICSSNode) element).getFirstChild();
-		}
-		else
-			return;
-
-		while (node != null) {
-			if (node instanceof CSSRule) {
-				v.add(node);
-			}
-
-			node = node.getNextSibling();
-		}
-
-	}
-
-	private String getMediaText(CSSRule rule) {
-		String result = ""; //$NON-NLS-1$
-		ICSSNode child = (rule != null) ? ((ICSSNode) rule).getFirstChild() : null;
-		while (child != null) {
-			if (child.getNodeType() == ICSSNode.MEDIALIST_NODE) {
-				result = ((MediaList) child).getMediaText();
-				break;
-			}
-			child = child.getNextSibling();
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/JFaceNodeAdapterFactoryCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/JFaceNodeAdapterFactoryCSS.java
deleted file mode 100644
index d87e8ee..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentoutline/JFaceNodeAdapterFactoryCSS.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentoutline;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-
-public class JFaceNodeAdapterFactoryCSS extends JFaceNodeAdapterFactory {
-	public JFaceNodeAdapterFactoryCSS() {
-		this(IJFaceNodeAdapter.class, true);
-	}
-
-	public JFaceNodeAdapterFactoryCSS(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-
-	protected INodeAdapter createAdapter(INodeNotifier node) {
-		if (singletonAdapter == null) {
-			// create the JFaceNodeAdapter
-			singletonAdapter = new CSSNodeAdapter(this);
-		}
-		return singletonAdapter;
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ContentSettingsRegistry.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ContentSettingsRegistry.java
deleted file mode 100644
index 87155f0..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ContentSettingsRegistry.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentproperties;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfile;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ComboList;
-
-/**
- * @deprecated This class only contains helper methods that you should
- *             actually implement yourself.
- */
-public final class ContentSettingsRegistry {
-	private static final String NONE = CSSUIMessages.UI_none;
-
-	public static void setCSSMetaModelRegistryInto(ComboList combo) {
-		combo.add(NONE, ""); //$NON-NLS-1$
-		CSSProfileRegistry reg = CSSProfileRegistry.getInstance();
-		Iterator i = reg.getProfiles();
-		while (i.hasNext()) {
-			CSSProfile profile = (CSSProfile) i.next();
-			String id = profile.getProfileID();
-			String name = profile.getProfileName();
-			combo.add(name, id);
-		}
-		combo.sortByKey(1);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ui/CSSContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ui/CSSContentSettingsPropertyPage.java
deleted file mode 100644
index 47f0f07..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ui/CSSContentSettingsPropertyPage.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentproperties.ui;
-
-
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.css.ui.internal.contentproperties.ContentSettingsRegistry;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.sse.internal.contentproperties.IContentSettings;
-import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ComboListOnPropertyPage;
-import org.eclipse.wst.sse.ui.internal.contentproperties.ui.ContentSettingsPropertyPage;
-
-/**
- * @deprecated Use CSSWebContentSettingsPropertyPage instead
- */
-public final class CSSContentSettingsPropertyPage extends ContentSettingsPropertyPage {
-
-	private final int N_CSS_PROFILE = 0;
-
-
-
-	public CSSContentSettingsPropertyPage() {
-		super();
-		numberOfCombo = 1;
-		numCols = 2;
-		numRows = 1;
-		combo = new ComboListOnPropertyPage[super.numberOfCombo];
-
-	}
-
-	protected void createCSSComboBox() {
-		super.combo[N_CSS_PROFILE] = super.createComboBoxOf(CSS_LABEL);
-		ContentSettingsRegistry.setCSSMetaModelRegistryInto(combo[N_CSS_PROFILE]);
-		if (combo[N_CSS_PROFILE].getItemCount() <= 0)
-			return;
-		String initValue = contentSettings.getProperty((IResource) super.getElement(), IContentSettings.CSS_PROFILE);
-		// when either .contentsettings or element doesn't exist
-		// when attribute doesn't exists,getProperty returns empty string.
-		if (initValue == null)
-			initValue = ""; //$NON-NLS-1$
-		// set init selectionItem in Combo
-		super.setSelectionItem(combo[N_CSS_PROFILE], initValue);
-	}
-
-
-
-	protected void createSettingsPageGUI() {
-
-		int type = ((IResource) getElement()).getType();
-		switch (type) {
-			case IResource.FILE :
-				//composite = createComposite(propertyPage,numCols,numRows);
-				createCSSComboBox();
-				PlatformUI.getWorkbench().getHelpSystem().setHelp(propertyPage, IHelpContextIds.CSS_CONTENT_SETTINGS_HELPID);
-				break;
-
-			default :
-				Logger.log(Logger.WARNING, "CSSContentSettingsPropertyPage is instantiated by resource except FILE");//$NON-NLS-1$
-				break;
-		}
-
-	}
-
-
-	protected void putSelectedPropertyInto(Map properties, String valueInCombo, int index) {
-
-		switch (index) {
-			case N_CSS_PROFILE :
-				// css
-				properties.put(IContentSettings.CSS_PROFILE, valueInCombo);
-				break;
-			default :
-				Logger.log(Logger.ERROR, "Index is out of range in putSelectedPropertyInto() in class CSSContentSettingsPropertyPage");//$NON-NLS-1$
-				break;
-		}
-
-	}
-
-	protected void deleteNoneProperty(int index) {
-		switch (index) {
-			case N_CSS_PROFILE :
-				// css
-				contentSettings.deleteProperty((IResource) super.getElement(), IContentSettings.CSS_PROFILE);
-				break;
-
-			default :
-				Logger.log(Logger.ERROR, "Index is out of range in deleteNoneProperty() in class CSSContentSettingsPropertyPage");//$NON-NLS-1$
-				break;
-		}
-	}
-
-}
-
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ui/CSSWebContentSettingsPropertyPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ui/CSSWebContentSettingsPropertyPage.java
deleted file mode 100644
index 7e1dff4..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/contentproperties/ui/CSSWebContentSettingsPropertyPage.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- *  IBM Corporation - initial API and implementation
- *  David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- ****************************************************************************/
-package org.eclipse.wst.css.ui.internal.contentproperties.ui;
-
-
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PropertyPage;
-import org.eclipse.wst.css.core.internal.contentproperties.CSSContentProperties;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfile;
-import org.eclipse.wst.css.core.internal.metamodel.CSSProfileRegistry;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-
-public final class CSSWebContentSettingsPropertyPage extends PropertyPage {
-	private static final String SELECT_NONE = CSSUIMessages.UI_none;
-
-	private Combo fProfileCombo;
-	private List fProfileIds;
-
-	public CSSWebContentSettingsPropertyPage() {
-		super();
-		setDescription(CSSUIMessages.CSSContentSettingsPropertyPage_0);
-	}
-
-	private Composite createComposite(Composite parent, int numColumns) {
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData(GridData.FILL, GridData.FILL, true, false);
-		data.horizontalIndent = 0;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	protected Control createContents(Composite parent) {
-		Composite propertyPage = createComposite(parent, 2);
-
-		// CSS Profile control
-		Text languageLabel = new Text(propertyPage, SWT.READ_ONLY);
-		languageLabel.setText(CSSUIMessages.CSSContentSettingsPropertyPage_1);
-		fProfileCombo = new Combo(propertyPage, SWT.READ_ONLY);
-		GridData data = new GridData(GridData.FILL, GridData.FILL, true, false);
-		data.horizontalIndent = 0;
-		fProfileCombo.setLayoutData(data);
-
-		populateValues();
-		initializeValues();
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(propertyPage, IHelpContextIds.CSS_CONTENT_SETTINGS_HELPID);
-		Dialog.applyDialogFont(parent);
-		return propertyPage;
-	}
-
-	/**
-	 * Get the resource this properties page is for
-	 * 
-	 * @return IResource for this properties page or null if there is no
-	 *         IResource
-	 */
-	private IResource getResource() {
-		IResource resource = null;
-		if (getElement() instanceof IResource) {
-			resource = (IResource) getElement();
-		}
-		return resource;
-	}
-
-	private void initializeValues() {
-		int index = 0;
-		String profile = CSSContentProperties.getProperty(CSSContentProperties.CSS_PROFILE, getResource(), false);
-		if (profile != null && profile.length() > 0) {
-			/*
-			 * If item is already part of combo, select it. Otherwise, select
-			 * none.
-			 */
-			index = fProfileIds.indexOf(profile);
-		}
-		index = index >= 0 ? index : 0;
-		fProfileCombo.select(index);
-	}
-
-	private void populateValues() {
-		fProfileIds = new ArrayList();
-		// add none first
-		fProfileCombo.add(SELECT_NONE);
-		fProfileIds.add(null);
-
-		CSSProfileRegistry reg = CSSProfileRegistry.getInstance();
-		Iterator i = reg.getProfiles();
-		while (i.hasNext()) {
-			CSSProfile profile = (CSSProfile) i.next();
-			String id = profile.getProfileID();
-			String name = profile.getProfileName();
-			fProfileCombo.add(name);
-			fProfileIds.add(id);
-		}
-	}
-
-	protected void performDefaults() {
-		int index = fProfileCombo.indexOf(SELECT_NONE);
-		if (index > -1)
-			fProfileCombo.select(index);
-
-		super.performDefaults();
-	}
-
-	public boolean performOk() {
-		int index = fProfileCombo.getSelectionIndex();
-		if (index > -1) {
-			String id = (String) fProfileIds.get(index);
-			if (id == null || id.length() == 0 || id.equalsIgnoreCase(SELECT_NONE)) {
-				// if none, use null
-				id = null;
-			}
-			try {
-				CSSContentProperties.setProperty(CSSContentProperties.CSS_PROFILE, getResource(), id);
-			}
-			catch (CoreException e) {
-				// maybe in future, let user know there was a problem saving
-				// file
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		}
-		return super.performOk();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/edit/ui/CleanupActionCSSDelegate.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/edit/ui/CleanupActionCSSDelegate.java
deleted file mode 100644
index 1f2d6d0..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/edit/ui/CleanupActionCSSDelegate.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.edit.ui;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.css.core.internal.cleanup.CleanupProcessorCSS;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-
-/**
- * Cleanup action delegate for CSS editor
- */
-public class CleanupActionCSSDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
-	private IEditorPart fEditor;
-	private IStructuredCleanupProcessor fCleanupProcessor;
-
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		fEditor = targetEditor;
-	}
-
-	public void dispose() {
-		// nulling out just in case
-		fEditor = null;
-		fCleanupProcessor = null;
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(CSSUIMessages.CleanupDocument_label);
-			action.setToolTipText(CSSUIMessages.CleanupDocument_tooltip);
-			action.setDescription(CSSUIMessages.CleanupDocument_description);
-		}
-	}
-
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	public void init(IViewPart view) {
-		// do nothing
-	}
-
-	public void run(IAction action) {
-		if (fEditor instanceof ITextEditor) {
-			final ITextEditor editor = (ITextEditor) fEditor;
-			Dialog cleanupDialog = new CleanupDialogCSS(editor.getSite().getShell());
-			if (cleanupDialog.open() == Window.OK) {
-				// setup runnable
-				Runnable runnable = new Runnable() {
-					public void run() {
-						IStructuredCleanupProcessor cleanupProcessor = getCleanupProcessor();
-						if (cleanupProcessor != null) {
-							IStructuredModel model = null;
-							try {
-								model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
-								if (model != null)
-									cleanupProcessor.cleanupModel(model);
-							}
-							finally {
-								if (model != null)
-									model.releaseFromEdit();
-							}
-						}
-					}
-				};
-
-				// TODO: make independent of 'model'.
-				IStructuredModel model = null;
-				try {
-					model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
-					if (model != null) {
-						// begin recording
-						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
-						model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength()); //$NON-NLS-1$ //$NON-NLS-2$
-
-						// tell the model that we are about to make a big
-						// model change
-						model.aboutToChangeModel();
-
-						// run
-						BusyIndicator.showWhile(fEditor.getEditorSite().getWorkbenchWindow().getShell().getDisplay(), runnable);
-					}
-				}
-				finally {
-					if (model != null) {
-						// tell the model that we are done with the big
-						// model
-						// change
-						model.changedModel();
-
-						// end recording
-						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
-						model.endRecording(this, selection.getOffset(), selection.getLength());
-						model.releaseFromEdit();
-					}
-				}
-			}
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// do nothing
-	}
-
-	IStructuredCleanupProcessor getCleanupProcessor() {
-		if (fCleanupProcessor == null)
-			fCleanupProcessor = new CleanupProcessorCSS();
-
-		return fCleanupProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/edit/ui/CleanupDialogCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/edit/ui/CleanupDialogCSS.java
deleted file mode 100644
index d3007a0..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/edit/ui/CleanupDialogCSS.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.edit.ui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategy;
-import org.eclipse.wst.css.core.internal.cleanup.CSSCleanupStrategyImpl;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-
-public class CleanupDialogCSS extends Dialog {
-
-	private boolean embeddedCSS;
-	protected Button fRadioButtonIdentCaseAsis;
-	protected Button fRadioButtonIdentCaseLower;
-	protected Button fRadioButtonIdentCaseUpper;
-	protected Button fRadioButtonPropNameCaseAsis;
-	protected Button fRadioButtonPropNameCaseLower;
-	protected Button fRadioButtonPropNameCaseUpper;
-	protected Button fRadioButtonPropValueCaseAsis;
-	protected Button fRadioButtonPropValueCaseLower;
-	protected Button fRadioButtonPropValueCaseUpper;
-	protected Button fRadioButtonSelectorTagCaseAsis;
-	protected Button fRadioButtonSelectorTagCaseLower;
-	protected Button fRadioButtonSelectorTagCaseUpper;
-	protected Button fCheckBoxQuoteValues;
-	protected Button fCheckBoxFormatSource;
-
-	/**
-	 * CSSCleanupDialog constructor comment.
-	 * 
-	 * @param parentShell
-	 *            org.eclipse.swt.widgets.Shell
-	 */
-	public CleanupDialogCSS(Shell parentShell) {
-		super(parentShell);
-	}
-
-	/**
-	 * 
-	 * @return org.eclipse.swt.widgets.Control
-	 * @param parent
-	 *            org.eclipse.swt.widgets.Composite
-	 */
-	public Control createDialogArea(Composite parent) {
-		if (isEmbeddedCSS())
-			getShell().setText(CSSUIMessages.CSS_Cleanup_UI_);
-		else
-			getShell().setText(CSSUIMessages.Cleanup_UI_);
-
-		Composite panel = new Composite(parent, SWT.NULL);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.makeColumnsEqualWidth = true;
-		panel.setLayout(layout);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(panel, IHelpContextIds.CSS_CLEANUP_HELPID);
-
-		// Convert ident case
-		// ACC: Group radio buttons together so associated label is read
-		//		Label identCaseLabel = new Label(panel, SWT.NULL);
-		//		identCaseLabel.setText(ResourceHandler.getString("Identifier_case__UI_"));
-		// //$NON-NLS-1$ = "Identifier case:"
-		//		Canvas identCase = new Canvas(panel, SWT.NULL);
-		Group identCase = new Group(panel, SWT.NULL);
-		identCase.setText(CSSUIMessages.Identifier_case__UI_);
-		GridLayout hLayout = new GridLayout();
-		hLayout.numColumns = 3;
-		identCase.setLayout(hLayout);
-		fRadioButtonIdentCaseAsis = new Button(identCase, SWT.RADIO);
-		fRadioButtonIdentCaseAsis.setText(CSSUIMessages.As_is_UI_);
-		fRadioButtonIdentCaseLower = new Button(identCase, SWT.RADIO);
-		fRadioButtonIdentCaseLower.setText(CSSUIMessages.Lower_UI_);
-		fRadioButtonIdentCaseUpper = new Button(identCase, SWT.RADIO);
-		fRadioButtonIdentCaseUpper.setText(CSSUIMessages.Upper_UI_);
-
-		// Convert property name case
-		// ACC: Group radio buttons together so associated label is read
-		//		Label propNameCaseLabel = new Label(panel, SWT.NULL);
-		//		propNameCaseLabel.setText(ResourceHandler.getString("Property_name_case__UI_"));
-		// //$NON-NLS-1$ = "Property name case:"
-		//		Canvas propNameCase = new Canvas(panel, SWT.NULL);
-		Group propNameCase = new Group(panel, SWT.NULL);
-		propNameCase.setText(CSSUIMessages.Property_name_case__UI_);
-		hLayout = new GridLayout();
-		hLayout.numColumns = 3;
-		propNameCase.setLayout(hLayout);
-		fRadioButtonPropNameCaseAsis = new Button(propNameCase, SWT.RADIO);
-		fRadioButtonPropNameCaseAsis.setText(CSSUIMessages.As_is_UI_);
-		fRadioButtonPropNameCaseLower = new Button(propNameCase, SWT.RADIO);
-		fRadioButtonPropNameCaseLower.setText(CSSUIMessages.Lower_UI_);
-		fRadioButtonPropNameCaseUpper = new Button(propNameCase, SWT.RADIO);
-		fRadioButtonPropNameCaseUpper.setText(CSSUIMessages.Upper_UI_);
-
-		// Convert property Value case
-		// ACC: Group radio buttons together so associated label is read
-		//		Label propValueCaseLabel = new Label(panel, SWT.NULL);
-		//		propValueCaseLabel.setText(ResourceHandler.getString("Property_value_case__UI_"));
-		// //$NON-NLS-1$ = "Property value case:"
-		//		Canvas propValueCase = new Canvas(panel, SWT.NULL);
-		Group propValueCase = new Group(panel, SWT.NULL);
-		propValueCase.setText(CSSUIMessages.Property_value_case__UI_);
-		hLayout = new GridLayout();
-		hLayout.numColumns = 3;
-		propValueCase.setLayout(hLayout);
-		fRadioButtonPropValueCaseAsis = new Button(propValueCase, SWT.RADIO);
-		fRadioButtonPropValueCaseAsis.setText(CSSUIMessages.As_is_UI_);
-		fRadioButtonPropValueCaseLower = new Button(propValueCase, SWT.RADIO);
-		fRadioButtonPropValueCaseLower.setText(CSSUIMessages.Lower_UI_);
-		fRadioButtonPropValueCaseUpper = new Button(propValueCase, SWT.RADIO);
-		fRadioButtonPropValueCaseUpper.setText(CSSUIMessages.Upper_UI_);
-
-		if (!isEmbeddedCSS()) {
-			// Convert selector tag case
-			// ACC: Group radio buttons together so associated label is read
-			//			Label selectorTagCaseLabel = new Label(panel, SWT.NULL);
-			//			selectorTagCaseLabel.setText(ResourceHandler.getString("Selector_tag_name_case__UI_"));
-			// //$NON-NLS-1$ = "Selector tag name case:"
-			//			Canvas selectorTagCase = new Canvas(panel, SWT.NULL);
-			Group selectorTagCase = new Group(panel, SWT.NULL);
-			selectorTagCase.setText(CSSUIMessages.Selector_tag_name_case__UI_);
-			hLayout = new GridLayout();
-			hLayout.numColumns = 3;
-			selectorTagCase.setLayout(hLayout);
-			fRadioButtonSelectorTagCaseAsis = new Button(selectorTagCase, SWT.RADIO);
-			fRadioButtonSelectorTagCaseAsis.setText(CSSUIMessages.As_is_UI_);
-			fRadioButtonSelectorTagCaseLower = new Button(selectorTagCase, SWT.RADIO);
-			fRadioButtonSelectorTagCaseLower.setText(CSSUIMessages.Lower_UI_);
-			fRadioButtonSelectorTagCaseUpper = new Button(selectorTagCase, SWT.RADIO);
-			fRadioButtonSelectorTagCaseUpper.setText(CSSUIMessages.Upper_UI_);
-		}
-
-		// Quote attribute values
-		fCheckBoxQuoteValues = new Button(panel, SWT.CHECK);
-		fCheckBoxQuoteValues.setText(CSSUIMessages.Quote_values_UI_);
-
-		if (!isEmbeddedCSS()) {
-			// Format source
-			fCheckBoxFormatSource = new Button(panel, SWT.CHECK);
-			fCheckBoxFormatSource.setText(CSSUIMessages.Format_source_UI_);
-		}
-
-		setCleanupOptions();
-
-		return panel;
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * 
-	 * @return boolean
-	 */
-	public boolean isEmbeddedCSS() {
-		return embeddedCSS;
-	}
-
-	/**
-	 *  
-	 */
-	protected void okPressed() {
-		updateCleanupOptions();
-		super.okPressed();
-	}
-
-	/**
-	 *  
-	 */
-	protected void setCleanupOptions() {
-		CSSCleanupStrategy stgy = CSSCleanupStrategyImpl.getInstance();
-
-		if (fRadioButtonIdentCaseAsis != null) {
-			if (stgy.getIdentCase() == CSSCleanupStrategy.UPPER)
-				fRadioButtonIdentCaseUpper.setSelection(true);
-			else if (stgy.getIdentCase() == CSSCleanupStrategy.LOWER)
-				fRadioButtonIdentCaseLower.setSelection(true);
-			else
-				fRadioButtonIdentCaseAsis.setSelection(true);
-		}
-
-		if (fRadioButtonPropNameCaseAsis != null) {
-			if (stgy.getPropNameCase() == CSSCleanupStrategy.UPPER)
-				fRadioButtonPropNameCaseUpper.setSelection(true);
-			else if (stgy.getPropNameCase() == CSSCleanupStrategy.LOWER)
-				fRadioButtonPropNameCaseLower.setSelection(true);
-			else
-				fRadioButtonPropNameCaseAsis.setSelection(true);
-		}
-
-		if (fRadioButtonPropValueCaseAsis != null) {
-			if (stgy.getPropValueCase() == CSSCleanupStrategy.UPPER)
-				fRadioButtonPropValueCaseUpper.setSelection(true);
-			else if (stgy.getPropValueCase() == CSSCleanupStrategy.LOWER)
-				fRadioButtonPropValueCaseLower.setSelection(true);
-			else
-				fRadioButtonPropValueCaseAsis.setSelection(true);
-		}
-
-		if (fRadioButtonSelectorTagCaseAsis != null) {
-			if (stgy.getSelectorTagCase() == CSSCleanupStrategy.UPPER)
-				fRadioButtonSelectorTagCaseUpper.setSelection(true);
-			else if (stgy.getSelectorTagCase() == CSSCleanupStrategy.LOWER)
-				fRadioButtonSelectorTagCaseLower.setSelection(true);
-			else
-				fRadioButtonSelectorTagCaseAsis.setSelection(true);
-		}
-
-		if (fCheckBoxQuoteValues != null)
-			fCheckBoxQuoteValues.setSelection(stgy.isQuoteValues());
-
-		if (fCheckBoxFormatSource != null)
-			fCheckBoxFormatSource.setSelection(stgy.isFormatSource());
-
-	}
-
-	/**
-	 * Insert the method's description here.
-	 * 
-	 * @param newEmbeddedCSS
-	 *            boolean
-	 */
-	public void setEmbeddedCSS(boolean newEmbeddedCSS) {
-		embeddedCSS = newEmbeddedCSS;
-	}
-
-	/**
-	 *  
-	 */
-	protected void updateCleanupOptions() {
-		CSSCleanupStrategy stgy = CSSCleanupStrategyImpl.getInstance();
-
-		if (fRadioButtonIdentCaseAsis != null) {
-			if (fRadioButtonIdentCaseUpper.getSelection())
-				stgy.setIdentCase(CSSCleanupStrategy.UPPER);
-			else if (fRadioButtonIdentCaseLower.getSelection())
-				stgy.setIdentCase(CSSCleanupStrategy.LOWER);
-			else
-				stgy.setIdentCase(CSSCleanupStrategy.ASIS);
-		}
-
-		if (fRadioButtonPropNameCaseAsis != null) {
-			if (fRadioButtonPropNameCaseUpper.getSelection())
-				stgy.setPropNameCase(CSSCleanupStrategy.UPPER);
-			else if (fRadioButtonPropNameCaseLower.getSelection())
-				stgy.setPropNameCase(CSSCleanupStrategy.LOWER);
-			else
-				stgy.setPropNameCase(CSSCleanupStrategy.ASIS);
-		}
-
-		if (fRadioButtonPropValueCaseAsis != null) {
-			if (fRadioButtonPropValueCaseUpper.getSelection())
-				stgy.setPropValueCase(CSSCleanupStrategy.UPPER);
-			else if (fRadioButtonPropValueCaseLower.getSelection())
-				stgy.setPropValueCase(CSSCleanupStrategy.LOWER);
-			else
-				stgy.setPropValueCase(CSSCleanupStrategy.ASIS);
-		}
-
-		if (fRadioButtonSelectorTagCaseAsis != null) {
-			if (fRadioButtonSelectorTagCaseUpper.getSelection())
-				stgy.setSelectorTagCase(CSSCleanupStrategy.UPPER);
-			else if (fRadioButtonSelectorTagCaseLower.getSelection())
-				stgy.setSelectorTagCase(CSSCleanupStrategy.LOWER);
-			else
-				stgy.setSelectorTagCase(CSSCleanupStrategy.ASIS);
-		}
-
-		if (fCheckBoxQuoteValues != null)
-			stgy.setQuoteValues(fCheckBoxQuoteValues.getSelection());
-
-		if (fCheckBoxFormatSource != null)
-			stgy.setFormatSource(fCheckBoxFormatSource.getSelection());
-
-		// save these values to preferences
-		((CSSCleanupStrategyImpl) stgy).saveOptions();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/CSSEditorPluginImages.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/CSSEditorPluginImages.java
deleted file mode 100644
index 7559e98..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/CSSEditorPluginImages.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.editor;
-
-
-/**
- * Bundle of most images used by the CSS Source Editor plug-in.
- */
-public class CSSEditorPluginImages {
-	public static final String IMG_OBJ_SORT = "icons/full/obj16/sort.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OBJ_STYLESHEET = "icons/full/obj16/stylesheet.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_RULE_CHARSET = "icons/full/obj16/charset_rule.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_RULE_FONTFACE = "icons/full/obj16/fontface_rule.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_RULE_IMPORT = "icons/full/obj16/link_rule.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_RULE_MEDIA = "icons/full/obj16/media_rule.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_RULE_PAGE = "icons/full/obj16/page_rule.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_RULE_STYLE = "icons/full/obj16/style_rule.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_RULE_UNKNOWN = "icons/full/obj16/unknown_rule.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OBJ_SELECTOR_CLASS = "icons/full/obj16/class_selector.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_SELECTOR_ID = "icons/full/obj16/id_selector.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_SELECTOR_PSEUDO = "icons/full/obj16/pseudo.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_SELECTOR_TAG = "icons/full/obj16/tag_selector.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_SELECTOR_LINK = "icons/full/obj16/link_selector.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_SELECTOR_DEFAULT = "icons/full/obj16/tag_selector.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OBJ_VALUE_FUNCTION = "icons/full/obj16/css_propertyvalue_function.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_VALUE_NUMBER = "icons/full/obj16/css_propertyvalue_unit.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_VALUE_STRING = "icons/full/obj16/css_propertyvalue_identifier.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OBJ_CATEGORY_AURAL = "icons/full/obj16/aural_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_BOX = "icons/full/obj16/boxmodel_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_COLORANDBACKGROUND = "icons/full/obj16/colback_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_CONTENT = "icons/full/obj16/content_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_FONT = "icons/full/obj16/font_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_PAGE = "icons/full/obj16/pagedmedia_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_TABLES = "icons/full/obj16/table_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_TEXT = "icons/full/obj16/text_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_UI = "icons/full/obj16/ui_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_VISUAL = "icons/full/obj16/visual_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CATEGORY_DEFAULT = "icons/full/obj16/other_props.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_TEMPLATE = "icons/full/obj16/tag-template.gif"; //$NON-NLS-1$
-	
-	public static final String IMG_WIZBAN_NEWCSSFILE = "icons/full/wizban/newcssfile_wiz.png"; //$NON-NLS-1$
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/IHelpContextIds.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/IHelpContextIds.java
deleted file mode 100644
index ddc622b..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/editor/IHelpContextIds.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.editor;
-
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-
-/**
- * Help context ids for the CSS Source Editor.
- * <p>
- * This interface contains constants only; it is not intended to be
- * implemented.
- * </p>
- * 
- */
-public interface IHelpContextIds {
-	// org.eclipse.wst.css.ui.
-	public static final String PREFIX = CSSUIPlugin.ID + "."; //$NON-NLS-1$
-
-	// // figured out on the fly
-	// // CSS Source page editor
-	// public static final String CSS_SOURCEVIEW_HELPID =
-	// ContentTypeIdForCSS.ContentTypeID_CSS +"_source_HelpId"; //$NON-NLS-1$
-
-	// CSS Files Preference page
-	public static final String CSS_PREFWEBX_FILES_HELPID = PREFIX + "webx0010"; //$NON-NLS-1$
-	// CSS Source Preference page
-	public static final String CSS_PREFWEBX_SOURCE_HELPID = PREFIX + "webx0011"; //$NON-NLS-1$
-	// CSS Styles Preference page
-	public static final String CSS_PREFWEBX_STYLES_HELPID = PREFIX + "webx0012"; //$NON-NLS-1$
-	// CSS Template Preference page
-	public static final String CSS_PREFWEBX_TEMPLATES_HELPID = PREFIX + "webx0013"; //$NON-NLS-1$
-
-	// CSS Cleanup dialog
-	public static final String CSS_CLEANUP_HELPID = PREFIX + "xmlm1300"; //$NON-NLS-1$
-
-	// CSS Content Settings
-	public static final String CSS_CONTENT_SETTINGS_HELPID = PREFIX + "misc0180"; //$NON-NLS-1$
-	
-	// CSS New File Wizard - Template Page
-	public static final String CSS_NEWWIZARD_TEMPLATE_HELPID = PREFIX + "cssw0010"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/AbstractCommentHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/AbstractCommentHandler.java
deleted file mode 100644
index f0122fb..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/AbstractCommentHandler.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.css.ui.internal.Logger;
-
-public class AbstractCommentHandler extends AbstractHandler {
-
-	static final String OPEN_COMMENT = "/*"; //$NON-NLS-1$
-	static final String CLOSE_COMMENT = "*/"; //$NON-NLS-1$
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ITextEditor textEditor = getTextEditor(event);
-		if (textEditor != null) {
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			if (document != null) {
-				// get current text selection
-				ITextSelection textSelection = getCurrentSelection(textEditor);
-				if (textSelection.isEmpty()) {
-					return null;
-				}
-
-				processAction(textEditor, document, textSelection);
-			}
-		}
-
-		return null;
-	}
-
-	protected void processAction(ITextEditor editor, IDocument document, ITextSelection textSelection) {
-	}
-
-	protected ITextEditor getTextEditor(ExecutionEvent event) {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		return textEditor;
-	}
-
-	protected ITextSelection getCurrentSelection(ITextEditor textEditor) {
-		ISelectionProvider provider = textEditor.getSelectionProvider();
-		if (provider != null) {
-			ISelection selection = provider.getSelection();
-			if (selection instanceof ITextSelection) {
-				return (ITextSelection) selection;
-			}
-		}
-		return TextSelection.emptySelection();
-	}
-
-	protected void removeOpenCloseComments(IDocument document, int offset, int length) {
-		try {
-			int adjusted_length = length;
-
-			// remove open comments
-			String string = document.get(offset, length);
-			int index = string.lastIndexOf(OPEN_COMMENT);
-			while (index != -1) {
-				document.replace(offset + index, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-				index = string.lastIndexOf(OPEN_COMMENT, index - 1);
-				adjusted_length -= OPEN_COMMENT.length();
-			}
-
-			// remove close comments
-			string = document.get(offset, adjusted_length);
-			index = string.lastIndexOf(CLOSE_COMMENT);
-			while (index != -1) {
-				document.replace(offset + index, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-				index = string.lastIndexOf(CLOSE_COMMENT, index - 1);
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/AddBlockCommentHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/AddBlockCommentHandler.java
deleted file mode 100644
index 232b0dc..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/AddBlockCommentHandler.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-
-public class AddBlockCommentHandler extends AbstractCommentHandler {
-
-	protected void processAction(ITextEditor textEditor, IDocument document, ITextSelection textSelection) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null && document instanceof IStructuredDocument) {
-			try {
-				IStructuredDocument doc = (IStructuredDocument) document;
-				IStructuredDocumentRegion startRegion = doc.getRegionAtCharacterOffset(textSelection.getOffset());
-				IStructuredDocumentRegion endRegion = doc.getRegionAtCharacterOffset(textSelection.getOffset() + textSelection.getLength());
-
-				if (startRegion == null) {
-					return;
-				}
-				if ((endRegion == null) && (textSelection.getLength() > 0)) {
-					endRegion = doc.getRegionAtCharacterOffset(textSelection.getOffset() + textSelection.getLength() - 1);
-				}
-				if (endRegion == null) {
-					return;
-				}
-
-				int openCommentOffset = startRegion.getStartOffset();
-				int closeCommentOffset = endRegion.getEndOffset() + CLOSE_COMMENT.length();
-
-				if ((textSelection.getLength() == 0) && (startRegion.getType() == CSSRegionContexts.CSS_COMMENT)) {
-					return;
-				}
-
-				model.beginRecording(this, CSSUIMessages.AddBlockComment_tooltip);
-				model.aboutToChangeModel();
-
-				try {
-					document.replace(openCommentOffset, 0, OPEN_COMMENT);
-					document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
-					super.removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-				}
-				catch (BadLocationException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-				finally {
-					model.changedModel();
-					model.endRecording(this);
-				}
-			}
-			finally {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/CleanupDocumentHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/CleanupDocumentHandler.java
deleted file mode 100644
index a623b3e..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/CleanupDocumentHandler.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.css.core.internal.cleanup.CleanupProcessorCSS;
-import org.eclipse.wst.css.ui.internal.edit.ui.CleanupDialogCSS;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-
-public class CleanupDocumentHandler extends AbstractHandler implements IHandler {
-	private IStructuredCleanupProcessor fCleanupProcessor;
-
-	public void dispose() {
-		// nulling out just in case
-		fCleanupProcessor = null;
-	}
-	
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editorPart instanceof ITextEditor)
-			textEditor = (ITextEditor) editorPart;
-		else {
-			Object o = editorPart.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		
-		if (textEditor != null) {
-			final ITextEditor editor = textEditor;
-			Dialog cleanupDialog = new CleanupDialogCSS(editor.getSite().getShell());
-			if (cleanupDialog.open() == Window.OK) {
-				// setup runnable
-				Runnable runnable = new Runnable() {
-					public void run() {
-						IStructuredCleanupProcessor cleanupProcessor = getCleanupProcessor();
-						if (cleanupProcessor != null) {
-							IStructuredModel model = null;
-							try {
-								model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
-								if (model != null)
-									cleanupProcessor.cleanupModel(model);
-							}
-							finally {
-								if (model != null)
-									model.releaseFromEdit();
-							}
-						}
-					}
-				};
-
-				// TODO: make independent of 'model'.
-				IStructuredModel model = null;
-				try {
-					model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
-					if (model != null) {
-						// begin recording
-						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
-						model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength()); //$NON-NLS-1$ //$NON-NLS-2$
-
-						// tell the model that we are about to make a big
-						// model change
-						model.aboutToChangeModel();
-
-						// run
-						BusyIndicator.showWhile(editor.getEditorSite().getWorkbenchWindow().getShell().getDisplay(), runnable);
-					}
-				}
-				finally {
-					if (model != null) {
-						// tell the model that we are done with the big
-						// model
-						// change
-						model.changedModel();
-
-						// end recording
-						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
-						model.endRecording(this, selection.getOffset(), selection.getLength());
-						model.releaseFromEdit();
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// do nothing
-	}
-
-	IStructuredCleanupProcessor getCleanupProcessor() {
-		if (fCleanupProcessor == null)
-			fCleanupProcessor = new CleanupProcessorCSS();
-
-		return fCleanupProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/RemoveBlockCommentHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/RemoveBlockCommentHandler.java
deleted file mode 100644
index 6d07909..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/RemoveBlockCommentHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-
-public class RemoveBlockCommentHandler extends AbstractCommentHandler {
-
-	protected void processAction(ITextEditor textEditor, IDocument document, ITextSelection textSelection) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null && document instanceof IStructuredDocument) {
-			try {
-				IStructuredDocument doc = (IStructuredDocument) document;
-				IStructuredDocumentRegion startRegion = doc.getRegionAtCharacterOffset(textSelection.getOffset());
-				IStructuredDocumentRegion endRegion = doc.getRegionAtCharacterOffset(textSelection.getOffset() + textSelection.getLength());
-
-				if ((startRegion == null) || (endRegion == null)) {
-					return;
-				}
-
-				int openCommentOffset = startRegion.getStartOffset();
-				int closeCommentOffset = endRegion.getEndOffset() - OPEN_COMMENT.length() - CLOSE_COMMENT.length();
-
-				model.beginRecording(this, CSSUIMessages.RemoveBlockComment_tooltip);
-				model.aboutToChangeModel();
-
-				try {
-					if (textSelection.getLength() == 0) {
-						if (startRegion.getType() == CSSRegionContexts.CSS_COMMENT) {
-							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-					}
-					else {
-						if (startRegion.getType() == CSSRegionContexts.CSS_COMMENT) {
-							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-
-						if (endRegion.getType() == CSSRegionContexts.CSS_COMMENT) {
-							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-					}
-					removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-				}
-				catch (BadLocationException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-				finally {
-					model.changedModel();
-					model.endRecording(this);
-				}
-			}
-			finally {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectEnclosingHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectEnclosingHandler.java
deleted file mode 100644
index efd4711..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectEnclosingHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.handlers.AbstractStructuredSelectHandler;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-public class StructuredSelectEnclosingHandler extends AbstractStructuredSelectHandler {
-	
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof ICSSNode) {
-			ICSSNode cursorNode = (ICSSNode) indexedRegion;
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if (cursorNodeRegion.getOffset() >= currentOffset && cursorNodeRegion.getOffset() <= currentEndOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset) {
-				ICSSNode newNode = cursorNode.getParentNode();
-				if(newNode instanceof CSSStyleDeclaration) {
-					newNode = newNode.getParentNode();
-				}
-
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-				}
-			}
-			else
-				newRegion = cursorNodeRegion;
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectNextHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectNextHandler.java
deleted file mode 100644
index bfccb26..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectNextHandler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.handlers.AbstractStructuredSelectHandler;
-
-public class StructuredSelectNextHandler extends AbstractStructuredSelectHandler {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		int offset = textSelection.getOffset() + textSelection.getLength() - 1;
-		if (offset < 0)
-			offset = 0;
-
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, offset);
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-
-		if (indexedRegion instanceof ICSSNode) {
-			ICSSNode cursorNode = (ICSSNode) indexedRegion;
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if (cursorNodeRegion.getOffset() >= currentOffset && cursorNodeRegion.getOffset() <= currentEndOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset) {
-				ICSSNode newNode = cursorNode.getNextSibling();
-				if (newNode == null) {
-					newNode = cursorNode.getParentNode();
-
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-					}
-				}
-				else {
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(currentOffset, newIndexedRegion.getEndOffset() - currentOffset);
-					}
-				}
-			}
-			else
-				newRegion = cursorNodeRegion;
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectPreviousHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectPreviousHandler.java
deleted file mode 100644
index 5827a4f..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/StructuredSelectPreviousHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.handlers.AbstractStructuredSelectHandler;
-
-public class StructuredSelectPreviousHandler extends AbstractStructuredSelectHandler {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof ICSSNode) {
-			ICSSNode cursorNode = (ICSSNode) indexedRegion;
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if (cursorNodeRegion.getOffset() >= currentOffset && cursorNodeRegion.getOffset() <= currentEndOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset) {
-				ICSSNode newNode = cursorNode.getPreviousSibling();
-				if (newNode == null) {
-					newNode = cursorNode.getParentNode();
-
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-					}
-				}
-				else {
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), currentEndOffset - newIndexedRegion.getStartOffset());
-					}
-				}
-			}
-			else
-				newRegion = cursorNodeRegion;
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/ToggleCommentHandler.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/ToggleCommentHandler.java
deleted file mode 100644
index ca7dd92..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/handlers/ToggleCommentHandler.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.handlers;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-
-public class ToggleCommentHandler extends AbstractCommentHandler {
-
-	protected void processAction(ITextEditor textEditor, IDocument document, ITextSelection textSelection) {
-		// get text selection lines info
-		int selectionStartLine = textSelection.getStartLine();
-		int selectionEndLine = textSelection.getEndLine();
-		try {
-			int selectionEndLineOffset = document.getLineOffset(selectionEndLine);
-			int selectionEndOffset = textSelection.getOffset() + textSelection.getLength();
-
-			// adjust selection end line
-			if ((selectionEndLine > selectionStartLine) && (selectionEndLineOffset == selectionEndOffset)) {
-				selectionEndLine--;
-			}
-
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-
-		// save the selection position since it will be changing
-		Position selectionPosition = null;
-		boolean updateStartOffset = false;
-		try {
-			selectionPosition = new Position(textSelection.getOffset(), textSelection.getLength());
-			document.addPosition(selectionPosition);
-
-			// extra check if commenting from beginning of line
-			int selectionStartLineOffset = document.getLineOffset(selectionStartLine);
-			if ((textSelection.getLength() > 0) && (selectionStartLineOffset == textSelection.getOffset()) && !isCommentLine(document, selectionStartLine)) {
-				updateStartOffset = true;
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-
-		processAction(document, selectionStartLine, selectionEndLine);
-
-		updateCurrentSelection(textEditor, selectionPosition, document, updateStartOffset);
-	}
-
-	private void processAction(IDocument document, int selectionStartLine, int selectionEndLine) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null) {
-			try {
-				model.beginRecording(this, CSSUIMessages.ToggleComment_tooltip);
-				model.aboutToChangeModel();
-
-				for (int i = selectionStartLine; i <= selectionEndLine; i++) {
-					try {
-						if (document.getLineLength(i) > 0) {
-							if (isCommentLine(document, i)) {
-								int lineOffset = document.getLineOffset(i);
-								IRegion region = document.getLineInformation(i);
-								String string = document.get(region.getOffset(), region.getLength());
-								int openCommentOffset = lineOffset + string.indexOf(OPEN_COMMENT);
-								int closeCommentOffset = lineOffset + string.indexOf(CLOSE_COMMENT) - OPEN_COMMENT.length();
-								uncomment(document, openCommentOffset, closeCommentOffset);
-							}
-							else {
-								int openCommentOffset = document.getLineOffset(i);
-								int lineDelimiterLength = document.getLineDelimiter(i) == null ? 0 : document.getLineDelimiter(i).length();
-								int closeCommentOffset = openCommentOffset + document.getLineLength(i) - lineDelimiterLength + OPEN_COMMENT.length();
-								comment(document, openCommentOffset, closeCommentOffset);
-							}
-						}
-					}
-					catch (BadLocationException e) {
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-			}
-			finally {
-				model.changedModel();
-				model.endRecording(this);
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	private void updateCurrentSelection(ITextEditor textEditor, Position selectionPosition, IDocument document, boolean updateStartOffset) {
-		// update the selection if text selection changed
-		if (selectionPosition != null) {
-			ITextSelection selection = null;
-			if (updateStartOffset) {
-				selection = new TextSelection(document, selectionPosition.getOffset() - OPEN_COMMENT.length(), selectionPosition.getLength() + OPEN_COMMENT.length());
-			}
-			else {
-				selection = new TextSelection(document, selectionPosition.getOffset(), selectionPosition.getLength());
-			}
-			ISelectionProvider provider = textEditor.getSelectionProvider();
-			if (provider != null) {
-				provider.setSelection(selection);
-			}
-			document.removePosition(selectionPosition);
-		}
-	}
-
-	private boolean isCommentLine(IDocument document, int line) {
-		boolean isComment = false;
-
-		try {
-			IRegion region = document.getLineInformation(line);
-			String string = document.get(region.getOffset(), region.getLength()).trim();
-			isComment = (string.length() >= OPEN_COMMENT.length() + CLOSE_COMMENT.length()) && string.startsWith(OPEN_COMMENT) && string.endsWith(CLOSE_COMMENT);
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-		return isComment;
-	}
-
-	private void comment(IDocument document, int openCommentOffset, int closeCommentOffset) {
-		try {
-			document.replace(openCommentOffset, 0, OPEN_COMMENT);
-			document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
-			removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-
-	private void uncomment(IDocument document, int openCommentOffset, int closeCommentOffset) {
-		try {
-			document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-			document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/image/CSSImageHelper.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/image/CSSImageHelper.java
deleted file mode 100644
index 702be85..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/image/CSSImageHelper.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.image;
-
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.CSSEditorPluginImages;
-
-
-public class CSSImageHelper {
-	private static CSSImageHelper fInstance = null;
-
-	/**
-	 * singleton
-	 */
-	public synchronized static CSSImageHelper getInstance() {
-		if (fInstance == null) {
-			fInstance = new CSSImageHelper();
-		}
-		return fInstance;
-	}
-
-	private HashMap fImageDescRegistry = null;	// save a descriptor for each image
-	private Map fTypeMap = null;
-
-	/**
-	 * 
-	 */
-	private CSSImageHelper() {
-		super();
-	}
-
-	/**
-	 * 
-	 */
-	private Image createImage(String resource) {
-		ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(CSSUIPlugin.ID, resource);
-		Image image = null;
-
-		if (desc == null) {
-			desc = ImageDescriptor.getMissingImageDescriptor();
-			image = desc.createImage();
-		} else {
-			image = desc.createImage();
-			getImageRegistry().put(resource, image);
-		}
-
-		return image;
-	}
-
-	/**
-	 * Creates an image descriptor from the given imageFilePath and adds the
-	 * image descriptor to the image descriptor registry. If an image
-	 * descriptor could not be created, the default "missing" image descriptor
-	 * is returned but not added to the image descriptor registry.
-	 * 
-	 * @param imageFilePath
-	 * @return ImageDescriptor image descriptor for imageFilePath or default
-	 *         "missing" image descriptor if resource could not be found
-	 */
-	private ImageDescriptor createImageDescriptor(String imageFilePath) {
-		ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(CSSUIPlugin.ID, imageFilePath);
-		if (imageDescriptor != null) {
-			getImageDescriptorRegistry().put(imageFilePath, imageDescriptor);
-		} else {
-			imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-		}
-
-		return imageDescriptor;
-	}
-
-	/**
-	 * by type
-	 */
-	public Image getImage(CSSImageType type) {
-		if (fTypeMap == null) {
-			fTypeMap = new HashMap();
-			fTypeMap.put(CSSImageType.STYLESHEET, CSSEditorPluginImages.IMG_OBJ_STYLESHEET);
-
-			fTypeMap.put(CSSImageType.RULE_CHARSET, CSSEditorPluginImages.IMG_OBJ_RULE_CHARSET);
-			fTypeMap.put(CSSImageType.RULE_FONTFACE, CSSEditorPluginImages.IMG_OBJ_RULE_FONTFACE);
-			fTypeMap.put(CSSImageType.RULE_IMPORT, CSSEditorPluginImages.IMG_OBJ_RULE_IMPORT);
-			fTypeMap.put(CSSImageType.RULE_MEDIA, CSSEditorPluginImages.IMG_OBJ_RULE_MEDIA);
-			fTypeMap.put(CSSImageType.RULE_PAGE, CSSEditorPluginImages.IMG_OBJ_RULE_PAGE);
-			fTypeMap.put(CSSImageType.RULE_STYLE, CSSEditorPluginImages.IMG_OBJ_RULE_STYLE);
-			fTypeMap.put(CSSImageType.RULE_UNKNOWN, CSSEditorPluginImages.IMG_OBJ_RULE_UNKNOWN);
-
-			fTypeMap.put(CSSImageType.SELECTOR_CLASS, CSSEditorPluginImages.IMG_OBJ_SELECTOR_CLASS);
-			fTypeMap.put(CSSImageType.SELECTOR_ID, CSSEditorPluginImages.IMG_OBJ_SELECTOR_ID);
-			fTypeMap.put(CSSImageType.SELECTOR_PSEUDO, CSSEditorPluginImages.IMG_OBJ_SELECTOR_PSEUDO);
-			fTypeMap.put(CSSImageType.SELECTOR_TAG, CSSEditorPluginImages.IMG_OBJ_SELECTOR_TAG);
-			fTypeMap.put(CSSImageType.SELECTOR_LINK, CSSEditorPluginImages.IMG_OBJ_SELECTOR_LINK);
-			fTypeMap.put(CSSImageType.SELECTOR_DEFAULT, CSSEditorPluginImages.IMG_OBJ_SELECTOR_DEFAULT);
-
-			fTypeMap.put(CSSImageType.VALUE_FUNCTION, CSSEditorPluginImages.IMG_OBJ_VALUE_FUNCTION);
-			fTypeMap.put(CSSImageType.VALUE_NUMBER, CSSEditorPluginImages.IMG_OBJ_VALUE_NUMBER);
-			fTypeMap.put(CSSImageType.VALUE_STRING, CSSEditorPluginImages.IMG_OBJ_VALUE_STRING);
-
-			fTypeMap.put(CSSImageType.CATEGORY_AURAL, CSSEditorPluginImages.IMG_OBJ_CATEGORY_AURAL);
-			fTypeMap.put(CSSImageType.CATEGORY_BOX, CSSEditorPluginImages.IMG_OBJ_CATEGORY_BOX);
-			fTypeMap.put(CSSImageType.CATEGORY_COLORANDBACKGROUND, CSSEditorPluginImages.IMG_OBJ_CATEGORY_COLORANDBACKGROUND);
-			fTypeMap.put(CSSImageType.CATEGORY_CONTENT, CSSEditorPluginImages.IMG_OBJ_CATEGORY_CONTENT);
-			fTypeMap.put(CSSImageType.CATEGORY_FONT, CSSEditorPluginImages.IMG_OBJ_CATEGORY_FONT);
-			fTypeMap.put(CSSImageType.CATEGORY_PAGE, CSSEditorPluginImages.IMG_OBJ_CATEGORY_PAGE);
-			fTypeMap.put(CSSImageType.CATEGORY_TABLES, CSSEditorPluginImages.IMG_OBJ_CATEGORY_TABLES);
-			fTypeMap.put(CSSImageType.CATEGORY_TEXT, CSSEditorPluginImages.IMG_OBJ_CATEGORY_TEXT);
-			fTypeMap.put(CSSImageType.CATEGORY_UI, CSSEditorPluginImages.IMG_OBJ_CATEGORY_UI);
-			fTypeMap.put(CSSImageType.CATEGORY_VISUAL, CSSEditorPluginImages.IMG_OBJ_CATEGORY_VISUAL);
-			fTypeMap.put(CSSImageType.CATEGORY_DEFAULT, CSSEditorPluginImages.IMG_OBJ_CATEGORY_DEFAULT);
-		}
-		return getImage((String) fTypeMap.get(type));
-	}
-
-	/**
-	 * by relative path(from here)
-	 */
-	public Image getImage(String resource) {
-		if (resource == null) {
-			return null;
-		}
-		Image image = getImageRegistry().get(resource);
-		if (image == null) {
-			image = createImage(resource);
-		}
-		return image;
-	}
-
-	/**
-	 * Retrieves the image descriptor associated with resource from the image
-	 * descriptor registry. If the image descriptor cannot be retrieved,
-	 * attempt to find and load the image descriptor at the location specified
-	 * in resource.
-	 * 
-	 * @param resource
-	 *            the image descriptor to retrieve
-	 * @return ImageDescriptor the image descriptor assocated with resource or
-	 *         the default "missing" image descriptor if one could not be
-	 *         found
-	 */
-	public ImageDescriptor getImageDescriptor(String resource) {
-		ImageDescriptor imageDescriptor = null;
-		Object o = getImageDescriptorRegistry().get(resource);
-		if (o == null) {
-			// create a descriptor
-			imageDescriptor = createImageDescriptor(resource);
-		} else {
-			imageDescriptor = (ImageDescriptor) o;
-		}
-		return imageDescriptor;
-	}
-
-	/**
-	 * Returns the image descriptor registry for this plugin.
-	 * 
-	 * @return HashMap - image descriptor registry for this plugin
-	 */
-	private HashMap getImageDescriptorRegistry() {
-		if (fImageDescRegistry == null)
-			fImageDescRegistry = new HashMap();
-		return fImageDescRegistry;
-	}
-
-	private ImageRegistry getImageRegistry() {
-		return JFaceResources.getImageRegistry();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/image/CSSImageType.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/image/CSSImageType.java
deleted file mode 100644
index 6f2bf91..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/image/CSSImageType.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.image;
-
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMProperty;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelFinder;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSPrimitiveValue;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSelectorList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSSimpleSelector;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.w3c.dom.css.CSSCharsetRule;
-import org.w3c.dom.css.CSSFontFaceRule;
-import org.w3c.dom.css.CSSImportRule;
-import org.w3c.dom.css.CSSMediaRule;
-import org.w3c.dom.css.CSSPageRule;
-import org.w3c.dom.css.CSSPrimitiveValue;
-import org.w3c.dom.css.CSSStyleDeclaration;
-import org.w3c.dom.css.CSSStyleRule;
-import org.w3c.dom.css.CSSValue;
-
-/**
- */
-public class CSSImageType {
-
-	private final String fName;
-
-	private CSSImageType(String name) {
-		this.fName = name;
-	}
-
-	public String toString() {
-		return fName;
-	}
-
-	public static final CSSImageType STYLESHEET = new CSSImageType("STYLESHEET"); //$NON-NLS-1$
-
-	public static final CSSImageType RULE_CHARSET = new CSSImageType("RULE_CHARSET"); //$NON-NLS-1$
-	public static final CSSImageType RULE_FONTFACE = new CSSImageType("RULE_FONTFACE"); //$NON-NLS-1$
-	public static final CSSImageType RULE_IMPORT = new CSSImageType("RULE_IMPORT"); //$NON-NLS-1$
-	public static final CSSImageType RULE_MEDIA = new CSSImageType("RULE_MEDIA"); //$NON-NLS-1$
-	public static final CSSImageType RULE_PAGE = new CSSImageType("RULE_PAGE"); //$NON-NLS-1$
-	public static final CSSImageType RULE_STYLE = new CSSImageType("RULE_STYLE"); //$NON-NLS-1$
-	public static final CSSImageType RULE_UNKNOWN = new CSSImageType("RULE_UNKNOWN"); //$NON-NLS-1$
-
-	public static final CSSImageType SELECTOR_CLASS = new CSSImageType("SELECTOR_CLASS"); //$NON-NLS-1$
-	public static final CSSImageType SELECTOR_ID = new CSSImageType("SELECTOR_ID"); //$NON-NLS-1$
-	public static final CSSImageType SELECTOR_DEFAULT = new CSSImageType("SELECTOR_DEFAULT"); //$NON-NLS-1$
-	public static final CSSImageType SELECTOR_PSEUDO = new CSSImageType("SELECTOR_PSEUDO"); //$NON-NLS-1$
-	public static final CSSImageType SELECTOR_TAG = new CSSImageType("SELECTOR_TAG"); //$NON-NLS-1$
-	public static final CSSImageType SELECTOR_LINK = new CSSImageType("SELECTOR_LINK"); //$NON-NLS-1$
-
-	public static final CSSImageType VALUE_FUNCTION = new CSSImageType("VALUE_FUNCTION"); //$NON-NLS-1$
-	public static final CSSImageType VALUE_NUMBER = new CSSImageType("VALUE_NUMBER"); //$NON-NLS-1$
-	public static final CSSImageType VALUE_STRING = new CSSImageType("VALUE_STRING"); //$NON-NLS-1$
-
-	public static final CSSImageType CATEGORY_AURAL = new CSSImageType("CATEGORY_AURAL"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_BOX = new CSSImageType("CATEGORY_BOX"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_COLORANDBACKGROUND = new CSSImageType("CATEGORY_COLORANDBACKGROUND"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_CONTENT = new CSSImageType("CATEGORY_CONTENT"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_FONT = new CSSImageType("CATEGORY_FONT"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_PAGE = new CSSImageType("CATEGORY_PAGE"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_TABLES = new CSSImageType("CATEGORY_TABLES"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_TEXT = new CSSImageType("CATEGORY_TEXT"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_UI = new CSSImageType("CATEGORY_UI"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_VISUAL = new CSSImageType("CATEGORY_VISUAL"); //$NON-NLS-1$
-	public static final CSSImageType CATEGORY_DEFAULT = new CSSImageType("CATEGORY_DEFAULT"); //$NON-NLS-1$
-
-	/**
-	 * by node
-	 */
-	public static CSSImageType getImageType(ICSSNode node) {
-		CSSImageType imageType = null;
-		if (node instanceof CSSCharsetRule) {
-			imageType = RULE_CHARSET;
-		} else if (node instanceof CSSFontFaceRule) {
-			imageType = RULE_FONTFACE;
-		} else if (node instanceof CSSImportRule) {
-			imageType = RULE_IMPORT;
-		} else if (node instanceof CSSMediaRule) {
-			imageType = RULE_MEDIA;
-		} else if (node instanceof CSSPageRule) {
-			imageType = RULE_PAGE;
-		} else if (node instanceof CSSStyleRule) {
-			imageType = getImageType(((ICSSStyleRule) node).getSelectors());
-		} else if (node instanceof CSSStyleDeclaration) {
-			ICSSNode parent = node.getParentNode();
-			if (parent != null) {
-				return getImageType(parent);
-			}
-		} else if (node instanceof ICSSStyleDeclItem) {
-			String name = ((ICSSStyleDeclItem) node).getPropertyName();
-			ICSSDocument doc = node.getOwnerDocument();
-			ICSSModel model = (doc != null) ? doc.getModel() : null;
-			CSSMetaModelFinder finder = CSSMetaModelFinder.getInstance();
-			CSSMetaModel metaModel = finder.findMetaModelFor(model);
-			// is font-face rule ?
-			ICSSNode parent = node.getParentNode();
-			if (parent != null) {
-				parent = parent.getParentNode();
-				if (parent instanceof CSSFontFaceRule) {
-					imageType = CSSImageType.CATEGORY_FONT;
-				}
-			}
-			if (imageType == null) {
-				CSSMMProperty prop = new CSSMetaModelUtil(metaModel).getProperty(name);
-				if (prop != null) {
-					String category = prop.getAttribute("category"); //$NON-NLS-1$
-					imageType = getImageType(category);
-				}
-				if (imageType == null) {
-					imageType = CSSImageType.CATEGORY_DEFAULT;
-				}
-			}
-		} else if (node instanceof CSSValue) {
-			switch (((CSSValue) node).getCssValueType()) {
-				case CSSPrimitiveValue.CSS_NUMBER :
-				case CSSPrimitiveValue.CSS_PERCENTAGE :
-				case CSSPrimitiveValue.CSS_EMS :
-				case CSSPrimitiveValue.CSS_EXS :
-				case CSSPrimitiveValue.CSS_PX :
-				case CSSPrimitiveValue.CSS_CM :
-				case CSSPrimitiveValue.CSS_MM :
-				case CSSPrimitiveValue.CSS_IN :
-				case CSSPrimitiveValue.CSS_PT :
-				case CSSPrimitiveValue.CSS_PC :
-				case CSSPrimitiveValue.CSS_DEG :
-				case CSSPrimitiveValue.CSS_RAD :
-				case CSSPrimitiveValue.CSS_GRAD :
-				case CSSPrimitiveValue.CSS_MS :
-				case CSSPrimitiveValue.CSS_S :
-				case CSSPrimitiveValue.CSS_HZ :
-				case CSSPrimitiveValue.CSS_KHZ :
-				case CSSPrimitiveValue.CSS_DIMENSION :
-				case ICSSPrimitiveValue.CSS_INTEGER :
-				case ICSSPrimitiveValue.CSS_HASH :
-					imageType = VALUE_NUMBER;
-					break;
-				case CSSPrimitiveValue.CSS_ATTR :
-				case CSSPrimitiveValue.CSS_COUNTER :
-				case CSSPrimitiveValue.CSS_RECT :
-				case CSSPrimitiveValue.CSS_RGBCOLOR :
-				case CSSPrimitiveValue.CSS_URI :
-				case ICSSPrimitiveValue.CSS_FORMAT :
-				case ICSSPrimitiveValue.CSS_LOCAL :
-					imageType = VALUE_FUNCTION;
-					break;
-				default :
-					imageType = VALUE_STRING;
-					break;
-			}
-		}
-		return imageType;
-	}
-
-	public static CSSImageType getImageType(ICSSSelectorList selectorList) {
-		if (selectorList == null || selectorList.getLength() == 0) {
-			return SELECTOR_DEFAULT;
-		}
-		CSSImageType imageType = null;
-		int nSelectors = selectorList.getLength();
-		for (int i = 0; i < nSelectors; i++) {
-			CSSImageType candidate = getImageType(selectorList.getSelector(i));
-			if (imageType == null) {
-				imageType = candidate;
-			} else if (imageType != candidate) {
-				imageType = null;
-				break;
-			}
-		}
-
-		return (imageType == null) ? SELECTOR_DEFAULT : imageType;
-	}
-
-	public static CSSImageType getImageType(ICSSSelector selector) {
-		CSSImageType imageType = SELECTOR_DEFAULT;
-		if (selector == null || selector.getLength() == 0) {
-			return imageType;
-		}
-		ICSSSelectorItem item = selector.getItem(selector.getLength() - 1);
-		if (item.getItemType() == ICSSSelectorItem.SIMPLE) {
-			ICSSSimpleSelector ss = (ICSSSimpleSelector) item;
-			if (0 < ss.getNumOfIDs()) {
-				imageType = SELECTOR_ID;
-			} else if (0 < ss.getNumOfClasses()) {
-				imageType = SELECTOR_CLASS;
-			} else if (0 < ss.getNumOfPseudoNames()) {
-				imageType = SELECTOR_PSEUDO;
-			} else {
-				imageType = SELECTOR_TAG;
-			}
-		}
-		return imageType;
-	}
-
-	public static CSSImageType getImageType(String category) {
-		if (fCategoryMap == null) {
-			fCategoryMap = new HashMap();
-			fCategoryMap.put("aural", CATEGORY_AURAL); //$NON-NLS-1$
-			fCategoryMap.put("box", CATEGORY_BOX); //$NON-NLS-1$
-			fCategoryMap.put("colorandbackground", CATEGORY_COLORANDBACKGROUND); //$NON-NLS-1$
-			fCategoryMap.put("content", CATEGORY_CONTENT); //$NON-NLS-1$
-			fCategoryMap.put("font", CATEGORY_FONT); //$NON-NLS-1$
-			fCategoryMap.put("page", CATEGORY_PAGE); //$NON-NLS-1$
-			fCategoryMap.put("tables", CATEGORY_TABLES); //$NON-NLS-1$
-			fCategoryMap.put("text", CATEGORY_TEXT); //$NON-NLS-1$
-			fCategoryMap.put("ui", CATEGORY_UI); //$NON-NLS-1$
-			fCategoryMap.put("visual", CATEGORY_VISUAL); //$NON-NLS-1$
-		}
-		CSSImageType imageType = (CSSImageType) fCategoryMap.get(category);
-		return (imageType == null) ? CATEGORY_DEFAULT : imageType;
-	}
-
-	private static Map fCategoryMap = null;
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java
deleted file mode 100644
index dc4b215..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceInitializer.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.eclipse.wst.css.ui.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ColorRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.style.IStyleConstantsCSS;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-
-/**
- * Sets default values for CSS UI preferences
- */
-public class CSSUIPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = CSSUIPlugin.getDefault().getPreferenceStore();
-		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
-		
-		// CSS Style Preferences
-		String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
-		String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
-		String JUSTBOLD = " | null | true";
-		String styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
-		store.setDefault(IStyleConstantsCSS.NORMAL, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATMARK_RULE, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.ATMARK_RULE, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.SELECTOR, 63, 127, 127) + JUSTBOLD;
-		store.setDefault(IStyleConstantsCSS.SELECTOR, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.UNIVERSAL, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.UNIVERSAL, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.COMBINATOR, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.COMBINATOR, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.SELECTOR_CLASS, 63, 127, 127) + JUSTITALIC;
-		store.setDefault(IStyleConstantsCSS.SELECTOR_CLASS, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ID, 63, 127, 127) + JUSTITALIC;
-		store.setDefault(IStyleConstantsCSS.ID, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.PSEUDO, 63, 127, 127) + JUSTITALIC;
-		store.setDefault(IStyleConstantsCSS.PSEUDO, styleValue);
-
-		/* Attribute selector */
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_DELIM, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_DELIM, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_NAME, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_NAME, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_OPERATOR, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_OPERATOR, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ATTRIBUTE_VALUE, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.ATTRIBUTE_VALUE, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.MEDIA, 42, 0, 225) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.MEDIA, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.COMMENT, 63, 95, 191) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.COMMENT, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.PROPERTY_NAME, 127, 0, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.PROPERTY_NAME, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.PROPERTY_VALUE, 42, 0, 225) + JUSTITALIC;
-		store.setDefault(IStyleConstantsCSS.PROPERTY_VALUE, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.URI, 42, 0, 225) + JUSTITALIC;
-		store.setDefault(IStyleConstantsCSS.URI, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.STRING, 42, 0, 225) + JUSTITALIC;
-		store.setDefault(IStyleConstantsCSS.STRING, styleValue);
-
-		styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
-		store.setDefault(IStyleConstantsCSS.COLON, styleValue);
-		store.setDefault(IStyleConstantsCSS.SEMI_COLON, styleValue);
-		store.setDefault(IStyleConstantsCSS.CURLY_BRACE, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsCSS.ERROR, 191, 63, 63) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsCSS.ERROR, styleValue);
-		
-		// set default new css file template to use in new file wizard
-		/*
-		 * Need to find template name that goes with default template id (name
-		 * may change for differnt language)
-		 */
-		String templateName = ""; //$NON-NLS-1$
-		Template template = CSSUIPlugin.getDefault().getTemplateStore().findTemplateById("org.eclipse.wst.css.ui.internal.templates.newcss"); //$NON-NLS-1$
-		if (template != null)
-			templateName = template.getName();
-		store.setDefault(CSSUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceNames.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceNames.java
deleted file mode 100644
index 48ab781..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/CSSUIPreferenceNames.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.preferences;
-
-/**
- * Preference keys for CSS UI
- */
-public class CSSUIPreferenceNames {
-	private CSSUIPreferenceNames() {
-		// cannot create instance
-	}
-	/**
-	 * The key to store customized templates.
-	 * <p>
-	 * Value is of type <code>String</code>.
-	 * </p>
-	 */
-	public static final String TEMPLATES_KEY = "org.eclipse.wst.sse.ui.custom_templates"; //$NON-NLS-1$
-	
-	/**
-	 * The key to store the last template name used in new CSS file wizard.
-	 * Template name is stored instead of template id because user-created
-	 * templates do not have template ids.
-	 * <p>
-	 * Value is of type <code>String</code>.
-	 * </p>
-	 */
-	public static final String NEW_FILE_TEMPLATE_NAME = "newFileTemplateName"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSColorPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSColorPage.java
deleted file mode 100644
index ab63bf1..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSColorPage.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004,2007 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.ui.internal.preferences.ui;
-
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.css.ui.internal.style.IStyleConstantsCSS;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractColorPage;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.StyledTextColorPicker;
-
-/**
- * @deprecated
- */
-public class CSSColorPage extends AbstractColorPage {
-
-	/**
-	 * Set up all the style preference keys in the overlay store
-	 */
-	protected OverlayKey[] createOverlayStoreKeys() {
-		ArrayList overlayKeys = new ArrayList();
-
-		ArrayList styleList = new ArrayList();
-		initStyleList(styleList);
-		Iterator i = styleList.iterator();
-		while (i.hasNext()) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String) i.next()));
-		}
-
-		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return keys;
-	}
-
-	protected Control createContents(Composite parent) {
-		Composite pageComponent = createComposite(parent, 1);
-		((GridData) pageComponent.getLayoutData()).horizontalAlignment = GridData.HORIZONTAL_ALIGN_FILL;
-
-		super.createContents(pageComponent);
-
-		// assigning one help for whole group
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.CSS_PREFWEBX_STYLES_HELPID);
-
-		return pageComponent;
-	}
-
-	protected Composite createColoringComposite(Composite parent) {
-		Composite coloringComposite = super.createColoringComposite(parent);
-
-		// assigning one help for whole group
-		return coloringComposite;
-	}
-
-	/**
-	 * getSampleText method comment.
-	 */
-	public String getSampleText() {
-		return CSSUIMessages.PrefsLabel_ColorSample; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * @param contextStyleMap
-	 *            java.util.Dictionary
-	 */
-	protected void initContextStyleMap(Dictionary contextStyleMap) {
-		contextStyleMap.put(CSSRegionContexts.CSS_COMMENT, IStyleConstantsCSS.COMMENT);
-		contextStyleMap.put(CSSRegionContexts.CSS_CDO, IStyleConstantsCSS.COMMENT);
-		contextStyleMap.put(CSSRegionContexts.CSS_CDC, IStyleConstantsCSS.COMMENT);
-		contextStyleMap.put(CSSRegionContexts.CSS_S, IStyleConstantsCSS.NORMAL);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_DELIMITER, IStyleConstantsCSS.SEMI_COLON);
-		contextStyleMap.put(CSSRegionContexts.CSS_LBRACE, IStyleConstantsCSS.CURLY_BRACE);
-		contextStyleMap.put(CSSRegionContexts.CSS_RBRACE, IStyleConstantsCSS.CURLY_BRACE);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_IMPORT, IStyleConstantsCSS.ATMARK_RULE);
-		contextStyleMap.put(CSSRegionContexts.CSS_PAGE, IStyleConstantsCSS.ATMARK_RULE);
-		contextStyleMap.put(CSSRegionContexts.CSS_MEDIA, IStyleConstantsCSS.ATMARK_RULE);
-		contextStyleMap.put(CSSRegionContexts.CSS_FONT_FACE, IStyleConstantsCSS.ATMARK_RULE);
-		contextStyleMap.put(CSSRegionContexts.CSS_CHARSET, IStyleConstantsCSS.ATMARK_RULE);
-		contextStyleMap.put(CSSRegionContexts.CSS_ATKEYWORD, IStyleConstantsCSS.ATMARK_RULE);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_STRING, IStyleConstantsCSS.STRING);
-		contextStyleMap.put(CSSRegionContexts.CSS_URI, IStyleConstantsCSS.URI);
-		contextStyleMap.put(CSSRegionContexts.CSS_MEDIUM, IStyleConstantsCSS.MEDIA);
-		contextStyleMap.put(CSSRegionContexts.CSS_MEDIA_SEPARATOR, IStyleConstantsCSS.MEDIA);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_CHARSET_NAME, IStyleConstantsCSS.STRING);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_PAGE_SELECTOR, IStyleConstantsCSS.MEDIA);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_UNIVERSAL, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_PSEUDO, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_CLASS, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ID, IStyleConstantsCSS.SELECTOR);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_COMBINATOR, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_SEPARATOR, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE, IStyleConstantsCSS.SELECTOR);
-		contextStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR, IStyleConstantsCSS.SELECTOR);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_PROPERTY, IStyleConstantsCSS.PROPERTY_NAME);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_STRING, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_HASH, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_UNICODE_RANGE, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IMPORTANT, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_S, IStyleConstantsCSS.PROPERTY_VALUE);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_SEPARATOR, IStyleConstantsCSS.COLON);
-		contextStyleMap.put(CSSRegionContexts.CSS_DECLARATION_DELIMITER, IStyleConstantsCSS.SEMI_COLON);
-
-		contextStyleMap.put(CSSRegionContexts.CSS_UNKNOWN, IStyleConstantsCSS.ERROR);
-	}
-
-	/**
-	 * 
-	 * @param descriptions
-	 *            java.util.Dictionary
-	 */
-	protected void initDescriptions(Dictionary descriptions) {
-		// create descriptions for hilighting types
-		descriptions.put(IStyleConstantsCSS.NORMAL, CSSUIMessages.PrefsLabel_ColorNormal);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.ATMARK_RULE, CSSUIMessages.PrefsLabel_ColorAtmarkRule);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.SELECTOR, CSSUIMessages.PrefsLabel_ColorSelector);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.MEDIA, CSSUIMessages.PrefsLabel_ColorMedia);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.COMMENT, CSSUIMessages.PrefsLabel_ColorComment);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.PROPERTY_NAME, CSSUIMessages.PrefsLabel_ColorPropertyName);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.PROPERTY_VALUE, CSSUIMessages.PrefsLabel_ColorPropertyValue);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.URI, CSSUIMessages.PrefsLabel_ColorUri);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.STRING, CSSUIMessages.PrefsLabel_ColorString);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.COLON, CSSUIMessages.PrefsLabel_ColorColon);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.SEMI_COLON, CSSUIMessages.PrefsLabel_ColorSemiColon);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.CURLY_BRACE, CSSUIMessages.PrefsLabel_ColorCurlyBrace);//$NON-NLS-1$
-		descriptions.put(IStyleConstantsCSS.ERROR, CSSUIMessages.PrefsLabel_ColorError);//$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 * @param list
-	 *            java.util.ArrayList
-	 */
-	protected void initStyleList(ArrayList list) {
-		list.add(IStyleConstantsCSS.NORMAL);
-		list.add(IStyleConstantsCSS.ATMARK_RULE);
-		list.add(IStyleConstantsCSS.SELECTOR);
-		list.add(IStyleConstantsCSS.MEDIA);
-		list.add(IStyleConstantsCSS.COMMENT);
-		list.add(IStyleConstantsCSS.PROPERTY_NAME);
-		list.add(IStyleConstantsCSS.PROPERTY_VALUE);
-		list.add(IStyleConstantsCSS.URI);
-		list.add(IStyleConstantsCSS.STRING);
-		list.add(IStyleConstantsCSS.COLON);
-		list.add(IStyleConstantsCSS.SEMI_COLON);
-		list.add(IStyleConstantsCSS.CURLY_BRACE);
-		list.add(IStyleConstantsCSS.ERROR);
-	}
-
-	/**
-	 * setupPicker method comment.
-	 */
-	protected void setupPicker(StyledTextColorPicker picker) {
-		IModelManager mmanager = StructuredModelManager.getModelManager();
-		picker.setParser(mmanager.createStructuredDocumentFor(ContentTypeIdForCSS.ContentTypeID_CSS).getParser());
-
-		Dictionary descriptions = new Hashtable();
-		initDescriptions(descriptions);
-
-		Dictionary contextStyleMap = new Hashtable();
-		initContextStyleMap(contextStyleMap);
-
-		ArrayList styleList = new ArrayList();
-		initStyleList(styleList);
-
-		picker.setContextStyleMap(contextStyleMap);
-		picker.setDescriptions(descriptions);
-		picker.setStyleList(styleList);
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return CSSUIPlugin.getDefault().getPreferenceStore();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.sse.ui.preferences.ui.AbstractColorPage#savePreferences()
-	 */
-	protected void savePreferences() {
-		CSSUIPlugin.getDefault().savePluginPreferences();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSFilesPreferencePage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSFilesPreferencePage.java
deleted file mode 100644
index 77cbe7f..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSFilesPreferencePage.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.preferences.ui;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLFilesPreferencePage;
-
-public class CSSFilesPreferencePage extends XMLFilesPreferencePage {
-	protected IPreferenceStore doGetPreferenceStore() {
-		return CSSUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	protected void doSavePreferenceStore() {
-		CSSCorePlugin.getDefault().savePluginPreferences(); // model
-	}
-
-	protected Preferences getModelPreferences() {
-		return CSSCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	protected Control createContents(Composite parent) {
-		Composite scrolledComposite = createScrolledComposite(parent);
-		createContentsForCreatingGroup(scrolledComposite);
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(scrolledComposite, IHelpContextIds.CSS_PREFWEBX_FILES_HELPID);
-		
-		setSize(scrolledComposite);
-		loadPreferences();
-		return scrolledComposite;
-	}
-
-	protected IContentType getContentType() {
-		return Platform.getContentTypeManager().getContentType(ContentTypeIdForCSS.ContentTypeID_CSS);
-	}
-	
-	protected void initializeValues() {
-		initializeValuesForCreatingGroup();
-	}
-	
-	protected void performDefaults() {
-		performDefaultsForCreatingGroup();
-
-        updateApplyButton();
-	}
-	
-	protected void storeValues() {
-		storeValuesForCreatingGroup();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java
deleted file mode 100644
index c2ffddb..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSourcePreferencePage.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.preferences.ui;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-
-/**
- */
-public class CSSSourcePreferencePage extends AbstractPreferencePage {
-	// Content Assist
-	protected Button fAutoPropose;
-	protected Label fAutoProposeLabel;
-
-	protected Text fAutoProposeText;
-	protected Button fClearAllBlankLines;
-	protected Button fIdentLower;
-	// case of output character
-	// case of identifier
-	protected Button fIdentUpper;
-	private Spinner fIndentationSize;
-	private Button fIndentUsingSpaces;
-	
-	private Button fIndentUsingTabs;
-	// Formatting
-	protected Label fLineWidthLabel;
-	
-	protected Text fLineWidthText;
-	// prohibit wrapping if style attribute
-	protected Button fNowrapAttr;
-	// one property per one line
-	protected Button fPropertyPerLine;
-	protected Button fPropNameLower;
-
-	// case of property name
-	protected Button fPropNameUpper;
-	protected Button fPropValueLower;
-	// case of property value
-	protected Button fPropValueUpper;
-
-	// Selector case
-	protected Button fSelectorUpper;
-	protected Button fSelectorLower;
-
-	protected Button fSplitMultiAttrs;
-	private final int MAX_INDENTATION_SIZE = 16;
-	private final int MIN_INDENTATION_SIZE = 0;
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite parent) {
-		final Composite composite = super.createComposite(parent, 1);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.CSS_PREFWEBX_SOURCE_HELPID);
-
-		new PreferenceLinkArea(composite, SWT.WRAP | SWT.MULTI, "org.eclipse.wst.sse.ui.preferences.editor", CSSUIMessages._UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK,//$NON-NLS-1$
-					(IWorkbenchPreferenceContainer) getContainer(), null).getControl().setLayoutData(GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).create());
-		new Label(composite, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().create());
-
-		createContentsForFormattingGroup(composite);
-		createContentsForContentAssistGroup(composite);
-		setSize(composite);
-		loadPreferences();
-
-		return composite;
-	}
-
-	private void createContentsForContentAssistGroup(Composite parent) {
-		// not content assist, but preferred case
-		Group caseGroup = createGroup(parent, 4);
-		caseGroup.setText(CSSUIMessages.PrefsLabel_CaseGroup);
-
-		// use group for radio buttons so that associated label is read
-		Group identGroup = createGroup(caseGroup, 1);
-		identGroup.setText(CSSUIMessages.PrefsLabel_CaseIdent);
-		fIdentUpper = createRadioButton(identGroup, CSSUIMessages.PrefsLabel_CaseIdentUpper);
-		fIdentLower = createRadioButton(identGroup, CSSUIMessages.PrefsLabel_CaseIdentLower);
-
-		// use group for radio buttons so that associated label is read
-		Group selectorGroup = createGroup(caseGroup, 1);
-		selectorGroup.setText(CSSUIMessages.PrefsLabel_SelectorTagName);
-		fSelectorUpper = createRadioButton(selectorGroup, CSSUIMessages.PrefsLabel_CaseIdentUpper);
-		fSelectorLower = createRadioButton(selectorGroup, CSSUIMessages.PrefsLabel_CaseIdentLower);
-
-		// use group for radio buttons so that associated label is read
-		Group propNameGroup = createGroup(caseGroup, 1);
-		propNameGroup.setText(CSSUIMessages.PrefsLabel_CasePropName);
-		fPropNameUpper = createRadioButton(propNameGroup, CSSUIMessages.PrefsLabel_CasePropNameUpper);
-		fPropNameLower = createRadioButton(propNameGroup, CSSUIMessages.PrefsLabel_CasePropNameLower);
-
-		// use group for radio buttons so that associated label is read
-		Group propValueGroup = createGroup(caseGroup, 1);
-		propValueGroup.setText(CSSUIMessages.PrefsLabel_CasePropValue);
-		fPropValueUpper = createRadioButton(propValueGroup, CSSUIMessages.PrefsLabel_CasePropValueUpper);
-		fPropValueLower = createRadioButton(propValueGroup, CSSUIMessages.PrefsLabel_CasePropValueLower);
-	}
-
-	private void createContentsForFormattingGroup(Composite parent) {
-		Group formattingGroup = createGroup(parent, 2);
-		formattingGroup.setText(CSSUIMessages.Formatting_UI_);
-
-		fLineWidthLabel = createLabel(formattingGroup, CSSUIMessages.Line_width__UI_);
-		fLineWidthText = new Text(formattingGroup, SWT.SINGLE | SWT.BORDER);
-		GridData gData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.BEGINNING);
-		gData.widthHint = 25;
-		fLineWidthText.setLayoutData(gData);
-		fLineWidthText.addModifyListener(this);
-
-		fPropertyPerLine = createCheckBox(formattingGroup, CSSUIMessages.PrefsLabel_WrappingInsertLineBreak);
-		((GridData) fPropertyPerLine.getLayoutData()).horizontalSpan = 2;
-
-		fNowrapAttr = createCheckBox(formattingGroup, CSSUIMessages.PrefsLabel_WrappingWithoutAttr);
-		((GridData) fNowrapAttr.getLayoutData()).horizontalSpan = 2;
-
-		// [269224] - Place the indent controls in their own composite for proper tab ordering
-		Composite indentComposite = createComposite(formattingGroup, 1);
-		((GridData) indentComposite.getLayoutData()).horizontalSpan = 2;
-		((GridLayout) indentComposite.getLayout()).marginWidth = 0;
-		((GridLayout) indentComposite.getLayout()).marginHeight = 0;
-
-		fIndentUsingTabs = createRadioButton(indentComposite, CSSUIMessages.Indent_using_tabs_);
-		((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1;
-		fIndentUsingSpaces = createRadioButton(indentComposite, CSSUIMessages.Indent_using_spaces);
-		((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1;
-
-		createLabel(formattingGroup, CSSUIMessages.Indentation_size);
-		fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY | SWT.BORDER);
-		GridData gd= new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		fIndentationSize.setLayoutData(gd);
-		fIndentationSize.setToolTipText(CSSUIMessages.Indentation_size_tip);
-		fIndentationSize.setMinimum(MIN_INDENTATION_SIZE);
-		fIndentationSize.setMaximum(MAX_INDENTATION_SIZE);
-		fIndentationSize.setIncrement(1);
-		fIndentationSize.setPageIncrement(4);
-		fIndentationSize.addModifyListener(this);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.preference.PreferencePage#doGetPreferenceStore()
-	 */
-	protected IPreferenceStore doGetPreferenceStore() {
-		return CSSUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private void doSavePreferenceStore() {
-		CSSUIPlugin.getDefault().savePluginPreferences();
-		CSSCorePlugin.getDefault().savePluginPreferences(); // model
-	}
-	
-	protected Preferences getModelPreferences() {
-		return CSSCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	protected void initializeValues() {
-		initializeValuesForFormattingGroup();
-		initializeValuesForContentAssistGroup();
-	}
-	
-	private void initializeValuesForContentAssistGroup() {
-		// not content assist, but preferred case
-		Preferences prefs = getModelPreferences();
-		fIdentUpper.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER);
-		fIdentLower.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.LOWER);
-		fSelectorUpper.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_SELECTOR) == CSSCorePreferenceNames.UPPER);
-		fSelectorLower.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_SELECTOR) == CSSCorePreferenceNames.LOWER);
-		fPropNameUpper.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.UPPER);
-		fPropNameLower.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.LOWER);
-		fPropValueUpper.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER);
-		fPropValueLower.setSelection(prefs.getInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.LOWER);
-	}
-
-	private void initializeValuesForFormattingGroup() {
-		// Formatting
-		Preferences prefs = getModelPreferences();
-		fLineWidthText.setText(prefs.getString(CSSCorePreferenceNames.LINE_WIDTH));
-		fPropertyPerLine.setSelection(prefs.getBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE));
-		fNowrapAttr.setSelection(prefs.getBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR));
-		
-		if (CSSCorePreferenceNames.TAB.equals(getModelPreferences().getString(CSSCorePreferenceNames.INDENTATION_CHAR))) {
-			fIndentUsingTabs.setSelection(true);
-			fIndentUsingSpaces.setSelection(false);
-		} else {
-			fIndentUsingSpaces.setSelection(true);
-			fIndentUsingTabs.setSelection(false);
-		}
-			
-		fIndentationSize.setSelection(getModelPreferences().getInt(CSSCorePreferenceNames.INDENTATION_SIZE));
-	}
-	
-	protected void performDefaults() {
-		performDefaultsForFormattingGroup();
-		performDefaultsForContentAssistGroup();
-
-		validateValues();
-		enableValues();
-
-		super.performDefaults();
-	}
-	
-	private void performDefaultsForContentAssistGroup() {
-		// not content assist, but preferred case
-		Preferences prefs = getModelPreferences();
-		fIdentUpper.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.UPPER);
-		fIdentLower.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_IDENTIFIER) == CSSCorePreferenceNames.LOWER);
-		fSelectorUpper.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_SELECTOR) == CSSCorePreferenceNames.UPPER);
-		fSelectorLower.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_SELECTOR) == CSSCorePreferenceNames.LOWER);
-		fPropNameUpper.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.UPPER);
-		fPropNameLower.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_PROPERTY_NAME) == CSSCorePreferenceNames.LOWER);
-		fPropValueUpper.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.UPPER);
-		fPropValueLower.setSelection(prefs.getDefaultInt(CSSCorePreferenceNames.CASE_PROPERTY_VALUE) == CSSCorePreferenceNames.LOWER);
-	}
-
-	private void performDefaultsForFormattingGroup() {
-		// Formatting
-		Preferences prefs = getModelPreferences();
-		fLineWidthText.setText(prefs.getDefaultString(CSSCorePreferenceNames.LINE_WIDTH));
-		fPropertyPerLine.setSelection(prefs.getDefaultBoolean(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE));
-		fNowrapAttr.setSelection(prefs.getDefaultBoolean(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR));
-		
-		if (CSSCorePreferenceNames.TAB.equals(getModelPreferences().getDefaultString(CSSCorePreferenceNames.INDENTATION_CHAR))) {
-			fIndentUsingTabs.setSelection(true);
-			fIndentUsingSpaces.setSelection(false);
-		} else {
-			fIndentUsingSpaces.setSelection(true);
-			fIndentUsingTabs.setSelection(false);
-		}		
-		fIndentationSize.setSelection(getModelPreferences().getDefaultInt(CSSCorePreferenceNames.INDENTATION_SIZE));
-	}
-
-	public boolean performOk() {
-		boolean result = super.performOk();
-
-		doSavePreferenceStore();
-
-		return result;
-	}
-
-	protected void storeValues() {
-		storeValuesForFormattingGroup();
-		storeValuesForContentAssistGroup();
-	}
-
-	private void storeValuesForContentAssistGroup() {
-		// not content assist, but preferred case
-		Preferences prefs = getModelPreferences();
-		prefs.setValue(CSSCorePreferenceNames.CASE_IDENTIFIER, (fIdentUpper.getSelection()) ? CSSCorePreferenceNames.UPPER : CSSCorePreferenceNames.LOWER);
-		prefs.setValue(CSSCorePreferenceNames.CASE_SELECTOR, (fSelectorUpper.getSelection()) ? CSSCorePreferenceNames.UPPER : CSSCorePreferenceNames.LOWER);
-		prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_NAME, (fPropNameUpper.getSelection()) ? CSSCorePreferenceNames.UPPER : CSSCorePreferenceNames.LOWER);
-		prefs.setValue(CSSCorePreferenceNames.CASE_PROPERTY_VALUE, (fPropValueUpper.getSelection()) ? CSSCorePreferenceNames.UPPER : CSSCorePreferenceNames.LOWER);
-	}
-	private void storeValuesForFormattingGroup() {
-		// Formatting
-		Preferences prefs = getModelPreferences();
-		prefs.setValue(CSSCorePreferenceNames.LINE_WIDTH, fLineWidthText.getText());
-		prefs.setValue(CSSCorePreferenceNames.WRAPPING_ONE_PER_LINE, fPropertyPerLine.getSelection());
-		prefs.setValue(CSSCorePreferenceNames.WRAPPING_PROHIBIT_WRAP_ON_ATTR, fNowrapAttr.getSelection());
-		
-		if (fIndentUsingTabs.getSelection()) {
-			getModelPreferences().setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.TAB);
-		} else {
-			getModelPreferences().setValue(CSSCorePreferenceNames.INDENTATION_CHAR, CSSCorePreferenceNames.SPACE);
-		}
-		getModelPreferences().setValue(CSSCorePreferenceNames.INDENTATION_SIZE, fIndentationSize.getSelection());
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSyntaxColoringPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSyntaxColoringPage.java
deleted file mode 100644
index c840995..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSSyntaxColoringPage.java
+++ /dev/null
@@ -1,902 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.preferences.ui;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.preference.ColorSelector;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.css.ui.internal.style.IStyleConstantsCSS;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-
-import com.ibm.icu.text.Collator;
-
-/**
- * A preference page to configure our XML syntax color. It resembles the JDT
- * and CDT pages far more than our original color page while retaining the
- * extra "click-to-find" functionality.
- */
-public final class CSSSyntaxColoringPage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	private Button fBold;
-	private Label fForegroundLabel;
-	private Label fBackgroundLabel;
-	private Button fClearStyle;
-	private Map fContextToStyleMap;
-	private Color fDefaultForeground = null;
-	private Color fDefaultBackground = null;
-	private IStructuredDocument fDocument;
-	private ColorSelector fForegroundColorEditor;
-	private ColorSelector fBackgroundColorEditor;
-	private Button fItalic;
-	private OverlayPreferenceStore fOverlayStore;
-	private Button fStrike;
-	private Collection fStylePreferenceKeys;
-	private StructuredViewer fStylesViewer = null;
-	private Map fStyleToDescriptionMap;
-	private StyledText fText;
-	private Button fUnderline;
-
-	// activate controls based on the given local color type
-	private void activate(String namedStyle) {
-		Color foreground = fDefaultForeground;
-		Color background = fDefaultBackground;
-		if (namedStyle == null) {
-			fClearStyle.setEnabled(false);
-			fBold.setEnabled(false);
-			fItalic.setEnabled(false);
-			fStrike.setEnabled(false);
-			fUnderline.setEnabled(false);
-			fForegroundLabel.setEnabled(false);
-			fBackgroundLabel.setEnabled(false);
-			fForegroundColorEditor.setEnabled(false);
-			fBackgroundColorEditor.setEnabled(false);
-			fBold.setSelection(false);
-			fItalic.setSelection(false);
-			fStrike.setSelection(false);
-			fUnderline.setSelection(false);
-		}
-		else {
-			TextAttribute attribute = getAttributeFor(namedStyle);
-			fClearStyle.setEnabled(true);
-			fBold.setEnabled(true);
-			fItalic.setEnabled(true);
-			fStrike.setEnabled(true);
-			fUnderline.setEnabled(true);
-			fForegroundLabel.setEnabled(true);
-			fBackgroundLabel.setEnabled(true);
-			fForegroundColorEditor.setEnabled(true);
-			fBackgroundColorEditor.setEnabled(true);
-			fBold.setSelection((attribute.getStyle() & SWT.BOLD) != 0);
-			fItalic.setSelection((attribute.getStyle() & SWT.ITALIC) != 0);
-			fStrike.setSelection((attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0);
-			fUnderline.setSelection((attribute.getStyle() & TextAttribute.UNDERLINE) != 0);
-			if (attribute.getForeground() != null) {
-				foreground = attribute.getForeground();
-			}
-			if (attribute.getBackground() != null) {
-				background = attribute.getBackground();
-			}
-		}
-
-		fForegroundColorEditor.setColorValue(foreground.getRGB());
-		fBackgroundColorEditor.setColorValue(background.getRGB());
-	}
-
-	/**
-	 * Color the text in the sample area according to the current preferences
-	 */
-	void applyStyles() {
-		if (fText == null || fText.isDisposed())
-			return;
-		IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion();
-		while (documentRegion != null) {
-			ITextRegionList regions = documentRegion.getRegions();
-			for (int i = 0; i < regions.size(); i++) {
-				ITextRegion currentRegion = regions.get(i);
-				// lookup the local coloring type and apply it
-				String namedStyle = (String) fContextToStyleMap.get(currentRegion.getType());
-				if (namedStyle == null)
-					continue;
-				TextAttribute attribute = getAttributeFor(namedStyle);
-				if (attribute == null)
-					continue;
-				StyleRange style = new StyleRange(documentRegion.getStartOffset(currentRegion), currentRegion.getTextLength(), attribute.getForeground(), attribute.getBackground(), attribute.getStyle());
-				style.strikeout = (attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0;
-				style.underline = (attribute.getStyle() & TextAttribute.UNDERLINE) != 0;
-				fText.setStyleRange(style);
-			}
-			documentRegion = documentRegion.getNext();
-		}
-	}
-
-	Button createCheckbox(Composite parent, String label) {
-		Button button = new Button(parent, SWT.CHECK);
-		button.setText(label);
-		button.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		return button;
-	}
-
-	/**
-	 * Creates composite control and sets the default layout data.
-	 */
-	private Composite createComposite(Composite parent, int numColumns) {
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.makeColumnsEqualWidth = false;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);
-		composite.setLayoutData(data);
-		return composite;
-	}
-
-	protected Control createContents(final Composite parent) {
-		initializeDialogUnits(parent);
-
-		fDefaultForeground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-		fDefaultBackground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-		Composite pageComponent = createComposite(parent, 2);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.CSS_PREFWEBX_STYLES_HELPID);
-
-		Link link = new Link(pageComponent, SWT.WRAP);
-		link.setText(SSEUIMessages.SyntaxColoring_Link);
-		link.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				PreferencesUtil.createPreferenceDialogOn(parent.getShell(), e.text, null, null);
-			}
-		});
-
-		GridData linkData= new GridData(SWT.FILL, SWT.BEGINNING, true, false, 2, 1);
-		linkData.widthHint= 150; // only expand further if anyone else requires it
-		link.setLayoutData(linkData);
-
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-
-		SashForm editor = new SashForm(pageComponent, SWT.VERTICAL);
-		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData2.horizontalSpan = 2;
-		editor.setLayoutData(gridData2);
-		SashForm top = new SashForm(editor, SWT.HORIZONTAL);
-		Composite styleEditor = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginRight = 5;
-		((GridLayout) styleEditor.getLayout()).marginLeft = 0;
-		createLabel(styleEditor, CSSUIMessages.SyntaxColoringPage_0);
-		fStylesViewer = createStylesViewer(styleEditor);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalIndent = 0;
-		Iterator iterator = fStyleToDescriptionMap.values().iterator();
-		while (iterator.hasNext()) {
-			gridData.widthHint = Math.max(gridData.widthHint, convertWidthInCharsToPixels(iterator.next().toString().length()));
-		}
-		gridData.heightHint = convertHeightInCharsToPixels(5);
-		fStylesViewer.getControl().setLayoutData(gridData);
-
-		Composite editingComposite = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginLeft = 5;
-		createLabel(editingComposite, "");
-		Button enabler = createCheckbox(editingComposite, CSSUIMessages.SyntaxColoringPage_2);
-		enabler.setEnabled(false);
-		enabler.setSelection(true);
-		Composite editControls = createComposite(editingComposite, 2);
-		((GridLayout) editControls.getLayout()).marginLeft = 20;
-
-		fForegroundLabel = createLabel(editControls, SSEUIMessages.Foreground_UI_);
-		((GridData) fForegroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		fForegroundLabel.setEnabled(false);
-
-		fForegroundColorEditor = new ColorSelector(editControls);
-		Button fForegroundColor = fForegroundColorEditor.getButton();
-		GridData gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fForegroundColor.setLayoutData(gd);
-		fForegroundColorEditor.setEnabled(false);
-
-		fBackgroundLabel = createLabel(editControls, SSEUIMessages.Background_UI_);
-		((GridData) fBackgroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		fBackgroundLabel.setEnabled(false);
-
-		fBackgroundColorEditor = new ColorSelector(editControls);
-		Button fBackgroundColor = fBackgroundColorEditor.getButton();
-		gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fBackgroundColor.setLayoutData(gd);
-		fBackgroundColorEditor.setEnabled(false);
-
-		fBold = createCheckbox(editControls, CSSUIMessages.SyntaxColoringPage_3);
-		fBold.setEnabled(false);
-		((GridData) fBold.getLayoutData()).horizontalSpan = 2;
-		fItalic = createCheckbox(editControls, CSSUIMessages.SyntaxColoringPage_4);
-		fItalic.setEnabled(false);
-		((GridData) fItalic.getLayoutData()).horizontalSpan = 2;
-		fStrike = createCheckbox(editControls, CSSUIMessages.SyntaxColoringPage_5);
-		fStrike.setEnabled(false);
-		((GridData) fStrike.getLayoutData()).horizontalSpan = 2;
-		fUnderline = createCheckbox(editControls, CSSUIMessages.SyntaxColoringPage_6);
-		fUnderline.setEnabled(false);
-		((GridData) fUnderline.getLayoutData()).horizontalSpan = 2;
-		fClearStyle = new Button(editingComposite, SWT.PUSH);
-		fClearStyle.setText(SSEUIMessages.Restore_Default_UI_); //$NON-NLS-1$ = "Restore Default"
-		fClearStyle.setLayoutData(new GridData(SWT.BEGINNING));
-		((GridData)fClearStyle.getLayoutData()).horizontalIndent = 20;
-		fClearStyle.setEnabled(false);
-
-		Composite sampleArea = createComposite(editor, 1);
-
-		((GridLayout) sampleArea.getLayout()).marginLeft = 5;
-		((GridLayout) sampleArea.getLayout()).marginTop = 5;
-		createLabel(sampleArea, SSEUIMessages.Sample_text__UI_); //$NON-NLS-1$ = "&Sample text:"
-		SourceViewer viewer = new SourceViewer(sampleArea, null, SWT.BORDER | SWT.LEFT_TO_RIGHT | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY);
-		fText = viewer.getTextWidget();
-		GridData gridData3 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData3.widthHint = convertWidthInCharsToPixels(20);
-		gridData3.heightHint = convertHeightInCharsToPixels(5);
-		gridData3.horizontalSpan = 2;
-		fText.setLayoutData(gridData3);
-		fText.setEditable(false);
-		fText.setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont"));
-		fText.addKeyListener(getTextKeyListener());
-		fText.addSelectionListener(getTextSelectionListener());
-		fText.addMouseListener(getTextMouseListener());
-		fText.addTraverseListener(getTraverseListener());
-		setAccessible(fText, SSEUIMessages.Sample_text__UI_);
-		fDocument = StructuredModelManager.getModelManager().createStructuredDocumentFor(ContentTypeIdForCSS.ContentTypeID_CSS);
-		fDocument.set(getExampleText());
-		viewer.setDocument(fDocument);
-
-		top.setWeights(new int[]{1, 1});
-		editor.setWeights(new int[]{1, 1});
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.CSS_PREFWEBX_STYLES_HELPID);
-
-		fStylesViewer.setInput(getStylePreferenceKeys());
-
-		applyStyles();
-
-		fStylesViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!event.getSelection().isEmpty()) {
-					Object o = ((IStructuredSelection) event.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					activate(namedStyle);
-					if (namedStyle == null)
-						return;
-				}
-			}
-		});
-
-		fForegroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[0];
-						// open color dialog to get new color
-						String newValue = ColorHelper.toRGBString(fForegroundColorEditor.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[0] = newValue;
-							String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle, newPrefString);
-							applyStyles();
-							fText.redraw();
-						}
-					}
-				}
-			}
-		});
-
-		fBackgroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[1];
-						// open color dialog to get new color
-						String newValue = ColorHelper.toRGBString(fBackgroundColorEditor.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[1] = newValue;
-							String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle, newPrefString);
-							applyStyles();
-							fText.redraw();
-							activate(namedStyle);
-						}
-					}
-				}
-			}
-		});
-
-		fBold.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[2];
-					String newValue = String.valueOf(fBold.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[2] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fItalic.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[3];
-					String newValue = String.valueOf(fItalic.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[3] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fStrike.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[4];
-					String newValue = String.valueOf(fStrike.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[4] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fUnderline.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[5];
-					String newValue = String.valueOf(fUnderline.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[5] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-		
-		fClearStyle.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fStylesViewer.getSelection().isEmpty())
-					return;
-				String namedStyle = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement().toString();
-				getOverlayStore().setToDefault(namedStyle);
-				applyStyles();
-				fText.redraw();
-				activate(namedStyle);
-			}
-		});
-
-		return pageComponent;
-	}
-
-	private Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
-		label.setLayoutData(data);
-		label.setBackground(parent.getBackground());
-		return label;
-	}
-
-	// protected Label createDescriptionLabel(Composite parent) {
-	// return null;
-	// }
-
-	/**
-	 * Set up all the style preference keys in the overlay store
-	 */
-	private OverlayKey[] createOverlayStoreKeys() {
-		List overlayKeys = new ArrayList();
-
-		Iterator i = getStylePreferenceKeys().iterator();
-		while (i.hasNext()) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String) i.next()));
-		}
-
-		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return keys;
-	}
-
-	/**
-	 * Creates the List viewer where we see the various syntax element display
-	 * names--would it ever be a Tree like JDT's?
-	 * 
-	 * @param parent
-	 * @return
-	 */
-	private StructuredViewer createStylesViewer(Composite parent) {
-		StructuredViewer stylesViewer = new ListViewer(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		stylesViewer.setComparator(new ViewerComparator(Collator.getInstance()));
-		stylesViewer.setLabelProvider(new LabelProvider() {
-			public String getText(Object element) {
-				Object description = fStyleToDescriptionMap.get(element);
-				if (description != null)
-					return description.toString();
-				return super.getText(element);
-			}
-		});
-		stylesViewer.setContentProvider(new ITreeContentProvider() {
-			public void dispose() {
-			}
-
-			public Object[] getChildren(Object parentElement) {
-				return getStylePreferenceKeys().toArray();
-			}
-
-			public Object[] getElements(Object inputElement) {
-				return getChildren(inputElement);
-			}
-
-			public Object getParent(Object element) {
-				return getStylePreferenceKeys();
-			}
-
-			public boolean hasChildren(Object element) {
-				return false;
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			}
-		});
-		return stylesViewer;
-	}
-
-	public void dispose() {
-		if (fOverlayStore != null) {
-			fOverlayStore.stop();
-		}
-		super.dispose();
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return CSSUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private TextAttribute getAttributeFor(String namedStyle) {
-		TextAttribute ta = new TextAttribute(fDefaultForeground, fDefaultBackground, SWT.NORMAL);
-
-		if (namedStyle != null && fOverlayStore != null) {
-			// note: "namedStyle" *is* the preference key
-			String prefString = getOverlayStore().getString(namedStyle);
-			String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-			if (stylePrefs != null) {
-				RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-				RGB background = ColorHelper.toRGB(stylePrefs[1]);
-
-				int fontModifier = SWT.NORMAL;
-
-				if (stylePrefs.length > 2) {
-					boolean on = Boolean.valueOf(stylePrefs[2]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.BOLD;
-				}
-				if (stylePrefs.length > 3) {
-					boolean on = Boolean.valueOf(stylePrefs[3]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.ITALIC;
-				}
-				if (stylePrefs.length > 4) {
-					boolean on = Boolean.valueOf(stylePrefs[4]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | TextAttribute.STRIKETHROUGH;
-				}
-				if (stylePrefs.length > 5) {
-					boolean on = Boolean.valueOf(stylePrefs[5]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | TextAttribute.UNDERLINE;
-				}
-
-				ta = new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, fontModifier);
-			}
-		}
-		return ta;
-	}
-
-	private String getExampleText() {
-		return CSSUIMessages.PrefsLabel_ColorSample;
-	}
-
-	private String getNamedStyleAtOffset(int offset) {
-		// ensure the offset is clean
-		if (offset >= fDocument.getLength())
-			return getNamedStyleAtOffset(fDocument.getLength() - 1);
-		else if (offset < 0)
-			return getNamedStyleAtOffset(0);
-		IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion();
-		while (documentRegion != null && !documentRegion.containsOffset(offset)) {
-			documentRegion = documentRegion.getNext();
-		}
-		if (documentRegion != null) {
-			// find the ITextRegion's Context at this offset
-			ITextRegion interest = documentRegion.getRegionAtCharacterOffset(offset);
-			if (interest == null)
-				return null;
-			if (offset > documentRegion.getTextEndOffset(interest))
-				return null;
-			String regionContext = interest.getType();
-			if (regionContext == null)
-				return null;
-			// find the named style (internal/selectable name) for that
-			// context
-			String namedStyle = (String) fContextToStyleMap.get(regionContext);
-			if (namedStyle != null) {
-				return namedStyle;
-			}
-		}
-		return null;
-	}
-
-	private OverlayPreferenceStore getOverlayStore() {
-		return fOverlayStore;
-	}
-
-	private Collection getStylePreferenceKeys() {
-		if (fStylePreferenceKeys == null) {
-			List styles = new ArrayList();
-			styles.add(IStyleConstantsCSS.NORMAL);
-			styles.add(IStyleConstantsCSS.ATMARK_RULE);
-			styles.add(IStyleConstantsCSS.SELECTOR);
-			styles.add(IStyleConstantsCSS.UNIVERSAL);
-			styles.add(IStyleConstantsCSS.COMBINATOR);
-			styles.add(IStyleConstantsCSS.SELECTOR_CLASS);
-			styles.add(IStyleConstantsCSS.ID);
-			styles.add(IStyleConstantsCSS.PSEUDO);
-			styles.add(IStyleConstantsCSS.ATTRIBUTE_DELIM);
-			styles.add(IStyleConstantsCSS.ATTRIBUTE_NAME);
-			styles.add(IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
-			styles.add(IStyleConstantsCSS.ATTRIBUTE_VALUE);
-			styles.add(IStyleConstantsCSS.MEDIA);
-			styles.add(IStyleConstantsCSS.COMMENT);
-			styles.add(IStyleConstantsCSS.PROPERTY_NAME);
-			styles.add(IStyleConstantsCSS.PROPERTY_VALUE);
-			styles.add(IStyleConstantsCSS.URI);
-			styles.add(IStyleConstantsCSS.STRING);
-			styles.add(IStyleConstantsCSS.COLON);
-			styles.add(IStyleConstantsCSS.SEMI_COLON);
-			styles.add(IStyleConstantsCSS.CURLY_BRACE);
-			styles.add(IStyleConstantsCSS.ERROR);
-			fStylePreferenceKeys = styles;
-		}
-		return fStylePreferenceKeys;
-	}
-
-	private KeyListener getTextKeyListener() {
-		return new KeyListener() {
-			public void keyPressed(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-
-			public void keyReleased(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private MouseListener getTextMouseListener() {
-		return new MouseListener() {
-			public void mouseDoubleClick(MouseEvent e) {
-			}
-
-			public void mouseDown(MouseEvent e) {
-			}
-
-			public void mouseUp(MouseEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private SelectionListener getTextSelectionListener() {
-		return new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-		};
-	}
-
-	private TraverseListener getTraverseListener() {
-		return new TraverseListener() {
-			/**
-			 * @see org.eclipse.swt.events.TraverseListener#keyTraversed(TraverseEvent)
-			 */
-			public void keyTraversed(TraverseEvent e) {
-				if (e.widget instanceof StyledText) {
-					if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS))
-						e.doit = true;
-				}
-			}
-		};
-	}
-
-	public void init(IWorkbench workbench) {
-		setDescription(SSEUIMessages.SyntaxColoring_Description);
-
-		fStyleToDescriptionMap = new HashMap();
-		fContextToStyleMap = new HashMap();
-
-		initStyleToDescriptionMap();
-		initRegionContextToStyleMap();
-
-		fOverlayStore = new OverlayPreferenceStore(getPreferenceStore(), createOverlayStoreKeys());
-		fOverlayStore.load();
-		fOverlayStore.start();
-	}
-
-	private void initRegionContextToStyleMap() {
-		fContextToStyleMap.put(CSSRegionContexts.CSS_COMMENT, IStyleConstantsCSS.COMMENT);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_CDO, IStyleConstantsCSS.COMMENT);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_CDC, IStyleConstantsCSS.COMMENT);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_S, IStyleConstantsCSS.NORMAL);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DELIMITER, IStyleConstantsCSS.SEMI_COLON);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_LBRACE, IStyleConstantsCSS.CURLY_BRACE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_RBRACE, IStyleConstantsCSS.CURLY_BRACE);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_IMPORT, IStyleConstantsCSS.ATMARK_RULE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_PAGE, IStyleConstantsCSS.ATMARK_RULE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_MEDIA, IStyleConstantsCSS.ATMARK_RULE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_FONT_FACE, IStyleConstantsCSS.ATMARK_RULE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_CHARSET, IStyleConstantsCSS.ATMARK_RULE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_ATKEYWORD, IStyleConstantsCSS.ATMARK_RULE);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_STRING, IStyleConstantsCSS.STRING);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_URI, IStyleConstantsCSS.URI);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_MEDIUM, IStyleConstantsCSS.MEDIA);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_MEDIA_SEPARATOR, IStyleConstantsCSS.MEDIA);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_CHARSET_NAME, IStyleConstantsCSS.STRING);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_PAGE_SELECTOR, IStyleConstantsCSS.MEDIA);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME, IStyleConstantsCSS.SELECTOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_UNIVERSAL, IStyleConstantsCSS.UNIVERSAL);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_PSEUDO, IStyleConstantsCSS.PSEUDO);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_CLASS, IStyleConstantsCSS.SELECTOR_CLASS);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ID, IStyleConstantsCSS.ID);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_COMBINATOR, IStyleConstantsCSS.COMBINATOR);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_SEPARATOR, IStyleConstantsCSS.SELECTOR);
-
-		/* Attribute selector */
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START, IStyleConstantsCSS.ATTRIBUTE_DELIM);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END, IStyleConstantsCSS.ATTRIBUTE_DELIM);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME, IStyleConstantsCSS.ATTRIBUTE_NAME);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE, IStyleConstantsCSS.ATTRIBUTE_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR, IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_PROPERTY, IStyleConstantsCSS.PROPERTY_NAME);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_STRING, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_HASH, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_UNICODE_RANGE, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IMPORTANT, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_VALUE_S, IStyleConstantsCSS.PROPERTY_VALUE);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_SEPARATOR, IStyleConstantsCSS.COLON);
-		fContextToStyleMap.put(CSSRegionContexts.CSS_DECLARATION_DELIMITER, IStyleConstantsCSS.SEMI_COLON);
-
-		fContextToStyleMap.put(CSSRegionContexts.CSS_UNKNOWN, IStyleConstantsCSS.ERROR);
-	}
-
-	private void initStyleToDescriptionMap() {
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.NORMAL, CSSUIMessages.PrefsLabel_ColorNormal);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATMARK_RULE, CSSUIMessages.PrefsLabel_ColorAtmarkRule);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.SELECTOR, CSSUIMessages.PrefsLabel_ColorSelector);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.COMBINATOR, CSSUIMessages.PrefsLabel_ColorCombinator);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.UNIVERSAL, CSSUIMessages.PrefsLabel_ColorUniversal);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.ID, CSSUIMessages.PrefsLabel_ColorId);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.PSEUDO, CSSUIMessages.PrefsLabel_ColorPseudoClass);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.SELECTOR_CLASS, CSSUIMessages.PrefsLabel_ColorClass);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_DELIM, CSSUIMessages.PrefsLabel_ColorAttrDelimiter);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_NAME, CSSUIMessages.PrefsLabel_ColorAttrName);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_OPERATOR, CSSUIMessages.PrefsLabel_ColorAttrOperator);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.ATTRIBUTE_VALUE, CSSUIMessages.PrefsLabel_ColorAttrValue);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.MEDIA, CSSUIMessages.PrefsLabel_ColorMedia);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.COMMENT, CSSUIMessages.PrefsLabel_ColorComment);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.PROPERTY_NAME, CSSUIMessages.PrefsLabel_ColorPropertyName);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.PROPERTY_VALUE, CSSUIMessages.PrefsLabel_ColorPropertyValue);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.URI, CSSUIMessages.PrefsLabel_ColorUri);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.STRING, CSSUIMessages.PrefsLabel_ColorString);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.COLON, CSSUIMessages.PrefsLabel_ColorColon);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.SEMI_COLON, CSSUIMessages.PrefsLabel_ColorSemiColon);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.CURLY_BRACE, CSSUIMessages.PrefsLabel_ColorCurlyBrace);//$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsCSS.ERROR, CSSUIMessages.PrefsLabel_ColorError);//$NON-NLS-1$
-	}
-
-	protected void performDefaults() {
-		super.performDefaults();
-		getOverlayStore().loadDefaults();
-		applyStyles();
-		fStylesViewer.setSelection(StructuredSelection.EMPTY);
-		activate(null);
-		fText.redraw();
-	}
-
-	public boolean performOk() {
-		getOverlayStore().propagate();
-
-		CSSUIPlugin.getDefault().savePluginPreferences();
-		SSEUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	private void selectColorAtOffset(int offset) {
-		String namedStyle = getNamedStyleAtOffset(offset);
-		if (namedStyle != null) {
-			fStylesViewer.setSelection(new StructuredSelection(namedStyle));
-			fStylesViewer.reveal(namedStyle);
-		}
-		else {
-			fStylesViewer.setSelection(StructuredSelection.EMPTY);
-		}
-		activate(namedStyle);
-	}
-
-	/**
-	 * Specifically set the reporting name of a control for accessibility
-	 */
-	private void setAccessible(Control control, String name) {
-		if (control == null)
-			return;
-		final String n = name;
-		control.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				if (e.childID == ACC.CHILDID_SELF)
-					e.result = n;
-			}
-		});
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSTemplatePreferencePage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSTemplatePreferencePage.java
deleted file mode 100644
index 419351e..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/preferences/ui/CSSTemplatePreferencePage.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.preferences.ui;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * Preference page for CSS templates
- */
-public class CSSTemplatePreferencePage extends TemplatePreferencePage {
-
-	class CSSEditTemplateDialog extends EditTemplateDialog {
-		public CSSEditTemplateDialog(Shell parent, Template template, boolean edit, boolean isNameModifiable, ContextTypeRegistry registry) {
-			super(parent, template, edit, isNameModifiable, registry);
-		}
-
-		protected SourceViewer createViewer(Composite parent) {			SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationCSS();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-
-			public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-				ContentAssistant assistant = new ContentAssistant();
-				assistant.enableAutoActivation(true);
-				assistant.enableAutoInsert(true);
-				assistant.setContentAssistProcessor(getTemplateProcessor(), IDocument.DEFAULT_CONTENT_TYPE);
-				return assistant;
-			}
-		};
-		return doCreateViewer(parent, sourceViewerConfiguration);
-}
-	}
-
-	public CSSTemplatePreferencePage() {
-		CSSUIPlugin cssUIPlugin = CSSUIPlugin.getDefault();
-
-		setPreferenceStore(cssUIPlugin.getPreferenceStore());
-		setTemplateStore(cssUIPlugin.getTemplateStore());
-		setContextTypeRegistry(cssUIPlugin.getTemplateContextRegistry());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		boolean ok = super.performOk();
-		CSSUIPlugin.getDefault().savePluginPreferences();
-		return ok;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#isShowFormatterSetting()
-	 */
-	protected boolean isShowFormatterSetting() {
-		// template formatting has not been implemented
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite ancestor) {
-		Control c = super.createContents(ancestor);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IHelpContextIds.CSS_PREFWEBX_TEMPLATES_HELPID);
-		return c;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
-	protected SourceViewer createViewer(Composite parent) {
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationCSS();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		return doCreateViewer(parent, sourceViewerConfiguration);
-	}
-
-	SourceViewer doCreateViewer(Composite parent, SourceViewerConfiguration viewerConfiguration) {
-		SourceViewer viewer = null;
-		String contentTypeID = ContentTypeIdForCSS.ContentTypeID_CSS;
-		viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-		IDocument document = scratchModel.getStructuredDocument();
-		viewer.configure(viewerConfiguration);
-		viewer.setDocument(document);
-		return viewer;
-	}
-
-	/**
-	 * Creates the edit dialog. Subclasses may override this method to provide
-	 * a custom dialog.
-	 * 
-	 * @param template
-	 *            the template being edited
-	 * @param edit
-	 *            whether the dialog should be editable
-	 * @param isNameModifiable
-	 *            whether the template name may be modified
-	 * @return the created or modified template, or <code>null</code> if the
-	 *         edition failed
-	 * @since 3.1
-	 */
-	protected Template editTemplate(Template template, boolean edit, boolean isNameModifiable) {
-		EditTemplateDialog dialog = new CSSEditTemplateDialog(getShell(), template, edit, isNameModifiable, getContextTypeRegistry());
-		if (dialog.open() == Window.OK) {
-			return dialog.getTemplate();
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/CSSFoldingStrategy.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/CSSFoldingStrategy.java
deleted file mode 100644
index 2811691..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/CSSFoldingStrategy.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.projection;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleRule;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingStrategy;
-
-/**
- * A folding strategy for CSS structured documents.
- * See AbstractStructuredFoldingStrategy for more details.
- */
-public class CSSFoldingStrategy extends AbstractStructuredFoldingStrategy {
-
-	/**
-	 * Create an instance of the folding strategy.
-	 * Be sure to set the viewer and document after creation.
-	 */
-	public CSSFoldingStrategy() {
-		super();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractFoldingStrategy#calcNewFoldPosition(org.eclipse.wst.sse.core.internal.provisional.IndexedRegion)
-	 */
-	protected Position calcNewFoldPosition(IndexedRegion indexedRegion) {
-		Position newPos = null;
-		
-		//only want to fold regions with a valid range
-		if(indexedRegionValidType(indexedRegion) && indexedRegion.getStartOffset() >= 0 && indexedRegion.getLength() >= 0) {
-			newPos = new CSSRuleFoldingPosition(indexedRegion);
-		}
-		return newPos;
-	}
-	
-	/**
-	 * The same as the AbstractFoldingStrategy implementation except for the new position is
-	 * calculated on the given IndexRegion and not the annotations stored IndexedRegion because
-	 * of the way CSS regions are replaced when they are updated.
-	 * 
-	 * (non-Javadoc)
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingStrategy#updateAnnotations(java.util.Iterator, org.eclipse.wst.sse.core.internal.provisional.IndexedRegion, java.util.List, java.util.List)
-	 */
-	protected void updateAnnotations(Iterator existingAnnotationsIter, IndexedRegion dirtyRegion,
-			List modifications, List deletions) {
-		
-		while(existingAnnotationsIter.hasNext()) {
-			Object obj = existingAnnotationsIter.next();
-			if(obj instanceof FoldingAnnotation) {
-				FoldingAnnotation annotation = (FoldingAnnotation)obj;
-				
-				//NOTE can not use the annotations stored region because the CSSStructuredDocument
-				//	replaces the old region with a new one when it is modified
-				Position newPos = calcNewFoldPosition(annotation.getRegion());
-				if(newPos != null) {
-					Position oldPos = fProjectionAnnotationModel.getPosition(annotation);
-					if(!newPos.equals(oldPos)) {
-						oldPos.setOffset(newPos.offset);
-						oldPos.setLength(newPos.length);
-						modifications.add(annotation);
-					}
-				} else {
-					deletions.add(annotation);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractFoldingStrategy#indexedRegionValidType(org.eclipse.wst.sse.core.internal.provisional.IndexedRegion)
-	 */
-	protected boolean indexedRegionValidType(IndexedRegion indexedRegion) {
-		return (indexedRegion instanceof ICSSStyleRule);
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/CSSRuleFoldingPosition.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/CSSRuleFoldingPosition.java
deleted file mode 100644
index dfc0984..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/projection/CSSRuleFoldingPosition.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.projection;
-
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingPosition;
-import org.w3c.dom.css.CSSStyleRule;
-
-/**
- * An {@link AbstractStructuredFoldingPosition} used to cover CSS regions
- */
-public class CSSRuleFoldingPosition extends AbstractStructuredFoldingPosition {
-
-	/**
-	 * the region that will be folded
-	 */
-	private IndexedRegion fRegion;
-	
-	/**
-	 * Creates a folding position that covers {@link IndexedRegion}s
-	 * in a CSS document
-	 * 
-	 * @param region the {@link IndexedRegion} that this folding position covers
-	 */
-	public CSSRuleFoldingPosition(IndexedRegion region) {
-		super(region.getStartOffset(), region.getLength());
-		this.fRegion = region;
-	}
-	
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingPosition#getStartOffset()
-	 */
-	protected int getStartOffset() {
-		int startOffset = fRegion.getStartOffset();
-		
-		//so that multi-line CSS selector text does not get folded
-		if(this.fRegion instanceof CSSStyleRule) {
-			CSSStyleRule rule = (CSSStyleRule)this.fRegion;
-			startOffset += rule.getSelectorText().length();
-		}
-		
-		return startOffset;
-	}
-	
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingPosition#getEndOffset()
-	 */
-	protected int getEndOffset() {
-		return fRegion.getEndOffset();
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java
deleted file mode 100644
index 5060e8b..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSPropertySource.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.properties;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMCategory;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMMNode;
-import org.eclipse.wst.css.core.internal.metamodel.CSSMetaModel;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelFinder;
-import org.eclipse.wst.css.core.internal.metamodel.util.CSSMetaModelUtil;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNodeList;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.sse.ui.views.properties.IPropertySourceExtension;
-import org.w3c.dom.css.CSSStyleDeclaration;
-
-/**
- * A IPropertySource implementation for a JFace viewer used to display
- * properties of CSS nodes.
- */
-public class CSSPropertySource implements IPropertySource, IPropertySourceExtension {
-	protected ICSSNode fNode = null;
-	// for performance...
-	final static Class ADAPTER_KEY = IPropertySource.class;
-	final boolean PERF_GETDESCRIPTORS = false;
-	private long time0;
-
-	public CSSPropertySource(ICSSNode target) {
-		super();
-		fNode =  target;
-	}
-
-	protected IPropertyDescriptor createDefaultPropertyDescriptor(String attributeName) {
-		// the displayName MUST be set
-		IPropertyDescriptor descriptor = new CSSTextPropertyDescriptor(attributeName, attributeName, fNode);
-		// IPropertyDescriptor descriptor = new
-		// TextPropertyDescriptor(attributeName, attributeName);
-		return descriptor;
-	}
-
-	protected IPropertyDescriptor createPropertyDescriptor(CSSMMNode node, String category) {
-		return createPropertyDescriptor(node.getName(), category);
-	}
-
-	protected IPropertyDescriptor createPropertyDescriptor(String name, String category) {
-		IPropertyDescriptor descriptor = null;
-		if (name != null && 0 < name.length()) {
-			name = name.toLowerCase();
-			if (category == null) {
-				category = CSSUIMessages.INFO_Not_Categorized_1; //$NON-NLS-1$
-			}
-			descriptor = new CSSTextPropertyDescriptor(name, name, fNode, category);
-			// if (category == null) {
-			// descriptor = new CSSTextPropertyDescriptor(name, name, fNode);
-			// } else {
-			// descriptor = new CSSTextPropertyDescriptor(name, name, fNode,
-			// category);
-			// }
-		}
-		return descriptor;
-	}
-
-	/**
-	 * Returns a value for this object that can be editted in a property
-	 * sheet.
-	 * 
-	 * @return a value that can be editted
-	 */
-	public Object getEditableValue() {
-		return null;
-	}
-
-	/**
-	 * Returns the current collection of property descriptors.
-	 * 
-	 * @return a vector containing all descriptors.
-	 */
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		time0 = System.currentTimeMillis();
-
-		CSSMetaModel metamodel = CSSMetaModelFinder.getInstance().findMetaModelFor(fNode);
-		Iterator iProperties = Collections.EMPTY_LIST.iterator();
-		switch (fNode.getNodeType()) {
-			case ICSSNode.STYLERULE_NODE :
-			case ICSSNode.FONTFACERULE_NODE :
-			case ICSSNode.PAGERULE_NODE :
-			case ICSSNode.STYLEDECLARATION_NODE :
-				CSSMMNode mmParent = new CSSMetaModelUtil(metamodel).getMetaModelNodeFor(fNode);
-				if (mmParent != null) {
-					iProperties = mmParent.getChildNodes();
-				}
-				break;
-			case ICSSNode.STYLEDECLITEM_NODE :
-				CSSMMNode mmNode = new CSSMetaModelUtil(metamodel).getMetaModelNodeFor(fNode);
-				if (mmNode != null) {
-					iProperties = Collections.singletonList(mmNode).iterator();
-				}
-				break;
-			default :
-				break;
-		}
-
-		// setup categories
-		Map categories = new HashMap();
-		Iterator iCategories = metamodel.getCategories();
-		while (iCategories.hasNext()) {
-			CSSMMCategory category = (CSSMMCategory) iCategories.next();
-			categories.put(category.getName(), category.getCaption());
-		}
-
-		// collect property names
-		Set declaredProperties = new HashSet();
-		if (iProperties.hasNext()) {
-			CSSStyleDeclaration declaration = getDeclarationNode();
-			if (declaration != null) {
-				ICSSNodeList nodeList = ((ICSSNode) declaration).getChildNodes();
-				int nProps = (nodeList != null) ? nodeList.getLength() : 0;
-				for (int i = 0; i < nProps; i++) {
-					ICSSNode node = nodeList.item(i);
-					if (node instanceof ICSSStyleDeclItem) {
-						String name = ((ICSSStyleDeclItem) node).getPropertyName();
-						if (name != null && 0 < name.length()) {
-							declaredProperties.add(name.toLowerCase());
-						}
-					}
-				}
-			}
-		}
-
-		List descriptors = new ArrayList();
-
-		// first: properties from content model
-		while (iProperties.hasNext()) {
-			CSSMMNode node = (CSSMMNode) iProperties.next();
-			if (node.getType() == CSSMMNode.TYPE_PROPERTY || node.getType() == CSSMMNode.TYPE_DESCRIPTOR) {
-				String category = (String) categories.get(node.getAttribute("category")); //$NON-NLS-1$
-				String name = node.getName().toLowerCase();
-				if (declaredProperties.contains(name)) {
-					declaredProperties.remove(name);
-				}
-				IPropertyDescriptor descriptor = createPropertyDescriptor(name, category);
-				if (descriptor != null) {
-					descriptors.add(descriptor);
-				}
-			}
-		}
-
-		// second: existing properties but not in content model
-		Iterator iRemains = declaredProperties.iterator();
-		while (iRemains.hasNext()) {
-			IPropertyDescriptor descriptor = createPropertyDescriptor((String) iRemains.next(), null);
-			if (descriptor != null) {
-				descriptors.add(descriptor);
-			}
-		}
-
-		IPropertyDescriptor[] resultArray = new IPropertyDescriptor[descriptors.size()];
-		if (PERF_GETDESCRIPTORS) {
-			System.out.println(getClass().getName() + ".getPropertyDescriptors: " + (System.currentTimeMillis() - time0) + "ms"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		return (IPropertyDescriptor[]) descriptors.toArray(resultArray);
-	}
-
-	/**
-	 * Returns the current value for the named property.
-	 * 
-	 * @param name
-	 *            the name of the property as named by its property descriptor
-	 * @return the current value of the property
-	 */
-	public Object getPropertyValue(Object name) {
-		if (name == null) {
-			return ""; //$NON-NLS-1$
-		}
-
-		String valueString = null;
-		String nameString = name.toString();
-
-		CSSStyleDeclaration declaration = null;
-
-		switch (fNode.getNodeType()) {
-			case ICSSNode.STYLEDECLITEM_NODE :
-				valueString = ((ICSSStyleDeclItem) fNode).getCSSValueText();
-				break;
-			case ICSSNode.STYLERULE_NODE :
-			case ICSSNode.FONTFACERULE_NODE :
-			case ICSSNode.PAGERULE_NODE :
-				declaration = (CSSStyleDeclaration) fNode.getFirstChild();
-				if (declaration != null) {
-					valueString = declaration.getPropertyValue(nameString);
-				}
-				break;
-			case ICSSNode.STYLEDECLARATION_NODE :
-				valueString = ((CSSStyleDeclaration) fNode).getPropertyValue(nameString);
-				break;
-			case ICSSNode.PRIMITIVEVALUE_NODE :
-				ICSSNode parent = fNode;
-				while (parent != null && !(parent instanceof ICSSStyleDeclItem)) {
-					parent = parent.getParentNode();
-				}
-				if (parent != null) {
-					valueString = ((ICSSStyleDeclItem) parent).getCSSValueText();
-				}
-				break;
-			default :
-				break;
-		}
-
-		if (valueString == null) {
-			valueString = ""; //$NON-NLS-1$
-		}
-
-		return valueString;
-	}
-
-	/**
-	 * Returns whether the property value has changed from the default.
-	 * 
-	 * @return <code>true</code> if the value of the specified property has
-	 *         changed from its original default value; <code>false</code>
-	 *         otherwise.
-	 */
-	public boolean isPropertySet(Object property) {
-		if (property == null) {
-			return false;
-		}
-		CSSStyleDeclaration declaration = getDeclarationNode();
-		if (declaration != null) {
-			String value = declaration.getPropertyValue(property.toString());
-			if (value != null && 0 < value.length()) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Resets the specified property's value to its default value.
-	 * 
-	 * @param property
-	 *            the property to reset
-	 */
-	public void resetPropertyValue(Object str) {
-		if (str == null) {
-			return;
-		}
-		CSSStyleDeclaration declaration = getDeclarationNode();
-		if (declaration != null) {
-			declaration.removeProperty(str.toString());
-		}
-	}
-
-	/**
-	 * Sets the named property to the given value.
-	 * 
-	 * @param name
-	 *            the name of the property being set
-	 * @param value
-	 *            the new value for the property
-	 */
-	public void setPropertyValue(Object name, Object value) {
-		if (name == null) {
-			return;
-		}
-		String valueString = (value != null) ? value.toString() : null;
-		String nameString = name.toString();
-		CSSStyleDeclaration declaration = getDeclarationNode();
-		if (declaration != null) {
-			try {
-				if (valueString == null || valueString.length() <= 0) {
-					declaration.removeProperty(nameString);
-				}
-				else {
-					declaration.setProperty(nameString, valueString, ""); //$NON-NLS-1$
-				}
-			}
-			catch (Exception e) {
-				IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-				String title = CSSUIMessages.Title_InvalidValue; //$NON-NLS-1$
-				String message = CSSUIMessages.Message_InvalidValue; //$NON-NLS-1$
-				MessageDialog.openWarning(window.getShell(), title, message);
-			}
-		}
-	}
-
-	private CSSStyleDeclaration getDeclarationNode() {
-		CSSStyleDeclaration declaration = null;
-
-		switch (fNode.getNodeType()) {
-			case ICSSNode.STYLEDECLITEM_NODE :
-				declaration = (CSSStyleDeclaration) fNode.getParentNode();
-				break;
-			case ICSSNode.STYLERULE_NODE :
-			case ICSSNode.FONTFACERULE_NODE :
-			case ICSSNode.PAGERULE_NODE :
-				declaration = (CSSStyleDeclaration) fNode.getFirstChild();
-				break;
-			case ICSSNode.STYLEDECLARATION_NODE :
-				declaration = (CSSStyleDeclaration) fNode;
-				break;
-			case ICSSNode.PRIMITIVEVALUE_NODE :
-				ICSSNode parent = fNode;
-				while (parent != null && !(parent instanceof CSSStyleDeclaration)) {
-					parent = parent.getParentNode();
-				}
-				if (parent != null) {
-					declaration = (CSSStyleDeclaration) parent;
-				}
-				break;
-			default :
-				break;
-		}
-
-		return declaration;
-	}
-
-	// Bug 130039 - Implement IPropertySourceExtension
-	
-	public boolean isPropertyRemovable(Object name) {
-		return true;
-	}
-
-	public void removeProperty(Object name) {
-		if(name == null)
-			return;
-		
-		CSSStyleDeclaration declaration = getDeclarationNode();
-		
-		if(declaration != null)
-			declaration.removeProperty(name.toString());
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java
deleted file mode 100644
index 77c27a9..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/properties/CSSTextPropertyDescriptor.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.properties;
-
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.util.CSSPathService;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
- */
-public class CSSTextPropertyDescriptor extends TextPropertyDescriptor {
-	private final ICSSNode fNode;
-
-	/**
-	 * CSSTextPropertyDescriptor constructor comment.
-	 * 
-	 * @param id
-	 *            java.lang.String
-	 * @param displayName
-	 *            java.lang.String
-	 */
-	public CSSTextPropertyDescriptor(String id, String displayName, ICSSNode node) {
-		super(id, displayName);
-		this.fNode = node;
-	}
-
-	public CSSTextPropertyDescriptor(String id, String displayName, ICSSNode node, String category) {
-		super(id, displayName);
-		this.fNode = node;
-		setCategory(category);
-	}
-
-	/**
-	 * @return org.eclipse.jface.viewers.CellEditor
-	 * @param parent
-	 *            org.eclipse.swt.widgets.Composite
-	 */
-	public CellEditor createPropertyEditor(Composite parent) {
-		ICSSModel model = fNode.getOwnerDocument().getModel();
-		if (model == null)
-			return null;
-		if (model.getStyleSheetType() == ICSSModel.EXTERNAL && findEditor(model) == null)
-			return null;
-		// check whether IFile is readonly to prohibit editing before
-		// validateEdit()
-		IStructuredModel structuredModel = model;
-		if (model.getStyleSheetType() != ICSSModel.EXTERNAL) {
-			structuredModel = ((IDOMNode) model.getOwnerDOMNode()).getModel();
-			if (structuredModel == null)
-				return null;
-		}
-		IFile file = CSSPathService.location2File(structuredModel.getBaseLocation());
-		if (file == null || file.isReadOnly())
-			return null;
-
-		return super.createPropertyEditor(parent);
-	}
-
-	private static IEditorPart findEditor(ICSSModel model) {
-		IWorkbench workbench = PlatformUI.getWorkbench();
-		IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-		for (int i = 0; i < windows.length; i++) {
-			IWorkbenchPage[] pages = windows[i].getPages();
-			for (int j = 0; j < pages.length; j++) {
-				IEditorReference[] editors = pages[j].getEditorReferences();
-				for (int k = 0; k < editors.length; k++) {
-					IEditorPart editPart = editors[k].getEditor(false);
-					if (editPart != null) {
-						IEditorInput editorInput = editPart.getEditorInput();
-						if (editorInput instanceof IFileEditorInput) {
-							IFile file = ((IFileEditorInput) editorInput).getFile();
-							if (file != null) {
-								//TODO Urgent needs to be fixed
-								// I think we need 'equals' (or 'equivalent'
-								// on model) for cases like this
-								if (StructuredModelManager.getModelManager().calculateId(file).equals(model.getId())) {
-									return editPart;
-								}
-							}
-						}
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/registry/AdapterFactoryProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/registry/AdapterFactoryProviderCSS.java
deleted file mode 100644
index 717dcb5..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/registry/AdapterFactoryProviderCSS.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.registry;
-
-import org.eclipse.wst.css.core.internal.modelhandler.ModelHandlerForCSS;
-import org.eclipse.wst.css.ui.internal.contentoutline.JFaceNodeAdapterFactoryCSS;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.util.Assert;
-
-public class AdapterFactoryProviderCSS implements AdapterFactoryProvider {
-	public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
-		return (contentTypeDescription instanceof ModelHandlerForCSS);
-	}
-
-	public void addAdapterFactories(IStructuredModel structuredModel) {
-		// add the normal content based factories to model's registry
-		addContentBasedFactories(structuredModel);
-	}
-
-	protected void addContentBasedFactories(IStructuredModel structuredModel) {
-		FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
-		Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$
-		INodeAdapterFactory factory = null;
-
-		factory = factoryRegistry.getFactoryFor(IJFaceNodeAdapter.class);
-		if (factory == null) {
-			factory = new JFaceNodeAdapterFactoryCSS(IJFaceNodeAdapter.class, true);
-			factoryRegistry.addFactory(factory);
-		}
-	}
-
-	public void reinitializeFactories(IStructuredModel structuredModel) {
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectEnclosingCSSActionDelegate.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectEnclosingCSSActionDelegate.java
deleted file mode 100644
index fa1a720..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectEnclosingCSSActionDelegate.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.css.ui.internal.selection;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
-
-/**
- * Selects enclosing CSS element
- */
-public class StructuredSelectEnclosingCSSActionDelegate extends StructuredSelectActionDelegate {
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(CSSUIMessages.StructureSelectEnclosing_label);
-			action.setToolTipText(CSSUIMessages.StructureSelectEnclosing_tooltip);
-			action.setDescription(CSSUIMessages.StructureSelectEnclosing_description);
-		}
-	}
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof ICSSNode) {
-			ICSSNode cursorNode = (ICSSNode) indexedRegion;
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if (cursorNodeRegion.getOffset() >= currentOffset && cursorNodeRegion.getOffset() <= currentEndOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset) {
-				ICSSNode newNode = cursorNode.getParentNode();
-
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-				}
-			}
-			else
-				newRegion = cursorNodeRegion;
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectNextCSSActionDelegate.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectNextCSSActionDelegate.java
deleted file mode 100644
index de122ab..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectNextCSSActionDelegate.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.css.ui.internal.selection;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
-
-/**
- * Selects next CSS element
- */
-public class StructuredSelectNextCSSActionDelegate extends StructuredSelectActionDelegate {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		int offset = textSelection.getOffset() + textSelection.getLength() - 1;
-		if (offset < 0)
-			offset = 0;
-
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, offset);
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-
-		if (indexedRegion instanceof ICSSNode) {
-			ICSSNode cursorNode = (ICSSNode) indexedRegion;
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if (cursorNodeRegion.getOffset() >= currentOffset && cursorNodeRegion.getOffset() <= currentEndOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset) {
-				ICSSNode newNode = cursorNode.getNextSibling();
-				if (newNode == null) {
-					newNode = cursorNode.getParentNode();
-
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-					}
-				}
-				else {
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(currentOffset, newIndexedRegion.getEndOffset() - currentOffset);
-					}
-				}
-			}
-			else
-				newRegion = cursorNodeRegion;
-		}
-		return newRegion;
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(CSSUIMessages.StructureSelectNext_label);
-			action.setToolTipText(CSSUIMessages.StructureSelectNext_tooltip);
-			action.setDescription(CSSUIMessages.StructureSelectNext_description);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectPreviousCSSActionDelegate.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectPreviousCSSActionDelegate.java
deleted file mode 100644
index 78289a2..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/selection/StructuredSelectPreviousCSSActionDelegate.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.css.ui.internal.selection;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
-
-/**
- * Selects previous CSS element
- */
-public class StructuredSelectPreviousCSSActionDelegate extends StructuredSelectActionDelegate {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof ICSSNode) {
-			ICSSNode cursorNode = (ICSSNode) indexedRegion;
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if (cursorNodeRegion.getOffset() >= currentOffset && cursorNodeRegion.getOffset() <= currentEndOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset && cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset) {
-				ICSSNode newNode = cursorNode.getPreviousSibling();
-				if (newNode == null) {
-					newNode = cursorNode.getParentNode();
-
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-					}
-				}
-				else {
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), currentEndOffset - newIndexedRegion.getStartOffset());
-					}
-				}
-			}
-			else
-				newRegion = cursorNodeRegion;
-		}
-		return newRegion;
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(CSSUIMessages.StructureSelectPrevious_label);
-			action.setToolTipText(CSSUIMessages.StructureSelectPrevious_tooltip);
-			action.setDescription(CSSUIMessages.StructureSelectPrevious_description);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/IStyleConstantsCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/IStyleConstantsCSS.java
deleted file mode 100644
index 2287a63..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/IStyleConstantsCSS.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.style;
-
-/**
- * Contains the symbolic name of styles used by LineStyleProvider,
- * ColorManager, and any others who may be interested
- */
-public interface IStyleConstantsCSS {
-	public static final String NORMAL = "NORMAL"; //$NON-NLS-1$
-	public static final String ATMARK_RULE = "ATMARK_RULE"; //$NON-NLS-1$
-	public static final String SELECTOR = "SELECTOR"; //$NON-NLS-1$
-	public static final String UNIVERSAL = "UNIVERSAL"; //$NON-NLS-1$
-	public static final String PSEUDO = "PSEUDO"; //$NON-NLS-1$
-	public static final String SELECTOR_CLASS = "CLASS"; //$NON-NLS-1$
-	public static final String ID = "ID"; //$NON-NLS-1$
-	public static final String MEDIA = "MEDIA"; //$NON-NLS-1$
-	public static final String COMMENT = "COMMENT"; //$NON-NLS-1$
-	public static final String PROPERTY_NAME = "PROPERTY_NAME"; //$NON-NLS-1$
-	public static final String PROPERTY_VALUE = "PROPERTY_VALUE"; //$NON-NLS-1$
-	public static final String URI = "URI"; //$NON-NLS-1$
-	public static final String STRING = "STRING"; //$NON-NLS-1$
-	public static final String COLON = "COLON"; //$NON-NLS-1$
-	public static final String SEMI_COLON = "SEMI_COLON"; //$NON-NLS-1$
-	public static final String CURLY_BRACE = "CURLY_BRACE"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_DELIM = "ATTRIBUTE_DELIM"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_NAME = "ATTRIBUTE_NAME"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_OPERATOR = "ATTRIBUTE_OPERATOR"; //$NON-NLS-1$
-	public static final String ATTRIBUTE_VALUE = "ATTRIBUTE_VALUE"; //$NON-NLS-1$
-	public static final String COMBINATOR = "COMBINATOR"; //$NON-NLS-1$
-	public static final String ERROR = "ERROR"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForCSS.java
deleted file mode 100644
index 8cffa99..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForCSS.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.style;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- */
-public class LineStyleProviderForCSS extends AbstractLineStyleProvider implements LineStyleProvider {
-	/** Contains region to style mapping */
-	private Map fColorTypes;
-
-	/**
-	 * LineStyleProviderForEmbeddedCSS constructor comment.
-	 */
-	public LineStyleProviderForCSS() {
-		super();
-	}
-
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		if (region != null) {
-			String type = region.getType();
-			if (type != null) {
-				return getAttributeFor(type);
-			}
-		}
-		return (TextAttribute) getTextAttributes().get(IStyleConstantsCSS.NORMAL);
-	}
-
-	/**
-	 * Look up the TextAttribute for the given region context. Might return
-	 * null for unusual text.
-	 * 
-	 * @param type
-	 * @return
-	 */
-	protected TextAttribute getAttributeFor(String type) {
-		return (TextAttribute) getTextAttributes().get(fColorTypes.get(type));
-	}
-
-	private void initAttributes() {
-		if (fColorTypes == null) {
-			fColorTypes = new HashMap();
-		}
-		fColorTypes.put(CSSRegionContexts.CSS_COMMENT, IStyleConstantsCSS.COMMENT);
-		fColorTypes.put(CSSRegionContexts.CSS_CDO, IStyleConstantsCSS.COMMENT);
-		fColorTypes.put(CSSRegionContexts.CSS_CDC, IStyleConstantsCSS.COMMENT);
-		fColorTypes.put(CSSRegionContexts.CSS_S, IStyleConstantsCSS.NORMAL);
-
-		fColorTypes.put(CSSRegionContexts.CSS_DELIMITER, IStyleConstantsCSS.SEMI_COLON);
-		fColorTypes.put(CSSRegionContexts.CSS_LBRACE, IStyleConstantsCSS.CURLY_BRACE);
-		fColorTypes.put(CSSRegionContexts.CSS_RBRACE, IStyleConstantsCSS.CURLY_BRACE);
-
-		fColorTypes.put(CSSRegionContexts.CSS_IMPORT, IStyleConstantsCSS.ATMARK_RULE);
-		fColorTypes.put(CSSRegionContexts.CSS_PAGE, IStyleConstantsCSS.ATMARK_RULE);
-		fColorTypes.put(CSSRegionContexts.CSS_MEDIA, IStyleConstantsCSS.ATMARK_RULE);
-		fColorTypes.put(CSSRegionContexts.CSS_FONT_FACE, IStyleConstantsCSS.ATMARK_RULE);
-		fColorTypes.put(CSSRegionContexts.CSS_CHARSET, IStyleConstantsCSS.ATMARK_RULE);
-		fColorTypes.put(CSSRegionContexts.CSS_ATKEYWORD, IStyleConstantsCSS.ATMARK_RULE);
-
-		fColorTypes.put(CSSRegionContexts.CSS_STRING, IStyleConstantsCSS.STRING);
-		fColorTypes.put(CSSRegionContexts.CSS_URI, IStyleConstantsCSS.URI);
-		fColorTypes.put(CSSRegionContexts.CSS_MEDIUM, IStyleConstantsCSS.MEDIA);
-		fColorTypes.put(CSSRegionContexts.CSS_MEDIA_SEPARATOR, IStyleConstantsCSS.MEDIA);
-
-		fColorTypes.put(CSSRegionContexts.CSS_CHARSET_NAME, IStyleConstantsCSS.STRING);
-
-		fColorTypes.put(CSSRegionContexts.CSS_PAGE_SELECTOR, IStyleConstantsCSS.MEDIA);
-
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ELEMENT_NAME, IStyleConstantsCSS.SELECTOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_UNIVERSAL, IStyleConstantsCSS.UNIVERSAL);
-
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_PSEUDO, IStyleConstantsCSS.PSEUDO);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_CLASS, IStyleConstantsCSS.SELECTOR_CLASS);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ID, IStyleConstantsCSS.ID);
-
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_COMBINATOR, IStyleConstantsCSS.COMBINATOR);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_SEPARATOR, IStyleConstantsCSS.SELECTOR);
-
-		/* Attribute selector */
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_START, IStyleConstantsCSS.ATTRIBUTE_DELIM);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_END, IStyleConstantsCSS.ATTRIBUTE_DELIM);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_NAME, IStyleConstantsCSS.ATTRIBUTE_NAME);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_VALUE, IStyleConstantsCSS.ATTRIBUTE_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_SELECTOR_ATTRIBUTE_OPERATOR, IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
-
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_PROPERTY, IStyleConstantsCSS.PROPERTY_NAME);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IDENT, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_DIMENSION, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_PERCENTAGE, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_NUMBER, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_FUNCTION, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_PARENTHESIS_CLOSE, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_STRING, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_URI, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_HASH, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_UNICODE_RANGE, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_IMPORTANT, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_OPERATOR, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_VALUE_S, IStyleConstantsCSS.PROPERTY_VALUE);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_SEPARATOR, IStyleConstantsCSS.COLON);
-		fColorTypes.put(CSSRegionContexts.CSS_DECLARATION_DELIMITER, IStyleConstantsCSS.SEMI_COLON);
-
-		fColorTypes.put(CSSRegionContexts.CSS_UNKNOWN, IStyleConstantsCSS.NORMAL);
-	}
-
-	protected void handlePropertyChange(PropertyChangeEvent event) {
-		String styleKey = null;
-
-		if (event != null) {
-			String prefKey = event.getProperty();
-			// check if preference changed is a style preference
-			if (IStyleConstantsCSS.ATMARK_RULE.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.ATMARK_RULE;
-			} else if (IStyleConstantsCSS.COLON.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.COLON;
-			} else if (IStyleConstantsCSS.COMMENT.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.COMMENT;
-			} else if (IStyleConstantsCSS.CURLY_BRACE.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.CURLY_BRACE;
-			} else if (IStyleConstantsCSS.ERROR.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.ERROR;
-			} else if (IStyleConstantsCSS.MEDIA.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.MEDIA;
-			} else if (IStyleConstantsCSS.NORMAL.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.NORMAL;
-			} else if (IStyleConstantsCSS.ATTRIBUTE_DELIM.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.ATTRIBUTE_DELIM;
-			} else if (IStyleConstantsCSS.ATTRIBUTE_NAME.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.ATTRIBUTE_NAME;
-			} else if (IStyleConstantsCSS.ATTRIBUTE_OPERATOR.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.ATTRIBUTE_OPERATOR;
-			} else if (IStyleConstantsCSS.ATTRIBUTE_VALUE.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.ATTRIBUTE_VALUE;
-			} else if (IStyleConstantsCSS.COMBINATOR.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.COMBINATOR;
-			} else if (IStyleConstantsCSS.PROPERTY_NAME.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.PROPERTY_NAME;
-			} else if (IStyleConstantsCSS.PROPERTY_VALUE.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.PROPERTY_VALUE;
-			} else if (IStyleConstantsCSS.SELECTOR.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.SELECTOR;
-			} else if (IStyleConstantsCSS.UNIVERSAL.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.UNIVERSAL;
-			} else if (IStyleConstantsCSS.ID.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.ID;
-			} else if (IStyleConstantsCSS.PSEUDO.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.PSEUDO;
-			} else if (IStyleConstantsCSS.SELECTOR_CLASS.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.SELECTOR_CLASS;
-			} else if (IStyleConstantsCSS.SEMI_COLON.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.SEMI_COLON;
-			} else if (IStyleConstantsCSS.STRING.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.STRING;
-			} else if (IStyleConstantsCSS.URI.equals(prefKey)) {
-				styleKey = IStyleConstantsCSS.URI;
-			}
-		} else {
-			// this is around for old deprecated preferencesChanged() method
-			// TODO remove when preferencesChanged() is removed
-			loadColors();
-			super.handlePropertyChange(event);
-		}
-
-		if (styleKey != null) {
-			// overwrite style preference with new value
-			addTextAttribute(styleKey);
-			super.handlePropertyChange(event);
-		}
-	}
-
-	public void release() {
-		if (fColorTypes != null) {
-			fColorTypes.clear();
-			fColorTypes = null;
-		}
-		super.release();
-	}
-
-	public void loadColors() {
-		initAttributes();
-		
-		addTextAttribute(IStyleConstantsCSS.ATMARK_RULE);
-		addTextAttribute(IStyleConstantsCSS.COLON);
-		addTextAttribute(IStyleConstantsCSS.COMMENT);
-		addTextAttribute(IStyleConstantsCSS.CURLY_BRACE);
-		addTextAttribute(IStyleConstantsCSS.ERROR);
-		addTextAttribute(IStyleConstantsCSS.MEDIA);
-		addTextAttribute(IStyleConstantsCSS.NORMAL);
-		addTextAttribute(IStyleConstantsCSS.PROPERTY_NAME);
-		addTextAttribute(IStyleConstantsCSS.PROPERTY_VALUE);
-		addTextAttribute(IStyleConstantsCSS.SELECTOR);
-		addTextAttribute(IStyleConstantsCSS.UNIVERSAL);
-		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_DELIM);
-		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_NAME);
-		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_OPERATOR);
-		addTextAttribute(IStyleConstantsCSS.ATTRIBUTE_VALUE);
-		addTextAttribute(IStyleConstantsCSS.COMBINATOR);
-		addTextAttribute(IStyleConstantsCSS.ID);
-		addTextAttribute(IStyleConstantsCSS.SELECTOR_CLASS);
-		addTextAttribute(IStyleConstantsCSS.PSEUDO);
-		addTextAttribute(IStyleConstantsCSS.SEMI_COLON);
-		addTextAttribute(IStyleConstantsCSS.STRING);
-		addTextAttribute(IStyleConstantsCSS.URI);
-	}
-
-	protected IPreferenceStore getColorPreferences() {
-		return CSSUIPlugin.getDefault().getPreferenceStore();
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForEmbeddedCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForEmbeddedCSS.java
deleted file mode 100644
index dde1a3b..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/style/LineStyleProviderForEmbeddedCSS.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.style;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextParser;
-import org.eclipse.wst.css.core.internal.parserz.CSSTextToken;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-
-public class LineStyleProviderForEmbeddedCSS extends LineStyleProviderForCSS {
-
-	public boolean prepareRegions(ITypedRegion typedRegion, int lineRequestStart, int lineRequestLength, Collection holdResults) {
-		int regionStart = typedRegion.getOffset();
-		int regionEnd = regionStart + typedRegion.getLength();
-		IStructuredDocumentRegion wholeRegion = getDocument().getRegionAtCharacterOffset(regionStart);
-
-		if (wholeRegion == null)
-			return false;
-
-		List tokens;
-		// [264597] - Using a cached offset caused shifted highlighting in <style> elements.
-		int offset = wholeRegion.getStartOffset();
-
-		List cache = getCachedParsingResult(wholeRegion);
-		if (cache == null) {
-			String content;
-			content = wholeRegion.getText();
-
-			CSSTextParser parser = new CSSTextParser(CSSTextParser.MODE_STYLESHEET, content);
-			tokens = parser.getTokenList();
-			cacheParsingResult(wholeRegion, tokens);
-		}
-		else
-			tokens = cache;
-
-		boolean result = false;
-
-		if (0 < tokens.size()) {
-			int start = offset;
-			int end = start;
-			Iterator i = tokens.iterator();
-			while (i.hasNext()) {
-				CSSTextToken token = (CSSTextToken) i.next();
-				end = start + token.length;
-				int styleLength = token.length;
-				/* The token starts in the region */
-				if (regionStart <= start && start < regionEnd) {
-					/* [239415] The region may not span the total length of the token -
-					 * Adjust the length so that it doesn't overlap with other style ranges */
-					if (regionEnd < end)
-						styleLength = regionEnd - start;
-					addStyleRange(holdResults, getAttributeFor(token.kind), start, styleLength);
-				}
-				/* The region starts in the token */
-				else if (start <= regionStart && regionStart < end ) {
-					/* The token may not span the total length of the region */
-					if (end < regionEnd)
-						styleLength = end - regionStart;
-					else /* Bugzilla 282218 */ 
-						styleLength = regionEnd - regionStart;
-					addStyleRange(holdResults, getAttributeFor(token.kind), regionStart, styleLength);
-				}
-				start += token.length;
-			}
-			result = true;
-		}
-
-		return result;
-	}
-	
-	private void addStyleRange(Collection holdResults, TextAttribute attribute, int start, int end) {
-		if (attribute != null)
-			holdResults.add(new StyleRange(start, end, attribute.getForeground(), attribute.getBackground(), attribute.getStyle()));
-		else
-			holdResults.add(new StyleRange(start, end, null, null));
-	}
-
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		return null;
-	}
-
-	private void cleanupCache() {
-		fCacheKey = -1;
-		fCacheResult = null;
-	}
-
-	private List getCachedParsingResult(IStructuredDocumentRegion region) {
-		if (fCacheKey == region.getText().hashCode()) {
-			return fCacheResult;
-		}
-		return null;
-	}
-
-	private void cacheParsingResult(IStructuredDocumentRegion region, List result) {
-		fCacheKey = region.getText().hashCode();
-		fCacheResult = result;
-	}
-
-	public void release() {
-		super.release();
-		cleanupCache();
-	}
-
-	int fCacheKey = -1;
-	List fCacheResult = null;
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/EncodingTemplateVariableResolverCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/EncodingTemplateVariableResolverCSS.java
deleted file mode 100644
index 757da6c..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/EncodingTemplateVariableResolverCSS.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.SimpleTemplateVariableResolver;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-
-
-public class EncodingTemplateVariableResolverCSS extends SimpleTemplateVariableResolver {
-	private static final String ENCODING_TYPE = getEncodingType();
-
-	private static String getEncodingType() {
-		return "encoding"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a new encoding variable
-	 */
-	public EncodingTemplateVariableResolverCSS() {
-		super(ENCODING_TYPE, CSSUIMessages.Creating_files_encoding);
-	}
-
-	protected String resolve(TemplateContext context) {
-		return CSSCorePlugin.getDefault().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/TemplateContextTypeCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/TemplateContextTypeCSS.java
deleted file mode 100644
index 7e981c8..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/TemplateContextTypeCSS.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.GlobalTemplateVariables;
-import org.eclipse.jface.text.templates.TemplateContextType;
-
-/**
- * Base class for CSS template context types. Templates of this context type
- * apply to any place within CSS content type.
- */
-public class TemplateContextTypeCSS extends TemplateContextType {
-
-	public TemplateContextTypeCSS() {
-		super();
-		addResolver(new GlobalTemplateVariables.Cursor());
-		addResolver(new GlobalTemplateVariables.Date());
-		addResolver(new GlobalTemplateVariables.Dollar());
-		addResolver(new GlobalTemplateVariables.LineSelection());
-		addResolver(new GlobalTemplateVariables.Time());
-		addResolver(new GlobalTemplateVariables.User());
-		addResolver(new GlobalTemplateVariables.WordSelection());
-		addResolver(new GlobalTemplateVariables.Year());
-		addResolver(new EncodingTemplateVariableResolverCSS());
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/TemplateContextTypeIdsCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/TemplateContextTypeIdsCSS.java
deleted file mode 100644
index d0a134f..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/templates/TemplateContextTypeIdsCSS.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.templates;
-
-
-public class TemplateContextTypeIdsCSS {
-
-	public static final String ALL = "css_all"; //$NON-NLS-1$
-
-	public static final String NEW = "css_new"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/text/CSSCharacterPairInserter.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/text/CSSCharacterPairInserter.java
deleted file mode 100644
index 93e3c5b..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/text/CSSCharacterPairInserter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.wst.css.ui.internal.text;

-

-import org.eclipse.wst.sse.ui.internal.provisional.typing.AbstractCharacterPairInserter;

-

-public class CSSCharacterPairInserter extends AbstractCharacterPairInserter {

-

-	public boolean hasPair(char c) {

-		switch (c) {

-			case '"':

-			case '\'':

-			case '[':

-			case '(':

-				return true;

-			default:

-				return false;

-		}

-	}

-

-	protected char getPair(char c) {

-		switch (c) {

-			case '\'':

-			case '"':

-				return c;

-			case '(':

-				return ')';

-			case '[':

-				return ']';

-			default:

-				throw new IllegalArgumentException();

-		}

-	}

-

-}

diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/text/CSSDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/text/CSSDocumentRegionEdgeMatcher.java
deleted file mode 100644
index 702dbc6..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/text/CSSDocumentRegionEdgeMatcher.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.text;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.source.ICharacterPairMatcher;
-import org.eclipse.wst.css.core.internal.parserz.CSSRegionContexts;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-public class CSSDocumentRegionEdgeMatcher implements ICharacterPairMatcher {
-
-	private int fAnchor = ICharacterPairMatcher.LEFT;
-
-	/**
-	 * @param validContexts
-	 * @param nextMatcher
-	 */
-	public CSSDocumentRegionEdgeMatcher() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#clear()
-	 */
-	public void clear() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#getAnchor()
-	 */
-	public int getAnchor() {
-		return fAnchor;
-	}
-
-	public IRegion match(IDocument document, int offset) {
-		if (document instanceof IStructuredDocument) {
-			IStructuredDocumentRegion r = ((IStructuredDocument) document).getRegionAtCharacterOffset(offset);
-			if (r != null) {
-				if (r.getPrevious() != null && r.getStartOffset() == offset && r.getPrevious().getType().equals(CSSRegionContexts.CSS_RBRACE)) {
-					r = r.getPrevious();
-				}
-				if (r.getType().equals(CSSRegionContexts.CSS_RBRACE)) {
-					while (r != null && !r.getType().equals(CSSRegionContexts.CSS_LBRACE)) {
-						r = r.getPrevious();
-					}
-					if (r != null) {
-						return new Region(r.getStartOffset(), 1);
-					}
-				} else if (r.getType().equals(CSSRegionContexts.CSS_LBRACE)) {
-					while (r != null && !r.getType().equals(CSSRegionContexts.CSS_RBRACE)) {
-						r = r.getNext();
-					}
-					if (r != null) {
-						return new Region(r.getEndOffset() - 1, 1);
-					}
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/FacetModuleCoreSupport.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/FacetModuleCoreSupport.java
deleted file mode 100644
index 636c693..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/FacetModuleCoreSupport.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-
-/**
- * This class encapsulates any used Module Core and Facets APIs along with
- * fallbacks for use on non-compliant projects and when those services are not
- * available at runtime.
- * 
- * Because ModuleCore API calls can result in locks needing to be acquired,
- * none of these methods should be called while other thread locks have
- * already been acquired.
- */
-final class FacetModuleCoreSupport {
-	static final boolean _dump_NCDFE = false;
-
-	/**
-	 * @param project
-	 * @return the IPath to the "root" of the web contents
-	 */
-	public static IPath getWebContentRootPath(IProject project) {
-		if (project == null)
-			return null;
-
-		IPath path = null;
-		try {
-			path = FacetModuleCoreSupportDelegate.getWebContentRootPath(project);
-		}
-		catch (NoClassDefFoundError e) {
-			if (_dump_NCDFE)
-				e.printStackTrace();
-		}
-		return path;
-	}
-
-	/**
-	 * @param project
-	 * @return
-	 * @throws org.eclipse.core.runtime.CoreException
-	 */
-	public static boolean isWebProject(IProject project) {
-		if (project == null)
-			return false;
-
-		try {
-			return FacetModuleCoreSupportDelegate.isWebProject(project);
-		}
-		catch (NoClassDefFoundError e) {
-			if (_dump_NCDFE)
-				e.printStackTrace();
-		}
-		return true;
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/FacetModuleCoreSupportDelegate.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/FacetModuleCoreSupportDelegate.java
deleted file mode 100644
index 1af190f..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/FacetModuleCoreSupportDelegate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.wizard;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.css.ui.internal.Logger;
-
-/**
- * Wrapper class for all Facet-related calls. If the Facet or ModuleCore
- * bundles are not available, this class will not load, or if it does, its
- * methods will cause NoClassDefFoundErrors. This allows us to
- * compartmentalize the dependencies.
- * 
- */
-final class FacetModuleCoreSupportDelegate {
-	/**
-	 * Copied to avoid unneeded extra dependency (plus it's unclear why the
-	 * value is in that plug-in).
-	 * 
-	 * @see org.eclipse.wst.common.componentcore.internal.util.IModuleConstants.JST_WEB_MODULE
-	 */
-	private final static String JST_WEB_MODULE = "jst.web"; //$NON-NLS-1$
-
-	private final static String WST_WEB_MODULE = "wst.web"; //$NON-NLS-1$
-
-	/**
-	 * @param project
-	 * @return the IPath to the "root" of the web contents
-	 */
-	static IPath getWebContentRootPath(IProject project) {
-		if (!ModuleCoreNature.isFlexibleProject(project))
-			return project.getFullPath();
-
-		IPath path = null;
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		if (component != null && component.exists()) {
-			path = component.getRootFolder().getWorkspaceRelativePath();
-		}
-		else {
-			path = project.getFullPath();
-		}
-		return path;
-	}
-
-	/**
-	 * @param project
-	 * @return
-	 * @throws CoreException
-	 */
-	static boolean isWebProject(IProject project) {
-		boolean is = false;
-		try {
-			IFacetedProject faceted = ProjectFacetsManager.create(project);
-			if (ProjectFacetsManager.isProjectFacetDefined(JST_WEB_MODULE)) {
-				IProjectFacet facet = ProjectFacetsManager.getProjectFacet(JST_WEB_MODULE);
-				is = is || (faceted != null && faceted.hasProjectFacet(facet));
-			}
-			if (ProjectFacetsManager.isProjectFacetDefined(WST_WEB_MODULE)) {
-				IProjectFacet facet = ProjectFacetsManager.getProjectFacet(WST_WEB_MODULE);
-				is = is || (faceted != null && faceted.hasProjectFacet(facet));
-			}
-		}
-		catch (CoreException e) {
-			Logger.logException(e);
-		}
-		return is;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSFileWizardPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSFileWizardPage.java
deleted file mode 100644
index 4cc6424..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSFileWizardPage.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.wizard;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.core.internal.preferences.CSSCorePreferenceNames;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-
-class NewCSSFileWizardPage extends WizardNewFileCreationPage {
-
-	private IContentType fContentType;
-	private List fValidExtensions = null;
-	
-	public NewCSSFileWizardPage(String pageName, IStructuredSelection selection) {
-        super(pageName, selection);
-    }
-	
-	/**
-	 * This method is overriden to set the selected folder to web contents 
-	 * folder if the current selection is outside the web contents folder. 
-	 */
-	protected void initialPopulateContainerNameField() {
-		super.initialPopulateContainerNameField();
-		
-		IPath fullPath = getContainerFullPath();
-		IProject project = getProjectFromPath(fullPath);
-		IPath webContentPath = getWebContentPath(project);
-		
-		if (webContentPath != null && !webContentPath.isPrefixOf(fullPath)) {
-			setContainerFullPath(webContentPath);
-		}
-	}
-	
-	/**
-	 * This method is overriden to set additional validation specific to 
-	 * css files. 
-	 */
-	protected boolean validatePage() {
-		setMessage(null);
-		setErrorMessage(null);
-		
-		if (!super.validatePage()) {
-			return false;
-		}
-		
-		String fileName = getFileName();
-		IPath fullPath = getContainerFullPath();
-		if ((fullPath != null) && (fullPath.isEmpty() == false) && (fileName != null)) {
-			// check that filename does not contain invalid extension
-			if (!extensionValidForContentType(fileName)) {
-				setErrorMessage(NLS.bind(CSSUIMessages._ERROR_FILENAME_MUST_END_CSS, getValidExtensions().toString()));
-				return false;
-			}
-			// no file extension specified so check adding default
-			// extension doesn't equal a file that already exists
-			if (fileName.lastIndexOf('.') == -1) {
-				String newFileName = addDefaultExtension(fileName);
-				IPath resourcePath = fullPath.append(newFileName);
-
-				IWorkspace workspace = ResourcesPlugin.getWorkspace();
-				IStatus result = workspace.validatePath(resourcePath.toString(), IResource.FOLDER);
-				if (!result.isOK()) {
-					// path invalid
-					setErrorMessage(result.getMessage());
-					return false;
-				}
-
-				if ((workspace.getRoot().getFolder(resourcePath).exists() || workspace.getRoot().getFile(resourcePath).exists())) {
-					setErrorMessage(CSSUIMessages.ResourceGroup_nameExists);
-					return false;
-				}
-			}
-			
-			// get the IProject for the selection path
-			IProject project = getProjectFromPath(fullPath);
-			// if inside web project, check if inside webContent folder
-			if (project != null && isWebProject(project)) {
-				// check that the path is inside the webContent folder
-				IPath webContentPath = getWebContentPath(project);
-				if (!webContentPath.isPrefixOf(fullPath)) {
-					setMessage(CSSUIMessages._WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT, WARNING);
-				}
-			}
-		}
-
-		return true;
-	}
-	
-	/**
-	 * Get content type associated with this new file wizard
-	 * 
-	 * @return IContentType
-	 */
-	private IContentType getContentType() {
-		if (fContentType == null)
-			fContentType = Platform.getContentTypeManager().getContentType(ContentTypeIdForCSS.ContentTypeID_CSS);
-		return fContentType;
-	}
-
-	/**
-	 * Get list of valid extensions for CSS Content type
-	 * 
-	 * @return
-	 */
-	private List getValidExtensions() {
-		if (fValidExtensions == null) {
-			IContentType type = getContentType();
-			fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
-		}
-		return fValidExtensions;
-	}
-	
-	/**
-	 * Verifies if fileName is valid name for content type. Takes base content
-	 * type into consideration.
-	 * 
-	 * @param fileName
-	 * @return true if extension is valid for this content type
-	 */
-	private boolean extensionValidForContentType(String fileName) {
-		boolean valid = false;
-
-		IContentType type = getContentType();
-		// there is currently an extension
-		if (fileName.lastIndexOf('.') != -1) {
-			// check what content types are associated with current extension
-			IContentType[] types = Platform.getContentTypeManager().findContentTypesFor(fileName);
-			int i = 0;
-			while (i < types.length && !valid) {
-				valid = types[i].isKindOf(type);
-				++i;
-			}
-		}
-		else
-			valid = true; // no extension so valid
-		return valid;
-	}
-
-	/**
-	 * Adds default extension to the filename
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	String addDefaultExtension(String filename) {
-		StringBuffer newFileName = new StringBuffer(filename);
-
-		Preferences preference = CSSCorePlugin.getDefault().getPluginPreferences();
-		String ext = preference.getString(CSSCorePreferenceNames.DEFAULT_EXTENSION);
-
-		newFileName.append("."); //$NON-NLS-1$
-		newFileName.append(ext);
-
-		return newFileName.toString();
-	}
-	
-	/**
-	 * Returns the project that contains the specified path
-	 * 
-	 * @param path the path which project is needed
-	 * @return IProject object. If path is <code>null</code> the return value 
-	 * 		   is also <code>null</code>. 
-	 */
-	private IProject getProjectFromPath(IPath path) {
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IProject project = null;
-		
-		if (path != null) {
-			if (workspace.validatePath(path.toString(), IResource.PROJECT).isOK()) {
-				project = workspace.getRoot().getProject(path.toString());
-			} else {
-				project = workspace.getRoot().getFile(path).getProject();
-			}
-		}
-		
-		return project;
-	}
-	
-	/**
-	 * Checks if the specified project is a web project. 
-	 * 
-	 * @param project project to be checked
-	 * @return true if the project is web project, otherwise false
-	 */
-	private boolean isWebProject(IProject project) {
-		return FacetModuleCoreSupport.isWebProject(project);
-	}
-	
-	/**
-	 * Returns the web contents folder of the specified project
-	 * 
-	 * @param project the project which web contents path is needed
-	 * @return IPath of the web contents folder
-	 */
-	private IPath getWebContentPath(IProject project) {
-		return FacetModuleCoreSupport.getWebContentRootPath(project);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSTemplatesWizardPage.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSTemplatesWizardPage.java
deleted file mode 100644
index 17a5de9..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSTemplatesWizardPage.java
+++ /dev/null
@@ -1,512 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.wizard;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.DocumentTemplateContext;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.css.core.internal.provisional.contenttype.ContentTypeIdForCSS;
-import org.eclipse.wst.css.ui.StructuredTextViewerConfigurationCSS;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.css.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.css.ui.internal.preferences.CSSUIPreferenceNames;
-import org.eclipse.wst.css.ui.internal.templates.TemplateContextTypeIdsCSS;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * Templates page in new file wizard. Allows users to select a new file
- * template to be applied in new file.
- * 
- */
-public class NewCSSTemplatesWizardPage extends WizardPage {
-
-	/**
-	 * Content provider for templates
-	 */
-	private class TemplateContentProvider implements IStructuredContentProvider {
-		/** The template store. */
-		private TemplateStore fStore;
-
-		/*
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-			fStore = null;
-		}
-
-		/*
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object input) {
-			return fStore.getTemplates(TemplateContextTypeIdsCSS.NEW);
-		}
-
-		/*
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			fStore = (TemplateStore) newInput;
-		}
-	}
-
-	/**
-	 * Label provider for templates.
-	 */
-	private class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		/*
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
-		 *      int)
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-
-		/*
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
-		 *      int)
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			Template template = (Template) element;
-
-			switch (columnIndex) {
-				case 0 :
-					return template.getName();
-				case 1 :
-					return template.getDescription();
-				default :
-					return ""; //$NON-NLS-1$
-			}
-		}
-	}
-
-	/** Last selected template name */
-	private String fLastSelectedTemplateName;
-	/** The viewer displays the pattern of selected template. */
-	private SourceViewer fPatternViewer;
-	/** The table presenting the templates. */
-	private TableViewer fTableViewer;
-	/** Template store used by this wizard page */
-	private TemplateStore fTemplateStore;
-	/** Checkbox for using templates. */
-	private Button fUseTemplateButton;
-
-	public NewCSSTemplatesWizardPage() {
-		super("NewCSSTemplatesWizardPage", CSSUIMessages.NewCSSTemplatesWizardPage_0, null); //$NON-NLS-1$
-		setDescription(CSSUIMessages.NewCSSTemplatesWizardPage_1);
-	}
-
-	/**
-	 * Correctly resizes the table so no phantom columns appear
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @param buttons
-	 *            the buttons
-	 * @param table
-	 *            the table
-	 * @param column1
-	 *            the first column
-	 * @param column2
-	 *            the second column
-	 * @param column3
-	 *            the third column
-	 */
-	private void configureTableResizing(final Composite parent, final Table table, final TableColumn column1, final TableColumn column2) {
-		parent.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				Rectangle area = parent.getClientArea();
-				Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-				int width = area.width - 2 * table.getBorderWidth();
-				if (preferredSize.y > area.height) {
-					// Subtract the scrollbar width from the total column
-					// width
-					// if a vertical scrollbar will be required
-					Point vBarSize = table.getVerticalBar().getSize();
-					width -= vBarSize.x;
-				}
-
-				Point oldSize = table.getSize();
-				if (oldSize.x > width) {
-					// table is getting smaller so make the columns
-					// smaller first and then resize the table to
-					// match the client area width
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-					table.setSize(width, area.height);
-				}
-				else {
-					// table is getting bigger so make the table
-					// bigger first and then make the columns wider
-					// to match the client area width
-					table.setSize(width, area.height);
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-				}
-			}
-		});
-	}
-
-	public void createControl(Composite ancestor) {
-		Composite parent = new Composite(ancestor, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		parent.setLayout(layout);
-
-		// create checkbox for user to use CSS Template
-		fUseTemplateButton = new Button(parent, SWT.CHECK);
-		fUseTemplateButton.setText(CSSUIMessages.NewCSSTemplatesWizardPage_4);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		fUseTemplateButton.setLayoutData(data);
-		fUseTemplateButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				enableTemplates();
-			}
-		});
-
-		// create composite for Templates table
-		Composite innerParent = new Composite(parent, SWT.NONE);
-		GridLayout innerLayout = new GridLayout();
-		innerLayout.numColumns = 2;
-		innerLayout.marginHeight = 0;
-		innerLayout.marginWidth = 0;
-		innerParent.setLayout(innerLayout);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		innerParent.setLayoutData(gd);
-
-		Label label = new Label(innerParent, SWT.NONE);
-		label.setText(CSSUIMessages.NewCSSTemplatesWizardPage_7);
-		data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		label.setLayoutData(data);
-
-		// create table that displays templates
-		Table table = new Table(innerParent, SWT.BORDER | SWT.FULL_SELECTION);
-
-		data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = convertWidthInCharsToPixels(2);
-		data.heightHint = convertHeightInCharsToPixels(10);
-		data.horizontalSpan = 2;
-		table.setLayoutData(data);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		TableLayout tableLayout = new TableLayout();
-		table.setLayout(tableLayout);
-
-		TableColumn column1 = new TableColumn(table, SWT.NONE);
-		column1.setText(CSSUIMessages.NewCSSTemplatesWizardPage_2);
-
-		TableColumn column2 = new TableColumn(table, SWT.NONE);
-		column2.setText(CSSUIMessages.NewCSSTemplatesWizardPage_3);
-
-		fTableViewer = new TableViewer(table);
-		fTableViewer.setLabelProvider(new TemplateLabelProvider());
-		fTableViewer.setContentProvider(new TemplateContentProvider());
-
-		fTableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object object1, Object object2) {
-				if ((object1 instanceof Template) && (object2 instanceof Template)) {
-					Template left = (Template) object1;
-					Template right = (Template) object2;
-					int result = left.getName().compareToIgnoreCase(right.getName());
-					if (result != 0)
-						return result;
-					return left.getDescription().compareToIgnoreCase(right.getDescription());
-				}
-				return super.compare(viewer, object1, object2);
-			}
-
-			public boolean isSorterProperty(Object element, String property) {
-				return true;
-			}
-		});
-
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				updateViewerInput();
-			}
-		});
-
-		// create viewer that displays currently selected template's contents
-		fPatternViewer = doCreateViewer(parent);
-
-		fTemplateStore = CSSUIPlugin.getDefault().getTemplateStore();
-		fTableViewer.setInput(fTemplateStore);
-
-		// Create linked text to just to templates preference page
-		Link link = new Link(parent, SWT.NONE);
-		link.setText(CSSUIMessages.NewCSSTemplatesWizardPage_6);
-		data = new GridData(SWT.END, SWT.FILL, true, false, 2, 1);
-		link.setLayoutData(data);
-		link.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				linkClicked();
-			}
-		});
-
-		configureTableResizing(innerParent, table, column1, column2);
-		loadLastSavedPreferences();
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.CSS_NEWWIZARD_TEMPLATE_HELPID);
-		Dialog.applyDialogFont(parent);
-		setControl(parent);
-	}
-
-	/**
-	 * Creates, configures and returns a source viewer to present the template
-	 * pattern on the preference page. Clients may override to provide a
-	 * custom source viewer featuring e.g. syntax coloring.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @return a configured source viewer
-	 */
-	private SourceViewer createViewer(Composite parent) {
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationCSS();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		SourceViewer viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForCSS.ContentTypeID_CSS);
-		IDocument document = scratchModel.getStructuredDocument();
-		viewer.configure(sourceViewerConfiguration);
-		viewer.setDocument(document);
-		return viewer;
-	}
-
-	private SourceViewer doCreateViewer(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(CSSUIMessages.NewCSSTemplatesWizardPage_5);
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		label.setLayoutData(data);
-
-		SourceViewer viewer = createViewer(parent);
-		viewer.setEditable(false);
-
-		Control control = viewer.getControl();
-		data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		data.heightHint = convertHeightInCharsToPixels(5);
-		// [261274] - source viewer was growing to fit the max line width of the template
-		data.widthHint = convertWidthInCharsToPixels(2);
-		control.setLayoutData(data);
-
-		return viewer;
-	}
-
-	/**
-	 * Enable/disable controls in page based on fUseTemplateButton's current
-	 * state.
-	 */
-	void enableTemplates() {
-		boolean enabled = fUseTemplateButton.getSelection();
-
-		if (!enabled) {
-			// save last selected template
-			Template template = getSelectedTemplate();
-			if (template != null)
-				fLastSelectedTemplateName = template.getName();
-			else
-				fLastSelectedTemplateName = ""; //$NON-NLS-1$
-
-			fTableViewer.setSelection(null);
-		}
-		else {
-			setSelectedTemplate(fLastSelectedTemplateName);
-		}
-
-		fTableViewer.getControl().setEnabled(enabled);
-		fPatternViewer.getControl().setEnabled(enabled);
-	}
-
-	/**
-	 * Return the template preference page id
-	 * 
-	 * @return
-	 */
-	private String getPreferencePageId() {
-		return "org.eclipse.wst.css.ui.preferences.templates"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the currently selected template.
-	 * 
-	 * @return
-	 */
-	private Template getSelectedTemplate() {
-		Template template = null;
-		IStructuredSelection selection = (IStructuredSelection) fTableViewer.getSelection();
-
-		if (selection.size() == 1) {
-			template = (Template) selection.getFirstElement();
-		}
-		return template;
-	}
-
-	/**
-	 * Returns template string to insert.
-	 * 
-	 * @return String to insert or null if none is to be inserted
-	 */
-	String getTemplateString() {
-		String templateString = null;
-
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			TemplateContextType contextType = CSSUIPlugin.getDefault().getTemplateContextRegistry().getContextType(TemplateContextTypeIdsCSS.NEW);
-			IDocument document = new Document();
-			TemplateContext context = new DocumentTemplateContext(contextType, document, 0, 0);
-			try {
-				TemplateBuffer buffer = context.evaluate(template);
-				templateString = buffer.getString();
-			}
-			catch (Exception e) {
-				Logger.log(Logger.WARNING_DEBUG, "Could not create template for new css", e); //$NON-NLS-1$
-			}
-		}
-
-		return templateString;
-	}
-
-	void linkClicked() {
-		String pageId = getPreferencePageId();
-		PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(), pageId, new String[]{pageId}, null);
-		dialog.open();
-		fTableViewer.refresh();
-	}
-
-	/**
-	 * Load the last template name used in New CSS File wizard.
-	 */
-	private void loadLastSavedPreferences() {
-		String templateName = CSSUIPlugin.getDefault().getPreferenceStore().getString(CSSUIPreferenceNames.NEW_FILE_TEMPLATE_NAME);
-		if (templateName == null || templateName.length() == 0) {
-			fLastSelectedTemplateName = ""; //$NON-NLS-1$
-			fUseTemplateButton.setSelection(false);
-		}
-		else {
-			fLastSelectedTemplateName = templateName;
-			fUseTemplateButton.setSelection(true);
-		}
-		enableTemplates();
-	}
-
-	/**
-	 * Save template name used for next call to New CSS File wizard.
-	 */
-	void saveLastSavedPreferences() {
-		String templateName = ""; //$NON-NLS-1$
-
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			templateName = template.getName();
-		}
-
-		CSSUIPlugin.getDefault().getPreferenceStore().setValue(CSSUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
-		CSSUIPlugin.getDefault().savePluginPreferences();
-	}
-
-	/**
-	 * Select a template in the table viewer given the template name. If
-	 * template name cannot be found or templateName is null, just select
-	 * first item in table. If no items in table select nothing.
-	 * 
-	 * @param templateName
-	 */
-	private void setSelectedTemplate(String templateName) {
-		Object template = null;
-
-		if (templateName != null && templateName.length() > 0) {
-			// pick the last used template
-			template = fTemplateStore.findTemplate(templateName, TemplateContextTypeIdsCSS.NEW);
-		}
-
-		// no record of last used template so just pick first element
-		if (template == null) {
-			// just pick first element
-			template = fTableViewer.getElementAt(0);
-		}
-
-		if (template != null) {
-			IStructuredSelection selection = new StructuredSelection(template);
-			fTableViewer.setSelection(selection, true);
-		}
-	}
-
-	/**
-	 * Updates the pattern viewer.
-	 */
-	void updateViewerInput() {
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			fPatternViewer.getDocument().set(template.getPattern());
-		}
-		else {
-			fPatternViewer.getDocument().set(""); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSWizard.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSWizard.java
deleted file mode 100644
index 62b456d..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/internal/wizard/NewCSSWizard.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.css.ui.internal.wizard;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.css.core.internal.CSSCorePlugin;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.Logger;
-import org.eclipse.wst.css.ui.internal.editor.CSSEditorPluginImages;
-import org.eclipse.wst.css.ui.internal.image.CSSImageHelper;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-
-public class NewCSSWizard extends Wizard implements INewWizard {
-	private NewCSSFileWizardPage fNewFilePage;
-	private NewCSSTemplatesWizardPage fNewFileTemplatesPage;
-	private IStructuredSelection fSelection;
-
-	public void addPages() {
-		fNewFilePage = new NewCSSFileWizardPage("CSSWizardNewFileCreationPage", new StructuredSelection(IDE.computeSelectedResources(fSelection))); //$NON-NLS-1$
-		fNewFilePage.setTitle(CSSUIMessages._UI_WIZARD_NEW_HEADING); //$NON-NLS-1$
-		fNewFilePage.setDescription(CSSUIMessages._UI_WIZARD_NEW_DESCRIPTION); //$NON-NLS-1$
-		addPage(fNewFilePage);
-
-		fNewFileTemplatesPage = new NewCSSTemplatesWizardPage();
-		addPage(fNewFileTemplatesPage);
-	}
-
-	private String applyLineDelimiter(IFile file, String text) {
-		String lineDelimiter = Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, System.getProperty("line.separator"), new IScopeContext[] {new ProjectScope(file.getProject()), new InstanceScope() });//$NON-NLS-1$
-		String convertedText = StringUtils.replace(text, "\r\n", "\n");
-		convertedText = StringUtils.replace(convertedText, "\r", "\n");
-		convertedText = StringUtils.replace(convertedText, "\n", lineDelimiter);
-		return convertedText;
-	}
-
-	public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
-		fSelection = aSelection;
-		setWindowTitle(CSSUIMessages._UI_WIZARD_NEW_TITLE); //$NON-NLS-1$
-		ImageDescriptor descriptor = CSSImageHelper.getInstance().getImageDescriptor(CSSEditorPluginImages.IMG_WIZBAN_NEWCSSFILE);
-		setDefaultPageImageDescriptor(descriptor);
-	}
-
-	private void openEditor(final IFile file) {
-		if (file != null) {
-			getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					try {
-						IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-						IDE.openEditor(page, file, true);
-					}
-					catch (PartInitException e) {
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-			});
-		}
-	}
-
-	public boolean performFinish() {
-		boolean performedOK = false;
-
-		// save user options for next use
-		fNewFileTemplatesPage.saveLastSavedPreferences();
-
-		// no file extension specified so add default extension
-		String fileName = fNewFilePage.getFileName();
-		if (fileName.lastIndexOf('.') == -1) {
-			String newFileName = fNewFilePage.addDefaultExtension(fileName);
-			fNewFilePage.setFileName(newFileName);
-		}
-
-		// create a new empty file
-		IFile file = fNewFilePage.createNewFile();
-
-		// if there was problem with creating file, it will be null, so make
-		// sure to check
-		if (file != null) {
-			// put template contents into file
-			String templateString = fNewFileTemplatesPage.getTemplateString();
-			if (templateString != null) {
-				templateString = applyLineDelimiter(file, templateString);
-				// determine the encoding for the new file
-				Preferences preference = CSSCorePlugin.getDefault().getPluginPreferences();
-				String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-
-				try {
-					ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-					OutputStreamWriter outputStreamWriter = null;
-					if (charSet == null || charSet.trim().equals("")) { //$NON-NLS-1$
-						// just use default encoding
-						outputStreamWriter = new OutputStreamWriter(outputStream);
-					}
-					else {
-						outputStreamWriter = new OutputStreamWriter(outputStream, charSet);
-					}
-					outputStreamWriter.write(templateString);
-					outputStreamWriter.flush();
-					outputStreamWriter.close();
-					ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
-					file.setContents(inputStream, true, false, null);
-					inputStream.close();
-				}
-				catch (Exception e) {
-					Logger.log(Logger.WARNING_DEBUG, "Could not create contents for new CSS file", e); //$NON-NLS-1$
-				}
-			}
-			// open the file in editor
-			openEditor(file);
-
-			// everything's fine
-			performedOK = true;
-		}
-		return performedOK;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java
deleted file mode 100644
index fbc9d85..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/CSSContentOutlineConfiguration.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.css.ui.views.contentoutline;
-
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSStyleDeclItem;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSValue;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateActionContributionItem;
-import org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration;
-
-/**
- * Configuration for outline view page which shows CSS content.
- * 
- * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration
- * @since 1.0
- */
-public class CSSContentOutlineConfiguration extends ContentOutlineConfiguration {
-	private IContentProvider fContentProvider = null;
-	private ILabelProvider fLabelProvider = null;
-	private final String OUTLINE_SORT_PREF = "outline-sort"; //$NON-NLS-1$
-
-	/**
-	 * Create new instance of CSSContentOutlineConfiguration
-	 */
-	public CSSContentOutlineConfiguration() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-
-	public IContributionItem[] createToolbarContributions(TreeViewer viewer) {
-		IContributionItem[] items = super.createToolbarContributions(viewer);
-
-		SortAction sortAction = new SortAction(viewer, CSSUIPlugin.getDefault().getPreferenceStore(), OUTLINE_SORT_PREF);
-		IContributionItem sortItem = new PropertyChangeUpdateActionContributionItem(sortAction);
-
-		if (items == null) {
-			items = new IContributionItem[1];
-			items[0] = sortItem;
-		}
-		else {
-			IContributionItem[] combinedItems = new IContributionItem[items.length + 1];
-			combinedItems[0] = sortItem;
-			System.arraycopy(items, 0, combinedItems, 1, items.length);
-			items = combinedItems;
-		}
-		return items;
-	}
-
-	public IContentProvider getContentProvider(TreeViewer viewer) {
-		if (fContentProvider == null)
-			fContentProvider = new JFaceNodeContentProviderCSS();
-		return fContentProvider;
-	}
-
-	private Object getFilteredNode(Object o) {
-		ICSSNode node = null;
-		if (o instanceof ICSSNode) {
-			node = (ICSSNode) o;
-			short nodeType = node.getNodeType();
-			if (node instanceof ICSSValue) {
-				while (node != null && !(node instanceof ICSSStyleDeclItem)) {
-					node = node.getParentNode();
-				}
-			}
-			else if (nodeType == ICSSNode.STYLEDECLARATION_NODE) {
-				node = node.getParentNode();
-			}
-			else if (nodeType == ICSSNode.MEDIALIST_NODE) {
-				node = node.getParentNode();
-			}
-		}
-		return node;
-	}
-
-	private Object[] getFilteredNodes(Object[] objects) {
-		Object[] filtered = new Object[objects.length];
-		for (int i = 0; i < filtered.length; i++) {
-			filtered[i] = getFilteredNode(objects[i]);
-		}
-		return filtered;
-	}
-
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		if (fLabelProvider == null)
-			fLabelProvider = new JFaceNodeLabelProviderCSS();
-		return fLabelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.StructuredContentOutlineConfiguration#getPreferenceStore()
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return CSSUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	public ISelection getSelection(TreeViewer viewer, ISelection selection) {
-		ISelection filteredSelection = selection;
-		if (selection instanceof IStructuredSelection) {
-			Object[] filteredNodes = getFilteredNodes(((IStructuredSelection) selection).toArray());
-			filteredSelection = new StructuredSelection(filteredNodes);
-		}
-		return filteredSelection;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeContentProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeContentProviderCSS.java
deleted file mode 100644
index fdf353a..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeContentProviderCSS.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.views.contentoutline;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSDocument;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapterFactory;
-import org.w3c.dom.css.CSSRule;
-
-/**
- * A Content provider for a JFace viewer used to display CSS nodes. This
- * content provider does not use adapters.
- */
-class JFaceNodeContentProviderCSS implements ITreeContentProvider {
-
-	public JFaceNodeContentProviderCSS() {
-		super();
-	}
-
-	/**
-	 * @deprecated
-	 */
-	protected void addElements(Object element, ArrayList v) {
-
-		ICSSNode node;
-
-		if (element instanceof ICSSModel) {
-			ICSSModel model = (ICSSModel) element;
-			ICSSDocument doc = model.getDocument();
-			node = doc.getFirstChild();
-		}
-		else if (element instanceof ICSSNode) {
-			node = ((ICSSNode) element).getFirstChild();
-		}
-		else
-			return;
-
-		while (node != null) {
-			if (node instanceof CSSRule) {
-				v.add(node);
-			}
-
-			node = node.getNextSibling();
-		}
-
-	}
-
-	/**
-	 * The visual part that is using this content provider is about to be
-	 * disposed. Deallocate all allocated SWT resources.
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * Returns an enumeration containing all child nodes of the given element,
-	 * which represents a node in a tree. The difference to
-	 * <code>IStructuredContentProvider.getElements(Object)</code> is as
-	 * follows: <code>getElements</code> is called to obtain the tree
-	 * viewer's root elements. Method <code>getChildren</code> is used to
-	 * obtain the children of a given node in the tree, which can can be a
-	 * root node, too.
-	 */
-	public Object[] getChildren(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-		if (adapter != null)
-			return adapter.getChildren(object);
-
-		return new Object[0];
-	}
-
-	/**
-	 * Returns an enumeration with the elements belonging to the passed
-	 * element. These elements can be presented as rows in a table, items in a
-	 * list etc.
-	 */
-	public Object[] getElements(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-		if (adapter != null)
-			return adapter.getElements(object);
-
-		return new Object[0];
-	}
-
-	/**
-	 * Returns the parent for the given element. This method can return
-	 * <code>null</code> indicating that the parent can't be computed. In
-	 * this case the tree viewer can't expand a given node correctly if
-	 * requested.
-	 */
-	public Object getParent(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-		if (adapter != null)
-			return adapter.getParent(object);
-
-		return null;
-	}
-
-	/**
-	 * Returns <code>true</code> if the given element has children.
-	 * Otherwise <code>false</code> is returned.
-	 */
-	public boolean hasChildren(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-		if (adapter != null)
-			return adapter.hasChildren(object);
-
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-	 *      java.lang.Object, java.lang.Object)
-	 */
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if (oldInput != null && oldInput instanceof IStructuredModel) {
-			IJFaceNodeAdapterFactory factory = (IJFaceNodeAdapterFactory) ((IStructuredModel) oldInput).getFactoryRegistry().getFactoryFor(IJFaceNodeAdapter.class);
-			if (factory != null) {
-				factory.removeListener(viewer);
-			}
-		}
-		if (newInput != null && newInput instanceof IStructuredModel) {
-			IJFaceNodeAdapterFactory factory = (IJFaceNodeAdapterFactory) ((IStructuredModel) newInput).getFactoryRegistry().getFactoryFor(IJFaceNodeAdapter.class);
-			if (factory != null) {
-				factory.addListener(viewer);
-			}
-		}
-	}
-
-	/**
-	 * Checks whether the given element is deleted or not.
-	 * 
-	 * @deprecated
-	 */
-	public boolean isDeleted(Object element) {
-		return false;
-	}
-
-	/**
-	 * Returns the JFace adapter for the specified object.
-	 * 
-	 * @param adaptable
-	 *            java.lang.Object The object to get the adapter for
-	 */
-	private IJFaceNodeAdapter getAdapter(Object adaptable) {
-		IJFaceNodeAdapter adapter = null;
-		if (adaptable instanceof ICSSModel) {
-			adaptable = ((ICSSModel) adaptable).getDocument();
-		}
-		if (adaptable instanceof ICSSNode && adaptable instanceof INodeNotifier) {
-			INodeAdapter nodeAdapter = ((INodeNotifier) adaptable).getAdapterFor(IJFaceNodeAdapter.class);
-			if (nodeAdapter instanceof IJFaceNodeAdapter)
-				adapter = (IJFaceNodeAdapter) nodeAdapter;
-		}
-		return adapter;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeLabelProviderCSS.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeLabelProviderCSS.java
deleted file mode 100644
index 964de2f..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/JFaceNodeLabelProviderCSS.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.css.ui.views.contentoutline;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSModel;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-
-class JFaceNodeLabelProviderCSS extends LabelProvider {
-
-	/**
-	 * JFaceNodeLabelProvider constructor comment.
-	 */
-	public JFaceNodeLabelProviderCSS() {
-		super();
-	}
-
-	/**
-	 * Returns the JFace adapter for the specified object.
-	 * 
-	 * @param adaptable
-	 *            java.lang.Object The object to get the adapter for
-	 */
-	private IJFaceNodeAdapter getAdapter(Object adaptable) {
-		IJFaceNodeAdapter adapter = null;
-		if (adaptable instanceof ICSSModel) {
-			adaptable = ((ICSSModel) adaptable).getDocument();
-		}
-		if (adaptable instanceof INodeNotifier) {
-			INodeAdapter nodeAdapter = ((INodeNotifier) adaptable).getAdapterFor(IJFaceNodeAdapter.class);
-			if (nodeAdapter instanceof IJFaceNodeAdapter)
-				adapter = (IJFaceNodeAdapter) nodeAdapter;
-		}
-		return adapter;
-	}
-
-	/**
-	 * Returns the image for the label of the given element, for use in the
-	 * given viewer.
-	 * 
-	 * @param viewer
-	 *            The viewer that displays the element.
-	 * @param element
-	 *            The element for which to provide the label image. Element
-	 *            can be <code>null</code> indicating no input object is set
-	 *            to the viewer.
-	 */
-	public Image getImage(Object element) {
-		Image image = null;
-		IJFaceNodeAdapter adapter = getAdapter(element);
-		if (adapter != null)
-			image = adapter.getLabelImage(element);
-		return image;
-	}
-
-	/**
-	 * Returns the text for the label of the given element, for use in the
-	 * given viewer.
-	 * 
-	 * @param viewer
-	 *            The viewer that displays the element.
-	 * @param element
-	 *            The element for which to provide the label text. Element can
-	 *            be <code>null</code> indicating no input object is set to
-	 *            the viewer.
-	 */
-	public String getText(Object element) {
-		String text = null;
-		IJFaceNodeAdapter adapter = getAdapter(element);
-		if (adapter != null) {
-			text = adapter.getLabelText(element);
-		}
-		return text;
-	}
-
-	/**
-	 * Checks whether this label provider is affected by the given domain
-	 * event.
-	 * 
-	 * @deprecated
-	 */
-	public boolean isAffected(Object dummy) {// DomainEvent event) {
-		// return event.isModifier(DomainEvent.NON_STRUCTURE_CHANGE);
-		return true;
-
-	}
-
-	/**
-	 * Returns whether the label would be affected by a change to the given
-	 * property of the given element. This can be used to optimize a
-	 * non-structural viewer update. If the property mentioned in the update
-	 * does not affect the label, then the viewer need not update the label.
-	 * 
-	 * @param element
-	 *            the element
-	 * @param property
-	 *            the property
-	 * @return <code>true</code> if the label would be affected, and
-	 *         <code>false</code> if it would be unaffected
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
deleted file mode 100644
index 370dbff..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/contentoutline/SortAction.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.css.ui.views.contentoutline;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.css.ui.internal.CSSUIMessages;
-import org.eclipse.wst.css.ui.internal.CSSUIPlugin;
-import org.eclipse.wst.css.ui.internal.editor.CSSEditorPluginImages;
-import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateAction;
-
-/*
- * Based on DTDContentOutlinePage#SortAction
- */
-class SortAction extends PropertyChangeUpdateAction {
-	private TreeViewer treeViewer;
-
-	public SortAction(TreeViewer viewer, IPreferenceStore store, String preferenceKey) {
-		super(CSSUIMessages.SortAction_0, store, preferenceKey, false); //$NON-NLS-1$
-		ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(CSSUIPlugin.ID, CSSEditorPluginImages.IMG_OBJ_SORT);
-		setImageDescriptor(desc);
-		setToolTipText(getText());
-		treeViewer = viewer;
-		if (isChecked()) {
-			treeViewer.setComparator(new ViewerComparator());
-		}
-	}
-
-	public void update() {
-		super.update();
-		treeViewer.getControl().setRedraw(false);
-		Object[] expandedElements = treeViewer.getExpandedElements();
-		if (isChecked()) {
-			treeViewer.setComparator(new ViewerComparator());
-		}
-		else {
-			treeViewer.setComparator(null);
-		}
-		treeViewer.setInput(treeViewer.getInput());
-		treeViewer.setExpandedElements(expandedElements);
-		treeViewer.getControl().setRedraw(true);
-	}
-}
diff --git a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/properties/CSSPropertySheetConfiguration.java b/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/properties/CSSPropertySheetConfiguration.java
deleted file mode 100644
index b8c1fa4..0000000
--- a/bundles/org.eclipse.wst.css.ui/src/org/eclipse/wst/css/ui/views/properties/CSSPropertySheetConfiguration.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-
-package org.eclipse.wst.css.ui.views.properties;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.wst.css.core.internal.provisional.document.ICSSNode;
-import org.eclipse.wst.css.ui.internal.properties.CSSPropertySource;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.views.properties.PropertySheetConfiguration;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Configuration for property sheet page which shows CSS content.
- * 
- * @see org.eclipse.wst.sse.ui.views.properties.PropertySheetConfiguration
- * @since 1.0
- */
-public class CSSPropertySheetConfiguration extends PropertySheetConfiguration {
-	private class CSSPropertySheetRefreshAdapter implements INodeAdapter {
-		public boolean isAdapterForType(Object type) {
-			return false;
-		}
-
-		public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-			if (fPropertySheetPage != null) {
-				getPropertiesRefreshJob().addPropertySheetPage(fPropertySheetPage);
-			}
-		}
-	}
-
-	private class CSSPropertySourceProvider implements IPropertySourceProvider {
-		private IPropertySource fPropertySource = null;
-		private ICSSNode fSource = null;
-
-		public IPropertySource getPropertySource(Object object) {
-			if (fSource != null && object.equals(fSource)) {
-				return fPropertySource;
-			}
-
-			if (object instanceof ICSSNode) {
-				fSource = (ICSSNode)object;
-				fPropertySource = new CSSPropertySource(fSource);
-			}
-			else {
-				fSource = null;
-				fPropertySource = null;
-			}
-			return fPropertySource;
-		}
-	}
-
-	private class PropertiesRefreshJob extends UIJob {
-		public static final int UPDATE_DELAY = 200;
-
-		private Set propertySheetPages = null;
-
-		public PropertiesRefreshJob() {
-			super(XMLUIMessages.JFaceNodeAdapter_1);
-			setSystem(true);
-			setPriority(Job.SHORT);
-			propertySheetPages = new HashSet(1);
-		}
-
-		void addPropertySheetPage(IPropertySheetPage page) {
-			propertySheetPages.add(page);
-			schedule(UPDATE_DELAY);
-		}
-
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			Object[] pages = propertySheetPages.toArray();
-			propertySheetPages.clear();
-
-			for (int i = 0; i < pages.length; i++) {
-				PropertySheetPage page = (PropertySheetPage) pages[i];
-				if (page.getControl() != null && !page.getControl().isDisposed()) {
-					page.refresh();
-				}
-			}
-
-			return Status.OK_STATUS;
-		}
-	}
-
-	private PropertiesRefreshJob fPropertiesRefreshJob = null;
-
-	IPropertySheetPage fPropertySheetPage;
-
-	private IPropertySourceProvider fPropertySourceProvider = null;
-
-	private INodeAdapter fRefreshAdapter = new CSSPropertySheetRefreshAdapter();
-
-	private INodeNotifier[] fSelectedNotifiers;
-
-	/**
-	 * Create new instance of CSSPropertySheetConfiguration
-	 */
-	public CSSPropertySheetConfiguration() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-
-	public ISelection getInputSelection(IWorkbenchPart selectingPart, ISelection selection) {
-		// remove UI refresh adapters
-		if (fSelectedNotifiers != null) {
-			for (int i = 0; i < fSelectedNotifiers.length; i++) {
-				fSelectedNotifiers[i].removeAdapter(fRefreshAdapter);
-			}
-			fSelectedNotifiers = null;
-		}
-
-		ISelection preferredSelection = super.getInputSelection(selectingPart, selection);
-		if (preferredSelection instanceof IStructuredSelection) {
-			Object[] selectedObjects = new Object[((IStructuredSelection) selection).size()];
-			System.arraycopy(((IStructuredSelection) selection).toArray(), 0, selectedObjects, 0, selectedObjects.length);
-			for (int i = 0; i < selectedObjects.length; i++) {
-				if (selectedObjects[i] instanceof ICSSNode) {
-					ICSSNode node = (ICSSNode) selectedObjects[i];
-					while (node.getNodeType() == ICSSNode.PRIMITIVEVALUE_NODE || node.getNodeType() == ICSSNode.STYLEDECLITEM_NODE) {
-						node = node.getParentNode();
-						selectedObjects[i] = node;
-					}
-				}
-			}
-
-			/*
-			 * Add UI refresh adapters and remember notifiers for later
-			 * removal
-			 */
-			if (selectedObjects.length > 0) {
-				List selectedNotifiers = new ArrayList(1);
-				for (int i = 0; i < selectedObjects.length; i++) {
-					if (selectedObjects[i] instanceof INodeNotifier) {
-						selectedNotifiers.add(selectedObjects[i]);
-						((INodeNotifier) selectedObjects[i]).addAdapter(fRefreshAdapter);
-					}
-				}
-				fSelectedNotifiers = (INodeNotifier[]) selectedNotifiers.toArray(new INodeNotifier[selectedNotifiers.size()]);
-			}
-			preferredSelection = new StructuredSelection(selectedObjects);
-		}
-		return preferredSelection;
-	}
-
-	PropertiesRefreshJob getPropertiesRefreshJob() {
-		if (fPropertiesRefreshJob == null) {
-			fPropertiesRefreshJob = new PropertiesRefreshJob();
-		}
-		return fPropertiesRefreshJob;
-	}
-
-	public IPropertySourceProvider getPropertySourceProvider(IPropertySheetPage page) {
-		if (fPropertySourceProvider == null) {
-			fPropertySourceProvider = new CSSPropertySourceProvider();
-			fPropertySheetPage = page;
-		}
-		return fPropertySourceProvider;
-	}
-
-	public void unconfigure() {
-		super.unconfigure();
-		if (fSelectedNotifiers != null) {
-			for (int i = 0; i < fSelectedNotifiers.length; i++) {
-				fSelectedNotifiers[i].removeAdapter(fRefreshAdapter);
-			}
-			fSelectedNotifiers = null;
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.css.ui/templates/cssdefault-templates.properties b/bundles/org.eclipse.wst.css.ui/templates/cssdefault-templates.properties
deleted file mode 100644
index bf282ec..0000000
--- a/bundles/org.eclipse.wst.css.ui/templates/cssdefault-templates.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
-###############################################################################
-Templates.newcss.name=New CSS File
-Templates.newcss.desc=new css file
diff --git a/bundles/org.eclipse.wst.css.ui/templates/cssdefault-templates.xml b/bundles/org.eclipse.wst.css.ui/templates/cssdefault-templates.xml
deleted file mode 100644
index e6e0f0d..0000000
--- a/bundles/org.eclipse.wst.css.ui/templates/cssdefault-templates.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
- -->
-<templates>
-<template name="%Templates.newcss.name" description="%Templates.newcss.desc" id="org.eclipse.wst.css.ui.internal.templates.newcss" context="css_new" enabled="true">@CHARSET "${encoding}";</template>
-</templates>
diff --git a/bundles/org.eclipse.wst.dtd.ui/.classpath b/bundles/org.eclipse.wst.dtd.ui/.classpath
deleted file mode 100644
index 95e5f5e..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-properties"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.dtd.ui/.cvsignore b/bundles/org.eclipse.wst.dtd.ui/.cvsignore
deleted file mode 100644
index 4d45660..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-runtime
-dtdui.jar
-*.zip
-build.xml
-temp.folder
-@dot
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.dtd.ui/.options b/bundles/org.eclipse.wst.dtd.ui/.options
deleted file mode 100644
index 35173eb..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.dtd.ui/projectionperf=false
diff --git a/bundles/org.eclipse.wst.dtd.ui/.project b/bundles/org.eclipse.wst.dtd.ui/.project
deleted file mode 100644
index 16b209c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.project
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtd.ui</name>
-	<comment></comment>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 4792166..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Sat Mar 24 02:57:35 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 0bbfc1d..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,40 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.dtd.ui; singleton:=true
-Bundle-Version: 1.0.500.qualifier
-Bundle-Activator: org.eclipse.wst.dtd.ui.internal.DTDUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.dtd.ui,
- org.eclipse.wst.dtd.ui.internal;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.dnd;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.editor;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.preferences;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.projection;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.properties.section;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.registry;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.style;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.templates;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.text;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.views.properties;x-internal:=true,
- org.eclipse.wst.dtd.ui.internal.wizard;x-internal:=true,
- org.eclipse.wst.dtd.ui.views.contentoutline
-Import-Package: com.ibm.icu.util; version="3.8",
- com.ibm.icu.text; version="3.8"
-Require-Bundle: org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.ui;bundle-version="[1.1.301,1.2.0)",
- org.eclipse.wst.dtd.core;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.400,1.2.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.301,1.2.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.dtd.ui/about.html b/bundles/org.eclipse.wst.dtd.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.dtd.ui/build.properties b/bundles/org.eclipse.wst.dtd.ui/build.properties
deleted file mode 100644
index 8f38fb6..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     David Carver, STAR - add new dtd file templates, bug 162321
-#     
-###############################################################################
-bin.includes = plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               templates/,\
-               META-INF/,\
-               .options,\
-               .,\
-               about.html
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-source.. = src/,\
-           src-properties/
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/DTDFile.gif b/bundles/org.eclipse.wst.dtd.ui/icons/DTDFile.gif
deleted file mode 100644
index 64ee536..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/DTDFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/browsebutton.gif b/bundles/org.eclipse.wst.dtd.ui/icons/browsebutton.gif
deleted file mode 100644
index 13dae59..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/browsebutton.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_Attribute.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_Attribute.gif
deleted file mode 100644
index 00bb7b4..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_Attribute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_Element.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_Element.gif
deleted file mode 100644
index 01f4889..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_Element.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_ElementToConModel.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_ElementToConModel.gif
deleted file mode 100644
index 1a8236b..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_ElementToConModel.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_GroupToConModel.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_GroupToConModel.gif
deleted file mode 100644
index 8168fb3..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/ctool16/ADD_GroupToConModel.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_Attribute.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_Attribute.gif
deleted file mode 100644
index a7fb780..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_Attribute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_Element.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_Element.gif
deleted file mode 100644
index 3755e5e..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_Element.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_ElementToConModel.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_ElementToConModel.gif
deleted file mode 100644
index 1a58e11..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_ElementToConModel.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_GroupToConModel.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_GroupToConModel.gif
deleted file mode 100644
index d525a21..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/ADD_GroupToConModel.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/newdtd_wiz.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/newdtd_wiz.gif
deleted file mode 100644
index 33f634f..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/dtool16/newdtd_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_Attribute.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_Attribute.gif
deleted file mode 100644
index 00bb7b4..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_Attribute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_Element.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_Element.gif
deleted file mode 100644
index 01f4889..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_Element.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_ElementToConModel.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_ElementToConModel.gif
deleted file mode 100644
index 1a8236b..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_ElementToConModel.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_GroupToConModel.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_GroupToConModel.gif
deleted file mode 100644
index 8168fb3..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/ADD_GroupToConModel.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/generate_xml.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/generate_xml.gif
deleted file mode 100644
index 0fd5dd8..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/generate_xml.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/newdtd_wiz.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/newdtd_wiz.gif
deleted file mode 100644
index 10b1a77..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/etool16/newdtd_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Comment.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Comment.gif
deleted file mode 100644
index 39611d6..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Comment.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Entity.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Entity.gif
deleted file mode 100644
index cb41506..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Entity.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Entity_Reference.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Entity_Reference.gif
deleted file mode 100644
index 5efa9b9..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Entity_Reference.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Notation.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Notation.gif
deleted file mode 100644
index 57ad089..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/ADD_Notation.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/DTDFile.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/DTDFile.gif
deleted file mode 100644
index 211c437..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/DTDFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/newdtd_wiz.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/newdtd_wiz.gif
deleted file mode 100644
index 2c115ff..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/newdtd_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/organize_dtd_logically.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/organize_dtd_logically.gif
deleted file mode 100644
index 093c6ba..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/organize_dtd_logically.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/sort.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/sort.gif
deleted file mode 100644
index 23c5d0b..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/sort.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/sourceEditor.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/validate.gif b/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/validate.gif
deleted file mode 100644
index 86196e9..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/obj16/validate.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/icons/full/wizban/newdtdfile_wiz.png b/bundles/org.eclipse.wst.dtd.ui/icons/full/wizban/newdtdfile_wiz.png
deleted file mode 100644
index 636d792..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/icons/full/wizban/newdtdfile_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.dtd.ui/plugin.properties b/bundles/org.eclipse.wst.dtd.ui/plugin.properties
deleted file mode 100644
index 3f5b50c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/plugin.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-! Properties file for component: XMDTD - XML Tools DTD Editor
-! Packaged for translation in:  xml.zip
-
-providerName=Eclipse.org
-pluginName=SSE DTD Source Editor
-
-DTD_Source_Page_Editor.name=DTD Editor
-_UI_LABEL_DTD_FILES=DTD Files
-DTD_Templates.name=Templates
-_UI_LABEL_DTD_STYLES=Styles
-DTD_Syntax_Coloring=Syntax Coloring
-_UI_WIZARD_NEW_DTD=DTD
-_UI_CREATE_NEW_DTD_FILE=Create a new DTD file
-##
-StructureSelectEnclosing_label=Enclosing Element
-StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
-StructureSelectNext_label=Next Element
-StructureSelectNext_tooltip=Expand selection to include next sibling
-StructureSelectPrevious_label=Previous Element
-StructureSelectPrevious_tooltip=Expand selection to include previous sibling
-StructureSelectHistory_label=Restore Last Selection
-StructureSelectHistory_tooltip=Restore last selection
-##
-AddTask.label=Add &Task...
-AddTask.tooltip=Add Task...
-AddBookmark.label=Add Boo&kmark...
-AddBookmark.tooltip=Add Bookmark...
-SelectRuler.label=Select Ruler
-##
-_UI_MENU_VALIDATE_DTD               = &Validate DTD File
-
-DTD_New_context_type_Extension_Element.name=New DTD
-_UI_LABEL_GENERAL=General
-_UI_LABEL_OTHER=Other
-_UI_LABEL_ATTRIBUTES=Attributes
-_UI_LABEL_DOCUMENTATION=Documentation
-##
-preferenceKeywords.files=editor dtd creating files suffix specified
-preferenceKeywords.templates=editor dtd templates snippet macros
-preferenceKeywords.styles=editor dtd style customize syntax highlighting type text content foreground background bold color
-
-Colors.dtdDefault=DTD Default
-Colors.dtdTag=DTD Tag
-Colors.dtdTagName=DTD Tag Name
-Colors.dtdComment=DTD Comment
-Colors.dtdKeyword=DTD Keyword
-Colors.dtdString=DTD String
-Colors.dtdData=DTD Data
-Colors.dtdSymbol=DTD Symbol
-			
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/plugin.xml b/bundles/org.eclipse.wst.dtd.ui/plugin.xml
deleted file mode 100644
index a30e912..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/plugin.xml
+++ /dev/null
@@ -1,498 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.editors">
-		<!-- class="org.eclipse.wst.sse.ui.StructuredTextEditor" -->
-		<editor
-			name="%DTD_Source_Page_Editor.name"
-			icon="$nl$/icons/full/obj16/DTDFile.gif"
-			contributorClass="org.eclipse.wst.dtd.ui.internal.editor.ActionContributorDTD"
-			class="org.eclipse.wst.dtd.ui.internal.DTDEditor"
-			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-			id="org.eclipse.wst.dtd.core.dtdsource.source">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.dtd.core.dtdsource" />
-		</editor>
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<contentOutlineConfiguration
-			class="org.eclipse.wst.dtd.ui.views.contentoutline.DTDContentOutlineConfiguration"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
-		<provisionalConfiguration
-			type="characterpairmatcher"
-			class="org.eclipse.wst.dtd.ui.internal.text.DTDDocumentRegionEdgeMatcher"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
-		<provisionalConfiguration
-			type="foldingstrategy"
-			class="org.eclipse.wst.dtd.ui.internal.projection.DTDFoldingStrategy"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
-		<provisionalDefinition
-			type="preferencepages"
-			value="org.eclipse.wst.dtd.ui.preferences.dtd, org.eclipse.wst.sse.ui.preferences.dtd.templates, org.eclipse.wst.sse.ui.preferences.dtd.styles"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
-		<!-- provide syntax highlighting for DTD subset within XML -->
-		<provisionalConfiguration
-			type="linestyleprovider"
-			class="org.eclipse.wst.dtd.ui.internal.style.LineStyleProviderForDTDSubSet"
-			target="org.eclipse.wst.xml.dtd.internal_subset" />
-		<provisionalDefinition
-			type="spellingregions"
-			value="org.eclipse.wst.dtd.core.internal.util.parser.DTDRegionTypes.COMMENT_CONTENT"
-			target="org.eclipse.wst.dtd.core.dtdsource" />
-	</extension>
-
-	<extension point="org.eclipse.ui.editorActions">
-		<editorContribution
-			id="org.eclipse.wst.dtd.core.dtdsource.source.editorActions"
-			targetID="org.eclipse.wst.dtd.core.dtdsource.source">
-			<action
-				id="StructureSelectEnclosing"
-				label="%StructureSelectEnclosing_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
-				tooltip="%StructureSelectEnclosing_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate"
-				actionID="StructureSelectEnclosing">
-			</action>
-			<action
-				id="StructureSelectNext"
-				label="%StructureSelectNext_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.next"
-				tooltip="%StructureSelectNext_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate"
-				actionID="StructureSelectNext">
-			</action>
-			<action
-				id="StructureSelectPrevious"
-				label="%StructureSelectPrevious_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
-				tooltip="%StructureSelectPrevious_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate"
-				actionID="StructureSelectPrevious">
-			</action>
-			<action
-				id="StructureSelectHistory"
-				label="%StructureSelectHistory_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.last"
-				tooltip="%StructureSelectHistory_tooltip"
-				class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
-				actionID="StructureSelectHistory">
-			</action>
-		</editorContribution>
-        <editorContribution
-            targetID="org.eclipse.wst.dtd.core.dtdsource.source"
-            id="org.eclipse.wst.dtd.core.dtdsource.ruler.actions">
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%SelectRuler.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
-
-	<!-- use a specific annotation model with FileBuffers -->
-	<extension
-		point="org.eclipse.core.filebuffers.annotationModelCreation">
-		<factory
-			contentTypeId="org.eclipse.wst.dtd.core.dtdsource"
-			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
-	</extension>
-
-	<!-- Register the UI adapter factory provider -->
-	<extension
-		point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
-		<adapterFactoryDescription
-			class="org.eclipse.wst.dtd.ui.internal.registry.AdapterFactoryProviderForDTD">
-			<contentType id="org.eclipse.wst.dtd.core.dtdsource" />
-		</adapterFactoryDescription>
-	</extension>
-
-	<!-- Editor actionsets -->
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part id="org.eclipse.wst.dtd.core.dtdsource.source" />
-		</actionSetPartAssociation>
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.NavigateActionSet">
-			<part id="org.eclipse.wst.dtd.core.dtdsource.source" />
-		</actionSetPartAssociation>
-	</extension>
-
-	<extension point="org.eclipse.ui.preferencePages">
-		<page
-			name="%_UI_LABEL_DTD_FILES"
-			category="org.eclipse.wst.xml.ui.preferences.xml"
-			class="org.eclipse.wst.dtd.ui.internal.preferences.DTDFilesPreferencePage"
-			id="org.eclipse.wst.dtd.ui.preferences.dtd">
-         	<keywordReference id="org.eclipse.wst.dtd.ui.files"/>
-		</page>
-		<page
-			name="%DTD_Templates.name"
-			category="org.eclipse.wst.dtd.ui.preferences.dtd"
-			class="org.eclipse.wst.dtd.ui.internal.preferences.DTDTemplatePreferencePage"
-			id="org.eclipse.wst.sse.ui.preferences.dtd.templates">
-         	<keywordReference id="org.eclipse.wst.dtd.ui.templates"/>
-		</page>
-		<page
-			name="%DTD_Syntax_Coloring"
-			category="org.eclipse.wst.dtd.ui.preferences.dtd"
-			class="org.eclipse.wst.dtd.ui.internal.preferences.DTDSyntaxColoringPage"
-			id="org.eclipse.wst.sse.ui.preferences.dtd.styles">
-         	<keywordReference id="org.eclipse.wst.dtd.ui.styles"/>
-		</page>
-	</extension>
-	
-	<!-- Keywords for preference and properties pages -->
-	<extension point="org.eclipse.ui.keywords">
-		<keyword
-			label="%preferenceKeywords.files"
-			id="org.eclipse.wst.dtd.ui.files"/>
-		<keyword
-			label="%preferenceKeywords.templates"
-			id="org.eclipse.wst.dtd.ui.templates"/>
-		<keyword
-			label="%preferenceKeywords.styles"
-			id="org.eclipse.wst.dtd.ui.styles"/>
-    </extension>
-
-	<!-- New DTD wizard -->
-	<extension point="org.eclipse.ui.newWizards">
-		<wizard
-			id="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard"
-			name="%_UI_WIZARD_NEW_DTD"
-			class="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard"
-			category="org.eclipse.wst.XMLCategory"
-			icon="$nl$/icons/full/etool16/newdtd_wiz.gif">
-			<description>%_UI_CREATE_NEW_DTD_FILE</description>
-			<selection class="org.eclipse.core.resources.IResource" />
-		</wizard>
-	</extension>
-
-	<!-- initialize DTD ui preferences -->
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.dtd.ui.internal.preferences.DTDUIPreferenceInitializer" />
-	</extension>
-
-	<extension point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="org.eclipse.wst.dtd.core.dtdsource.source.RulerContext"
-			id="org.eclipse.ui.texteditor.ruler.context.actions">
-			<action
-				label="%AddTask.label"
-				helpContextId="org.eclipse.ui.AddTask_action_context"
-				class="org.eclipse.ui.texteditor.TaskRulerAction"
-				tooltip="%AddTask.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.TaskRulerAction">
-			</action>
-			<action
-				label="%AddBookmark.label"
-				helpContextId="org.eclipse.ui.bookmark_action_context"
-				class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-				tooltip="%AddBookmark.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-			</action>
-		</viewerContribution>
-	</extension>
-
-	<!-- Templates -->
-	<extension point="org.eclipse.ui.editors.templates">
-		<contextType
-			name="%DTD_New_context_type_Extension_Element.name"
-			class="org.eclipse.wst.dtd.ui.internal.templates.TemplateContextTypeDTD"
-			id="dtd_new">
-		</contextType>
-  <include
-        file="templates/dtddefault-templates.xml"
-        translations="$nl$/templates/dtddefault-templates.properties">
-  </include>
-	</extension>
-
-   <extension
-         id="org.eclipse.wst.dtd.ui.propertyContributor"
-         point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-      <propertyContributor
-            contributorId="org.eclipse.wst.dtd.core.dtdsource.source"
-            labelProvider="org.eclipse.wst.dtd.ui.internal.properties.section.DTDSectionLabelProvider"
-            typeMapper="org.eclipse.wst.dtd.ui.internal.properties.section.DTDTypeMapper">
-         <propertyCategory
-               category="dtd.ui.general"/>
-         <propertyCategory
-               category="dtd.ui.other"/>
-         <propertyCategory
-               category="dtd.ui.attributes"/>
-         <propertyCategory
-               category="dtd.ui.documentation"/>
-      </propertyContributor>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-      <propertyTabs
-            contributorId="org.eclipse.wst.dtd.core.dtdsource.source">
-         <propertyTab
-               label="%_UI_LABEL_GENERAL"
-               category="dtd.ui.general"
-               id="org.eclipse.wst.dtd.ui.general"/>
-         <propertyTab
-               afterTab="org.eclipse.wst.dtd.ui.general"
-               category="dtd.ui.attributes"
-               id="org.eclipse.wst.dtd.ui.attributes"
-               label="%_UI_LABEL_ATTRIBUTES"/>
-         <propertyTab
-               afterTab="org.eclipse.wst.dtd.ui.attributes"
-               category="dtd.ui.other"
-               id="org.eclipse.wst.dtd.ui.other"
-               label="%_UI_LABEL_OTHER"/>
-         <propertyTab
-               afterTab="org.eclipse.wst.dtd.ui.attributes"
-               category="dtd.ui.documentation"
-               id="org.eclipse.wst.dtd.ui.documentation"
-               label="%_UI_LABEL_DOCUMENTATION"/>
-      </propertyTabs>
-   </extension>   
-
-<extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-   <propertySections contributorId="org.eclipse.wst.dtd.core.dtdsource.source">
-	 <propertySection
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.NameSection"
-        enablesFor="1"
-        id="org.eclipse.wst.dtd.ui.internal.properties.section.NameSection"
-        tab="org.eclipse.wst.dtd.ui.general">
-		    <input type="org.eclipse.wst.dtd.core.internal.Element"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.Attribute"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.AttributeList"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.Notation"/>
-	 </propertySection>
-	 
-	 <propertySection tab="org.eclipse.wst.dtd.ui.general" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.AttributeDefaultSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.AttributeDefaultSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.Attribute"/>
-	 </propertySection>
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.general" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.CommentSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.CommentSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.Comment"/>
-	 </propertySection>
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.general" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelGroupSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelGroupSection">
-	    	<input type="org.eclipse.wst.dtd.core.internal.CMGroupNode"/>
-	 </propertySection>
-	 	
-	 <propertySection
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelNameSection"
-        filter="org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelNameFilter"
-        id="org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelNameSection"
-        enablesFor="1"
-        tab="org.eclipse.wst.dtd.ui.general">
-		    <input type="org.eclipse.wst.dtd.core.internal.CMBasicNode"/>
-	 </propertySection>
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.other" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelTypeSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelTypeSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.CMBasicNode"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.CMGroupNode"/>
-	 </propertySection>
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.documentation" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.DocumentSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.DocumentSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.Element"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.Entity"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.AttributeList"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.Notation"/>
-	 </propertySection>
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.general" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.EmptySection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.EmptySection">
-		    <input type="org.eclipse.wst.dtd.core.internal.ParameterEntityReference"/>
-		 	<input type="org.eclipse.wst.sse.core.internal.provisional.IndexedRegion"/>
-	 </propertySection>
-	 	
-	 <!--	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.other" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.EntityTypeSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.EntityTypeSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.Entity"/>
-	 </propertySection>
-
-	 <propertySection tab="org.eclipse.wst.dtd.ui.attributes" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.EntityValueSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.EntityValueSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.Entity"/>
-	 </propertySection>
-	 -->
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.general" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.NewEntitySection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.NewEntitySection">
-		    <input type="org.eclipse.wst.dtd.core.internal.DTDFile"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.Entity"/>
-	 </propertySection>
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.general" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.NotationSection"  
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.NotationSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.Notation"/>
-	 </propertySection>
-	 	
-	 <propertySection tab="org.eclipse.wst.dtd.ui.attributes" 
-        enablesFor="1"
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.OccurrenceSection"  
-        filter="org.eclipse.wst.dtd.ui.internal.properties.section.OccurrenceFilter"
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.OccurrenceSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.CMBasicNode"/>
-		    <input type="org.eclipse.wst.dtd.core.internal.CMRepeatableNode"/>
-	 </propertySection>
-
-	 <propertySection tab="org.eclipse.wst.dtd.ui.attributes" 
-        class="org.eclipse.wst.dtd.ui.internal.properties.section.TypeSection"  
-        enablesFor="1"
-	 	id="org.eclipse.wst.dtd.ui.internal.properties.section.TypeSection">
-		    <input type="org.eclipse.wst.dtd.core.internal.Attribute"/>
-	 </propertySection>
-  </propertySections>
-</extension>
-
-	<!-- Define theme -->
-	<extension
-		point="org.eclipse.ui.themes">
-		<theme
-			id="org.eclipse.ui.ide.systemDefault">
-			<colorOverride
-				id="dtdDefault"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="dtdTag"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="dtdTagName"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="dtdComment"
-				value="COLOR_LIST_SELECTION">
-			</colorOverride>
-			<colorOverride
-				id="dtdKeyword"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="dtdString"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="dtdData"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="dtdSymbol"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-		</theme>
-		<colorDefinition
-			id="dtdDefault"
-			isEditable="false"
-			label="%Colors.dtdDefault"
-			value="0, 0, 0">
-		</colorDefinition>
-		<colorDefinition
-			id="dtdTag"
-			isEditable="false"
-			label="%Colors.dtdTag"
-			value="63, 63, 191">
-		</colorDefinition>
-		<colorDefinition
-			id="dtdTagName"
-			isEditable="false"
-			label="%Colors.dtdTagName"
-			value="63, 63, 191">
-		</colorDefinition>
-		<colorDefinition
-			id="dtdComment"
-			isEditable="false"
-			label="%Colors.dtdComment"
-			value="127, 127, 127">
-		</colorDefinition>
-		<colorDefinition
-			id="dtdKeyword"
-			isEditable="false"
-			label="%Colors.dtdKeyword"
-			value="128, 0, 0">
-		</colorDefinition>
-		<colorDefinition
-			id="dtdString"
-			isEditable="false"
-			label="%Colors.dtdString"
-			value="63, 159, 95">
-		</colorDefinition>
-		<colorDefinition
-			id="dtdData"
-			isEditable="false"
-			label="%Colors.dtdData"
-			value="191, 95, 95">
-		</colorDefinition>
-		<colorDefinition
-			id="dtdSymbol"
-			isEditable="false"
-			label="%Colors.dtdSymbol"
-			value="128, 0, 0">
-		</colorDefinition>
-	</extension>
-
- <extension point="org.eclipse.ui.menus">
-	<menuContribution locationURI="toolbar:org.eclipse.wst.xml.ui.perspective.NewFileToolBar">
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              icon="icons/full/etool16/newdtd_wiz.gif"
-              id="org.eclipse.wst.dtd.ui.newDTDFile"
-              style="push"
-              tooltip="%DTD_New_context_type_Extension_Element.name">
-             <parameter name="newWizardId" value="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard"/>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-				<equals value="org.eclipse.wst.xml.ui.perspective"/>
-			</with>
-           </visibleWhen>         
-        </command>
-     </menuContribution>
-  </extension>
-
- <extension point="org.eclipse.ui.navigator.navigatorContent">
-	<commonWizard type="new" wizardId="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard">
-		<enablement>
-		</enablement>
-	</commonWizard>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDEditor.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDEditor.java
deleted file mode 100644
index 9dad7fb..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDEditor.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal;
-
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-
-/**
- * A DTD Editor subclass StructuredTextEditor, required to supply a complete
- * replacement for the property sheet page. When a better solution is found,
- * this class will be removed.
- */
-public class DTDEditor extends StructuredTextEditor {
-	class DTDPropertySheetPageContributor implements ITabbedPropertySheetPageContributor {
-		DTDPropertySheetPageContributor() {
-			super();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor#getContributorId()
-		 */
-		public String getContributorId() {
-			return getEditorSite().getId();
-		}
-	}
-
-	TabbedPropertySheetPage fPropertySheetPage;
-
-	public DTDEditor() {
-		super();
-	}
-
-	/*
-	 * @see IAdaptable#getAdapter(Class)
-	 */
-	public Object getAdapter(Class required) {
-		if (IPropertySheetPage.class.equals(required)) {
-			if (fPropertySheetPage == null) {
-				fPropertySheetPage = new DTDTabbedPropertySheetPage(new DTDPropertySheetPageContributor());
-				/*
-				 * Add the property sheet page as a direct post selection
-				 * listener so standard cursor navigation triggers a selection
-				 * notification. The default tabbed property sheet does not
-				 * listen to post selection.
-				 */
-				((IPostSelectionProvider) getSelectionProvider()).addPostSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						if (fPropertySheetPage != null && !fPropertySheetPage.getControl().isDisposed()) {
-							fPropertySheetPage.selectionChanged(DTDEditor.this, getSelectionProvider().getSelection());
-						}
-					}
-				});
-			}
-			return fPropertySheetPage;
-		}
-		return super.getAdapter(required);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.StructuredTextEditor#init(org.eclipse.ui.IEditorSite,
-	 *      org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput editorInput) throws PartInitException {
-		super.init(site, editorInput);
-
-		IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		IWorkbenchPage page = dw.getActivePage();
-		try {
-			if (page != null) {
-				page.showView(IPageLayout.ID_PROP_SHEET);
-			}
-		}
-		catch (PartInitException e) {
-			Logger.logException(e);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDPropertiesMessages.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDPropertiesMessages.java
deleted file mode 100644
index eb8f90c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDPropertiesMessages.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-public class DTDPropertiesMessages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages"; //$NON-NLS-1$
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.OccurrenceSection.java
-	public static String _UI_ONCE;
-	public static String _UI_ONE_OR_MORE;
-	public static String _UI_OPTIONAL;
-	public static String _UI_ZERO_OR_MORE;
-	public static String _UI_LABEL_OCCURRENCE;
-	// org.eclipse.wst.dtd.ui.internal.properties.section.AttribueDefaultSection.java
-	public static String _UI_DEFAULT;
-	public static String _UI_LABEL_USAGE;
-	public static String _UI_LABEL_DEFAULT_VALUE;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelGroupSection.java
-	public static String _UI_SEQUENCE;
-	public static String _UI_CHOICE;
-	public static String _UI_LABEL_MODEL_GROUP;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelNameSection.java
-	public static String _UI_LABEL_CONTENT_MODEL;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelTypeSection.java
-	public static String _UI_LABEL_CONTENT_TYPE;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.NameSection.java
-	public static String _UI_LABEL_NAME;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.TypeSection.java
-	public static String _UI_LABEL_TYPE;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.EntityTypeSection.java
-	public static String _UI_LABEL_ENTITY_TYPE;
-	public static String _UI_LABEL_EXTERNAL_ENTITY;
-	public static String _UI_LABEL_PARAMETER_ENTITY;
-	public static String _UI_LABEL_GENERAL_ENTITY;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.EntityValueSection.java
-	public static String _UI_LABEL_ENTITY_VALUE;
-	public static String _UI_LABEL_PUBLIC_ID;
-	public static String _UI_LABEL_SYSTEM_ID;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.DTDSectionLabelProvider
-	public static String _UI_PROPERTIES_VIEW_TITLE_ELEMENT;
-	public static String _UI_PROPERTIES_VIEW_TITLE_ELEMENT_REF;
-	public static String _UI_PROPERTIES_VIEW_TITLE_CHOICE;
-	public static String _UI_PROPERTIES_VIEW_TITLE_SEQUENCE;
-	public static String _UI_PROPERTIES_VIEW_TITLE_ATTRIBUTE;
-	public static String _UI_PROPERTIES_VIEW_TITLE_ATTLIST;
-	public static String _UI_PROPERTIES_VIEW_TITLE_COMMENT;
-	public static String _UI_PROPERTIES_VIEW_TITLE_ENTITY;
-	public static String _UI_PROPERTIES_VIEW_TITLE_NOTATION;
-
-	// org.eclipse.wst.dtd.ui.internal.properties.section.NewEntitySection
-	public static String _UI_FILEDIALOG_SELECT_DTD;
-	public static String _UI_FILEDIALOG_SELECT_DTD_DESC;
-
-	// New property tabs
-	public static String _UI_LABEL_GENERAL;
-	public static String _UI_LABEL_OTHER;
-	public static String _UI_LABEL_ATTRIBUTES;
-	public static String _UI_LABEL_DOCUMENTATION;
-	public static String DTDEditor_0;
-	public static String DTDEditor_1;
-	public static String DTDEditor_2;
-	public static String DTDEditor_3;
-	public static String DTDSectionLabelProvider_0;
-	public static String DTDSectionLabelProvider_1;
-	public static String DTDSectionLabelProvider_10;
-	public static String DTDSectionLabelProvider_11;
-	public static String DTDSectionLabelProvider_6;
-	public static String DTDSectionLabelProvider_7;
-	public static String DTDSectionLabelProvider_8;
-	public static String DTDSectionLabelProvider_9;
-
-	private static ResourceBundle fResourceBundle;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, DTDPropertiesMessages.class);
-	}
-
-	public static ResourceBundle getResourceBundle() {
-		try {
-			if (fResourceBundle == null)
-				fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
-		}
-		catch (MissingResourceException x) {
-			fResourceBundle = null;
-		}
-		return fResourceBundle;
-	}
-
-	private DTDPropertiesMessages() {
-		super();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDPropertiesMessages.properties b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDPropertiesMessages.properties
deleted file mode 100644
index dd19ba9..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDPropertiesMessages.properties
+++ /dev/null
@@ -1,86 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-! Properties file for component: XML tools DTD Editor
-! Packaged for translation in:  xml.zip
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.OccurrenceSection.java
-_UI_ONCE             = Just once (1)
-_UI_ONE_OR_MORE      = One or more (+)
-_UI_OPTIONAL         = Optional (?)
-_UI_ZERO_OR_MORE     = Zero or more (*)
-_UI_LABEL_OCCURRENCE = Occurrence
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.AttributeDefaultSection.java
-_UI_DEFAULT             = Default
-_UI_LABEL_USAGE         = Usage
-_UI_LABEL_DEFAULT_VALUE = Default Value
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelGroupSection.java
-_UI_SEQUENCE          = Sequence (,)
-_UI_CHOICE            = Choice (|)
-_UI_LABEL_MODEL_GROUP = Model Group
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelNameSection.java
-_UI_LABEL_CONTENT_MODEL = Content Model
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.ContentModelTypeSection.java
-_UI_LABEL_CONTENT_TYPE = Content Type
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.NameSection.java
-_UI_LABEL_NAME = Name
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.TypeSection.java
-_UI_LABEL_TYPE = Type
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.EntityTypeSection.java
-_UI_LABEL_ENTITY_TYPE      = Entity Type
-_UI_LABEL_EXTERNAL_ENTITY  = External
-_UI_LABEL_PARAMETER_ENTITY = Parameter
-_UI_LABEL_GENERAL_ENTITY   = General
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.EntityValueSection.java
-_UI_LABEL_ENTITY_VALUE = Entity Value
-_UI_LABEL_PUBLIC_ID    = Public ID
-_UI_LABEL_SYSTEM_ID    = System ID
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.DTDSectionLabelProvider
-_UI_PROPERTIES_VIEW_TITLE_ELEMENT     = element
-_UI_PROPERTIES_VIEW_TITLE_ELEMENT_REF = element reference
-_UI_PROPERTIES_VIEW_TITLE_CHOICE      = choice
-_UI_PROPERTIES_VIEW_TITLE_SEQUENCE    = sequence
-_UI_PROPERTIES_VIEW_TITLE_ATTRIBUTE   = attribute
-_UI_PROPERTIES_VIEW_TITLE_ATTLIST     = attribute list
-_UI_PROPERTIES_VIEW_TITLE_COMMENT     = comment
-_UI_PROPERTIES_VIEW_TITLE_ENTITY      = entity
-_UI_PROPERTIES_VIEW_TITLE_NOTATION    = notation
-
-! org.eclipse.wst.dtd.ui.internal.properties.section.NewEntitySection
-_UI_FILEDIALOG_SELECT_DTD = Select DTD file
-_UI_FILEDIALOG_SELECT_DTD_DESC   = Select a DTD file from the Workbench projects
-
-! New property tabs
-_UI_LABEL_GENERAL       = General
-_UI_LABEL_OTHER         = Other
-_UI_LABEL_ATTRIBUTES    = Attributes
-_UI_LABEL_DOCUMENTATION = Documentation
-! end
-DTDEditor_0=general
-DTDEditor_1=other
-DTDEditor_2=attributes
-DTDEditor_3=documentation
-DTDSectionLabelProvider_0=choice
-DTDSectionLabelProvider_1=sequence
-DTDSectionLabelProvider_6=element
-DTDSectionLabelProvider_7=attribute
-DTDSectionLabelProvider_8=attribute list
-DTDSectionLabelProvider_9=comment
-DTDSectionLabelProvider_10=entity
-DTDSectionLabelProvider_11=notation
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDTabbedPropertySheetPage.java
deleted file mode 100644
index 10ca85e..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/DTDTabbedPropertySheetPage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-class DTDTabbedPropertySheetPage extends TabbedPropertySheetPage {
-
-	private ISelection oldSelection = null;
-
-	public DTDTabbedPropertySheetPage(ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor) {
-		super(tabbedPropertySheetPageContributor);
-	}
-
-	public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-		IWorkbenchWindow workbenchWindow = getSite().getWorkbenchWindow();
-		if (workbenchWindow != null) {
-			IWorkbenchPage activePage = workbenchWindow.getActivePage();
-			if (activePage != null) {
-				IEditorPart activeEditor = activePage.getActiveEditor();
-				if (activeEditor != null) {
-					// make sure the correct editor is active
-					if (activeEditor.getAdapter(IPropertySheetPage.class) == DTDTabbedPropertySheetPage.this) {
-						if (oldSelection == null || !oldSelection.equals(selection)) {
-							oldSelection = selection;
-							super.selectionChanged(part, selection);
-						}
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AbstractSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AbstractSection.java
deleted file mode 100644
index 2674741..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AbstractSection.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.part.EditorActionBarContributor;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.w3c.dom.Element;
-
-public class AbstractSection implements ISection, IPropertyChangeListener, Listener, SelectionListener {
-	private TabbedPropertySheetWidgetFactory factory;
-	protected IWorkbenchPart fWorkbenchPart;
-	protected ISelection fSelection;
-	protected Object fInput;
-	protected int rightMarginSpace;
-
-	public void createControls(Composite parent, TabbedPropertySheetPage tabbedPropertySheetPage) {
-		createControls(parent, tabbedPropertySheetPage.getWidgetFactory());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory aFactory) {
-		this.factory = aFactory;
-		GC gc = new GC(parent);
-		Point extent = gc.textExtent("  ...  "); //$NON-NLS-1$
-		rightMarginSpace = extent.x;
-		gc.dispose();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#setInput(org.eclipse.ui.IWorkbenchPart,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void setInput(IWorkbenchPart part, ISelection sel) {
-		Assert.isTrue(sel instanceof IStructuredSelection, "selection " + sel.getClass() + "is not structured"); //$NON-NLS-1$ //$NON-NLS-2$
-		this.fWorkbenchPart = part;
-		this.fSelection = sel;
-		this.fInput = ((IStructuredSelection) fSelection).getFirstElement();
-		/*
-		 * if (fInput instanceof XSDConcreteComponent) { xsdSchema =
-		 * ((XSDConcreteComponent)fInput).getSchema(); }
-		 */
-
-		// refresh();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeShown()
-	 */
-	public void aboutToBeShown() {
-		refresh();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#aboutToBeHidden()
-	 */
-	public void aboutToBeHidden() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#dispose()
-	 */
-	public void dispose() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#getMinimumHeight()
-	 */
-	public int getMinimumHeight() {
-		return SWT.DEFAULT;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-	 */
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#refresh()
-	 */
-	public void refresh() {
-		// TODO Auto-generated method stub
-	}
-
-	public Object getInput() {
-		if (fInput instanceof Element) {
-			// fInput = xsdSchema.getCorrespondingComponent((Element)fInput);
-		}
-		return fInput;
-	}
-
-	/**
-	 * Get the widget factory.
-	 * 
-	 * @return the widget factory.
-	 */
-	public TabbedPropertySheetWidgetFactory getWidgetFactory() {
-		return factory;
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		refresh();
-	}
-
-	public void doWidgetDefaultSelected(SelectionEvent e) {
-	}
-
-	public void doWidgetSelected(SelectionEvent e) {
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(SelectionEvent)
-	 */
-	public void widgetDefaultSelected(SelectionEvent e) {
-		if (isListenerEnabled() && getInput() != null && !isInDoHandle) {
-			isInDoHandle = true;
-			doWidgetDefaultSelected(e);
-			isInDoHandle = false;
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-	 */
-	public void widgetSelected(SelectionEvent e) {
-		if (isListenerEnabled() && getInput() != null && !isInDoHandle) {
-			isInDoHandle = true;
-			doWidgetSelected(e);
-			isInDoHandle = false;
-		}
-
-	}
-
-	boolean listenerEnabled = true;
-
-	/**
-	 * Get the value of listenerEnabled.
-	 * 
-	 * @return value of listenerEnabled.
-	 */
-	public boolean isListenerEnabled() {
-		return listenerEnabled;
-	}
-
-	/**
-	 * Set the value of listenerEnabled.
-	 * 
-	 * @param v
-	 *            Value to assign to listenerEnabled.
-	 */
-	public void setListenerEnabled(boolean v) {
-		this.listenerEnabled = v;
-	}
-
-	public void handleEvent(Event event) {
-		if (isListenerEnabled() && !isInDoHandle) {
-			isInDoHandle = true;
-			startDelayedEvent(event);
-			isInDoHandle = false;
-		} // end of if ()
-	}
-
-	public void doHandleEvent(Event event) {
-
-	}
-
-	protected DelayedEvent delayedTask;
-
-	protected void startDelayedEvent(Event e) {
-		if (delayedTask == null || delayedTask.getEvent() == null) {
-			delayedTask = new DelayedEvent();
-			delayedTask.setEvent(e);
-			Display.getDefault().timerExec(500, delayedTask);
-		}
-		else {
-			Event delayedEvent = delayedTask.getEvent();
-
-			if (e.widget == delayedEvent.widget && e.type == delayedEvent.type) {
-				// same event, just different data, delay new event
-				delayedTask.setEvent(null);
-			}
-			delayedTask = new DelayedEvent();
-			delayedTask.setEvent(e);
-			Display.getDefault().timerExec(500, delayedTask);
-		}
-	}
-
-	class DelayedEvent implements Runnable {
-		protected Event event;
-
-		/*
-		 * @see Runnable#run()
-		 */
-		public void run() {
-			if (event != null) {
-				isInDoHandle = true;
-				doHandleEvent(event);
-				isInDoHandle = false;
-				event = null;
-			}
-		}
-
-		/**
-		 * Gets the event.
-		 * 
-		 * @return Returns a Event
-		 */
-		public Event getEvent() {
-			return event;
-		}
-
-		/**
-		 * Sets the event.
-		 * 
-		 * @param event
-		 *            The event to set
-		 */
-		public void setEvent(Event e) {
-			this.event = e;
-		}
-
-	}
-
-	boolean isInDoHandle;
-
-	/**
-	 * Get the value of isInDoHandle.
-	 * 
-	 * @return value of isInDoHandle.
-	 */
-	public boolean isInDoHandle() {
-		return isInDoHandle;
-	}
-
-	static protected IEditorPart getActiveEditor() {
-		IWorkbench workbench = DTDUIPlugin.getDefault().getWorkbench();
-		IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-		IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-
-		return editorPart;
-	}
-
-	static protected IStatusLineManager getStatusLineManager(IEditorPart editorPart) {
-		IStatusLineManager result = null;
-		try {
-			EditorActionBarContributor contributor = (EditorActionBarContributor) editorPart.getEditorSite().getActionBarContributor();
-			result = contributor.getActionBars().getStatusLineManager();
-		}
-		catch (Exception e) {
-		}
-		return result;
-	}
-
-	DocumentImpl getDocument(Element element) {
-		return (DocumentImpl) element.getOwnerDocument();
-	}
-
-	public void beginRecording(String description, Element element) {
-		DocumentImpl doc = getDocument(element);
-		doc.getModel().beginRecording(this, description);
-	}
-
-	public void endRecording(Element element) {
-		DocumentImpl doc = getDocument(element);
-
-		doc.getModel().endRecording(this);
-	}
-
-	protected boolean validateName(String name) {
-		return true;
-	}
-
-	protected boolean validateLanguage(String lang) {
-		return true;
-	}
-
-	protected boolean validatePrefix(String prefix) {
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AttributeDefaultSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AttributeDefaultSection.java
deleted file mode 100644
index 224b185..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/AttributeDefaultSection.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class AttributeDefaultSection extends AbstractSection {
-
-	private final String IMPLIED = Attribute.IMPLIED;
-	private final String REQUIRED = Attribute.REQUIRED;
-	private final String FIXED = Attribute.FIXED;
-
-	private CCombo usageCombo;
-	private String[] usageComboValues = {IMPLIED, REQUIRED, FIXED, DTDPropertiesMessages._UI_DEFAULT};
-	private Text defaultValueText;
-	private CLabel defaultValueLabel;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel usageLabel = getWidgetFactory().createCLabel(composite, DTDPropertiesMessages._UI_LABEL_USAGE);
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = usageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		usageLabel.setLayoutData(data);
-
-		usageCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-		data = new FormData();
-		data.left = new FormAttachment(usageLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(usageLabel, 0, SWT.CENTER);
-		usageCombo.setLayoutData(data);
-		usageCombo.addSelectionListener(this);
-		usageCombo.setItems(usageComboValues);
-
-		// Create label first then attach other control to it
-		defaultValueLabel = getWidgetFactory().createCLabel(composite, DTDPropertiesMessages._UI_LABEL_DEFAULT_VALUE);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		p = defaultValueLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(usageLabel, +ITabbedPropertyConstants.VSPACE);
-		defaultValueLabel.setLayoutData(data);
-
-		defaultValueText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(defaultValueLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(defaultValueLabel, 0, SWT.CENTER);
-		defaultValueText.setLayoutData(data);
-		defaultValueText.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		Object input = getInput();
-		if (input != null) {
-			if (input instanceof Attribute) {
-				String kind = ((Attribute) input).getDefaultKind();
-				if ("".equals(kind)) //$NON-NLS-1$
-					usageCombo.setText(DTDPropertiesMessages._UI_DEFAULT);
-				else
-					usageCombo.setText(kind);
-
-				if ("".equals(kind) || FIXED.equals(kind)) { //$NON-NLS-1$
-					defaultValueLabel.setVisible(true);
-					defaultValueText.setVisible(true);
-					defaultValueText.setEnabled(true);
-					defaultValueText.setText(((Attribute) input).getDefaultValue());
-				}
-				else {
-					defaultValueText.setText(""); //$NON-NLS-1$
-					defaultValueLabel.setVisible(false);
-					defaultValueText.setVisible(false);
-					defaultValueText.setEnabled(false);
-				}
-			}
-		}
-		setListenerEnabled(true);
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == usageCombo) {
-			Object input = getInput();
-			if (input instanceof Attribute) {
-				String usage = usageCombo.getText();
-				Attribute attribute = (Attribute) input;
-				if (usage.equals(DTDPropertiesMessages._UI_DEFAULT))
-					attribute.setDefaultKind(""); //$NON-NLS-1$
-				else
-					attribute.setDefaultKind(usage);
-
-				if (DTDPropertiesMessages._UI_DEFAULT.equals(usage) || FIXED.equals(usage)) {
-					defaultValueLabel.setVisible(true);
-					defaultValueText.setVisible(true);
-					defaultValueText.setEnabled(true);
-				}
-				else {
-					defaultValueLabel.setVisible(false);
-					defaultValueText.setVisible(false);
-					defaultValueText.setEnabled(false);
-				}
-			}
-		}
-	}
-
-	public void doHandleEvent(Event event) {
-		Object input = getInput();
-		if (input instanceof Attribute) {
-			if (event.widget == defaultValueText) {
-				String newValue = defaultValueText.getText();
-				((Attribute) input).setDefaultValue(newValue, usageCombo.getText().equals(FIXED));
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/CommentSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/CommentSection.java
deleted file mode 100644
index 1c9f2df..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/CommentSection.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.Comment;
-
-public class CommentSection extends AbstractSection {
-	private Text commentText;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-		commentText = getWidgetFactory().createText(composite, "", SWT.MULTI | SWT.NONE); //$NON-NLS-1$
-		commentText.addListener(SWT.Modify, CommentSection.this);
-
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		data.bottom = new FormAttachment(100, 0);
-		commentText.setLayoutData(data);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		commentText.setEnabled(true);
-		Object input = getInput();
-		commentText.setText(""); //$NON-NLS-1$
-		if (input != null) {
-			if (input instanceof Comment)
-				commentText.setText(((Comment) input).getText());
-		}
-		setListenerEnabled(true);
-	}
-
-
-	public void doHandleEvent(Event event) {
-		Object input = getInput();
-		if (input != null) {
-			String newValue = commentText.getText();
-			if (newValue.length() > 0 && input instanceof Comment) {
-				Comment comment = (Comment) input;
-				comment.setText(newValue);
-			}
-		}
-
-	}
-
-	public boolean shouldUseExtraSpace() {
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelGroupSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelGroupSection.java
deleted file mode 100644
index 575185a..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelGroupSection.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class ContentModelGroupSection extends AbstractSection {
-	private final String SEQUENCE = DTDPropertiesMessages._UI_SEQUENCE;
-	private final String CHOICE = DTDPropertiesMessages._UI_CHOICE;
-	private final String MODEL_GROUP = DTDPropertiesMessages._UI_LABEL_MODEL_GROUP;
-
-	private CCombo modelGroupCombo;
-	private String[] modelGroupComboValues = {SEQUENCE, CHOICE};
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel cLabel = getWidgetFactory().createCLabel(composite, MODEL_GROUP);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		cLabel.setLayoutData(data);
-
-		modelGroupCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-		data = new FormData();
-		data.left = new FormAttachment(cLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100);
-		data.top = new FormAttachment(cLabel, 0, SWT.CENTER);
-		modelGroupCombo.setLayoutData(data);
-		modelGroupCombo.addSelectionListener(this);
-		modelGroupCombo.setItems(modelGroupComboValues);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		Object input = getInput();
-		if (input != null) {
-			if (input instanceof CMGroupNode) {
-				CMGroupNode node = (CMGroupNode) input;
-				char modelType = node.getConnector();
-				if (CMGroupNode.CHOICE == modelType)
-					modelGroupCombo.setText(CHOICE);
-				else if (CMGroupNode.SEQUENCE == modelType)
-					modelGroupCombo.setText(SEQUENCE);
-			}
-		}
-		setListenerEnabled(true);
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == modelGroupCombo) {
-			Object input = getInput();
-			if (input instanceof CMGroupNode) {
-				CMGroupNode node = (CMGroupNode) input;
-				if (CHOICE.equals(modelGroupCombo.getText()))
-					node.setConnector(CMGroupNode.CHOICE);
-				else if (SEQUENCE.equals(modelGroupCombo.getText()))
-					node.setConnector(CMGroupNode.SEQUENCE);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelNameFilter.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelNameFilter.java
deleted file mode 100644
index 7150bff..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelNameFilter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-
-public class ContentModelNameFilter implements IFilter {
-	public boolean select(Object toTest) {
-		return toTest instanceof CMBasicNode && !((CMBasicNode) toTest).isRootElementContent();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelNameSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelNameSection.java
deleted file mode 100644
index dfb1ecf..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelNameSection.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import java.util.Iterator;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class ContentModelNameSection extends AbstractSection {
-	private final String CONTENT_MODEL = DTDPropertiesMessages._UI_LABEL_CONTENT_MODEL;
-
-	private CCombo typeCombo;
-	private String[] typeComboValues = {CMNode.PCDATA};
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_MODEL);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		cLabel.setLayoutData(data);
-
-		typeCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT | SWT.READ_ONLY);
-		data = new FormData();
-		data.left = new FormAttachment(cLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100);
-		data.top = new FormAttachment(cLabel, 0, SWT.CENTER);
-		typeCombo.setLayoutData(data);
-		typeCombo.addSelectionListener(this);
-		typeCombo.setItems(typeComboValues);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		Object input = getInput();
-
-		if (input != null) {
-			if (input instanceof CMBasicNode) {
-				typeCombo.removeAll();
-				typeCombo.add(CMNode.PCDATA);
-				// NodeList list =
-				// ((CMBasicNode)fInput).getDTDFile().getElementsAndParameterEntityReferences();
-				Iterator iterator = ((CMBasicNode) input).getDTDFile().getNodes().iterator();
-				boolean isForRootContent = ((CMBasicNode) input).isRootElementContent();
-				while (iterator.hasNext()) {
-					DTDNode node = (DTDNode) iterator.next();
-					if (!isForRootContent && node instanceof Element)
-						typeCombo.add(node.getName());
-					if (node instanceof Entity && ((Entity) node).isParameterEntity())
-						typeCombo.add("%" + node.getName() + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-
-				typeCombo.setText(((CMBasicNode) input).getName());
-			}
-		}
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == typeCombo) {
-			Object input = getInput();
-			if (input instanceof CMBasicNode) {
-				CMBasicNode node = (CMBasicNode) input;
-				String selected = typeCombo.getText();
-				// if (CMNode.PCDATA.equals(selected))
-				node.setName(selected);
-			}
-		}
-	}
-
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelTypeFilter.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelTypeFilter.java
deleted file mode 100644
index 3fdac83..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelTypeFilter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-
-public class ContentModelTypeFilter implements IFilter {
-	public boolean select(Object toTest) {
-		if (toTest instanceof CMBasicNode && !((CMBasicNode) toTest).isRootElementContent())
-			return true;
-		if (toTest instanceof CMGroupNode && ((CMGroupNode) toTest).isRootElementContent())
-			return true;
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelTypeSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelTypeSection.java
deleted file mode 100644
index e64a895..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/ContentModelTypeSection.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import java.util.Iterator;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class ContentModelTypeSection extends AbstractSection {
-	private final String CONTENT_TYPE = DTDPropertiesMessages._UI_LABEL_CONTENT_TYPE;
-
-	private CCombo typeCombo;
-	private String[] typeComboValues = {CMNode.ANY, CMNode.EMPTY, CMNode.PCDATA, CMNode.CHILDREN, CMNode.MIXED};
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel cLabel = getWidgetFactory().createCLabel(composite, CONTENT_TYPE);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		cLabel.setLayoutData(data);
-
-		typeCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-		data = new FormData();
-		data.left = new FormAttachment(cLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100);
-		data.top = new FormAttachment(cLabel, 0, SWT.CENTER);
-		typeCombo.setLayoutData(data);
-		typeCombo.addSelectionListener(this);
-		typeCombo.setItems(typeComboValues);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		Object input = getInput();
-
-		if (input != null) {
-			if (input instanceof CMNode) {
-				typeCombo.removeAll();
-				typeCombo.add(CMNode.ANY);
-				typeCombo.add(CMNode.EMPTY);
-				typeCombo.add(CMNode.PCDATA);
-				typeCombo.add(CMNode.CHILDREN);
-				typeCombo.add(CMNode.MIXED);
-
-				Iterator iterator = ((CMNode) input).getDTDFile().getNodes().iterator();
-				String nodeName = null;
-				while (iterator.hasNext()) {
-					DTDNode node = (DTDNode) iterator.next();
-					nodeName = node.getName();
-					if (node instanceof Element && typeCombo.indexOf(nodeName) == -1)
-						typeCombo.add(nodeName);
-					else if (node instanceof Entity && ((Entity) node).isParameterEntity() && typeCombo.indexOf(nodeName) == -1)
-						typeCombo.add("%" + nodeName + ";"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				if (input instanceof CMGroupNode)
-					typeCombo.setText(((CMGroupNode) input).getType());
-				else if (input instanceof CMBasicNode)
-					typeCombo.setText(((CMBasicNode) input).getType());
-			}
-		} // end if (fInput != null)
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == typeCombo) {
-			Object input = getInput();
-			if (input instanceof CMGroupNode || input instanceof CMBasicNode) {
-				CMNode node = (CMNode) input;
-				String selected = typeCombo.getText();
-				if (CMNode.MIXED.equals(selected))
-					node.setMixedContent();
-				else if (CMNode.CHILDREN.equals(selected))
-					node.setChildrenContent(""); //$NON-NLS-1$
-				else if (CMNode.EMPTY.equals(selected) || CMNode.ANY.equals(selected) || CMNode.PCDATA.equals(selected))
-					node.setContent(selected);
-				else
-					node.setChildrenContent(selected);
-			}
-		}
-	}
-
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDSectionLabelProvider.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDSectionLabelProvider.java
deleted file mode 100644
index 4bd37ac..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDSectionLabelProvider.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.CMRepeatableNode;
-import org.eclipse.wst.dtd.core.internal.Comment;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.core.internal.Notation;
-import org.eclipse.wst.dtd.core.internal.ParameterEntityReference;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class DTDSectionLabelProvider extends LabelProvider {
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object object) {
-		if (object == null || object.equals(StructuredSelection.EMPTY)) {
-			return null;
-		}
-
-		Image result = null;
-
-		Object selected = object;
-		if (object instanceof IStructuredSelection) {
-			selected = ((IStructuredSelection) object).getFirstElement();
-		}
-		if (selected instanceof DTDFile) {
-			return null; // ((DTDFile) selected).getImage();
-		}
-		else if (selected instanceof DTDNode) {
-			if (selected instanceof ParameterEntityReference)
-				return null;
-			return ((DTDNode) selected).getImage();
-		}
-		else if (selected instanceof org.w3c.dom.Element) {
-			return null;
-		}
-		return result;
-	}
-
-	/**
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object object) {
-		if (object == null || object.equals(StructuredSelection.EMPTY)) {
-			return null;
-		}
-
-		Object selected = object;
-		if (object instanceof IStructuredSelection) {
-			selected = ((IStructuredSelection) object).getFirstElement();
-		}
-
-		if (selected instanceof DTDFile) {
-			return ((DTDFile) selected).getName();
-		}
-		else if (selected instanceof CMBasicNode) {
-			if (((CMBasicNode) selected).isReference())
-				return DTDPropertiesMessages._UI_PROPERTIES_VIEW_TITLE_ELEMENT_REF;
-			else
-				return ((CMBasicNode) selected).getName();
-		}
-		else if (selected instanceof CMRepeatableNode) {
-			CMRepeatableNode node = (CMRepeatableNode) selected;
-			String name = node.getName();
-			if (node instanceof CMGroupNode) {
-				if (((CMGroupNode) node).getConnector() == CMGroupNode.CHOICE)
-					name = DTDPropertiesMessages.DTDSectionLabelProvider_0;
-				else
-					name = DTDPropertiesMessages.DTDSectionLabelProvider_1;
-			}
-			char occurrence = node.getOccurrence();
-			switch (occurrence) {
-				case CMRepeatableNode.ONCE :
-					name += " [1..1]"; //$NON-NLS-1$
-					break;
-				case CMRepeatableNode.OPTIONAL :
-					name += " [0..1]"; //$NON-NLS-1$
-					break;
-				case CMRepeatableNode.ONE_OR_MORE :
-					name += " [1..*]"; //$NON-NLS-1$
-					break;
-				case CMRepeatableNode.ZERO_OR_MORE :
-					name += " [0..*]"; //$NON-NLS-1$
-					break;
-			}
-			return name;
-		}
-		else if (selected instanceof DTDNode) {
-			if (selected instanceof Element)
-				return DTDPropertiesMessages.DTDSectionLabelProvider_6;
-			else if (selected instanceof Attribute)
-				return DTDPropertiesMessages.DTDSectionLabelProvider_7;
-			else if (selected instanceof AttributeList)
-				return DTDPropertiesMessages.DTDSectionLabelProvider_8;
-			else if (selected instanceof Comment)
-				return DTDPropertiesMessages.DTDSectionLabelProvider_9;
-			else if (selected instanceof Entity)
-				return DTDPropertiesMessages.DTDSectionLabelProvider_10;
-			else if (selected instanceof Notation)
-				return DTDPropertiesMessages.DTDSectionLabelProvider_11;
-			else if (selected instanceof ParameterEntityReference)
-				// return "parameter entity reference";
-				return null;
-			else
-				return ((DTDNode) selected).getName();
-		}
-		else if (selected instanceof org.w3c.dom.Element) {
-			return ((org.w3c.dom.Element) selected).getLocalName();
-		}
-		else if (object instanceof ITextSelection) {
-			return ""; //$NON-NLS-1$
-		}
-		else
-			return object.toString();
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDSelectIncludeFileWizard.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDSelectIncludeFileWizard.java
deleted file mode 100644
index f315313..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDSelectIncludeFileWizard.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.common.ui.internal.viewers.SelectSingleFilePage;
-import org.eclipse.wst.dtd.core.internal.emf.DTDResource;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-
-/**
- * Extend the base wizard to select a file from the project or outside the
- * workbench and add error handling
- */
-class DTDSelectIncludeFileWizard extends Wizard implements INewWizard {
-	DTDSelectSingleFilePage filePage;
-
-	IFile resultFile;
-
-	public DTDSelectIncludeFileWizard(String title, String desc, ViewerFilter filter, IStructuredSelection selection) {
-		super();
-		setWindowTitle(title);
-		setDefaultPageImageDescriptor(AbstractUIPlugin.imageDescriptorFromPlugin(DTDUIPlugin.getDefault().getBundle().getSymbolicName(), DTDResource.NEWDTD));
-
-		// Select File Page
-		filePage = new DTDSelectSingleFilePage(PlatformUI.getWorkbench(), selection, true);
-		filePage.setTitle(title);
-		filePage.setDescription(desc);
-		filePage.addFilter(filter);
-	}
-
-	public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
-	}
-
-	public void addPages() {
-		addPage(filePage);
-	}
-
-	public boolean canFinish() {
-		return filePage.isPageComplete();
-	}
-
-	public boolean performFinish() {
-		resultFile = filePage.getFile();
-		return true;
-	}
-
-	public IFile getResultFile() {
-		return resultFile;
-	}
-
-	/**
-	 * Select DTD File
-	 */
-	class DTDSelectSingleFilePage extends SelectSingleFilePage {
-		public DTDSelectSingleFilePage(IWorkbench w, IStructuredSelection selection, boolean isFileMandatory) {
-			super(w, selection, isFileMandatory);
-		}
-
-		public boolean isPageComplete() {
-			return super.isPageComplete();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDTypeMapper.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDTypeMapper.java
deleted file mode 100644
index 04e35d8..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DTDTypeMapper.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.ui.views.properties.tabbed.ITypeMapper;
-
-public class DTDTypeMapper implements ITypeMapper {
-	public DTDTypeMapper() {
-		super();
-	}
-
-	public Class mapType(Object object) {
-		return object.getClass();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DocumentSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DocumentSection.java
deleted file mode 100644
index 4f720eb..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/DocumentSection.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import java.util.Iterator;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.Comment;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-
-public class DocumentSection extends AbstractSection {
-	private Text commentText;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-		commentText = getWidgetFactory().createText(composite, "", SWT.MULTI | SWT.NONE); //$NON-NLS-1$
-		commentText.addListener(SWT.Modify, this);
-
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		data.bottom = new FormAttachment(100, 0);
-		commentText.setLayoutData(data);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		commentText.setEnabled(true);
-		Object input = getInput();
-		commentText.setText(""); //$NON-NLS-1$
-		if (input != null) {
-			if (input instanceof DTDNode) {
-				Comment comment = getCommentNode((DTDNode) input);
-				if (comment != null)
-					commentText.setText(comment.getText());
-			}
-		}
-		setListenerEnabled(true);
-	}
-
-	public void doHandleEvent(Event event) {
-		Object input = getInput();
-		if (input != null) {
-			String newValue = commentText.getText();
-			if (input instanceof DTDNode) {
-				Comment comment = getCommentNode((DTDNode) input);
-				if (comment != null)
-					comment.setText(newValue);
-				else {
-					// Create a new comment node.
-					((DTDNode) input).getDTDFile().createComment((DTDNode) input, newValue, false);
-				}
-			}
-		}
-
-	}
-
-	private Comment getCommentNode(DTDNode node) {
-		Iterator iterator = node.getDTDFile().getNodes().iterator();
-		DTDNode currentNode = null;
-		DTDNode prevNode = null;
-		while (iterator.hasNext()) {
-			currentNode = (DTDNode) iterator.next();
-			if (node == currentNode && prevNode != null && prevNode instanceof Comment)
-				return (Comment) prevNode;
-			else
-				prevNode = currentNode;
-		}
-		return null;
-	}
-
-	public boolean shouldUseExtraSpace() {
-		return true;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EmptySection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EmptySection.java
deleted file mode 100644
index 78f4293..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EmptySection.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-public class EmptySection extends AbstractSection {
-	public void doHandleEvent(Event event) {
-		super.doHandleEvent(event);
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		super.refresh();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-	 */
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-	
-	public int getMinimumHeight() {
-		return 0;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EntityTypeSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EntityTypeSection.java
deleted file mode 100644
index 3f634ba..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EntityTypeSection.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class EntityTypeSection extends AbstractSection {
-	private final String ENTITY_TYPE = DTDPropertiesMessages._UI_LABEL_ENTITY_TYPE;
-	private final String EXTERNAL_ENTITY = DTDPropertiesMessages._UI_LABEL_EXTERNAL_ENTITY;
-	private final String PARAMETER = DTDPropertiesMessages._UI_LABEL_PARAMETER_ENTITY;
-	private final String GENERAL = DTDPropertiesMessages._UI_LABEL_GENERAL_ENTITY;
-
-	private CCombo typeCombo;
-	private String[] typeComboValues = {PARAMETER, GENERAL};
-	private Button checkBox;
-
-	public static boolean isExternalEntity = false;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel cLabel = getWidgetFactory().createCLabel(composite, ENTITY_TYPE);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		cLabel.setLayoutData(data);
-
-		typeCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-		data = new FormData();
-		data.left = new FormAttachment(cLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(cLabel, 0, SWT.CENTER);
-		typeCombo.setLayoutData(data);
-		typeCombo.addSelectionListener(this);
-		typeCombo.setItems(typeComboValues);
-
-		checkBox = getWidgetFactory().createButton(composite, EXTERNAL_ENTITY, SWT.CHECK);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		p = checkBox.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(95, 0);
-		data.top = new FormAttachment(cLabel, +ITabbedPropertyConstants.VSPACE);
-		checkBox.setLayoutData(data);
-		checkBox.addSelectionListener(this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		Object input = getInput();
-
-		if (input != null) {
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				if (entity.isParameterEntity())
-					typeCombo.setText(PARAMETER);
-				else
-					typeCombo.setText(GENERAL);
-
-				if (entity.isExternalEntity()) {
-					checkBox.setSelection(true);
-					isExternalEntity = true;
-				}
-				else {
-					checkBox.setSelection(false);
-					isExternalEntity = false;
-				}
-			}
-		}
-		setListenerEnabled(true);
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == typeCombo) {
-			Object input = getInput();
-			if (input instanceof Entity) {
-				Entity node = (Entity) input;
-				String selected = typeCombo.getText();
-				if (PARAMETER.equals(selected))
-					node.setParameterEntity(true);
-				else
-					node.setParameterEntity(false);
-			}
-		}
-		else if (e.widget == checkBox) {
-			Object input = getInput();
-			if (input instanceof Entity) {
-				Entity node = (Entity) input;
-				boolean selected = checkBox.getSelection();
-				if (selected) {
-					node.setExternalEntity(true);
-					isExternalEntity = true;
-				}
-				else {
-					node.setExternalEntity(false);
-					isExternalEntity = false;
-				}
-			}
-		}
-	}
-
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EntityValueSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EntityValueSection.java
deleted file mode 100644
index abf3569..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/EntityValueSection.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class EntityValueSection extends AbstractSection {
-	private final String VALUE = DTDPropertiesMessages._UI_LABEL_ENTITY_VALUE;
-	private final String PUBLIC_ID = DTDPropertiesMessages._UI_LABEL_PUBLIC_ID;
-	private final String SYSTEM_ID = DTDPropertiesMessages._UI_LABEL_SYSTEM_ID;
-
-	private Text valueText;
-	private Text publicIdText;
-	private Text systemIdText;
-
-	private CLabel valueLabel;
-	private CLabel publicIdLabel;
-	private CLabel systemIdLabel;
-
-	public void doHandleEvent(Event event) {
-		if (event.widget == valueText) {
-			Object input = getInput();
-			String newValue = valueText.getText();
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				entity.setValue(newValue);
-			}
-		}
-		else if (event.widget == publicIdText) {
-			Object input = getInput();
-			String newValue = publicIdText.getText();
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				entity.setPublicID(newValue);
-			}
-		}
-		else if (event.widget == systemIdText) {
-			Object input = getInput();
-			String newValue = systemIdText.getText();
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				entity.setSystemID(newValue);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		valueLabel = getWidgetFactory().createCLabel(composite, VALUE);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = valueLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		valueLabel.setLayoutData(data);
-
-		// Entity Value
-		valueText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(valueLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(valueLabel, 0, SWT.CENTER);
-		valueText.setLayoutData(data);
-		valueText.addListener(SWT.Modify, this);
-
-		// Create label first then attach other control to it
-		publicIdLabel = getWidgetFactory().createCLabel(composite, PUBLIC_ID);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		p = publicIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(valueLabel, +ITabbedPropertyConstants.VSPACE);
-		publicIdLabel.setLayoutData(data);
-
-		// Public ID
-		publicIdText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(publicIdLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(publicIdLabel, 0, SWT.CENTER);
-		publicIdText.setLayoutData(data);
-		publicIdText.addListener(SWT.Modify, this);
-
-		// Create label first then attach other control to it
-		systemIdLabel = getWidgetFactory().createCLabel(composite, SYSTEM_ID);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		p = systemIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);
-		systemIdLabel.setLayoutData(data);
-
-		// System ID
-		systemIdText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(systemIdLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(systemIdLabel, 0, SWT.CENTER);
-		systemIdText.setLayoutData(data);
-		systemIdText.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		Object input = getInput();
-		if (isExternalEntity()) {
-			valueLabel.setVisible(false);
-			valueText.setVisible(false);
-			publicIdLabel.setVisible(true);
-			publicIdText.setVisible(true);
-			systemIdLabel.setVisible(true);
-			systemIdText.setVisible(true);
-
-			publicIdText.setText(""); //$NON-NLS-1$
-			systemIdText.setText(""); //$NON-NLS-1$
-			if (input != null && input instanceof Entity) {
-				Entity entity = (Entity) input;
-				publicIdText.setText((entity).getPublicID());
-				systemIdText.setText((entity).getSystemID());
-			}
-		}
-		else {
-			valueLabel.setVisible(true);
-			valueText.setVisible(true);
-			publicIdLabel.setVisible(false);
-			publicIdText.setVisible(false);
-			systemIdLabel.setVisible(false);
-			systemIdText.setVisible(false);
-
-			valueText.setText(""); //$NON-NLS-1$
-			if (input != null && input instanceof Entity)
-				valueText.setText(((Entity) input).getValue());
-		}
-		setListenerEnabled(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-	 */
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-
-	private boolean isExternalEntity() {
-		return EntityTypeSection.isExternalEntity;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NameSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NameSection.java
deleted file mode 100644
index 0014c67..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NameSection.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class NameSection extends AbstractSection {
-	private final String NAME = DTDPropertiesMessages._UI_LABEL_NAME;
-	private Text nameText;
-
-	public void doHandleEvent(Event event) {
-		if (event.widget == nameText) {
-			Object input = getInput();
-			String newValue = nameText.getText();
-			if (newValue.length() > 0 && input instanceof DTDNode) {
-				DTDNode dtdNode = (DTDNode) input;
-				dtdNode.setName(newValue);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel nameLabel = getWidgetFactory().createCLabel(composite, NAME);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		nameLabel.setLayoutData(data);
-
-		nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(nameLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100);
-		data.top = new FormAttachment(nameLabel, 0, SWT.CENTER);
-		nameText.setLayoutData(data);
-		nameText.addListener(SWT.Modify, this);
-
-		// listener.startListeningForEnter(nameText);
-		// listener.startListeningTo(nameText);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		nameText.setEnabled(true);
-		Object input = getInput();
-		nameText.setText(""); //$NON-NLS-1$
-		if (input != null) {
-			if (input instanceof DTDNode)
-				nameText.setText(((DTDNode) input).getName());
-		}
-		setListenerEnabled(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-	 */
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NewEntitySection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NewEntitySection.java
deleted file mode 100644
index 6449222..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NewEntitySection.java
+++ /dev/null
@@ -1,376 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.common.ui.internal.viewers.ResourceFilter;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-
-public class NewEntitySection extends AbstractSection {
-	private final String NAME = DTDPropertiesMessages._UI_LABEL_NAME;
-	private final String ENTITY_TYPE = DTDPropertiesMessages._UI_LABEL_ENTITY_TYPE;
-	private final String EXTERNAL_ENTITY = DTDPropertiesMessages._UI_LABEL_EXTERNAL_ENTITY;
-	private final String PARAMETER = DTDPropertiesMessages._UI_LABEL_PARAMETER_ENTITY;
-	private final String GENERAL = DTDPropertiesMessages._UI_LABEL_GENERAL_ENTITY;
-	private final String VALUE = DTDPropertiesMessages._UI_LABEL_ENTITY_VALUE;
-	private final String PUBLIC_ID = DTDPropertiesMessages._UI_LABEL_PUBLIC_ID;
-	private final String SYSTEM_ID = DTDPropertiesMessages._UI_LABEL_SYSTEM_ID;
-
-	private Text systemIdText;
-	private Text publicIdText;
-	private Text nameText;
-	private Button wizardButton;
-
-	private Text entityValueText;
-	private Button checkBox;
-
-	private CCombo typeCombo;
-	private String[] typeComboValues = {PARAMETER, GENERAL};
-	private PageBook pageBook;
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		createEntityCommonComposite(composite);
-
-		pageBook = new PageBook(composite, SWT.FLAT);
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(entityCommonComposite, 0);
-		data.bottom = new FormAttachment(100, 0);
-		pageBook.setLayoutData(data);
-
-		createExternalEntityComposite(pageBook);
-		createInternalEntityComposite(pageBook);
-
-		pageBook.showPage(externalEntityComposite);
-	}
-
-	private Composite entityCommonComposite;
-
-	private Composite createEntityCommonComposite(Composite parent) {
-		entityCommonComposite = getWidgetFactory().createFlatFormComposite(parent);
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(0, 0);
-		entityCommonComposite.setLayoutData(data);
-
-		// Create label first then attach other control to it
-		CLabel nameLabel = getWidgetFactory().createCLabel(entityCommonComposite, NAME); //$NON-NLS-1$
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = nameLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		nameLabel.setLayoutData(data);
-
-		nameText = getWidgetFactory().createText(entityCommonComposite, "", SWT.NONE); //$NON-NLS-1$    
-		data = new FormData();
-		data.left = new FormAttachment(nameLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(nameLabel, 0, SWT.CENTER);
-		nameText.setLayoutData(data);
-		nameText.addListener(SWT.Modify, this);
-
-		// Create label first then attach other control to it
-		CLabel cLabel = getWidgetFactory().createCLabel(entityCommonComposite, ENTITY_TYPE);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(nameLabel, +ITabbedPropertyConstants.VSPACE);
-		cLabel.setLayoutData(data);
-
-		// Create Checkbox
-		checkBox = getWidgetFactory().createButton(entityCommonComposite, EXTERNAL_ENTITY, SWT.CHECK); //$NON-NLS-1$
-		data = new FormData();
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(cLabel, 0, SWT.CENTER);
-		checkBox.setLayoutData(data);
-		checkBox.addSelectionListener(this);
-
-		// Create CCombo
-		typeCombo = getWidgetFactory().createCCombo(entityCommonComposite, SWT.FLAT | SWT.READ_ONLY);
-		data = new FormData();
-		data.left = new FormAttachment(cLabel, -ITabbedPropertyConstants.HSPACE - 2);
-		data.right = new FormAttachment(checkBox, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(cLabel, 0, SWT.CENTER);
-		typeCombo.setLayoutData(data);
-		typeCombo.addSelectionListener(this);
-		typeCombo.setItems(typeComboValues);
-		typeCombo.setText(PARAMETER);
-
-		return entityCommonComposite;
-	}
-
-	private Composite internalEntityComposite;
-
-	private Composite createInternalEntityComposite(Composite parent) {
-		internalEntityComposite = getWidgetFactory().createFlatFormComposite(parent);
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(entityCommonComposite, -ITabbedPropertyConstants.VSPACE);
-		internalEntityComposite.setLayoutData(data);
-
-		// Create label first then attach other control to it
-		CLabel entityValueLabel = getWidgetFactory().createCLabel(internalEntityComposite, VALUE); //$NON-NLS-1$
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = entityValueLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		entityValueLabel.setLayoutData(data);
-
-		entityValueText = getWidgetFactory().createText(internalEntityComposite, "", SWT.NONE); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(entityValueLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(entityValueLabel, 0, SWT.CENTER);
-		entityValueText.setLayoutData(data);
-		entityValueText.setEditable(true);
-		entityValueText.addListener(SWT.Modify, this);
-
-		return internalEntityComposite;
-	}
-
-	private Composite externalEntityComposite;
-
-	private Composite createExternalEntityComposite(Composite parent) {
-		externalEntityComposite = getWidgetFactory().createFlatFormComposite(parent);
-		FormData data = new FormData();
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(entityCommonComposite, -ITabbedPropertyConstants.VSPACE);
-		externalEntityComposite.setLayoutData(data);
-
-		// Create label first then attach other control to it
-		CLabel publicIdLabel = getWidgetFactory().createCLabel(externalEntityComposite, PUBLIC_ID); //$NON-NLS-1$
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = publicIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		publicIdLabel.setLayoutData(data);
-
-		publicIdText = getWidgetFactory().createText(externalEntityComposite, "", SWT.NONE); //$NON-NLS-1$
-		publicIdText.setEditable(true);
-		data = new FormData();
-		data.left = new FormAttachment(publicIdLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(publicIdLabel, 0, SWT.CENTER);
-		publicIdText.setLayoutData(data);
-		publicIdText.addListener(SWT.Modify, this);
-
-		// Create label first then attach other control to it
-		// Create System ID Label
-		CLabel systemIdLabel = getWidgetFactory().createCLabel(externalEntityComposite, SYSTEM_ID); //$NON-NLS-1$
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		p = systemIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);
-		systemIdLabel.setLayoutData(data);
-
-		// Create Wizard Button
-		wizardButton = getWidgetFactory().createButton(externalEntityComposite, "", SWT.NONE); //$NON-NLS-1$
-		wizardButton.setImage(AbstractUIPlugin.imageDescriptorFromPlugin(DTDUIPlugin.getDefault().getBundle().getSymbolicName(), "icons/browsebutton.gif").createImage()); //$NON-NLS-1$
-		data = new FormData();
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(systemIdLabel, 0, SWT.CENTER);
-		wizardButton.setLayoutData(data);
-		wizardButton.addSelectionListener(this);
-
-		// Create System ID Text
-		systemIdText = getWidgetFactory().createText(externalEntityComposite, "", SWT.NONE); //$NON-NLS-1$
-		// systemIdText.setEditable(false);
-		data = new FormData();
-		data.left = new FormAttachment(systemIdLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(wizardButton, -ITabbedPropertyConstants.HSPACE);
-		data.top = new FormAttachment(systemIdLabel, 0, SWT.CENTER);
-		systemIdText.setLayoutData(data);
-		systemIdText.addListener(SWT.Modify, this);
-
-		return externalEntityComposite;
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == typeCombo) {
-			Object input = getInput();
-			if (input instanceof Entity) {
-				Entity node = (Entity) input;
-				String selected = typeCombo.getText();
-				if (PARAMETER.equals(selected))
-					node.setParameterEntity(true);
-				else
-					node.setParameterEntity(false);
-			}
-		}
-		else if (e.widget == checkBox) {
-			Object input = getInput();
-			if (input instanceof Entity) {
-				Entity node = (Entity) input;
-				boolean selected = checkBox.getSelection();
-				if (selected) {
-					node.setExternalEntity(true);
-					pageBook.showPage(externalEntityComposite);
-				}
-				else {
-					node.setExternalEntity(false);
-					pageBook.showPage(internalEntityComposite);
-				}
-			}
-		}
-		else if (e.widget == wizardButton) {
-			Shell shell = Display.getCurrent().getActiveShell();
-			IFile currentIFile = ((IFileEditorInput) getActiveEditor().getEditorInput()).getFile();
-			ViewerFilter filter = new ResourceFilter(new String[]{".dtd"}, new IFile[]{currentIFile}, null); //$NON-NLS-1$
-
-			DTDSelectIncludeFileWizard fileSelectWizard = new DTDSelectIncludeFileWizard(DTDPropertiesMessages._UI_FILEDIALOG_SELECT_DTD, DTDPropertiesMessages._UI_FILEDIALOG_SELECT_DTD_DESC, filter, (IStructuredSelection) fSelection);
-
-			WizardDialog wizardDialog = new WizardDialog(shell, fileSelectWizard);
-			wizardDialog.create();
-			wizardDialog.setBlockOnOpen(true);
-			int result = wizardDialog.open();
-			if (result == Window.OK) {
-				String value = systemIdText.getText();
-				IFile selectedIFile = fileSelectWizard.getResultFile();
-				String dtdFileString = value;
-				if (selectedIFile != null) {
-					dtdFileString = URIHelper.getRelativeURI(selectedIFile.getFullPath(), currentIFile.getFullPath());
-				}
-				systemIdText.setText(dtdFileString);
-			}
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		Object input = getInput();
-		nameText.setText(""); //$NON-NLS-1$
-		if (input != null) {
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				nameText.setText(entity.getName());
-
-				if (entity.isParameterEntity())
-					typeCombo.setText(PARAMETER);
-				else
-					typeCombo.setText(GENERAL);
-
-				if (entity.isExternalEntity()) {
-					checkBox.setSelection(true);
-					pageBook.showPage(externalEntityComposite);
-					publicIdText.setText(entity.getPublicID());
-					systemIdText.setText(entity.getSystemID());
-				}
-				else {
-					checkBox.setSelection(false);
-					pageBook.showPage(internalEntityComposite);
-					entityValueText.setText(entity.getValue());
-				}
-			}
-		}
-		setListenerEnabled(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-	 */
-	public boolean shouldUseExtraSpace() {
-		return true;
-	}
-
-	public void doHandleEvent(Event event) {
-		if (event.widget == nameText) {
-			Object input = getInput();
-			String newValue = nameText.getText();
-			if (newValue.length() > 0 && input instanceof Entity) {
-				Entity entity = (Entity) input;
-				entity.setName(newValue);
-			}
-		}
-		else if (event.widget == entityValueText) {
-			Object input = getInput();
-			String newValue = entityValueText.getText();
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				entity.setValue(newValue);
-			}
-		}
-		else if (event.widget == publicIdText) {
-			Object input = getInput();
-			String newValue = publicIdText.getText();
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				entity.setPublicID(newValue);
-			}
-		}
-		else if (event.widget == systemIdText) {
-			Object input = getInput();
-			String newValue = systemIdText.getText();
-			if (input instanceof Entity) {
-				Entity entity = (Entity) input;
-				entity.setSystemID(newValue);
-			}
-		}
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NotationSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NotationSection.java
deleted file mode 100644
index 2e960e7..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/NotationSection.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.Notation;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class NotationSection extends AbstractSection {
-	private final String PUBLIC_ID = DTDPropertiesMessages._UI_LABEL_PUBLIC_ID;
-	private final String SYSTEM_ID = DTDPropertiesMessages._UI_LABEL_SYSTEM_ID;
-
-	private Text publicIdText;
-	private Text systemIdText;
-
-	private CLabel publicIdLabel;
-	private CLabel systemIdLabel;
-
-	public void doHandleEvent(Event event) {
-		if (event.widget == publicIdText) {
-			Object input = getInput();
-			String newValue = publicIdText.getText();
-			if (input instanceof Notation) {
-				Notation notation = (Notation) input;
-				notation.setPublicID(newValue);
-			}
-		}
-		else if (event.widget == systemIdText) {
-			Object input = getInput();
-			String newValue = systemIdText.getText();
-			if (input instanceof Notation) {
-				Notation notation = (Notation) input;
-				notation.setSystemID(newValue);
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		publicIdLabel = getWidgetFactory().createCLabel(composite, PUBLIC_ID);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = publicIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		publicIdLabel.setLayoutData(data);
-
-		// Public ID
-		publicIdText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(publicIdLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(publicIdLabel, 0, SWT.CENTER);
-		publicIdText.setLayoutData(data);
-		publicIdText.addListener(SWT.Modify, this);
-
-		// Create label first then attach other control to it
-		systemIdLabel = getWidgetFactory().createCLabel(composite, SYSTEM_ID);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		p = systemIdLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		labelWidth = Math.max(p.x, 98);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(publicIdLabel, +ITabbedPropertyConstants.VSPACE);
-		systemIdLabel.setLayoutData(data);
-
-		// System ID
-		systemIdText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-		data = new FormData();
-		data.left = new FormAttachment(systemIdLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(systemIdLabel, 0, SWT.CENTER);
-		systemIdText.setLayoutData(data);
-		systemIdText.addListener(SWT.Modify, this);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		Object input = getInput();
-		publicIdText.setText(""); //$NON-NLS-1$
-		systemIdText.setText(""); //$NON-NLS-1$
-
-		if (input != null && input instanceof Notation) {
-			Notation notation = (Notation) input;
-			publicIdText.setText((notation).getPublicID());
-			systemIdText.setText((notation).getSystemID());
-		}
-
-		setListenerEnabled(true);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-	 */
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/OccurrenceFilter.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/OccurrenceFilter.java
deleted file mode 100644
index eb57e01..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/OccurrenceFilter.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.CMRepeatableNode;
-
-public class OccurrenceFilter implements IFilter {
-	public boolean select(Object toTest) {
-		if (toTest instanceof CMBasicNode && ((CMBasicNode) toTest).isEmptyAnyOrPCData())
-			return false;
-		else if (toTest instanceof CMRepeatableNode)
-			return true;
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/OccurrenceSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/OccurrenceSection.java
deleted file mode 100644
index 90f5ffa..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/OccurrenceSection.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.CMRepeatableNode;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class OccurrenceSection extends AbstractSection {
-	private final String ONCE = DTDPropertiesMessages._UI_ONCE;
-	private final String ONE_OR_MORE = DTDPropertiesMessages._UI_ONE_OR_MORE;
-	private final String OPTIONAL = DTDPropertiesMessages._UI_OPTIONAL;
-	private final String ZERO_OR_MORE = DTDPropertiesMessages._UI_ZERO_OR_MORE;
-	private final String OCCURENCE = DTDPropertiesMessages._UI_LABEL_OCCURRENCE;
-
-	private CCombo occurrenceCombo;
-	private String[] occurrenceComboValues = {ONCE, ONE_OR_MORE, OPTIONAL, ZERO_OR_MORE};
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel usageLabel = getWidgetFactory().createCLabel(composite, OCCURENCE);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = usageLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		usageLabel.setLayoutData(data);
-
-		occurrenceCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-		data = new FormData();
-		data.left = new FormAttachment(usageLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(usageLabel, 0, SWT.CENTER);
-		occurrenceCombo.setLayoutData(data);
-		occurrenceCombo.addSelectionListener(this);
-		occurrenceCombo.setItems(occurrenceComboValues);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		setListenerEnabled(false);
-		Object input = getInput();
-		if (input instanceof CMRepeatableNode) {
-			char occurence = ((CMRepeatableNode) input).getOccurrence();
-			if (CMRepeatableNode.ONCE == occurence)
-				occurrenceCombo.setText(ONCE);
-			else if (CMRepeatableNode.ONE_OR_MORE == occurence)
-				occurrenceCombo.setText(ONE_OR_MORE);
-			else if (CMRepeatableNode.OPTIONAL == occurence)
-				occurrenceCombo.setText(OPTIONAL);
-			else if (CMRepeatableNode.ZERO_OR_MORE == occurence)
-				occurrenceCombo.setText(ZERO_OR_MORE);
-			else
-				occurrenceCombo.setText(ONCE);
-		}
-		setListenerEnabled(true);
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		Object input = getInput();
-		if (input instanceof CMRepeatableNode) {
-			setListenerEnabled(false);
-			CMRepeatableNode node = (CMRepeatableNode) input;
-			String occurrence = occurrenceCombo.getText();
-			if (ONCE.equals(occurrence))
-				node.setOccurrence(CMRepeatableNode.ONCE);
-			else if (ONE_OR_MORE.equals(occurrence))
-				node.setOccurrence(CMRepeatableNode.ONE_OR_MORE);
-			else if (OPTIONAL.equals(occurrence))
-				node.setOccurrence(CMRepeatableNode.OPTIONAL);
-			else if (ZERO_OR_MORE.equals(occurrence))
-				node.setOccurrence(CMRepeatableNode.ZERO_OR_MORE);
-			setListenerEnabled(true);
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/TypeSection.java b/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/TypeSection.java
deleted file mode 100644
index d18795c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src-properties/org/eclipse/wst/dtd/ui/internal/properties/section/TypeSection.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.properties.section;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertyConstants;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.ui.internal.DTDPropertiesMessages;
-
-public class TypeSection extends AbstractSection {
-	private final String TYPE = DTDPropertiesMessages._UI_LABEL_TYPE;
-
-	private CCombo typeCombo;
-	private String[] typeComboValues = {Attribute.CDATA, Attribute.ID, Attribute.IDREF, Attribute.IDREFS, Attribute.ENTITY, Attribute.ENTITIES, Attribute.NMTOKEN, Attribute.NMTOKENS, Attribute.ENUMERATED_NAME, Attribute.ENUMERATED_NOTATION};
-
-	/**
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-	 *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-	 */
-	public void createControls(Composite parent, TabbedPropertySheetWidgetFactory factory) {
-		super.createControls(parent, factory);
-		Composite composite = getWidgetFactory().createFlatFormComposite(parent);
-
-		// Create label first then attach other control to it
-		CLabel cLabel = getWidgetFactory().createCLabel(composite, TYPE);
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=141106
-		Point p = cLabel.computeSize(SWT.DEFAULT, SWT.DEFAULT, false);
-		int labelWidth = Math.max(p.x, 98);
-		FormData data = new FormData(labelWidth, SWT.DEFAULT);
-		data = new FormData(labelWidth, SWT.DEFAULT);
-		data.left = new FormAttachment(0, 0);
-		data.top = new FormAttachment(0, 0);
-		cLabel.setLayoutData(data);
-
-		typeCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-		data = new FormData();
-		data.left = new FormAttachment(cLabel, -ITabbedPropertyConstants.HSPACE);
-		data.right = new FormAttachment(100, 0);
-		data.top = new FormAttachment(cLabel, 0, SWT.CENTER);
-		typeCombo.setLayoutData(data);
-		typeCombo.addSelectionListener(this);
-		typeCombo.setItems(typeComboValues);
-	}
-
-	/*
-	 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-	 */
-	public void refresh() {
-		Object input = getInput();
-
-		if (input != null) {
-			if (input instanceof Attribute)
-				typeCombo.setText(((Attribute) input).getType());
-		}
-
-	}
-
-	/**
-	 * @see org.eclipse.swt.events.SelectionListener#widgetSelected(SelectionEvent)
-	 */
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == typeCombo) {
-			Object input = getInput();
-			if (input instanceof Attribute) {
-				Attribute attribute = (Attribute) input;
-				attribute.setType(typeCombo.getText());
-			}
-		}
-	}
-
-	public boolean shouldUseExtraSpace() {
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/StructuredTextViewerConfigurationDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/StructuredTextViewerConfigurationDTD.java
deleted file mode 100644
index 80a5dd1..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/StructuredTextViewerConfigurationDTD.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui;
-
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.dtd.core.text.IDTDPartitions;
-import org.eclipse.wst.dtd.ui.internal.style.LineStyleProviderForDTD;
-import org.eclipse.wst.sse.core.text.IStructuredPartitions;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-
-/**
- * Configuration for a source viewer which shows DTD content.
- * <p>
- * Clients can subclass and override just those methods which must be specific
- * to their needs.
- * </p>
- * 
- * @see org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration
- * @since 1.0
- */
-public class StructuredTextViewerConfigurationDTD extends StructuredTextViewerConfiguration {
-	/*
-	 * One instance per configuration because not sourceviewer-specific and
-	 * it's a String array
-	 */
-	private String[] fConfiguredContentTypes;
-	/*
-	 * One instance per configuration
-	 */
-	private LineStyleProvider[] fLineStyleProviders;
-
-	/**
-	 * Create new instance of StructuredTextViewerConfigurationDTD
-	 */
-	public StructuredTextViewerConfigurationDTD() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-		if (fConfiguredContentTypes == null) {
-			fConfiguredContentTypes = new String[]{IDTDPartitions.DTD_DEFAULT, IStructuredPartitions.DEFAULT_PARTITION, IStructuredPartitions.UNKNOWN_PARTITION};
-		}
-		return fConfiguredContentTypes;
-	}
-
-	public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-		if (fLineStyleProviders == null) {
-			fLineStyleProviders = new LineStyleProvider[]{createLineStyleProviderForDTD()};
-		}
-		return fLineStyleProviders;
-	}
-
-	private LineStyleProvider createLineStyleProviderForDTD() {
-		return new LineStyleProviderForDTD();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIMessages.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIMessages.java
deleted file mode 100644
index 710f2c7..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIMessages.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by DTD UI
- * 
- * @plannedfor 1.0
- */
-public class DTDUIMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.dtd.ui.internal.DTDUIPluginResources";//$NON-NLS-1$
-
-	public static String _UI_ACTION_ADD_ATTRIBUTELIST;
-	public static String _UI_ACTION_ADD_DTD_NOTATION;
-	public static String _UI_ACTION_ADD_DTD_ENTITY;
-	public static String _UI_ACTION_ADD_DTD_ELEMENT;
-	public static String _UI_ACTION_ADD_DTD_COMMENT;
-	public static String _UI_ACTION_DTD_DELETE;
-	public static String _UI_ACTION_ADD_ATTRIBUTE;
-	public static String _UI_ACTION_GROUP_ADD_GROUP;
-	public static String _UI_ACTION_ADD_ELEMENT;
-	public static String _UI_BUTTON_GROUP_ITEMS_LOGICALLY;
-	public static String _UI_BUTTON_SORT_ITEMS;
-	public static String _UI_ACTION_ADD_PARAM_ENTITY_REF;
-	public static String _UI_MOVE_ATTRIBUTE;
-	public static String _UI_MOVE_CONTENT;
-	public static String _UI_MOVE_NODE;
-	public static String _UI_MOVE_NODES;
-	public static String _ERROR_FILENAME_MUST_END_DTD;
-	public static String Creating_files;
-	public static String DTDFilesPreferencePage_ExtensionLabel;
-	public static String DTDFilesPreferencePage_ExtensionError;
-	public static String DTDColorPage_0;
-	public static String DTDColorPage_1;
-	public static String DTDColorPage_2;
-	public static String DTDColorPage_3;
-	public static String DTDColorPage_4;
-	public static String DTDColorPage_5;
-	public static String DTDColorPage_6;
-	public static String DTDColorPage_7;
-	public static String DTDColorPage_8;
-	public static String DTDPropertySourceAdapter_0;
-	public static String DTDPropertySourceAdapter_1;
-	public static String DTDPropertySourceAdapter_2;
-	public static String SourceMenu_label;
-	public static String _UI_CREATE_NEW_DTD_FILE;
-	public static String _UI_WIZARD_NEW_DTD_TITLE;
-	public static String _UI_WIZARD_NEW_DTD_EXPL;
-	public static String _UI_LABEL_DTD_FILE_DELETE;
-	public static String ResourceGroup_nameExists;
-	public static String NewDTDTemplatesWizardPage_0;
-	public static String NewDTDTemplatesWizardPage_1;
-	public static String NewDTDTemplatesWizardPage_2;
-	public static String NewDTDTemplatesWizardPage_3;
-	public static String NewDTDTemplatesWizardPage_4;
-	public static String NewDTDTemplatesWizardPage_5;
-	public static String NewDTDTemplatesWizardPage_6;
-	public static String NewDTDTemplatesWizardPage_7;
-	public static String SyntaxColoringPage_0;
-	public static String SyntaxColoringPage_2;
-	public static String SyntaxColoringPage_3;
-	public static String SyntaxColoringPage_4;
-	public static String SyntaxColoringPage_5;
-	public static String SyntaxColoringPage_6;
-	public static String _UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, DTDUIMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java
deleted file mode 100644
index e76e6db..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPlugin.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.preferences.DTDUIPreferenceNames;
-import org.eclipse.wst.dtd.ui.internal.templates.TemplateContextTypeIdsDTD;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class DTDUIPlugin extends AbstractUIPlugin {
-	// The shared instance.
-	private static DTDUIPlugin plugin;
-	
-	/**
-	 * The template store for the dtd ui.
-	 */
-	private TemplateStore fTemplateStore;
-
-	/**
-	 * The template context type registry for dtd ui.
-	 */
-	private ContextTypeRegistry fContextTypeRegistry;
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static DTDUIPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the workspace instance.
-	 */
-	public static IWorkspace getWorkspace() {
-		return ResourcesPlugin.getWorkspace();
-	}
-
-	/**
-	 * The constructor.
-	 */
-	public DTDUIPlugin() {
-		super();
-		plugin = this;
-	}
-	
-	/**
-	 * Returns the template store for the dtd editor templates.
-	 * 
-	 * @return the template store for the dtd editor templates
-	 */
-	public TemplateStore getTemplateStore() {
-		if (fTemplateStore == null) {
-			fTemplateStore = new ContributionTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), DTDUIPreferenceNames.TEMPLATES_KEY);
-
-			try {
-				fTemplateStore.load();
-			} catch (IOException e) {
-				Logger.logException(e);
-			}
-		}
-		return fTemplateStore;
-	}
-
-	/**
-	 * Returns the template context type registry for the dtd plugin.
-	 * 
-	 * @return the template context type registry for the dtd plugin
-	 */
-	public ContextTypeRegistry getTemplateContextRegistry() {
-		if (fContextTypeRegistry == null) {
-			ContributionContextTypeRegistry registry = new ContributionContextTypeRegistry();
-			registry.addContextType(TemplateContextTypeIdsDTD.NEW);
-
-			fContextTypeRegistry = registry;
-		}
-
-		return fContextTypeRegistry;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPluginResources.properties b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPluginResources.properties
deleted file mode 100644
index 26a34c6..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/DTDUIPluginResources.properties
+++ /dev/null
@@ -1,90 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-_UI_ACTION_ADD_ATTRIBUTELIST=Add Attribute &List
-
-!DTDOutliner
-_UI_ACTION_ADD_DTD_NOTATION=Add &Notation
-_UI_ACTION_ADD_DTD_ENTITY=Add &Entity
-_UI_ACTION_ADD_DTD_ELEMENT=Add Ele&ment
-_UI_ACTION_ADD_DTD_COMMENT=Add &Comment
-_UI_ACTION_DTD_DELETE=&Delete
-_UI_ACTION_ADD_ATTRIBUTE=Add &Attribute
-_UI_ACTION_GROUP_ADD_GROUP=Add Group to Con&tent Model
-_UI_ACTION_ADD_ELEMENT=Add Element to C&ontent Model
-
-!DTDContentOutlinePage
-_UI_BUTTON_GROUP_ITEMS_LOGICALLY=Group items logically.
-_UI_BUTTON_SORT_ITEMS=Sort items alphabetically.
-
-!DTDContextContributer
-_UI_ACTION_ADD_PARAM_ENTITY_REF=Add &Parameter Entity Reference
-
-!DragAttributeCommand
-_UI_MOVE_ATTRIBUTE=Move Attribute
-
-!DragContentModelCommand
-_UI_MOVE_CONTENT=Move Content
-
-!DragTopLevelNodesCommand
-_UI_MOVE_NODE=Move Node
-_UI_MOVE_NODES=Move Nodes
-
-_ERROR_FILENAME_MUST_END_DTD=The file name must end in one of the following extensions {0}.
-
-#DTD File page
-Creating_files=Creating files
-DTDFilesPreferencePage_ExtensionLabel=Add this suffix (if not specified):
-DTDFilesPreferencePage_ExtensionError=Suffix must be one of the following {0}.
-
-#DTD Style page
-DTDColorPage_0=<!ELEMENT Main (One,Two+)>\r\n<!ELEMENT One (Three,Four)>\r\n<!ATTLIST One\r\n oneone CDATA #REQUIRED\r\n>\r\n<!-- You need this -->\r\n<!ELEMENT Two (moremore*)>\r\n<!ATTLIST Two\r\n twotwo CDATA #REQUIRED\r\n twothree (aaa | bbb) "aaa"\r\n>\r\n
-DTDColorPage_1=Comments
-DTDColorPage_2=Data
-DTDColorPage_3=Default
-DTDColorPage_4=Keywords
-DTDColorPage_5=Strings
-DTDColorPage_6=Symbols
-DTDColorPage_7=Tag Delimiters
-DTDColorPage_8=Tag Names
-DTDPropertySourceAdapter_0=Name
-DTDPropertySourceAdapter_1=Contents
-DTDPropertySourceAdapter_2=Attributes
-
-! NewDTDWizard.java
-_UI_CREATE_NEW_DTD_FILE      = Create a new DTD file.
-_UI_WIZARD_NEW_DTD_TITLE     = Create DTD
-_UI_WIZARD_NEW_DTD_EXPL      = Create a new DTD file. Specify the folder and name for the file.
-
-# copied from dtd core
-_UI_LABEL_DTD_FILE_DELETE=Delete
-##
-ResourceGroup_nameExists = The same name already exists.
-NewDTDTemplatesWizardPage_0=Select DTD Template
-NewDTDTemplatesWizardPage_1=Select a template as initial content in the DTD page.
-NewDTDTemplatesWizardPage_2=Name
-NewDTDTemplatesWizardPage_3=Description
-NewDTDTemplatesWizardPage_4=&Use DTD Template
-NewDTDTemplatesWizardPage_5=&Preview:
-NewDTDTemplatesWizardPage_6=Templates are 'New DTD' templates found in the <a>DTD Templates</a> preference page.
-NewDTDTemplatesWizardPage_7=&Templates:
-
-SourceMenu_label=Source
-
-SyntaxColoringPage_0=Syntax Element:
-SyntaxColoringPage_2=Enable
-SyntaxColoringPage_3=&Bold
-SyntaxColoringPage_4=&Italic
-SyntaxColoringPage_5=&Strikethrough
-SyntaxColoringPage_6=&Underline
-
-_UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK=DTD preferences.  Note that some preferences may be set on the <a>{0}</a> preference page.
-
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/Logger.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/Logger.java
deleted file mode 100644
index d224ef2..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/Logger.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.dtd.ui"; //$NON-NLS-1$
-
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null)
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (!isDebugging())
-			return;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-					Bundle bundle = Platform.getBundle(PLUGIN_ID);
-					if (bundle != null)
-						Platform.getLog(bundle).log(statusObj);
-					return;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DTDDragAndDropManager.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DTDDragAndDropManager.java
deleted file mode 100644
index a95050d..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DTDDragAndDropManager.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.dnd;
-
-import java.util.Collection;
-
-import org.eclipse.wst.common.ui.internal.dnd.DragAndDropCommand;
-import org.eclipse.wst.common.ui.internal.dnd.DragAndDropManager;
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.TopLevelNode;
-
-public class DTDDragAndDropManager implements DragAndDropManager {
-
-	public DragAndDropCommand createCommand(Object target, float location, int operations, int operation, Collection source) {
-		if (target instanceof DTDNode) {
-			DTDNode node = (DTDNode) target;
-
-			if (node instanceof TopLevelNode) {
-				return new DragTopLevelNodesCommand(target, location, operations, operation, source);
-			}
-			if (node instanceof Attribute) {
-				return new DragAttributeCommand(target, location, operations, operation, source);
-			}
-			if (node instanceof CMNode) {
-				return new DragContentModelCommand(target, location, operations, operation, source);
-			}
-
-		}
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragAttributeCommand.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragAttributeCommand.java
deleted file mode 100644
index 45511c1..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragAttributeCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.dnd;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.common.ui.internal.dnd.DefaultDragAndDropCommand;
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-
-
-
-public class DragAttributeCommand extends DefaultDragAndDropCommand {
-
-	public DragAttributeCommand(Object target, float location, int operations, int operation, Collection sources) {
-		super(target, location, operations, operation, sources);
-	}
-
-	public boolean canExecute() {
-		Iterator iter = sources.iterator();
-		while (iter.hasNext()) {
-			Object source = iter.next();
-			if (!(source instanceof Attribute)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public void execute() {
-		DTDNode referenceNode = (DTDNode) target;
-		DTDFile dtdFile = referenceNode.getDTDFile();
-		if (referenceNode instanceof Attribute) {
-			dtdFile.getDTDModel().beginRecording(this, DTDUIMessages._UI_MOVE_ATTRIBUTE); //$NON-NLS-1$
-			AttributeList attList = (AttributeList) referenceNode.getParentNode();
-			Iterator iter = sources.iterator();
-			while (iter.hasNext()) {
-				DTDNode node = (DTDNode) iter.next();
-				if (node instanceof Attribute) {
-					attList.insertIntoModel(this, (Attribute) referenceNode, (Attribute) node, isAfter());
-					dtdFile.deleteNode(this, node);
-				}
-			}
-			dtdFile.getDTDModel().endRecording(this);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragContentModelCommand.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragContentModelCommand.java
deleted file mode 100644
index 51cdb87..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragContentModelCommand.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.dnd;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.wst.common.ui.internal.dnd.DefaultDragAndDropCommand;
-import org.eclipse.wst.dtd.core.internal.CMBasicNode;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-
-
-public class DragContentModelCommand extends DefaultDragAndDropCommand {
-
-	public DragContentModelCommand(Object target, float location, int operations, int operation, Collection sources) {
-		super(target, location, operations, operation, sources);
-	}
-
-	public boolean canExecute() {
-		if (!(target instanceof CMNode)) {
-			return false;
-		}
-
-		Iterator iter = sources.iterator();
-		while (iter.hasNext()) {
-			Object source = iter.next();
-			if (!(source instanceof CMNode)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public void execute() {
-		DTDNode referenceNode = (DTDNode) target;
-
-		if (referenceNode instanceof CMNode) {
-			DTDFile dtdFile = referenceNode.getDTDFile();
-
-			DTDNode parent = (DTDNode) referenceNode.getParentNode();
-			dtdFile.getDTDModel().beginRecording(this, DTDUIMessages._UI_MOVE_CONTENT); //$NON-NLS-1$
-			boolean parentIsElement = false;
-			Element element = null;
-			CMGroupNode group = null;
-			if (parent instanceof Element) {
-				parentIsElement = true;
-				element = (Element) parent;
-			}
-			else {
-				group = (CMGroupNode) parent;
-			}
-
-			if (element == null && group == null) {
-				// no parent to add to
-				return;
-			}
-
-			Iterator iter = sources.iterator();
-			while (iter.hasNext()) {
-				DTDNode node = (DTDNode) iter.next();
-				if (node instanceof CMNode) {
-					if (parentIsElement) {
-						if (element.getContentModel() == node) {
-							continue;
-						}
-						element.replaceContentModel(this, (CMNode) node);
-					}
-					else {
-						if (referenceNode == node || (isAfter() && referenceNode.getNextSibling() == node) || (!isAfter() && node.getNextSibling() == referenceNode)) {
-							continue;
-						}
-
-						group.insertIntoModel(this, (CMNode) referenceNode, (CMNode) node, isAfter());
-
-					}
-					DTDNode nodeParent = (DTDNode) node.getParentNode();
-					nodeParent.delete(this, node);
-				}
-			}
-			dtdFile.getDTDModel().endRecording(this);
-		}
-	}
-
-	public int getFeedback() {
-		DTDNode referenceNode = (DTDNode) target;
-		if (referenceNode instanceof CMNode) {
-			CMNode cmNode = (CMNode) referenceNode;
-			if (cmNode.isRootElementContent() && cmNode instanceof CMBasicNode) {
-				return DND.FEEDBACK_SELECT;
-			}
-		}
-
-		return super.getFeedback();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragTopLevelNodesCommand.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragTopLevelNodesCommand.java
deleted file mode 100644
index 59b872e..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/dnd/DragTopLevelNodesCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.dnd;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.wst.common.ui.internal.dnd.DefaultDragAndDropCommand;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.TopLevelNode;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-
-public class DragTopLevelNodesCommand extends DefaultDragAndDropCommand {
-
-	static private final String moveNode = DTDUIMessages._UI_MOVE_NODE; //$NON-NLS-1$
-	static private final String moveNodes = DTDUIMessages._UI_MOVE_NODES; //$NON-NLS-1$
-
-	public DragTopLevelNodesCommand(Object target, float location, int operations, int operation, Collection sources) {
-		super(target, location, operations, operation, sources);
-	}
-
-	public boolean canExecute() {
-		if (!(target instanceof TopLevelNode)) {
-			return false;
-		}
-
-		Iterator iter = sources.iterator();
-		while (iter.hasNext()) {
-			Object source = iter.next();
-			if (!(source instanceof TopLevelNode)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	public void execute() {
-		DTDNode referenceNode = (DTDNode) target;
-
-		DTDFile dtdFile = referenceNode.getDTDFile();
-		dtdFile.getDTDModel().beginRecording(this, sources.size() > 1 ? moveNodes : moveNode);
-		Iterator iter = sources.iterator();
-		while (iter.hasNext()) {
-			DTDNode node = (DTDNode) iter.next();
-			if (node instanceof TopLevelNode) {
-				dtdFile.moveNode(this, referenceNode, node, isAfter());
-			}
-		}
-		dtdFile.getDTDModel().endRecording(this);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/ActionContributorDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/ActionContributorDTD.java
deleted file mode 100644
index a624936..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/ActionContributorDTD.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.editor;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.sse.ui.internal.actions.ActionContributor;
-
-/**
- * XMLEditorActionContributor
- * 
- * This class should not be used inside multi page editor's
- * ActionBarContributor, since cascaded init() call from the
- * ActionBarContributor will causes exception and it leads to lose whole
- * toolbars.
- * 
- * Instead, use SourcePageActionContributor for source page contributor of
- * multi page editor.
- * 
- * Note that this class is still valid for single page editor.
- */
-public class ActionContributorDTD extends ActionContributor {
-	protected static final String[] EDITOR_IDS = {"org.eclipse.wst.dtd.core.dtdsource.source", "org.eclipse.wst.sse.ui.StructuredTextEditor"}; //$NON-NLS-1$ //$NON-NLS-2$
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.edit.util.ActionContributor#getExtensionIDs()
-	 */
-	protected String[] getExtensionIDs() {
-		return EDITOR_IDS;
-	}
-
-	protected void addToMenu(IMenuManager menu) {
-		// edit commands
-		IMenuManager editMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
-		if (editMenu != null) {
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fToggleInsertModeAction);
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fExpandSelectionToMenu);
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fMenuAdditionsGroupMarker);
-		}
-
-		// source commands
-		String sourceMenuLabel = DTDUIMessages.SourceMenu_label;
-		String sourceMenuId = "sourceMenuId"; //$NON-NLS-1$
-		IMenuManager sourceMenu = new MenuManager(sourceMenuLabel, sourceMenuId);
-		menu.insertAfter(IWorkbenchActionConstants.M_EDIT, sourceMenu);
-		if (sourceMenu != null) {
-			sourceMenu.add(fCommandsSeparator);
-			sourceMenu.add(fShiftRight);
-			sourceMenu.add(fShiftLeft);
-			sourceMenu.add(fCommandsSeparator);
-		}
-		IMenuManager navigateMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_NAVIGATE);
-		if (navigateMenu != null) {
-			IMenuManager gotoGroup = navigateMenu.findMenuUsingPath(IWorkbenchActionConstants.GO_TO);
-			if (gotoGroup != null) {
-				gotoGroup.add(fGotoMatchingBracketAction);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/DTDEditorPluginImageHelper.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/DTDEditorPluginImageHelper.java
deleted file mode 100644
index 70d949d..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/DTDEditorPluginImageHelper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.editor;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-
-
-/**
- * Helper class to handle images provided by this plug-in.
- * 
- * NOTE: For internal use only. For images used externally, please use the
- * Shared***ImageHelper class instead.
- * 
- * @author amywu
- */
-public class DTDEditorPluginImageHelper {
-	private static DTDEditorPluginImageHelper instance = null;
-
-	/**
-	 * Gets the instance.
-	 * 
-	 * @return Returns a DTDEditorPluginImageHelper
-	 */
-	public synchronized static DTDEditorPluginImageHelper getInstance() {
-		if (instance == null)
-			instance = new DTDEditorPluginImageHelper();
-		return instance;
-	}
-
-	// save a descriptor for each image
-	private HashMap fImageDescRegistry = null;
-	private final String PLUGINID = DTDUIPlugin.getDefault().getBundle().getSymbolicName();
-
-	/**
-	 * Creates an image from the given resource and adds the image to the
-	 * image registry.
-	 * 
-	 * @param resource
-	 * @return Image
-	 */
-	private Image createImage(String resource) {
-		ImageDescriptor desc = getImageDescriptor(resource);
-		Image image = null;
-
-		if (desc != null) {
-			image = desc.createImage();
-			// dont add the missing image descriptor image to the image
-			// registry
-			if (!desc.equals(ImageDescriptor.getMissingImageDescriptor()))
-				getImageRegistry().put(resource, image);
-		}
-		return image;
-	}
-
-	/**
-	 * Creates an image descriptor from the given imageFilePath and adds the
-	 * image descriptor to the image descriptor registry. If an image
-	 * descriptor could not be created, the default "missing" image descriptor
-	 * is returned but not added to the image descriptor registry.
-	 * 
-	 * @param imageFilePath
-	 * @return ImageDescriptor image descriptor for imageFilePath or default
-	 *         "missing" image descriptor if resource could not be found
-	 */
-	private ImageDescriptor createImageDescriptor(String imageFilePath) {
-		ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGINID, imageFilePath);
-		if (imageDescriptor != null) {
-			getImageDescriptorRegistry().put(imageFilePath, imageDescriptor);
-		}
-		else {
-			imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-		}
-
-		return imageDescriptor;
-	}
-
-	/**
-	 * Retrieves the image associated with resource from the image registry.
-	 * If the image cannot be retrieved, attempt to find and load the image at
-	 * the location specified in resource.
-	 * 
-	 * @param resource
-	 *            the image to retrieve
-	 * @return Image the image associated with resource or null if one could
-	 *         not be found
-	 */
-	public Image getImage(String resource) {
-		Image image = getImageRegistry().get(resource);
-		if (image == null) {
-			// create an image
-			image = createImage(resource);
-		}
-		return image;
-	}
-
-	/**
-	 * Retrieves the image descriptor associated with resource from the image
-	 * descriptor registry. If the image descriptor cannot be retrieved,
-	 * attempt to find and load the image descriptor at the location specified
-	 * in resource.
-	 * 
-	 * @param resource
-	 *            the image descriptor to retrieve
-	 * @return ImageDescriptor the image descriptor assocated with resource or
-	 *         the default "missing" image descriptor if one could not be
-	 *         found
-	 */
-	public ImageDescriptor getImageDescriptor(String resource) {
-		ImageDescriptor imageDescriptor = null;
-		Object o = getImageDescriptorRegistry().get(resource);
-		if (o == null) {
-			// create a descriptor
-			imageDescriptor = createImageDescriptor(resource);
-		}
-		else {
-			imageDescriptor = (ImageDescriptor) o;
-		}
-		return imageDescriptor;
-	}
-
-	/**
-	 * Returns the image descriptor registry for this plugin.
-	 * 
-	 * @return HashMap - image descriptor registry for this plugin
-	 */
-	private HashMap getImageDescriptorRegistry() {
-		if (fImageDescRegistry == null)
-			fImageDescRegistry = new HashMap();
-		return fImageDescRegistry;
-	}
-
-	/**
-	 * Returns the image registry for this plugin.
-	 * 
-	 * @return ImageRegistry - image registry for this plugin
-	 */
-	private ImageRegistry getImageRegistry() {
-		return JFaceResources.getImageRegistry();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/DTDEditorPluginImages.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/DTDEditorPluginImages.java
deleted file mode 100644
index bb2befb..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/DTDEditorPluginImages.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.editor;
-
-/**
- * Bundle of most images used by the DTD Source Editor plug-in.
- */
-public class DTDEditorPluginImages {
-	public static final String IMG_CTOOL_ADD_ATTRIBUTE = "icons/full/ctool16/ADD_Attribute.gif"; //$NON-NLS-1$
-
-	public static final String IMG_CTOOL_ADD_ELEMENT = "icons/full/ctool16/ADD_Element.gif"; //$NON-NLS-1$
-
-	public static final String IMG_CTOOL_ADD_ELEMENTTOCONMODEL = "icons/full/ctool16/ADD_ElementToConModel.gif"; //$NON-NLS-1$
-
-	public static final String IMG_CTOOL_ADD_GROUPTOCONMODEL = "icons/full/ctool16/ADD_GroupToConModel.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_ADD_ATTRIBUTE = "icons/full/dtool16/ADD_Attribute.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_ADD_ELEMENT = "icons/full/dtool16/ADD_Element.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_ADD_ELEMENTTOCONMODEL = "icons/full/dtool16/ADD_ElementToConModel.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_ADD_GROUPTOCONMODEL = "icons/full/dtool16/ADD_GroupToConModel.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_ADD_ATTRIBUTE = "icons/full/etool16/ADD_Attribute.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_ADD_ELEMENT = "icons/full/etool16/ADD_Element.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_ADD_ELEMENTTOCONMODEL = "icons/full/etool16/ADD_ElementToConModel.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_ADD_GROUPTOCONMODEL = "icons/full/etool16/ADD_GroupToConModel.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OBJ_ADD_COMMENT = "icons/full/obj16/ADD_Comment.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ADD_ENTITY = "icons/full/obj16/ADD_Entity.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ADD_ENTITY_REFERENCE = "icons/full/obj16/ADD_Entity_Reference.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ADD_NOTATION = "icons/full/obj16/ADD_Notation.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ORGANIZE_DTD_LOGICALLY = "icons/full/obj16/organize_dtd_logically.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_SORT = "icons/full/obj16/sort.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_VALIDATE = "icons/full/obj16/validate.gif"; //$NON-NLS-1$
-	
-	public static final String IMG_WIZBAN_NEWDTDFILE = "icons/full/wizban/newdtdfile_wiz.png"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/IHelpContextIds.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/IHelpContextIds.java
deleted file mode 100644
index e0ce210..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/editor/IHelpContextIds.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.editor;
-
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-
-/**
- * Help context ids for the DTD Source Editor.
- * <p>
- * This interface contains constants only; it is not intended to be
- * implemented.
- * </p>
- * 
- */
-public interface IHelpContextIds {
-
-	// org.eclipse.wst.dtd.ui.
-	public static final String PREFIX = DTDUIPlugin.getDefault().getBundle().getSymbolicName() + "."; //$NON-NLS-1$
-	// DTD Files Preference page
-	public static final String DTD_PREFWEBX_FILES_HELPID = PREFIX + "webx0020"; //$NON-NLS-1$
-	// DTD Styles Preference page
-	public static final String DTD_PREFWEBX_STYLES_HELPID = PREFIX + "webx0021"; //$NON-NLS-1$
-	// DTD Template Preference page (no id for this yet)
-	public static final String DTD_PREFWEBX_TEMPLATES_HELPID = PREFIX + "webx0022"; //$NON-NLS-1$
-
-	// // figured out on the fly
-	// // DTD Source page editor
-	// public static final String DTD_SOURCEVIEW_HELPID =
-	// ContentTypeIdForDTD.ContentTypeID_DTD + "_source_HelpId"; //$NON-NLS-1$
-
-	// DTD New File Wizard - Template Page
-	public static final String DTD_NEWWIZARD_TEMPLATE_HELPID = PREFIX + "dtdw0010"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDColorPage.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDColorPage.java
deleted file mode 100644
index ed1855d..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDColorPage.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.dtd.ui.internal.style.IStyleConstantsDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractColorPage;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.StyledTextColorPicker;
-
-/**
- * @deprecated
- */
-public class DTDColorPage extends AbstractColorPage {
-
-	protected Control createContents(Composite parent) {
-		Composite pageComponent = createComposite(parent, 1);
-		((GridData) pageComponent.getLayoutData()).horizontalAlignment = GridData.HORIZONTAL_ALIGN_FILL;
-
-		super.createContents(pageComponent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.DTD_PREFWEBX_STYLES_HELPID);
-
-		return pageComponent;
-	}
-
-	/**
-	 * Set up all the style preference keys in the overlay store
-	 */
-	protected OverlayKey[] createOverlayStoreKeys() {
-		ArrayList overlayKeys = new ArrayList();
-
-		ArrayList styleList = new ArrayList();
-		initStyleList(styleList);
-		Iterator i = styleList.iterator();
-		while (i.hasNext()) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String) i.next()));
-		}
-
-		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return keys;
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	public String getSampleText() {
-		return DTDUIMessages.DTDColorPage_0; //$NON-NLS-1$
-	}
-
-	protected void initContextStyleMap(Dictionary contextStyleMap) {
-		contextStyleMap.put(DTDRegionTypes.CONTENT_EMPTY, IStyleConstantsDTD.DTD_DATA);
-		contextStyleMap.put(DTDRegionTypes.CONTENT_ANY, IStyleConstantsDTD.DTD_DATA);
-		contextStyleMap.put(DTDRegionTypes.CONTENT_PCDATA, IStyleConstantsDTD.DTD_DATA);
-		contextStyleMap.put(DTDRegionTypes.NDATA_VALUE, IStyleConstantsDTD.DTD_DATA);
-		contextStyleMap.put(DTDRegionTypes.NAME, IStyleConstantsDTD.DTD_DATA);
-		contextStyleMap.put(DTDRegionTypes.ENTITY_PARM, IStyleConstantsDTD.DTD_DATA);
-
-		contextStyleMap.put(DTDRegionTypes.ELEMENT_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-		contextStyleMap.put(DTDRegionTypes.ENTITY_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-		contextStyleMap.put(DTDRegionTypes.ATTLIST_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-		contextStyleMap.put(DTDRegionTypes.NOTATION_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-
-		contextStyleMap.put(DTDRegionTypes.CONNECTOR, IStyleConstantsDTD.DTD_SYMBOL);
-		contextStyleMap.put(DTDRegionTypes.OCCUR_TYPE, IStyleConstantsDTD.DTD_SYMBOL);
-
-		contextStyleMap.put(DTDRegionTypes.START_TAG, IStyleConstantsDTD.DTD_TAG);
-		contextStyleMap.put(DTDRegionTypes.END_TAG, IStyleConstantsDTD.DTD_TAG);
-		contextStyleMap.put(DTDRegionTypes.EXCLAMATION, IStyleConstantsDTD.DTD_TAG);
-
-		contextStyleMap.put(DTDRegionTypes.COMMENT_START, IStyleConstantsDTD.DTD_COMMENT);
-		contextStyleMap.put(DTDRegionTypes.COMMENT_CONTENT, IStyleConstantsDTD.DTD_COMMENT);
-		contextStyleMap.put(DTDRegionTypes.COMMENT_END, IStyleConstantsDTD.DTD_COMMENT);
-
-		contextStyleMap.put(DTDRegionTypes.SINGLEQUOTED_LITERAL, IStyleConstantsDTD.DTD_STRING);
-		contextStyleMap.put(DTDRegionTypes.DOUBLEQUOTED_LITERAL, IStyleConstantsDTD.DTD_STRING);
-
-		contextStyleMap.put(DTDRegionTypes.SYSTEM_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.PUBLIC_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.NDATA_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.CDATA_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.ID_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.IDREF_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.IDREFS_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.ENTITY_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.ENTITIES_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.NMTOKEN_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.NMTOKENS_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.NOTATION_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.REQUIRED_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.IMPLIED_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		contextStyleMap.put(DTDRegionTypes.FIXED_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-	}
-
-	protected void initDescriptions(Dictionary descriptions) {
-		descriptions.put(IStyleConstantsDTD.DTD_COMMENT, DTDUIMessages.DTDColorPage_1); //$NON-NLS-1$
-		descriptions.put(IStyleConstantsDTD.DTD_DATA, DTDUIMessages.DTDColorPage_2); //$NON-NLS-1$
-		descriptions.put(IStyleConstantsDTD.DTD_DEFAULT, DTDUIMessages.DTDColorPage_3); //$NON-NLS-1$
-		descriptions.put(IStyleConstantsDTD.DTD_KEYWORD, DTDUIMessages.DTDColorPage_4); //$NON-NLS-1$
-		descriptions.put(IStyleConstantsDTD.DTD_STRING, DTDUIMessages.DTDColorPage_5); //$NON-NLS-1$
-		descriptions.put(IStyleConstantsDTD.DTD_SYMBOL, DTDUIMessages.DTDColorPage_6); //$NON-NLS-1$
-		descriptions.put(IStyleConstantsDTD.DTD_TAG, DTDUIMessages.DTDColorPage_7); //$NON-NLS-1$
-		descriptions.put(IStyleConstantsDTD.DTD_TAGNAME, DTDUIMessages.DTDColorPage_8); //$NON-NLS-1$
-	}
-
-	protected void initStyleList(ArrayList list) {
-		list.add(IStyleConstantsDTD.DTD_COMMENT);
-		list.add(IStyleConstantsDTD.DTD_DATA);
-		list.add(IStyleConstantsDTD.DTD_DEFAULT);
-		list.add(IStyleConstantsDTD.DTD_KEYWORD);
-		list.add(IStyleConstantsDTD.DTD_STRING);
-		list.add(IStyleConstantsDTD.DTD_SYMBOL);
-		list.add(IStyleConstantsDTD.DTD_TAG);
-		list.add(IStyleConstantsDTD.DTD_TAGNAME);
-	}
-
-	protected void setupPicker(StyledTextColorPicker picker) {
-		IModelManager mmanager = StructuredModelManager.getModelManager();
-		picker.setParser(mmanager.createStructuredDocumentFor(ContentTypeIdForDTD.ContentTypeID_DTD).getParser());
-
-		Dictionary descriptions = new Hashtable();
-		initDescriptions(descriptions);
-
-		Dictionary contextStyleMap = new Hashtable();
-		initContextStyleMap(contextStyleMap);
-
-		ArrayList styleList = new ArrayList();
-		initStyleList(styleList);
-
-		picker.setContextStyleMap(contextStyleMap);
-		picker.setDescriptions(descriptions);
-		picker.setStyleList(styleList);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.preferences.ui.AbstractColorPage#savePreferences()
-	 */
-	protected void savePreferences() {
-		DTDUIPlugin.getDefault().savePluginPreferences();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDFilesPreferencePage.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDFilesPreferencePage.java
deleted file mode 100644
index 7bff14c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDFilesPreferencePage.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
-import org.eclipse.wst.dtd.core.internal.preferences.DTDCorePreferenceNames;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-
-
-public class DTDFilesPreferencePage extends AbstractPreferencePage {
-	private Combo fDefaultSuffix = null;
-	private List fValidExtensions = null;
-
-	protected Control createContents(final Composite parent) {
-		Composite composite = super.createComposite(parent, 1);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.DTD_PREFWEBX_FILES_HELPID);
-
-		new PreferenceLinkArea(composite, SWT.WRAP | SWT.MULTI, "org.eclipse.wst.sse.ui.preferences.editor", DTDUIMessages._UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK,//$NON-NLS-1$
-					(IWorkbenchPreferenceContainer) getContainer(), null).getControl().setLayoutData(GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).create());
-		new Label(composite, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().create());
-
-
-		Group creatingGroup = createGroup(composite, 2);
-		creatingGroup.setText(DTDUIMessages.Creating_files);
-
-		// Default extension for New file Wizard
-		createLabel(creatingGroup, DTDUIMessages.DTDFilesPreferencePage_ExtensionLabel);
-		fDefaultSuffix = createDropDownBox(creatingGroup);
-		String[] validExtensions = (String[]) getValidExtensions().toArray(new String[0]);
-		Arrays.sort(validExtensions);
-		fDefaultSuffix.setItems(validExtensions);
-		fDefaultSuffix.addSelectionListener(this);
-
-		setSize(composite);
-		loadPreferences();
-
-		return composite;
-	}
-
-	public void dispose() {
-		fDefaultSuffix.removeModifyListener(this);
-		super.dispose();
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	protected void doSavePreferenceStore() {
-		DTDCorePlugin.getInstance().savePluginPreferences(); // model
-	}
-
-	/**
-	 * Get content type associated with this new file wizard
-	 * 
-	 * @return IContentType
-	 */
-	private IContentType getContentType() {
-		return Platform.getContentTypeManager().getContentType(ContentTypeIdForDTD.ContentTypeID_DTD);
-	}
-
-	/**
-	 * Get list of valid extensions
-	 * 
-	 * @return List
-	 */
-	private List getValidExtensions() {
-		if (fValidExtensions == null) {
-			IContentType type = getContentType();
-			fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
-		}
-		return fValidExtensions;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.preferences.ui.AbstractPreferencePage#getModelPreferences()
-	 */
-	protected Preferences getModelPreferences() {
-		return DTDCorePlugin.getInstance().getPluginPreferences();
-	}
-
-	protected void initializeValues() {
-		String suffix = getModelPreferences().getString(DTDCorePreferenceNames.DEFAULT_EXTENSION);
-		fDefaultSuffix.setText(suffix);
-	}
-
-	protected void performDefaults() {
-		String suffix = getModelPreferences().getDefaultString(DTDCorePreferenceNames.DEFAULT_EXTENSION);
-		fDefaultSuffix.setText(suffix);
-
-		super.performDefaults();
-	}
-
-	public boolean performOk() {
-		boolean result = super.performOk();
-
-		doSavePreferenceStore();
-
-		return result;
-	}
-
-	protected void storeValues() {
-		String suffix = fDefaultSuffix.getText();
-		getModelPreferences().setValue(DTDCorePreferenceNames.DEFAULT_EXTENSION, suffix);
-	}
-
-	protected void validateValues() {
-		boolean isValid = false;
-		Iterator i = getValidExtensions().iterator();
-		while (i.hasNext() && !isValid) {
-			String extension = (String) i.next();
-			isValid = extension.equalsIgnoreCase(fDefaultSuffix.getText());
-		}
-
-		if (!isValid) {
-			setErrorMessage(NLS.bind(DTDUIMessages.DTDFilesPreferencePage_ExtensionError, getValidExtensions().toString()));
-			setValid(false);
-		}
-		else {
-			setErrorMessage(null);
-			setValid(true);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDSyntaxColoringPage.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDSyntaxColoringPage.java
deleted file mode 100644
index a675cbd..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDSyntaxColoringPage.java
+++ /dev/null
@@ -1,855 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.preference.ColorSelector;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.dtd.ui.internal.style.IStyleConstantsDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-
-import com.ibm.icu.text.Collator;
-
-/**
- * A preference page to configure our XML syntax color. It resembles the JDT
- * and CDT pages far more than our original color page while retaining the
- * extra "click-to-find" functionality.
- */
-public final class DTDSyntaxColoringPage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	private Button fBold;
-	private Label fForegroundLabel;
-	private Label fBackgroundLabel;
-	private Button fClearStyle;
-	private Map fContextToStyleMap;
-	private Color fDefaultForeground = null;
-	private Color fDefaultBackground = null;
-	private IStructuredDocument fDocument;
-	private ColorSelector fForegroundColorEditor;
-	private ColorSelector fBackgroundColorEditor;
-	private Button fItalic;
-	private OverlayPreferenceStore fOverlayStore;
-	private Button fStrike;
-	private Collection fStylePreferenceKeys;
-	private StructuredViewer fStylesViewer = null;
-	private Map fStyleToDescriptionMap;
-	private StyledText fText;
-	private Button fUnderline;
-
-	// activate controls based on the given local color type
-	private void activate(String namedStyle) {
-		Color foreground = fDefaultForeground;
-		Color background = fDefaultBackground;
-		if (namedStyle == null) {
-			fClearStyle.setEnabled(false);
-			fBold.setEnabled(false);
-			fItalic.setEnabled(false);
-			fStrike.setEnabled(false);
-			fUnderline.setEnabled(false);
-			fForegroundLabel.setEnabled(false);
-			fBackgroundLabel.setEnabled(false);
-			fForegroundColorEditor.setEnabled(false);
-			fBackgroundColorEditor.setEnabled(false);
-			fBold.setSelection(false);
-			fItalic.setSelection(false);
-			fStrike.setSelection(false);
-			fUnderline.setSelection(false);
-		}
-		else {
-			TextAttribute attribute = getAttributeFor(namedStyle);
-			fClearStyle.setEnabled(true);
-			fBold.setEnabled(true);
-			fItalic.setEnabled(true);
-			fStrike.setEnabled(true);
-			fUnderline.setEnabled(true);
-			fForegroundLabel.setEnabled(true);
-			fBackgroundLabel.setEnabled(true);
-			fForegroundColorEditor.setEnabled(true);
-			fBackgroundColorEditor.setEnabled(true);
-			fBold.setSelection((attribute.getStyle() & SWT.BOLD) != 0);
-			fItalic.setSelection((attribute.getStyle() & SWT.ITALIC) != 0);
-			fStrike.setSelection((attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0);
-			fUnderline.setSelection((attribute.getStyle() & TextAttribute.UNDERLINE) != 0);
-			if (attribute.getForeground() != null) {
-				foreground = attribute.getForeground();
-			}
-			if (attribute.getBackground() != null) {
-				background = attribute.getBackground();
-			}
-		}
-
-		fForegroundColorEditor.setColorValue(foreground.getRGB());
-		fBackgroundColorEditor.setColorValue(background.getRGB());
-	}
-
-	/**
-	 * Color the text in the sample area according to the current preferences
-	 */
-	void applyStyles() {
-		if (fText == null || fText.isDisposed())
-			return;
-		IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion();
-		while (documentRegion != null) {
-			ITextRegionList regions = documentRegion.getRegions();
-			for (int i = 0; i < regions.size(); i++) {
-				ITextRegion currentRegion = regions.get(i);
-				// lookup the local coloring type and apply it
-				String namedStyle = (String) fContextToStyleMap.get(currentRegion.getType());
-				if (namedStyle == null)
-					continue;
-				TextAttribute attribute = getAttributeFor(namedStyle);
-				if (attribute == null)
-					continue;
-				StyleRange style = new StyleRange(documentRegion.getStartOffset(currentRegion), currentRegion.getTextLength(), attribute.getForeground(), attribute.getBackground(), attribute.getStyle());
-				style.strikeout = (attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0;
-				style.underline = (attribute.getStyle() & TextAttribute.UNDERLINE) != 0;
-				fText.setStyleRange(style);
-			}
-			documentRegion = documentRegion.getNext();
-		}
-	}
-
-	Button createCheckbox(Composite parent, String label) {
-		Button button = new Button(parent, SWT.CHECK);
-		button.setText(label);
-		button.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		return button;
-	}
-
-	/**
-	 * Creates composite control and sets the default layout data.
-	 */
-	private Composite createComposite(Composite parent, int numColumns) {
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.makeColumnsEqualWidth = false;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);
-		composite.setLayoutData(data);
-		return composite;
-	}
-
-	protected Control createContents(final Composite parent) {
-		initializeDialogUnits(parent);
-
-		fDefaultForeground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-		fDefaultBackground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-		Composite pageComponent = createComposite(parent, 2);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.DTD_PREFWEBX_STYLES_HELPID);
-
-		Link link = new Link(pageComponent, SWT.WRAP);
-		link.setText(SSEUIMessages.SyntaxColoring_Link);
-		link.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				PreferencesUtil.createPreferenceDialogOn(parent.getShell(), e.text, null, null);
-			}
-		});
-
-		GridData linkData= new GridData(SWT.FILL, SWT.BEGINNING, true, false, 2, 1);
-		linkData.widthHint= 150; // only expand further if anyone else requires it
-		link.setLayoutData(linkData);
-
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-
-		SashForm editor = new SashForm(pageComponent, SWT.VERTICAL);
-		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData2.horizontalSpan = 2;
-		editor.setLayoutData(gridData2);
-		SashForm top = new SashForm(editor, SWT.HORIZONTAL);
-		Composite styleEditor = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginRight = 5;
-		((GridLayout) styleEditor.getLayout()).marginLeft = 0;
-		createLabel(styleEditor, DTDUIMessages.SyntaxColoringPage_0);
-		fStylesViewer = createStylesViewer(styleEditor);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalIndent = 0;
-		Iterator iterator = fStyleToDescriptionMap.values().iterator();
-		while (iterator.hasNext()) {
-			gridData.widthHint = Math.max(gridData.widthHint, convertWidthInCharsToPixels(iterator.next().toString().length()));
-		}
-		gridData.heightHint = convertHeightInCharsToPixels(5);
-		fStylesViewer.getControl().setLayoutData(gridData);
-
-		Composite editingComposite = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginLeft = 5;
-		createLabel(editingComposite, ""); //$NON-NLS-1$
-		Button enabler = createCheckbox(editingComposite, DTDUIMessages.SyntaxColoringPage_2);
-		enabler.setEnabled(false);
-		enabler.setSelection(true);
-		Composite editControls = createComposite(editingComposite, 2);
-		((GridLayout) editControls.getLayout()).marginLeft = 20;
-
-		fForegroundLabel = createLabel(editControls, SSEUIMessages.Foreground_UI_);
-		((GridData) fForegroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		fForegroundLabel.setEnabled(false);
-
-		fForegroundColorEditor = new ColorSelector(editControls);
-		Button fForegroundColor = fForegroundColorEditor.getButton();
-		GridData gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fForegroundColor.setLayoutData(gd);
-		fForegroundColorEditor.setEnabled(false);
-
-		fBackgroundLabel = createLabel(editControls, SSEUIMessages.Background_UI_);
-		((GridData) fBackgroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		fBackgroundLabel.setEnabled(false);
-
-		fBackgroundColorEditor = new ColorSelector(editControls);
-		Button fBackgroundColor = fBackgroundColorEditor.getButton();
-		gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fBackgroundColor.setLayoutData(gd);
-		fBackgroundColorEditor.setEnabled(false);
-
-		fBold = createCheckbox(editControls, DTDUIMessages.SyntaxColoringPage_3);
-		fBold.setEnabled(false);
-		((GridData) fBold.getLayoutData()).horizontalSpan = 2;
-		fItalic = createCheckbox(editControls, DTDUIMessages.SyntaxColoringPage_4);
-		fItalic.setEnabled(false);
-		((GridData) fItalic.getLayoutData()).horizontalSpan = 2;
-		fStrike = createCheckbox(editControls, DTDUIMessages.SyntaxColoringPage_5);
-		fStrike.setEnabled(false);
-		((GridData) fStrike.getLayoutData()).horizontalSpan = 2;
-		fUnderline = createCheckbox(editControls, DTDUIMessages.SyntaxColoringPage_6);
-		fUnderline.setEnabled(false);
-		((GridData) fUnderline.getLayoutData()).horizontalSpan = 2;
-		fClearStyle = new Button(editingComposite, SWT.PUSH);
-		fClearStyle.setText(SSEUIMessages.Restore_Default_UI_); //$NON-NLS-1$ = "Restore Default"
-		fClearStyle.setLayoutData(new GridData(SWT.BEGINNING));
-		((GridData)fClearStyle.getLayoutData()).horizontalIndent = 20;
-		fClearStyle.setEnabled(false);
-
-		Composite sampleArea = createComposite(editor, 1);
-
-		((GridLayout) sampleArea.getLayout()).marginLeft = 5;
-		((GridLayout) sampleArea.getLayout()).marginTop = 5;
-		createLabel(sampleArea, SSEUIMessages.Sample_text__UI_); //$NON-NLS-1$ = "&Sample text:"
-		SourceViewer viewer = new SourceViewer(sampleArea, null, SWT.BORDER | SWT.LEFT_TO_RIGHT | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY);
-		fText = viewer.getTextWidget();
-		GridData gridData3 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData3.widthHint = convertWidthInCharsToPixels(20);
-		gridData3.heightHint = convertHeightInCharsToPixels(5);
-		gridData3.horizontalSpan = 2;
-		fText.setLayoutData(gridData3);
-		fText.setEditable(false);
-		fText.setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont"));//$NON-NLS-1$
-		fText.addKeyListener(getTextKeyListener());
-		fText.addSelectionListener(getTextSelectionListener());
-		fText.addMouseListener(getTextMouseListener());
-		fText.addTraverseListener(getTraverseListener());
-		setAccessible(fText, SSEUIMessages.Sample_text__UI_);
-		fDocument = StructuredModelManager.getModelManager().createStructuredDocumentFor(ContentTypeIdForDTD.ContentTypeID_DTD);
-		fDocument.set(getExampleText());
-		viewer.setDocument(fDocument);
-
-		top.setWeights(new int[]{1, 1});
-		editor.setWeights(new int[]{1, 1});
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.DTD_PREFWEBX_STYLES_HELPID);
-
-		fStylesViewer.setInput(getStylePreferenceKeys());
-
-		applyStyles();
-
-		fStylesViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!event.getSelection().isEmpty()) {
-					Object o = ((IStructuredSelection) event.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					activate(namedStyle);
-					if (namedStyle == null)
-						return;
-				}
-			}
-		});
-
-		fForegroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[0];
-						// open color dialog to get new color
-						String newValue = ColorHelper.toRGBString(fForegroundColorEditor.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[0] = newValue;
-							String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle, newPrefString);
-							applyStyles();
-							fText.redraw();
-						}
-					}
-				}
-			}
-		});
-
-		fBackgroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[1];
-						// open color dialog to get new color
-						String newValue = ColorHelper.toRGBString(fBackgroundColorEditor.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[1] = newValue;
-							String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle, newPrefString);
-							applyStyles();
-							fText.redraw();
-							activate(namedStyle);
-						}
-					}
-				}
-			}
-		});
-
-		fBold.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[2];
-					String newValue = String.valueOf(fBold.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[2] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fItalic.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[3];
-					String newValue = String.valueOf(fItalic.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[3] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fStrike.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[4];
-					String newValue = String.valueOf(fStrike.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[4] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fUnderline.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[5];
-					String newValue = String.valueOf(fUnderline.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[5] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-		
-		fClearStyle.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fStylesViewer.getSelection().isEmpty())
-					return;
-				String namedStyle = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement().toString();
-				getOverlayStore().setToDefault(namedStyle);
-				applyStyles();
-				fText.redraw();
-				activate(namedStyle);
-			}
-		});
-
-		return pageComponent;
-	}
-
-	private Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
-		label.setLayoutData(data);
-		label.setBackground(parent.getBackground());
-		return label;
-	}
-
-	// protected Label createDescriptionLabel(Composite parent) {
-	// return null;
-	// }
-
-	/**
-	 * Set up all the style preference keys in the overlay store
-	 */
-	private OverlayKey[] createOverlayStoreKeys() {
-		List overlayKeys = new ArrayList();
-
-		Iterator i = getStylePreferenceKeys().iterator();
-		while (i.hasNext()) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String) i.next()));
-		}
-
-		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return keys;
-	}
-
-	/**
-	 * Creates the List viewer where we see the various syntax element display
-	 * names--would it ever be a Tree like JDT's?
-	 * 
-	 * @param parent
-	 * @return
-	 */
-	private StructuredViewer createStylesViewer(Composite parent) {
-		StructuredViewer stylesViewer = new ListViewer(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		stylesViewer.setComparator(new ViewerComparator(Collator.getInstance()));
-		stylesViewer.setLabelProvider(new LabelProvider() {
-			public String getText(Object element) {
-				Object description = fStyleToDescriptionMap.get(element);
-				if (description != null)
-					return description.toString();
-				return super.getText(element);
-			}
-		});
-		stylesViewer.setContentProvider(new ITreeContentProvider() {
-			public void dispose() {
-			}
-
-			public Object[] getChildren(Object parentElement) {
-				return getStylePreferenceKeys().toArray();
-			}
-
-			public Object[] getElements(Object inputElement) {
-				return getChildren(inputElement);
-			}
-
-			public Object getParent(Object element) {
-				return getStylePreferenceKeys();
-			}
-
-			public boolean hasChildren(Object element) {
-				return false;
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			}
-		});
-		return stylesViewer;
-	}
-
-	public void dispose() {
-		if (fOverlayStore != null) {
-			fOverlayStore.stop();
-		}
-		super.dispose();
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private TextAttribute getAttributeFor(String namedStyle) {
-		TextAttribute ta = new TextAttribute(fDefaultForeground, fDefaultBackground, SWT.NORMAL);
-
-		if (namedStyle != null && fOverlayStore != null) {
-			// note: "namedStyle" *is* the preference key
-			String prefString = getOverlayStore().getString(namedStyle);
-			String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-			if (stylePrefs != null) {
-				RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-				RGB background = ColorHelper.toRGB(stylePrefs[1]);
-
-				int fontModifier = SWT.NORMAL;
-
-				if (stylePrefs.length > 2) {
-					boolean on = Boolean.valueOf(stylePrefs[2]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.BOLD;
-				}
-				if (stylePrefs.length > 3) {
-					boolean on = Boolean.valueOf(stylePrefs[3]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.ITALIC;
-				}
-				if (stylePrefs.length > 4) {
-					boolean on = Boolean.valueOf(stylePrefs[4]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | TextAttribute.STRIKETHROUGH;
-				}
-				if (stylePrefs.length > 5) {
-					boolean on = Boolean.valueOf(stylePrefs[5]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | TextAttribute.UNDERLINE;
-				}
-
-				ta = new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, fontModifier);
-			}
-		}
-		return ta;
-	}
-
-	private String getExampleText() {
-		return DTDUIMessages.DTDColorPage_0;
-	}
-
-	private String getNamedStyleAtOffset(int offset) {
-		// ensure the offset is clean
-		if (offset >= fDocument.getLength())
-			return getNamedStyleAtOffset(fDocument.getLength() - 1);
-		else if (offset < 0)
-			return getNamedStyleAtOffset(0);
-		IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion();
-		while (documentRegion != null && !documentRegion.containsOffset(offset)) {
-			documentRegion = documentRegion.getNext();
-		}
-		if (documentRegion != null) {
-			// find the ITextRegion's Context at this offset
-			ITextRegion interest = documentRegion.getRegionAtCharacterOffset(offset);
-			if (interest == null)
-				return null;
-			if (offset > documentRegion.getTextEndOffset(interest))
-				return null;
-			String regionContext = interest.getType();
-			if (regionContext == null)
-				return null;
-			// find the named style (internal/selectable name) for that
-			// context
-			String namedStyle = (String) fContextToStyleMap.get(regionContext);
-			if (namedStyle != null) {
-				return namedStyle;
-			}
-		}
-		return null;
-	}
-
-	private OverlayPreferenceStore getOverlayStore() {
-		return fOverlayStore;
-	}
-
-	private Collection getStylePreferenceKeys() {
-		if (fStylePreferenceKeys == null) {
-			List styles = new ArrayList();
-			styles.add(IStyleConstantsDTD.DTD_COMMENT); //$NON-NLS-1$
-			styles.add(IStyleConstantsDTD.DTD_DATA); //$NON-NLS-1$
-			styles.add(IStyleConstantsDTD.DTD_DEFAULT); //$NON-NLS-1$
-			styles.add(IStyleConstantsDTD.DTD_KEYWORD); //$NON-NLS-1$
-			styles.add(IStyleConstantsDTD.DTD_STRING); //$NON-NLS-1$
-			styles.add(IStyleConstantsDTD.DTD_SYMBOL); //$NON-NLS-1$
-			styles.add(IStyleConstantsDTD.DTD_TAG); //$NON-NLS-1$
-			styles.add(IStyleConstantsDTD.DTD_TAGNAME); //$NON-NLS-1$
-			fStylePreferenceKeys = styles;
-		}
-		return fStylePreferenceKeys;
-	}
-
-	private KeyListener getTextKeyListener() {
-		return new KeyListener() {
-			public void keyPressed(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-
-			public void keyReleased(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private MouseListener getTextMouseListener() {
-		return new MouseListener() {
-			public void mouseDoubleClick(MouseEvent e) {
-			}
-
-			public void mouseDown(MouseEvent e) {
-			}
-
-			public void mouseUp(MouseEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private SelectionListener getTextSelectionListener() {
-		return new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-		};
-	}
-
-	private TraverseListener getTraverseListener() {
-		return new TraverseListener() {
-			/**
-			 * @see org.eclipse.swt.events.TraverseListener#keyTraversed(TraverseEvent)
-			 */
-			public void keyTraversed(TraverseEvent e) {
-				if (e.widget instanceof StyledText) {
-					if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS))
-						e.doit = true;
-				}
-			}
-		};
-	}
-
-	public void init(IWorkbench workbench) {
-		setDescription(SSEUIMessages.SyntaxColoring_Description);
-
-		fStyleToDescriptionMap = new HashMap();
-		fContextToStyleMap = new HashMap();
-
-		initStyleToDescriptionMap();
-		initRegionContextToStyleMap();
-
-		fOverlayStore = new OverlayPreferenceStore(getPreferenceStore(), createOverlayStoreKeys());
-		fOverlayStore.load();
-		fOverlayStore.start();
-	}
-
-	private void initRegionContextToStyleMap() {
-		fContextToStyleMap.put(DTDRegionTypes.CONTENT_EMPTY, IStyleConstantsDTD.DTD_DATA);
-		fContextToStyleMap.put(DTDRegionTypes.CONTENT_ANY, IStyleConstantsDTD.DTD_DATA);
-		fContextToStyleMap.put(DTDRegionTypes.CONTENT_PCDATA, IStyleConstantsDTD.DTD_DATA);
-		fContextToStyleMap.put(DTDRegionTypes.NDATA_VALUE, IStyleConstantsDTD.DTD_DATA);
-		fContextToStyleMap.put(DTDRegionTypes.NAME, IStyleConstantsDTD.DTD_DATA);
-		fContextToStyleMap.put(DTDRegionTypes.ENTITY_PARM, IStyleConstantsDTD.DTD_DATA);
-
-		fContextToStyleMap.put(DTDRegionTypes.ELEMENT_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-		fContextToStyleMap.put(DTDRegionTypes.ENTITY_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-		fContextToStyleMap.put(DTDRegionTypes.ATTLIST_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-		fContextToStyleMap.put(DTDRegionTypes.NOTATION_TAG, IStyleConstantsDTD.DTD_TAGNAME);
-
-		fContextToStyleMap.put(DTDRegionTypes.CONNECTOR, IStyleConstantsDTD.DTD_SYMBOL);
-		fContextToStyleMap.put(DTDRegionTypes.OCCUR_TYPE, IStyleConstantsDTD.DTD_SYMBOL);
-
-		fContextToStyleMap.put(DTDRegionTypes.START_TAG, IStyleConstantsDTD.DTD_TAG);
-		fContextToStyleMap.put(DTDRegionTypes.END_TAG, IStyleConstantsDTD.DTD_TAG);
-		fContextToStyleMap.put(DTDRegionTypes.EXCLAMATION, IStyleConstantsDTD.DTD_TAG);
-
-		fContextToStyleMap.put(DTDRegionTypes.COMMENT_START, IStyleConstantsDTD.DTD_COMMENT);
-		fContextToStyleMap.put(DTDRegionTypes.COMMENT_CONTENT, IStyleConstantsDTD.DTD_COMMENT);
-		fContextToStyleMap.put(DTDRegionTypes.COMMENT_END, IStyleConstantsDTD.DTD_COMMENT);
-
-		fContextToStyleMap.put(DTDRegionTypes.SINGLEQUOTED_LITERAL, IStyleConstantsDTD.DTD_STRING);
-		fContextToStyleMap.put(DTDRegionTypes.DOUBLEQUOTED_LITERAL, IStyleConstantsDTD.DTD_STRING);
-
-		fContextToStyleMap.put(DTDRegionTypes.SYSTEM_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.PUBLIC_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.NDATA_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.CDATA_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.ID_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.IDREF_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.IDREFS_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.ENTITY_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.ENTITIES_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.NMTOKEN_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.NMTOKENS_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.NOTATION_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.REQUIRED_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.IMPLIED_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-		fContextToStyleMap.put(DTDRegionTypes.FIXED_KEYWORD, IStyleConstantsDTD.DTD_KEYWORD);
-	}
-
-	private void initStyleToDescriptionMap() {
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_COMMENT, DTDUIMessages.DTDColorPage_1); //$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_DATA, DTDUIMessages.DTDColorPage_2); //$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_DEFAULT, DTDUIMessages.DTDColorPage_3); //$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_KEYWORD, DTDUIMessages.DTDColorPage_4); //$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_STRING, DTDUIMessages.DTDColorPage_5); //$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_SYMBOL, DTDUIMessages.DTDColorPage_6); //$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_TAG, DTDUIMessages.DTDColorPage_7); //$NON-NLS-1$
-		fStyleToDescriptionMap.put(IStyleConstantsDTD.DTD_TAGNAME, DTDUIMessages.DTDColorPage_8); //$NON-NLS-1$
-	}
-
-	protected void performDefaults() {
-		super.performDefaults();
-		getOverlayStore().loadDefaults();
-		applyStyles();
-		fStylesViewer.setSelection(StructuredSelection.EMPTY);
-		activate(null);
-		fText.redraw();
-	}
-
-	public boolean performOk() {
-		getOverlayStore().propagate();
-
-		DTDUIPlugin.getDefault().savePluginPreferences();
-		SSEUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	private void selectColorAtOffset(int offset) {
-		String namedStyle = getNamedStyleAtOffset(offset);
-		if (namedStyle != null) {
-			fStylesViewer.setSelection(new StructuredSelection(namedStyle));
-			fStylesViewer.reveal(namedStyle);
-		}
-		else {
-			fStylesViewer.setSelection(StructuredSelection.EMPTY);
-		}
-		activate(namedStyle);
-	}
-
-	/**
-	 * Specifically set the reporting name of a control for accessibility
-	 */
-	private void setAccessible(Control control, String name) {
-		if (control == null)
-			return;
-		final String n = name;
-		control.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				if (e.childID == ACC.CHILDID_SELF)
-					e.result = n;
-			}
-		});
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDTemplatePreferencePage.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDTemplatePreferencePage.java
deleted file mode 100644
index 8cca387..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDTemplatePreferencePage.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.preferences;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * Preference page for DTD templates
- */
-public class DTDTemplatePreferencePage extends TemplatePreferencePage {
-
-	class DTDEditTemplateDialog extends EditTemplateDialog {
-		public DTDEditTemplateDialog(Shell parent, Template template, boolean edit, boolean isNameModifiable, ContextTypeRegistry registry) {
-			super(parent, template, edit, isNameModifiable, registry);
-		}
-
-		protected SourceViewer createViewer(Composite parent) {
-			SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-				StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationDTD();
-
-				public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-					return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-				}
-
-				public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-					return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-				}
-
-				public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-					ContentAssistant assistant = new ContentAssistant();
-					assistant.enableAutoActivation(true);
-					assistant.enableAutoInsert(true);
-					assistant.setContentAssistProcessor(getTemplateProcessor(), IDocument.DEFAULT_CONTENT_TYPE);
-					return assistant;
-				}
-			};
-			return doCreateViewer(parent, sourceViewerConfiguration);
-		}
-	}
-
-	public DTDTemplatePreferencePage() {
-		DTDUIPlugin dtdUIPlugin = DTDUIPlugin.getDefault();
-
-		setPreferenceStore(dtdUIPlugin.getPreferenceStore());
-		setTemplateStore(dtdUIPlugin.getTemplateStore());
-		setContextTypeRegistry(dtdUIPlugin.getTemplateContextRegistry());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		boolean ok = super.performOk();
-		DTDUIPlugin.getDefault().savePluginPreferences();
-		return ok;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#isShowFormatterSetting()
-	 */
-	protected boolean isShowFormatterSetting() {
-		// template formatting has not been implemented
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite ancestor) {
-		Control c = super.createContents(ancestor);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IHelpContextIds.DTD_PREFWEBX_TEMPLATES_HELPID);
-		return c;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
-	protected SourceViewer createViewer(Composite parent) {
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationDTD();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		return doCreateViewer(parent, sourceViewerConfiguration);
-	}
-
-	SourceViewer doCreateViewer(Composite parent, SourceViewerConfiguration viewerConfiguration) {
-		SourceViewer viewer = null;
-		String contentTypeID = ContentTypeIdForDTD.ContentTypeID_DTD;
-		viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-		IDocument document = scratchModel.getStructuredDocument();
-		viewer.configure(viewerConfiguration);
-		viewer.setDocument(document);
-		return viewer;
-	}
-
-	/**
-	 * Creates the edit dialog. Subclasses may override this method to provide
-	 * a custom dialog.
-	 * 
-	 * @param template
-	 *            the template being edited
-	 * @param edit
-	 *            whether the dialog should be editable
-	 * @param isNameModifiable
-	 *            whether the template name may be modified
-	 * @return the created or modified template, or <code>null</code> if the
-	 *         edition failed
-	 * @since 3.1
-	 */
-	protected Template editTemplate(Template template, boolean edit, boolean isNameModifiable) {
-		EditTemplateDialog dialog = new DTDEditTemplateDialog(getShell(), template, edit, isNameModifiable, getContextTypeRegistry());
-		if (dialog.open() == Window.OK) {
-			return dialog.getTemplate();
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceInitializer.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceInitializer.java
deleted file mode 100644
index 3f6f2c6..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceInitializer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ColorRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.style.IStyleConstantsDTD;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-
-/**
- * Sets default values for DTD UI preferences
- */
-public class DTDUIPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = DTDUIPlugin.getDefault().getPreferenceStore();
-		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
-		
-		// DTD Style Preferences
-		String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
-		String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
-		String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_DEFAULT, 0, 0, 0) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsDTD.DTD_DEFAULT, styleValue); // black
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_TAG, 63, 63, 191) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsDTD.DTD_TAG, styleValue); // blue
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_TAGNAME, 63, 63, 191) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsDTD.DTD_TAGNAME, styleValue); // blue
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_COMMENT, 127, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsDTD.DTD_COMMENT, styleValue); // grey
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_KEYWORD, 128, 0, 0) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsDTD.DTD_KEYWORD, styleValue); // dark
-		// red
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_STRING, 63, 159, 95) + JUSTITALIC;
-		store.setDefault(IStyleConstantsDTD.DTD_STRING, styleValue); // green
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_DATA, 191, 95, 95) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsDTD.DTD_DATA, styleValue); // light
-		// red
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsDTD.DTD_SYMBOL, 128, 0, 0) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsDTD.DTD_SYMBOL, styleValue); // dark
-		// red
-
-		// set default new xml file template to use in new file wizard
-		/*
-		 * Need to find template name that goes with default template id (name
-		 * may change for differnt language)
-		 */
-		String templateName = ""; //$NON-NLS-1$
-		Template template = DTDUIPlugin.getDefault().getTemplateStore().findTemplateById("org.eclipse.wst.dtd.ui.internal.templates.xmldeclaration"); //$NON-NLS-1$
-		if (template != null)
-			templateName = template.getName();
-		store.setDefault(DTDUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceNames.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceNames.java
deleted file mode 100644
index 73f2f71..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/preferences/DTDUIPreferenceNames.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.preferences;
-
-/**
- * Preference keys for DTD UI
- */
-public class DTDUIPreferenceNames {
-	private DTDUIPreferenceNames() {
-		// cannot create instance
-	}
-	/**
-	 * The key to store customized templates.
-	 * <p>
-	 * Value is of type <code>String</code>.
-	 * </p>
-	 */
-	public static final String TEMPLATES_KEY = "org.eclipse.wst.sse.ui.custom_templates"; //$NON-NLS-1$
-	
-	/**
-	 * The key to store the last template name used in new DTD file wizard.
-	 * Template name is stored instead of template id because user-created
-	 * templates do not have template ids.
-	 * <p>
-	 * Value is of type <code>String</code>.
-	 * </p>
-	 */
-	public static final String NEW_FILE_TEMPLATE_NAME = "newFileTemplateName"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/projection/DTDFoldingStrategy.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/projection/DTDFoldingStrategy.java
deleted file mode 100644
index 27bd38b..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/projection/DTDFoldingStrategy.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.projection;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.dtd.core.internal.Comment;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Unrecognized;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingStrategy;
-import org.eclipse.wst.xml.ui.internal.projection.XMLCommentFoldingPosition;
-import org.eclipse.wst.xml.ui.internal.projection.XMLElementFoldingPosition;
-
-
-/**
- * A folding strategy for DTD structured documents.
- * See AbstractStructuredFoldingStrategy for more details.
- * 
- * This strategy is rather lame because the DTD parser does not
- * create regions for syntax such as <[ ]> so folding on it
- * can not currently occur.
- */
-public class DTDFoldingStrategy extends AbstractStructuredFoldingStrategy {
-
-	/**
-	 * Create an instance of the folding strategy.
-	 * Be sure to set the viewer and document after creation.
-	 */
-	public DTDFoldingStrategy() {
-		super();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractFoldingStrategy#calcNewFoldPosition(org.eclipse.wst.sse.core.internal.provisional.IndexedRegion)
-	 */
-	protected Position calcNewFoldPosition(IndexedRegion indexedRegion) {
-		Position newPos = null;
-		
-		//only want to fold regions with a valid range
-		if(indexedRegionValidType(indexedRegion) && indexedRegion.getStartOffset() >= 0 && indexedRegion.getLength() >= 0) {
-			IStructuredDocumentRegion structRegion = ((DTDNode) indexedRegion).getStructuredDTDDocumentRegion();
-			//if Comment then use comment folding position
-			//else use element folding position
-			if(indexedRegion instanceof Comment) {
-				newPos = new XMLCommentFoldingPosition(structRegion);
-			} else {
-				newPos = new XMLElementFoldingPosition(structRegion);
-			}
-		}
-		return newPos;
-	}
-
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractFoldingStrategy#indexedRegionValidType(org.eclipse.wst.sse.core.internal.provisional.IndexedRegion)
-	 */
-	protected boolean indexedRegionValidType(IndexedRegion indexedRegion) {
-		//can only fold DTDNodes
-		return (indexedRegion instanceof DTDNode && !(indexedRegion instanceof Unrecognized));
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/registry/AdapterFactoryProviderForDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/registry/AdapterFactoryProviderForDTD.java
deleted file mode 100644
index 61a22f1..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/registry/AdapterFactoryProviderForDTD.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.registry;
-
-import org.eclipse.wst.dtd.core.internal.modelhandler.ModelHandlerForDTD;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.util.Assert;
-
-
-/**
- * @author nitin
- * 
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class AdapterFactoryProviderForDTD implements AdapterFactoryProvider {
-
-	/**
-	 * 
-	 */
-	public AdapterFactoryProviderForDTD() {
-		super();
-	}
-
-	/*
-	 * @see AdapterFactoryProvider#addAdapterFactories(IStructuredModel)
-	 */
-	public void addAdapterFactories(IStructuredModel structuredModel) {
-		FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
-		Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$
-	}
-
-	public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
-		return (contentTypeDescription instanceof ModelHandlerForDTD);
-	}
-
-	public void reinitializeFactories(IStructuredModel structuredModel) {
-		// nothing to do, since no embedded type
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/IStyleConstantsDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/IStyleConstantsDTD.java
deleted file mode 100644
index 68bdb5e..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/IStyleConstantsDTD.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.style;
-
-/**
- * Contains the symbolic name of styles used by LineStyleProvider,
- * ColorManager, and any others who may be interested
- */
-public interface IStyleConstantsDTD {
-
-	public static final String DTD_COMMENT = "dtdComment"; //$NON-NLS-1$
-
-	// Data are variables
-	public static final String DTD_DATA = "dtdData"; //$NON-NLS-1$
-	public static final String DTD_DEFAULT = "dtdDefault"; //$NON-NLS-1$
-
-	// keywords are constants like IMPLIED or PCDATA
-	public static final String DTD_KEYWORD = "dtdKeyword"; //$NON-NLS-1$
-
-	// strings are anything in quotes
-	public static final String DTD_STRING = "dtdString"; //$NON-NLS-1$
-
-	// All the remaining symbols
-	public static final String DTD_SYMBOL = "dtdSymbol"; //$NON-NLS-1$
-
-	// tags are '<', '!', or '>'
-	public static final String DTD_TAG = "dtdTag"; //$NON-NLS-1$
-
-	// tagnames are like ELEMENT, ATTLIST, etc.
-	public static final String DTD_TAGNAME = "dtdTagName"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/LineStyleProviderForDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/LineStyleProviderForDTD.java
deleted file mode 100644
index 443a940..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/LineStyleProviderForDTD.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.style;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-public class LineStyleProviderForDTD extends AbstractLineStyleProvider implements LineStyleProvider {
-	public LineStyleProviderForDTD() {
-		super();
-	}
-
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		/**
-		 * a method to centralize all the "format rules" for regions
-		 * specifically associated for how to "open" the region.
-		 */
-		// not sure why this is coming through null, but just to catch it
-		if (region == null) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_DEFAULT);
-		}
-		String type = region.getType();
-		if (type == DTDRegionTypes.CONTENT_EMPTY || type == DTDRegionTypes.CONTENT_ANY || type == DTDRegionTypes.CONTENT_PCDATA) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_DATA);
-		}
-		else if (type == DTDRegionTypes.ELEMENT_TAG || type == DTDRegionTypes.ENTITY_TAG || type == DTDRegionTypes.ATTLIST_TAG || type == DTDRegionTypes.NOTATION_TAG) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_TAGNAME);
-		}
-		else if (type == DTDRegionTypes.CONNECTOR || type == DTDRegionTypes.OCCUR_TYPE) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_SYMBOL);
-		}
-		else if (type == DTDRegionTypes.NDATA_VALUE) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_DATA);
-		}
-		else if (type == DTDRegionTypes.START_TAG || type == DTDRegionTypes.END_TAG || type == DTDRegionTypes.EXCLAMATION) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_TAG);
-		}
-		else if (type == DTDRegionTypes.COMMENT_START || type == DTDRegionTypes.COMMENT_CONTENT || type == DTDRegionTypes.COMMENT_END) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_COMMENT);
-		}
-		else if (type == DTDRegionTypes.SINGLEQUOTED_LITERAL || type == DTDRegionTypes.DOUBLEQUOTED_LITERAL) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_STRING);
-		}
-		else if (type == DTDRegionTypes.SYSTEM_KEYWORD || type == DTDRegionTypes.PUBLIC_KEYWORD || type == DTDRegionTypes.NDATA_KEYWORD || type == DTDRegionTypes.CDATA_KEYWORD || type == DTDRegionTypes.ID_KEYWORD || type == DTDRegionTypes.IDREF_KEYWORD || type == DTDRegionTypes.IDREFS_KEYWORD || type == DTDRegionTypes.ENTITY_KEYWORD || type == DTDRegionTypes.ENTITIES_KEYWORD || type == DTDRegionTypes.NMTOKEN_KEYWORD || type == DTDRegionTypes.NMTOKENS_KEYWORD || type == DTDRegionTypes.NOTATION_KEYWORD || type == DTDRegionTypes.REQUIRED_KEYWORD || type == DTDRegionTypes.IMPLIED_KEYWORD || type == DTDRegionTypes.FIXED_KEYWORD) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_KEYWORD);
-		}
-		else if (type == DTDRegionTypes.NAME || type == DTDRegionTypes.ENTITY_PARM) {
-			// if (region instanceof DTDRegion) {
-			// DTDRegion dtdRegion = (DTDRegion) region;
-			// IStructuredDocumentRegion flatNode = dtdRegion.getParent();
-			// String regionText = flatNode.getText(dtdRegion);
-			// if (regionText.equals("ANY") || regionText.equals("EMPTY")) {
-			// return new TextAttribute(DTDColors.DTD_KEYWORD);
-			// }
-			// }
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsDTD.DTD_DATA);
-		}
-
-		// default, return null to signal "not handled"
-		// in which case, other factories should be tried
-		return null;
-	}
-
-	protected IPreferenceStore getColorPreferences() {
-		return DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	protected void handlePropertyChange(PropertyChangeEvent event) {
-		String styleKey = null;
-
-		if (event != null) {
-			String prefKey = event.getProperty();
-			// check if preference changed is a style preference
-			if (IStyleConstantsDTD.DTD_DEFAULT.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_DEFAULT;
-			}
-			else if (IStyleConstantsDTD.DTD_TAG.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_TAG;
-			}
-			else if (IStyleConstantsDTD.DTD_TAGNAME.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_TAGNAME;
-			}
-			else if (IStyleConstantsDTD.DTD_COMMENT.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_COMMENT;
-			}
-			else if (IStyleConstantsDTD.DTD_KEYWORD.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_KEYWORD;
-			}
-			else if (IStyleConstantsDTD.DTD_STRING.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_STRING;
-			}
-			else if (IStyleConstantsDTD.DTD_DATA.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_DATA;
-			}
-			else if (IStyleConstantsDTD.DTD_SYMBOL.equals(prefKey)) {
-				styleKey = IStyleConstantsDTD.DTD_SYMBOL;
-			}
-		}
-
-		if (styleKey != null) {
-			// overwrite style preference with new value
-			addTextAttribute(styleKey);
-			super.handlePropertyChange(event);
-		}
-	}
-
-	protected void loadColors() {
-		addTextAttribute(IStyleConstantsDTD.DTD_DEFAULT);
-		addTextAttribute(IStyleConstantsDTD.DTD_TAG);
-		addTextAttribute(IStyleConstantsDTD.DTD_TAGNAME);
-		addTextAttribute(IStyleConstantsDTD.DTD_COMMENT);
-		addTextAttribute(IStyleConstantsDTD.DTD_KEYWORD);
-		addTextAttribute(IStyleConstantsDTD.DTD_STRING);
-		addTextAttribute(IStyleConstantsDTD.DTD_DATA);
-		addTextAttribute(IStyleConstantsDTD.DTD_SYMBOL);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/LineStyleProviderForDTDSubSet.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/LineStyleProviderForDTDSubSet.java
deleted file mode 100644
index 0f25b7e..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/style/LineStyleProviderForDTDSubSet.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.style;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.core.text.IDTDPartitions;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredPartitioning;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-public class LineStyleProviderForDTDSubSet extends AbstractLineStyleProvider implements LineStyleProvider {
-	private IStructuredModel fInternalModel = null;
-	private LineStyleProviderForDTD fInternalProvider = null;
-	private StyleRange[] fInternalRanges;
-	private String fPartitioning = null;
-
-	public LineStyleProviderForDTDSubSet() {
-		super();
-		fInternalProvider = new LineStyleProviderForDTD();
-		fInternalRanges = new StyleRange[0];
-		fPartitioning = IStructuredPartitioning.DEFAULT_STRUCTURED_PARTITIONING;
-	}
-
-
-	/**
-	 * @param lineRequestStart
-	 * @param lineRequestLength
-	 * @param holdResults
-	 */
-	private void addStyleRanges(int lineRequestStart, int lineRequestLength, Collection holdResults, int adjustment) {
-		int lineRequestEnd = lineRequestStart + lineRequestLength;
-		for (int i = 0; i < fInternalRanges.length; i++) {
-			int adjustedStyleRangeStart = adjustment + fInternalRanges[i].start;
-			int adjustedStyleRangeEnd = adjustedStyleRangeStart + fInternalRanges[i].length;
-			if (adjustedStyleRangeEnd < lineRequestStart || lineRequestEnd < adjustedStyleRangeStart)
-				continue;
-			int end = Math.min(adjustedStyleRangeEnd, lineRequestEnd);
-			StyleRange range = new StyleRange();
-			range.start = Math.max(adjustedStyleRangeStart, lineRequestStart);
-			range.length = end - range.start;
-			range.fontStyle = fInternalRanges[i].fontStyle;
-			range.foreground = fInternalRanges[i].foreground;
-			range.background = fInternalRanges[i].background;
-			holdResults.add(range);
-		}
-	}
-	
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		TextAttribute ta = null;
-
-		String prefString = getColorPreferences().getString(IStyleConstantsDTD.DTD_DEFAULT);
-		String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-		if (stylePrefs != null) {
-			RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-			RGB background = ColorHelper.toRGB(stylePrefs[1]);
-			boolean bold = Boolean.valueOf(stylePrefs[2]).booleanValue();
-			ta = createTextAttribute(foreground, background, bold);
-		}
-		return ta;
-	}
-
-	protected IPreferenceStore getColorPreferences() {
-		return DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	/**
-	 * @return
-	 */
-	private IStructuredDocument getInternalDocument() {
-		if (fInternalModel == null) {
-			fInternalModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForDTD.ContentTypeID_DTD);
-		}
-		return fInternalModel.getStructuredDocument();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.structured.style.AbstractLineStyleProvider#prepareRegions(org.eclipse.jface.text.ITypedRegion,
-	 *      int, int, java.util.Collection)
-	 */
-	public boolean prepareRegions(ITypedRegion typedRegion, int lineRequestStart, int lineRequestLength, Collection holdResults) {
-		if (!IDTDPartitions.DTD_DEFAULT.equals(typedRegion.getType())) {
-			// compute an internal DTD model and return linestyles for it
-			ITextRegion dtdContentRegion = null;
-			IStructuredDocumentRegion doctype = fDocument.getRegionAtCharacterOffset(typedRegion.getOffset());
-			if (doctype != null)
-				dtdContentRegion = doctype.getRegionAtCharacterOffset(typedRegion.getOffset());
-			String contents = dtdContentRegion != null ? doctype.getFullText(dtdContentRegion) : null;
-			IStructuredDocument document = getInternalDocument();
-			if (document == null)
-				return false;
-
-			updateStyleRanges(document, contents);
-
-			addStyleRanges(lineRequestStart, lineRequestLength, holdResults, doctype.getStartOffset(dtdContentRegion));
-			return true;
-		}
-		return false;
-	}
-
-	public void release() {
-		super.release();
-		if (fInternalProvider != null) {
-			fInternalProvider.release();
-		}
-	}
-
-	private void updateStyleRanges(IStructuredDocument document, String contents) {
-		if (!document.get().equals(contents)) {
-			document.set(contents);
-			try {
-				ITypedRegion regions[] = TextUtilities.computePartitioning(getInternalDocument(), fPartitioning, 0, document.getLength(), false);
-				List ranges = new ArrayList();
-				fInternalProvider.init(getInternalDocument(), fRecHighlighter);
-				for (int i = 0; i < regions.length; i++) {
-					fInternalProvider.prepareRegions(regions[i], regions[i].getOffset(), regions[i].getLength(), ranges);
-				}
-				fInternalRanges = (StyleRange[]) ranges.toArray(new StyleRange[0]);
-			}
-			catch (BadLocationException e) {
-				fInternalRanges = new StyleRange[0];
-			}
-		}
-	}
-
-
-	protected void loadColors() {
-		fInternalProvider.loadColors();
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeDTD.java
deleted file mode 100644
index c63d593..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeDTD.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver, STAR - added Encoding Content Resolver, bug 162321
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.GlobalTemplateVariables;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.wst.xml.ui.internal.templates.EncodingTemplateVariableResolverXML;
-
-/**
- * Base class for DTD template context types. Templates of this context type
- * apply to any place within DTD content type.
- */
-public class TemplateContextTypeDTD extends TemplateContextType {
-
-	public TemplateContextTypeDTD() {
-		super();
-		addResolver(new GlobalTemplateVariables.Cursor());
-		addResolver(new GlobalTemplateVariables.Date());
-		addResolver(new GlobalTemplateVariables.Dollar());
-		addResolver(new GlobalTemplateVariables.LineSelection());
-		addResolver(new GlobalTemplateVariables.Time());
-		addResolver(new GlobalTemplateVariables.User());
-		addResolver(new GlobalTemplateVariables.WordSelection());
-		addResolver(new GlobalTemplateVariables.Year());
-		addResolver(new EncodingTemplateVariableResolverXML());
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeIdsDTD.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeIdsDTD.java
deleted file mode 100644
index 0aa4ee0..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/templates/TemplateContextTypeIdsDTD.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.templates;
-
-
-public class TemplateContextTypeIdsDTD {
-	public static final String NEW = "dtd_new"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/text/DTDDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/text/DTDDocumentRegionEdgeMatcher.java
deleted file mode 100644
index 5cf9a66..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/text/DTDDocumentRegionEdgeMatcher.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.text;
-
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.sse.ui.internal.text.DocumentRegionEdgeMatcher;
-
-
-public class DTDDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher {
-
-	/**
-	 * @param validContexts
-	 * @param nextMatcher
-	 */
-	public DTDDocumentRegionEdgeMatcher() {
-		super(new String[]{DTDRegionTypes.START_TAG, DTDRegionTypes.COMMENT_START}, null);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddAttributeAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddAttributeAction.java
deleted file mode 100644
index ed94bc9..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddAttributeAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-
-public class AddAttributeAction extends BaseAction {
-
-	public AddAttributeAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode selectedNode = getFirstNodeSelected();
-		String newName = "NewAttribute"; //$NON-NLS-1$
-		if (selectedNode instanceof AttributeList) {
-			((AttributeList) selectedNode).addAttribute(newName);
-		}
-		else if (selectedNode instanceof Element) {
-			((Element) selectedNode).addAttribute(newName);
-		}
-	}
-
-	protected boolean updateSelection(IStructuredSelection selection) {
-		boolean rc = super.updateSelection(selection);
-		DTDNode node = getFirstNodeSelected(selection);
-		if (node instanceof Element) {
-			// System.out.println("attribute set to true");
-			setEnabled(true);
-		}
-		else {
-			// System.out.println("attribute set to false");
-			setEnabled(false);
-		}
-
-		return rc;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddAttributeListAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddAttributeListAction.java
deleted file mode 100644
index 1bcc5a1..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddAttributeListAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-
-public class AddAttributeListAction extends BaseAction {
-
-	public AddAttributeListAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode selectedNode = getFirstNodeSelected();
-		DTDFile dtdFile = getModel().getDTDFile();
-		String attListName = "NewAttList"; //$NON-NLS-1$
-		if (selectedNode != null) {
-			DTDNode topLevelNode = dtdFile.getTopLevelNodeAt(selectedNode.getStartOffset());
-			if (topLevelNode instanceof Element) {
-				attListName = ((Element) topLevelNode).getName();
-			}
-		}
-
-		getModel().getDTDFile().createAttributeList(selectedNode, attListName, true);
-		// newElement.setName(DTDUniqueNameHelper.getUniqueElementName(dtdFile));
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddCommentAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddCommentAction.java
deleted file mode 100644
index bdd9630..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddCommentAction.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-
-public class AddCommentAction extends BaseAction {
-
-	public AddCommentAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode selectedNode = getFirstNodeSelected();
-		getModel().getDTDFile().createComment(selectedNode, "NewComment", true); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddElementAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddElementAction.java
deleted file mode 100644
index 6b00a25..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddElementAction.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.util.DTDUniqueNameHelper;
-
-
-public class AddElementAction extends BaseAction {
-
-	public AddElementAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode selectedNode = getFirstNodeSelected();
-		DTDFile dtdFile = getModel().getDTDFile();
-		String elementName = DTDUniqueNameHelper.getUniqueElementName(dtdFile);
-		dtdFile.createElement(selectedNode, elementName, true); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddElementToContentModelAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddElementToContentModelAction.java
deleted file mode 100644
index c398cf9..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddElementToContentModelAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-
-public class AddElementToContentModelAction extends BaseAction {
-
-	public AddElementToContentModelAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode node = getFirstNodeSelected();
-
-		if (node instanceof CMGroupNode) {
-			((CMGroupNode) node).addChild();
-		}
-		else if (node instanceof Element) {
-			((Element) node).addChild();
-		}
-	}
-
-	protected boolean updateSelection(IStructuredSelection selection) {
-		boolean rc = super.updateSelection(selection);
-		DTDNode node = getFirstNodeSelected(selection);
-		if (node instanceof CMGroupNode) {
-			setEnabled(true);
-		}
-		else {
-			setEnabled(false);
-		}
-		return rc;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddEntityAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddEntityAction.java
deleted file mode 100644
index c51669e..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddEntityAction.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-
-public class AddEntityAction extends BaseAction {
-
-	public AddEntityAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode selectedNode = getFirstNodeSelected();
-
-		getModel().getDTDFile().createEntity(selectedNode, "NewEntity", true); //$NON-NLS-1$
-		// newElement.setName(DTDUniqueNameHelper.getUniqueElementName(dtdFile));
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddGroupToContentModelAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddGroupToContentModelAction.java
deleted file mode 100644
index 866e1c9..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddGroupToContentModelAction.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-
-public class AddGroupToContentModelAction extends BaseAction {
-
-	public AddGroupToContentModelAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode node = getFirstNodeSelected();
-
-		if (node instanceof CMGroupNode) {
-			((CMGroupNode) node).addGroup();
-		}
-		else if (node instanceof Element) {
-			((Element) node).addGroup();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddNotationAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddNotationAction.java
deleted file mode 100644
index b11f82d..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddNotationAction.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-
-public class AddNotationAction extends BaseAction {
-
-	public AddNotationAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode selectedNode = getFirstNodeSelected();
-
-		getModel().getDTDFile().createNotation(selectedNode, "NewNotation", true); //$NON-NLS-1$
-
-		// newNotation.setName(DTDUniqueNameHelper.getUniqueNotationName(dtdFile));
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddParameterEntityReferenceAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddParameterEntityReferenceAction.java
deleted file mode 100644
index 05ebced..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/AddParameterEntityReferenceAction.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.util.LabelValuePair;
-
-
-public class AddParameterEntityReferenceAction extends BaseAction {
-	public AddParameterEntityReferenceAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public String getFirstExternalParameterEntity(DTDFile dtdFile) {
-		LabelValuePair[] freeExternalEntities = dtdFile.getDTDModel().createParmEntityContentItems(null);
-
-		if (freeExternalEntities.length > 0) {
-			return (String) freeExternalEntities[0].fValue;
-			// return (Entity) freeExternalEntities[0].fValue;
-		}
-		return null;
-	}
-
-	public void run() {
-		DTDFile dtdFile = getModel().getDTDFile();
-		String extEntity = getFirstExternalParameterEntity(dtdFile);
-		DTDNode selectedNode = getFirstNodeSelected();
-		if (extEntity != null) {
-			dtdFile.createParameterEntityReference(selectedNode, extEntity, true);
-		}
-		else {
-			dtdFile.createParameterEntityReference(selectedNode, "%NewEntityReference;", true); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/BaseAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/BaseAction.java
deleted file mode 100644
index 411e9c3..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/BaseAction.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-
-abstract public class BaseAction extends SelectionListenerAction {
-
-	protected IEditorActionBarContributor contextContributor;
-	private IStructuredModel fModel;
-
-	public BaseAction(IStructuredModel model, String text) {
-		this(model, text, null);
-	}
-
-	public BaseAction(IStructuredModel model, String text, ImageDescriptor imageDesc) {
-		super(text);
-		fModel = model;
-		setImageDescriptor(imageDesc);
-	}
-
-	protected DTDNode getFirstNodeSelected() {
-		return getFirstNodeSelected(getStructuredSelection());
-	}
-
-	protected DTDNode getFirstNodeSelected(IStructuredSelection selection) {
-		Iterator iter = selection.iterator();
-		// DTDNode referencePoint = null;
-		while (iter.hasNext()) {
-			Object element = iter.next();
-			if (element instanceof DTDNode) {
-				return (DTDNode) element;
-			}
-		}
-		return null;
-	}
-
-	protected DTDModelImpl getModel() {
-		return (DTDModelImpl) fModel;
-	}
-
-	public void setContextContributor(IEditorActionBarContributor contributor) {
-		contextContributor = contributor;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/DeleteAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/DeleteAction.java
deleted file mode 100644
index 679c1dc..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/DeleteAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.actions.SelectionListenerAction;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.util.DTDBatchNodeDelete;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-
-
-public class DeleteAction extends SelectionListenerAction {
-
-	public DeleteAction(String label) {
-		super(label);
-	}
-
-	public void run() {
-		IStructuredSelection selection = getStructuredSelection();
-
-		Iterator iter = selection.iterator();
-		DTDBatchNodeDelete batchDelete = null;
-		DTDFile dtdFile = null;
-		while (iter.hasNext()) {
-			Object element = iter.next();
-			if (element instanceof DTDNode) {
-				DTDNode node = (DTDNode) element;
-				dtdFile = node.getDTDFile();
-				if (batchDelete == null) {
-					batchDelete = new DTDBatchNodeDelete(dtdFile);
-				}
-				batchDelete.addNode((DTDNode) element);
-			}
-		}
-		dtdFile.getDTDModel().beginRecording(this, DTDUIMessages._UI_LABEL_DTD_FILE_DELETE); //$NON-NLS-1$
-		batchDelete.deleteNodes(this);
-		dtdFile.getDTDModel().endRecording(this);
-	}
-
-	public boolean updateSelection(IStructuredSelection sel) {
-		if (!super.updateSelection(sel))
-			return false;
-
-		Object selectedObject = sel.getFirstElement();
-		if (selectedObject instanceof DTDNode && !(selectedObject instanceof CMNode && ((CMNode) selectedObject).isRootElementContent())) {
-			setEnabled(true);
-			return true; // enable delete menu item
-		}
-		else {
-			setEnabled(false);
-			return false; // disable it - grey out
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/ReplaceEmptyContentModelWithGroupAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/ReplaceEmptyContentModelWithGroupAction.java
deleted file mode 100644
index 5523965..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/contentoutline/actions/ReplaceEmptyContentModelWithGroupAction.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-
-public class ReplaceEmptyContentModelWithGroupAction extends BaseAction {
-
-	public ReplaceEmptyContentModelWithGroupAction(DTDModelImpl model, String label) {
-		super(model, label);
-	}
-
-	public void run() {
-		DTDNode node = getFirstNodeSelected();
-		if (node instanceof Element) {
-			CMNode contentModel = ((Element) node).getContentModel();
-			if (CMNode.EMPTY.equals(contentModel.getType())) {
-				getModel().beginRecording(this, getText());
-				((Element) node).replaceContentModel(this, "()"); //$NON-NLS-1$
-				getModel().endRecording(this);
-			}
-		}
-	}
-
-	protected boolean updateSelection(IStructuredSelection selection) {
-		boolean rc = super.updateSelection(selection);
-		DTDNode node = getFirstNodeSelected(selection);
-		setEnabled(node instanceof Element);
-		return rc;
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapter.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapter.java
deleted file mode 100644
index cc90289..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapter.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.views.properties;
-
-import java.util.Stack;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.properties.CustomPropertyDescriptor;
-
-
-/**
- * An IPropertySource implementation for a JFace viewer used to display
- * properties of DOM nodes. Requires an adapter factory to create JFace
- * adapters for the nodes in the tree.
- */
-public class DTDPropertySourceAdapter implements INodeAdapter, IPropertySource {
-	protected final static String CATEGORY_ATTRIBUTES = "Attributes"; //$NON-NLS-1$
-
-	private static final String ID_NAME = DTDUIMessages.DTDPropertySourceAdapter_0; //$NON-NLS-1$
-	private static final String ID_TEXT = DTDUIMessages.DTDPropertySourceAdapter_1; //$NON-NLS-1$
-
-	protected IPropertyDescriptor[] fDescriptors = null;
-	protected INodeNotifier fNode = null;
-
-	protected Stack fValuesBeingSet = new Stack();
-
-	public DTDPropertySourceAdapter(INodeNotifier target) {
-		super();
-		fNode = target;
-	}
-
-	/**
-	 * @return
-	 */
-	private IPropertyDescriptor[] createPropertyDescriptors() {
-		CustomPropertyDescriptor nameDescriptor = new CustomPropertyDescriptor(ID_NAME, ID_NAME, null);
-		nameDescriptor.setCategory(DTDUIMessages.DTDPropertySourceAdapter_2); //$NON-NLS-1$
-		// CustomPropertyDescriptor contentDescriptor = new
-		// CustomPropertyDescriptor(ID_TEXT, ID_TEXT, null);
-		// contentDescriptor.setCategory("Attributes");
-		return new IPropertyDescriptor[]{nameDescriptor};
-	}
-
-	/**
-	 * Returns a value for this Node that can be editted in a property sheet.
-	 * 
-	 * @return a value that can be editted
-	 */
-	public Object getEditableValue() {
-		return null;
-	}
-
-	/**
-	 * Returns the current collection of property descriptors.
-	 * 
-	 * @return all valid descriptors.
-	 */
-	public IPropertyDescriptor[] getPropertyDescriptors() {
-		if (fDescriptors == null || fDescriptors.length == 0) {
-			fDescriptors = createPropertyDescriptors();
-		}
-		else {
-			updatePropertyDescriptors();
-		}
-		return fDescriptors;
-	}
-
-	/**
-	 * @see org.eclipse.ui.views.properties.IPropertySource#getPropertyValue(java.lang.Object)
-	 */
-	public Object getPropertyValue(Object id) {
-		Object value = null;
-		if (id.equals(ID_NAME) && fNode instanceof DTDNode) {
-			value = ((DTDNode) fNode).getName();
-		}
-		if (id.equals(ID_TEXT) && fNode instanceof DTDNode) {
-			value = ((DTDNode) fNode).getFullNodeText();
-		}
-		return value;
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		return type == IPropertySource.class;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#isPropertySet(java.lang.Object)
-	 */
-	public boolean isPropertySet(Object id) {
-		return false;
-	}
-
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.views.properties.IPropertySource#resetPropertyValue(java.lang.Object)
-	 */
-	public void resetPropertyValue(Object id) {
-	}
-
-	public void setPropertyValue(Object nameObject, Object value) {
-	}
-
-	protected void updatePropertyDescriptors() {
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapterFactory.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapterFactory.java
deleted file mode 100644
index 59606bb..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/views/properties/DTDPropertySourceAdapterFactory.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.views.properties;
-
-
-
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-
-public class DTDPropertySourceAdapterFactory extends AbstractAdapterFactory {
-
-	public DTDPropertySourceAdapterFactory() {
-		super(IPropertySource.class, true);
-	}
-
-	public DTDPropertySourceAdapterFactory(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	public INodeAdapterFactory copy() {
-		return new DTDPropertySourceAdapterFactory(getAdapterKey(), isShouldRegisterAdapter());
-	}
-
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-		// at the moment, only one implementation exists
-		return new DTDPropertySourceAdapter(target);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDTemplatesWizardPage.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDTemplatesWizardPage.java
deleted file mode 100644
index 4af5a52..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDTemplatesWizardPage.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.wizard;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.DocumentTemplateContext;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.StructuredTextViewerConfigurationDTD;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.Logger;
-import org.eclipse.wst.dtd.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.dtd.ui.internal.preferences.DTDUIPreferenceNames;
-import org.eclipse.wst.dtd.ui.internal.templates.TemplateContextTypeIdsDTD;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-
-/**
- * Templates page in new file wizard. Allows users to select a new file
- * template to be applied in new file.
- * 
- */
-public class NewDTDTemplatesWizardPage extends WizardPage {
-
-	/**
-	 * Content provider for templates
-	 */
-	private class TemplateContentProvider implements IStructuredContentProvider {
-		/** The template store. */
-		private TemplateStore fStore;
-
-		/*
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-			fStore = null;
-		}
-
-		/*
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object input) {
-			return fStore.getTemplates(TemplateContextTypeIdsDTD.NEW);
-		}
-
-		/*
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			fStore = (TemplateStore) newInput;
-		}
-	}
-
-	/**
-	 * Label provider for templates.
-	 */
-	private class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		/*
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
-		 *      int)
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-
-		/*
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
-		 *      int)
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			Template template = (Template) element;
-
-			switch (columnIndex) {
-				case 0 :
-					return template.getName();
-				case 1 :
-					return template.getDescription();
-				default :
-					return ""; //$NON-NLS-1$
-			}
-		}
-	}
-
-	/** Last selected template name */
-	private String fLastSelectedTemplateName;
-	/** The viewer displays the pattern of selected template. */
-	private SourceViewer fPatternViewer;
-	/** The table presenting the templates. */
-	private TableViewer fTableViewer;
-	/** Template store used by this wizard page */
-	private TemplateStore fTemplateStore;
-	/** Checkbox for using templates. */
-	private Button fUseTemplateButton;
-
-	public NewDTDTemplatesWizardPage() {
-		super("NewDTDTemplatesWizardPage", DTDUIMessages.NewDTDTemplatesWizardPage_0, null); //$NON-NLS-1$
-		setDescription(DTDUIMessages.NewDTDTemplatesWizardPage_1);
-	}
-
-	/**
-	 * Correctly resizes the table so no phantom columns appear
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @param buttons
-	 *            the buttons
-	 * @param table
-	 *            the table
-	 * @param column1
-	 *            the first column
-	 * @param column2
-	 *            the second column
-	 * @param column3
-	 *            the third column
-	 */
-	private void configureTableResizing(final Composite parent, final Table table, final TableColumn column1, final TableColumn column2) {
-		parent.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				Rectangle area = parent.getClientArea();
-				Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-				int width = area.width - 2 * table.getBorderWidth();
-				if (preferredSize.y > area.height) {
-					// Subtract the scrollbar width from the total column
-					// width
-					// if a vertical scrollbar will be required
-					Point vBarSize = table.getVerticalBar().getSize();
-					width -= vBarSize.x;
-				}
-
-				Point oldSize = table.getSize();
-				if (oldSize.x > width) {
-					// table is getting smaller so make the columns
-					// smaller first and then resize the table to
-					// match the client area width
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-					table.setSize(width, area.height);
-				}
-				else {
-					// table is getting bigger so make the table
-					// bigger first and then make the columns wider
-					// to match the client area width
-					table.setSize(width, area.height);
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-				}
-			}
-		});
-	}
-
-	public void createControl(Composite ancestor) {
-		Composite parent = new Composite(ancestor, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		parent.setLayout(layout);
-
-		// create checkbox for user to use DTD Template
-		fUseTemplateButton = new Button(parent, SWT.CHECK);
-		fUseTemplateButton.setText(DTDUIMessages.NewDTDTemplatesWizardPage_4);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		fUseTemplateButton.setLayoutData(data);
-		fUseTemplateButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				enableTemplates();
-			}
-		});
-
-		// create composite for Templates table
-		Composite innerParent = new Composite(parent, SWT.NONE);
-		GridLayout innerLayout = new GridLayout();
-		innerLayout.numColumns = 2;
-		innerLayout.marginHeight = 0;
-		innerLayout.marginWidth = 0;
-		innerParent.setLayout(innerLayout);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		innerParent.setLayoutData(gd);
-
-		Label label = new Label(innerParent, SWT.NONE);
-		label.setText(DTDUIMessages.NewDTDTemplatesWizardPage_7);
-		data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		label.setLayoutData(data);
-
-		// create table that displays templates
-		Table table = new Table(innerParent, SWT.BORDER | SWT.FULL_SELECTION);
-
-		data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = convertWidthInCharsToPixels(2);
-		data.heightHint = convertHeightInCharsToPixels(10);
-		data.horizontalSpan = 2;
-		table.setLayoutData(data);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		TableLayout tableLayout = new TableLayout();
-		table.setLayout(tableLayout);
-
-		TableColumn column1 = new TableColumn(table, SWT.NONE);
-		column1.setText(DTDUIMessages.NewDTDTemplatesWizardPage_2);
-
-		TableColumn column2 = new TableColumn(table, SWT.NONE);
-		column2.setText(DTDUIMessages.NewDTDTemplatesWizardPage_3);
-
-		fTableViewer = new TableViewer(table);
-		fTableViewer.setLabelProvider(new TemplateLabelProvider());
-		fTableViewer.setContentProvider(new TemplateContentProvider());
-
-		fTableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object object1, Object object2) {
-				if ((object1 instanceof Template) && (object2 instanceof Template)) {
-					Template left = (Template) object1;
-					Template right = (Template) object2;
-					int result = left.getName().compareToIgnoreCase(right.getName());
-					if (result != 0)
-						return result;
-					return left.getDescription().compareToIgnoreCase(right.getDescription());
-				}
-				return super.compare(viewer, object1, object2);
-			}
-
-			public boolean isSorterProperty(Object element, String property) {
-				return true;
-			}
-		});
-
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				updateViewerInput();
-			}
-		});
-
-		// create viewer that displays currently selected template's contents
-		fPatternViewer = doCreateViewer(parent);
-
-		fTemplateStore = DTDUIPlugin.getDefault().getTemplateStore();
-		fTableViewer.setInput(fTemplateStore);
-
-		// Create linked text to just to templates preference page
-		Link link = new Link(parent, SWT.NONE);
-		link.setText(DTDUIMessages.NewDTDTemplatesWizardPage_6);
-		data = new GridData(SWT.END, SWT.FILL, true, false, 2, 1);
-		link.setLayoutData(data);
-		link.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				linkClicked();
-			}
-		});
-
-		configureTableResizing(innerParent, table, column1, column2);
-		loadLastSavedPreferences();
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.DTD_NEWWIZARD_TEMPLATE_HELPID);
-		Dialog.applyDialogFont(parent);
-		setControl(parent);
-	}
-
-	/**
-	 * Creates, configures and returns a source viewer to present the template
-	 * pattern on the preference page. Clients may override to provide a
-	 * custom source viewer featuring e.g. syntax coloring.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @return a configured source viewer
-	 */
-	private SourceViewer createViewer(Composite parent) {
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationDTD();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		SourceViewer viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForDTD.ContentTypeID_DTD);
-		IDocument document = scratchModel.getStructuredDocument();
-		viewer.configure(sourceViewerConfiguration);
-		viewer.setDocument(document);
-		return viewer;
-	}
-
-	private SourceViewer doCreateViewer(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(DTDUIMessages.NewDTDTemplatesWizardPage_5);
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		label.setLayoutData(data);
-
-		SourceViewer viewer = createViewer(parent);
-		viewer.setEditable(false);
-
-		Control control = viewer.getControl();
-		data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		data.heightHint = convertHeightInCharsToPixels(5);
-		// [261274] - source viewer was growing to fit the max line width of the template
-		data.widthHint = convertWidthInCharsToPixels(2);
-		control.setLayoutData(data);
-
-		return viewer;
-	}
-
-	/**
-	 * Enable/disable controls in page based on fUseTemplateButton's current
-	 * state.
-	 */
-	void enableTemplates() {
-		boolean enabled = fUseTemplateButton.getSelection();
-
-		if (!enabled) {
-			// save last selected template
-			Template template = getSelectedTemplate();
-			if (template != null)
-				fLastSelectedTemplateName = template.getName();
-			else
-				fLastSelectedTemplateName = ""; //$NON-NLS-1$
-
-			fTableViewer.setSelection(null);
-		}
-		else {
-			setSelectedTemplate(fLastSelectedTemplateName);
-		}
-
-		fTableViewer.getControl().setEnabled(enabled);
-		fPatternViewer.getControl().setEnabled(enabled);
-	}
-
-	/**
-	 * Return the template preference page id
-	 * 
-	 * @return
-	 */
-	private String getPreferencePageId() {
-		return "org.eclipse.wst.sse.ui.preferences.dtd.templates"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the currently selected template.
-	 * 
-	 * @return
-	 */
-	private Template getSelectedTemplate() {
-		Template template = null;
-		IStructuredSelection selection = (IStructuredSelection) fTableViewer.getSelection();
-
-		if (selection.size() == 1) {
-			template = (Template) selection.getFirstElement();
-		}
-		return template;
-	}
-
-	/**
-	 * Returns template string to insert.
-	 * 
-	 * @return String to insert or null if none is to be inserted
-	 */
-	String getTemplateString() {
-		String templateString = null;
-
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			TemplateContextType contextType = DTDUIPlugin.getDefault().getTemplateContextRegistry().getContextType(TemplateContextTypeIdsDTD.NEW);
-			IDocument document = new Document();
-			TemplateContext context = new DocumentTemplateContext(contextType, document, 0, 0);
-			try {
-				TemplateBuffer buffer = context.evaluate(template);
-				templateString = buffer.getString();
-			}
-			catch (Exception e) {
-				Logger.log(Logger.WARNING_DEBUG, "Could not create template for new dtd", e); //$NON-NLS-1$
-			}
-		}
-
-		return templateString;
-	}
-
-	void linkClicked() {
-		String pageId = getPreferencePageId();
-		PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(), pageId, new String[]{pageId}, null);
-		dialog.open();
-		fTableViewer.refresh();
-	}
-
-	/**
-	 * Load the last template name used in New DTD File wizard.
-	 */
-	private void loadLastSavedPreferences() {
-		String templateName = DTDUIPlugin.getDefault().getPreferenceStore().getString(DTDUIPreferenceNames.NEW_FILE_TEMPLATE_NAME);
-		if (templateName == null || templateName.length() == 0) {
-			fLastSelectedTemplateName = ""; //$NON-NLS-1$
-			fUseTemplateButton.setSelection(false);
-		}
-		else {
-			fLastSelectedTemplateName = templateName;
-			fUseTemplateButton.setSelection(true);
-		}
-		enableTemplates();
-	}
-
-	/**
-	 * Save template name used for next call to New DTD File wizard.
-	 */
-	void saveLastSavedPreferences() {
-		String templateName = ""; //$NON-NLS-1$
-
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			templateName = template.getName();
-		}
-
-		DTDUIPlugin.getDefault().getPreferenceStore().setValue(DTDUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
-		DTDUIPlugin.getDefault().savePluginPreferences();
-	}
-
-	/**
-	 * Select a template in the table viewer given the template name. If
-	 * template name cannot be found or templateName is null, just select
-	 * first item in table. If no items in table select nothing.
-	 * 
-	 * @param templateName
-	 */
-	private void setSelectedTemplate(String templateName) {
-		Object template = null;
-
-		if (templateName != null && templateName.length() > 0) {
-			// pick the last used template
-			template = fTemplateStore.findTemplate(templateName, TemplateContextTypeIdsDTD.NEW);
-		}
-
-		// no record of last used template so just pick first element
-		if (template == null) {
-			// just pick first element
-			template = fTableViewer.getElementAt(0);
-		}
-
-		if (template != null) {
-			IStructuredSelection selection = new StructuredSelection(template);
-			fTableViewer.setSelection(selection, true);
-		}
-	}
-
-	/**
-	 * Updates the pattern viewer.
-	 */
-	void updateViewerInput() {
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			fPatternViewer.getDocument().set(template.getPattern());
-		}
-		else {
-			fPatternViewer.getDocument().set(""); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDWizard.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDWizard.java
deleted file mode 100644
index ad7a35c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/internal/wizard/NewDTDWizard.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.internal.wizard;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.dtd.core.internal.DTDCorePlugin;
-import org.eclipse.wst.dtd.core.internal.preferences.DTDCorePreferenceNames;
-import org.eclipse.wst.dtd.core.internal.provisional.contenttype.ContentTypeIdForDTD;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.Logger;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-
-public class NewDTDWizard extends Wizard implements INewWizard {
-	private WizardNewFileCreationPage fNewFilePage;
-	private NewDTDTemplatesWizardPage fNewFileTemplatesPage;
-	private IStructuredSelection fSelection;
-	private IContentType fContentType;
-	private List fValidExtensions = null;
-
-	/**
-	 * Adds default extension to the filename
-	 * 
-	 * @param filename
-	 * @return
-	 */
-	String addDefaultExtension(String filename) {
-		StringBuffer newFileName = new StringBuffer(filename);
-
-		Preferences preference = DTDCorePlugin.getInstance().getPluginPreferences();
-		String ext = preference.getString(DTDCorePreferenceNames.DEFAULT_EXTENSION);
-
-		newFileName.append("."); //$NON-NLS-1$
-		newFileName.append(ext);
-
-		return newFileName.toString();
-	}
-
-	/**
-	 * Get content type associated with this new file wizard
-	 * 
-	 * @return IContentType
-	 */
-	IContentType getContentType() {
-		if (fContentType == null)
-			fContentType = Platform.getContentTypeManager().getContentType(ContentTypeIdForDTD.ContentTypeID_DTD);
-		return fContentType;
-	}
-
-	/**
-	 * Get list of valid extensions for DTD Content type
-	 * 
-	 * @return
-	 */
-	List getValidExtensions() {
-		if (fValidExtensions == null) {
-			IContentType type = getContentType();
-			fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
-		}
-		return fValidExtensions;
-	}
-
-	private String applyLineDelimiter(IFile file, String text) {
-		String lineDelimiter = Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, System.getProperty("line.separator"), new IScopeContext[] {new ProjectScope(file.getProject()), new InstanceScope() });//$NON-NLS-1$
-		String convertedText = StringUtils.replace(text, "\r\n", "\n");
-		convertedText = StringUtils.replace(convertedText, "\r", "\n");
-		convertedText = StringUtils.replace(convertedText, "\n", lineDelimiter);
-		return convertedText;
-	}
-
-	/**
-	 * Verifies if fileName is valid name for content type. Takes base content
-	 * type into consideration.
-	 * 
-	 * @param fileName
-	 * @return true if extension is valid for this content type
-	 */
-	boolean extensionValidForContentType(String fileName) {
-		boolean valid = false;
-
-		IContentType type = getContentType();
-		// there is currently an extension
-		if (fileName.lastIndexOf('.') != -1) {
-			// check what content types are associated with current extension
-			IContentType[] types = Platform.getContentTypeManager().findContentTypesFor(fileName);
-			int i = 0;
-			while (i < types.length && !valid) {
-				valid = types[i].isKindOf(type);
-				++i;
-			}
-		}
-		else
-			valid = true; // no extension so valid
-		return valid;
-	}
-	
-	public void addPages() {
-		fNewFilePage = new WizardNewFileCreationPage("DTDWizardNewFileCreationPage", new StructuredSelection(IDE.computeSelectedResources(fSelection))) { //$NON-NLS-1$
-			protected boolean validatePage() {
-				String fileName = getFileName();
-				IPath fullPath = getContainerFullPath();
-				if ((fullPath != null) && (fullPath.isEmpty() == false) && (fileName != null)) {
-					// check that filename does not contain invalid extension
-					if (!extensionValidForContentType(fileName)) {
-						setErrorMessage(NLS.bind(DTDUIMessages._ERROR_FILENAME_MUST_END_DTD, getValidExtensions().toString()));
-						return false;
-					}
-					// no file extension specified so check adding default
-					// extension doesn't equal a file that already exists
-					if (fileName.lastIndexOf('.') == -1) {
-						String newFileName = addDefaultExtension(fileName);
-						IPath resourcePath = fullPath.append(newFileName);
-
-						IWorkspace workspace = ResourcesPlugin.getWorkspace();
-						IStatus result = workspace.validatePath(resourcePath.toString(), IResource.FOLDER);
-						if (!result.isOK()) {
-							// path invalid
-							setErrorMessage(result.getMessage());
-							return false;
-						}
-
-						if ((workspace.getRoot().getFolder(resourcePath).exists() || workspace.getRoot().getFile(resourcePath).exists())) {
-							setErrorMessage(DTDUIMessages.ResourceGroup_nameExists);
-							return false;
-						}
-					}
-				}
-				setErrorMessage(null);
-				return super.validatePage();
-			}
-		};
-		fNewFilePage.setTitle(DTDUIMessages._UI_CREATE_NEW_DTD_FILE);
-		fNewFilePage.setDescription(DTDUIMessages._UI_WIZARD_NEW_DTD_EXPL);
-
-		addPage(fNewFilePage);
-
-		fNewFileTemplatesPage = new NewDTDTemplatesWizardPage();
-		addPage(fNewFileTemplatesPage);
-	}
-
-	public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
-		fSelection = aSelection;
-		setWindowTitle(DTDUIMessages._UI_WIZARD_NEW_DTD_TITLE); //$NON-NLS-1$
-
-		ImageDescriptor descriptor = DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_WIZBAN_NEWDTDFILE);
-		setDefaultPageImageDescriptor(descriptor);
-	}
-
-	private void openEditor(final IFile file) {
-		if (file != null) {
-			getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					try {
-						IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-						IDE.openEditor(page, file, true);
-					}
-					catch (PartInitException e) {
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-			});
-		}
-	}
-
-	public boolean performFinish() {
-		boolean performedOK = false;
-
-		// save user options for next use
-		fNewFileTemplatesPage.saveLastSavedPreferences();
-
-		// no file extension specified so add default extension
-		String fileName = fNewFilePage.getFileName();
-		if (fileName.lastIndexOf('.') == -1) {
-			String newFileName = addDefaultExtension(fileName);
-			fNewFilePage.setFileName(newFileName);
-		}
-
-		// create a new empty file
-		IFile file = fNewFilePage.createNewFile();
-
-		// if there was problem with creating file, it will be null, so make
-		// sure to check
-		if (file != null) {
-			// put template contents into file
-			String templateString = fNewFileTemplatesPage.getTemplateString();
-			if (templateString != null) {
-				templateString = applyLineDelimiter(file, templateString);
-				// determine the encoding for the new file
-				String charSet = getAppropriateCharset();
-				
-				try {
-					ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-					OutputStreamWriter outputStreamWriter = null;
-					if (charSet == null || charSet.trim().equals("")) { //$NON-NLS-1$
-						// just use default encoding
-						outputStreamWriter = new OutputStreamWriter(outputStream);
-					}
-					else {
-						outputStreamWriter = new OutputStreamWriter(outputStream, charSet);
-					}
-					outputStreamWriter.write(templateString);
-					outputStreamWriter.flush();
-					outputStreamWriter.close();
-					ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
-					file.setContents(inputStream, true, false, null);
-					inputStream.close();
-				}
-				catch (Exception e) {
-					Logger.log(Logger.WARNING_DEBUG, "Could not create contents for new DTD file", e); //$NON-NLS-1$
-				}
-			}
-
-			// open the file in editor
-			openEditor(file);
-
-			// everything's fine
-			performedOK = true;
-		}
-		return performedOK;
-	}
-	
-	/**
-	 * If the DTD preference identifies a charset, use that. If not, revert to the XML
-	 * charset preference
-	 * 
-	 * @return charset based on DTD preferences if defined, if not, from the XML preferences
-	 */
-	private String getAppropriateCharset() {
-		String charset = DTDCorePlugin.getInstance().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-		if(charset == null || charset.trim().equals(""))
-			charset = XMLCorePlugin.getDefault().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-		return charset;
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineComparator.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineComparator.java
deleted file mode 100644
index e6aca53..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineComparator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *     

- *******************************************************************************/

-package org.eclipse.wst.dtd.ui.views.contentoutline;

-

-import org.eclipse.jface.viewers.Viewer;

-import org.eclipse.jface.viewers.ViewerComparator;

-import org.eclipse.wst.dtd.core.internal.CMNode;

-

-/**

- * Comparator for the outline. Allows sorting of regular DTD elements, but not

- * their content models since the ordering there is important.

- */

-class DTDContentOutlineComparator extends ViewerComparator {

-

-	public DTDContentOutlineComparator() {

-		super();

-	}

-

-	public int compare(Viewer viewer, Object e1, Object e2) {

-		if (e1 instanceof CMNode && e2 instanceof CMNode)

-			return 0;

-		return super.compare(viewer, e1, e2);

-	}

-	

-	public boolean isSorterProperty(Object element, String property) {

-		return super.isSorterProperty(element, property);

-	}

-}

diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java
deleted file mode 100644
index e42869c..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContentOutlineConfiguration.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.views.contentoutline;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.util.TransferDragSourceListener;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.common.ui.internal.dnd.DragAndDropCommand;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.ui.internal.DTDUIPlugin;
-import org.eclipse.wst.dtd.ui.internal.dnd.DTDDragAndDropManager;
-import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateActionContributionItem;
-import org.eclipse.wst.sse.ui.internal.util.Assert;
-import org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration;
-
-/**
- * Configuration for outline view page which shows DTD content.
- * 
- * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration
- * @since 1.0
- */
-public class DTDContentOutlineConfiguration extends ContentOutlineConfiguration {
-	private IContentProvider fContentProvider = null;
-	private ILabelProvider fLabelProvider = null;
-
-	private DTDContextMenuHelper fMenuHelper;
-	private TransferDragSourceListener[] fTransferDragSourceListeners;
-	private TransferDropTargetListener[] fTransferDropTargetListeners;
-	private Map fViewerContributions;
-	private final String OUTLINE_ORDER_PREF = "outline-order"; //$NON-NLS-1$
-	private final String OUTLINE_SORT_PREF = "outline-sort"; //$NON-NLS-1$
-
-	/**
-	 * Default constructor for DTDContentOutlineConfiguration.
-	 */
-	public DTDContentOutlineConfiguration() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-		fViewerContributions = new HashMap(2);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#createToolbarContributions(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public IContributionItem[] createToolbarContributions(TreeViewer viewer) {
-		Assert.isTrue(getContentProvider(viewer) instanceof DTDTreeContentProvider, "invalid content provider on viewer"); //$NON-NLS-1$
-		IContributionItem[] items = super.createToolbarContributions(viewer);
-
-		SortAction sortAction = new SortAction(viewer, DTDUIPlugin.getDefault().getPreferenceStore(), OUTLINE_SORT_PREF);
-		OrderAction orderAction = new OrderAction(viewer, (DTDTreeContentProvider) getContentProvider(viewer), DTDUIPlugin.getDefault().getPreferenceStore(), OUTLINE_ORDER_PREF);
-		IContributionItem sortItem = new PropertyChangeUpdateActionContributionItem(sortAction);
-		IContributionItem orderItem = new PropertyChangeUpdateActionContributionItem(orderAction);
-
-		if (items == null) {
-			items = new IContributionItem[2];
-			items[0] = sortItem;
-			items[1] = orderItem;
-		}
-		else {
-			IContributionItem[] combinedItems = new IContributionItem[items.length + 2];
-			combinedItems[0] = sortItem;
-			combinedItems[1] = orderItem;
-			System.arraycopy(items, 0, combinedItems, 2, items.length);
-			items = combinedItems;
-		}
-		return items;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getContentProvider(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public IContentProvider getContentProvider(TreeViewer viewer) {
-		if (fContentProvider == null) {
-			fContentProvider = new DTDTreeContentProvider();
-		}
-		// return super.getContentProvider(viewer);
-		return fContentProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getLabelProvider(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		if (fLabelProvider == null) {
-			fLabelProvider = new DTDLabelProvider();
-		}
-		// return super.getLabelProvider(viewer);
-		return fLabelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getMenuListener(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public IMenuListener getMenuListener(TreeViewer viewer) {
-		IMenuListener listener = null;
-		if (fMenuHelper == null && viewer.getInput() instanceof DTDModelImpl) {
-			fMenuHelper = new DTDContextMenuHelper((DTDModelImpl) viewer.getInput());
-			fMenuHelper.createMenuListenersFor(viewer);
-		}
-		if (fMenuHelper != null) {
-			listener = fMenuHelper.getMenuListener();
-		}
-		return listener;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getPreferenceStore()
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return DTDUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getTransferDragSourceListeners(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public TransferDragSourceListener[] getTransferDragSourceListeners(final TreeViewer treeViewer) {
-		if (fTransferDragSourceListeners == null) {
-			fTransferDragSourceListeners = new TransferDragSourceListener[]{new TransferDragSourceListener() {
-				public void dragFinished(DragSourceEvent event) {
-					LocalSelectionTransfer.getTransfer().setSelection(null);
-				}
-	
-				public void dragSetData(DragSourceEvent event) {
-				}
-	
-				public void dragStart(DragSourceEvent event) {
-					LocalSelectionTransfer.getTransfer().setSelection(treeViewer.getSelection());
-				}
-	
-				public Transfer getTransfer() {
-					return LocalSelectionTransfer.getTransfer();
-				}
-			}};
-		}
-	
-		return fTransferDragSourceListeners;
-	}
-
-	/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getTransferDropTargetListeners(org.eclipse.jface.viewers.TreeViewer)
-		 */
-	public TransferDropTargetListener[] getTransferDropTargetListeners(final TreeViewer treeViewer) {
-		if (fTransferDropTargetListeners == null) {
-			fTransferDropTargetListeners = new TransferDropTargetListener[]{new TransferDropTargetListener() {
-				public void dragEnter(DropTargetEvent event) {
-				}
-	
-				public void dragLeave(DropTargetEvent event) {
-				}
-	
-				public void dragOperationChanged(DropTargetEvent event) {
-				}
-	
-				public void dragOver(DropTargetEvent event) {
-					event.feedback = DND.FEEDBACK_SELECT;
-					float feedbackFloat = getHeightInItem(event);
-					if (feedbackFloat > 0.75) {
-						event.feedback = DND.FEEDBACK_INSERT_AFTER;
-					}
-					else if (feedbackFloat < 0.25) {
-						event.feedback = DND.FEEDBACK_INSERT_BEFORE;
-					}
-					event.feedback |= DND.FEEDBACK_EXPAND | DND.FEEDBACK_SCROLL;
-				}
-	
-				public void drop(DropTargetEvent event) {
-					if (event.operations != DND.DROP_NONE && LocalSelectionTransfer.getTransfer().getSelection() instanceof IStructuredSelection) {
-						IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
-						if (selection != null && !selection.isEmpty() && event.item != null && event.item.getData() != null) {
-							/*
-							 * the command uses these numbers instead of the
-							 * feedback constants (even though it converts in
-							 * the other direction as well)
-							 */
-							float feedbackFloat = getHeightInItem(event);
-	
-							final DragAndDropCommand command = new DTDDragAndDropManager().createCommand(event.item.getData(), feedbackFloat, event.operations, event.detail, selection.toList());
-							if (command != null && command.canExecute()) {
-								SafeRunnable.run(new SafeRunnable() {
-									public void run() throws Exception {
-										command.execute();
-									}
-								});
-							}
-						}
-					}
-				}
-	
-				public void dropAccept(DropTargetEvent event) {
-				}
-	
-				private float getHeightInItem(DropTargetEvent event) {
-					if(event.item == null) return .5f;
-					if (event.item instanceof TreeItem) {
-						TreeItem treeItem = (TreeItem) event.item;
-						Control control = treeItem.getParent();
-						Point point = control.toControl(new Point(event.x, event.y));
-						Rectangle bounds = treeItem.getBounds();
-						return (float) (point.y - bounds.y) / (float) bounds.height;
-					}
-					else if (event.item instanceof TableItem) {
-						TableItem tableItem = (TableItem) event.item;
-						Control control = tableItem.getParent();
-						Point point = control.toControl(new Point(event.x, event.y));
-						Rectangle bounds = tableItem.getBounds(0);
-						return (float) (point.y - bounds.y) / (float) bounds.height;
-					}
-					else {
-						return 0.0F;
-					}
-				}
-				
-				public Transfer getTransfer() {
-					return LocalSelectionTransfer.getTransfer();
-				}
-	
-				public boolean isEnabled(DropTargetEvent event) {
-					return getTransfer().isSupportedType(event.currentDataType);
-				}
-			}};
-		}
-		return fTransferDropTargetListeners;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#unconfigure(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public void unconfigure(TreeViewer viewer) {
-		super.unconfigure(viewer);
-		fViewerContributions.remove(viewer);
-		if (fMenuHelper != null) {
-			fMenuHelper.removeMenuListenersFor(viewer);
-			fMenuHelper = null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContextMenuHelper.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContextMenuHelper.java
deleted file mode 100644
index f99a07f..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDContextMenuHelper.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     Naoki Akiyama (Fujitsu) - bug 187172 - fix attribute grouping
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.dtd.ui.views.contentoutline;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.CMGroupNode;
-import org.eclipse.wst.dtd.core.internal.CMNode;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.NodeList;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.parser.DTDRegionTypes;
-import org.eclipse.wst.dtd.core.internal.util.LabelValuePair;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddAttributeAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddAttributeListAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddCommentAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddElementAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddElementToContentModelAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddEntityAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddGroupToContentModelAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddNotationAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.AddParameterEntityReferenceAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.DeleteAction;
-import org.eclipse.wst.dtd.ui.internal.views.contentoutline.actions.ReplaceEmptyContentModelWithGroupAction;
-
-/**
- * Menu helper for Content Outline page. This should not be used elsewhere.
- */
-class DTDContextMenuHelper {
-	class DTDMenuListener implements IMenuListener {
-		public void menuAboutToShow(IMenuManager manager) {
-			// update the action selection now
-			addNotationAction.selectionChanged(fViewerSelection);
-			addEntityAction.selectionChanged(fViewerSelection);
-			addElementAction.selectionChanged(fViewerSelection);
-			addCommentAction.selectionChanged(fViewerSelection);
-			addParameterEntityReferenceAction.selectionChanged(fViewerSelection);
-			deleteAction.selectionChanged(fViewerSelection);
-			addAttributeAction.selectionChanged(fViewerSelection);
-			addAttributeListAction.selectionChanged(fViewerSelection);
-			addGroupToContentModelAction.selectionChanged(fViewerSelection);
-			addElementToContentModelAction.selectionChanged(fViewerSelection);
-			replaceEmptyContentModelWithGroupAction.selectionChanged(fViewerSelection);
-
-
-			if (!fViewerSelection.isEmpty()) {
-				addActionItemsForSelection(fViewerSelection.getFirstElement(), manager);
-			}
-		}
-	}
-
-	class ViewerSelectionChangeListener implements ISelectionChangedListener {
-		public void selectionChanged(SelectionChangedEvent event) {
-			_selectionChanged(event);
-		}
-	}
-
-	AddAttributeAction addAttributeAction;
-
-	AddAttributeListAction addAttributeListAction;
-	AddCommentAction addCommentAction;
-	AddElementAction addElementAction;
-	AddElementToContentModelAction addElementToContentModelAction;
-	AddEntityAction addEntityAction;
-	AddGroupToContentModelAction addGroupToContentModelAction;
-	AddNotationAction addNotationAction;
-	AddParameterEntityReferenceAction addParameterEntityReferenceAction;
-	DeleteAction deleteAction;
-	private ISelectionChangedListener fInternalSelectionChangedListener = new ViewerSelectionChangeListener();
-
-	private IMenuListener fMenuListener;
-	private DTDModelImpl fModel;
-	private List fViewerList;
-
-	IStructuredSelection fViewerSelection = StructuredSelection.EMPTY;
-
-	ReplaceEmptyContentModelWithGroupAction replaceEmptyContentModelWithGroupAction;
-
-	public DTDContextMenuHelper(DTDModelImpl model) {
-		fModel = model;
-		fViewerList = new ArrayList(1);
-		fMenuListener = new DTDMenuListener();
-
-		addNotationAction = new AddNotationAction(model, DTDUIMessages._UI_ACTION_ADD_DTD_NOTATION); //$NON-NLS-1$
-		addEntityAction = new AddEntityAction(model, DTDUIMessages._UI_ACTION_ADD_DTD_ENTITY); //$NON-NLS-1$
-		addElementAction = new AddElementAction(model, DTDUIMessages._UI_ACTION_ADD_DTD_ELEMENT); //$NON-NLS-1$
-		addCommentAction = new AddCommentAction(model, DTDUIMessages._UI_ACTION_ADD_DTD_COMMENT); //$NON-NLS-1$
-
-		addParameterEntityReferenceAction = new AddParameterEntityReferenceAction(model, DTDUIMessages._UI_ACTION_ADD_PARAM_ENTITY_REF); //$NON-NLS-1$
-		deleteAction = new DeleteAction(DTDUIMessages._UI_ACTION_DTD_DELETE); //$NON-NLS-1$
-		addAttributeAction = new AddAttributeAction(model, DTDUIMessages._UI_ACTION_ADD_ATTRIBUTE); //$NON-NLS-1$
-		addAttributeListAction = new AddAttributeListAction(model, DTDUIMessages._UI_ACTION_ADD_ATTRIBUTELIST); //$NON-NLS-1$
-
-		addGroupToContentModelAction = new AddGroupToContentModelAction(model, DTDUIMessages._UI_ACTION_GROUP_ADD_GROUP); //$NON-NLS-1$
-		addElementToContentModelAction = new AddElementToContentModelAction(model, DTDUIMessages._UI_ACTION_ADD_ELEMENT); //$NON-NLS-1$
-
-		replaceEmptyContentModelWithGroupAction = new ReplaceEmptyContentModelWithGroupAction(model, DTDUIMessages._UI_ACTION_GROUP_ADD_GROUP); //$NON-NLS-1$
-
-		addNotationAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ADD_NOTATION));
-		addEntityAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ADD_ENTITY));
-		addCommentAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ADD_COMMENT));
-		addParameterEntityReferenceAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ADD_ENTITY_REFERENCE));
-
-		// Tri-state images
-		addElementAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_ETOOL_ADD_ELEMENT));
-		addElementAction.setHoverImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_CTOOL_ADD_ELEMENT));
-		addElementAction.setDisabledImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_DTOOL_ADD_ELEMENT));
-
-		addAttributeAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_ETOOL_ADD_ATTRIBUTE));
-		addAttributeAction.setHoverImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_CTOOL_ADD_ATTRIBUTE));
-		addAttributeAction.setDisabledImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_DTOOL_ADD_ATTRIBUTE));
-
-		addAttributeListAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_ETOOL_ADD_ATTRIBUTE));
-		addAttributeListAction.setHoverImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_CTOOL_ADD_ATTRIBUTE));
-		addAttributeListAction.setDisabledImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_DTOOL_ADD_ATTRIBUTE));
-
-		addGroupToContentModelAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_ETOOL_ADD_GROUPTOCONMODEL));
-		addGroupToContentModelAction.setHoverImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_CTOOL_ADD_GROUPTOCONMODEL));
-		addGroupToContentModelAction.setDisabledImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_DTOOL_ADD_GROUPTOCONMODEL));
-
-		addElementToContentModelAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_ETOOL_ADD_ELEMENTTOCONMODEL));
-		addElementToContentModelAction.setHoverImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_CTOOL_ADD_ELEMENTTOCONMODEL));
-		addElementToContentModelAction.setDisabledImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_DTOOL_ADD_ELEMENTTOCONMODEL));
-
-		// use the same images as addGroupToContentModelAction
-		replaceEmptyContentModelWithGroupAction.setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_ETOOL_ADD_GROUPTOCONMODEL));
-		replaceEmptyContentModelWithGroupAction.setHoverImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_CTOOL_ADD_GROUPTOCONMODEL));
-		replaceEmptyContentModelWithGroupAction.setDisabledImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_DTOOL_ADD_GROUPTOCONMODEL));
-	}
-
-	void _selectionChanged(SelectionChangedEvent event) {
-		/*
-		 * Save the selection so we only notify the actions when the menu is
-		 * shown
-		 */
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			fViewerSelection = (IStructuredSelection) selection;
-		}
-		else {
-			fViewerSelection = StructuredSelection.EMPTY;
-		}
-	}
-
-	void addActionItemsForSelection(Object selectedObject, IMenuManager menu) {
-		if (selectedObject instanceof NodeList) {
-			// add appropriate menu to logical view
-			NodeList folder = (NodeList) selectedObject;
-			if (folder.getListType().equals(DTDRegionTypes.NOTATION_TAG)) {
-				menu.add(addNotationAction);
-			}
-			else if (folder.getListType().equals(DTDRegionTypes.ENTITY_TAG)) {
-				menu.add(addEntityAction);
-			}
-			else if (folder.getListType().equals(DTDRegionTypes.ELEMENT_TAG)) {
-				LabelValuePair[] availableEntities = fModel.createParmEntityContentItems(null);
-				addParameterEntityReferenceAction.setEnabled(availableEntities.length > 0);
-
-				menu.add(addElementAction);
-				menu.add(addParameterEntityReferenceAction);
-			}
-			else if (folder.getListType().equals(DTDRegionTypes.ATTLIST_TAG)) {
-				menu.add(addAttributeListAction);
-			}
-		}
-		if (selectedObject instanceof DTDFile || selectedObject == null) {
-			LabelValuePair[] availableEntities = fModel.createParmEntityContentItems(null);
-			addParameterEntityReferenceAction.setEnabled(availableEntities.length > 0);
-
-			menu.add(addElementAction);
-			menu.add(addEntityAction);
-			menu.add(addNotationAction);
-			menu.add(addParameterEntityReferenceAction);
-			menu.add(addCommentAction);
-			menu.add(addAttributeListAction);
-			menu.add(new Separator());
-		}
-
-		if (selectedObject instanceof Element) {
-			Element dtdElement = (Element) selectedObject;
-
-			CMNode contentModel = dtdElement.getContentModel();
-			if (contentModel == null) {
-				menu.add(addGroupToContentModelAction);
-				menu.add(addElementToContentModelAction);
-			}
-			else if (contentModel != null && CMNode.EMPTY.equals(contentModel.getType())) {
-				menu.add(replaceEmptyContentModelWithGroupAction);
-			}
-			menu.add(addAttributeAction);
-		}
-		else if (selectedObject instanceof CMGroupNode) {
-			menu.add(addElementToContentModelAction);
-			menu.add(addGroupToContentModelAction);
-		}
-		else if (selectedObject instanceof AttributeList) {
-			menu.add(addAttributeAction);
-		}
-
-		menu.add(new Separator());
-		addEditActions(menu);
-		menu.add(new Separator());
-
-		if (selectedObject instanceof DTDNode && !(selectedObject instanceof CMNode && ((CMNode) selectedObject).isRootElementContent())) {
-			menu.add(deleteAction);
-			deleteAction.setEnabled(true);
-		}
-	}
-
-	void addEditActions(IMenuManager menu) {
-		// menu.add(undoAction);
-		// menu.add(redoAction);
-		// menu.add(new Separator());
-		// menu.add(cutAction);
-		// menu.add(copyAction);
-		// menu.add(pasteAction);
-	}
-
-	public void createMenuListenersFor(Viewer viewer) {
-		viewer.addSelectionChangedListener(fInternalSelectionChangedListener);
-		ISelection selection = viewer.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			fViewerSelection = (IStructuredSelection) selection;
-		}
-		else {
-			fViewerSelection = StructuredSelection.EMPTY;
-		}
-
-		fViewerList.add(viewer);
-	}
-
-	public IMenuListener getMenuListener() {
-		return fMenuListener;
-	}
-
-	public void removeMenuListenersFor(Viewer viewer) {
-		viewer.removeSelectionChangedListener(fInternalSelectionChangedListener);
-		fViewerList.remove(viewer);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDLabelProvider.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDLabelProvider.java
deleted file mode 100644
index 6c7fb1f..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDLabelProvider.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.views.contentoutline;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.NodeList;
-
-class DTDLabelProvider extends LabelProvider {
-
-	public DTDLabelProvider() {
-		super();
-	}
-
-	/**
-	 * Returns the image for the label of the given element.
-	 * 
-	 * @param element
-	 *            the element for which to provide the label image
-	 * @return the image used to label the element, or <code>null</code> if
-	 *         these is no image for the given object
-	 */
-	public Image getImage(Object element) {
-		Image image = null;
-		if (element instanceof DTDNode) {
-			image = ((DTDNode) element).getImage();
-		}
-		else if (element instanceof NodeList) {
-			image = ((NodeList) element).getImage();
-		}
-		else if (element instanceof DTDFile) {
-			image = ((DTDFile) element).getImage();
-		}
-		else {
-			image = super.getImage(element);
-		}
-		return image;
-	}
-
-	/**
-	 * Returns the text for the label of the given element.
-	 * 
-	 * @param element
-	 *            the element for which to provide the label text
-	 * @return the text string used to label the element, or <code>null</code>
-	 *         if these is no text label for the given object
-	 */
-	public String getText(Object element) {
-		if (element instanceof DTDNode) {
-			String name = ((DTDNode) element).getName();
-
-			// strip leading whitespace (useful for multi-line comments)
-			int firstSignificantCharacter = 0;
-			int lastVisibleCharacter = name.length() - 1;
-			for (firstSignificantCharacter = 0; firstSignificantCharacter < name.length(); firstSignificantCharacter++) {
-				if (!Character.isWhitespace(name.charAt(firstSignificantCharacter)))
-					break;
-			}
-			// keep only the first line of text in a multi-line name
-			if (firstSignificantCharacter < lastVisibleCharacter) {
-				for (lastVisibleCharacter = firstSignificantCharacter + 1; lastVisibleCharacter < name.length(); lastVisibleCharacter++) {
-					char character = name.charAt(lastVisibleCharacter);
-					if (character == '\r' || character == '\n')
-						break;
-				}
-			}
-			if (firstSignificantCharacter > 0 && firstSignificantCharacter < name.length() - 1) {
-				name = name.substring(firstSignificantCharacter, lastVisibleCharacter);
-			}
-
-			return name;
-		}
-		else if (element instanceof NodeList) {
-			// return ((NodeList) element).getListType();
-			return ((NodeList) element).getName();
-		}
-		else if (element instanceof DTDFile) {
-			return ((DTDFile) element).getName();
-		}
-		return super.getText(element);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDTreeContentProvider.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDTreeContentProvider.java
deleted file mode 100644
index a6aa906..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/DTDTreeContentProvider.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.views.contentoutline;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.dtd.core.internal.Attribute;
-import org.eclipse.wst.dtd.core.internal.AttributeList;
-import org.eclipse.wst.dtd.core.internal.Comment;
-import org.eclipse.wst.dtd.core.internal.DTDFile;
-import org.eclipse.wst.dtd.core.internal.DTDNode;
-import org.eclipse.wst.dtd.core.internal.Element;
-import org.eclipse.wst.dtd.core.internal.Entity;
-import org.eclipse.wst.dtd.core.internal.NodeList;
-import org.eclipse.wst.dtd.core.internal.Notation;
-import org.eclipse.wst.dtd.core.internal.ParameterEntityReference;
-import org.eclipse.wst.dtd.core.internal.document.DTDModelImpl;
-import org.eclipse.wst.dtd.core.internal.event.IDTDFileListener;
-import org.eclipse.wst.dtd.core.internal.event.NodesEvent;
-
-class DTDTreeContentProvider implements ITreeContentProvider, IDTDFileListener {
-
-	private Object fInputObject;
-	protected Viewer fViewer;
-
-	// A cached set of IndexedNodeLists, required for getParent to return the
-	// correct instances mapping to TreeItems
-	protected Object[] logicalNodeLists = null;
-
-	private boolean showLogicalOrder = false;
-
-	public DTDTreeContentProvider() {
-		super();
-	}
-
-	public void dispose() {
-		fViewer = null;
-	}
-
-	private void expandToNode(DTDNode node) {
-		DTDFile dtdFile = node.getDTDFile();
-		// first expand the root
-		AbstractTreeViewer viewer = (AbstractTreeViewer) fViewer;
-		viewer.expandToLevel(dtdFile, 1);
-		NodeList listToExpand = null;
-		if (node instanceof Element || node instanceof ParameterEntityReference) {
-			listToExpand = dtdFile.getElementsAndParameterEntityReferences();
-		}
-		else if (node instanceof Notation) {
-			listToExpand = dtdFile.getNotations();
-		}
-		else if (node instanceof Entity) {
-			listToExpand = dtdFile.getEntities();
-		}
-		else if (node instanceof Comment) {
-			listToExpand = dtdFile.getComments();
-		}
-		if (listToExpand != null) {
-			viewer.expandToLevel(listToExpand, 1);
-		}
-		viewer.expandToLevel(node, 0);
-	}
-
-	public Object[] getChildren(Object parentElement) {
-		// return the lists of nodes when in logical order mode, all the Nodes
-		// otherwise
-		if (parentElement instanceof DTDFile) {
-			if (isShowLogicalOrder()) {
-				// return the visible node lists
-				if (logicalNodeLists == null) {
-					Iterator nodeLists = ((DTDFile) parentElement).getNodeLists().iterator();
-					List visibleLists = new ArrayList(7);
-					while (nodeLists.hasNext()) {
-						NodeList list = (NodeList) nodeLists.next();
-						if (isVisibleNodeList(list)) {
-							visibleLists.add(list);
-						}
-					}
-					logicalNodeLists = visibleLists.toArray();
-				}
-				return logicalNodeLists;
-			}
-			else {
-				// return the visible nodes
-				List allNodes = ((DTDFile) parentElement).getNodes();
-				List visibleNodes = new ArrayList(allNodes.size());
-				for (int i = 0; i < allNodes.size(); i++) {
-					Object o = allNodes.get(i);
-					if (isVisibleNode(o)) {
-						visibleNodes.add(o);
-					}
-				}
-				return visibleNodes.toArray();
-			}
-		}
-		else if (parentElement instanceof NodeList) {
-			return ((NodeList) parentElement).getNodes().toArray();
-		}
-		else if (parentElement instanceof Element) {
-			// always group the attributes directly under the element
-			Object[] children = ((DTDNode) parentElement).getChildren();
-			List attributes = ((Element) parentElement).getElementAttributes();
-			Object[] logicalChildren = new Object[children.length + attributes.size()];
-			int index = 0;
-			for (index = 0; index < children.length; index++) {
-				logicalChildren[index] = children[index];
-			}
-			for (Iterator iter = attributes.iterator(); iter.hasNext();) {
-				logicalChildren[index++] = iter.next();
-			}
-			return logicalChildren;
-		}
-		else if (parentElement instanceof DTDNode) {
-			return ((DTDNode) parentElement).getChildren();
-		}
-		return Collections.EMPTY_LIST.toArray();
-	}
-
-	public Object[] getElements(java.lang.Object inputElement) {
-		Object[] elements = null;
-		// Always show the DTDFile "node"
-		if (inputElement instanceof DTDModelImpl) {
-			elements = new Object[]{((DTDModelImpl) inputElement).getDTDFile()};
-		}
-		if (elements == null) {
-			elements = new Object[0];
-		}
-		return elements;
-	}
-
-	public Object getParent(Object element) {
-		Object parent = null;
-		if (element instanceof DTDNode) {
-			DTDNode node = (DTDNode) element;
-			if (element instanceof Attribute) {
-				// then we must say that the element with the same name
-				// as our attribute's parent attributelist is our parent
-				parent = node.getParentNode();
-				if (parent != null && parent instanceof AttributeList) {
-					return getParent(parent);
-				}
-			}
-			if (element instanceof AttributeList) {
-				// then we must say that the element with the same name
-				// as our attributelist is our parent
-				String attListName = ((AttributeList) element).getName();
-				Iterator iter = node.getDTDFile().getElementsAndParameterEntityReferences().getNodes().iterator();
-				while (iter.hasNext() && parent == null) {
-					DTDNode currentNode = (DTDNode) iter.next();
-					if (currentNode instanceof Element && currentNode.getName().equals(attListName)) {
-						parent = currentNode;
-					}
-				}
-			}
-
-			if (parent == null) {
-				parent = ((DTDNode) element).getParentNode();
-			}
-
-			// if showing in the logical order, return the IndexedNodeList
-			// acting as the parent in the tree
-			if (parent == null) {
-				if (isShowLogicalOrder()) {
-					Object[] indexedNodeLists = getChildren(((DTDModelImpl) fInputObject).getDTDFile());
-					for (int i = 0; i < indexedNodeLists.length && parent == null; i++) {
-						if (indexedNodeLists[i] instanceof NodeList) {
-							if (((NodeList) indexedNodeLists[i]).getNodes().contains(element))
-								parent = indexedNodeLists[i];
-						}
-					}
-				}
-				else {
-					parent = ((DTDModelImpl) fInputObject).getDTDFile();
-				}
-			}
-		}
-		else if (element instanceof NodeList && fInputObject instanceof DTDModelImpl) {
-			parent = ((DTDModelImpl) fInputObject).getDTDFile();
-		}
-		return parent;
-	}
-
-	public boolean hasChildren(Object element) {
-		Object[] children = getChildren(element);
-		return children.length > 0;
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		fViewer = viewer;
-
-		if (fInputObject instanceof DTDModelImpl) {
-			((DTDModelImpl) fInputObject).getDTDFile().removeDTDFileListener(this);
-		}
-		fInputObject = newInput;
-		if (fInputObject instanceof DTDModelImpl) {
-			((DTDModelImpl) fInputObject).getDTDFile().addDTDFileListener(this);
-		}
-	}
-
-	/**
-	 * Get the value of showLogicalOrder.
-	 * 
-	 * @return value of showLogicalOrder.
-	 */
-	public boolean isShowLogicalOrder() {
-		return showLogicalOrder;
-	}
-
-	private boolean isVisibleNode(Object o) {
-		if (o instanceof AttributeList) {
-			return false;
-		}
-		return true;
-	}
-
-	private boolean isVisibleNodeList(NodeList nodeList) {
-		/*
-		 * All NodesLists should be visible because you can momentarily have
-		 * an ATTLIST (for example) without a corresponding ELEMENT
-		 * declaration
-		 */
-		return true;// !nodeList.getListType().equals(DTDRegionTypes.ATTLIST_TAG);
-	}
-
-	public void nodeChanged(final DTDNode node) {
-		if (fViewer instanceof StructuredViewer) {
-			// System.out.println("node changed notified");
-			// System.out.println("selection before = " +
-			// ((StructuredViewer)view).getSelection());
-			if (node instanceof AttributeList && isShowLogicalOrder()) {
-				// in this case, we are showing attributes under the element.
-				// refresh the element object instead
-				Iterator iter = node.getDTDFile().getNodes().iterator();
-				while (iter.hasNext()) {
-					DTDNode currentNode = (DTDNode) iter.next();
-					if (currentNode.getName().equals(node.getName()) && currentNode instanceof Element) {
-						((StructuredViewer) fViewer).refresh(currentNode, true);
-					}
-				} // end of while ()
-			}
-			else {
-				// do standard stuff
-				fViewer.getControl().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						if (fViewer.getControl().isDisposed())
-							return;
-						if (node.getParentNode() != null) {
-							((StructuredViewer) fViewer).refresh(node.getParentNode(), true);
-						}
-						((StructuredViewer) fViewer).refresh(node, true);
-					}
-				});
-			}
-			
-			if (node instanceof Attribute) {
-				fViewer.getControl().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						if (fViewer.getControl().isDisposed())
-							return;
-						/*
-						 * go from the attribute to its list and then owning element
-						 * so we refresh the tree item there as well
-						 */
-						Object attrList = node.getParentNode();
-						if (attrList != null && attrList instanceof AttributeList) {
-							String attListName = ((AttributeList) attrList).getName();
-							Iterator iter = node.getDTDFile().getElementsAndParameterEntityReferences().getNodes().iterator();
-							Object parent = null;
-							while (iter.hasNext() && parent == null) {
-								DTDNode currentNode = (DTDNode) iter.next();
-								if (currentNode instanceof Element && currentNode.getName().equals(attListName)) {
-									parent = currentNode;
-								}
-							}
-							if (parent != null) {
-								((StructuredViewer) fViewer).refresh(parent, true);
-							}
-						}
-					}
-				});
-			}
-			// System.out.println("selection after = " +
-			// ((StructuredViewer)view).getSelection());
-		}
-	}
-
-	public void nodesAdded(NodesEvent event) {
-		if (fViewer instanceof AbstractTreeViewer) {
-			StructuredViewer viewer = (StructuredViewer) fViewer;
-			ISelection selection = viewer.getSelection();
-
-			Object firstObj = (!selection.isEmpty() && selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-			DTDNode oldSelectedNode = null;
-			if (firstObj instanceof DTDNode) {
-				oldSelectedNode = (DTDNode) firstObj;
-			}
-
-			final AbstractTreeViewer abstractTreeViewer = (AbstractTreeViewer) fViewer;
-			for (Iterator it = event.getNodes().iterator(); it.hasNext();) {
-				Object node = it.next();
-				final Object parent = getParent(node);
-				// Bug 111100 - If it is a top level node (ie. parent is a
-				// DTDFile),
-				// insert the node directly to improve performance
-				if (parent instanceof DTDFile) {
-					Object[] objs = getChildren(parent);
-					for (int i = 0; i < objs.length; i++) {
-						if (objs[i] == node) {
-							abstractTreeViewer.insert(parent, node, i);
-							break;
-						}
-					}
-				}
-				// If the parent node is not a DTDFile, just refresh the
-				// parent for now
-				else if (parent != null) {
-					fViewer.getControl().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							if (fViewer.getControl().isDisposed())
-								return;
-							abstractTreeViewer.refresh(parent, true);
-						}
-					});
-				}
-				// You should never reach this block, if you do, just refresh
-				// the whole tree
-				else {
-					fViewer.getControl().getDisplay().asyncExec(new Runnable() {
-						public void run() {
-							if (fViewer.getControl().isDisposed())
-								return;
-							abstractTreeViewer.refresh(true);
-						}
-					});
-				}
-			}
-
-			Iterator iter = event.getNodes().iterator();
-			List newSelection = new ArrayList();
-			while (iter.hasNext()) {
-				DTDNode node = (DTDNode) iter.next();
-				if (oldSelectedNode == null || node.getStructuredDTDDocumentRegion() != oldSelectedNode.getStructuredDTDDocumentRegion() || node.getStartOffset() != oldSelectedNode.getStartOffset() || node.getEndOffset() != oldSelectedNode.getEndOffset()) {
-					// add to selection
-					newSelection.add(node);
-					expandToNode(node);
-				}
-			}
-			if (newSelection.size() > 0) {
-				viewer.setSelection(new StructuredSelection(newSelection));
-			}
-
-		}
-	}
-
-	public void nodesRemoved(NodesEvent event) {
-		if (fViewer instanceof AbstractTreeViewer) {
-			AbstractTreeViewer abstractTreeViewer = (AbstractTreeViewer) fViewer;
-			for (Iterator iter = event.getNodes().iterator(); iter.hasNext();) {
-				abstractTreeViewer.remove(iter.next());
-			}
-		}
-
-	}
-
-	/**
-	 * Set the value of showLogicalOrder.
-	 * 
-	 * @param value
-	 *            Value to assign to showLogicalOrder.
-	 */
-	public void setShowLogicalOrder(boolean value) {
-		this.showLogicalOrder = value;
-		if (!value) {
-			// if not using logical order, lose the cached lists
-			logicalNodeLists = null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java
deleted file mode 100644
index 227bc77..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/OrderAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-/*
- * Created on Jan 22, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.wst.dtd.ui.views.contentoutline;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
-import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateAction;
-
-class OrderAction extends PropertyChangeUpdateAction {
-	private DTDTreeContentProvider contentProvider;
-	private TreeViewer treeViewer;
-
-	public OrderAction(TreeViewer viewer, DTDTreeContentProvider provider, IPreferenceStore store, String preferenceKey) {
-		super(DTDUIMessages._UI_BUTTON_GROUP_ITEMS_LOGICALLY, store, preferenceKey, false); //$NON-NLS-1$
-		setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_ORGANIZE_DTD_LOGICALLY));
-		treeViewer = viewer;
-		contentProvider = provider;
-		setToolTipText(getText());
-		contentProvider.setShowLogicalOrder(isChecked());
-	}
-
-	public void update() {
-		super.update();
-		treeViewer.getControl().setRedraw(false);
-		setChecked(getPreferenceStore().getBoolean(getPreferenceKey()));
-		Object[] expandedElements = treeViewer.getExpandedElements();
-		ISelection selection = treeViewer.getSelection();
-		contentProvider.setShowLogicalOrder(isChecked());
-
-		// treeViewer.setInput(treeViewer.getInput());
-		treeViewer.refresh(treeViewer.getInput());
-
-		treeViewer.setExpandedElements(expandedElements);
-		treeViewer.getControl().setRedraw(true);
-		treeViewer.setSelection(selection);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java b/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
deleted file mode 100644
index dc73f47..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/src/org/eclipse/wst/dtd/ui/views/contentoutline/SortAction.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.dtd.ui.views.contentoutline;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.wst.dtd.ui.internal.DTDUIMessages;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImageHelper;
-import org.eclipse.wst.dtd.ui.internal.editor.DTDEditorPluginImages;
-import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateAction;
-
-class SortAction extends PropertyChangeUpdateAction {
-	private TreeViewer treeViewer;
-	private ViewerComparator fComparator;
-
-	public SortAction(TreeViewer viewer, IPreferenceStore store, String preferenceKey) {
-		super(DTDUIMessages._UI_BUTTON_SORT_ITEMS, store, preferenceKey, false); //$NON-NLS-1$
-		setImageDescriptor(DTDEditorPluginImageHelper.getInstance().getImageDescriptor(DTDEditorPluginImages.IMG_OBJ_SORT));
-		setToolTipText(getText());
-		fComparator = new DTDContentOutlineComparator();
-		treeViewer = viewer;
-		if (isChecked()) {
-			treeViewer.setComparator(fComparator);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.IUpdate#update()
-	 */
-	public void update() {
-		super.update();
-		treeViewer.getControl().setRedraw(false);
-		Object[] expandedElements = treeViewer.getExpandedElements();
-		if (isChecked()) {
-			treeViewer.setComparator(fComparator);
-		}
-		else {
-			treeViewer.setComparator(null);
-		}
-		treeViewer.setInput(treeViewer.getInput());
-		treeViewer.setExpandedElements(expandedElements);
-		treeViewer.getControl().setRedraw(true);
-	}
-}
diff --git a/bundles/org.eclipse.wst.dtd.ui/templates/dtddefault-templates.properties b/bundles/org.eclipse.wst.dtd.ui/templates/dtddefault-templates.properties
deleted file mode 100644
index 89682b9..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/templates/dtddefault-templates.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 STAR Standards for Technology in Automotive Retail
-# 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:
-#     David Carver, STAR - initial API and implementation, bug 162321
-#     
-###############################################################################
-Templates.xmldeclaration.name=xml declaration
-Templates.xmldeclaration.desc=xml declaration
diff --git a/bundles/org.eclipse.wst.dtd.ui/templates/dtddefault-templates.xml b/bundles/org.eclipse.wst.dtd.ui/templates/dtddefault-templates.xml
deleted file mode 100644
index b2c6422..0000000
--- a/bundles/org.eclipse.wst.dtd.ui/templates/dtddefault-templates.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*******************************************************************************
- * Copyright (c) 2007 Standards for Technology in Automotive Retail 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:
- *     David Carver - STAR - initial contribution, bug 162321
- *******************************************************************************/
- -->
-<templates>
-  <template name="%Templates.xmldeclaration.name" description="%Templates.xmldeclaration.desc" id="org.eclipse.wst.dtd.ui.internal.templates.xmldeclaration" context="dtd_new" enabled="true">&lt;?xml version="1.0" encoding="${encoding}"?&gt;</template>
-</templates>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.classpath b/bundles/org.eclipse.wst.jsdt.web.core/.classpath
deleted file mode 100644
index 52165ec..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.options b/bundles/org.eclipse.wst.jsdt.web.core/.options
deleted file mode 100644
index 4ac5072..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.options
+++ /dev/null
@@ -1,12 +0,0 @@
-org.eclipse.wst.jsdt.web.core/debug=true
-org.eclipse.wst.jsdt.web.core/debug/tracefilter=
-org.eclipse.wst.jsdt.web.core/debug/jsindexmanager=false
-org.eclipse.wst.jsdt.web.core/debug/jstranslation=false
-org.eclipse.wst.jsdt.web.core/debug/jstranslationstodisk=false
-org.eclipse.wst.jsdt.web.core/debug/jssearch=false
-
-org.eclipse.wst.jsdt.web.core/taglib/resolve=false
-
-org.eclipse.wst.jsdt.web.core/debug/jsjavamapping=false
-
-org.eclipse.wst.jsdt.web.core/debug/jsvalidator=false
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.project b/bundles/org.eclipse.wst.jsdt.web.core/.project
deleted file mode 100644
index 22cb875..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.jsdt.web.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e07215..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,96 +0,0 @@
-#Wed Oct 24 19:49:45 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c91d09d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,51 +0,0 @@
-#Wed Oct 24 19:41:31 EDT 2007
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=false
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.format_source_code=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=true
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_SSE Team Styles
-cleanup_settings_version=2
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d5bd78..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.core;singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Activator: org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.jsdt.web.core.internal,
- org.eclipse.wst.jsdt.web.core.internal.modelhandler,
- org.eclipse.wst.jsdt.web.core.internal.project;
-  uses:="org.eclipse.wst.common.project.facet.core,
-   org.eclipse.wst.jsdt.internal.core,
-   org.eclipse.wst.jsdt.core,
-   org.eclipse.core.resources,
-   org.eclipse.core.runtime",
- org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype,
- org.eclipse.wst.jsdt.web.core.internal.validation,
- org.eclipse.wst.jsdt.web.core.javascript,
- org.eclipse.wst.jsdt.web.core.javascript.search,
- org.eclipse.wst.jsdt.web.core.text
-Import-Package: com.ibm.icu.util; version="3.8"
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.100,2.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.jsdt.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,2.0.0)";resolution:=optional,
- org.eclipse.wst.common.modulecore;bundle-version="[1.1.0,2.0.0)";resolution:=optional
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/about.html b/bundles/org.eclipse.wst.jsdt.web.core/about.html
deleted file mode 100644
index 4602330..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/build.properties b/bundles/org.eclipse.wst.jsdt.web.core/build.properties
deleted file mode 100644
index 0a4269e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-bin.includes = .options,\
-               META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               component.xml,\
-               about.html
-src.includes = component.xml
-              
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/component.xml b/bundles/org.eclipse.wst.jsdt.web.core/component.xml
deleted file mode 100644
index 0d66ac2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/component.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.wst.jsdt.web">
-	<component-depends unrestricted="true" />
-	<plugin id="org.eclipse.wst.jsdt.web.core" fragment="false" />
-	<package name="org.eclipse.wst.jsdt.web.core.taglib" api="false">
-		<type name="IJarRecord" implement="false" />
-		<!-- <type name="ITagDirRecord" implement="false" /> -->
-		<!-- <type name="ITaglibIndexListener" implement="true" /> -->
-		<type name="ITaglibDescriptor" implement="false" />
-		<type name="ITaglibRecord" implement="false" />
-		<!-- <type name="ITaglibRecordEvent" implement="false" /> -->
-		<type name="ITLDRecord" implement="false" />
-		<type name="IURLRecord" implement="false" />
-		<type name="TaglibIndex" subclass="false" instantiate="false" />
-	</package>
-	<plugin id="org.eclipse.wst.jsdt.web.ui" fragment="false" />
-	<package name="org.eclipse.wst.jsdt.web.ui" api="false">
-		<type name="StructuredTextViewerConfigurationJSP" subclass="true" instantiate="true" />
-	</package>
-	<package name="org.eclipse.wst.jsdt.web.ui.views.contentoutline" api="false">
-		<type name="JSPContentOutlineConfiguration" subclass="true" instantiate="true" />
-	</package>
-	<plugin id="org.eclipse.wst.jsdt.web.ui.infopop" fragment="false" />
-	<description url="http://eclipse.org/webtools/jst/components/jsp/overview.html" />
-</component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/plugin.properties b/bundles/org.eclipse.wst.jsdt.web.core/plugin.properties
deleted file mode 100644
index c38d24b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName= JavaScript Support
-providerName= Eclipse.org
-Bundle-Name.0 = JSDT Web Support Core 
-Bundle-Vendor.0 = Eclipse.org
-extension.name.0 = JavaScript Embedded
-extension.name.1 = Embedded JavaScript Builder
-extension-point.name.0 = JavaScript Pre Processing
-javascript.validator= Client-side JavaScript
-facet.label=JavaScript Toolkit
-facet.description=Adds advanced JavaScript editing support.
-
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
deleted file mode 100644
index a200a72..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/plugin.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension-point id="javascriptPreProcessor" name="%extension-point.name.0" schema="schema/javascriptPreProcessor.exsd"/>
-   
-   <!-- Full blown JSDT FACET -->
-   <extension point="org.eclipse.wst.common.project.facet.core.facets">
-   		<project-facet id="wst.jsdt.web">
-			<label>%facet.label</label>
-	  	 	<description>%facet.description</description>
-	  	  	<default-version version="1.0"/>
-		</project-facet>
-	
-		<project-facet-version facet="wst.jsdt.web" version="1.0" />
-	
-		<action facet="wst.jsdt.web" type="install" id="wst.jsdt.web.install" version="1.0">
-	   		<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureInstaller"/>
-		</action>
-	
-		<action facet="wst.jsdt.web" type="uninstall" id="wst.jsdt.web.uninstall" version="1.0">
-			<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureUninstaller"/>
-		</action>
-	
-	</extension>
-	
-	<extension point="org.eclipse.wst.common.project.facet.core.runtimes">
-	  <supported>
-	    <facet id="wst.jsdt.web"/>
-	    <runtime-component any="true"/>
-	  </supported>
-
-	</extension>
-   
-   <extension point="org.eclipse.wst.jsdt.web.core.javascriptPreProcessor">
-   		<javascriptPreProcessor
-   			class="org.eclipse.wst.jsdt.web.core.javascript.JsTranslation"
-   			priority="1" />
-   </extension>
-   
-   <!-- Install Handler for web JSDT.. Piggybacks on wst.web facet-->
-  
-   <extension point="org.eclipse.wst.common.project.facet.core.facets">
-   
-		<event-handler facet="wst.web" type="POST_INSTALL" version="[1.0">
-	   		<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureInstaller"/>
-		</event-handler>
-	
-		<event-handler facet="wst.web" type="POST_UNINSTALL" version="[1.0">
-			<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureUninstaller"/>
-		</event-handler>
-
-	</extension>
-	
-	<!-- removed due to JUnit failures during initial WTP build
-	   <extension id="embeded.jsNature" name="%extension.name.0" point="org.eclipse.core.resources.natures"> 
-		   <runtime>          
-		   	<run class="org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature"/>       
-		   </runtime>       
-	 	   <builder id="org.eclipse.wst.jsdt.web.core.embeded.javascript"/>    
-	   </extension> 
-	-->   
-
-	   	<!-- 
-	   	Not using this at the moment, but everythings in place if we need in the future. 
-	    -->  
-	   
-	   <extension id="embeded.javascript" name="%extension.name.1" point="org.eclipse.core.resources.builders">       
-		   	<builder hasNature="true" callOnEmptyDelta="true">		   	      
-		   	<run class="org.eclipse.wst.jsdt.web.core.internal.IncrementalBuilder"/>      
-		   </builder>    
-	   </extension>
-
-	
-	<!--======================================================================================-->
-	<!-- JS batch validation in Web files                                                     -->
-	<!--======================================================================================-->
-	<extension
-		id="JsBatchValidator"
-		name="%javascript.validator"
-		point="org.eclipse.wst.validation.validatorV2">
-      <validator
-            build="false"
-			class="org.eclipse.wst.jsdt.web.core.internal.validation.JsValidator"
-            manual="false"
-            sourceid="org.eclipse.wst.jsdt.web.jssourcevalidator"
-            version="1"
-            markerId="org.eclipse.wst.jsdt.core.problem">
-         <include>
-            <rules>
-				<projectNature id="org.eclipse.wst.jsdt.core.jsNature" />
-			</rules>
-         </include>
-         <include>
-            <rules>
-				<fileext caseSensitive="false" ext="html"/>
-				<fileext caseSensitive="false" ext="xhtml"/>
-				<fileext caseSensitive="false" ext="htm"/>
-				<fileext caseSensitive="false" ext="htpl"/>
-				<fileext caseSensitive="false" ext="jsp"/>
-				<fileext caseSensitive="false" ext="jsf"/>
-				<fileext caseSensitive="false" ext="jsv"/>
-				<fileext caseSensitive="false" ext="jtpl"/>
-				<contentType id="org.eclipse.wst.html.core.htmlsource"/>
-				<contentType id="org.eclipse.jst.jsp.core.jspsource"/>
-			</rules>
-         </include>
-         <group id="org.eclipse.wst.sse.core.structuredModelGroup"/>
-      </validator>
-	</extension>
-	
-	<extension  point="org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer">
-	      <JsGlobalScopeContainerInitializer
-	            class="org.eclipse.wst.jsdt.web.core.internal.project.WebProjectJsGlobalScopeContainerInitializer"
-	            id="org.eclipse.wst.jsdt.launching.WebProject">
-	      </JsGlobalScopeContainerInitializer>
-  	 </extension>
-	
-</plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/schema/javascriptPreProcessor.exsd b/bundles/org.eclipse.wst.jsdt.web.core/schema/javascriptPreProcessor.exsd
deleted file mode 100644
index 82f6f30..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/schema/javascriptPreProcessor.exsd
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.jsdt.web.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.eclipse.wst.jsdt.web.core" id="javascriptPreProcessor" name="JavaScript Pre Processing"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="javascriptPreProcessor"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="javascriptPreProcessor">
-      <complexType>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-         <attribute name="priority" type="string">
-            <annotation>
-               <documentation>
-                  loading priority. the highest number wins.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiinfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/IncrementalBuilder.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/IncrementalBuilder.java
deleted file mode 100644
index 443bdb7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/IncrementalBuilder.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class IncrementalBuilder extends IncrementalProjectBuilder {
-	public IncrementalBuilder() {
-		System.out.println("Unimplemented method:IncrementalProjectBuilder()"); //$NON-NLS-1$
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.resources.IncrementalProjectBuilder#build(int,
-	 *      java.util.Map, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	protected IProject[] build(int kind, Map args, IProgressMonitor monitor) throws CoreException {
-		// TODO Auto-generated method stub
-		System.out.println("Unimplemented method:IncrementalBuilder.build"); //$NON-NLS-1$
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties
deleted file mode 100644
index f3918c6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JSPCorePluginResources.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-JSPIndexManager_0=Updating JavaScript Index
-JSPIndexManager_2=JavaScript Indexer indexing {0} files
-JSP_Search=JavaScript Search - 
-JSPDocumentLoader_1=Program Error: structured model had no structuredDocument
-JSPEL_Syntax=EL Syntax Error 
-JSPEL_Token=Unable to analyse EL expression due to lexical analysis error
-MESSAGE_JSP_VALIDATING_MESSAGE_UI_=JavaScript Validator validating {0}
-JSPFContentPropertiesManager_Updating=Updating JavaScript Fragment Content Settings
-JSPFContentPropertiesManager_Problems_Updating=Problem saving JavaScript Fragment Content Settings for {0}
-JSPDirectiveValidator_0={0} is a reserved prefix.  Try another
-JSPDirectiveValidator_1=Cannot find the tag library descriptor for {0}
-JSPDirectiveValidator_2=The prefix {0} is used more than once
-JSPDirectiveValidator_3=A {0} value is required in this directive
-JSPBatchValidator_0=Gathering files in {0}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java
deleted file mode 100644
index 287fc1f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCoreMessages.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal;
-
-import org.eclipse.osgi.util.NLS;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsCoreMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.core.internal.JSPCorePluginResources"; //$NON-NLS-1$
-	public static String JSP_Search;
-	public static String JSPBatchValidator_0;
-	public static String JSPDirectiveValidator_0;
-	public static String JSPDirectiveValidator_1;
-	public static String JSPDirectiveValidator_2;
-	public static String JSPDirectiveValidator_3;
-	public static String JSPDocumentLoader_1;
-	public static String JSPEL_Syntax;
-	public static String JSPEL_Token;
-	public static String JSPFContentPropertiesManager_Problems_Updating;
-	public static String JSPFContentPropertiesManager_Updating;
-	public static String JSPIndexManager_0;
-	public static String JSPIndexManager_2;
-	/**
-	 * @deprecated
-	 */
-
-	public static String MESSAGE_JSP_VALIDATING_MESSAGE_UI_;
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(JsCoreMessages.BUNDLE_NAME, JsCoreMessages.class);
-	}
-	
-	private JsCoreMessages() {}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java
deleted file mode 100644
index ef6801a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/JsCorePlugin.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsIndexManager;
-import org.osgi.framework.BundleContext;
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsCorePlugin extends Plugin {
-	// The shared instance.
-	private static JsCorePlugin plugin;
-	public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.core"; //$NON-NLS-1$
-	
-	/**
-	 * Returns the shared instance.
-	 * 
-	 * @deprecated - will be removed. Currently used to get "model preferences",
-	 *             but there are other, better ways.
-	 */
-
-	public static JsCorePlugin getDefault() {
-		return JsCorePlugin.plugin;
-	}
-	
-	/**
-	 * The constructor.
-	 */
-	public JsCorePlugin() {
-		super();
-		JsCorePlugin.plugin = this;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)
-	 */
-	
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		// JSPIndexManager depends on TaglibController, so TaglibController
-		// should be started first
-		// listen for classpath changes
-		JsIndexManager.getInstance().initialize();
-		// listen for resource changes to update content properties keys
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	
-	public void stop(BundleContext context) throws Exception {
-		// stop listenning for resource changes to update content properties
-		// keys
-		// stop any indexing
-		JsIndexManager.getInstance().shutdown();
-		super.stop(context);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/Logger.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/Logger.java
deleted file mode 100644
index 50ac416..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/Logger.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class Logger {
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + Logger.ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + Logger.INFO;
-	public static final int OK = IStatus.OK; // 0
-	public static final int OK_DEBUG = 200 + Logger.OK;
-	private static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.core"; //$NON-NLS-1$
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + Logger.WARNING;
-	
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == Logger.OK_DEBUG || level == Logger.INFO_DEBUG || level == Logger.WARNING_DEBUG || level == Logger.ERROR_DEBUG) {
-			if (!Logger.isDebugging()) {
-				return;
-			}
-		}
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG:
-			case INFO:
-				severity = IStatus.INFO;
-			break;
-			case WARNING_DEBUG:
-			case WARNING:
-				severity = IStatus.WARNING;
-			break;
-			case ERROR_DEBUG:
-			case ERROR:
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, Logger.PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-		if (bundle != null) {
-			Platform.getLog(bundle).log(statusObj);
-		}
-	}
-	
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (Logger.isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, Logger.PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-			if (bundle != null) {
-				Platform.getLog(bundle).log(statusObj);
-			}
-		}
-	}
-	
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-	
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!Logger.isDebugging()) {
-			return false;
-		}
-		String traceFilter = Platform.getDebugOption(Logger.PLUGIN_ID + Logger.TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public static void log(int level, String message) {
-		Logger._log(level, message, null);
-	}
-	
-	public static void log(int level, String message, Throwable exception) {
-		Logger._log(level, message, exception);
-	}
-	
-	public static void logException(String message, Throwable exception) {
-		Logger._log(Logger.ERROR, message, exception);
-	}
-	
-	public static void logException(Throwable exception) {
-		Logger._log(Logger.ERROR, exception.getMessage(), exception);
-	}
-	
-	public static void trace(String category, String message) {
-		Logger._trace(category, message, null);
-	}
-	
-	public static void traceException(String category, String message, Throwable exception) {
-		Logger._trace(category, message, exception);
-	}
-	
-	public static void traceException(String category, Throwable exception) {
-		Logger._trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebDocumentChangeListener.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebDocumentChangeListener.java
deleted file mode 100644
index 9d4edd7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebDocumentChangeListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.modelhandler;
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IWebDocumentChangeListener extends IWebResourceChangedListener {
-	public static final int BORING = 0;
-	public static final int DIRTY_DOC = 1;
-	public static final int DIRTY_MODEL = 2;
-	
-	public int getIntrestLevelAtOffset(int documentOffset);
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebResourceChangedListener.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebResourceChangedListener.java
deleted file mode 100644
index 4084e8b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/IWebResourceChangedListener.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.modelhandler;
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IWebResourceChangedListener {
-	public void resourceChanged();
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/Messages.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/Messages.java
deleted file mode 100644
index 889438f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/Messages.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.modelhandler;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.core.internal.modelhandler.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java
deleted file mode 100644
index 106843f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/WebResourceChangeHandler.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.modelhandler;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.wst.sse.core.internal.model.ModelLifecycleEvent;
-import org.eclipse.wst.sse.core.internal.provisional.IModelLifecycleListener;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class WebResourceChangeHandler implements IResourceChangeListener, IDocumentListener, IModelLifecycleListener {
-	/*
-	 * Check the level of dirty regions when signaling for document events.
-	 * 
-	 * sometimes the SSE editor doesn't re-validate regions when text is
-	 * inserted, so setting this to false causes every document change event to
-	 * trigger a revalidation.
-	 * 
-	 * setting to true may speed things up.
-	 * 
-	 */
-//	private static final boolean CHECK_INTREST_LEVEL = false;
-	private static Hashtable instances = new Hashtable();
-	private static final boolean SIGNAL_MODEL = false;
-	
-	public static WebResourceChangeHandler getInstance(IStructuredModel xmlModel, IWebResourceChangedListener changeListener) {
-		WebResourceChangeHandler handler = null;
-		synchronized (WebResourceChangeHandler.instances) {
-			Enumeration values = WebResourceChangeHandler.instances.elements();
-			while (values.hasMoreElements()) {
-				Object model = values.nextElement();
-				if (model == xmlModel) {
-					handler = (WebResourceChangeHandler) WebResourceChangeHandler.instances.get(model);
-				}
-			}
-			if (handler == null) {
-				handler = new WebResourceChangeHandler();
-				WebResourceChangeHandler.instances.put(handler, xmlModel);
-			}
-		}
-		handler.initialize();
-		handler.fchangeListener.add(changeListener);
-		return handler;
-	}
-	private class ModelIrritantThread implements Runnable {
-		public void run() {
-			signalAllDirtyModel();
-		}
-		
-		public void signalAllDirtyModel() {
-			for (int i = 0; i < fchangeListener.size(); i++) {
-				((IWebResourceChangedListener) fchangeListener.get(i)).resourceChanged();
-			}
-			if (!WebResourceChangeHandler.SIGNAL_MODEL) {
-				return;
-			}
-			IStructuredModel xmlModel = null;
-			Object modelRef = getModel();
-			if (modelRef == null) {
-				return;
-			}
-			try {
-// for(int i =0;i<fchangeListener.size();i++) {
-// ((IWebResourceChangedListener)fchangeListener.get(i)).resourceChanged();
-// }
-				xmlModel = (IStructuredModel) modelRef;//(IDOMModel) StructuredModelManager.getModelManager().getExistingModelForEdit(((IStructuredModel) modelRef).getBaseLocation());
-				if (xmlModel != null) {
-					IStructuredDocument doc = xmlModel.getStructuredDocument();
-					try {
-						xmlModel.aboutToChangeModel();
-					// xmlModel.setReinitializeNeeded(true);
-					// (doc).replace(0, doc.getLength(),doc.get());
-					}
-					finally {
-						xmlModel.changedModel();
-					}
-				}
-			} catch (Exception e) {
-				System.out.println(Messages.getString("WebResourceChangeHandler.0")); //$NON-NLS-1$
-			} finally {
-				if (xmlModel != null) {
-//					xmlModel.releaseFromEdit();
-				}
-			}
-		}
-	}
-	private ArrayList fchangeListener = new ArrayList();
-	private ModelIrritantThread irritator;
-	
-	private WebResourceChangeHandler() {}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentAboutToBeChanged(DocumentEvent event) {}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentChanged(DocumentEvent event) {
-//		if (WebResourceChangeHandler.CHECK_INTREST_LEVEL) {
-//			for (int i = 0; i < fchangeListener.size(); i++) {
-//				Object o = fchangeListener.get(i);
-//				if (o instanceof IWebDocumentChangeListener) {
-//					int intrest = ((IWebDocumentChangeListener) o).getIntrestLevelAtOffset(event.fOffset);
-//					switch (intrest) {
-//						case IWebDocumentChangeListener.DIRTY_MODEL:
-//							irritator.signalAllDirtyModel();
-//							return;
-//						case IWebDocumentChangeListener.DIRTY_DOC:
-//							((IWebDocumentChangeListener) o).resourceChanged();
-//						break;
-//					}
-//					return;
-//				}
-//			}
-//		} else {
-			irritator.signalAllDirtyModel();
-		//}
-	}
-	
-	
-	public boolean equals(Object o) {
-		return (o instanceof WebResourceChangeHandler && ((WebResourceChangeHandler) o).fchangeListener == this.fchangeListener);
-	}
-	
-	
-	public void finalize() {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		if (WebResourceChangeHandler.instances == null) {
-			return;
-		}
-		Object o = null;
-		synchronized (WebResourceChangeHandler.instances) {
-			o = WebResourceChangeHandler.instances.get(this);
-			WebResourceChangeHandler.instances.remove(this);
-		}
-		if (o != null) {
-			IStructuredModel fXMLModel = (IStructuredModel) o;
-			IStructuredDocument fJspDocument = fXMLModel.getStructuredDocument();
-			if (fJspDocument != null) {
-				fJspDocument.removeDocumentListener(this);
-			}
-		}
-	}
-	
-	private IStructuredModel getModel() {
-		if (WebResourceChangeHandler.instances == null) {
-			return null;
-		}
-		return (IStructuredModel) WebResourceChangeHandler.instances.get(this);
-	}
-	
-	private void initialize() {
-		IStructuredModel xmlModel = getModel();
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-		xmlModel.addModelLifecycleListener(this);
-		IStructuredDocument fJspDocument = xmlModel.getStructuredDocument();
-		if (fJspDocument != null) {
-			fJspDocument.addDocumentListener(this);
-		}
-		irritator = new ModelIrritantThread();
-	}
-	
-	public void processPostModelEvent(ModelLifecycleEvent event) {
-		if (irritator != null) {
-			irritator.signalAllDirtyModel();
-		}
-		if (WebResourceChangeHandler.instances == null) {
-			return;
-		}
-		if (event.getType() == ModelLifecycleEvent.MODEL_RELEASED) {
-			synchronized (WebResourceChangeHandler.instances) {
-				WebResourceChangeHandler.instances.remove(this);
-			}
-		}
-	}
-	
-	public void processPreModelEvent(ModelLifecycleEvent event) {}
-	
-	public void resourceChanged(IResourceChangeEvent event) {
-		FileBuffers.getTextFileBufferManager().execute(irritator);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/messages.properties b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/messages.properties
deleted file mode 100644
index c06bf5d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/modelhandler/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-WebResourceChangeHandler.0=Error when updating the model.
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureInstaller.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureInstaller.java
deleted file mode 100644
index bd4b74d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureInstaller.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsNatureInstaller implements IDelegate {
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("Installing Facet for JavaScript Development Tools" + ".", 100); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			installNature(project, monitor);
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	public void installNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(Messages.getString("JsNatureInstaller.1"), 100); //$NON-NLS-1$
-		monitor.subTask(Messages.getString("JsNatureInstaller.2")); //$NON-NLS-1$
-		try {
-			monitor.worked(20);
-			JsWebNature jsNature = new JsWebNature(project, monitor);
-			monitor.worked(20);
-			jsNature.configure();
-			monitor.worked(40);
-		} catch (Exception e) {
-			throw new CoreException(new Status(IStatus.ERROR, JsCorePlugin.PLUGIN_ID, IStatus.OK, Messages.getString("JsNatureInstaller.3"), e)); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureUninstaller.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureUninstaller.java
deleted file mode 100644
index c59fc6d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsNatureUninstaller.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.wst.common.project.facet.core.IDelegate;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsNatureUninstaller implements IDelegate {
-	public void execute(IProject project, IProjectFacetVersion fv, Object config, IProgressMonitor monitor) throws CoreException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		monitor.beginTask("Uninstalling Facet for JavaScript Development Tools" + ".", 100); //$NON-NLS-1$ //$NON-NLS-2$
-		try {
-			uninstallNature(project, monitor);
-		} finally {
-			monitor.done();
-		}
-	}
-	
-	public void uninstallNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(Messages.getString("JsNatureUninstaller.1"), 100); //$NON-NLS-1$
-		// by using natures we can leverage the precondition support
-		monitor.subTask(Messages.getString("JsNatureUninstaller.2")); //$NON-NLS-1$
-		if (!JsWebNature.hasNature(project)) {
-			return;
-		}
-		try {
-			IProjectNature jsNature = new JsWebNature(project, monitor);
-			monitor.worked(20);
-			monitor.worked(50);
-			jsNature.deconfigure();
-			monitor.worked(20);
-		} catch (CoreException e) {
-			throw new CoreException(new Status(IStatus.ERROR, JsCorePlugin.PLUGIN_ID, IStatus.OK, Messages.getString("JsNatureUninstaller.3"), e)); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
deleted file mode 100644
index 2e2ef0c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/JsWebNature.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import java.util.Arrays;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IAccessRule;
-import org.eclipse.wst.jsdt.core.IIncludePathAttribute;
-import org.eclipse.wst.jsdt.core.IIncludePathEntry;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.LibrarySuperType;
-
-import org.eclipse.wst.jsdt.internal.core.JavaProject;
-//import org.eclipse.wst.jsdt.ui.PreferenceConstants;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsWebNature implements IProjectNature {
-	//private static final String FILENAME_CLASSPATH = ".classpath"; //$NON-NLS-1$
-	// private static final String NATURE_IDS[] =
-	// {"org.eclipse.wst.jsdt.web.core.embeded.jsNature",JavaScriptCore.NATURE_ID};
-	// //$NON-NLS-1$
-	private static final String NATURE_IDS[] = { JavaScriptCore.NATURE_ID };
-
-	public static final IPath VIRTUAL_BROWSER_CLASSPATH = new Path("org.eclipse.wst.jsdt.launching.baseBrowserLibrary"); //$NON-NLS-1$
-	public static final String VIRTUAL_CONTAINER = "org.eclipse.wst.jsdt.launching.WebProject"; //$NON-NLS-1$
-	public static final IIncludePathEntry VIRTUAL_SCOPE_ENTRY = JavaScriptCore.newContainerEntry(new Path(VIRTUAL_CONTAINER),  new IAccessRule[0], new IIncludePathAttribute[] {IIncludePathAttribute.HIDE}, false);
-	private static final String SUPER_TYPE_NAME = "Window"; //$NON-NLS-1$
-	private static final String SUPER_TYPE_LIBRARY = "org.eclipse.wst.jsdt.launching.baseBrowserLibrary"; //$NON-NLS-1$
-	
-	/* Default JRE entry */
-	private static final String DEFAULT_JRE_PATH = "org.eclipse.wst.jsdt.launching.JRE_CONTAINER"; //$NON-NLS-1$
-	
-	public static void addJsNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null && monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-		if (!JsWebNature.hasNature(project)) {
-			IProjectDescription description = project.getDescription();
-			String[] prevNatures = description.getNatureIds();
-			String[] newNatures = new String[prevNatures.length + JsWebNature.NATURE_IDS.length];
-			System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-			// newNatures[prevNatures.length] = JavaScriptCore.NATURE_ID;
-			for (int i = 0; i < JsWebNature.NATURE_IDS.length; i++) {
-				newNatures[prevNatures.length + i] = JsWebNature.NATURE_IDS[i];
-			}
-			description.setNatureIds(newNatures);
-			project.setDescription(description, monitor);
-		} else {
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-	}
-	
-	public static boolean hasNature(IProject project) {
-		try {
-			for (int i = 0; i < JsWebNature.NATURE_IDS.length; i++) {
-				if (!project.hasNature(JsWebNature.NATURE_IDS[i])) {
-					return false;
-				}
-			}
-		} catch (CoreException ex) {
-			return false;
-		}
-		return true;
-	}
-	
-	public static void removeJsNature(IProject project, IProgressMonitor monitor) throws CoreException {
-		if (monitor != null && monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-		if (JsWebNature.hasNature(project)) {
-			IProjectDescription description = project.getDescription();
-			String[] prevNatures = description.getNatureIds();
-			String[] newNatures = new String[prevNatures.length - JsWebNature.NATURE_IDS.length];
-			int k = 0;
-			head: for (int i = 0; i < prevNatures.length; i++) {
-				for (int j = 0; j < JsWebNature.NATURE_IDS.length; j++) {
-					if (prevNatures[i].equals(JsWebNature.NATURE_IDS[j])) {
-						continue head;
-					}
-				}
-				newNatures[k++] = prevNatures[i];
-			}
-			description.setNatureIds(newNatures);
-			project.setDescription(description, monitor);
-		} else {
-			if (monitor != null) {
-				monitor.worked(1);
-			}
-		}
-	}
-	private Vector classPathEntries = new Vector();
-	private boolean DEBUG = false;
-	private IProject fCurrProject;
-	private JavaProject fJavaProject;
-	private IPath fOutputLocation;
-	private IProgressMonitor monitor;
-	
-	public JsWebNature() {
-		monitor = new NullProgressMonitor();
-	}
-	
-	public JsWebNature(IProject project, IProgressMonitor monitor) {
-		fCurrProject = project;
-		if (monitor != null) {
-			this.monitor = monitor;
-		} else {
-			monitor = new NullProgressMonitor();
-		}
-	}
-	
-	public void configure() throws CoreException {
-
-		initOutputPath();
-		createSourceClassPath();
-		initJREEntry();
-		initLocalClassPath();
-		
-		if (hasProjectClassPathFile()) {
-			IIncludePathEntry[] entries = getRawClassPath();
-			if (entries != null && entries.length > 0) {
-				classPathEntries.removeAll(Arrays.asList(entries));
-				classPathEntries.addAll(Arrays.asList(entries));
-			}
-		}
-		
-		JsWebNature.addJsNature(fCurrProject, monitor);
-		fJavaProject = (JavaProject) JavaScriptCore.create(fCurrProject);
-		fJavaProject.setProject(fCurrProject);
-		try {
-			// , fOutputLocation
-			if (!hasProjectClassPathFile()) {
-				fJavaProject.setRawIncludepath((IIncludePathEntry[]) classPathEntries.toArray(new IIncludePathEntry[] {}), fOutputLocation, monitor);
-			}else{
-				fJavaProject.setRawIncludepath((IIncludePathEntry[]) classPathEntries.toArray(new IIncludePathEntry[] {}), monitor);
-			}
-		} catch (Exception e) {
-			System.out.println(e);
-		}
-		LibrarySuperType superType = new LibrarySuperType(new Path( SUPER_TYPE_LIBRARY),  getJavaProject(), SUPER_TYPE_NAME);
-		getJavaProject().setCommonSuperType(superType);
-		// getJavaProject().addToBuildSpec(BUILDER_ID);
-		fCurrProject.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-	}
-	
-	private void createSourceClassPath() {
-		if (hasAValidSourcePath()) {
-			return;
-		}
-		// IPath projectPath = fCurrProject.getFullPath();
-		// classPathEntries.add(JavaScriptCore.newSourceEntry(projectPath));
-	}
-	
-	public void deconfigure() throws CoreException {
-		Vector badEntries = new Vector();
-		IIncludePathEntry defaultJRELibrary =  getJreEntry();
-		IIncludePathEntry[] localEntries = initLocalClassPath();
-		badEntries.add(defaultJRELibrary);
-		badEntries.addAll(Arrays.asList(localEntries));
-		IIncludePathEntry[] entries = getRawClassPath();
-		Vector goodEntries = new Vector();
-		for (int i = 0; i < entries.length; i++) {
-			if (!badEntries.contains(entries[i])) {
-				goodEntries.add(entries[i]);
-			}
-		}
-		// getJavaProject().removeFromBuildSpec(BUILDER_ID);
-		IPath outputLocation = getJavaProject().getOutputLocation();
-		getJavaProject().setRawIncludepath((IIncludePathEntry[]) goodEntries.toArray(new IIncludePathEntry[] {}), outputLocation, monitor);
-		getJavaProject().deconfigure();
-		JsWebNature.removeJsNature(fCurrProject, monitor);
-		fCurrProject.refreshLocal(IResource.DEPTH_INFINITE, monitor);
-	}
-	
-	public JavaProject getJavaProject() {
-		if (fJavaProject == null) {
-			fJavaProject = (JavaProject) JavaScriptCore.create(fCurrProject);
-			fJavaProject.setProject(fCurrProject);
-		}
-		return fJavaProject;
-	}
-	
-	public IProject getProject() {
-		return this.fCurrProject;
-	}
-	
-	private IIncludePathEntry[] getRawClassPath() {
-		JavaProject proj = new JavaProject();
-		proj.setProject(fCurrProject);
-		return proj.readRawIncludepath();
-	}
-	
-	private boolean hasAValidSourcePath() {
-		if (hasProjectClassPathFile()) {
-			try {
-				IIncludePathEntry[] entries = getRawClassPath();
-				for (int i = 0; i < entries.length; i++) {
-					if (entries[i].getEntryKind() == IIncludePathEntry.CPE_SOURCE) {
-						return true;
-					}
-				}
-			} catch (Exception e) {
-				if (DEBUG) {
-					System.out.println(Messages.getString("JsWebNature.5") + e); //$NON-NLS-1$
-				}
-			}
-		}
-		return false;
-	}
-	
-	private boolean hasProjectClassPathFile() {
-		if (fCurrProject == null) {
-			return false;
-		}
-		return fCurrProject.getFolder(JavaProject.DEFAULT_PREFERENCES_DIRNAME).getFile(JavaProject.CLASSPATH_FILENAME).exists();
-	}
-	
-	private IIncludePathEntry getJreEntry() {
-		return JavaScriptCore.newContainerEntry(new Path(DEFAULT_JRE_PATH));
-	}
-	
-	private void initJREEntry() {
-		IIncludePathEntry defaultJRELibrary =  getJreEntry();
-		try {
-			IIncludePathEntry[] entries = getRawClassPath();
-			for (int i = 0; i < entries.length; i++) {
-				if (entries[i] == defaultJRELibrary) {
-					return;
-				}
-			}
-			classPathEntries.add(defaultJRELibrary);
-		} catch (Exception e) {
-			if (DEBUG) {
-				System.out.println(Messages.getString("JsWebNature.6") + e); //$NON-NLS-1$
-			}
-		}
-	}
-	
-	private IIncludePathEntry[] initLocalClassPath() {
-		
-		classPathEntries.add(JsWebNature.VIRTUAL_SCOPE_ENTRY);
-		IIncludePathEntry browserLibrary = JavaScriptCore.newContainerEntry( VIRTUAL_BROWSER_CLASSPATH);
-		classPathEntries.add(browserLibrary);
-		//IPath webRoot = WebRootFinder.getWebContentFolder(fCurrProject);
-	//	IIncludePathEntry source = JavaScriptCore.newSourceEntry(fCurrProject.getFullPath().append(webRoot).append("/"));
-	//	classPathEntries.add(source);
-		return new IIncludePathEntry[] { JsWebNature.VIRTUAL_SCOPE_ENTRY , browserLibrary/*,source*/};
-	}
-	
-	private void initOutputPath() {
-		if (fOutputLocation == null) {
-			fOutputLocation = fCurrProject.getFullPath();
-		}
-	}
-	
-	public void setProject(IProject project) {
-		this.fCurrProject = project;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/Messages.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/Messages.java
deleted file mode 100644
index 3c2697f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/Messages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.core.internal.project.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleCoreSupport.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleCoreSupport.java
deleted file mode 100644
index a17da6a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleCoreSupport.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2007, 2008 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.wst.jsdt.web.core.internal.project;

-

-import org.eclipse.core.filebuffers.FileBuffers;

-import org.eclipse.core.resources.IContainer;

-import org.eclipse.core.resources.IFile;

-import org.eclipse.core.resources.IFolder;

-import org.eclipse.core.resources.IProject;

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.core.runtime.Path;

-

-/**

- * This class encapsulates any used Module Core APIs along with fallbacks for

- * use on non-compliant projects and when those services are not available at

- * runtime.

- * 

- * Because ModuleCore API calls can result in locks needing to be acquired,

- * none of these methods should be called while other thread locks have

- * already been acquired.

- */

-public final class ModuleCoreSupport {

-	static final boolean _dump_NCDFE = false;

-	private static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$

-	private static final IPath WEB_INF_PATH = new Path(WEB_INF);

-

-	/**

-	 * @param project

-	 * @return the computed IPath to the "root" of the web contents, either

-	 *         from facet knowledge or hueristics, or null if one can not be

-	 *         determined

-	 */

-	public static IPath computeWebContentRootPath(IPath path) {

-		IPath root = null;

-		try {

-			root = ModuleCoreSupportDelegate.getWebContentRootPath(ResourcesPlugin.getWorkspace().getRoot().getProject(path.segment(0)));

-		}

-		catch (NoClassDefFoundError e) {

-			if (_dump_NCDFE)

-				e.printStackTrace();

-		}

-		if (root == null) {

-			/*

-			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=213245

-			 * 

-			 * NPE in JSPTaglibDirectiveContentAssistProcessor with

-			 * non-faceted project

-			 */

-			root = getLocalRoot(path);

-		}

-		return root;

-	}

-

-	/**

-	 * @param project

-	 * @return the IPath to the "root" of the web contents

-	 */

-	public static IPath getWebContentRootPath(IProject project) {

-		if (project == null)

-			return null;

-

-		IPath path = null;

-		try {

-			path = ModuleCoreSupportDelegate.getWebContentRootPath(project);

-		}

-		catch (NoClassDefFoundError e) {

-			if (_dump_NCDFE)

-				e.printStackTrace();

-		}

-		return path;

-	}

-

-	/**

-	 * @param path

-	 *            - the full path to a resource within the workspace

-	 * @return - the runtime path of the resource if one exists, null

-	 *         otherwise

-	 */

-	public static IPath getRuntimePath(IPath path) {

-		IPath result = null;

-		try {

-			result = ModuleCoreSupportDelegate.getRuntimePath(path);

-		}

-		catch (NoClassDefFoundError e) {

-			if (_dump_NCDFE)

-				e.printStackTrace();

-		}

-		if (result == null) {

-			IPath root = getLocalRoot(path);

-			result = path.removeFirstSegments(root.segmentCount()).makeAbsolute();

-		}

-		return result;

-	}

-

-	/**

-	 * @param basePath

-	 *            - the full path to a resource within the workspace

-	 * @param reference

-	 *            - the reference string to resolve

-	 * @return - the full path within the workspace that corresponds to the

-	 *         given reference according to the virtual pathing support

-	 */

-	public static IPath resolve(IPath basePath, String reference) {

-		IPath resolvedPath = null;

-		try {

-			resolvedPath = ModuleCoreSupportDelegate.resolve(basePath, reference);

-		}

-		catch (NoClassDefFoundError e) {

-			if (_dump_NCDFE)

-				e.printStackTrace();

-		}

-

-		if (resolvedPath == null) {

-			IPath rootPath = getLocalRoot(basePath);

-			if (reference.startsWith(Path.ROOT.toString())) {

-				resolvedPath = rootPath.append(reference);

-			}

-			else {

-				resolvedPath = basePath.removeLastSegments(1).append(reference);

-			}

-		}

-

-		return resolvedPath;

-	}

-

-	/**

-	 * @param basePath

-	 * @return the applicable Web context root path, if one exists

-	 */

-	private static IPath getLocalRoot(IPath basePath) {

-		IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();

-

-		// existing workspace resources - this is the 93% case

-		IResource file = FileBuffers.getWorkspaceFileAtLocation(basePath);

-

-		// Try the base path as a folder first

-		if (file == null && basePath.segmentCount() > 1) {

-			file = workspaceRoot.getFolder(basePath);

-		}

-		// If not a folder, then try base path as a file

-		if (file != null && !file.exists() && basePath.segmentCount() > 1) {

-			file = workspaceRoot.getFile(basePath);

-		}

-

-		if (file == null && basePath.segmentCount() == 1) {

-			file = workspaceRoot.getProject(basePath.segment(0));

-		}

-

-		if (file == null) {

-			/*

-			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=116529

-			 * 

-			 * This method produces a less accurate result, but doesn't

-			 * require that the file exist yet.

-			 */

-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(basePath);

-			if (files.length > 0)

-				file = files[0];

-		}

-

-		while (file != null) {

-			/**

-			 * Treat any parent folder with a WEB-INF subfolder as a web-app

-			 * root

-			 */

-			IContainer folder = null;

-			if ((file.getType() & IResource.FOLDER) != 0) {

-				folder = (IContainer) file;

-			}

-			else {

-				folder = file.getParent();

-			}

-			// getFolder on a workspace root must use a full path, skip

-			if (folder != null && (folder.getType() & IResource.ROOT) == 0) {

-				IFolder webinf = folder.getFolder(WEB_INF_PATH);

-				if (webinf != null && webinf.exists()) {

-					return folder.getFullPath();

-				}

-			}

-			file = file.getParent();

-		}

-

-		return basePath.uptoSegment(1);

-	}

-

-

-}

diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleCoreSupportDelegate.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleCoreSupportDelegate.java
deleted file mode 100644
index e8b6112..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/ModuleCoreSupportDelegate.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import java.lang.ref.Reference;
-import java.lang.ref.SoftReference;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-/**
- * Wrapper class for all Facet and ModuleCore-related calls. If the Facet or
- * ModuleCore bundles are not available, this class will not load, or if it
- * does, its methods will cause NoClassDefFoundErrors. This allows us to
- * compartmentalize the dependencies.
- * 
- */
-final class ModuleCoreSupportDelegate {
-	private static final String SLASH = "/";
-	private static Map fResolvedMap = new HashMap();
-
-	/**
-	 * @param path
-	 *            - the full path to a resource within the workspace
-	 * @return - the runtime path of the resource if one exists, null
-	 *         otherwise
-	 */
-	static IPath getRuntimePath(IPath path) {
-		if (path == null)
-			return null;
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(path.segment(0));
-
-		if (!ModuleCoreNature.isFlexibleProject(project))
-			return null;
-
-		IVirtualResource[] virtualResources = ComponentCore.createResources(ResourcesPlugin.getWorkspace().getRoot().getFile(path));
-		if (virtualResources != null && virtualResources.length > 0) {
-			return virtualResources[0].getRuntimePath();
-		}
-		return null;
-	}
-
-	/**
-	 * @param project
-	 * @return the IPath to the "root" of the web contents
-	 */
-	static IPath getWebContentRootPath(IProject project) {
-		if (project == null)
-			return null;
-
-		if (!ModuleCoreNature.isFlexibleProject(project))
-			return null;
-
-		IPath path = null;
-		IVirtualComponent component = ComponentCore.createComponent(project);
-		if (component != null && component.exists()) {
-			path = component.getRootFolder().getWorkspaceRelativePath();
-		}
-		return path;
-	}
-
-	/**
-	 * @param basePath
-	 *            - the full path to a resource within the workspace
-	 * @param reference
-	 *            - the reference string to resolve
-	 * @return - the full path within the workspace that corresponds to the
-	 *         given reference according to the virtual pathing support
-	 */
-	static IPath resolve(IPath basePath, String reference) {
-		if (reference == null || basePath == null || basePath.segmentCount() == 0)
-			return null;
-
-		IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(basePath.segment(0));
-
-		if (!ModuleCoreNature.isFlexibleProject(project))
-			return null;
-
-		if (basePath.segmentCount() > 1) {
-			/*
-			 * It can take the better part of a full second to do this, so
-			 * cache the result.
-			 */
-			IPath resolved = null;
-			Map mapForBaseResource = null;
-			mapForBaseResource = (Map) fResolvedMap.get(basePath);
-			if (mapForBaseResource != null) {
-				Reference resolvedReference = (Reference) mapForBaseResource.get(reference);
-				if (resolvedReference != null)
-					resolved = (IPath) resolvedReference.get();
-			}
-			else {
-				mapForBaseResource = new HashMap();
-				fResolvedMap.put(basePath, mapForBaseResource);
-			}
-
-			if (resolved == null) {
-				IFile baseFile = ResourcesPlugin.getWorkspace().getRoot().getFile(basePath);
-				IVirtualResource[] virtualResources = ComponentCore.createResources(baseFile);
-				for (int i = 0; i < virtualResources.length; i++) {
-					IPath baseRuntimePath = virtualResources[i].getRuntimePath();
-					IPath referenceRuntimePath = null;
-					if (reference.startsWith(SLASH)) {
-						referenceRuntimePath = new Path(reference);
-					}
-					else {
-						referenceRuntimePath = baseRuntimePath.removeLastSegments(1).append(reference);
-					}
-					IVirtualFile virtualFile = ComponentCore.createFile(project, referenceRuntimePath);
-					if (virtualFile != null && virtualFile.exists()) {
-						IFile[] underlyingFiles = virtualFile.getUnderlyingFiles();
-						for (int j = 0; j < underlyingFiles.length; j++) {
-							if (underlyingFiles[j].getProject().equals(project) && underlyingFiles[j].exists()) {
-								mapForBaseResource.put(reference, new SoftReference(underlyingFiles[j].getFullPath()));
-								resolved = underlyingFiles[j].getFullPath();
-							}
-
-						}
-					}
-				}
-			}
-			return resolved;
-		}
-		else {
-			IVirtualFile virtualFile = ComponentCore.createFile(project, new Path(reference));
-			if (virtualFile != null && virtualFile.exists()) {
-				return virtualFile.getUnderlyingFile().getFullPath();
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectJsGlobalScopeContainerInitializer.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectJsGlobalScopeContainerInitializer.java
deleted file mode 100644
index f5c4960..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/WebProjectJsGlobalScopeContainerInitializer.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.project;
-
-import java.net.URI;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.IIncludePathEntry;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJsGlobalScopeContainer;
-import org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer;
-import org.eclipse.wst.jsdt.core.compiler.libraries.LibraryLocation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsNameManglerUtil;
-import org.eclipse.wst.jsdt.web.core.javascript.WebRootFinder;
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class WebProjectJsGlobalScopeContainerInitializer extends JsGlobalScopeContainerInitializer  {
-	private static final String CONTAINER_DESCRIPTION = Messages.getString("WebProjectJsGlobalScopeContainerInitializer.0"); //$NON-NLS-1$
-	
-	public static final char[] LIB_NAME = {'b','r','o','w','s','e','r','W','i','n','d','o','w','.','j','s'};
-	/* Some tokens for us to identify mangled paths */
-	private static final String MANGLED_BUTT1 = "htm"; //$NON-NLS-1$
-	private static final String MANGLED_BUTT2 = ".js"; //$NON-NLS-1$
-	
-	//private IJavaScriptProject javaProject;
-	
-	
-	private static String getUnmangedHtmlPath(String containerPathString) {
-		if (containerPathString == null) {
-			return null;
-		}
-		if (containerPathString.toLowerCase().indexOf(WebProjectJsGlobalScopeContainerInitializer.MANGLED_BUTT1) != -1 && containerPathString.toLowerCase().indexOf(WebProjectJsGlobalScopeContainerInitializer.MANGLED_BUTT2) != -1) {
-			return JsNameManglerUtil.unmangle(containerPathString);
-		}
-		return null;
-	}
-	public LibraryLocation getLibraryLocation() {
-		return null;
-	}
-	
-	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer#canUpdateJsGlobalScopeContainer(org.eclipse.core.runtime.IPath,
-	 *      org.eclipse.wst.jsdt.core.IJavaScriptProject)
-	 */
-	
-	public boolean canUpdateJsGlobalScopeContainer(IPath containerPath, IJavaScriptProject project) {
-		/* dont remove from this project */
-		return false;
-	}
-	
-	
-	protected IJsGlobalScopeContainer getContainer(IPath containerPath, IJavaScriptProject project) {
-		return this;
-	}
-	
-	
-	public String getDescription() {
-		return WebProjectJsGlobalScopeContainerInitializer.CONTAINER_DESCRIPTION;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer#getDescription(org.eclipse.core.runtime.IPath,
-	 *      org.eclipse.wst.jsdt.core.IJavaScriptProject)
-	 */
-	
-	public String getDescription(IPath containerPath, IJavaScriptProject javaProject) {
-		if (containerPath.equals(new Path(JsWebNature.VIRTUAL_CONTAINER))) {
-			return WebProjectJsGlobalScopeContainerInitializer.CONTAINER_DESCRIPTION;
-		}
-		
-		String containerPathString = containerPath.toString();
-		IPath webContext = getWebContextRoot(javaProject);
-		String fileExtension = containerPath.getFileExtension();
-		if(containerPath.equals(getWebContextRoot(javaProject)) || (fileExtension!=null && fileExtension.equals("js"))) { //$NON-NLS-1$
-			return webContext.toString();
-		}
-		String unmangled = WebProjectJsGlobalScopeContainerInitializer.getUnmangedHtmlPath(containerPathString);
-		if (unmangled != null) {
-			IPath projectPath = javaProject.getPath();
-			/* Replace the project path with the project name */
-			if (unmangled.indexOf(projectPath.toString()) >= 0) {
-				unmangled = javaProject.getDisplayName() + ":" + unmangled.substring(projectPath.toString().length()); //$NON-NLS-1$
-			}
-			return unmangled;
-		}
-		return containerPathString;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.JsGlobalScopeContainerInitializer#getHostPath(org.eclipse.core.runtime.IPath)
-	 */
-	
-	public URI getHostPath(IPath path, IJavaScriptProject project) {
-		// TODO Auto-generated method stub
-		String htmlPath = WebProjectJsGlobalScopeContainerInitializer.getUnmangedHtmlPath(path.toString());
-		if (htmlPath != null) {
-			URI fileUri =  new Path(htmlPath).toFile().toURI();
-			return fileUri;
-			//			try {
-//				return new URI(htmlPath);
-//			} catch (URISyntaxException ex) {
-//				ex.printStackTrace();
-//			}
-		}
-//		else {
-//			try {
-//				return new URI(path.toString());
-//			} catch (URISyntaxException ex) {
-//				// TODO Auto-generated catch block
-//				ex.printStackTrace();
-//			}
-//		}
-		return null;
-	}
-	
-	
-	public int getKind() {
-		return IJsGlobalScopeContainer.K_SYSTEM;
-	}
-	
-	
-	public IPath getPath() {
-		return new Path(JsWebNature.VIRTUAL_CONTAINER);
-	}
-
-	/**
-	 * @deprecated Use {@link #getIncludepathEntries()} instead
-	 */
-	public IIncludePathEntry[] getClasspathEntries() {
-		return getIncludepathEntries();
-	}
-	public IIncludePathEntry[] getIncludepathEntries() {
-		
-		//IIncludePathEntry entry=null;
-		
-	return new IIncludePathEntry[0];
-//		try {
-//		
-//			
-//			
-//			IPath contextPath = getWebContextRoot(javaProject);
-//			//entry =JavaScriptCore.newLibraryEntry(contextPath.makeAbsolute(), null,null, new IAccessRule[0], new IIncludePathAttribute[0], true);
-//			//entry =JavaScriptCore.newLibraryEntry(contextPath.makeAbsolute(), null, null, new IAccessRule[0], new IIncludePathAttribute[0], true);
-//			//entry =JavaScriptCore.newSourceEntry(contextPath.makeAbsolute());
-//			entry = new ClasspathEntry(
-//					IPackageFragmentRoot.K_SOURCE,
-//					IIncludePathEntry.CPE_SOURCE,
-//					contextPath.makeAbsolute(),
-//					ClasspathEntry.INCLUDE_ALL, ClasspathEntry.EXCLUDE_NONE,
-//					null, // source attachment
-//					null, // source attachment root
-//					null, // custom output location
-//					false,
-//					null,
-//					false, // no access rules to combine
-//					new IIncludePathAttribute[] {ClasspathEntry.EXCLUDE_VALIDATE}); 
-//			
-//		} catch (RuntimeException ex) {
-//			// TODO Auto-generated catch block
-//			ex.printStackTrace();
-//		}
-//		
-//		if(entry!=null) return new IIncludePathEntry[] {entry};
-//		return new IIncludePathEntry[0];
-	}
-	public void initialize(IPath containerPath, IJavaScriptProject project) throws CoreException {
-		//this.javaProject = project;
-		super.initialize(containerPath, project);
-		
-	}
-	
-	public static IPath getWebContextRoot(IJavaScriptProject javaProject) {
-		String webRoot = WebRootFinder.getWebContentFolder(javaProject.getProject()).toString();	
-		IPath webRootPath = javaProject.getPath().append(webRoot);
-		return webRootPath;
-	}
-	
-//	public IPath[] getAllHtmlInProject() {
-//		final ArrayList found = new ArrayList();
-//		String webRoot = getWebContextRoot(javaProject).toString();	
-//			IResourceProxyVisitor visitor = new IResourceProxyVisitor()
-//			{
-//				public boolean visit( IResourceProxy proxy ) throws CoreException
-//				{
-//					if ( proxy.getName().endsWith( ".htm" ) )
-//					{
-//						IPath path = proxy.requestResource().getLocation();
-//						found.add(path);
-//						//IIncludePathEntry newLibraryEntry = JavaScriptCore.newLibraryEntry( path,null, null, new IAccessRule[ 0 ], new IIncludePathAttribute[ 0 ], true );
-//						//entries.add( newLibraryEntry );
-//						return false;
-//					}
-//					
-//					return true;
-//				}
-//			};
-//			try
-//			{
-//				javaProject.getProject().findMember( new Path(webRoot) ).accept( visitor, 0 );
-//			}
-//			catch ( CoreException e )
-//			{
-//			}
-//		
-//		
-//		return (IPath[])found.toArray(new IPath[found.size()]);
-//	
-//	}
-	
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/messages.properties b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/messages.properties
deleted file mode 100644
index 52bc405..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/project/messages.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-JsNatureUninstaller.1=Uninstalling JavaScript Development Tools...
-JsNatureUninstaller.2=Removing JavaScript Development Toolking Nature...
-JsNatureUninstaller.3=Error installing runtime\! JavaScript Development Tools could not be removed, or is not present in target project..
-JsNatureInstaller.1=Installing JavaScript Development Tools...
-JsNatureInstaller.2=Adding JavaScript Development Toolkit Nature...
-JsNatureInstaller.3=Error installing runtime\! JavaScript Development Tools could not be added..
-JsWebNature.5=Error checking sourcepath:
-JsWebNature.6=Error checking sourcepath:
-WebProjectJsGlobalScopeContainerInitializer.0=Web Project support for JSDT
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/ContentTypeIdForEmbededJs.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/ContentTypeIdForEmbededJs.java
deleted file mode 100644
index f4f8734..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/ContentTypeIdForEmbededJs.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class ContentTypeIdForEmbededJs {
-	/**
-	 * The value of the contenttype id field must match what is specified in
-	 * plugin.xml file. Note: this value is intentially set with default
-	 * protected method so it will not be inlined.
-	 */
-	public final static String[] ContentTypeIds = ContentTypeIdForEmbededJs. getJsConstantString();
-
-	static String[] getJsConstantString() {
-		return new String[] {"org.eclipse.wst.html.core.htmlsource","org.eclipse.jst.jsp.core.jspsource"}; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	private ContentTypeIdForEmbededJs() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/IContentDescriptionForJSP.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/IContentDescriptionForJSP.java
deleted file mode 100644
index 2b48f85..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/provisional/contenttype/IContentDescriptionForJSP.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.wst.sse.core.internal.encoding.ICodedResourcePlugin;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IContentDescriptionForJSP {
-	public final static QualifiedName CONTENT_FAMILY_ATTRIBUTE = new QualifiedName(ICodedResourcePlugin.ID, "contentFamilyAttribute"); //$NON-NLS-1$;
-	/**
-	 * Extra properties as part of ContentDescription, if the content is JSP.
-	 */
-	public final static QualifiedName CONTENT_TYPE_ATTRIBUTE = new QualifiedName(ICodedResourcePlugin.ID, "contentTypeAttribute"); //$NON-NLS-1$
-	public final static QualifiedName LANGUAGE_ATTRIBUTE = new QualifiedName(ICodedResourcePlugin.ID, "languageAttribute"); //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java
deleted file mode 100644
index 59669ae..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/JsValidator.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.internal.validation;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Locale;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapterFactory;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-public class JsValidator extends AbstractValidator implements IValidator, IExecutableExtension {
-	private static final boolean DEBUG = Boolean.valueOf(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsvalidator")).booleanValue(); //$NON-NLS-1$
-	private IValidator fMessageOriginator;
-	private Set fValidFileExts = new HashSet();
-	
-//	private static String [] jsdtValidator = {"org.eclipse.wst.jsdt.web.core.internal.validation.JsBatchValidator"}; //$NON-NLS-1$
-
-	
-	protected class LocalizedMessage extends Message {
-		private String _message = null;
-		
-		public LocalizedMessage(int severity, String messageText) {
-			this(severity, messageText, null);
-		}
-		
-		public LocalizedMessage(int severity, String messageText, IResource targetObject) {
-			this(severity, messageText, (Object) targetObject);
-		}
-		
-		public LocalizedMessage(int severity, String messageText, Object targetObject) {
-			super(null, severity, null);
-			setLocalizedMessage(messageText);
-			setTargetObject(targetObject);
-		}
-		
-		public String getLocalizedMessage() {
-			return _message;
-		}
-		
-		
-		public String getText() {
-			return getLocalizedMessage();
-		}
-		
-		
-		public String getText(ClassLoader cl) {
-			return getLocalizedMessage();
-		}
-		
-		
-		public String getText(Locale l) {
-			return getLocalizedMessage();
-		}
-		
-		
-		public String getText(Locale l, ClassLoader cl) {
-			return getLocalizedMessage();
-		}
-		
-		public void setLocalizedMessage(String message) {
-			_message = message;
-		}
-	}
-	public JsValidator() {
-		this.fMessageOriginator = this;
-	}
-	
-	/**
-	 * Creates an IMessage from an IProblem
-	 * 
-	 * @param problem
-	 * @param f
-	 * @param translation
-	 * @param textDoc
-	 * @return message representation of the problem, or null if it could not
-	 *         create one
-	 */
-	private IMessage createMessageFromProblem(IProblem problem, IFile f, IJsTranslation translation, IDocument textDoc) {
-		int sourceStart = problem.getSourceStart();
-		int sourceEnd = problem.getSourceEnd();
-		if (sourceStart == -1) {
-			return null;
-		}
-		
-		/*
-		 * Bug 241794 - Validation shows errors when using JSP Expressions
-		 * inside JavaScript code
-		 */
-		IStructuredDocument doc = (IStructuredDocument) textDoc;
-		IStructuredDocumentRegion documentRegion = doc.getRegionAtCharacterOffset(sourceStart);
-		if (documentRegion != null) {
-			ITextRegion textRegion = documentRegion.getRegionAtCharacterOffset(sourceStart);
-			/*
-			 * Filter out problems from areas that aren't simple JavaScript,
-			 * e.g. JSP.
-			 */
-			if (textRegion != null && textRegion instanceof ITextRegionCollection)
-				return null;
-		}
-
-		int sev = problem.isError() ? IMessage.HIGH_SEVERITY : (problem.isWarning() ? IMessage.NORMAL_SEVERITY : IMessage.LOW_SEVERITY);
-		IMessage m = new LocalizedMessage(sev, problem.getMessage(), f);
-		// line numbers for marker starts @ 1
-		// line numbers from document starts @ 0
-		try {
-			int lineNo = textDoc.getLineOfOffset(sourceStart) + 1;
-			m.setLineNo(lineNo);
-			m.setOffset(sourceStart);
-			m.setLength(sourceEnd - sourceStart + 1);
-		}
-		catch (BadLocationException e) {
-			Logger.logException(e);
-		}
-		return m;
-	}
-	
-	void performValidation(IFile f, IReporter reporter, IStructuredModel model, boolean inBatch) {
-		if (model instanceof IDOMModel) {
-			IDOMModel domModel = (IDOMModel) model;
-			setupAdapterFactory(domModel);
-			IDOMDocument xmlDoc = domModel.getDocument();
-			JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			//translationAdapter.resourceChanged();
-			IJsTranslation translation = translationAdapter.getJsTranslation(false);
-			if (!reporter.isCancelled()) {
-				translation.setProblemCollectingActive(true);
-				translation.reconcileCompilationUnit();
-				List problems = translation.getProblems();
-//				if(!inBatch) reporter.removeAllMessages(this, f);
-				// add new messages
-				for (int i = 0; i < problems.size() && !reporter.isCancelled(); i++) {
-					IMessage m = createMessageFromProblem((IProblem) problems.get(i), f, translation, domModel.getStructuredDocument());
-					if (m != null) {
-						reporter.addMessage(fMessageOriginator, m);
-					}
-				}
-			}
-		}
-	}
-	
-	/* Read the definition for this validator and the declared valid file extensions
-	 * @see org.eclipse.core.runtime.IExecutableExtension#setInitializationData(org.eclipse.core.runtime.IConfigurationElement, java.lang.String, java.lang.Object)
-	 */
-	public void setInitializationData(IConfigurationElement config, String propertyName, Object data) throws CoreException {
-		IConfigurationElement[] includes = config.getChildren("include"); //$NON-NLS-1$
-		for (int i = 0; i < includes.length; i++) {
-			IConfigurationElement[] fileexts = includes[i].getChildren("fileext"); //$NON-NLS-1$
-			for (int j = 0; j < fileexts.length; j++) {
-				String fileext = fileexts[j].getAttribute("ext"); //$NON-NLS-1$
-				if (fileext != null) {
-					fValidFileExts.add(fileext);
-				}
-			}
-		}
-	}
-	
-	/**
-	 * Ensures that our translation adapter is present before we try to use it
-	 * 
-	 * @param sm
-	 */
-	private void setupAdapterFactory(IStructuredModel sm) {
-		if (sm.getFactoryRegistry().getFactoryFor(IJsTranslation.class) == null) {
-			JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory();
-			sm.getFactoryRegistry().addFactory(factory);
-		}
-	}
-	
-	boolean shouldValidate(IFile file) {
-		IResource resource = file;
-		do {
-			if (resource.isDerived() || resource.isTeamPrivateMember() || !resource.isAccessible() || resource.getName().charAt(0) == '.') {
-				return false;
-			}
-			resource = resource.getParent();
-		} while ((resource.getType() & IResource.PROJECT) == 0);
-		return fValidFileExts.isEmpty() || fValidFileExts.contains(file.getFileExtension());
-	}
-	
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		/* Added by BC ---- */
-		// if(true) return;
-		/* end Added by BC ---- */
-		
-		String[] uris = helper.getURIs();
-		if (uris.length > 0) {
-			IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-			IFile currentFile = null;
-			for (int i = 0; i < uris.length && !reporter.isCancelled(); i++) {
-				currentFile = wsRoot.getFile(new Path(uris[i]));
-				reporter.removeAllMessages(this, currentFile);
-				if (currentFile != null && currentFile.exists()) {
-					if (shouldValidate(currentFile) ){ //&& fragmentCheck(currentFile)) {
-						int percent = (i * 100) / uris.length + 1;
-						IMessage message = new LocalizedMessage(IMessage.LOW_SEVERITY, percent + "% " + uris[i]); //$NON-NLS-1$
-						reporter.displaySubtask(this, message);
-						validateFile(currentFile, reporter);
-					}
-					if (DEBUG) {
-						System.out.println("validating: [" + uris[i] + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		} else {
-			// if uris[] length 0 -> validate() gets called for each project
-			if (helper instanceof IWorkbenchContext) {
-				IProject project = ((IWorkbenchContext) helper).getProject();
-				JSFileVisitor visitor = new JSFileVisitor(reporter);
-				try {
-					// collect all jsp files for the project
-					project.accept(visitor, IResource.DEPTH_INFINITE);
-				} catch (CoreException e) {
-					if (DEBUG) {
-						e.printStackTrace();
-					}
-				}
-				IFile[] files = visitor.getFiles();
-				for (int i = 0; i < files.length && !reporter.isCancelled(); i++) {
-					int percent = (i * 100) / files.length + 1;
-					IMessage message = new LocalizedMessage(IMessage.LOW_SEVERITY, percent + "% " + files[i].getFullPath().toString()); //$NON-NLS-1$
-					reporter.displaySubtask(this, message);
-					validateFile(files[i], reporter);
-					if (DEBUG) {
-						System.out.println("validating: [" + files[i] + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		}
-	}
-
-	protected class JSFileVisitor implements IResourceProxyVisitor {
-		private List fFiles = new ArrayList();
-		private IReporter fReporter = null;
-		
-		public JSFileVisitor(IReporter reporter) {
-			fReporter = reporter;
-		}
-		
-		public final IFile[] getFiles() {
-			return (IFile[]) fFiles.toArray(new IFile[fFiles.size()]);
-		}
-		
-		
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			// check validation
-			if (fReporter.isCancelled()) {
-				return false;
-			}
-			if (proxy.getType() == IResource.FILE) {
-				if (Util.isJsType(proxy.getName())) {
-					IFile file = (IFile) proxy.requestResource();
-					if (file.exists() && shouldValidate(file)) {
-						if (DEBUG) {
-							System.out.println("(+) JSPValidator adding file: " + file.getName()); //$NON-NLS-1$
-						}
-						fFiles.add(file);
-						// don't search deeper for files
-						return false;
-					}
-				}
-			}
-			return true;
-		}
-	}
-	public void cleanup(IReporter reporter) {
-		// nothing to do
-	}
-	/**
-	 * Validate one file. It's assumed that the file has JSP content type.
-	 * 
-	 * @param f
-	 * @param reporter
-	 */
-	
-	protected void validateFile(IFile f, IReporter reporter) {
-		if (JsValidator.DEBUG) {
-			Logger.log(Logger.INFO, getClass().getName() + " validating: " + f); //$NON-NLS-1$
-		}
-		IStructuredModel model = null;
-		try {
-			// get jsp model, get tranlsation
-			model = StructuredModelManager.getModelManager().getModelForRead(f);
-			if (!reporter.isCancelled() && model != null) {
-				// get DOM model then translation
-				if (model instanceof IDOMModel) {
-					//WorkbenchReporter.removeAllMessages(f.getProject(), jsdtValidator, f.toString());
-					//reporter.removeAllMessages(fMessageOriginator, f);
-					performValidation(f, reporter, model, false);
-				}
-			}
-		} catch (IOException e) {
-			Logger.logException(e);
-		} catch (CoreException e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-	}
-	public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
-		if (resource.getType() != IResource.FILE)
-			return null;
-		ValidationResult result = new ValidationResult();
-		IReporter reporter = result.getReporter(monitor);
-		validateFile((IFile) resource, reporter);
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java
deleted file mode 100644
index 5e84a72..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/internal/validation/Util.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.internal.validation;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.wst.jsdt.web.core.internal.provisional.contenttype.ContentTypeIdForEmbededJs;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class Util {
-	
-	public static boolean isJsType(String fileName) {
-		if(fileName==null) return false;
-		boolean valid = false;
-		IContentType[] types =getJavascriptContentTypes();
-		int i = 0;
-		while (types!=null && i < types.length && !valid) {
-			valid = types[i]!=null && types[i].isAssociatedWith(fileName);
-			++i;
-		}
-		return valid;
-		
-	}
-	
-	public static IContentType[] getJavascriptContentTypes() {
-
-		String[] contentTypeIds = ContentTypeIdForEmbededJs.ContentTypeIds;
-		ArrayList fContentTypes = new ArrayList();
-		
-		
-		for(int i = 0;i<contentTypeIds.length;i++) {
-			IContentType ct =  Platform.getContentTypeManager().getContentType(contentTypeIds[i]);
-			if(ct!=null) fContentTypes.add(ct);
-		}
-		
-		return (IContentType[])fContentTypes.toArray(new IContentType[fContentTypes.size()]);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/CompilationUnitHelper.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/CompilationUnitHelper.java
deleted file mode 100644
index 8dbeb85..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/CompilationUnitHelper.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IProblemRequestor;
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-
-/**
-
-
-
-
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
- * (repeatedly) as the API evolves.
- * 
- * <br><br> this code was taken from the JSP plugin.  This class is to ensure only one copy of the compilation unit exits.
- * 
- * @author pavery
- */
-public class CompilationUnitHelper {
-	private static CompilationUnitHelper instance;
-	
-	public synchronized static final CompilationUnitHelper getInstance() {
-		if (CompilationUnitHelper.instance == null) {
-			CompilationUnitHelper.instance = new CompilationUnitHelper();
-		}
-		return CompilationUnitHelper.instance;
-	}
-	private JsProblemRequestor fProblemRequestor = null;
-	private WorkingCopyOwner fWorkingCopyOwner = null;
-	
-	private CompilationUnitHelper() {
-	// force use of instance
-	}
-	
-	public JsProblemRequestor getProblemRequestor() {
-		if (fProblemRequestor == null) {
-			fProblemRequestor = new JsProblemRequestor();
-		}
-		return fProblemRequestor;
-	}
-	
-	public WorkingCopyOwner getWorkingCopyOwner() {
-		if (fWorkingCopyOwner == null) {
-			fWorkingCopyOwner = new WorkingCopyOwner() {
-				/* (non-Javadoc)
-				 * @see org.eclipse.wst.jsdt.core.WorkingCopyOwner#getProblemRequestor(org.eclipse.wst.jsdt.core.IJavaScriptUnit)
-				 */
-				public IProblemRequestor getProblemRequestor(IJavaScriptUnit workingCopy) {
-					return CompilationUnitHelper.this.getProblemRequestor();
-				}
-				
-				public String toString() {
-					return "Client JavaScript WorkingCopyOwner"; //$NON-NLS-1$
-				}
-			};
-		}
-		return fWorkingCopyOwner;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/DocumentChangeListenerToTextEdit.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/DocumentChangeListenerToTextEdit.java
deleted file mode 100644
index 7320ba9..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/DocumentChangeListenerToTextEdit.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-* <br><br>
-* 
-* this class attaches to a "cloned" document, listens for changes to that document then translates
-* the changes to text edits.  these changes can then be applied back to the original document.
-* 
-*
-*/
-public class DocumentChangeListenerToTextEdit implements IDocumentListener {
-	private MultiTextEdit textEdit;
-	
-	public DocumentChangeListenerToTextEdit() {
-		textEdit = new MultiTextEdit();
-	}
-	
-	public void documentAboutToBeChanged(DocumentEvent event) {
-	// System.out.println("Unimplemented
-	// method:DocumentChangeListenerToTextEdit.documentAboutToBeChanged");
-	}
-	
-	public void documentChanged(DocumentEvent event) {
-		int length = event.getLength();
-		int offset = event.getOffset();
-		String text = event.getText();
-		if (length < 0) {
-			return;
-		}
-		if (length == 0) {
-			/* inserting text operation */
-			InsertEdit edit = new InsertEdit(offset, text);
-			textEdit.addChild(edit);
-			
-		} else if (text == null || text.equals("")) { //$NON-NLS-1$
-			/* delete operation */
-			DeleteEdit edit = new DeleteEdit(offset, length);
-			textEdit.addChild(edit);
-			
-		} else if (length > 0) {
-			/* replace text operation */
-			ReplaceEdit edit = new ReplaceEdit(offset, length, text);
-			textEdit.addChild(edit);
-		
-		}
-	}
-	
-	public MultiTextEdit getTextEdits() {
-		return textEdit;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/HTML40Namespace.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/HTML40Namespace.java
deleted file mode 100644
index e34d226..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/HTML40Namespace.java
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslation.java
deleted file mode 100644
index 5a6dd23..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslation.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.<br>
-* 
-*/
-public interface IJsTranslation {
-
-	/**
-	 * @return IJavaScriptProject that this translation belongs to
-	 */
-	public IJavaScriptProject getJavaProject();
-
-	/**
-	 * @return Original HTML document from the translation.
-	 */
-	public IDocument getHtmlDocument();
-
-	/**
-	 * @return integer position of a missing </script> tag (the document isn't well formed and resulted in translation error.).
-	 * 
-	 */
-	public int getMissingTagStart();
-
-	/**
-	 * @param javaPositionStart
-	 * @param javaPositionEnd
-	 * @return all javascript elements within the given range
-	 */
-	public IJavaScriptElement[] getAllElementsInJsRange(int javaPositionStart, int javaPositionEnd);
-
-	/**
-	 * @return the javascript unit from the jsdt.core
-	 */
-	public IJavaScriptUnit getCompilationUnit();
-
-	/**
-	 * @param javaPositionStart
-	 * @param javaPositionEnd
-	 * @return
-	 */
-	public IJavaScriptElement[] getElementsFromJsRange(int javaPositionStart, int javaPositionEnd);
-
-	/**
-	 * @return string of the document.
-	 */
-	public String getHtmlText();
-
-	/**
-	 * @param jsOffset
-	 * @return a single javascript element at the given offset.
-	 */
-	public IJavaScriptElement getJsElementAtOffset(int jsOffset);
-
-	/**
-	 * @return only the translated javascript text
-	 */
-	public String getJsText();
-
-	/**
-	 * @return a list of the script regions within the translation.
-	 */
-	public Position[] getScriptPositions();
-
-	/**
-	 * @param text
-	 */
-	public void insertInFirstScriptRegion(String text);
-
-	/**
-	 * insert javascript at the given offset.  method should ensure the documents well-formedness and proper script region.
-	 * 
-	 * @param offset
-	 * @param text
-	 */
-	public void insertScript(int offset, String text);
-
-	/**
-	 * @return a list of javascript errors
-	 */
-	public List getProblems();
-
-	/**
-	 * @param offset
-	 * @return if the offset is within a script import node.
-	 */
-	public boolean ifOffsetInImportNode(int offset);
-
-	/**
-	 * checks the CU for errors/consistancy.
-	 */
-	public void reconcileCompilationUnit();
-
-	/**
-	 * release the translation.  always a good idea to do when you're done.  you may notice document and model locks if not.
-	 */
-	public void release();
-	
-	/**
-	 * fixes a mangled html--> pure js name.
-	 * @param displayString
-	 * @return
-	 */
-	public String fixupMangledName(String displayString); 
-	
-	/**
-	 * start/stop collecting problems within the javascript unit.
-	 * @param collect
-	 */
-	public void setProblemCollectingActive(boolean collect);
-	
-	/**
-	 * @return
-	 */
-	public String getJavaPath();
-	
-	/**
-	 * 
-	 * 
-	 * @param htmlDocument
-	 * @param javaProj
-	 * @param listenForChanges
-	 * @return
-	 */
-	public IJsTranslation getInstance(IStructuredDocument htmlDocument, IJavaScriptProject javaProj, boolean listenForChanges) ;
-
-	/**
-	 * notify the translation to update any external dependancies that are created during translation
-	 * 
-	 */
-	public void classpathChange() ;
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslator.java
deleted file mode 100644
index 8726cab..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/IJsTranslator.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.jsdt.core.IBuffer;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-
-
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IJsTranslator extends IDocumentListener{
-
-	/**
-	 * @return string of javascript from the document
-	 */
-	public String getJsText();
-
-	/**
-	 * sets the javascript unit buffer
-	 * @param buffer
-	 */
-	public void setBuffer(IBuffer buffer);
-
-	/**
-	 * 
-	 * @return a list of html locations within the docuemnt.
-	 */
-	public Position[] getHtmlLocations();
-
-	/**
-	 * @return the region of a missing </script> tag
-	 */
-	public int getMissingEndTagRegionStart();
-
-	/**
-	 * @return position array of <script src=".."> within the doc.
-	 */
-	public Position[] getImportHtmlRanges();
-
-	/**
-	 * @return raw/unresolved <script imports>
-	 */
-	public String[] getRawImports();
-
-	/**
-	 *  begin translating the document.
-	 */
-	public void translate();
-
-	/**
-	 * translates an inline (event="..") js container region and adds it to the document text.  must be called in order
-	 * @param container
-	 */
-	public void translateInlineJSNode(IStructuredDocumentRegion container);
-
-	/**
-	 * translates a script block.  must be called in the order it appears within the document.
-	 * @param container
-	 */
-	public void translateJSNode(IStructuredDocumentRegion container);
-
-	/**
-	 * translates a <script src=".."> element, parsing out an import.
-	 * @param region
-	 */
-	public void translateScriptImportNode(IStructuredDocumentRegion region);
-
-	/**
-	 * release any resources the translation is holding onto.
-	 * 
-	 */
-	public void release();
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsDataTypes.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsDataTypes.java
deleted file mode 100644
index 8bd2ae1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsDataTypes.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface JsDataTypes extends HTML40Namespace {
-	/*
-	 * remove when when we refactor (need to add this content type to many
-	 * project types in wst)
-	 */
-	public static final String BASE_FILE_EXTENSION = ".js"; //$NON-NLS-1$
-	public static String[] CONSTANTS = { "false", "null", "true" }; //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	public static final String[] EVENTS = { HTML40Namespace.ATTR_NAME_ONCLICK, HTML40Namespace.ATTR_NAME_ONDBLCLICK, HTML40Namespace.ATTR_NAME_ONMOUSEDOWN,
-			HTML40Namespace.ATTR_NAME_ONMOUSEUP, HTML40Namespace.ATTR_NAME_ONMOUSEOVER, HTML40Namespace.ATTR_NAME_ONMOUSEMOVE,
-			HTML40Namespace.ATTR_NAME_ONMOUSEOUT, HTML40Namespace.ATTR_NAME_ONKEYPRESS, HTML40Namespace.ATTR_NAME_ONKEYDOWN, HTML40Namespace.ATTR_NAME_ONKEYUP,
-			HTML40Namespace.ATTR_NAME_ONHELP };
-	public static final String[] HTMLATREVENTS = { "onload ", "onunload", "onclick", "onmousedown", "onmouseup", "onmouseover", "onmousemove", "onmouseout", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			"onfocus", "onblur", "onkeypress", "onkeydown", "onkeyup", "onsubmit", "onreset", "onselect", "onchange", }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
-	public static final String[] JSVALIDDATATYPES = { "JAVASCRIPT", "TEXT/JAVASCRIPT" }; //$NON-NLS-1$ //$NON-NLS-2$
-	public static String[] KEYWORDS = { "abstract", "break", "case", "catch", "class", "const", "continue", "debugger", "default", "delete", "do", "else", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$
-			"enum", "export", "extends", "final", "finally", "for", "function", "goto", "if", "implements", "import", "in", "instanceof", "interface", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$ //$NON-NLS-14$
-			"native", "new", "package", "private", "protected", "public", "return", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
-			"static", "super", "switch", "synchronized", "this", "throw", "throws", "transient", "try", "typeof", "volatile", "while", "with" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$ //$NON-NLS-11$ //$NON-NLS-12$ //$NON-NLS-13$
-	// public static final String
-	// NEW_PARTITION_TYPE="org.eclipse.wst.jsdt.StructuredJs";
-	// public static final String NEW_PARTITION_TYPE=IHTMLPartitions.SCRIPT;
-	public static final String NEW_PARTITION_TYPE = IHTMLPartitions.SCRIPT;
-	public static final String[] TAKEOVER_PARTITION_TYPES = { "none" }; //$NON-NLS-1$
-	public static String[] TYPES = { "boolean", "byte", "char", "double", "int", "long", "short", "float", "var", "void" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$ //$NON-NLS-10$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsNameManglerUtil.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsNameManglerUtil.java
deleted file mode 100644
index 40cee8f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsNameManglerUtil.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import java.io.File;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsNameManglerUtil {
-	/**
-	 * Determine if given string is a valid Hex representation of an ASCII
-	 * character (eg. 2F -> /)
-	 * 
-	 * @param possible
-	 * @return
-	 */
-	private static boolean isValid(String possible) {
-		boolean result = false;
-		if (possible.length() == 2) {
-			char c1 = possible.charAt(0);
-			char c2 = possible.charAt(1);
-			// 1st character must be a digit
-			if (Character.isDigit(c1)) {
-				// 2nd character must be digit or upper case letter A-F
-				if (Character.isDigit(c2)) {
-					result = true;
-				} else if (Character.isUpperCase(c2) && (c2 == 'A' || c2 == 'B' || c2 == 'C' || c2 == 'D' || c2 == 'E' || c2 == 'F')) {
-					result = true;
-				}
-			}
-		}
-		return result;
-	}
-	
-	/**
-	 * Mangle string to WAS-like specifications
-	 * 
-	 */
-	public final static String mangle(String name) {
-		StringBuffer modifiedName = new StringBuffer();
-		// extension (.jsp, .jspf, .jspx, etc...) should already be encoded in
-		// name
-		int length = name.length();
-		// in case name is forbidden (a number, class, for, etc...)
-		modifiedName.append('_');
-		// ensure rest of characters are valid
-		for (int i = 0; i < length; i++) {
-			char currentChar = name.charAt(i);
-			if (Character.isJavaIdentifierPart(currentChar) == true) {
-				modifiedName.append(currentChar);
-			} else {
-				modifiedName.append(JsNameManglerUtil.mangleChar(currentChar));
-			}
-		}
-		return modifiedName.toString();
-	}
-	
-	/**
-	 * take a character and return its hex equivalent
-	 */
-	private final static String mangleChar(char ch) {
-		if (ch == File.separatorChar) {
-			ch = '/';
-		}
-		if (Character.isLetterOrDigit(ch) == true) {
-			return "" + ch; //$NON-NLS-1$
-		}
-		return "_" + Integer.toHexString(ch).toUpperCase() + "_"; //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	/**
-	 * WAS mangles Tom&Jerry as: _Tom_26_Jerry; this takes in the mangled name
-	 * and returns the original name.
-	 * 
-	 * Unmangles the qualified type name. If an underscore is found it is
-	 * assumed to be a mangled representation of a non-alpha, non-digit
-	 * character of the form _NN_, where NN are hex digits representing the
-	 * encoded character. This routine converts it back to the original
-	 * character.
-	 */
-	public final static String unmangle(String qualifiedTypeName) {
-		if (qualifiedTypeName.charAt(0) != '_') {
-			return qualifiedTypeName;
-		}
-		StringBuffer buf = new StringBuffer();
-		String possible = ""; //$NON-NLS-1$
-		// remove the .java extension if there is one
-		if (qualifiedTypeName.endsWith(".js")) { //$NON-NLS-1$
-			qualifiedTypeName = qualifiedTypeName.substring(0, qualifiedTypeName.length() - 3);
-		}
-		for (int i = 1; i < qualifiedTypeName.length(); i++) { // start at
-			// index 1 b/c
-			// 1st char is
-			// always '_'
-			char c = qualifiedTypeName.charAt(i);
-			if (c == '_') {
-				int endIndex = qualifiedTypeName.indexOf('_', i + 1);
-				if (endIndex == -1) {
-					buf.append(c);
-				} else {
-					char unmangled;
-					try {
-						possible = qualifiedTypeName.substring(i + 1, endIndex);
-						if (JsNameManglerUtil.isValid(possible)) {
-							unmangled = (char) Integer.decode("0x" + possible).intValue();//$NON-NLS-1$
-							i = endIndex;
-						} else {
-							unmangled = c;
-						}
-					} catch (NumberFormatException e) {
-						unmangled = c;
-					}
-					buf.append(unmangled);
-				}
-			} else {
-				buf.append(c);
-			}
-		}
-		return buf.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsProblemRequestor.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsProblemRequestor.java
deleted file mode 100644
index ac94dd0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsProblemRequestor.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.jsdt.core.IProblemRequestor;
-import org.eclipse.wst.jsdt.core.compiler.IProblem;
-
-class JsProblemRequestor implements IProblemRequestor {
-	private List fCollectedProblems;
-	private boolean fIsActive = false;
-	private boolean fIsRunning = false;
-	
-	public void acceptProblem(IProblem problem) {
-		if (isActive()) {
-			getCollectedProblems().add(problem);
-		}
-	}
-	
-	public void beginReporting() {
-		fIsRunning = true;
-	}
-	
-	public void endReporting() {
-		fIsRunning = false;
-	}
-	
-	/**
-	 * @return the list of collected problems
-	 */
-	public List getCollectedProblems() {
-		if (fCollectedProblems == null)
-			fCollectedProblems = new ArrayList();
-		return fCollectedProblems;
-	}
-	
-	public boolean isActive() {
-		return fIsActive;
-	}
-	
-	public boolean isRunning() {
-		return fIsRunning;
-	}
-	
-	/**
-	 * Sets the active state of this problem requestor.
-	 * 
-	 * @param isActive
-	 *            the state of this problem requestor
-	 */
-	public void setIsActive(boolean isActive) {
-		fIsActive = isActive;
-	}
-	
-	/**
-	 * Tells this annotation model to collect temporary problems from now on.
-	 */
-	private void startCollectingProblems() {
-		getCollectedProblems().clear();
-	}
-	
-	/**
-	 * Tells this annotation model to no longer collect temporary problems.
-	 */
-	private void stopCollectingProblems() {
-	// do nothing
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
deleted file mode 100644
index 211bb7f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslation.java
+++ /dev/null
@@ -1,565 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     bug:244839 - eugene@genuitec.com
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.jsdt.core.IBuffer;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IPackageFragmentRoot;
-import org.eclipse.wst.jsdt.core.ISourceRange;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.WorkingCopyOwner;
-import org.eclipse.wst.jsdt.internal.core.DocumentContextFragmentRoot;
-import org.eclipse.wst.jsdt.internal.core.Member;
-import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsTranslation implements IJsTranslation {
-
-	private static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jstranslation"); //$NON-NLS-1$
- 		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-
-	private IJavaScriptUnit fCompilationUnit = null;
-	private DocumentContextFragmentRoot fDocumentScope;
-	private IJavaScriptProject fJavaProject = null;
-	private byte[] fLock = null;
-	private IProgressMonitor fProgressMonitor = null;
-	protected IStructuredDocument fHtmlDocument;
-	protected String fModelBaseLocation;
-
-
-//	private static final String SUPER_TYPE_NAME = "Window"; //$NON-NLS-1$
-//	private static final String SUPER_TYPE_LIBRARY = "org.eclipse.wst.jsdt.launching.baseBrowserLibrary"; //$NON-NLS-1$
-
-	protected IJsTranslator fTranslator;
-
-	private String mangledName;
-	protected boolean listenForChanges;
-
-	public JsTranslation() {
-		/* do nothing */
-	}
-	
-	public IJsTranslator getTranslator() {
-		if(fTranslator!=null) {
-			return fTranslator;
-		}
-		
-		fTranslator = new JsTranslator(fHtmlDocument, fModelBaseLocation, listenForChanges);
-		return this.fTranslator;
-	}
-	
-
-	
-	protected JsTranslation(IStructuredDocument htmlDocument, IJavaScriptProject javaProj, boolean listenForChanges) {
-		fLock = new byte[0];
-		fJavaProject = javaProj;
-		fHtmlDocument = htmlDocument;
-		setBaseLocation();
-		mangledName = createMangledName();
-		this.listenForChanges=listenForChanges;
-	}
-
-	public IJsTranslation getInstance(IStructuredDocument htmlDocument, IJavaScriptProject javaProj, boolean listenForChanges) {
-		return new JsTranslation(htmlDocument,javaProj, listenForChanges);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getJavaProject()
-	 */
-	public IJavaScriptProject getJavaProject() {
-		return fJavaProject;
-	}
-
-	private IPackageFragmentRoot getDocScope(boolean reset) {
-		if (fDocumentScope == null) {
-			// IProject project = getJavaProject().getProject();
-			// IResource absoluteRoot =
-			// ((IContainer)getJavaProject().getResource()).findMember(
-			// WebRootFinder.getWebContentFolder(fJavaProject.getProject()));
-			fDocumentScope = new DocumentContextFragmentRoot(fJavaProject, getFile(), WebRootFinder.getWebContentFolder(fJavaProject.getProject()), WebRootFinder.getServerContextRoot(fJavaProject.getProject()), JsWebNature.VIRTUAL_SCOPE_ENTRY);
-			fDocumentScope.setIncludedFiles(getTranslator().getRawImports());
-			return fDocumentScope;
-		}
-
-		if (reset)
-			fDocumentScope.setIncludedFiles(getTranslator().getRawImports());
-		return fDocumentScope;
-	}
-
-	private void setBaseLocation() {
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(fHtmlDocument);
-			if (xmlModel == null) {
-				xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(fHtmlDocument);
-			}
-			fModelBaseLocation = xmlModel.getBaseLocation();
-		}
-		finally {
-			if (xmlModel != null)
-				xmlModel.releaseFromRead();
-		}
-		// return xmlModel;
-	}
-
-	public IFile getFile() {
-		return FileBuffers.getWorkspaceFileAtLocation(new Path(fModelBaseLocation));
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getHtmlDocument()
-	 */
-	public IDocument getHtmlDocument() {
-		return fHtmlDocument;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getMissingTagStart()
-	 */
-	public int getMissingTagStart() {
-		return getTranslator().getMissingEndTagRegionStart();
-	}
-
-	private String getWebRoot() {
-		return WebRootFinder.getWebContentFolder(fJavaProject.getProject()).toString();
-	}
-
-
-	public String getDirectoryUnderRoot() {
-		String webRoot = getWebRoot();
-		IPath projectWebRootPath = getJavaProject().getPath().append(webRoot);
-		IPath filePath = new Path(fModelBaseLocation).removeLastSegments(1);
-		return filePath.removeFirstSegments(projectWebRootPath.matchingFirstSegments(filePath)).toString();
-	}
-
-	/**
-	 * Originally from ReconcileStepForJava. Creates an IJavaScriptUnit from
-	 * the contents of the JSP document.
-	 * 
-	 * @return an IJavaScriptUnit from the contents of the JSP document
-	 */
-	private IJavaScriptUnit createCompilationUnit() throws JavaScriptModelException {
-		IPackageFragmentRoot root = getDocScope(true);
-		IJavaScriptUnit cu = root.getPackageFragment("").getJavaScriptUnit(getMangledName() + JsDataTypes.BASE_FILE_EXTENSION).getWorkingCopy(getWorkingCopyOwner(), getProgressMonitor()); //$NON-NLS-1$
-		IBuffer buffer;
-		try {
-			buffer = cu.getBuffer();
-		}
-		catch (JavaScriptModelException e) {
-			e.printStackTrace();
-			buffer = null;
-		}
-		if (buffer != null) {
-			getTranslator().setBuffer(buffer);
-		}
-		return cu;
-	}
-
-	public String fixupMangledName(String displayString) {
-		if (displayString == null) {
-			return null;
-		}
-		return displayString.replaceAll(getMangledName() + ".js", getHtmlPageName()); //$NON-NLS-1$
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getAllElementsInJsRange(int, int)
-	 */
-	public IJavaScriptElement[] getAllElementsInJsRange(int javaPositionStart, int javaPositionEnd) {
-		IJavaScriptElement[] EMTPY_RESULT_SET = new IJavaScriptElement[0];
-		IJavaScriptElement[] result = EMTPY_RESULT_SET;
-		IJavaScriptElement[] allChildren = null;
-		try {
-			allChildren = getCompilationUnit().getChildren();
-		}
-		catch (JavaScriptModelException e) {
-		}
-		Vector validChildren = new Vector();
-		for (int i = 0; i < allChildren.length; i++) {
-			ISourceRange range = getJSSourceRangeOf(allChildren[i]);
-			if (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd)) {
-				validChildren.add(allChildren[i]);
-			}
-			else if (allChildren[i].getElementType() == IJavaScriptElement.TYPE) {
-				validChildren.add(allChildren[i]);
-			}
-		}
-		if (validChildren.size() > 0) {
-			result = (IJavaScriptElement[]) validChildren.toArray(new IJavaScriptElement[]{});
-		}
-		if (result == null || result.length == 0) {
-			return EMTPY_RESULT_SET;
-		}
-		return result;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getCompilationUnit()
-	 */
-	public IJavaScriptUnit getCompilationUnit() {
-        // Genuitec Begin Fix 6149: Exception opening external HTML file
-	    if (!getJavaProject().exists()) {
-	        return null;
-	    }
-	    // Genuitec End Fix 6149: Exception opening external HTML file
-		synchronized (fLock) {
-			try {
-				if (fCompilationUnit == null) {
-					fCompilationUnit = createCompilationUnit();
-					return fCompilationUnit;
-				}
-
-			}
-			catch (JavaScriptModelException jme) {
-				if (JsTranslation.DEBUG) {
-					Logger.logException("error creating JSP working copy... ", jme); //$NON-NLS-1$
-				}
-			}
-
-		}
-		getDocScope(true);
-		try {
-			fCompilationUnit = fCompilationUnit.getWorkingCopy(getWorkingCopyOwner(), getProgressMonitor());
-			// fCompilationUnit.makeConsistent(getProgressMonitor());
-		}
-		catch (JavaScriptModelException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-		return fCompilationUnit;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getElementsFromJsRange(int, int)
-	 */
-	public IJavaScriptElement[] getElementsFromJsRange(int javaPositionStart, int javaPositionEnd) {
-		IJavaScriptElement[] EMTPY_RESULT_SET = new IJavaScriptElement[0];
-		IJavaScriptElement[] result = EMTPY_RESULT_SET;
-		try {
-			IJavaScriptUnit cu = getCompilationUnit();
-			if (cu != null) {
-				synchronized (fLock) {
-					int cuDocLength = cu.getBuffer().getLength();
-					int javaLength = javaPositionEnd - javaPositionStart;
-					if (cuDocLength > 0 && javaPositionStart >= 0 && javaLength >= 0 && javaPositionEnd <= cuDocLength) {
-						result = cu.codeSelect(javaPositionStart, javaLength, getWorkingCopyOwner());
-					}
-				}
-			}
-			if (result == null || result.length == 0) {
-				return EMTPY_RESULT_SET;
-			}
-		}
-		catch (JavaScriptModelException x) {
-			Logger.logException(x);
-		}
-		return result;
-	}
-
-	private String getHtmlPageName() {
-		IPath path = new Path(fModelBaseLocation);
-		return path.lastSegment();
-
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getHtmlText()
-	 */
-	public String getHtmlText() {
-		return fHtmlDocument.get();
-	}
-
-	public String getJavaPath() {
-		IPath rootPath = new Path(fModelBaseLocation).removeLastSegments(1);
-		String cuPath = rootPath.append("/" + getMangledName() + JsDataTypes.BASE_FILE_EXTENSION).toString(); //$NON-NLS-1$
-		return cuPath;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getJsElementAtOffset(int)
-	 */
-	public IJavaScriptElement getJsElementAtOffset(int jsOffset) {
-		IJavaScriptElement elements = null;
-		try {
-			elements = getCompilationUnit().getElementAt(jsOffset);
-		}
-		catch (JavaScriptModelException e) {
-			// TODO Auto-generated catch block
-			if (JsTranslation.DEBUG) {
-				Logger.logException("error retrieving java elemtnt from compilation unit... ", e); //$NON-NLS-1$
-			}
-			// }
-		}
-		return elements;
-	}
-
-	private ISourceRange getJSSourceRangeOf(IJavaScriptElement element) {
-		// returns the offset in html of given element
-		ISourceRange range = null;
-		if (element instanceof Member) {
-			try {
-				range = ((Member) element).getNameRange();
-			} catch (JavaScriptModelException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}else if (element instanceof SourceRefElement) {
-			try {
-				range = ((SourceRefElement) element).getSourceRange();
-			}
-			catch (JavaScriptModelException e) {
-				e.printStackTrace();
-			}
-		}
-		return range;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getJsText()
-	 */
-	public String getJsText() {
-		return getTranslator().getJsText();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getScriptPositions()
-	 */
-	public Position[] getScriptPositions() {
-		return getTranslator().getHtmlLocations();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#insertInFirstScriptRegion(java.lang.String)
-	 */
-	public void insertInFirstScriptRegion(String text) {
-		Position pos[] = getScriptPositions();
-		int scriptStartOffset = 0;
-		if(pos!=null && pos.length>0) {
-			scriptStartOffset = pos[0].getOffset();
-			
-		}
-		String insertText = (scriptStartOffset==0?"":"\n") + text;
-		insertScript(scriptStartOffset,insertText);
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#insertScript(int, java.lang.String)
-	 */
-	public void insertScript(int offset, String text) {
-
-		IDOMModel xmlModel = null;
-		Position[] inHtml = getScriptPositions();
-		boolean isInsideExistingScriptRegion = false;
-		for (int i = 0; i < inHtml.length; i++) {
-			if (inHtml[i].overlapsWith(offset, 1)) {
-				// * inserting into a script region
-				isInsideExistingScriptRegion = true;
-			}
-		}
-
-		String insertText = null;
-
-		if (isInsideExistingScriptRegion) {
-			insertText = text;
-		}
-		else {
-			insertText = offset != 0 ? "\n" : "" + "<script type=\"text/javascript\">\n" + text + "\n</script>\n";
-		}
-	//	translator.documentAboutToBeChanged(null);
-
-		synchronized (fLock) {
-			try {
-				xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForEdit(fHtmlDocument);
-				if (xmlModel == null) {
-					xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(fHtmlDocument);
-				}
-				if (xmlModel != null) {
-
-
-					xmlModel.aboutToChangeModel();
-					xmlModel.getDocument().getStructuredDocument().replaceText(this, offset, 0, insertText);
-					xmlModel.changedModel();
-					try {
-						xmlModel.save();
-					}
-
-					catch (UnsupportedEncodingException e) {}
-					catch (IOException e) {}
-					catch (CoreException e) {}
-				}
-			}
-			finally {
-				if (xmlModel != null)
-					xmlModel.releaseFromEdit();
-			}
-		}
-
-	//	translator.documentChanged(null);
-
-	}
-
-	public String getMangledName() {
-		return this.mangledName;
-	}
-
-	private String createMangledName() {
-		return JsNameManglerUtil.mangle(fModelBaseLocation);
-	}
-
-	/**
-	 * 
-	 * @return the problem requestor for the JavaScriptUnit in this
-	 *         JsTranslation
-	 */
-	private JsProblemRequestor getProblemRequestor() {
-		return CompilationUnitHelper.getInstance().getProblemRequestor();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#getProblems()
-	 */
-	public List getProblems() {
-		List problems = getProblemRequestor().getCollectedProblems();
-		getProblemRequestor().endReporting();
-		return problems != null ? problems : new ArrayList();
-	}
-
-	private IProgressMonitor getProgressMonitor() {
-		if (fProgressMonitor == null) {
-			fProgressMonitor = new NullProgressMonitor();
-		}
-		return fProgressMonitor;
-	}
-
-	public WorkingCopyOwner getWorkingCopyOwner() {
-		return CompilationUnitHelper.getInstance().getWorkingCopyOwner();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#ifOffsetInImportNode(int)
-	 */
-	public boolean ifOffsetInImportNode(int offset) {
-		Position[] importRanges = getTranslator().getImportHtmlRanges();
-		for (int i = 0; i < importRanges.length; i++) {
-			if (importRanges[i].includes(offset)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#reconcileCompilationUnit()
-	 */
-	public void reconcileCompilationUnit() {
-		// if(true) return;
-		IJavaScriptUnit cu = getCompilationUnit();
-		if (fCompilationUnit == null) {
-			return;
-		}
-		if (cu != null) {
-			try {
-				synchronized (fLock) {
-					cu.reconcile(IJavaScriptUnit.NO_AST, true, true, getWorkingCopyOwner(), getProgressMonitor());
-				}
-			}
-			catch (JavaScriptModelException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#release()
-	 */
-	public void release() {
-		if (getTranslator() != null)
-			getTranslator().release();
-		synchronized (fLock) {
-			if (fCompilationUnit != null) {
-				try {
-					if (JsTranslation.DEBUG) {
-						System.out.println("------------------------------------------------------------------"); //$NON-NLS-1$
-						System.out.println("(-) JsTranslation [" + this + "] discarding JavaScriptUnit: " + fCompilationUnit); //$NON-NLS-1$ //$NON-NLS-2$
-						System.out.println("------------------------------------------------------------------"); //$NON-NLS-1$
-					}
-					fCompilationUnit.discardWorkingCopy();
-				}
-				catch (JavaScriptModelException e) {
-					// we're done w/ it anyway
-				}
-			}
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.internal.java.IJsTranslation#setProblemCollectingActive(boolean)
-	 */
-	public void setProblemCollectingActive(boolean collect) {
-		IJavaScriptUnit cu = getCompilationUnit();
-		if (cu != null) {
-			getProblemRequestor().setIsActive(collect);
-		}
-	}
-
-	public void classpathChange() {
-
-		if (fDocumentScope != null) {
-			fDocumentScope.classpathChange();
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapter.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapter.java
deleted file mode 100644
index 8d165da..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapter.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-
- * <br><br> this adapter loads translation information from extension points.  this is to allow more complicated html/js translations through extensions.
- * @author pavery
- */
-public class JsTranslationAdapter implements INodeAdapter, IResourceChangeListener {
-
-	private static final boolean DEBUG = "true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jstranslation")); //$NON-NLS-1$  //$NON-NLS-2$
-	private IStructuredDocument fHtmlDocument = null;
-	private IJsTranslation fJSPTranslation = null;
-	private NullProgressMonitor fTranslationMonitor = null;
-	private String baseLocation;
-	private boolean listenForChanges=false;
-	private static final String PRIORITY_ATTRIB = "priority";
-	private IJsTranslation fTranslationElement;
-	
-	public JsTranslationAdapter(IDOMModel xmlModel) {
-		fHtmlDocument = xmlModel.getStructuredDocument();
-		baseLocation = xmlModel.getBaseLocation();
-		initializeJavaPlugins();
-		
-		
-	}
-	public void shouldListenForChanges(boolean listenForProjectChanges) {
-		if(listenForProjectChanges) {
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.POST_CHANGE);
-		}
-	}
-
-	public IJavaScriptProject getJavaProject() {
-		IJavaScriptProject javaProject = null;
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IPath filePath = new Path(baseLocation);
-		IProject project = null;
-		if (filePath.segmentCount() > 0) {
-			project = root.getProject(filePath.segment(0));
-		}
-		if (project != null) {
-			javaProject = JavaScriptCore.create(project);
-		}
-		
-		return javaProject;
-	}
-	
-	/**
-	 * Returns the IJsTranslation for this adapter.
-	 * 
-	 * @return a IJsTranslation
-	 */
-	public IJsTranslation getJsTranslation(boolean listenForChanges) {
-		if (fJSPTranslation == null || (!this.listenForChanges && listenForChanges)) {
-			if(fJSPTranslation!=null) fJSPTranslation.release();
-			if(fTranslationElement==null) {
-				/* load the translation factory from the extension point */
-				try {
-					IExtensionRegistry registry = Platform.getExtensionRegistry();
-				    IExtensionPoint extensionPoint =  registry.getExtensionPoint("org.eclipse.wst.jsdt.web.core.javascriptPreProcessor");
-				    IConfigurationElement points[] = extensionPoint.getConfigurationElements();
-				 //   int[] priorities = new int[points.length];
-				   
-				    int highestPriorityValue = -1;
-				    int highestPriorityIndex = -1;
-				    
-				    for(int i = 0;i < points.length;i++){
-				    	String priority = points[i].getAttribute(PRIORITY_ATTRIB);
-				    	int value = Integer.parseInt(priority);
-				    	if(value>highestPriorityValue) {
-				    		highestPriorityIndex = i;
-				    		highestPriorityValue = value;
-				    	}
-				       
-				    }
-				    fTranslationElement = (IJsTranslation)points[highestPriorityIndex].createExecutableExtension("class");
-				}catch(Exception e) {
-					System.out.println(e);
-				}
-			}
-			//fJSPTranslation = new JsTranslation(fHtmlDocument, getJavaProject(),listenForChanges);
-			fJSPTranslation = fTranslationElement.getInstance(fHtmlDocument, getJavaProject(), listenForChanges);
-			this.listenForChanges=listenForChanges;
-		}
-		shouldListenForChanges(listenForChanges);
-		return fJSPTranslation;
-	}
-	
-	
-	private void initializeJavaPlugins() {
-		JavaScriptCore.getPlugin();
-	}
-	
-	public boolean isAdapterForType(Object type) {
-		return type.equals(IJsTranslation.class);
-	}
-	
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {}
-	
-	public void release() {
-		if (fTranslationMonitor != null) {
-			fTranslationMonitor.setCanceled(true);
-		}
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-		if (fJSPTranslation != null) {
-			if (JsTranslationAdapter.DEBUG) {
-				System.out.println("JSPTranslationAdapter releasing:" + fJSPTranslation); //$NON-NLS-1$
-			}
-			fJSPTranslation.release();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-	 */
-	public void resourceChanged(IResourceChangeEvent event) {
-		IProject changedProject = (event==null || event.getResource()==null)?null:event.getResource().getProject();
-		if(changedProject!=null && getJavaProject().getProject().equals(changedProject) && fJSPTranslation!=null){
-			fJSPTranslation.classpathChange();
-		}	
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapterFactory.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapterFactory.java
deleted file mode 100644
index b621153..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslationAdapterFactory.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-
- * @author pavery
- * 
- */
-public class JsTranslationAdapterFactory extends AbstractAdapterFactory {
-	// for debugging
-	private static final boolean DEBUG;
-	
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jstranslation"); //$NON-NLS-1$
- 		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	private JsTranslationAdapter fAdapter = null;
-	
-	public JsTranslationAdapterFactory() {
-		super(IJsTranslation.class, true);
-	}
-	
-	
-	public INodeAdapterFactory copy() {
-		return new JsTranslationAdapterFactory();
-	}
-	
-	
-	protected INodeAdapter createAdapter(INodeNotifier target) {
-		if (target instanceof IDOMNode && fAdapter == null) {
-			fAdapter = new JsTranslationAdapter(((IDOMNode) target).getModel());
-			if (JsTranslationAdapterFactory.DEBUG) {
-				System.out.println("(+) JSPTranslationAdapterFactory [" + this + "] created adapter: " + fAdapter); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-		}
-		return fAdapter;
-	}
-	
-	
-	public void release() {
-		if (fAdapter != null) {
-			if (JsTranslationAdapterFactory.DEBUG) {
-				System.out.println("(-) JSPTranslationAdapterFactory [" + this + "] releasing adapter: " + fAdapter); //$NON-NLS-1$ //$NON-NLS-2$
-			}
-			fAdapter.release();
-		}
-		super.release();
-	}
-	
-	public static void setupAdapterFactory(IStructuredModel sm) {
-		if (sm.getFactoryRegistry().getFactoryFor(IJsTranslation.class) == null) {
-			JsTranslationAdapterFactory factory = new JsTranslationAdapterFactory();
-			sm.getFactoryRegistry().addFactory(factory);
-		}
-	}
-	
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslator.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslator.java
deleted file mode 100644
index ce72b35..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/JsTranslator.java
+++ /dev/null
@@ -1,672 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocumentListener;
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.jsdt.core.IBuffer;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-
- * Translates a JSP/HTML document into its JavaScript pieces. 
- * 
- */
-public class JsTranslator extends Job implements IJsTranslator, IDocumentListener {
-	
-	protected static final boolean DEBUG;
-	private static final boolean DEBUG_SAVE_OUTPUT = false;  //"true".equalsIgnoreCase(Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jstranslationstodisk")); //$NON-NLS-1$  //$NON-NLS-2$
-//	private static final String ENDL = "\n"; //$NON-NLS-1$
-	
-	private static final String XML_COMMENT_START = "<!--"; //$NON-NLS-1$
-//	private static final String XML_COMMENT_END = "-->"; //$NON-NLS-1$
-	private static final boolean REPLACE_INNER_BLOCK_SECTIONS_WITH_SPACE = false;
-	private static final Pattern fClientSideTagPattern = Pattern.compile("<[^<%)>]+/?>"); //$NON-NLS-1$
-	
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsjavamapping"); //$NON-NLS-1$
- 		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-
-	private IStructuredDocumentRegion fCurrentNode;
-	protected StringBuffer fScriptText = new StringBuffer();
-	protected IStructuredDocument fStructuredDocument = null;
-	protected ArrayList importLocationsInHtml = new ArrayList();
-	/* use java script by default */
-	protected boolean fIsGlobalJs = true;
-	protected ArrayList rawImports = new ArrayList(); // translated
-	protected ArrayList scriptLocationInHtml = new ArrayList();
-	protected int scriptOffset = 0;
-	
-	protected byte[] fLock = new byte[0];
-	protected byte[] finished = new byte[0];
-	
-	protected IBuffer fCompUnitBuff;
-	protected boolean cancelParse = false;
-	protected int missingEndTagRegionStart = -1;
-	protected static final boolean ADD_SEMICOLON_AT_INLINE=true;
-	
-	protected boolean isGlobalJs() {
-		return fIsGlobalJs;
-	}
-	
-	protected IBuffer getCompUnitBuffer() {
-		return fCompUnitBuff;
-	}
-	
-	protected StringBuffer getScriptTextBuffer() {
-		return fScriptText;
-	}
-	
-	
-	protected void setIsGlobalJs(boolean value) {
-		this.fIsGlobalJs = value;
-	}
-	
-	protected void advanceNextNode() {
-		setCurrentNode(getCurrentNode().getNext());
-	}	
-	
-	public JsTranslator(IStructuredDocument document, 	String fileName) {
-		super("JavaScript translation for : "  + fileName); //$NON-NLS-1$
-		fStructuredDocument = document;
-		
-		fStructuredDocument.addDocumentListener(this);
-		setPriority(Job.LONG);
-		setSystem(true);
-		schedule();
-		reset();
-	}
-	
-	public JsTranslator() {
-		super("JavaScript Translation");
-	}
-	
-	public JsTranslator(IStructuredDocument document, 	String fileName, boolean listenForChanges) {
-		super("JavaScript translation for : "  + fileName); //$NON-NLS-1$
-		fStructuredDocument = document;
-		if(listenForChanges) {
-			fStructuredDocument.addDocumentListener(this);
-			setPriority(Job.LONG);
-			setSystem(true);
-			schedule();
-		}
-		reset();
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#getJsText()
-	 */
-	public String getJsText() {
-		synchronized(finished) {
-			return fScriptText.toString();
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#getCurrentNode()
-	 */
-	protected final IStructuredDocumentRegion getCurrentNode() {
-		
-		return fCurrentNode;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#setBuffer(org.eclipse.wst.jsdt.core.IBuffer)
-	 */
-	public void setBuffer(IBuffer buffer) {
-		fCompUnitBuff = buffer;
-		synchronized(finished) {
-			fCompUnitBuff.setContents(fScriptText.toString());
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#getHtmlLocations()
-	 */
-	public Position[] getHtmlLocations() {
-		synchronized(finished) {
-			return (Position[]) scriptLocationInHtml.toArray(new Position[scriptLocationInHtml.size()]);
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#getMissingEndTagRegionStart()
-	 */
-	public int getMissingEndTagRegionStart() {
-		return missingEndTagRegionStart;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#getImportHtmlRanges()
-	 */
-	public Position[] getImportHtmlRanges() {
-		synchronized(finished) {
-			return (Position[]) importLocationsInHtml.toArray(new Position[importLocationsInHtml.size()]);
-		}
-	}
-	
-
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#getRawImports()
-	 */
-	public String[] getRawImports() {
-		synchronized(finished) {
-			return (String[]) this.rawImports.toArray(new String[rawImports.size()]);
-		}
-	}
-
-		
-	
-	/**
-	 * 
-	 * @return the status of the translator's progrss monitor, false if the
-	 *         monitor is null
-	 */
-	protected boolean isCanceled() {
-		return cancelParse;
-	}
-	
-	/**
-	 * Reinitialize some fields
-	 */
-	protected void reset() {
-		synchronized(fLock) {
-			scriptOffset = 0;
-			// reset progress monitor
-			fScriptText = new StringBuffer();
-			fCurrentNode = fStructuredDocument.getFirstStructuredDocumentRegion();
-			rawImports.clear();
-			importLocationsInHtml.clear();
-			scriptLocationInHtml.clear();
-			missingEndTagRegionStart = -1;
-			cancelParse = false;
-		}
-		translate();
-	}
-
-
-	
-	protected IStructuredDocumentRegion setCurrentNode(IStructuredDocumentRegion currentNode) {
-		synchronized(fLock) {
-			return this.fCurrentNode = currentNode;
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#translate()
-	 */
-	public void translate() {
-		//setCurrentNode(fStructuredDocument.getFirstStructuredDocumentRegion());
-		
-		synchronized(finished) {
-			if(getCurrentNode() != null) {
-			NodeHelper nh = new NodeHelper(getCurrentNode());
-			while (getCurrentNode() != null && !isCanceled()) {
-				nh.setDocumentRegion(getCurrentNode());
-				
-				// System.out.println("Translator Looking at Node
-				// type:"+getCurrentNode().getType()+"---------------------------------:");
-				// System.out.println(new NodeHelper(getCurrentNode()));
-				// i.println("/---------------------------------------------------");
-				if (getCurrentNode().getType() == DOMRegionContext.XML_TAG_NAME) {
-					if ((!nh.isEndTag() || nh.isSelfClosingTag()) && nh.nameEquals("script")) { //$NON-NLS-1$
-						/*
-						 * Handles the following cases: <script
-						 * type="javascriptype"> <script language="javascriptype>
-						 * <script src='' type=javascriptype> <script src=''
-						 * language=javascripttype <script src=''> global js type.
-						 * <script> (global js type)
-						 */
-						if (NodeHelper.isInArray(JsDataTypes.JSVALIDDATATYPES, nh.getAttributeValue("type")) || NodeHelper.isInArray(JsDataTypes.JSVALIDDATATYPES, nh.getAttributeValue("language")) || isGlobalJs()) { //$NON-NLS-1$ //$NON-NLS-2$
-							if (nh.containsAttribute(new String[] { "src" })) { //$NON-NLS-1$
-								// Handle import
-								translateScriptImportNode(getCurrentNode());
-							}
-							// } else {
-							// handle script section
-							
-							if (getCurrentNode().getNext() != null /*&& getCurrentNode().getNext().getType() == DOMRegionContext.BLOCK_TEXT*/) {
-								translateJSNode(getCurrentNode().getNext());
-							}
-						} // End search for <script> sections
-					} else if (nh.containsAttribute(JsDataTypes.HTMLATREVENTS)) {
-						/* Check for embedded JS events in any tags */
-						translateInlineJSNode(getCurrentNode());
-					} else if (nh.nameEquals("META") && nh.attrEquals("http-equiv", "Content-Script-Type") && nh.containsAttribute(new String[] { "content" })) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-						// <META http-equiv="Content-Script-Type" content="type">
-						setIsGlobalJs( NodeHelper.isInArray(JsDataTypes.JSVALIDDATATYPES, nh.getAttributeValue("content"))); //$NON-NLS-1$
-					} // End big if of JS types
-				}
-				if (getCurrentNode() != null) {
-					advanceNextNode();
-				}
-			} // end while loop
-			if(getCompUnitBuffer()!=null) getCompUnitBuffer().setContents(fScriptText.toString());
-		}
-		finishedTranslation();
-		}
-	}
-	
-	protected void finishedTranslation() {
-		if(DEBUG_SAVE_OUTPUT){
-			IDOMModel xmlModel = null;
-			String baseLocation = null;
-			FileOutputStream fout = null;
-			PrintStream out = null;
-			try {
-				xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(fStructuredDocument);
-				if (xmlModel == null) {
-					xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getModelForRead(fStructuredDocument);
-				}
-				baseLocation = xmlModel.getBaseLocation();
-			}
-			finally {
-				if (xmlModel != null)
-					xmlModel.releaseFromRead();
-			}
-			
-			if(baseLocation!=null){
-				IWorkspace workspace = ResourcesPlugin.getWorkspace();
-				IWorkspaceRoot root = workspace.getRoot();
-				IFile tFile = workspace.getRoot().getFile(new Path(baseLocation + ".js"));
-				File tempFile = tFile.getLocation().toFile();
-				
-				  if(tempFile.exists()){
-					  tempFile.delete();
-				  }
-				 
-				  try {
-					  tempFile.createNewFile();
-					  fout = new FileOutputStream(tempFile);
-					  out = new PrintStream(fout);
-					  out.println(fScriptText);
-					  out.close();
-				} catch (FileNotFoundException e) {
-				
-				} catch (IOException e) {
-					
-				}finally{
-					if(out!=null) out.close();
-				
-					
-				}
-				 try {
-					root.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-				} catch (CoreException e) {
-					
-				}
-			}
-			
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#translateInlineJSNode(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion)
-	 */
-	public void translateInlineJSNode(IStructuredDocumentRegion container) {
-		// System.out
-		// .println("JSPTranslator.translateInlineJSNode Entered
-		// w/ScriptOffset:"
-		// + scriptOffset);
-		
-			//NodeHelper nh = new NodeHelper(container);
-			// System.out.println("inline js node looking at:\n" + nh);
-			/* start a function header.. will amend later */
-			ITextRegionList t = container.getRegions();
-			ITextRegion r;
-			Iterator regionIterator = t.iterator();
-			while (regionIterator.hasNext() && !isCanceled() ) {
-				r = (ITextRegion) regionIterator.next();
-				if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-					int start = r.getStart();
-					int offset = r.getTextEnd();
-					String tagAttrname = container.getText().substring(start, offset).trim();
-					/*
-					 * Attribute values aren't case sensative, also make sure next
-					 * region is attrib value
-					 */
-					if (NodeHelper.isInArray(JsDataTypes.HTMLATREVENTS, tagAttrname)) {
-						if (regionIterator.hasNext()) {
-							regionIterator.next();
-						}
-						if (regionIterator.hasNext()) {
-							r = ((ITextRegion) regionIterator.next());
-						}
-						if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-							int valStartOffset = container.getStartOffset(r);
-							// int valEndOffset = r.getTextEnd();
-							String rawText = container.getText().substring(r.getStart(), r.getTextEnd());
-							if (rawText == null || rawText.length() == 0) {
-								return;
-							}
-							/* Strip quotes */
-							switch (rawText.charAt(0)) {
-								case '\'':
-								case '"':
-									rawText = rawText.substring(1);
-									valStartOffset++;
-							}
-							if (rawText == null || rawText.length() == 0) {
-								return;
-							}
-							switch (rawText.charAt(rawText.length() - 1)) {
-								case '\'':
-								case '"':
-									rawText = rawText.substring(0, rawText.length() - 1);
-							}
-							// Position inScript = new Position(scriptOffset,
-							// rawText.length());
-							/* Quoted text starts +1 and ends -1 char */
-							if(ADD_SEMICOLON_AT_INLINE) rawText = rawText + ";"; //$NON-NLS-1$
-							Position inHtml = new Position(valStartOffset, rawText.length());
-							scriptLocationInHtml.add(inHtml);
-							/* need to pad the script text with spaces */
-							char[] spaces = Util.getPad(valStartOffset - scriptOffset);
-							fScriptText.append(spaces);
-							fScriptText.append(rawText);
-							scriptOffset = fScriptText.length();
-						}
-					}
-				}
-			}
-		}
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#translateJSNode(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion)
-	 */
-	public void translateJSNode(IStructuredDocumentRegion container) {
-		ITextRegionCollection containerRegion = container;
-		Iterator regions = containerRegion.getRegions().iterator();
-		ITextRegion region = null;
-		
-		if(container==null) return;
-		
-		char[] spaces = Util.getPad(container.getStartOffset() - scriptOffset);
-		fScriptText.append(spaces);
-		scriptOffset = container.getStartOffset();
-	
-		if(container.getType()!=DOMRegionContext.BLOCK_TEXT && container.getType()!= DOMRegionContext.XML_CDATA_TEXT) {
-			return;
-		}
-		
-		while (regions.hasNext() && !isCanceled()) {
-			region = (ITextRegion) regions.next();
-			String type = region.getType();
-			// content assist was not showing up in JSP inside a javascript
-			// region
-			
-			//System.out.println("Region text: " + container.getText().substring(region.getStart(), region.getEnd()));
-			boolean isContainerRegion = region instanceof ITextRegionContainer;
-			/* make sure its not a sub container region, probably JSP */
-			if (type == DOMRegionContext.BLOCK_TEXT ) {
-				int scriptStart = container.getStartOffset();
-				int scriptTextLength = container.getLength();
-				String regionText = container.getFullText(region);
-				int regionLength = region.getLength();
-				
-				spaces = Util.getPad(scriptStart - scriptOffset);
-				fScriptText.append(spaces); 	
-				// fJsToHTMLRanges.put(inScript, inHtml);
-				if(isContainerRegion && REPLACE_INNER_BLOCK_SECTIONS_WITH_SPACE) {
-					spaces = Util.getPad(regionLength);
-					fScriptText.append(spaces); 	
-				}
-				// Bug 241794 - Validation shows errors when using JSP Expressions inside JavaScript code
-				else if (regionText.indexOf(XML_COMMENT_START) >= 0) {
-					int index = regionText.indexOf(XML_COMMENT_START);
-					int leadingTrim = index + XML_COMMENT_START.length();
-					for (int i = 0; i < index; i++) {
-						/*
-						 * ignore the comment start when it's preceded only
-						 * by white space
-						 */
-						if (!Character.isWhitespace(regionText.charAt(i))) {
-							leadingTrim = 0;
-							break;
-						}
-					}
-					spaces = Util.getPad(leadingTrim);
-					fScriptText.append(spaces);
-					fScriptText.append(regionText.substring(leadingTrim));
-				}
-//				// Bug 241794 - Validation shows errors when using JSP Expressions inside JavaScript code
-//				else if (regionText.indexOf(XML_COMMENT_END) >= 0) {
-//					int index = regionText.indexOf(XML_COMMENT_END);
-//					int trailingTrim = index + XML_COMMENT_END.length();
-//					for (int i = index; i < trailingTrim; i++) {
-//						/*
-//						 * ignore the comment end when it's followed only
-//						 * by white space
-//						 */
-//						if (!Character.isWhitespace(regionText.charAt(i))) {
-//							trailingTrim = 0;
-//							break;
-//						}
-//					}
-//					spaces = Util.getPad(trailingTrim);
-//					fScriptText.append(spaces);
-//					fScriptText.append(regionText.substring(0, trailingTrim));
-//				}
-				else {
-					// fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=284774
-					// last offset of content that was skipped
-					int validStart = 0;
-					// start of content to skip
-					int validEnd = 0;
-										
-					Matcher matcher = fClientSideTagPattern.matcher(regionText);
-					StringBuffer contents = new StringBuffer();
-					// find any instance of tags in the region text
-					int serverSideStart = regionText.indexOf("<%");
-					int clientMatchStart = matcher.find() ? matcher.start() : -1;
-					// contains server-side script
-					while (serverSideStart > -1 || clientMatchStart > -1) { //$NON-NLS-1$
-						validEnd = validStart;
-						boolean biasClient = false;
-						boolean biasServer = false;
-						// update the start of content to skip
-						if (clientMatchStart > -1 && serverSideStart > -1) {
-							validEnd = Math.min(clientMatchStart, serverSideStart);
-							biasClient = validEnd == clientMatchStart;
-							biasServer = validEnd == serverSideStart;
-						}
-						else if (clientMatchStart > -1 && serverSideStart < 0) {
-							validEnd = clientMatchStart;
-							biasClient = true;
-						}
-						else if (clientMatchStart < 0 && serverSideStart > -1) {
-							validEnd = serverSideStart;
-							biasServer = true;
-						}
-						
-						// append if there's something we want to include
-						if (-1 < validStart && -1 < validEnd) {
-							// append what we want to include
-							contents.append(regionText.substring(validStart, validEnd));
-							
-							// change the skipped content to a valid variable name and append it as a placeholder
-							int startOffset = container.getStartOffset(region) + validEnd;
-
-							int serverSideEnd = (regionLength > validEnd + 2) ? regionText.indexOf("%>", validEnd + 2) : -1;
-							if (serverSideEnd > -1)
-								serverSideEnd += 2;
-							int clientMatchEnd = matcher.find(validEnd) ? matcher.end() : -1;
-							// update end of what we skipped
-							validStart = -1;
-							if (clientMatchEnd > validEnd && serverSideEnd > validEnd) {
-								if (biasClient)
-									validStart = clientMatchEnd;
-								else if (biasServer)
-									validStart = serverSideEnd;
-								else
-									validStart = Math.min(clientMatchEnd, serverSideEnd);
-							}
-							if (clientMatchEnd >= validEnd && serverSideEnd < 0)
-								validStart = matcher.end();
-							if (clientMatchEnd < 0 && serverSideEnd >= validEnd)
-								validStart = serverSideEnd;
-							int line = container.getParentDocument().getLineOfOffset(startOffset);
-							int column;
-							try {
-								column = startOffset - container.getParentDocument().getLineOffset(line);
-							}
-							catch (BadLocationException e) {
-								column = -1;
-							}
-							if (line >= 0 && column >= 0) {
-								// if the column looks wrong, note any leading tabs would make it non-obvious
-								contents.append("__tag_" + (line+1) + "$" + column + "_"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-							}
-							else {
-								contents.append("__tag_" + startOffset + "_"); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-						}
-						// set up to end while if no end for valid
-						if (validStart > 0) {
-							serverSideStart = validStart < regionLength - 2 ? regionText.indexOf("<%", validStart) : -1;
-							clientMatchStart = validStart < regionLength ? (matcher.find(validStart + 1) ? matcher.start() : -1) : -1;
-						}
-						else {
-							serverSideStart = clientMatchStart = -1;
-						}
-					}
-					if (validStart >= 0) {
-						contents.append(regionText.substring(validStart));
-					}
-					if (contents.length() != 0) {
-						fScriptText.append(contents.toString());
-					}
-					else {
-						fScriptText.append(regionText);
-					}
-					Position inHtml = new Position(scriptStart, scriptTextLength);
-					scriptLocationInHtml.add(inHtml);
-				}
-								
-				scriptOffset = fScriptText.length();
-			}
-		}
-		
-		IStructuredDocumentRegion endTag = container.getNext();
-		
-		if(endTag==null) {
-			missingEndTagRegionStart = container.getStartOffset();
-		}else if(endTag!=null) {
-			NodeHelper nh = new NodeHelper(endTag);
-			String name = nh.getTagName();
-			
-			if(name==null || !name.trim().equalsIgnoreCase("script") || !nh.isEndTag()) { //$NON-NLS-1$
-				missingEndTagRegionStart = container.getStartOffset();
-			}
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#translateScriptImportNode(org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion)
-	 */
-	public void translateScriptImportNode(IStructuredDocumentRegion region) {
-		NodeHelper nh = new NodeHelper(region);
-		String importName = nh.getAttributeValue("src"); //$NON-NLS-1$
-		if (importName != null && !importName.equals("")) { //$NON-NLS-1$
-			rawImports.add(importName);
-			Position inHtml = new Position(region.getStartOffset(), region.getEndOffset());
-			importLocationsInHtml.add(inHtml);
-		}
-	}
-
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentAboutToBeChanged(DocumentEvent event) {
-		cancelParse = true;
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#documentChanged(org.eclipse.jface.text.DocumentEvent)
-	 */
-	public void documentChanged(DocumentEvent event) {
-		reset();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	protected IStatus run(IProgressMonitor monitor) {
-		return Status.OK_STATUS;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.web.core.javascript.IJsTranslator#release()
-	 */
-	public void release() {
-		fStructuredDocument.removeDocumentListener(this);
-	}
-	
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/Messages.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/Messages.java
deleted file mode 100644
index 4b0baff..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/Messages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * 
- * 
- * Provisional API: This class/interface is part of an interim API that is
- * still under development and expected to change significantly before
- * reaching stability. It is being made available at this early stage to
- * solicit feedback from pioneering adopters on the understanding that any
- * code that uses this API will almost certainly be broken (repeatedly) as the
- * API evolves.
- * 
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.core.internal.java.messages"; //$NON-NLS-1$
-
-	private Messages() {
-	}
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(Messages.BUNDLE_NAME, Messages.class);
-	}
-
-	public static String NodeHelper00;
-	public static String NodeHelper01;
-	public static String NodeHelper03;
-	public static String NodeHelper11;
-	public static String NodeHelper12;
-
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/NodeHelper.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/NodeHelper.java
deleted file mode 100644
index 34d8910..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/NodeHelper.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import java.util.Iterator;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class NodeHelper {
-	protected static final char DOUBLE_QUOTE_CHAR = '\"';
-	protected static final String DOUBLE_QUOTE_ENTITY = "&quot;"; //$NON-NLS-1$
-	protected static final char SINGLE_QUOTE_CHAR = '\'';
-	protected static final String SINGLE_QUOTE_ENTITY = "&#039;"; //$NON-NLS-1$
-	
-	public static boolean isInArray(String StringArray[], String text) {
-		if (StringArray == null || text == null) {
-			return false;
-		}
-		for (int i = 0; i < StringArray.length; i++) {
-			if (StringArray[i].equalsIgnoreCase(text.trim())) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public static boolean isQuoted(String string) {
-		if ((string == null) || (string.length() < 2)) {
-			return false;
-		}
-		int lastIndex = string.length() - 1;
-		char firstChar = string.charAt(0);
-		char lastChar = string.charAt(lastIndex);
-		return (((firstChar == NodeHelper.SINGLE_QUOTE_CHAR) && (lastChar == NodeHelper.SINGLE_QUOTE_CHAR)) || ((firstChar == NodeHelper.DOUBLE_QUOTE_CHAR) && (lastChar == NodeHelper.DOUBLE_QUOTE_CHAR)));
-	}
-	protected IStructuredDocumentRegion region;
-	
-	public NodeHelper(IStructuredDocumentRegion region) {
-		this.region = region;
-	}
-	
-	public boolean attrEquals(String attribute, String value) {
-		String attValue = getAttributeValue(attribute);
-		if(attValue==null) return false;
-		return attValue.equalsIgnoreCase(value);
-	}
-	
-	public String AttrToString() {
-		if (region == null) {
-			return null;
-		}
-		// For debugging
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		String StructuredValue = Messages.NodeHelper00 + getTagName() + Messages.NodeHelper01; //$NON-NLS-1$ //$NON-NLS-2$
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				StructuredValue += "\t\t" + region.getText(r); //$NON-NLS-1$
-				/*
-				 * Theres a XML_TAG_ATTRIBUTE_EQUALS after the
-				 * XML_TAG_ATTRIBUTE_NAME we have to get rid of
-				 */
-				if (regionIterator.hasNext()) {
-					regionIterator.next();
-				}
-				if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-					if (regionIterator.hasNext()) {
-						r = ((ITextRegion) regionIterator.next());
-					}
-					if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-						StructuredValue += "\t\t" + stripEndQuotes(region.getText(r)) + "\n"; //$NON-NLS-1$ //$NON-NLS-2$
-					}
-				}
-			}
-		}
-		return StructuredValue;
-	}
-	
-	public boolean containsAttribute(String name[]) {
-		if (name == null) {
-			return false;
-		}
-		if (region == null) {
-			return false;
-		}
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				String tagname = region.getText(r).trim();
-				/* Attribute values aren't case sensative */
-				if (NodeHelper.isInArray(name, tagname)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public String getAttributeValue(String name) {
-		if (region == null) {
-			return null;
-		}
-		if (name == null) {
-			return null;
-		}
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				String tagname = region.getText(r).trim();
-				/*
-				 * Attribute values aren't case sensative, also make sure next
-				 * region is attrib value
-				 */
-				if (tagname.equalsIgnoreCase(name)) {
-					if (regionIterator.hasNext()) {
-						regionIterator.next();
-					}
-					if (regionIterator.hasNext()) {
-						r = ((ITextRegion) regionIterator.next());
-					}
-					if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-						return stripEndQuotes(region.getText(r));
-					}
-				}
-			}
-		}
-		return null;
-	}
-	
-	public String getElementAsFlatString() {
-		/*
-		 * Returns a full string of this element minus and 'illegal' characters
-		 * (usefull for identifying the HTML element in a generic JS function)
-		 */
-		if (region == null) {
-			return null;
-		}
-		String fullRegionText = region.getFullText();
-		if (fullRegionText == null) {
-			return null;
-		}
-		return fullRegionText.replaceAll("[^a-zA-Z0-9]", ""); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-	
-	public String getTagName() {
-		if (region == null) {
-			return null;
-		}
-		ITextRegionList t = region.getRegions();
-		ITextRegion r;
-		Iterator regionIterator = t.iterator();
-		while (regionIterator.hasNext()) {
-			r = (ITextRegion) regionIterator.next();
-			if (r.getType() == DOMRegionContext.XML_TAG_NAME) {
-				return region.getText(r);
-			}
-		}
-		return null;
-	}
-	
-	public boolean isEndTag() {
-		if (region == null) {
-			return false;
-		}
-		return DOMRegionContext.XML_END_TAG_OPEN.equals(region.getFirstRegion().getType());
-	}
-	
-	public boolean isSelfClosingTag() {
-		if (region == null) {
-			return false;
-		}
-		return DOMRegionContext.XML_EMPTY_TAG_CLOSE.equals(region.getLastRegion().getType());
-	}
-	
-	public boolean nameEquals(String name) {
-		if (region == null) {
-			return false;
-		}
-		String tagName;
-		return ((tagName = getTagName()) != null && tagName.equalsIgnoreCase(name));
-	}
-	
-	public void setDocumentRegion(IStructuredDocumentRegion newRegion) {
-		if (newRegion == null)
-			throw new IllegalArgumentException();
-		region = newRegion;
-	}
-	
-	public String stripEndQuotes(String text) {
-		if (text == null) {
-			return null;
-		}
-		if (NodeHelper.isQuoted(text)) {
-			return text.substring(1, text.length() - 1);
-		}
-		return text;
-	}
-	
-	
-	public String toString() {
-		ITextRegionList t = region.getRegions();
-		Iterator regionIterator = t.iterator();
-		String nodeText = new String();
-		while (regionIterator.hasNext()) {
-			ITextRegion r = (ITextRegion) regionIterator.next();
-			String nodeType = r.getType();
-			nodeText += (Messages.NodeHelper11 + nodeType + Messages.NodeHelper12 + region.getText(r) + "\n"); //$NON-NLS-1$
-		}
-		return nodeText;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/Util.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/Util.java
deleted file mode 100644
index a42aead..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/Util.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import java.util.Arrays;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- *
- */
-public class Util {
-	public static char[] getPad(int numberOfChars) {
-		if(numberOfChars < 0) return new char[0];
-		final char[] spaceArray = new char[numberOfChars];
-		Arrays.fill(spaceArray, ' ');
-		return spaceArray;
-	}
-	
-	public static String removeAll(String source, char remove) {
-		
-		String newString = "";
-		
-		char[] oldStringArray = source.toCharArray();
-		
-		for(int i = 0;i<oldStringArray.length;i++) {
-			if(oldStringArray[i]!=remove) newString+=oldStringArray[i];
-		}
-		return newString;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/WebRootFinder.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/WebRootFinder.java
deleted file mode 100644
index 24cc871..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/WebRootFinder.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- * Provisional API: This class/interface is part of an interim API that is still under development and expected to 
- * change significantly before reaching stability. It is being made available at this early stage to solicit feedback 
- * from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken 
- * (repeatedly) as the API evolves.
- *     
- *     
- *******************************************************************************/
-
-
-
-package org.eclipse.wst.jsdt.web.core.javascript;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.web.core.internal.project.ModuleCoreSupport;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class WebRootFinder {
-	public static IPath getServerContextRoot(IProject project) {
-		IPath root = ModuleCoreSupport.getWebContentRootPath(project);
-		if (root != null)
-			return root;
-		return Path.ROOT;
-	}
-	
-	public static IPath getWebContentFolder(IProject project) {
-		IPath root = ModuleCoreSupport.getWebContentRootPath(project);
-		if (root != null)
-			return root.removeFirstSegments(1);
-		return Path.ROOT;
-	}
-	
-	public static String getWebContext(IProject project) {
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/messages.properties b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/messages.properties
deleted file mode 100644
index ebccdda..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/messages.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-NodeHelper.0=Tag name:
-NodeHelper.1=\tAttribute\tValue\n
-NodeHelper.3=attrib type
-NodeHelper.11=\tNode Type:
-NodeHelper.12=\ \t\tValue:
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/IndexWorkspaceJob.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/IndexWorkspaceJob.java
deleted file mode 100644
index a259283..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/IndexWorkspaceJob.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages;
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-* (copied from JSP)
- * Re-indexes the entire workspace.
- * Ensures the JSP Index is in a stable state before performing a search.
- * (like after a crash or if previous indexing was canceled)
- * 
- * @author pavery
- */
-public class IndexWorkspaceJob extends Job {
-
-	// for debugging
-	static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsindexmanager"); //$NON-NLS-1$
- 		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Visitor that retrieves jsp project paths for all jsp files in the workspace,
-	 * and adds the files to be indexed as they are encountered
-	 */
-	private class JSPFileVisitor implements IResourceProxyVisitor {
-	    private List files = new ArrayList(); 
-		
-		// monitor from the Job
-		IProgressMonitor fInnerMonitor = null;
-		public JSPFileVisitor(IProgressMonitor monitor) {
-			this.fInnerMonitor = monitor;
-		}
-		
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			
-			// check job canceled
-			if ((this.fInnerMonitor != null) && this.fInnerMonitor.isCanceled()) {
-				setCanceledState();
-				return false;
-			}
-			
-			// check search support canceled
-			if(JsSearchSupport.getInstance().isCanceled()) {
-				setCanceledState();
-				return false;
-			}
-			
-			if (proxy.getType() == IResource.FILE) {
-				
-				// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3553
-				// check this before description
-				// check name before actually getting the file (less work)
-				if(Util.isJsType(proxy.getName())) {
-					IFile file = (IFile) proxy.requestResource();
-					if(file.exists()) {
-						
-						if(DEBUG) {
-							System.out.println("(+) IndexWorkspaceJob adding file: " + file.getName()); //$NON-NLS-1$
-						}
-						// this call will check the ContentTypeDescription, so don't need to do it here.
-						//JSPSearchSupport.getInstance().addJspFile(file);
-						this.files.add(file);
-						this.fInnerMonitor.subTask(proxy.getName());
-						
-						// don't search deeper for files
-						return false;
-					}
-				}
-			}
-			return true;
-		}
-		
-		public final IFile[] getFiles() {
-		    return (IFile[])this.files.toArray(new IFile[this.files.size()]);
-		}
-	}
-	
-	//private IContentType fContentTypeJSP = null;
-	
-	public IndexWorkspaceJob() {
-		// pa_TODO may want to say something like "Rebuilding JSP Index" to be more
-		// descriptive instead of "Updating JSP Index" since they are 2 different things
-		super(JsCoreMessages.JSPIndexManager_0);
-		setPriority(Job.LONG);
-		setSystem(true);
-	}
-
-//	IContentType getJspContentType() {
-//		if(this.fContentTypeJSP == null)
-//			this.fContentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeID_JSP);
-//		return this.fContentTypeJSP;
-//	}
-	
-	/**
-	 * @see org eclipse.core.internal.jobs.InternalJob#run(org.eclipse.core.runtime.IProgressMonitor) 
-	 * for similar method
-	 */
-	protected IStatus run(IProgressMonitor monitor) {
-		
-		IStatus status = Status.OK_STATUS;
-		
-		if(monitor.isCanceled()) {
-			setCanceledState();
-			return Status.CANCEL_STATUS;
-		}
-		
-		if(DEBUG) {
-			System.out.println(" ^ IndexWorkspaceJob started: "); //$NON-NLS-1$
-		}
-		
-		long start = System.currentTimeMillis();
-		
-		try {
-		    JSPFileVisitor visitor = new JSPFileVisitor(monitor);
-		    // collect all jsp files
-			ResourcesPlugin.getWorkspace().getRoot().accept(visitor, IResource.DEPTH_INFINITE);
-			// request indexing
-			// this is pretty much like faking an entire workspace resource delta
-			JsIndexManager.getInstance().indexFiles(visitor.getFiles());
-		}
-		catch (CoreException e) {
-			if(DEBUG) {
-				e.printStackTrace();
-			}
-		}
-		finally {
-			monitor.done();
-		}
-		long finish = System.currentTimeMillis();
-		if(DEBUG) {
-			System.out.println(" ^ IndexWorkspaceJob finished\n   total time running: " + (finish - start)); //$NON-NLS-1$
-		}
-		
-		return status;
-	}
-	
-	void setCanceledState() {
-		JsIndexManager.getInstance().setIndexState(JsIndexManager.S_CANCELED);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JSDTSearchDocumentDelegate.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JSDTSearchDocumentDelegate.java
deleted file mode 100644
index 0862b4b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JSDTSearchDocumentDelegate.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.internal.core.search.JavaSearchDocument;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*(copied from JSP)
- * Wrapper method to set getPath() path to be the path of the compilation unit 
- * for the jsp file. (since it's a final method, it needs to be set via constructor)
- * 
- * @author pavery
- */
-public class JSDTSearchDocumentDelegate extends JavaSearchDocument {
-	
-	private JsSearchDocument fJSPSearchDoc = null;
-	
-	public JSDTSearchDocumentDelegate(JsSearchDocument jspSearchDoc) {
-		
-		super(jspSearchDoc.getPath(), jspSearchDoc.getParticipant());
-		this.fJSPSearchDoc = jspSearchDoc;
-	}
-
-	public byte[] getByteContents() {
-		
-		return this.fJSPSearchDoc.getByteContents();
-	}
-
-	public char[] getCharContents() {
-		
-		return this.fJSPSearchDoc.getCharContents();
-	}
-	
-	public String getJavaText() {
-		return this.fJSPSearchDoc.getJavaText();
-	}
-
-	public String getEncoding() {
-		
-		return this.fJSPSearchDoc.getEncoding();
-	}
-	
-	public IFile getFile() {
-		
-		return this.fJSPSearchDoc.getFile();
-	}
-	
-	public IJsTranslation getJspTranslation() {
-		
-		return this.fJSPSearchDoc.getJSTranslation();
-	}
-	
-//	public int getJspOffset(int javaOffset) {
-//		
-//		return this.fJSPSearchDoc.getJspOffset(javaOffset);
-//	}
-	
-	public void release() {
-		this.fJSPSearchDoc.release();
-	}
-	public IJavaScriptElement getJavaElement() {
-		return getJspTranslation().getCompilationUnit();
-	}
-	public boolean isVirtual() {
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsIndexManager.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsIndexManager.java
deleted file mode 100644
index 11b1149..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsIndexManager.java
+++ /dev/null
@@ -1,775 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
-import org.eclipse.wst.jsdt.internal.core.index.Index;
-import org.eclipse.wst.jsdt.internal.core.search.indexing.IndexManager;
-import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-import org.osgi.framework.Bundle;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*(copied from JSP)
- * Responsible for keeping the JSP index up to date.
- * 
- * @author pavery
- */
-public class JsIndexManager {
-
-	// for debugging
-	// TODO move this to Logger, as we have in SSE
-	static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsindexmanager"); //$NON-NLS-1$
- 		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-
-	private static final String PKEY_INDEX_STATE = "jspIndexState"; //$NON-NLS-1$
-
-	private IndexWorkspaceJob indexingJob = new IndexWorkspaceJob();
-
-
-
-	// TODO: consider enumeration for these int constants
-	// set to S_UPDATING once a resource change comes in
-	// set to S_STABLE if:
-	// - we know we aren't interested in the resource change
-	// - or the ProcessFilesJob completes
-	// set to S_CANCELED if an indexing job is canceled
-	// set to S_REBUILDING if re-indexing the entire workspace
-
-	// the int '0' is reserved for the default value if a preference is not
-	// there
-	/** index is reliable to use */
-	public static final int S_STABLE = 1;
-	/** index is being updated (from a resource delta) */
-	public static final int S_UPDATING = 2;
-	/** entire index is being rebuilt */
-	public static final int S_REBUILDING = 3;
-	/**
-	 * indexing job was canceled in the middle of it, index needs to be
-	 * rebuilt
-	 */
-	public static final int S_CANCELED = 4;
-
-	/** symbolic name for OSGI framework */
-	private final String OSGI_FRAMEWORK_ID = "org.eclipse.osgi"; //$NON-NLS-1$
-
-	/**
-	 * Collects JSP files from a resource delta.
-	 */
-	private class JSPResourceVisitor implements IResourceDeltaVisitor {
-		// using hash map ensures only one of each file
-		// must be reset before every use
-		private HashMap jspFiles = null;
-
-		public JSPResourceVisitor() {
-			this.jspFiles = new HashMap();
-		}
-
-		public boolean visit(IResourceDelta delta) throws CoreException {
-
-			// in case JSP search was canceled (eg. when closing the editor)
-			if (JsSearchSupport.getInstance().isCanceled() || frameworkIsShuttingDown()) {
-				setCanceledState();
-				return false;
-			}
-
-			try {
-				if (!isHiddenResource(delta.getFullPath())) {
-
-					int kind = delta.getKind();
-					boolean added = (kind & IResourceDelta.ADDED) == IResourceDelta.ADDED;
-					boolean isInterestingChange = false;
-					if ((kind & IResourceDelta.CHANGED) == IResourceDelta.CHANGED) {
-						int flags = delta.getFlags();
-						// ignore things like marker changes
-						isInterestingChange = ((flags & IResourceDelta.CONTENT) == IResourceDelta.CONTENT) || ((flags & IResourceDelta.REPLACED) == IResourceDelta.REPLACED);
-					}
-					boolean removed = (kind & IResourceDelta.REMOVED) == IResourceDelta.REMOVED;
-					if (added || isInterestingChange) {
-
-						visitAdded(delta);
-					}
-					else if (removed) {
-						visitRemoved(delta);
-					}
-				}
-			}
-			catch (Exception e) {
-				// need to set state here somehow, and reindex
-				// otherwise index will be unreliable
-				if (DEBUG) {
-					Logger.logException("Delta analysis may not be complete", e); //$NON-NLS-1$
-				}
-			}
-			// if the delta has children, continue to add/remove files
-			return true;
-		}
-
-		private void visitRemoved(IResourceDelta delta) {
-			// handle cleanup
-			if (delta.getResource() != null) {
-				IResource r = delta.getResource();
-				if ((r.getType() == IResource.FOLDER) && r.exists()) {
-					deleteIndex((IFile) r);
-				}
-			}
-		}
-
-		private void visitAdded(IResourceDelta delta) {
-			// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3553
-			// quick check if it's even JSP related to improve
-			// performance
-			// checking name from the delta before getting
-			// resource because it's lighter
-			String filename = delta.getFullPath().lastSegment();
-			if ((filename != null) && Util.isJsType(filename)) {
-				IResource r = delta.getResource();
-				if ((r != null) && r.exists() && (r.getType() == IResource.FILE)) {
-					this.jspFiles.put(r.getFullPath(), r);
-				}
-			}
-		}
-
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=93463
-		private boolean isHiddenResource(IPath p) {
-			String[] segments = p.segments();
-			for (int i = 0; i < segments.length; i++) {
-				if (segments[i].startsWith(".")) {
-					return true;
-				}
-			}
-			return false;
-		}
-
-		private void deleteIndex(IFile folder) {
-			// cleanup index
-			IndexManager im = JavaModelManager.getJavaModelManager().getIndexManager();
-			IPath folderPath = folder.getFullPath();
-			IPath indexLocation = JsSearchSupport.getInstance().computeIndexLocation(folderPath);
-			im.removeIndex(indexLocation);
-			// im.indexLocations.removeKey(folderPath);
-			// im.indexLocations.removeValue(indexLocation);
-			File f = indexLocation.toFile();
-			f.delete();
-		}
-
-		public IFile[] getFiles() {
-			return (IFile[]) this.jspFiles.values().toArray(new IFile[this.jspFiles.size()]);
-		}
-
-		public void reset() {
-			this.jspFiles.clear();
-		}
-	}
-
-	// end class JSPResourceVisitor
-
-	/**
-	 * schedules JSP files for indexing by Java core
-	 */
-	private class ProcessFilesJob extends Job {
-		List fileList = null;
-		// keep track of how many files we've indexed
-		int lastFileCursor = 0;
-
-		ProcessFilesJob(String taskName) {
-			super(taskName);
-			fileList = new ArrayList();
-		}
-
-		synchronized void process(IFile[] files) {
-			for (int i = 0; i < files.length; i++) {
-				fileList.add(files[i]);
-			}
-			if (DEBUG) {
-				System.out.println("JSPIndexManager queuing " + files.length + " files"); //$NON-NLS-2$ //$NON-NLS-1$
-			}
-		}
-
-		synchronized IFile[] getFiles() {
-			return (IFile[]) fileList.toArray(new IFile[fileList.size()]);
-		}
-
-		synchronized void clearFiles() {
-			fileList.clear();
-			lastFileCursor = 0;
-			//System.out.println("cleared files");
-		}
-
-		protected IStatus run(IProgressMonitor monitor) {
-			// System.out.println("indexer monitor" + monitor);
-			if (isCanceled(monitor) || frameworkIsShuttingDown()) {
-				setCanceledState();
-				return Status.CANCEL_STATUS;
-			}
-
-			long start = System.currentTimeMillis();
-
-			try {
-				IFile[] filesToBeProcessed = getFiles();
-
-				if (DEBUG) {
-					System.out.println("JSPIndexManager indexing " + filesToBeProcessed.length + " files"); //$NON-NLS-2$ //$NON-NLS-1$
-				}
-				// API indicates that monitor is never null
-				monitor.beginTask("", filesToBeProcessed.length); //$NON-NLS-1$
-				JsSearchSupport ss = JsSearchSupport.getInstance();
-				String processingNFiles = ""; //$NON-NLS-1$
-
-
-				for (;lastFileCursor < filesToBeProcessed.length; lastFileCursor++) {
-
-					if (isCanceled(monitor) || frameworkIsShuttingDown()) {
-						setCanceledState();
-						return Status.CANCEL_STATUS;
-					}
-					IFile file = filesToBeProcessed[lastFileCursor];
-					try {
-						IJavaScriptProject project = JavaScriptCore.create(file.getProject());
-						if (project.exists()) {
-							ss.addJspFile(file);
-							// JSP Indexer processing n files
-							processingNFiles = NLS.bind(JsCoreMessages.JSPIndexManager_2, new String[]{Integer.toString((filesToBeProcessed.length - lastFileCursor))});
-							monitor.subTask(processingNFiles + " - " + file.getName()); //$NON-NLS-1$
-							monitor.worked(1);
-
-							if (DEBUG) {
-								System.out.println("JSPIndexManager Job added file: " + file.getName()); //$NON-NLS-1$
-							}
-						}
-					}
-					catch (Exception e) {
-						// RATLC00284776
-						// ISSUE: we probably shouldn't be catching EVERY
-						// exception, but
-						// the framework only allows to return IStatus in
-						// order to communicate
-						// that something went wrong, which means the loop
-						// won't complete, and we would hit the same problem
-						// the next time.
-						// 
-						// a possible solution is to keep track of the
-						// exceptions logged
-						// and only log a certain amt of the same one,
-						// otherwise skip it.
-						if (!frameworkIsShuttingDown()) {
-							String filename = file != null ? file.getFullPath().toString() : ""; //$NON-NLS-1$
-							Logger.logException("JSPIndexer problem indexing:" + filename, e); //$NON-NLS-1$
-						}
-					}
-				} // end for
-			}
-			finally {
-				// just in case something didn't follow API (monitor is null)
-				if (monitor != null) {
-					monitor.done();
-				}
-			}
-
-			// successfully finished, clear files list
-			clearFiles();
-			
-			long finish = System.currentTimeMillis();
-			long diff = finish - start;
-			if (DEBUG) {
-				fTotalTime += diff;
-				System.out.println("============================================================================"); //$NON-NLS-1$
-				System.out.println("this time: " + diff + " cumulative time for resource changed: " + fTotalTime); //$NON-NLS-1$ //$NON-NLS-2$
-				System.out.println("============================================================================"); //$NON-NLS-1$
-			}
-			return Status.OK_STATUS;
-		}
-
-		private boolean isCanceled(IProgressMonitor runMonitor) {
-
-			boolean canceled = false;
-			// check specific monitor passed into run method (the progress
-			// group in this case)
-			// check main search support canceled
-			if ((runMonitor != null) && runMonitor.isCanceled()) {
-				canceled = true;
-			} else if (JsSearchSupport.getInstance().isCanceled()) {
-				canceled = true;
-				if (runMonitor != null) {
-					runMonitor.setCanceled(true);
-				}
-			}
-			return canceled;
-		}
-		
-	}
-
-	// end class ProcessFilesJob
-
-	private static JsIndexManager fSingleton = null;
-	private boolean initialized;
-	private boolean initializing = true;
-
-	private IndexJobCoordinator indexJobCoordinator;
-	private IResourceChangeListener jspResourceChangeListener;
-
-	private JSPResourceVisitor fVisitor = null;
-	static long fTotalTime = 0;
-
-	// Job for processing resource delta
-	private ProcessFilesJob processFilesJob = null;
-
-	private JsIndexManager() {
-		processFilesJob = new ProcessFilesJob(JsCoreMessages.JSPIndexManager_0);
-		// only show in verbose mode
-		processFilesJob.setSystem(true);
-		processFilesJob.setPriority(Job.LONG);
-		processFilesJob.addJobChangeListener(new JobChangeAdapter() {
-			public void done(IJobChangeEvent event) {
-				super.done(event);
-				setStableState();
-			}
-		});
-	}
-
-	public synchronized static JsIndexManager getInstance() {
-
-		if (fSingleton == null) {
-			fSingleton = new JsIndexManager();
-		}
-		return fSingleton;
-	}
-
-	public void initialize() {
-
-		JsIndexManager singleInstance = getInstance();
-
-
-		if (!singleInstance.initialized) {
-			singleInstance.initialized = true;
-
-			singleInstance.indexJobCoordinator = new IndexJobCoordinator();
-			singleInstance.jspResourceChangeListener = new JSPResourceChangeListener();
-
-			// added as JobChange listener so JSPIndexManager can be smarter
-			// about when it runs
-			Platform.getJobManager().addJobChangeListener(singleInstance.indexJobCoordinator);
-
-			// add JSPIndexManager to keep JSP Index up to date
-			// listening for IResourceChangeEvent.PRE_DELETE and
-			// IResourceChangeEvent.POST_CHANGE
-			ResourcesPlugin.getWorkspace().addResourceChangeListener(jspResourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-
-			// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5091
-			// makes sure IndexManager is aware of our indexes
-			saveIndexes();
-			//rebuildIndexIfNeeded();
-			singleInstance.initializing = false;
-
-		}
-
-	}
-	
-	synchronized void setIndexState(int state) {
-		if (DEBUG) {
-			System.out.println("JSPIndexManager setting index state to: " + state2String(state)); //$NON-NLS-1$
-		}
-		Plugin jspModelPlugin = JsCorePlugin.getDefault();
-		jspModelPlugin.getPluginPreferences().setValue(PKEY_INDEX_STATE, state);
-		jspModelPlugin.savePluginPreferences();
-
-	}
-
-	private String state2String(int state) {
-		String s = "UNKNOWN"; //$NON-NLS-1$
-		switch (state) {
-			case (S_STABLE) :
-				s = "S_STABLE"; //$NON-NLS-1$
-				break;
-			case (S_UPDATING) :
-				s = "S_UPDATING"; //$NON-NLS-1$
-				break;
-			case (S_CANCELED) :
-				s = "S_CANCELED"; //$NON-NLS-1$
-				break;
-			case (S_REBUILDING) :
-				s = "S_REBUILDING"; //$NON-NLS-1$
-				break;
-		}
-		return s;
-	}
-
-	int getIndexState() {
-		return JsCorePlugin.getDefault().getPluginPreferences().getInt(PKEY_INDEX_STATE);
-	}
-
-	void setUpdatingState() {
-		//if (getIndexState() != S_CANCELED)
-		setIndexState(S_UPDATING);
-	}
-
-	void setCanceledState() {
-		setIndexState(JsIndexManager.S_CANCELED);
-	}
-
-	void setStableState() {
-		//if (getIndexState() != S_CANCELED)
-		setIndexState(S_STABLE);
-	}
-
-	void setRebuildingState() {
-		setIndexState(S_REBUILDING);
-	}
-
-	synchronized void rebuildIndexIfNeeded() {
-		if (getIndexState() != S_STABLE) {
-			rebuildIndex();
-		}
-	}
-
-	void rebuildIndex() {
-
-		if (DEBUG) {
-			System.out.println("*** JSP Index unstable, requesting re-indexing"); //$NON-NLS-1$
-		}
-
-		getIndexingJob().addJobChangeListener(new JobChangeAdapter() {
-			public void aboutToRun(IJobChangeEvent event) {
-				super.aboutToRun(event);
-				setRebuildingState();
-			}
-
-			public void done(IJobChangeEvent event) {
-				super.done(event);
-				setStableState();
-				getIndexingJob().removeJobChangeListener(this);
-			}
-		});
-		// we're about to reindex everything anyway
-		getProcessFilesJob().clearFiles();
-		getIndexingJob().schedule();
-
-	}
-
-	/**
-	 * Creates and schedules a Job to process collected files. All JSP
-	 * indexing should be done through this method or processFiles(IFile file)
-	 * 
-	 * @param files
-	 */
-	final void indexFiles(IFile[] files) {
-		// don't use this rule
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=4931
-		// processFiles.setRule(new IndexFileRule());
-		processFilesJob.process(files);
-	}
-
-
-	/**
-	 * Package protected for access by inner Job class in resourceChanged(...)
-	 * 
-	 * @return
-	 */
-	JSPResourceVisitor getVisitor() {
-
-		if (this.fVisitor == null) {
-			this.fVisitor = new JSPResourceVisitor();
-		}
-		return this.fVisitor;
-	}
-	void saveIndexes() {
-		IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
-		IProject[] allProjects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		for (int j = 0; j < allProjects.length; j++) {
-			if (!JsWebNature.hasNature(allProjects[j]) || !allProjects[j].isOpen()) {
-				continue;
-			}
-			IPath jspModelWorkingLocation = JsSearchSupport.getInstance().getModelJspPluginWorkingLocation(allProjects[j]);
-			File folder = new File(jspModelWorkingLocation.toOSString());
-			String[] files = folder.list();
-			String locay = ""; //$NON-NLS-1$
-			try {
-				for (int i = 0; i < files.length; i++) {
-					if (files[i].toLowerCase().endsWith(".index")) { //$NON-NLS-1$
-						locay = jspModelWorkingLocation.toString() + "/" + files[i]; //$NON-NLS-1$
-						// reuse index file
-// index = new Index(locay, allProjects[j].getFullPath().toOSString(), true);
-// //$NON-NLS-1$
-// index.save();
-						indexManager.getIndex(allProjects[j].getFullPath(), new Path(locay), true, false);
-						// indexManager.saveIndex(index);
-					}
-				}
-			} catch (Exception e) {
-				// we should be shutting down, want to shut down quietly
-				if (JsIndexManager.DEBUG) {
-					e.printStackTrace();
-				}
-			}
-		}
-	}
-	// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5091
-	// makes sure IndexManager is aware of our indexes
-	void saveIndexesORIGINAL() {
-		IndexManager indexManager = JavaModelManager.getJavaModelManager().getIndexManager();
-		IPath jspModelWorkingLocation = JsSearchSupport.getInstance().getModelJspPluginWorkingLocation();
-
-		File folder = new File(jspModelWorkingLocation.toOSString());
-		String[] files = folder.list();
-		String locay = ""; //$NON-NLS-1$
-		Index index = null;
-		try {
-			for (int i = 0; i < files.length; i++) {
-				if (files[i].toLowerCase().endsWith(".index")) { //$NON-NLS-1$
-					locay = jspModelWorkingLocation.toString() + "/" + files[i]; //$NON-NLS-1$
-					// reuse index file
-					index = new Index(locay, "Index for " + locay, true); //$NON-NLS-1$
-					indexManager.saveIndex(index);
-				}
-			}
-		}
-		catch (Exception e) {
-			// we should be shutting down, want to shut down quietly
-			if (DEBUG) {
-				e.printStackTrace();
-			}
-		}
-	}
-
-//	IContentType getJspContentType() {
-//		if (this.fContentTypeJSP == null)
-//			this.fContentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeID_JSP);
-//		return this.fContentTypeJSP;
-//	}
-
-	/**
-	 * A check to see if the OSGI framework is shutting down.
-	 * 
-	 * @return true if the System Bundle is stopped (ie. the framework is
-	 *         shutting down)
-	 */
-	boolean frameworkIsShuttingDown() {
-		// in the Framework class there's a note:
-		// set the state of the System Bundle to STOPPING.
-		// this must be done first according to section 4.19.2 from the OSGi
-		// R3 spec.
-		boolean shuttingDown = Platform.getBundle(OSGI_FRAMEWORK_ID).getState() == Bundle.STOPPING;
-		if (DEBUG && shuttingDown) {
-			System.out.println("JSPIndexManager: system is shutting down!"); //$NON-NLS-1$
-		}
-		return shuttingDown;
-	}
-
-
-	public void shutdown() {
-
-		// stop listening
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(jspResourceChangeListener);
-
-
-		// stop any searching
-		JsSearchSupport.getInstance().setCanceled(true);
-
-		// stop listening to jobs
-		Platform.getJobManager().removeJobChangeListener(indexJobCoordinator);
-
-
-		int maxwait = 5000;
-		if (processFilesJob != null) {
-			processFilesJob.cancel();
-		}
-		// attempt to make sure this indexing job is litterally
-		// done before continuing, since we are shutting down
-		waitTillNotRunning(maxwait, processFilesJob);
-
-		if (indexingJob != null) {
-			indexingJob.cancel();
-		}
-		waitTillNotRunning(maxwait, processFilesJob);
-	}
-
-	private void waitTillNotRunning(int maxSeconds, Job job) {
-		int pauseTime = 10;
-		int maxtries = maxSeconds / pauseTime;
-		int count = 0;
-		while ((count++ < maxtries) && (job.getState() == Job.RUNNING)) {
-			try {
-				Thread.sleep(pauseTime);
-				// System.out.println("count: " + count + " max: " +
-				// maxtries);
-			}
-			catch (InterruptedException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-
-	private class IndexJobCoordinator extends JobChangeAdapter {
-		
-		public void aboutToRun(IJobChangeEvent event) {
-			Job jobToCoordinate = event.getJob();
-			if (isJobToAvoid(jobToCoordinate)) {
-				// job will be rescheduled when the job we
-				// are avoiding (eg. build) is done
-				getProcessFilesJob().cancel();
-				//System.out.println("cancel:" + jobToCoordinate.getName());
-			}
-		}
-
-		public void done(IJobChangeEvent event) {
-
-			Job jobToCoordinate = event.getJob();
-			if (isJobToAvoid(jobToCoordinate)) {
-				if (getProcessFilesJob().getFiles().length > 0) {
-					getProcessFilesJob().schedule(500);
-					//System.out.println("schedule:" + jobToCoordinate.getName());
-				}
-					
-
-			}
-		}
-
-		private boolean isJobToAvoid(Job jobToCoordinate) {
-			boolean result = false;
-			if (jobToCoordinate.belongsTo(ResourcesPlugin.FAMILY_AUTO_BUILD) || jobToCoordinate.belongsTo(ResourcesPlugin.FAMILY_MANUAL_BUILD) || jobToCoordinate.belongsTo(ResourcesPlugin.FAMILY_AUTO_REFRESH)) {
-				result = true;
-			}
-			return result;
-
-		}
-
-	}
-
-	private class JSPResourceChangeListener implements IResourceChangeListener {
-
-
-		/**
-		 * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-		 */
-		public void resourceChanged(IResourceChangeEvent event) {
-
-			if (isInitializing()) {
-				return;
-			}
-
-			// ignore resource changes if already rebuilding
-			if (getIndexState() == S_REBUILDING) {
-				return;
-			}
-			// previously canceled, needs entire index rebuild
-			if (getIndexState() == S_CANCELED) {
-				// rebuildIndex();
-				// just resume indexing
-				getProcessFilesJob().schedule(500);
-				//System.out.println("schedule: resource changed, previously canceled");
-				return;
-			}
-
-			IResourceDelta delta = event.getDelta();
-			if (delta != null) {
-				// only care about adds or changes right now...
-				int kind = delta.getKind();
-				boolean added = (kind & IResourceDelta.ADDED) == IResourceDelta.ADDED;
-				boolean changed = (kind & IResourceDelta.CHANGED) == IResourceDelta.CHANGED;
-				if (added || changed) {
-
-					// only analyze the full (starting at root) delta
-					// hierarchy
-					if (delta.getFullPath().toString().equals("/")) { //$NON-NLS-1$
-						try {
-							JSPResourceVisitor v = getVisitor();
-							// clear from last run
-							v.reset();
-							// count files, possibly do this in a job too...
-							// don't include PHANTOM resources
-							delta.accept(v, false);
-
-							// process files from this delta
-							IFile[] files = v.getFiles();
-							if (files.length > 0) {
-								/*
-								 * Job change listener should set back to
-								 * stable when finished
-								 */
-								setUpdatingState();
-								// processFiles(files);
-								indexFiles(files);
-							}
-						}
-						catch (CoreException e) {
-							// need to set state here somehow, and reindex
-							// otherwise index will be unreliable
-							if (DEBUG) {
-								Logger.logException(e);
-							}
-						}
-						catch (Exception e) {
-							// need to set state here somehow, and reindex
-							// otherwise index will be unreliable
-							if (DEBUG) {
-								Logger.logException(e);
-							}
-						}
-					}
-				}
-
-			}
-		}
-
-	}
-
-	IndexWorkspaceJob getIndexingJob() {
-		return indexingJob;
-	}
-
-	ProcessFilesJob getProcessFilesJob() {
-		return processFilesJob;
-	}
-
-	boolean isInitializing() {
-		return initializing;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsPathIndexer.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsPathIndexer.java
deleted file mode 100644
index b1ebaad..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsPathIndexer.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*(copied from JSP)
- * pa_TODO Still need to take into consideration:
- * 	- focus in workspace
- *  - search pattern
- * 
- * @author pavery
- */
-public class JsPathIndexer {
-
-	// for debugging
-	static final boolean DEBUG;
-	static {
-		
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jssearch"); //$NON-NLS-1$
- 		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-
-	}
-	
-	// visitor that retrieves jsp project paths for all jsp files in the workspace
-	class JSPFileVisitor implements IResourceProxyVisitor {
-		// hash map forces only one of each file
-		private HashMap fPaths = new HashMap();
-		IJavaScriptSearchScope fScope = null;
-		SearchPattern fPattern = null;
-
-		public JSPFileVisitor(SearchPattern pattern, IJavaScriptSearchScope scope) {
-			this.fPattern = pattern;
-			this.fScope = scope;
-		}
-
-		public boolean visit(IResourceProxy proxy) throws CoreException {
-			
-			if(JsSearchSupport.getInstance().isCanceled()) {
-				return false;
-			}
-			
-			if (proxy.getType() == IResource.FILE) {
-
-				//IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeID_JSP);
-				// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3553
-				// check this before description
-				// check name before actually getting the file (less work)
-				//if(contentTypeJSP.isAssociatedWith(proxy.getName())) {
-				if(Util.isJsType(proxy.getName())){	
-					IFile file = (IFile)proxy.requestResource();
-					//IContentDescription contentDescription = file.getContentDescription();
-					//String ctId = null;
-//					if (contentDescription != null) {
-//						ctId = contentDescription.getContentType().getId();
-//					}
-					//if (ContentTypeIdForJSP.ContentTypeID_JSP.equals(ctId)) {
-					//if(Util.isJsType(file.getName())){
-						if (this.fScope.encloses(proxy.requestFullPath().toString())) {
-	
-							if (DEBUG) {
-								System.out.println("adding selected index path:" + file.getParent().getFullPath()); //$NON-NLS-1$
-							}
-
-							fPaths.put(file.getParent().getFullPath(), JsSearchSupport.getInstance().computeIndexLocation(file.getParent().getFullPath()));
-						}
-					//}
-				}
-				// don't search deeper for files
-				return false;
-			}
-			return true;
-		}
-
-		public IPath[] getPaths() {
-			return (IPath[]) fPaths.values().toArray(new IPath[fPaths.size()]);
-		}
-	}
-
-	public IPath[] getVisibleJspPaths(SearchPattern pattern, IJavaScriptSearchScope scope) {
-
-		JSPFileVisitor jspFileVisitor = new JSPFileVisitor(pattern, scope);
-		try {
-			ResourcesPlugin.getWorkspace().getRoot().accept(jspFileVisitor, 0);
-		}
-		catch (CoreException e) {
-			e.printStackTrace();
-		}
-		return jspFileVisitor.getPaths();
-	}
-}
-
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchDocument.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchDocument.java
deleted file mode 100644
index ce87bb1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchDocument.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.jsdt.core.search.SearchParticipant;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapterFactory;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.exceptions.UnsupportedCharsetExceptionWithDetail;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*(copied from JSP)
- * Created with a .jsp file, but should appear to be a .java file for indexing
- * and searching purposes. There are purposely few fields in this class, and
- * those fields are lightweight since it's possible for many JSP search
- * documents to exist in memory at one time (eg. after importing a project
- * with a large number of JSP files)
- * 
- * @author pavery
- */
-public class JsSearchDocument {
-
-	private String UNKNOWN_PATH = "**path unknown**"; //$NON-NLS-1$
-	private String fJSPPathString = UNKNOWN_PATH;
-	private String fCUPath = UNKNOWN_PATH;
-	private SearchParticipant fParticipant = null;
-	private long fLastModifiedStamp;
-	private char[] fCachedCharContents;
-	
-	/**
-	 * @param file
-	 * @param participant
-	 * @throws CoreException
-	 */
-	public JsSearchDocument(String filePath, SearchParticipant participant) {
-
-		this.fJSPPathString = filePath;
-		this.fParticipant = participant;
-	}
-
-	public SearchParticipant getParticipant() {
-		return this.fParticipant;
-	}
-
-	/**
-	 * @see org.eclipse.jdt.core.search.SearchDocument#getCharContents()
-	 */
-	public char[] getCharContents() {
-		
-		if((fCachedCharContents == null) || isDirty()) {
-		    IJsTranslation trans = getJSTranslation();    
-		    fCachedCharContents = trans != null ? trans.getJsText().toCharArray() : new char[0];
-		    fCUPath = trans.getJavaPath();
-		}
-		return fCachedCharContents;
-	}
-
-	public String getJavaText() {
-		return new String(getCharContents());
-	}
-
-	private IModelManager getModelManager() {
-		return StructuredModelManager.getModelManager();
-	}
-
-	/**
-	 * It's not recommended for clients to hold on to this JSPTranslation
-	 * since it's kind of large. If possible, hold on to the
-	 * JSPSearchDocument, which is more of a lightweight proxy.
-	 * 
-	 * @return the JSPTranslation for the jsp file, or null if it's an
-	 *         unsupported file.
-	 */
-	public final IJsTranslation getJSTranslation() {
-		IJsTranslation translation = null;
-		IFile jspFile = getFile();
-		if (!JsSearchSupport.isJsp(jspFile)) {
-			return translation;
-		}
-
-		IStructuredModel model = null;
-		try {
-			// get existing model for read, then get document from it
-			IModelManager modelManager = getModelManager();
-			if (modelManager != null) {
-				jspFile.refreshLocal(IResource.DEPTH_ZERO, new NullProgressMonitor());
-				model = modelManager.getModelForRead(jspFile);
-			}
-			// handle unsupported
-			if (model instanceof IDOMModel) {
-				IDOMModel xmlModel = (IDOMModel)model;
-				setupAdapterFactory(xmlModel);
-				IDOMDocument doc = xmlModel.getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) doc.getAdapterFor(IJsTranslation.class);
-				translation = adapter.getJsTranslation(false);
-			}
-		}
-		catch (IOException e) {
-			Logger.logException(e);
-		}
-		catch (CoreException e) {
-			Logger.logException(e);
-		}
-		catch (UnsupportedCharsetExceptionWithDetail e) {
-			// no need to log this. Just consider it an invalid file for our
-			// purposes.
-			// Logger.logException(e);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-		return translation;
-	}
-
-	/**
-	 * add the factory for JSPTranslationAdapter here
-	 * 
-	 * @param sm
-	 */
-	private void setupAdapterFactory(IStructuredModel sm) {
-		JsTranslationAdapterFactory.setupAdapterFactory(sm);
-	}
-
-	/**
-	 * the path to the Java compilation unit
-	 * 
-	 * @see org.eclipse.jdt.core.search.SearchDocument#getPath()
-	 */
-	public String getPath() {
-	    // caching the path since it's expensive to get translation
-		// important that isDirty() check is second to cache modification stamp
-	    if((this.fCUPath == null) || isDirty() || (this.fCUPath == UNKNOWN_PATH)) {
-	        IJsTranslation trans = getJSTranslation();
-	        if(trans != null) {
-	            this.fCUPath = trans.getJavaPath();
-	            // save since it's expensive to calculate again later
-	            fCachedCharContents = trans.getJsText().toCharArray();
-	        }
-	    }
-		return fCUPath != null ? fCUPath : UNKNOWN_PATH;
-	}
-
-//	public int getJspOffset(int javaOffset) {
-//		// copied from JSPTranslation
-//		int result = -1;
-//		int offsetInRange = 0;
-//		Position jspPos, javaPos = null;
-//		IJsTranslation trans = getJSPTranslation();
-//		if (trans != null) {
-//			HashMap java2jspMap = trans.getJava2JspMap();
-//
-//			// iterate all mapped java ranges
-//			Iterator it = java2jspMap.keySet().iterator();
-//			while (it.hasNext()) {
-//				javaPos = (Position) it.next();
-//				// need to count the last position as included
-//				if (!javaPos.includes(javaOffset) && !(javaPos.offset + javaPos.length == javaOffset))
-//					continue;
-//
-//				offsetInRange = javaOffset - javaPos.offset;
-//				jspPos = (Position) java2jspMap.get(javaPos);
-//
-//				if (jspPos != null)
-//					result = jspPos.offset + offsetInRange;
-//				else {
-//					Logger.log(Logger.ERROR, "jspPosition was null!" + javaOffset); //$NON-NLS-1$
-//				}
-//				break;
-//			}
-//		}
-//		return result;
-//	}
-
-	public IFile getFile() {
-		IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-		IPath jspPath = new Path(this.fJSPPathString);
-		IFile jspFile = root.getFile(jspPath);
-		if (!jspFile.exists()) {
-			// possibly outside workspace
-			jspFile = root.getFileForLocation(jspPath);
-		}
-		return jspFile;
-	}
-
-	
-	private boolean isDirty() {
-		boolean modified = false;
-		IFile f = getFile();
-		if(f != null) {
-			long currentStamp = f.getModificationStamp();
-			if(currentStamp != fLastModifiedStamp) {
-				modified = true;
-			}
-			fLastModifiedStamp = currentStamp;
-		}
-		return modified;
-	}
-	
-	public void release() {
-		// nothing to do now since JSPTranslation is created on the fly
-	}
-
-	/**
-	 * for debugging
-	 */
-	public String toString() {
-		return "[JSPSearchDocument:" + this.fJSPPathString + "]"; //$NON-NLS-1$ //$NON-NLS-2$ 
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.core.search.SearchDocument#getEncoding()
-	 */
-	public String getEncoding() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.core.search.SearchDocument#getByteContents()
-	 */
-	public byte[] getByteContents() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchParticipant.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchParticipant.java
deleted file mode 100644
index 88ac3a1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchParticipant.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchEngine;
-import org.eclipse.wst.jsdt.core.search.SearchParticipant;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*(copied from JSP)
- * Integration of JSP w/ java search.
- * 
- * @author pavery
- */
-public class JsSearchParticipant extends SearchParticipant {
-
-	// for debugging
-	private static final boolean DEBUG = calculateValue();
-
-	private static boolean calculateValue() {
-		String value = Platform.getDebugOption("org.eclipse.jst.jsp.core/debug/jspsearch"); //$NON-NLS-1$
-		boolean debug = (value != null) && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-		return debug;
-	}
-
-	/**
-	 * Important to never return null here or else Java search participation
-	 * will break.
-	 */
-	public SearchDocument getDocument(String documentPath) {
-		SearchDocument sDoc = JsSearchSupport.getInstance().getSearchDocument(documentPath);
-
-		if (sDoc == null) {
-			// return a dummy doc here so search participation doesn't break
-			return new NullSearchDocument(documentPath);
-		}
-		return sDoc;
-	}
-
-	public String getDescription() {
-		return "Embeded JavaScript"; //$NON-NLS-1$
-	}
-
-	public IPath[] selectIndexes(SearchPattern pattern, IJavaScriptSearchScope scope) {
-		JsPathIndexer indexer = new JsPathIndexer();
-		return indexer.getVisibleJspPaths(pattern, scope);
-	}
-
-	public void indexDocument(SearchDocument document, IPath indexPath) {
-		if (!(document instanceof JSDTSearchDocumentDelegate)) {
-			return;
-		}
-
-		// use Java search indexing
-		SearchEngine.getDefaultSearchParticipant().indexDocument(document, indexPath);
-	}
-
-	public void locateMatches(SearchDocument[] indexMatches, SearchPattern pattern, IJavaScriptSearchScope scope, SearchRequestor requestor, IProgressMonitor monitor) throws CoreException {
-
-		if ((monitor != null) && monitor.isCanceled()) {
-			return;
-		}
-
-		// filter out null matches
-		List filtered = new ArrayList();
-		SearchDocument match = null;
-		for (int i = 0; i < indexMatches.length; i++) {
-			if (DEBUG) {
-				System.out.println("found possible matching JavaSearchDocumentDelegate: " + indexMatches[i]); //$NON-NLS-1$
-			}
-			match = indexMatches[i];
-			if (match != null) {
-				// some matches may be null, or if the index is out of date,
-				// the file may not even exist
-				if ((match instanceof JSDTSearchDocumentDelegate) && ((JSDTSearchDocumentDelegate) match).getFile().exists()) {
-					filtered.add(match);
-				}
-			}
-		}
-
-		indexMatches = (SearchDocument[]) filtered.toArray(new SearchDocument[filtered.size()]);
-		SearchEngine.getDefaultSearchParticipant().locateMatches(indexMatches, pattern, scope, requestor, monitor);
-	}
-
-	/**
-	 * @see org.eclipse.jdt.core.search.SearchParticipant#getDocument(org.eclipse.core.resources.IFile)
-	 */
-	public SearchDocument getDocument(IFile file) {
-		// never gets called?
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchScope.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchScope.java
deleted file mode 100644
index 815e7f7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchScope.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*(copied from JSP)
- * Used to constrain JSP/java search to certain paths and elements.
- * @author pavery
- */
-public class JsSearchScope implements IJavaScriptSearchScope {
-
-	private boolean fEnclosesAll = false;
-	private List fResourcePaths = null;
-	private List fJavaElements = null;
-
-	public JsSearchScope() {
-		// empty constructor just returns true for everything
-		// everything is in scope
-		this.fEnclosesAll = true;
-		init();
-	}
-
-	public JsSearchScope(String[] resourceStringPath) {
-		init();
-		fResourcePaths.addAll(Arrays.asList(resourceStringPath));
-	}
-
-	public JsSearchScope(IJavaScriptElement[] javaElement) {
-		init();
-		fJavaElements.addAll(Arrays.asList(javaElement));
-	}
-
-	private void init() {
-		this.fResourcePaths = new ArrayList();
-		this.fJavaElements = new ArrayList();
-	}
-
-	public boolean encloses(String resourcePathString) {
-
-		if (this.fEnclosesAll) {
-			return true;
-		} else if (enclosesPath(resourcePathString)) {
-			return true;
-		}
-
-		return false;
-	}
-
-	public boolean encloses(IJavaScriptElement element) {
-
-		// pa_TOD implement
-		if (this.fEnclosesAll) {
-			return true;
-		}
-
-		return true;
-	}
-
-	public boolean encloses(IResourceProxy element) {
-
-		if (this.fEnclosesAll) {
-			return true;
-		} else if (enclosesPath(element.requestFullPath().toOSString())) {
-			return true;
-		}
-
-		return true;
-	}
-
-	public void addPath(String path) {
-		this.fResourcePaths.add(path);
-	}
-
-	public void addElement(IJavaScriptElement element) {
-		this.fJavaElements.add(element);
-	}
-
-	private boolean enclosesPath(String possible) {
-
-		String[] paths = (String[]) fResourcePaths.toArray(new String[fResourcePaths.size()]);
-		for (int i = 0; i < paths.length; i++) {
-			if (possible.equals(paths[i])) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String getDescription() {
-
-		return "JavaScript Search Scope"; //$NON-NLS-1$
-	}
-
-	public IPath[] enclosingProjectsAndJars() {
-		return (IPath[]) fResourcePaths.toArray(new IPath[fResourcePaths.size()]);
-	}
-
-	public boolean shouldExclude(String container, String resourceName) {
-		/* auto gen */
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchSupport.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchSupport.java
deleted file mode 100644
index 80f03f0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/JsSearchSupport.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import java.io.File;
-import java.util.zip.CRC32;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchConstants;
-import org.eclipse.wst.jsdt.core.search.IJavaScriptSearchScope;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchEngine;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-import org.eclipse.wst.jsdt.internal.core.JavaModelManager;
-import org.eclipse.wst.jsdt.web.core.internal.JsCoreMessages;
-import org.eclipse.wst.jsdt.web.core.internal.JsCorePlugin;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.validation.Util;
-import org.eclipse.wst.jsdt.web.core.javascript.JsNameManglerUtil;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*(copied from JSP)
- * Central access to java indexing and search. All contact between JDT indexing
- * and Searching should be done through here.
- * 
- * Clients should access the methods of this class via the single instance via
- * <code>getInstance()</code>.
- * 
- * @author pavery
- */
-public class JsSearchSupport {
-
-    // for debugging
-    static final boolean DEBUG;
-    static {
-    	String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jssearch"); //$NON-NLS-1$
- 		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-    }
-
-    private static JsSearchSupport singleton = null;
-
-    private JsSearchParticipant fParticipant = null;
-
-    private IPath fJsPluginLocation = null;
-
-    // pa_TODO may be slow (esp for indexing entire workspace)
-    private final CRC32 fChecksumCalculator = new CRC32();
-
-    /** main cancel montior for all search support */
-    private final IProgressMonitor fMonitor = new NullProgressMonitor();
-
-    private JsSearchSupport() {
-        // force use of single instance
-    }
-
-    /**
-     * This operation ensures that the live resource's search markers show up in
-     * the open editor. It also allows the ability to pass in a ProgressMonitor
-     */
-    private class SearchJob extends Job implements IJavaScriptSearchConstants {
-
-        String fSearchText = ""; //$NON-NLS-1$
-
-        IJavaScriptSearchScope fScope = null;
-
-        int fSearchFor = FIELD;
-
-        int fLimitTo = ALL_OCCURRENCES;
-
-        int fMatchMode = SearchPattern.R_PATTERN_MATCH;
-
-       // boolean fIsCaseSensitive = false;
-
-        SearchRequestor fRequestor = null;
-
-        IJavaScriptElement fElement = null;
-
-        // constructor w/ java element
-        public SearchJob(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) {
-
-            super(JsCoreMessages.JSP_Search + element.getElementName());
-            this.fElement = element;
-            this.fScope = scope;
-            this.fRequestor = requestor;
-        }
-
-        // constructor w/ search text
-        public SearchJob(String searchText, IJavaScriptSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-
-            super(JsCoreMessages.JSP_Search + searchText);
-            this.fSearchText = searchText;
-            this.fScope = scope;
-            this.fSearchFor = searchFor;
-            this.fLimitTo = limitTo;
-            this.fMatchMode = matchMode;
-           // this.fIsCaseSensitive = isCaseSensitive;
-            this.fRequestor = requestor;
-        }
-
-        public IStatus run(IProgressMonitor jobMonitor) {
-
-            if ((jobMonitor != null) && jobMonitor.isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-            if (JsSearchSupport.getInstance().isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-
-            SearchPattern javaSearchPattern = null;
-            // if an element is available, use that to create search pattern
-            // (eg. LocalVariable)
-            // otherwise use the text and other paramters
-            if (this.fElement != null) {
-				javaSearchPattern = SearchPattern.createPattern(this.fElement, this.fLimitTo);
-			} else {
-				javaSearchPattern = SearchPattern.createPattern(this.fSearchText, this.fSearchFor, this.fLimitTo, this.fMatchMode);
-			}
-
-            if (javaSearchPattern != null) {
-                JsSearchParticipant[] participants = { getSearchParticipant() };
-                SearchEngine engine = new SearchEngine();
-                try {
-                    if (jobMonitor != null) {
-						jobMonitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-					}
-                    engine.search(javaSearchPattern, participants, this.fScope, this.fRequestor, jobMonitor);
-                } catch (CoreException e) {
-                    if (DEBUG) {
-						Logger.logException(e);
-					}
-                }
-                // non-CoreExceptions will permanently stall the Worker thread
-                catch (Exception e) {
-                    if (DEBUG) {
-						Logger.logException(e);
-					}
-                } finally {
-                    if (jobMonitor != null) {
-						jobMonitor.done();
-					}
-                }
-            }
-            return Status.OK_STATUS;
-        }
-    }
-
-    // end SearchJob
-    /**
-     * Runnable forces caller to wait until finished (as opposed to using a Job)
-     */
-    private class SearchRunnable implements IWorkspaceRunnable, IJavaScriptSearchConstants {
-
-        String fSearchText = ""; //$NON-NLS-1$
-
-        IJavaScriptSearchScope fScope = null;
-
-        int fSearchFor = FIELD;
-
-        int fLimitTo = ALL_OCCURRENCES;
-
-        int fMatchMode = SearchPattern.R_PATTERN_MATCH;
-
-        //boolean fIsCaseSensitive = false;
-
-        SearchRequestor fRequestor = null;
-
-        IJavaScriptElement fElement = null;
-
-        // constructor w/ java element
-        public SearchRunnable(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) {
-
-            this.fElement = element;
-            this.fScope = scope;
-            this.fRequestor = requestor;
-        }
-
-        // constructor w/ search text
-//        public SearchRunnable(String searchText, IJavaScriptSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-//
-//            this.fSearchText = searchText;
-//            this.fScope = scope;
-//            this.fSearchFor = searchFor;
-//            this.fLimitTo = limitTo;
-//            this.fMatchMode = matchMode;
-//            this.fIsCaseSensitive = isCaseSensitive;
-//            this.fRequestor = requestor;
-//        }
-
-        public void run(IProgressMonitor monitor) throws CoreException {
-
-            if ((monitor != null) && monitor.isCanceled()) {
-				return;
-			}
-            if (JsSearchSupport.getInstance().isCanceled()) {
-				return;
-			}
-
-            SearchPattern javaSearchPattern = null;
-            // if an element is available, use that to create search pattern
-            // (eg. LocalVariable)
-            // otherwise use the text and other paramters
-            if (this.fElement != null) {
-				javaSearchPattern = SearchPattern.createPattern(this.fElement, fLimitTo);
-			} else {
-				javaSearchPattern = SearchPattern.createPattern(fSearchText, fSearchFor, fLimitTo, fMatchMode);
-			}
-
-            if (javaSearchPattern != null) {
-                JsSearchParticipant[] participants = { getSearchParticipant() };
-                SearchEngine engine = new SearchEngine();
-                try {
-                    if (monitor != null) {
-						monitor.beginTask("", 0); //$NON-NLS-1$
-					}
-                    engine.search(javaSearchPattern, participants, fScope, fRequestor, monitor);
-                } catch (CoreException e) {
-                    Logger.logException(e);
-                    //throw e;
-                }
-                // non-CoreExceptions will permanently stall the Worker thread
-                catch (Exception e) {
-                    Logger.logException(e);
-                } finally {
-                    if (monitor != null) {
-						monitor.done();
-					}
-                }
-            }
-        }
-    }
-
-    // end SearchRunnable
-
-    /**
-     * Clients should access the methods of this class via the single instance
-     * via getInstance()
-     * 
-     * @return
-     */
-    public synchronized static JsSearchSupport getInstance() {
-
-        if (singleton == null) {
-			singleton = new JsSearchSupport();
-		}
-        return singleton;
-    }
-
-    /**
-     * Utility method to check if a file is a jsp file (since this is done
-     * frequently)
-     */
-    public static boolean isJsp(IFile file) {
-    	return Util.isJsType(file.getName());
-    	// (pa) 20051025 removing deep content type check
-    	// because this method is called frequently
-    	// and IO is expensive
-//        boolean isJsp = false;
-//
-//        if (file != null && file.exists()) {
-//        	
-//            IContentType contentTypeJSP = Platform.getContentTypeManager().getContentType(ContentTypeIdForJSP.ContentTypeID_JSP);
-//            // check this before description, it's less expensive
-//            if (contentTypeJSP.isAssociatedWith(file.getName())) {
-//            	isJsp = true;
-//            }
-//        }
-//
-//        return isJsp;
-    }
-
-    /**
-     * schedules a search document representing this JSP file for indexing (by
-     * the java indexer)
-     * 
-     * @param file
-     *            the JSP file
-     * @return true if indexing was successful, false otherwise
-     * @throws CoreException
-     */
-    public SearchDocument addJspFile(IFile file) {
-        if (JsSearchSupport.getInstance().isCanceled() || !file.isAccessible()) {
-            return null;
-        }
-
-        if (DEBUG) {
-			System.out.println("adding JSP file:" + file.getFullPath()); //$NON-NLS-1$
-		}
-
-        // create
-        SearchDocument delegate = createSearchDocument(file);
-        // null if not a jsp file
-        if (delegate != null) {
-            try {
-                getSearchParticipant().scheduleDocumentIndexing(delegate, computeIndexLocation(file.getParent().getFullPath()));
-            } catch (Exception e) {
-                // ensure that failure here doesn't keep other documents from
-                // being indexed
-                // if peformed in a batch call (like JSPIndexManager)
-                if (DEBUG) {
-					e.printStackTrace();
-				}
-            }
-        }
-
-        if (DEBUG) {
-			System.out.println("scheduled" + delegate + "for indexing"); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-
-        return delegate;
-    }
-    
-    /**
-     * Perform a java search w/ the given parameters. Runs in a background Job
-     * (results may still come in after this method call)
-     * 
-     * @param searchText
-     *            the string of text to search on
-     * @param searchFor
-     *            IJavaScriptSearchConstants.TYPE, METHOD, FIELD, PACKAGE, etc...
-     * @param limitTo
-     *            IJavaScriptSearchConstants.DECLARATIONS,
-     *            IJavaScriptSearchConstants.REFERENCES,
-     *            IJavaScriptSearchConstants.IMPLEMENTORS, or
-     *            IJavaScriptSearchConstants.ALL_OCCURRENCES
-     * @param matchMode
-     *            allow * wildcards or not
-     * @param isCaseSensitive
-     * @param requestor
-     *            passed in to accept search matches (and do "something" with
-     *            them)
-     */
-    public void search(String searchText, IJavaScriptSearchScope scope, int searchFor, int limitTo, int matchMode, boolean isCaseSensitive, SearchRequestor requestor) {
-
-        JsIndexManager.getInstance().rebuildIndexIfNeeded();
-
-        SearchJob job = new SearchJob(searchText, scope, searchFor, limitTo, matchMode, isCaseSensitive, requestor);
-        setCanceled(false);
-        job.setUser(true);
-        // https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
-        // pops up user operation blocked dialog if you perform a long search,
-        // then open a file because it locks the workspace
-        //job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-        job.schedule();
-    }
-
-    /**
-     * Search for an IJavaScriptElement, constrained by the given parameters. Runs in
-     * a background Job (results may still come in after this method call)
-     * 
-     * @param element
-     * @param scope
-     * @param requestor
-     */
-    public void search(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) {
-
-        JsIndexManager.getInstance().rebuildIndexIfNeeded();
-
-        SearchJob job = new SearchJob(element, scope, requestor);
-        setCanceled(false);
-        job.setUser(true);
-        // https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5032
-        //job.setRule(ResourcesPlugin.getWorkspace().getRoot());
-        job.schedule();
-    }
-
-    /**
-     * Search for an IJavaScriptElement, constrained by the given parameters. Runs in
-     * an IWorkspace runnable (results will be reported by the end of this
-     * method)
-     * 
-     * @param element
-     * @param scope
-     * @param requestor
-     */
-    public void searchRunnable(IJavaScriptElement element, IJavaScriptSearchScope scope, SearchRequestor requestor) {
-
-        JsIndexManager.getInstance().rebuildIndexIfNeeded();
-
-        SearchRunnable searchRunnable = new SearchRunnable(element, scope, requestor);
-        try {
-            setCanceled(false);
-            ResourcesPlugin.getWorkspace().run(searchRunnable, JsSearchSupport.getInstance().getProgressMonitor());
-        } catch (CoreException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     * @param jspFile
-     * @return SearchDocument if the file is not null, exists, and is a JSP
-     *         file, otherwise null.
-     */
-    private SearchDocument createSearchDocument(IFile jspFile) {
-
-        JSDTSearchDocumentDelegate delegate = null;
-        if ((jspFile != null) && jspFile.exists() && isJsp(jspFile)) {
-
-            delegate = new JSDTSearchDocumentDelegate(new JsSearchDocument(jspFile.getFullPath().toString(), getSearchParticipant()));
-        }
-        return delegate;
-
-    }
-
-    /**
-     * Centralized place to access JSPSearchDocuments (used by
-     * JSPSearchParticipant and JSPSearchRequestor)
-     * 
-     * @param searchDocPath
-     * @param doc
-     * @return the JSPSearchDocument or null if one is not found
-     */
-    public SearchDocument getSearchDocument(String searchDocPath) {
-         
-        SearchDocument delegate = null;
-        IFile f = fileForCUPath(searchDocPath);
-        if (f != null) {
-            delegate = createSearchDocument(f);
-        } else {
-            // handle failure case... (file deleted maybe?)
-        }
-        return delegate;
-    }
-
-    /**
-     * Unmangles the searchDocPath and returns the corresponding JSP file.
-     * 
-     * @param searchDocPath
-     */
-    private IFile fileForCUPath(String searchDocPath) {
-    
-        String[] split = searchDocPath.split("/"); //$NON-NLS-1$
-        String classname = split[split.length - 1];
-
-        // ignore anything but .java matches (like .class binary matches)
-        if(!searchDocPath.endsWith(".js")) { //$NON-NLS-1$
-            return null;
-        }
-
-        String filePath = JsNameManglerUtil.unmangle(classname);
-       
-        // try absolute path
-        IFile f = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(new Path(filePath));
-        // workspace relative then
-        if(f == null) {
-            // https://bugs.eclipse.org/bugs/show_bug.cgi?id=86009
-            // must have a project name as well
-            // which would mean >= 2 path segments
-            IPath path = new Path(filePath);
-            if(path.segmentCount() >= 2) {
-                f = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-            }
-        }
-        return f;
-    }
-
-    JsSearchParticipant getSearchParticipant() {
-
-        if (this.fParticipant == null) {
-			this.fParticipant = new JsSearchParticipant();
-		}
-        return this.fParticipant;
-    }
-
-    // This is called from JSPPathIndexer
-    // pa_TODO
-    //how can we make sure participant indexLocations are updated at startup?
-    public final IPath computeIndexLocation(IPath containerPath) {
-
-        IPath indexLocation = null;
-        // we don't want to inadvertently use a JDT Index
-        // we want to be sure to use the Index from the JSP location
-        //Object obj = indexLocations.get(containerPath);
-        //if (obj != null) {
-        //    indexLocation = (String) obj;
-        //} else {
-            // create index entry
-            String pathString = containerPath.toOSString();
-            this.fChecksumCalculator.reset();
-            this.fChecksumCalculator.update(pathString.getBytes());
-            String fileName = Long.toString(this.fChecksumCalculator.getValue()) + ".index"; //$NON-NLS-1$
-            // this is the only difference from
-            // IndexManager#computeIndexLocation(...)
-            indexLocation = getModelJspPluginWorkingLocation().append(fileName);
-
-            // pa_TODO need to add to java path too, so JDT search support knows
-            // there should be a non internal way to do this.
-            // https://bugs.eclipse.org/bugs/show_bug.cgi?id=77564
-            JavaModelManager.getJavaModelManager().getIndexManager().indexLocations.put(containerPath, indexLocation);
-        //}
-        return indexLocation;
-    }
-	public IPath getModelJspPluginWorkingLocation(IProject project) {
-		if (project == null) {
-			System.out.println("Null project"); //$NON-NLS-1$
-		}
-		IPath workingLocationFile = project.getWorkingLocation(JsCorePlugin.PLUGIN_ID).append("jssearch"); //$NON-NLS-1$
-		// ensure that it exists on disk
-		File folder = new File(workingLocationFile.toOSString());
-		if (!folder.isDirectory()) {
-			try {
-				folder.mkdir();
-			} catch (SecurityException e) {
-			}
-		}
-		return workingLocationFile;
-	}
-    // copied from JDT IndexManager
-    public IPath getModelJspPluginWorkingLocation() {
-
-        if (this.fJsPluginLocation != null) {
-			return this.fJsPluginLocation;
-		}
-
-        // Append the folder name "jssearch" to keep the state location area cleaner
-        IPath stateLocation = JsCorePlugin.getDefault().getStateLocation().addTrailingSeparator().append("jssearch"); //$NON-NLS-1$
-
-        // pa_TODO workaround for
-        // https://bugs.eclipse.org/bugs/show_bug.cgi?id=62267
-        // copied from IndexManager
-        String device = stateLocation.getDevice();
-        if ((device != null) && (device.charAt(0) == '/')) {
-			stateLocation = stateLocation.setDevice(device.substring(1));
-		}
-
-        // ensure that it exists on disk
-        File folder = new File(stateLocation.toOSString());
-		if (!folder.isDirectory()) {
-			try {
-				folder.mkdir();
-			}
-			catch (SecurityException e) {
-			}
-		}
-
-        return this.fJsPluginLocation = stateLocation;
-    }
-
-    /**
-     * JSP Indexing and Search jobs check this
-     * 
-     * @return
-     */
-    public synchronized final void setCanceled(boolean cancel) {
-    	//System.out.println("search support monitor" + fMonitor);
-        fMonitor.setCanceled(cancel);
-    }
-
-    /**
-     * JSP Indexing and Search jobs check this
-     * 
-     * @return
-     */
-    public synchronized final boolean isCanceled() {
-
-        return fMonitor.isCanceled();
-    }
-
-    /**
-     * JSP Indexing and Search jobs check this
-     * 
-     * @return
-     */
-    public final IProgressMonitor getProgressMonitor() {
-
-        return this.fMonitor;
-    }
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/NullSearchDocument.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/NullSearchDocument.java
deleted file mode 100644
index 7f1ce79..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/javascript/search/NullSearchDocument.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.javascript.search;
-
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * An empty servlet, safe for Java search participation
- * 
- * @author pavery
- */
-public class NullSearchDocument extends SearchDocument {
-	
-	StringBuffer fEmptyServletBuffer = null;
-	
-	public NullSearchDocument(String documentPath) {
-		super(documentPath, new JsSearchParticipant()); 
-		this.fEmptyServletBuffer = new StringBuffer();
-	}
-	
-	public byte[] getByteContents() {
-		return this.fEmptyServletBuffer.toString().getBytes();
-	}
-	
-	public char[] getCharContents() {
-		return this.fEmptyServletBuffer.toString().toCharArray();
-	}
-	
-	public String getEncoding() {
-		return null;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/text/IJsPartitions.java b/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/text/IJsPartitions.java
deleted file mode 100644
index 44ab14b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.core/src/org/eclipse/wst/jsdt/web/core/text/IJsPartitions.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.core.text;
-
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IJsPartitions {
-	String HtmlJsPartition = IHTMLPartitions.SCRIPT;
-	//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.classpath b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.classpath
deleted file mode 100644
index ce73933..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.cvsignore b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.cvsignore
deleted file mode 100644
index c7e8ba8..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-@dot
-build.xml
-javaCompiler...args
-org.eclipse.wst.jsdt.web.support.jsp_1.0.0.200806031304.jar
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.project b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.project
deleted file mode 100644
index f9e0796..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.jsdt.web.support.jsp</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9153739..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sat Mar 24 11:23:54 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index fc522bb..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF
deleted file mode 100644
index 51a0404..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.support.jsp;singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Activator: org.eclipse.wst.jsdt.web.support.jsp.Activator
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.jsdt.web.ui;bundle-version="[1.0.200,2.0.0)",
- org.eclipse.jst.jsp.ui;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.html.ui;bundle-version="[1.0.500,1.1.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.2.300,1.3.0)",
- org.eclipse.wst.css.core;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.jsdt.web.core;bundle-version="[1.0.300,2.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/about.html b/bundles/org.eclipse.wst.jsdt.web.support.jsp/about.html
deleted file mode 100644
index 4602330..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/build.properties b/bundles/org.eclipse.wst.jsdt.web.support.jsp/build.properties
deleted file mode 100644
index bc3b0f2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.properties b/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.properties
deleted file mode 100644
index f0465d1..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-#Properties file for org.eclipse.wst.jsdt.web.support.jsp

-Bundle-Vendor.0 = Eclipse.org

-Bundle-Name.0 = JSDT support for JSP Plug-in
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.xml
deleted file mode 100644
index c706355..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/plugin.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.jsdt.web.support.jsp.JSDTStructuredTextViewerConfigurationJSP"
-			target="org.eclipse.jst.jsp.core.jspsource.source" />
-		<provisionalConfiguration
-			type="contentassistprocessor"
-			class="org.eclipse.wst.jsdt.web.ui.internal.contentassist.JSDTContentAssistant"
-			target="org.eclipse.jst.jsp.SCRIPT.JAVASCRIPT" />
-		<documentationTextHover
-			class="org.eclipse.wst.jsdt.web.ui.internal.taginfo.JSDTHoverProcessor"
-			target="org.eclipse.jst.jsp.SCRIPT.JAVASCRIPT" />
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.jsdt.web.core.internal.validation.JsValidator"
-			id="org.eclipse.wst.jsdt.web.support.jsp.jssourcevalidator">
-			<contentTypeIdentifier id="org.eclipse.jst.jsp.core.jspsource">
-				<partitionType id="org.eclipse.wst.html.SCRIPT"></partitionType>
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENT"></partitionType>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-
-   <extension point="org.eclipse.wst.common.project.facet.core.facets">
-		<event-handler facet="jst.web" type="POST_INSTALL"  version="[2.0">
-	   		<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureInstaller"/>
-		</event-handler>
-	
-		<event-handler facet="jst.web" type="POST_UNINSTALL" version="[2.0">
-			<delegate class="org.eclipse.wst.jsdt.web.core.internal.project.JsNatureUninstaller"/>
-		</event-handler>
-	</extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/Activator.java b/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/Activator.java
deleted file mode 100644
index dd179c0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/Activator.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************
- *
- **/
-package org.eclipse.wst.jsdt.web.support.jsp;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.support.jsp";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTStructuredTextViewerConfigurationJSP.java b/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTStructuredTextViewerConfigurationJSP.java
deleted file mode 100644
index 7dc2f9f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.support.jsp/src/org/eclipse/wst/jsdt/web/support/jsp/JSDTStructuredTextViewerConfigurationJSP.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.support.jsp;
-
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jst.jsp.core.text.IJSPPartitions;
-import org.eclipse.jst.jsp.ui.StructuredTextViewerConfigurationJSP;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.jsdt.web.ui.StructuredTextViewerConfigurationJSDT;
-import org.eclipse.wst.jsdt.web.ui.internal.format.FormattingStrategyJSDT;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-/**
-*
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTStructuredTextViewerConfigurationJSP extends StructuredTextViewerConfigurationJSP{
-
-	private StructuredTextViewerConfiguration fHTMLSourceViewerConfiguration;
-
-	private StructuredTextViewerConfiguration getJSDTHTMLSourceViewerConfiguration() {
-		if (fHTMLSourceViewerConfiguration == null) {
-			fHTMLSourceViewerConfiguration = new StructuredTextViewerConfigurationJSDT();
-		}
-		return fHTMLSourceViewerConfiguration;
-	}
-	
-	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		final IContentFormatter formatter = super.getContentFormatter(sourceViewer);
-		if(formatter instanceof MultiPassContentFormatter) {
-		/*
-		 * Check for any externally supported auto edit strategies from EP.
-		 * [Bradley Childs - childsb@us.ibm.com]
-		 */
-		String[] contentTypes = getConfiguredContentTypes(sourceViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-				if (IHTMLPartitions.SCRIPT.equals(contentTypes[i]) || IJSPPartitions.JSP_CONTENT_JAVASCRIPT.equals(contentTypes[i]) || IHTMLPartitions.SCRIPT_EVENTHANDLER.equals(contentTypes[i])) {
-					((MultiPassContentFormatter) formatter).setSlaveStrategy(new FormattingStrategyJSDT(), contentTypes[i]);
-				}
-			}
-		}
-		return formatter;
-	}
-	
-	public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
-		String[] indentations = null;
-		if (IHTMLPartitions.SCRIPT.equals(contentType) || IJSPPartitions.JSP_CONTENT_JAVASCRIPT.equals(contentType) || IHTMLPartitions.SCRIPT_EVENTHANDLER.equals(contentType))
-			indentations = getJSDTHTMLSourceViewerConfiguration().getIndentPrefixes(sourceViewer, contentType);
-		else
-			indentations = super.getIndentPrefixes(sourceViewer, contentType);
-		return indentations;
-	}
-	
-	public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-		LineStyleProvider[] providers = null;
-		if (IHTMLPartitions.SCRIPT.equals(partitionType) || IJSPPartitions.JSP_CONTENT_JAVASCRIPT.equals(partitionType) || IHTMLPartitions.SCRIPT_EVENTHANDLER.equals(partitionType)) {
-			providers = getJSDTHTMLSourceViewerConfiguration().getLineStyleProviders(sourceViewer, IHTMLPartitions.SCRIPT);
-		}
-		else{
-			providers = super.getLineStyleProviders(sourceViewer, partitionType);
-		}
-
-		return providers;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.classpath b/bundles/org.eclipse.wst.jsdt.web.ui/.classpath
deleted file mode 100644
index 52165ec..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.project b/bundles/org.eclipse.wst.jsdt.web.ui/.project
deleted file mode 100644
index 4917858..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.jsdt.web.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 6e07215..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,96 +0,0 @@
-#Wed Oct 24 19:49:45 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index c91d09d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,51 +0,0 @@
-#Wed Oct 24 19:41:31 EDT 2007
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=false
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.format_source_code=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=true
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_SSE Team Styles
-cleanup_settings_version=2
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=false
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 262b0ab..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,28 +0,0 @@
-#Fri Feb 27 12:45:35 EST 2009
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.illegal-att-value=0
-compilers.p.internal=1
-compilers.p.missing-packages=2
-compilers.p.missing-version-export-package=2
-compilers.p.missing-version-import-package=2
-compilers.p.missing-version-require-bundle=2
-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-identifier=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bc949dd..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,53 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.jsdt.web.ui; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Activator: org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.jsdt.web.ui;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.autoedit;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.contentassist;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.derived;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.editor;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.format;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.hyperlink;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.java.search;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.java.search.ui;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.registry;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.style;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.style.java;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.taginfo;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.internal.text;x-internal:=true,
- org.eclipse.wst.jsdt.web.ui.views.contentoutline
-Import-Package: com.ibm.icu.util; version="3.8",
- com.ibm.icu.text; version="3.8",
- org.eclipse.core.filesystem,
- org.eclipse.ui.views.contentoutline
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.workbench;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.1.100,1.2.0)",
- org.eclipse.wst.jsdt.web.core;bundle-version="[1.0.300,2.0.0)",
- org.eclipse.wst.css.core;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.search;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.jsdt.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.jsdt.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.html.ui;bundle-version="[1.0.500,1.1.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.wst.jsdt.manipulation;bundle-version="[1.0.200,2.0.0)"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/about.html b/bundles/org.eclipse.wst.jsdt.web.ui/about.html
deleted file mode 100644
index 4602330..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
- 
-<p>June 2, 2006</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
-being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was 
-provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/build.properties b/bundles/org.eclipse.wst.jsdt.web.ui/build.properties
deleted file mode 100644
index c7697bd..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/icons/eye_icon.gif b/bundles/org.eclipse.wst.jsdt.web.ui/icons/eye_icon.gif
deleted file mode 100644
index 078398e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/icons/eye_icon.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.properties b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.properties
deleted file mode 100644
index 5d3635e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.properties
+++ /dev/null
@@ -1,67 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = JSDT Web Support UI
-hyperlinkDetector.name.0 = JavaScript Element
-menu.label.0 = Declarations
-action.tooltip.0 = Working Set
-action.label.0 = Working Set
-action.label.1 = Hierarchy
-action.tooltip.1 = Hierarchy
-action.label.2 = Project
-action.tooltip.2 = Project
-action.label.3 = Workspace
-action.tooltip.3 = Declarations
-menu.label.1 = References
-action.label.4 = Working Set
-action.tooltip.4 = Working Set
-action.label.5 = Hierarchy
-action.tooltip.5 = Hierarchy
-action.label.6 = Project
-action.tooltip.6 = Project
-action.label.7 = Workspace
-action.tooltip.7 = 
-menu.label.2 = Refactor
-menu.label.3 = Source
-action.label.8 = Generate Element Comment
-action.tooltip.8 = Generate Element Comment
-action.label.9 = Change Function Signature
-action.tooltip.9 = Change Function Signature
-action.label.10 = Move
-action.tooltip.10 = Move
-action.label.11 = Rename
-action.tooltip.11 = Rename
-action.label.12 = Delete
-action.tooltip.12 = Delete
-action.label.13 = Paste After
-action.tooltip.13 = Paste
-action.label.14 = Paste Before
-action.tooltip.14 = Paste
-action.label.15 = Copy
-action.tooltip.15 = Copy
-action.label.16 = Cut
-action.tooltip.16 = Cut
-menu.label.4 = Show In
-action.label.17 = Navigator
-action.tooltip.17 = Show In Navigator
-action.label.18 = Script Explorer
-action.tooltip.18 = Show In Script Explorer
-action.label.19 = Open Call Hierarchy
-action.tooltip.19 = Open Call Hierarchy
-action.label.20 = Open Type Hierarchy
-action.tooltip.20 = Open Type Hierarchy
-renameParticipant.name.0 = JSDT Web Rename Participant
-renameParticipant.name.1 = JSDT Web Rename Participant
-renameParticipant.name.2 = JSDT Web Rename Participant
-renameParticipant.name.3 = JSDT Web Rename Participant
-action.label.21 = Add JavaScript support...
-queryParticipant.name.0 = JavaScript Query Participant
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml b/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
deleted file mode 100644
index dd9c8f9..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/plugin.xml
+++ /dev/null
@@ -1,674 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- 	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
- 		<contentOutlineConfiguration
-			class="org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline.JsContentOutlineConfig"
-			target="org.eclipse.wst.html.core.htmlsource.source" />	
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.jsdt.web.ui.StructuredTextViewerConfigurationJSDT"
-			target="org.eclipse.wst.html.core.htmlsource.source" />	
-		<provisionalConfiguration
-			type="contentassistprocessor"
-			class="org.eclipse.wst.jsdt.web.ui.internal.contentassist.JSDTContentAssistant"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" />
-		<provisionalConfiguration
-			type="linestyleprovider"
-			class="org.eclipse.wst.jsdt.web.ui.internal.style.java.LineStyleProviderForJSDT"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" />
-		<documentationTextHover
-			class="org.eclipse.wst.jsdt.web.ui.internal.taginfo.JSDTHoverProcessor"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" />
-		<provisionalConfiguration
-			type="characterpairmatcher"
-			class="org.eclipse.wst.jsdt.web.ui.internal.text.JsDocumentRegionEdgeMatcher"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" />
-		<provisionalConfiguration
-			type="autoeditstrategy"
-			class="org.eclipse.wst.jsdt.web.ui.internal.autoedit.AutoEditStrategyForJs"
-			target="org.eclipse.wst.html.SCRIPT,org.eclipse.wst.html.SCRIPT.EVENTHANDLER" />
-	</extension>		
-	
-	 <extension
-         point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
-      <hyperlinkDetector 
-            class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector"
-            id="org.eclipse.wst.jsdt.web.ui.JSDTHyperlinkDetector.SCRIPT"
-            name="%hyperlinkDetector.name.0"
-            targetId="org.eclipse.wst.html.SCRIPT"/>
-      <hyperlinkDetector
-            class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector"
-            id="org.eclipse.wst.jsdt.web.ui.JSDTHyperlinkDetector.SCRIPT.events"
-            name="%hyperlinkDetector.name.0"
-            targetId="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>  
-      <hyperlinkDetector
-			class="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.JSDTHyperlinkDetector"
-			id="org.eclipse.wst.jsdt.web.ui.JSDTHyperlinkDetector.HTML"
-			name="%hyperlinkDetector.name.0"
-			targetId="org.eclipse.wst.html.core.htmlsource"/>
-   </extension>
-  
-  
-    <extension
-         point="org.eclipse.ui.popupMenus">
-	<!-- content outline contributions for Open Type and Open Hierarchy menu.  Menus show up in reverse order of decliration (google it). -->
-      <objectContribution
-            objectClass="org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode"
-            id="org.eclipse.wst.jsdt.web.ui.JavaActions">
-            <!-- Declarations Search Menu -->
-            <menu
-                id="org.eclipse.wst.jsdt.web.declerations"
-         		label="%menu.label.0"
-         		path="group.search">
-     		 	<separator name="declerations"/>
-         </menu>
-         <action
-               label="%action.label.0"          
-               tooltip="%action.tooltip.0"
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesInWorkingSetAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsInWorkingSetAction">
-         </action>  
-         <action
-               label="%action.label.1"          
-               tooltip="%action.tooltip.1"
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsInHierarchyAction">
-         </action> 
-          <action
-               label="%action.label.2"          
-               tooltip="%action.tooltip.2"
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsInProjectAction">
-         </action>
-         
-         <action
-               label="%action.label.3"
-               tooltip="%action.tooltip.3"
-               menubarPath="org.eclipse.wst.jsdt.web.declerations/declerations"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindDeclarationsAction">
-         </action>   
-            
-            <!-- Refrences Search menu -->
-          <menu
-                id="org.eclipse.wst.jsdt.web.references"
-         		label="%menu.label.1"
-         		path="group.search">
-     		 	<separator name="references"/>
-         </menu>
-         <action
-               label="%action.label.4"          
-               tooltip="%action.tooltip.4"
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesInWorkingSetAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesInWorkingSetAction">
-         </action>  
-         <action
-               label="%action.label.5"          
-               tooltip="%action.tooltip.5"
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesInHierarchyAction">
-         </action> 
-          <action
-               label="%action.label.6"          
-               tooltip="%action.tooltip.6"
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesInProjectAction">
-         </action>
-         
-         <action
-               label="%action.label.7"
-               tooltip="%action.tooltip.7"
-               menubarPath="org.eclipse.wst.jsdt.web.references/references"
-               class="org.eclipse.wst.jsdt.web.ui.actions.FindReferencesAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.FindReferencesAction">
-         </action>   
-         <!-- Source and Refactoring Menu's -->
-          <menu
-                id="org.eclipse.wst.jsdt.web.refactor"
-         		label="%menu.label.2"
-         		path="group.generate">
-     		 	<separator name="refactor"/>
-         </menu>
-
-         <menu
-                id="org.eclipse.wst.jsdt.web.source"
-         		label="%menu.label.3"
-         		path="group.generate">
-     		 	<separator name="source"/>
-         </menu>
-         <!-- Source Actions -->
-		 <action
-               label="%action.label.8"          
-               tooltip="%action.tooltip.8"
-               menubarPath="org.eclipse.wst.jsdt.web.source/source"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.AddJavaDocStubAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.generate.element.comment">
-         </action>
-         <!-- Refactor Actions -->
-         <action
-               label="%action.label.9"          
-               tooltip="%action.tooltip.9"
-               menubarPath="org.eclipse.wst.jsdt.web.refactor/refactor"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.SourceActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.change.function.signature">
-         </action>
-         <action
-               label="%action.label.10"          
-               tooltip="%action.tooltip.10"
-               menubarPath="org.eclipse.wst.jsdt.web.refactor/refactor"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.SourceActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.Move">
-         </action>
-         <action
-               label="%action.label.11"          
-               tooltip="%action.tooltip.11"
-               menubarPath="org.eclipse.wst.jsdt.web.refactor/refactor"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.SourceActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.rename">
-         </action>
-         
-         
-         <!-- Edit  (cut copy paste etc.. -->
-          <action
-               label="%action.label.12"          
-               tooltip="%action.tooltip.12"
-               menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.delete">
-         </action>
-        
-         <action
-               label="%action.label.13"          
-               tooltip="%action.tooltip.13"
-                     menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.web.ui.paste.after">
-         </action>
-          <action
-               label="%action.label.14"          
-               tooltip="%action.tooltip.14"
-                     menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.web.ui.paste.before">
-         </action>
-         <action
-               label="%action.label.15"          
-               tooltip="%action.tooltip.15"
-                     menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.copy">
-         </action>
-
-         <action
-               label="%action.label.16"          
-               tooltip="%action.tooltip.16"
-               menubarPath="group.edit"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.StandardEditorActionsAction"
-               enablesFor="*"
-               id="org.eclipse.wst.jsdt.web.ui.cut">
-         </action>         
-         
-         <!-- Show in Script Explorer, History and Navigator -->       
-         <menu
-                id="org.eclipse.wst.jsdt.web.showin"
-         		label="%menu.label.4"
-         		path="group.show">
-     		 	<separator name="showin"/>
-         </menu>  
-         <action
-               label="%action.label.17"          
-               tooltip="%action.tooltip.17"
-               menubarPath="org.eclipse.wst.jsdt.web.showin/showin"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.ShowInNavigatorAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.ShowInNavigatorViewAction">
-         </action>
-         <!-- History not working well -->
-         <!--
-         <action
-               label="History"          
-               tooltip="Show In History"
-               menubarPath="org.eclipse.wst.jsdt.web.showin/showin"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.ShowHistoryAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.internal.ui.callhierarchy.OpenCallHierarchyAction">
-         </action> 
-         -->
-          <action
-               label="%action.label.18"          
-               tooltip="%action.tooltip.18"
-               menubarPath="org.eclipse.wst.jsdt.web.showin/showin"
-               style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.ShowInScriptExplorerAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.ShowInScriptExplorer">
-         </action>
-         
-         <!-- Open Call and Type Hierarchies -->
-          <action
-               label="%action.label.19"          
-               tooltip="%action.tooltip.19"
-             menubarPath="group.show"
-             style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.OpenCallHierarchyAction"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.internal.ui.callhierarchy.OpenCallHierarchyAction">
-         </action>
-         <action
-               label="%action.label.20"
-               tooltip="%action.tooltip.20"
-   			menubarPath="group.show"
-   			style="push"
-               class="org.eclipse.wst.jsdt.web.ui.actions.OpenTypeHierarchy"
-               enablesFor="1"
-               id="org.eclipse.wst.jsdt.ui.actions.OpenTypeHierarchyAction">
-         </action>
-       </objectContribution> 
-		
-	</extension>
-	
-  
-	<!-- ====================================================================================== -->
-	<!-- source validation for JSP															  -->
-	<!--======================================================================================-->
-	
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.jsdt.web.core.internal.validation.JsValidator"
-			id="org.eclipse.wst.jsdt.web.jssourcevalidator">
-			<contentTypeIdentifier id="org.eclipse.wst.html.core.htmlsource">
-				<partitionType id="org.eclipse.wst.html.SCRIPT"/>
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
-			</contentTypeIdentifier>
-			<contentTypeIdentifier id="org.eclipse.jst.jsp.core.jspsource">
-				<partitionType id="org.eclipse.wst.html.SCRIPT"/>
-				<partitionType id="org.eclipse.wst.html.SCRIPT.EVENTHANDLER"/>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-	
-	<!--======================================================================================-->
-	<!-- JSP UI Adapter factories					   						  				  -->
-	<!--======================================================================================-->
-	<extension
-		point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
-		<adapterFactoryDescription
-			class="org.eclipse.wst.jsdt.web.ui.internal.registry.AdapterFactoryProviderForJSDT">
-			<contentType id="org.eclipse.wst.html.core.htmlsource" />
-		</adapterFactoryDescription>
-	</extension>
-
-	
-
-
-	<!--======================================================================================-->
-	<!-- for breakpoint                                                                       -->
-	<!--======================================================================================-->
-	<!-- removed for now -->
-	<!--
-	<extension point="org.eclipse.wst.sse.ui.breakpoint">
-		<breakpointContribution id="org.eclipse.wst.jsdt.web.ui.providers">
-			<provider
-				contentTypes="org.eclipse.wst.html.core.htmlsource"
-				class="org.eclipse.wst.jsdt.web.ui.internal.breakpointproviders.JavaStratumBreakpointProvider:*html,js,htm*"
-				id="org.eclipse.wst.jsdt.web.ui.internal.breakpointproviders.JavaStratumBreakpointProvider" />
-		</breakpointContribution>
-	</extension>
-	-->
-	
-	
-	<!-- Editor actionsets -->
-	<!--
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part id="org.eclipse.wst.jsdt.web.core.jspsource.source" />
-		</actionSetPartAssociation>
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.NavigateActionSet">
-			<part id="org.eclipse.wst.jsdt.web.core.jspsource.source" />
-		</actionSetPartAssociation>
-	</extension>
-	-->
-
-	
-	
-	
-	<!-- Keybindings for jsp source editor -->
-	<!--
-	<extension point="org.eclipse.ui.bindings"> -->
-	    <!--  win32:  M1=CTRL, M2=SHIFT, M3=ALT -->
-		<!-- rename refactor -->
-		<!--
-		<key
-			sequence="M2+M3+R"
-			contextId="org.eclipse.wst.jsdt.web.ui.structured.text.editor.jsp.scope"
-			commandId="org.eclipse.wst.jsdt.ui.edit.text.java.rename.element"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-		</key>
-		-->
-		<!-- move refactor -->
-		<!--
-		<key
-			sequence="M2+M3+V"
-			contextId="org.eclipse.wst.jsdt.web.ui.structured.text.editor.jsp.scope"
-			commandId="org.eclipse.wst.jsdt.web.ui.refactor.move"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-		</key>
-	</extension>
-	-->
-	
-	
-	<!--======================================================================================-->
-	<!-- queryParticipant to participate in java seraches                                     -->
-	<!--======================================================================================-->
-	<extension point="org.eclipse.wst.jsdt.ui.queryParticipants">
-		<queryParticipant
-			name="%queryParticipant.name.0"
-			nature="org.eclipse.wst.jsdt.core.jsNature"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.search.ui.JsQueryParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.java.search.ui.JsQueryParticipant" />
-
-	</extension>
-	
-	
-	<!--======================================================================================-->
-	<!-- Document provider for ExternalFileEditorInput                                        -->
-	<!--======================================================================================-->
-	<!--
-	<extension point="org.eclipse.ui.editors.documentProviders">
-		<provider
-			inputTypes="org.eclipse.wst.jsdt.web.ui.internal.hyperlink.ExternalFileEditorInput"
-			class="org.eclipse.ui.editors.text.TextFileDocumentProvider"
-			id="org.eclipse.wst.jsdt.web.ui.internal.ExternalFileDocumentProvider" />
-
-	</extension>
-	-->
-	<!--
-	<extension point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="org.eclipse.wst.jsdt.web.core.jspsource.source.RulerContext"
-			id="org.eclipse.ui.texteditor.ruler.context.actions">
-			<action
-				label="%AddTask.label"
-				helpContextId="org.eclipse.ui.AddTask_action_context"
-				class="org.eclipse.ui.texteditor.TaskRulerAction"
-				tooltip="%AddTask.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.TaskRulerAction" />
-
-			<action
-				label="%AddBookmark.label"
-				helpContextId="org.eclipse.ui.bookmark_action_context"
-				class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-				tooltip="%AddBookmark.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.BookmarkRulerAction" />
-
-		</viewerContribution>
-	</extension>
--->
-
-
-<!--
-	<extension point="org.eclipse.ui.editorActions">
-		<editorContribution
-			id="org.eclipse.wst.jsdt.web.core.jspsource.source.editorActions"
-			contributorClass="org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditorActionContributor"
-			targetID="org.eclipse.wst.html.core.htmlsource">
-			<action
-				id="CleanupDocument"
-				label="%CleanupDocument_label"
-				definitionId="org.eclipse.wst.sse.ui.cleanup.document"
-				tooltip="%CleanupDocument_tooltip"
-				class="org.eclipse.wst.html.ui.internal.edit.ui.CleanupActionHTMLDelegate"
-				actionID="CleanupDocument">
-			</action>
-			<action
-				id="ToggleComment"
-				label="%ToggleComment_label"
-				definitionId="org.eclipse.wst.sse.ui.toggle.comment"
-				tooltip="%ToggleComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXMLDelegate"
-				actionID="ToggleComment">
-			</action>
-			<action
-				id="AddBlockComment"
-				label="%AddBlockComment_label"
-				definitionId="org.eclipse.wst.sse.ui.add.block.comment"
-				tooltip="%AddBlockComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.AddBlockCommentActionXMLDelegate"
-				actionID="AddBlockComment">
-			</action>
-			<action
-				id="RemoveBlockComment"
-				label="%RemoveBlockComment_label"
-				definitionId="org.eclipse.wst.sse.ui.remove.block.comment"
-				tooltip="%RemoveBlockComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXMLDelegate"
-				actionID="RemoveBlockComment">
-			</action>
-			<action
-				id="RenameElement"
-				label="%RenameElement_label"
-				definitionId="org.eclipse.wst.jsdt.web.ui.refactor.rename"
-				class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPRenameElementActionDelegate"
-				actionID="RenameElement">
-			</action>
-			<action
-				id="MoveElement"
-				label="%MoveElement_label"
-				definitionId="org.eclipse.wst.jsdt.web.ui.refactor.move"
-				class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMoveElementActionDelegate"
-				actionID="MoveElement">
-			</action>
-			<action
-				id="FindOccurrences"
-				label="%FindOccurrences_label"
-				definitionId="org.eclipse.wst.sse.ui.search.find.occurrences"
-				class="org.eclipse.wst.jsdt.web.ui.internal.java.search.JsFindOccurrencesActionDelegate"
-				actionID="FindOccurrences">
-			</action>
-			<action
-				id="StructureSelectEnclosing"
-				label="%StructureSelectEnclosing_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
-				tooltip="%StructureSelectEnclosing_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate"
-				actionID="StructureSelectEnclosing">
-			</action>
-			<action
-				id="StructureSelectNext"
-				label="%StructureSelectNext_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.next"
-				tooltip="%StructureSelectNext_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate"
-				actionID="StructureSelectNext">
-			</action>
-			<action
-				id="StructureSelectPrevious"
-				label="%StructureSelectPrevious_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
-				tooltip="%StructureSelectPrevious_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate"
-				actionID="StructureSelectPrevious">
-			</action>
-			<action
-				id="StructureSelectHistory"
-				label="%StructureSelectHistory_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.last"
-				tooltip="%StructureSelectHistory_tooltip"
-				class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
-				actionID="StructureSelectHistory">
-			</action>
-		</editorContribution>
-        <editorContribution
-            targetID="org.eclipse.wst.html.core.htmlsource"
-            id="org.eclipse.wst.jsdt.web.core.jspsource.ruler.actions">
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%SelectRuler.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
-	-->
-		<!--======================================================================================-->
-	<!-- FOR JSP/JAVA RENAME PARTICIPATION                                                    -->
-	<!--======================================================================================-->
-	<extension
-		point="org.eclipse.ltk.core.refactoring.renameParticipants">
-		<renameParticipant
-			name="%renameParticipant.name.0"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.core.IType" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-		<renameParticipant
-			name="%renameParticipant.name.1"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPTypeRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-		<renameParticipant
-			name="%renameParticipant.name.2"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.core.IFunction" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-		<renameParticipant
-			name="%renameParticipant.name.3"
-			class="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant"
-			id="org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.JSPMethodRenameParticipant">
-			<enablement>
-				<with variable="affectedNatures">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.jsdt.core.jsNature" />
-
-					</iterate>
-				</with>
-				<with variable="element">
-					<instanceof value="org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode" />
-
-				</with>
-			</enablement>
-		</renameParticipant>
-
-	  </extension>
-
-	  <!--
-  <extension point="org.eclipse.wst.jsdt.ui.JsGlobalScopeUIInitializer">
-     <JsGlobalScopeUIInitializer
-     	id="org.eclipse.wst.jsdt.launching.WebProject"
-     	class="org.eclipse.wst.jsdt.web.ui.WebProjectJsGlobalScopeUIInitializer">
-     </JsGlobalScopeUIInitializer>
-   </extension>
--->
-
-  	 <extension
-         point="org.eclipse.ui.popupMenus">
-  		<objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            id="org.eclipse.wst.jsdt.web.ui.jsdtSetup">
-         <action
-            class="org.eclipse.wst.jsdt.web.ui.SetupProjectsWizzard"
-            label="%action.label.21"
-            menubarPath="org.eclipse.ui.projectConfigure/additions"
-            enablesFor="+"
-            id="org.eclipse.wst.jsdt.internal.web.ui.convertProjects">
-      	</action>
-   		</objectContribution>
-   </extension> 
-
-  	 <!-- Uncomment for Standalone + HTML as seperate options -->
-  	 <!--
-  	 <extension
-         point="org.eclipse.ui.popupMenus">
- 		<objectContribution
-            objectClass="org.eclipse.core.resources.IProject"
-            adaptable="true"
-            id="org.eclipse.wst.jsdt.web.ui.jsdtSetup">
-         <action
-            label="Add Support for JavaScript in HTML"
-            class="org.eclipse.wst.jsdt.web.ui.SetupProjectsWizzard"
-            menubarPath="org.eclipse.wst.jsdt.ui.project.tools/group0"
-            enablesFor="+"
-            id="org.eclipse.wst.jsdt.web.internal.ui.convertProjects">
-      	</action>
-   		</objectContribution>
-   </extension>  
-   -->
-</plugin>
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/Messages.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/Messages.java
deleted file mode 100644
index 3c7655f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/Messages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- *
- */
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/SetupProjectsWizzard.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/SetupProjectsWizzard.java
deleted file mode 100644
index 298210c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/SetupProjectsWizzard.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.jsdt.web.ui;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.jsdt.core.IIncludePathEntry;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.internal.project.JsWebNature;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin;
-
-/**
- * Not API
- */
-public class SetupProjectsWizzard implements IObjectActionDelegate, IActionDelegate {
-	IWorkbenchPart fPart;
-	Object[] fTarget;
-
-	private void doInstall(IProject project, final boolean openProperties, IProgressMonitor monitor) {
-		boolean configured = false;
-		JsWebNature nature = new JsWebNature(project, monitor);
-		try {
-			boolean hadBasicNature = JsWebNature.hasNature(project);
-
-			nature.configure();
-
-			if (!hadBasicNature) {
-				/*
-				 * No nature before, so no existing build path. Define the
-				 * project itself as an include folder.
-				 */
-				IJavaScriptProject jp = JavaScriptCore.create(project);
-				IIncludePathEntry[] oldEntries = null;
-				try {
-					oldEntries = jp.getRawIncludepath();
-				}
-				catch (JavaScriptModelException ex1) {
-					Logger.log(Logger.ERROR_DEBUG, null, ex1);
-				}
-				
-				IPath projectPath = project.getFullPath();
-				IIncludePathEntry projectPathEntry = JavaScriptCore.newSourceEntry(projectPath);
-				
-				if (! Arrays.asList(oldEntries).contains(projectPathEntry)) {
-					IIncludePathEntry[] newEntries = new IIncludePathEntry[oldEntries.length + 1];
-					System.arraycopy(oldEntries, 0, newEntries, 0, oldEntries.length);
-					
-					newEntries[oldEntries.length] = projectPathEntry;
-					jp.setRawIncludepath(newEntries, monitor);
-				}
-			}
-			configured = true;
-		}
-		catch (CoreException ex) {
-			Logger.logException(ex);
-		}
-
-		if (configured && openProperties) {
-			showPropertiesOn(project, monitor);
-		}
-	}
-	
-	private void doUninstall(IProject project, IProgressMonitor monitor) {
-		JsWebNature nature = new JsWebNature(project, monitor);
-		try {
-			nature.deconfigure();
-		} catch (CoreException ex) {
-			Logger.logException(ex);
-		}
-	}
-
-	private void install(final IProject project, final boolean openProperties) {
-		IProgressService service = null;
-		if (fPart != null) {
-			service = (IProgressService) fPart.getSite().getService(IProgressService.class);
-		}
-		if (service == null) {
-			doInstall(project, openProperties, null);
-		}
-		else {
-			IRunnableWithProgress runnable = new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-					doInstall(project, openProperties, monitor);
-				}
-			};
-			try {
-				service.run(false, false, runnable);
-			}
-			catch (InvocationTargetException e) {
-				Logger.logException(e);
-			}
-			catch (InterruptedException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-
-	public void run(IAction action) {
-		if (fTarget == null)
-			return;
-
-		for (int i = 0; i < fTarget.length; i++) {
-			if (fTarget[i] instanceof IResource) {
-				final IProject project = ((IResource) fTarget[i]).getProject();
-
-				if (!JsWebNature.hasNature(project)) {
-					/* Doesn't have nature, do a full install. */
-					install(project, i == fTarget.length - 1);
-				}
-				else {
-					/*
-					 * Has nature, check for browser library on include path
-					 * and setup if not found.
-					 */
-					IJavaScriptProject jp = JavaScriptCore.create(project);
-					IIncludePathEntry[] rawClasspath = null;
-					try {
-						rawClasspath = jp.getRawIncludepath();
-					}
-					catch (JavaScriptModelException ex1) {
-						Logger.log(Logger.ERROR_DEBUG, null, ex1);
-					}
-
-					boolean browserFound = false;
-					for (int k = 0; rawClasspath != null && !browserFound && k < rawClasspath.length; k++) {
-						if (rawClasspath[k].getPath().equals(JsWebNature.VIRTUAL_BROWSER_CLASSPATH)) {
-							browserFound = true;
-						}
-					}
-					if (!browserFound) {
-						install(project, false);
-					}
-				}
-			}
-		}
-
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			fTarget = ((IStructuredSelection) selection).toArray();
-		}
-		else {
-			fTarget = null;
-		}
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		fPart = targetPart;
-	}
-
-	private void showPropertiesOn(final IProject project, final IProgressMonitor monitor) {
-		IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.propertyPages").getExtensions(); //$NON-NLS-1$
-		final List pageIds = new ArrayList(8);
-		for (int i = 0; i < extensions.length; i++) {
-			if (extensions[i].getNamespaceIdentifier().startsWith("org.eclipse.wst.jsdt.")) { //$NON-NLS-1$
-				IConfigurationElement[] configurationElements = extensions[i].getConfigurationElements();
-				for (int j = 0; j < configurationElements.length; j++) {
-					if ("page".equals(configurationElements[j].getName())) {
-						pageIds.add(configurationElements[j].getAttribute("id")); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		Shell shell = (Shell) fPart.getAdapter(Shell.class);
-		if (shell == null) {
-			IWorkbenchWindow activeWorkbenchWindow = JsUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow();
-			if (activeWorkbenchWindow != null)
-				shell = activeWorkbenchWindow.getShell();
-		}
-		final Shell finalShell = shell;
-		if (finalShell != null) {
-			finalShell.getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					PreferenceDialog dialog = PreferencesUtil.createPropertyDialogOn(finalShell, project, "org.eclipse.wst.jsdt.ui.propertyPages.BuildPathsPropertyPage", (String[]) pageIds.toArray(new String[pageIds.size()]), null); //$NON-NLS-1$
-					if (dialog.open() == Window.CANCEL) {
-						doUninstall(project, monitor);
-					}
-				}
-			});
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/StructuredTextViewerConfigurationJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/StructuredTextViewerConfigurationJSDT.java
deleted file mode 100644
index b339576..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/StructuredTextViewerConfigurationJSDT.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui;
-
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.html.ui.StructuredTextViewerConfigurationHTML;
-import org.eclipse.wst.jsdt.web.ui.internal.format.FormattingStrategyJSDT;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-* 
- * Configuration for a source viewer which shows Html and supports JSDT.
- * <p>
- * Clients can subclass and override just those methods which must be specific
- * to their needs.
- * </p>
- * 
- * @see org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration
- * @since 1.0
- */
-public class StructuredTextViewerConfigurationJSDT extends StructuredTextViewerConfigurationHTML {
-	/**
-	 * Create new instance of StructuredTextViewerConfigurationHTML
-	 */
-	public StructuredTextViewerConfigurationJSDT() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-	
-	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		final IContentFormatter formatter = super.getContentFormatter(sourceViewer);
-		if(formatter instanceof MultiPassContentFormatter) {
-		/*
-		 * Check for any externally supported auto edit strategies from EP.
-		 * [Bradley Childs - childsb@us.ibm.com]
-		 */
-		String[] contentTypes = getConfiguredContentTypes(sourceViewer);
-		for (int i = 0; i < contentTypes.length; i++) {
-				if (IHTMLPartitions.SCRIPT.equals(contentTypes[i]) || IHTMLPartitions.SCRIPT_EVENTHANDLER.equals(contentTypes[i])) {
-					((MultiPassContentFormatter) formatter).setSlaveStrategy(new FormattingStrategyJSDT(), contentTypes[i]);
-				}
-			}
-		}
-		return formatter;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectJsGlobalScopeUIInitializer.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectJsGlobalScopeUIInitializer.java
deleted file mode 100644
index 03aecce..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/WebProjectJsGlobalScopeUIInitializer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.internal.ui.IJsGlobalScopeContainerInitializerExtension;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- *
- */
-public class WebProjectJsGlobalScopeUIInitializer implements IJsGlobalScopeContainerInitializerExtension{
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.jsdt.internal.ui.IJsGlobalScopeContainerInitialzerExtension#getImage(org.eclipse.core.runtime.IPath, java.lang.String, org.eclipse.wst.jsdt.core.IJavaScriptProject)
-	 */
-	public ImageDescriptor getImage(IPath containerPath, String element, IJavaScriptProject project) {
-		return ImageDescriptor.createFromFile(this.getClass(),"web1.JPG"); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java
deleted file mode 100644
index 560444c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubAction.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.internal.ui.actions.WorkbenchRunnableAdapter;
-import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class AddJavaDocStubAction implements IObjectActionDelegate {
-	private ISelection selection;
-	private IWorkbenchPart targetPart;
-	
-	public String getDialogTitle() {
-		return Messages.getString("AddJavaDocStubAction.0"); //$NON-NLS-1$
-	}
-	
-	public Shell getShell() {
-		return getSite().getShell();
-	}
-	
-	public IWorkbenchPartSite getSite() {
-		return targetPart.getSite();
-	}
-	
-	public void run(IAction action) {
-		IJavaScriptElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection);
-		if (elements == null || elements.length < 1) {
-			return;
-		}
-		IJavaScriptElement parent = elements[0].getParent();
-		/* find the cu */
-		while (parent != null && !(parent instanceof IJavaScriptUnit)) {
-			
-		}
-		if (parent != null) {
-			ArrayList members = new ArrayList();
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IMember) {
-					members.add(elements[i]);
-				}
-			}
-			JsJfaceNode node[] = SimpleJSDTActionProxy.getJsJfaceNodesFromSelection(selection);
-			/* only should be one node */
-			run((IJavaScriptUnit) parent, (IMember[]) members.toArray(new IMember[members.size()]), node[0]);
-		}
-	}
-	
-	public void run(IJavaScriptUnit cu, IMember[] members, JsJfaceNode node) {
-		try {
-			AddJavaDocStubOperation op = new AddJavaDocStubOperation(members, node);
-			PlatformUI.getWorkbench().getProgressService().runInUI(PlatformUI.getWorkbench().getProgressService(), new WorkbenchRunnableAdapter(op, op.getScheduleRule()), op.getScheduleRule());
-		} catch (InvocationTargetException e) {
-			ExceptionHandler.handle(e, getShell(), getDialogTitle(), Messages.getString("AddJavaDocStubAction.1")); //$NON-NLS-1$
-		} catch (InterruptedException e) {
-			// operation canceled
-		}
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-	
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java
deleted file mode 100644
index edde605..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/AddJavaDocStubOperation.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.web.core.javascript.DocumentChangeListenerToTextEdit;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class AddJavaDocStubOperation extends org.eclipse.wst.jsdt.internal.corext.codemanipulation.AddJavaDocStubOperation {
-	private IDocument copy;
-	/**
-	 * @param members
-	 */
-	private JsJfaceNode node;
-	private DocumentChangeListenerToTextEdit textEditListener;
-	
-	public AddJavaDocStubOperation(IMember[] members, JsJfaceNode node) {
-		super(members);
-		this.node = node;
-	}
-	
-	protected void applyChanges() {
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-		IStructuredDocument doc = node.getStructuredDocument();
-		try {
-			MultiTextEdit edits = textEditListener.getTextEdits();
-			model = modelManager.getExistingModelForEdit(doc);
-			model.aboutToChangeModel();
-			model.beginRecording(this, Messages.getString("AddJavaDocStubOperation.0"), Messages.getString("AddJavaDocStubOperation.1")); //$NON-NLS-1$ //$NON-NLS-2$
-			edits.apply(doc);
-		} catch (MalformedTreeException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (BadLocationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} finally {
-			if (model != null) {
-				model.endRecording(this);
-				model.changedModel();
-				model.releaseFromEdit();
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.internal.corext.codemanipulation.AddJavaDocStubOperation#getDocument(org.eclipse.wst.jsdt.core.IJavaScriptUnit,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	protected IDocument getDocument(IJavaScriptUnit cu, IProgressMonitor monitor) throws CoreException {
-		return getJavaDocumentFromNode();
-	}
-	
-	protected IDocument getJavaDocumentFromNode() {
-		if (copy == null) {
-			IJsTranslation tran = node.getTranslation();
-			copy = new Document(tran.getJsText());
-			textEditListener = new DocumentChangeListenerToTextEdit();
-			copy.addDocumentListener(textEditListener);
-		}
-		return copy;
-	}
-	
-	
-	public void run(IProgressMonitor monitor) throws CoreException, OperationCanceledException {
-		super.run(monitor);
-		applyChanges();
-		/* need to apply the text edits back to the original doc */
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java
deleted file mode 100644
index 28a4c70..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesAction.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class FindReferencesAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgs(org.eclipse.jface.action.IAction)
-	 */
-	
-	public Object[] getRunArgs(IAction action) {
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements != null && elements.length > 0) {
-			return new Object[] { elements[0] };
-		}
-		return new Object[0];
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgTypes()
-	 */
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { IJavaScriptElement.class };
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java
deleted file mode 100644
index 0c8f424..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/FindReferencesInWorkingSetAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class FindReferencesInWorkingSetAction extends FindReferencesAction {
-	
-	public void run(IAction action) {
-		try {
-			Object handler = getActionHandler(action);
-			IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-			if (elements == null || elements.length == 0) {
-				return;
-			}
-			SimpleJSDTActionProxy.executeMethod(handler, "run", new Class[] { IJavaScriptElement.class }, new Object[] { elements[0] }); //$NON-NLS-1$
-		} catch (IllegalArgumentException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (SecurityException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (IllegalAccessException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (NoSuchMethodException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InstantiationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InvocationTargetException ex) {
-			// If user doesn't select a working set an exception is thrown so we
-			// wont print stack trace here
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java
deleted file mode 100644
index 00771fa..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/JsElementActionProxy.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class JsElementActionProxy extends SimpleJSDTActionProxy {
-	/* Util method to get all the java elements in a selection */
-	public static IJavaScriptElement[] getJsElementsFromSelection(ISelection selection) {
-		if (selection == null) {
-			return new IJavaScriptElement[0];
-		}
-		ArrayList elements = new ArrayList();
-		if (selection instanceof IStructuredSelection) {
-			Iterator itt = ((IStructuredSelection) selection).iterator();
-			while (itt.hasNext()) {
-				Object element = itt.next();
-				if (element instanceof IJavaScriptElement) {
-					elements.add(element);
-				}
-				if (element instanceof IJavaWebNode) {
-					elements.add(((IJavaWebNode) element).getJavaElement());
-				}
-			}
-			return (IJavaScriptElement[]) elements.toArray(new IJavaScriptElement[elements.size()]);
-		}
-		return new IJavaScriptElement[0];
-	}
-	
-	
-	public Object[] getRunArgs(IAction action) {
-		/*
-		 * Needs to return an array of IJavaElements. Since its one arg of type
-		 * IJavaScriptElement[] need to put into an object array
-		 */
-		return new Object[] { JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection()) };
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.SimpleJSDTActionProxy#getRunArgTypes()
-	 */
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { (new IJavaScriptElement[0]).getClass() };
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/Messages.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/Messages.java
deleted file mode 100644
index 0bfa17b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/Messages.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- *
- */
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.actions.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java
deleted file mode 100644
index 06083a3..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenCallHierarchyAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class OpenCallHierarchyAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.SimpleJSDTActionProxy#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		IJavaScriptElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection);
-		/* Open call hierarchy needs to be disabled for TYPEs */
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].getElementType() == IJavaScriptElement.TYPE) {
-				action.setEnabled(false);
-				return;
-			}
-		}
-		super.selectionChanged(action, selection);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java
deleted file mode 100644
index 405a4c6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/OpenTypeHierarchy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class OpenTypeHierarchy extends JsElementActionProxy {
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		IJavaScriptElement[] elements = JsElementActionProxy.getJsElementsFromSelection(selection);
-		/* Open call hierarchy needs to be disabled for TYPEs */
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].getElementType() != IJavaScriptElement.TYPE) {
-				action.setEnabled(false);
-				return;
-			}
-		}
-		super.selectionChanged(action, selection);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java
deleted file mode 100644
index 678c02f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowHistoryAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class ShowHistoryAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	private IResource getHostResource(IJavaScriptElement virtualElement) {
-		IProject project = virtualElement.getJavaScriptProject().getProject();
-		IPath path = new Path(virtualElement.getHostPath().getPath());
-		IResource host = project.getWorkspace().getRoot().findMember(path);
-		return host;
-	}
-	
-	
-	public void run(IAction action) {
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements == null || elements.length == 0) {
-			return;
-		}
-		IResource resource = null;
-		if (elements[0].isVirtual()) {
-			resource = getHostResource(elements[0]);
-		} else {
-			resource = elements[0].getResource();
-		}
-		if (resource == null) {
-			return;
-		}
-		try {
-			IWorkbenchPage page = targetWorkbenchPart.getSite().getPage();
-			IViewPart view = page.showView(IPageLayout.ID_RES_NAV);
-			if (view instanceof ISetSelectionTarget) {
-				ISelection selection = new StructuredSelection(resource);
-				((ISetSelectionTarget) view).selectReveal(selection);
-			}
-		} catch (PartInitException e) {
-			ExceptionHandler.handle(e, targetWorkbenchPart.getSite().getShell(), Messages.getString("ShowHistoryAction.0"), Messages.getString("ShowHistoryAction.1") + e); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].isVirtual()) {
-				IResource resource = getHostResource(elements[i]);
-				if (resource == null || !resource.exists()) {
-					action.setEnabled(false);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java
deleted file mode 100644
index 628b942..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInNavigatorAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.internal.ui.util.ExceptionHandler;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class ShowInNavigatorAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	private IResource getHostResource(IJavaScriptElement virtualElement) {
-		IProject project = virtualElement.getJavaScriptProject().getProject();
-		IPath path = new Path(virtualElement.getHostPath().getPath());
-		IResource host = project.getWorkspace().getRoot().findMember(path);
-		return host;
-	}
-	
-	
-	public void run(IAction action) {
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements == null || elements.length == 0) {
-			return;
-		}
-		IResource resource = null;
-		if (elements[0].isVirtual()) {
-			resource = getHostResource(elements[0]);
-		} else {
-			resource = elements[0].getResource();
-		}
-		if (resource == null) {
-			return;
-		}
-		try {
-			IWorkbenchPage page = targetWorkbenchPart.getSite().getPage();
-			IViewPart view = page.showView(IPageLayout.ID_RES_NAV);
-			if (view instanceof ISetSelectionTarget) {
-				ISelection selection = new StructuredSelection(resource);
-				((ISetSelectionTarget) view).selectReveal(selection);
-			}
-		} catch (PartInitException e) {
-			ExceptionHandler.handle(e, targetWorkbenchPart.getSite().getShell(), Messages.getString("ShowInNavigatorAction.0"), Messages.getString("ShowInNavigatorAction.1") + e); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].isVirtual()) {
-				IResource resource = getHostResource(elements[i]);
-				if (resource == null || !resource.exists()) {
-					action.setEnabled(false);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java
deleted file mode 100644
index 799ea1f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/ShowInScriptExplorerAction.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.internal.ui.packageview.PackageExplorerPart;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class ShowInScriptExplorerAction extends JsElementActionProxy {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	private IResource getHostResource(IJavaScriptElement virtualElement) {
-		IProject project = virtualElement.getJavaScriptProject().getProject();
-		IPath path = new Path(virtualElement.getHostPath().getPath());
-		IResource host = project.getWorkspace().getRoot().findMember(path);
-		return host;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgs(org.eclipse.jface.action.IAction)
-	 */
-	
-	public Object[] getRunArgs(IAction action) {
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements != null && elements.length > 0) {
-			return new Object[] { elements[0] };
-		}
-		return new Object[0];
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.actions.JsElementActionProxy#getRunArgTypes()
-	 */
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { IJavaScriptElement.class };
-	}
-	
-	
-	public void run(IAction action) {
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		if (elements == null || elements.length == 0) {
-			return;
-		}
-		IResource resource = null;
-		if (elements[0].isVirtual()) {
-			resource = getHostResource(elements[0]);
-		} else {
-			resource = elements[0].getResource();
-		}
-		if (resource == null) {
-			return;
-		}
-		try {
-			PackageExplorerPart view = PackageExplorerPart.openInActivePerspective();
-			view.tryToReveal(resource);
-// IWorkbenchPage page= targetWorkbenchPart.getSite().getPage();
-// IViewPart view= page.showView(IPageLayout.ID_RES_NAV);
-			if (view instanceof ISetSelectionTarget) {
-				ISelection selection = new StructuredSelection(resource);
-				((ISetSelectionTarget) view).selectReveal(selection);
-			}
-		} catch (Exception e) {
-			// ExceptionHandler.handle(e,
-			// targetWorkbenchPart.getSite().getShell(), "Error Opening in
-			// Script View", "Error while displaying element in Script View:\n"
-			// + e);
-		}
-	}
-	
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		setSelection(selection);
-		IJavaScriptElement elements[] = JsElementActionProxy.getJsElementsFromSelection(getCurrentSelection());
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].isVirtual()) {
-				IResource resource = getHostResource(elements[i]);
-				if (resource == null || !resource.exists()) {
-					action.setEnabled(false);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SimpleJSDTActionProxy.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SimpleJSDTActionProxy.java
deleted file mode 100644
index 3d24b70..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SimpleJSDTActionProxy.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class SimpleJSDTActionProxy implements IObjectActionDelegate {
-	public static Object executeMethod(Object handler, String methodName, Class[] paramaterTypes, Object[] paramaterValues) throws SecurityException,
-			NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException {
-		Class target = handler.getClass();
-		Method m = target.getMethod(methodName, paramaterTypes);
-		return m.invoke(handler, paramaterValues);
-	}
-	
-	public static JsJfaceNode[] getJsJfaceNodesFromSelection(ISelection selection) {
-		if (selection == null) {
-			return new JsJfaceNode[0];
-		}
-		ArrayList elements = new ArrayList();
-		if (selection instanceof IStructuredSelection) {
-			Iterator itt = ((IStructuredSelection) selection).iterator();
-			while (itt.hasNext()) {
-				Object element = itt.next();
-				if (element instanceof JsJfaceNode) {
-					elements.add(element);
-				}
-			}
-			return (JsJfaceNode[]) elements.toArray(new JsJfaceNode[elements.size()]);
-		}
-		return new JsJfaceNode[0];
-	}
-	protected Object actionHandlerTarget;
-	private ISelection currentSelection;
-	protected IAction handlerTargetAction;
-	protected IWorkbenchPart targetWorkbenchPart;
-	
-	public SimpleJSDTActionProxy() {}
-	
-	/*
-	 * Most handlers look for WorkBenchSite, so we convert the WorkBenchPart to
-	 * WorkBenchSite for init
-	 */
-	protected Object getActionHandler(IAction action) throws IllegalAccessException, NoSuchMethodException, IllegalArgumentException, InstantiationException,
-			InvocationTargetException {
-		/* Target class is cached */
-		if (handlerTargetAction == action && actionHandlerTarget != null) {
-			return actionHandlerTarget;
-		}
-		Class target = null;
-		String className = getActionHandlerClassName(action);
-		try {
-			target = Class.forName(className);
-		} catch (ClassNotFoundException ex) {
-			System.out.println("Error.. Class target of action handler not found: " + action);
-			System.out.println(Messages.getString("SimpleJSDTActionProxy.0") + ex); //$NON-NLS-1$
-		}
-		// use the loaded class
-		Class[] types = new Class[] { IWorkbenchSite.class };
-		Constructor cons = target.getConstructor(types);
-		Object[] args = new Object[] { targetWorkbenchPart.getSite() };
-		
-		actionHandlerTarget = cons.newInstance(args);
-		handlerTargetAction = action;
-		return actionHandlerTarget;
-	}
-	
-	/*
-	 * Default way of determining the action handlers class name.. may be
-	 * subclassed/overridden
-	 */
-	protected String getActionHandlerClassName(IAction action) {
-		return action.getId();
-	}
-	
-	public ISelection getCurrentSelection() {
-		return currentSelection;
-	}
-	
-	public Object[] getRunArgs(IAction action) {
-		return new Object[] { getCurrentSelection() };
-	}
-	
-	public Class[] getRunArgTypes() {
-		return new Class[] { IStructuredSelection.class };
-	}
-	
-	public Object[] getSelectionChangeArgs(IAction action, ISelection selection) {
-		return new Object[] { getCurrentSelection() };
-	}
-	
-	public Class[] getSelectionChangeArgTypes() {
-		return new Class[] { IStructuredSelection.class };
-	}
-	
-	/*
-	 * Generic reflection util method to execute a named method with unknown
-	 * paramaters on an object
-	 */
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		try {
-			Object handler = getActionHandler(action);
-			SimpleJSDTActionProxy.executeMethod(handler, "run", getRunArgTypes(), getRunArgs(action)); //$NON-NLS-1$
-		} catch (IllegalArgumentException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (SecurityException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (IllegalAccessException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (NoSuchMethodException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InstantiationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InvocationTargetException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		currentSelection = selection;
-		if(targetWorkbenchPart==null) return;
-		
-		try {
-			Object handler = getActionHandler(action);
-			SimpleJSDTActionProxy.executeMethod(handler, "selectionChanged", getSelectionChangeArgTypes(), getSelectionChangeArgs(action, selection)); //$NON-NLS-1$
-		} catch (IllegalArgumentException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (SecurityException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (IllegalAccessException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (NoSuchMethodException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InstantiationException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		} catch (InvocationTargetException ex) {
-			// TODO Auto-generated catch block
-			ex.printStackTrace();
-		}
-		
-	}
-	
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		this.targetWorkbenchPart = targetPart;
-	}
-	
-	protected void setSelection(ISelection selection) {
-		this.currentSelection = selection;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SourceActionsAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SourceActionsAction.java
deleted file mode 100644
index 75815ea..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/SourceActionsAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class SourceActionsAction implements IObjectActionDelegate {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-	
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		action.setEnabled(false);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java
deleted file mode 100644
index 8677ee4..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/StandardEditorActionsAction.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.dnd.Clipboard;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JsJfaceNode;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- * 
- */
-public class StandardEditorActionsAction implements IObjectActionDelegate {
-	private static final boolean APPEND_NEW_LINES_TO_COPY = true;
-	protected static final String COPY = "org.eclipse.wst.jsdt.web.ui.copy"; //$NON-NLS-1$
-	protected static final String CUT = "org.eclipse.wst.jsdt.web.ui.cut"; //$NON-NLS-1$
-	protected static final String DELETE = "org.eclipse.wst.jsdt.web.ui.delete"; //$NON-NLS-1$
-	private static final char NEW_LINE = '\n';
-	protected static final String PASTE_AFTER = "org.eclipse.wst.jsdt.web.ui.paste.after"; //$NON-NLS-1$
-	protected static final String PASTE_BEFORE = "org.eclipse.wst.jsdt.web.ui.paste.before"; //$NON-NLS-1$
-	protected ISelection selection;
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	private void copy(IAction action) {
-		JsJfaceNode[] nodes = parseSelection();
-		if (nodes == null || nodes.length == 0) {
-			return;
-		}
-		Clipboard clipboard = null;
-		StringBuffer text = new StringBuffer();
-		if (StandardEditorActionsAction.APPEND_NEW_LINES_TO_COPY) {
-			text.append(StandardEditorActionsAction.NEW_LINE);
-		}
-		try {
-			for (int i = 0; i < nodes.length; i++) {
-				JsJfaceNode currentNode = nodes[i];
-				int start = currentNode.getStartOffset();
-				int length = currentNode.getLength();
-				IStructuredDocument doc = currentNode.getStructuredDocument();
-				try {
-					String elementText = doc.get(start, length);
-					text.append(elementText);
-				} catch (BadLocationException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-				if (StandardEditorActionsAction.APPEND_NEW_LINES_TO_COPY) {
-					text.append(StandardEditorActionsAction.NEW_LINE);
-				}
-				clipboard = new Clipboard(Display.getCurrent());
-				clipboard.setContents(new Object[] { text.toString() }, new Transfer[] { TextTransfer.getInstance() });
-			}
-		} finally {
-			if (clipboard != null) {
-				clipboard.dispose();
-			}
-		}
-	}
-	
-	private void delete(IAction action) {
-		JsJfaceNode[] nodes = parseSelection();
-		if (nodes == null || nodes.length == 0) {
-			return;
-		}
-		IStructuredDocument lastDoc = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-		try {
-			int start;
-			int length;
-			for (int i = 0; i < nodes.length; i++) {
-				JsJfaceNode currentNode = nodes[i];
-				start = currentNode.getStartOffset();
-				length = currentNode.getLength();
-				IStructuredDocument doc = currentNode.getStructuredDocument();
-				if (doc != lastDoc) {
-					lastDoc = doc;
-					if (model != null) {
-						model.endRecording(action);
-						model.changedModel();
-						model.releaseFromEdit();
-					}
-					if (modelManager != null) {
-						model = modelManager.getExistingModelForEdit(doc);
-						model.aboutToChangeModel();
-						model.beginRecording(action, "Delete JavaScript Element", "Delete JavaScript Element");
-					}
-				}
-				doc.replaceText(action, start, length, ""); //$NON-NLS-1$
-			}
-			model.endRecording(action);
-		} catch (Exception e) {
-			System.out.println(Messages.getString("StandardEditorActionsAction.8") + e); //$NON-NLS-1$
-		} finally {
-			if (model != null) {
-				model.changedModel();
-				model.releaseFromEdit();
-			}
-		}
-	}
-	
-	private JsJfaceNode[] parseSelection() {
-		if (selection == null) {
-			return new JsJfaceNode[0];
-		}
-		ArrayList elements = new ArrayList();
-		if (selection instanceof IStructuredSelection) {
-			Iterator itt = ((IStructuredSelection) selection).iterator();
-			while (itt.hasNext()) {
-				Object element = itt.next();
-				if (element instanceof IJavaScriptElement) {
-					elements.add(element);
-				}
-				if (element instanceof IJavaWebNode) {
-					elements.add(element);
-				}
-			}
-			return (JsJfaceNode[]) elements.toArray(new JsJfaceNode[elements.size()]);
-		}
-		return new JsJfaceNode[0];
-	}
-	
-	private void paste(IAction action, boolean atEnd) {
-		JsJfaceNode[] nodes = parseSelection();
-		if (nodes == null || nodes.length == 0) {
-			return;
-		}
-		int startOfPaste = -1;
-		IStructuredDocument doc = null;
-		/* Figure out where to paste the content */
-		if (atEnd) {
-			for (int i = 0; i < nodes.length; i++) {
-				if ((nodes[i].getStartOffset() + nodes[i].getLength()) > startOfPaste) {
-					startOfPaste = (nodes[i].getStartOffset() + nodes[i].getLength());
-					doc = nodes[i].getStructuredDocument();
-				}
-			}
-		} else {
-			for (int i = 0; i < nodes.length; i++) {
-				if ((nodes[i].getStartOffset() < startOfPaste || startOfPaste < 0)) {
-					startOfPaste = nodes[i].getStartOffset();
-					doc = nodes[i].getStructuredDocument();
-				}
-			}
-		}
-		Clipboard clipboard = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-		try {
-			clipboard = new Clipboard(Display.getCurrent());
-			String pasteString = (String) clipboard.getContents(TextTransfer.getInstance());
-			model = modelManager.getExistingModelForEdit(doc);
-			model.aboutToChangeModel();
-			model.beginRecording(action, Messages.getString("StandardEditorActionsAction.9") + (atEnd ? Messages.getString("StandardEditorActionsAction.10") : Messages.getString("StandardEditorActionsAction.11")) + Messages.getString("StandardEditorActionsAction.12"), Messages.getString("StandardEditorActionsAction.13") + (atEnd ? Messages.getString("StandardEditorActionsAction.14") : Messages.getString("StandardEditorActionsAction.15")) + Messages.getString("StandardEditorActionsAction.16")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$
-			doc.replaceText(action, startOfPaste, 0, pasteString);
-		} finally {
-			if (clipboard != null) {
-				clipboard.dispose();
-			}
-			if (model != null) {
-				model.endRecording(action);
-				model.changedModel();
-				model.releaseFromEdit();
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (action.getId().equals(StandardEditorActionsAction.CUT)) {
-			copy(action);
-			delete(action);
-		} else if (action.getId().equals(StandardEditorActionsAction.COPY)) {
-			copy(action);
-		} else if (action.getId().equals(StandardEditorActionsAction.PASTE_BEFORE)) {
-			paste(action, false);
-		} else if (action.getId().equals(StandardEditorActionsAction.PASTE_AFTER)) {
-			paste(action, true);
-		} else if (action.getId().equals(StandardEditorActionsAction.DELETE)) {
-			delete(action);
-		}
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		this.selection = selection;
-	}
-	
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/messages.properties b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/messages.properties
deleted file mode 100644
index c89b761..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/actions/messages.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-StandardEditorActionsAction.8=Error in Standard Editor Action : 
-StandardEditorActionsAction.9=Insert Text 
-StandardEditorActionsAction.10=before
-StandardEditorActionsAction.11=after
-StandardEditorActionsAction.12=\ a JavaScript Element.
-StandardEditorActionsAction.13=Insert Text 
-StandardEditorActionsAction.14=before
-StandardEditorActionsAction.15=after
-StandardEditorActionsAction.16=\ a JavaScript Element.
-SimpleJSDTActionProxy.0=Exception : 
-ShowHistoryAction.0=Error Opening in Script View
-ShowHistoryAction.1=Error while displaying element in Script View:\n
-ShowInNavigatorAction.0=Error Opening in Script View
-ShowInNavigatorAction.1=Error while displaying element in Script View:\n
-AddJavaDocStubAction.0=JavaScript Doc
-AddJavaDocStubAction.1=Error while adding comment
-AddJavaDocStubOperation.0=Generate JsDoc
-AddJavaDocStubOperation.1=Generate JsDoc
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionConstantsJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionConstantsJs.java
deleted file mode 100644
index 7d1af51..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionConstantsJs.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public interface IActionConstantsJs {
-	public final static String ACTION_NAME_MOVE_ELEMENT = "MoveElement"; //$NON-NLS-1$
-	public final static String ACTION_NAME_RENAME_ELEMENT = "RenameElement"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionDefinitionIdsJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionDefinitionIdsJs.java
deleted file mode 100644
index 9161681..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/IActionDefinitionIdsJs.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal;
-
-import org.eclipse.wst.jsdt.ui.actions.IJavaEditorActionDefinitionIds;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public interface IActionDefinitionIdsJs {
-	public final static String MOVE_ELEMENT = IJavaEditorActionDefinitionIds.MOVE_ELEMENT;
-	public final static String RENAME_ELEMENT = IJavaEditorActionDefinitionIds.RENAME_ELEMENT;
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JSPUIPluginResources.properties b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JSPUIPluginResources.properties
deleted file mode 100644
index 2cb5d27..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JSPUIPluginResources.properties
+++ /dev/null
@@ -1,87 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-## The following line is a sample JSP document.  Please translate only the following parts:
-## Use below tags ONLY for JSP 1.1
-## Welcome!
-## Use below tags ONLY for JSP 1.2
-## Welcome!
-Sample_JSP_doc=<%@ page \n\tlanguage=\"java\" \n\tcontentType=\"text/html; charset=ISO-8859-1\"\n%>\n<jsp:include flush=\"true\" page=\"titleBar.jsp\"/>\n\n<%-- Use below tags ONLY for JSP 1.1 --%>\n<%\n\tSystem.out.println(\"Welcome!\");\n%>\n<%-- Use below tags ONLY for JSP 1.2 --%>\n<jsp:scriptlet>\n\tSystem.out.println(\"Welcome!\");\n</jsp:scriptlet>
-JSP_Delimiters_UI_=JSP Delimiters
-Refactor_label=Refactor
-RenameElement_label=Rename
-MoveElement_label=Move
-MoveElementWizard=Move the selected elements
-#
-OK=OK
-JSP_changes=JSP changes
-ActionContributorJSP_0=Refa&ctor
-JSPRenameElementAction_0=Editor selection does not resolve to a renamable Java element
-JSPMoveElementAction_0=Editor selection does not resolve to movable Java elements
-BasicRefactorSearchRequestor_0=JSP Rename
-BasicRefactorSearchRequestor_1=in file: {0} line: {1}
-BasicRefactorSearchRequestor_2=Move Type ''{0}'' to package ''{1}''
-BasicRefactorSearchRequestor_3=Rename Method ''{0}'' to ''{1}''
-BasicRefactorSearchRequestor_4=Rename Type ''{0}'' to ''{1}''
-BasicRefactorSearchRequestor_5=Rename Package ''{0}'' to ''{1}''
-BasicRefactorSearchRequestor_6=JSP Rename Change
-#
-_UI_WIZARD_NEW_TITLE = New JavaServer Page
-_UI_WIZARD_NEW_HEADING = JavaServer Page
-_UI_WIZARD_NEW_DESCRIPTION = Create a new JavaServer Page.
-_ERROR_FILENAME_MUST_END_JSP = The file name must end in one of the following extensions {0}. 
-_WARNING_FILE_MUST_BE_INSIDE_JAVA_PROJECT = JavaServer Pages created in projects that do not support Java might not work as expected. 
-_WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT = Files created outside of the Web Content folder will not be included in your deployed Web application. 
-ResourceGroup_nameExists = The same name already exists.
-NewJSPTemplatesWizardPage_0=Select JSP Template
-NewJSPTemplatesWizardPage_1=Select a template as initial content in the JSP page.
-NewJSPTemplatesWizardPage_2=Name
-NewJSPTemplatesWizardPage_3=Description
-NewJSPTemplatesWizardPage_4=Use JSP Template
-NewJSPTemplatesWizardPage_5=Preview
-NewJSPTemplatesWizardPage_6=Templates are 'New JSP' templates found in the <a>JSP Templates</a> preference page.
-# Copied from sse.ui
-CleanupDocument_label=Cleanup Document...
-CleanupDocument_tooltip=Cleanup Document
-CleanupDocument_description=Cleanup Document
-ToggleComment_label=Toggle Comment
-ToggleComment_tooltip=Toggle Comment
-ToggleComment_description=Toggle Comment
-AddBlockComment_label=Add Block Comment
-AddBlockComment_tooltip=Add Block Comment
-AddBlockComment_description=Add Block Comment
-RemoveBlockComment_label=Remove Block Comment
-RemoveBlockComment_tooltip=Remove Block Comment
-RemoveBlockComment_description=Remove Block Comment
-FindOccurrences_label=Occurrences in File
-OccurrencesSearchQuery_0={0} - {1} Occurrences in {2}
-OccurrencesSearchQuery_2=file
-Content_Assist_not_availab_UI_=Content Assist not available at the current location
-Java_Content_Assist_is_not_UI_=Java Content Assist is not available for the current cursor location
-#
-Override_method_in=Override method in '
-Creating_files_encoding=Creating files encoding preference
-#
-JSPSourcePreferencePage_0=JSP Source preferences are based on the content within the JSP.
-JSPSourcePreferencePage_1=See <a>''{0}''</a> for JSP with HTML content.
-JSPSourcePreferencePage_2=See <a>''{0}''</a> for JSP with XML content.
-JSPColorPage_jsp_content=JSP Content
-JSPFilesPreferencePage_0=Validating files
-JSPFilesPreferencePage_1=Validate JSP fragments
-# JSP Fragments
-JSPFContentSettingsPropertyPage_0=none
-JSPFContentSettingsPropertyPage_1=The properties used instead of the page directive that cannot be specified in JSP fragment files.  The project setting is used if you specify "none."
-JSPFContentSettingsPropertyPage_2=Language:
-JSPFContentSettingsPropertyPage_3=Content Type:
-JSPFContentSettingsPropertyPage_4=Enable specific setting:
-ProjectJSPFContentSettingsPropertyPage_0=The properties for J2EE Web projects act as "project" default to be looked up when no properties are specified for a particular JSP fragment file.
-# CSS JSP
-Title_InvalidValue=Invalid Value
-Message_InvalidValue=Invalid property value.
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIMessages.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIMessages.java
deleted file mode 100644
index fbd9cf8..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIMessages.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- **********************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- 
- */
-public class JsUIMessages extends NLS {
-	public static String _ERROR_FILENAME_MUST_END_JSP;
-	public static String _UI_WIZARD_NEW_DESCRIPTION;
-	public static String _UI_WIZARD_NEW_HEADING;
-	public static String _UI_WIZARD_NEW_TITLE;
-	public static String _WARNING_FILE_MUST_BE_INSIDE_JAVA_PROJECT;
-	public static String _WARNING_FOLDER_MUST_BE_INSIDE_WEB_CONTENT;
-	public static String ActionContributorJSP_0;
-	public static String AddBlockComment_description; // resource bundle
-	public static String AddBlockComment_label; // resource bundle
-	public static String AddBlockComment_tooltip; // resource bundle
-	public static String BasicRefactorSearchRequestor_0;
-	public static String BasicRefactorSearchRequestor_1;
-	public static String BasicRefactorSearchRequestor_2;
-	public static String BasicRefactorSearchRequestor_3;
-	public static String BasicRefactorSearchRequestor_4;
-	public static String BasicRefactorSearchRequestor_5;
-	public static String BasicRefactorSearchRequestor_6;
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.internal.JSPUIPluginResources";//$NON-NLS-1$
-	public static String CleanupDocument_description; // resource bundle
-	public static String CleanupDocument_label; // resource bundle
-	public static String CleanupDocument_tooltip; // resource bundle
-	public static String Content_Assist_not_availab_UI_;
-	public static String Creating_files_encoding;
-	public static String FindOccurrences_label; // resource bundle
-	private static ResourceBundle fResourceBundle;
-	public static String Java_Content_Assist_is_not_UI_;
-	public static String JSP_changes;
-	public static String JSP_Delimiters_UI_;
-	public static String JSPColorPage_jsp_content;
-	public static String JSPFContentSettingsPropertyPage_0;
-	public static String JSPFContentSettingsPropertyPage_1;
-	public static String JSPFContentSettingsPropertyPage_2;
-	public static String JSPFContentSettingsPropertyPage_3;
-	public static String JSPFContentSettingsPropertyPage_4;
-	public static String JSPFilesPreferencePage_0;
-	public static String JSPFilesPreferencePage_1;
-	public static String JSPMoveElementAction_0;
-	public static String JSPRenameElementAction_0;
-	public static String JSPSourcePreferencePage_0;
-	public static String JSPSourcePreferencePage_1;
-	public static String JSPSourcePreferencePage_2;
-	public static String Message_InvalidValue;
-	public static String MoveElement_label; // resource bundle
-	public static String MoveElementWizard;
-	public static String NewJSPTemplatesWizardPage_0;
-	public static String NewJSPTemplatesWizardPage_1;
-	public static String NewJSPTemplatesWizardPage_2;
-	public static String NewJSPTemplatesWizardPage_3;
-	public static String NewJSPTemplatesWizardPage_4;
-	public static String NewJSPTemplatesWizardPage_5;
-	public static String NewJSPTemplatesWizardPage_6;
-	public static String OccurrencesSearchQuery_0;
-	public static String OccurrencesSearchQuery_2;
-	public static String OK;
-	public static String Override_method_in;
-	public static String ProjectJSPFContentSettingsPropertyPage_0;
-	public static String Refactor_label;
-	public static String RemoveBlockComment_description; // resource bundle
-	public static String RemoveBlockComment_label; // resource bundle
-	public static String RemoveBlockComment_tooltip; // resource bundle
-	public static String RenameElement_label; // resource bundle
-	public static String ResourceGroup_nameExists;
-	public static String Sample_JSP_doc;
-	public static String Title_InvalidValue;
-	public static String ToggleComment_description; // resource bundle
-	public static String ToggleComment_label; // resource bundle
-	public static String ToggleComment_tooltip; // resource bundle
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(JsUIMessages.BUNDLE_NAME, JsUIMessages.class);
-	}
-	
-	public static ResourceBundle getResourceBundle() {
-		try {
-			if (JsUIMessages.fResourceBundle == null) {
-				JsUIMessages.fResourceBundle = ResourceBundle.getBundle(JsUIMessages.BUNDLE_NAME);
-			}
-		} catch (MissingResourceException x) {
-			JsUIMessages.fResourceBundle = null;
-		}
-		return JsUIMessages.fResourceBundle;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java
deleted file mode 100644
index 70b836d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/JsUIPlugin.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.jsdt.internal.ui.JavaScriptPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;
-import org.osgi.framework.BundleContext;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsUIPlugin extends AbstractUIPlugin {
-	public final static String ID = "org.eclipse.wst.jsdt.web.ui"; //$NON-NLS-1$
-	protected static JsUIPlugin instance = null;
-	
-	public static JsUIPlugin getDefault() {
-		return JsUIPlugin.instance;
-	}
-	
-	public synchronized static JsUIPlugin getInstance() {
-		return JsUIPlugin.instance;
-	}
-	/**
-	 * The template context type registry for the jsp editor.
-	 */
-	private ContextTypeRegistry fContextTypeRegistry;
-	/**
-	 * The template store for the jsp editor.
-	 */
-	private TemplateStore fTemplateStore;
-	
-	public JsUIPlugin() {
-		super();
-		JsUIPlugin.instance = this;
-	}
-	
-	public AdapterFactoryRegistry getAdapterFactoryRegistry() {
-		return AdapterFactoryRegistryImpl.getInstance();
-	}
-	
-	/**
-	 * Returns the template context type registry for the jsp plugin.
-	 * 
-	 * @return the template context type registry for the jsp plugin
-	 */
-	public ContextTypeRegistry getTemplateContextRegistry() {
-		if (fContextTypeRegistry == null) {
-// ContributionContextTypeRegistry registry = new
-// ContributionContextTypeRegistry();
-// registry.addContextType(TemplateContextTypeIdsJSP.ALL);
-// registry.addContextType(TemplateContextTypeIdsJSP.NEW);
-// registry.addContextType(TemplateContextTypeIdsJSP.TAG);
-// registry.addContextType(TemplateContextTypeIdsJSP.ATTRIBUTE);
-// registry.addContextType(TemplateContextTypeIdsJSP.ATTRIBUTE_VALUE);
-			fContextTypeRegistry = JavaScriptPlugin.getDefault().getCodeTemplateContextRegistry();
-		}
-		return fContextTypeRegistry;
-	}
-	
-	/**
-	 * Returns the template store for the jsp editor templates.
-	 * 
-	 * @return the template store for the jsp editor templates
-	 */
-	public TemplateStore getTemplateStore() {
-		if (fTemplateStore == null) {
-// fTemplateStore = new ContributionTemplateStore(
-// getTemplateContextRegistry(), getPreferenceStore(),
-// JSPUIPreferenceNames.TEMPLATES_KEY);
-			JavaScriptPlugin jp = JavaScriptPlugin.getDefault();
-			fTemplateStore = jp.getTemplateStore();
-			try {
-				fTemplateStore.load();
-			} catch (IOException e) {
-				Logger.logException(e);
-			}
-		}
-		return fTemplateStore;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		instance = this;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		instance = null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/Logger.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/Logger.java
deleted file mode 100644
index f79c751..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/Logger.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class Logger {
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + Logger.ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + Logger.INFO;
-	public static final int OK = IStatus.OK; // 0
-	public static final int OK_DEBUG = 200 + Logger.OK;
-	private static final String PLUGIN_ID = "org.eclipse.wst.jsdt.web.ui"; //$NON-NLS-1$
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + Logger.WARNING;
-	
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == Logger.OK_DEBUG || level == Logger.INFO_DEBUG || level == Logger.WARNING_DEBUG || level == Logger.ERROR_DEBUG) {
-			if (!Logger.isDebugging()) {
-				return;
-			}
-		}
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG:
-			case INFO:
-				severity = IStatus.INFO;
-			break;
-			case WARNING_DEBUG:
-			case WARNING:
-				severity = IStatus.WARNING;
-			break;
-			case ERROR_DEBUG:
-			case ERROR:
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, Logger.PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-		if (bundle != null) {
-			Platform.getLog(bundle).log(statusObj);
-		}
-	}
-	
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (Logger.isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, Logger.PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(Logger.PLUGIN_ID);
-			if (bundle != null) {
-				Platform.getLog(bundle).log(statusObj);
-			}
-		}
-	}
-	
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-	
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!Logger.isDebugging()) {
-			return false;
-		}
-		String traceFilter = Platform.getDebugOption(Logger.PLUGIN_ID + Logger.TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-	
-	public static void log(int level, String message) {
-		Logger._log(level, message, null);
-	}
-	
-	public static void log(int level, String message, Throwable exception) {
-		Logger._log(level, message, exception);
-	}
-	
-	public static void logException(String message, Throwable exception) {
-		Logger._log(Logger.ERROR, message, exception);
-	}
-	
-	public static void logException(Throwable exception) {
-		Logger._log(Logger.ERROR, exception.getMessage(), exception);
-	}
-	
-	public static void trace(String category, String message) {
-		Logger._trace(category, message, null);
-	}
-	
-	public static void traceException(String category, String message, Throwable exception) {
-		Logger._trace(category, message, exception);
-	}
-	
-	public static void traceException(String category, Throwable exception) {
-		Logger._trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java
deleted file mode 100644
index b662203..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForJs.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.autoedit;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.html.core.text.IHTMLPartitions;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.internal.ui.text.java.JavaAutoIndentStrategy;
-import org.eclipse.wst.jsdt.internal.ui.text.java.SmartSemicolonAutoEditStrategy;
-import org.eclipse.wst.jsdt.internal.ui.text.javadoc.JavaDocAutoIndentStrategy;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class AutoEditStrategyForJs implements IAutoEditStrategy {
-	private IAutoEditStrategy[] fStrategies;
-	
-	public AutoEditStrategyForJs() {
-		super();
-	}
-	
-	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		IAutoEditStrategy[] strats = getAutoEditStrategies(document);
-		for (int i = 0; i < strats.length; i++) {
-			strats[i].customizeDocumentCommand(document, command);
-		}
-	}
-	
-	public IAutoEditStrategy[] getAutoEditStrategies(IDocument document) {
-		if (fStrategies != null) {
-			return fStrategies;
-		}
-		String partitioning = IHTMLPartitions.SCRIPT;
-		fStrategies = new IAutoEditStrategy[] { new JavaDocAutoIndentStrategy(partitioning), new SmartSemicolonAutoEditStrategy(partitioning),
-				new JavaAutoIndentStrategy(partitioning, getJavaProject(document), null) };
-		/* new AutoEditStrategyForTabs() */
-		return fStrategies;
-	}
-	
-	private IJavaScriptProject getJavaProject(IDocument document) {
-		IDOMModel model = null;
-		IJavaScriptProject javaProject = null;
-		try {
-			model = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			String baseLocation = model.getBaseLocation();
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IPath filePath = new Path(baseLocation);
-			IProject project = null;
-			if (filePath.segmentCount() > 0) {
-				project = root.getProject(filePath.segment(0));
-			}
-			if (project != null) {
-				javaProject = JavaScriptCore.create(project);
-			}
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-		return javaProject;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForTabs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForTabs.java
deleted file mode 100644
index 50ab442..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/autoedit/AutoEditStrategyForTabs.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.autoedit;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ConfigurableLineTracker;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ILineTracker;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorExtension3;
-import org.eclipse.wst.html.core.internal.HTMLCorePlugin;
-import org.eclipse.wst.html.core.internal.preferences.HTMLCorePreferenceNames;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class AutoEditStrategyForTabs implements IAutoEditStrategy {
-	private final String TAB_CHARACTER = "\t"; //$NON-NLS-1$
-	
-	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		// if not in smart insert mode just ignore
-		if (!isSmartInsertMode()) {
-			return;
-		}
-		// spaces for tab character
-		if (command.length == 0 && command.text != null && command.text.length() > 0 && command.text.indexOf(TAB_CHARACTER) != -1) {
-			smartInsertForTab(command, document);
-		}
-	}
-	
-	/**
-	 * Returns indentation width if using spaces for indentation, -1 otherwise
-	 * 
-	 * @return
-	 */
-	private int getIndentationWidth() {
-		int width = -1;
-		Preferences preferences = HTMLCorePlugin.getDefault().getPluginPreferences();
-		if (HTMLCorePreferenceNames.SPACE.equals(preferences.getString(HTMLCorePreferenceNames.INDENTATION_CHAR))) {
-			width = preferences.getInt(HTMLCorePreferenceNames.INDENTATION_SIZE);
-		}
-		return width;
-	}
-	
-	/**
-	 * Calculate number of spaces for next tab stop
-	 */
-	private String getIndentString(int indentationWidth, int lineOffset, ILineTracker lineTracker, int index) {
-		int indentSize = indentationWidth;
-		int offsetInLine = -1;
-		if (lineTracker != null) {
-			try {
-				IRegion lineInfo = lineTracker.getLineInformationOfOffset(index);
-				if (lineInfo.getOffset() == 0 && lineOffset > -1) {
-					offsetInLine = lineOffset + index;
-				} else {
-					offsetInLine = index - lineInfo.getOffset();
-				}
-			} catch (BadLocationException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		} else {
-			if (lineOffset > -1) {
-				offsetInLine = lineOffset + index;
-			}
-		}
-		if (offsetInLine > -1 && indentationWidth > 0) {
-			int remainder = offsetInLine % indentationWidth;
-			indentSize = indentationWidth - remainder;
-		}
-		StringBuffer indent = new StringBuffer();
-		for (int i = 0; i < indentSize; i++) {
-			indent.append(' ');
-		}
-		return indent.toString();
-	}
-	
-	/**
-	 * Set up a line tracker for text within command if text is multi-line
-	 */
-	private ILineTracker getLineTracker(IDocument document, String originalText) {
-		ConfigurableLineTracker lineTracker = null;
-		int[] delims = TextUtilities.indexOf(document.getLegalLineDelimiters(), originalText, 0);
-		if (delims[0] != -1 || delims[1] != -1) {
-			lineTracker = new ConfigurableLineTracker(document.getLegalLineDelimiters());
-			lineTracker.set(originalText);
-		}
-		return lineTracker;
-	}
-	
-	/**
-	 * Return true if active editor is in smart insert mode, false otherwise
-	 * 
-	 * @return
-	 */
-	private boolean isSmartInsertMode() {
-		boolean isSmartInsertMode = false;
-		ITextEditor textEditor = null;
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				IEditorPart editor = page.getActiveEditor();
-				if (editor != null) {
-					if (editor instanceof ITextEditor) {
-						textEditor = (ITextEditor) editor;
-					} else {
-						textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-					}
-				}
-			}
-		}
-		// check if smart insert mode
-		if (textEditor instanceof ITextEditorExtension3 && ((ITextEditorExtension3) textEditor).getInsertMode() == ITextEditorExtension3.SMART_INSERT) {
-			isSmartInsertMode = true;
-		}
-		return isSmartInsertMode;
-	}
-	
-	/**
-	 * Insert spaces for tabs
-	 * 
-	 * @param command
-	 */
-	private void smartInsertForTab(DocumentCommand command, IDocument document) {
-		// tab key was pressed. now check preferences to see if need to insert
-		// spaces instead of tab
-		int indentationWidth = getIndentationWidth();
-		if (indentationWidth > -1) {
-			String originalText = command.text;
-			StringBuffer newText = new StringBuffer(originalText);
-			// determine where in line this command begins
-			int lineOffset = -1;
-			try {
-				IRegion lineInfo = document.getLineInformationOfOffset(command.offset);
-				lineOffset = command.offset - lineInfo.getOffset();
-			} catch (BadLocationException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-			ILineTracker lineTracker = getLineTracker(document, originalText);
-			int startIndex = 0;
-			int index = newText.indexOf(TAB_CHARACTER);
-			while (index != -1) {
-				String indent = getIndentString(indentationWidth, lineOffset, lineTracker, index);
-				// replace \t character with spaces
-				newText.replace(index, index + 1, indent);
-				if (lineTracker != null) {
-					try {
-						lineTracker.replace(index, 1, indent);
-					} catch (BadLocationException e) {
-						// if something goes wrong with replacing text, just
-						// reset to current string
-						lineTracker.set(newText.toString());
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-				startIndex = index + indent.length();
-				index = newText.indexOf(TAB_CHARACTER, startIndex);
-			}
-			command.text = newText.toString();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTCompletionProposal.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTCompletionProposal.java
deleted file mode 100644
index 7f598f7..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTCompletionProposal.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.internal.ui.text.java.JavaCompletionProposal;
-import org.eclipse.wst.jsdt.internal.ui.text.java.LazyJavaCompletionProposal;
-import org.eclipse.wst.jsdt.ui.text.java.IJavaCompletionProposal;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTCompletionProposal extends JavaCompletionProposal implements IJavaCompletionProposal {
-	/*
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=124483
-	 * 
-	 * This is a wrapped proposal so we don't need to make "slow" calls to the
-	 * java proposal up front, only when needed for example, getAdditionalInfo()
-	 * reads external javadoc, and it makes no sense
-	 */
-	ICompletionProposal fJavaCompletionProposal = null;
-	
-	public JSDTCompletionProposal(String replacementString, int replacementOffset, int replacementLength, int cursorPosition, Image image,
-			String displayString, IContextInformation contextInformation, String additionalProposalInfo, int relevance,
-			boolean updateReplacementLengthOnValidate) {
-		super(replacementString, replacementOffset, replacementLength, image, displayString, relevance);
-		super.setCursorPosition(cursorPosition);
-		super.setContextInformation(contextInformation);
-// super(replacementString, replacementOffset, replacementLength,
-// cursorPosition, image, displayString, contextInformation,
-// additionalProposalInfo, relevance,
-// updateReplacementLengthOnValidate);
-	}
-	
-	/**
-	 * Sets cursor position after applying.
-	 */
-	
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		if (this.fJavaCompletionProposal instanceof LazyJavaCompletionProposal)
-		{
-			((LazyJavaCompletionProposal)this.fJavaCompletionProposal).apply(viewer.getDocument(), trigger, offset);
-		} else {
-			super.apply(viewer, trigger, stateMask, offset);
-		}
-	}
-	
-	
-	public String getAdditionalProposalInfo() {
-		String additionalInfo = super.getAdditionalProposalInfo();
-		ICompletionProposal javaProposal = getJavaCompletionProposal();
-		if (javaProposal != null) {
-			additionalInfo = javaProposal.getAdditionalProposalInfo();
-		}
-		return additionalInfo;
-	}
-	
-	final public ICompletionProposal getJavaCompletionProposal() {
-		return fJavaCompletionProposal;
-	}
-	
-	final public void setJavaCompletionProposal(ICompletionProposal javaCompletionProposal) {
-		fJavaCompletionProposal = javaCompletionProposal;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java
deleted file mode 100644
index 6725196..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistant.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import java.util.Arrays;
-import java.util.Vector;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTContentAssistant extends AbstractContentAssistProcessor {
-	private JSDTContentAssistantProcessor fContentAssistProcessor;
-	private JSDTTemplateAssistProcessor fTemplateAssistProcessor;
-	private JsTranslationAdapter fTranslationAdapter;
-	private JSDTHtmlCompletionProcessor fHhtmlcomp;
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentPosition) {
-		Vector proposals = new Vector();
-		ICompletionProposal[] completionProposals;
-		ICompletionProposal endScript = getHtmlContentAssistProcessor().getEndScriptProposal(viewer, documentPosition);
-		if(endScript!=null) {
-			return new ICompletionProposal[] {endScript};
-			//proposals.add(endScript);
-		}
-		JSDTProposalCollector theCollector = getProposalCollector(viewer, documentPosition);
-		/* add end script tag if needed */
-
-		/* --------- Content Assistant --------- */
-		if(theCollector==null) return new ICompletionProposal[0];
-		
-		getContentAssistProcessor().setProposalCollector(theCollector);
-		completionProposals = getContentAssistProcessor().computeCompletionProposals(viewer, documentPosition);
-		proposals.addAll(Arrays.asList(completionProposals));
-		/* HTML Proposals */
-		completionProposals = getHtmlContentAssistProcessor().computeCompletionProposals(viewer, documentPosition);
-		proposals.addAll(Arrays.asList(completionProposals));
-		/* --------- template completions --------- */
-		getTemplateCompletionProcessor().setProposalCollector(theCollector);
-		completionProposals = getTemplateCompletionProcessor().computeCompletionProposals(viewer, documentPosition);
-		proposals.addAll(Arrays.asList(completionProposals));
-		return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[0]);
-	}
-	
-	private JSDTHtmlCompletionProcessor getHtmlContentAssistProcessor() {
-		if (fHhtmlcomp == null) {
-			fHhtmlcomp = new JSDTHtmlCompletionProcessor();
-		}
-		return fHhtmlcomp;
-	}
-	
-	private JSDTContentAssistantProcessor getContentAssistProcessor() {
-		if (fContentAssistProcessor == null) {
-			fContentAssistProcessor = new JSDTContentAssistantProcessor();
-		}
-		return fContentAssistProcessor;
-	}
-	private IJsTranslation getJSPTranslation(ITextViewer viewer, int offset) {
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(viewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			if (fTranslationAdapter == null) {
-				fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			}
-			if (fTranslationAdapter != null) {
-				return fTranslationAdapter.getJsTranslation(true);
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return null;
-	}
-	
-	protected JSDTProposalCollector getProposalCollector(ITextViewer viewer, int offset) {
-		IJsTranslation tran = getJSPTranslation(viewer, offset);
-		if(tran==null) return null;
-		return new JSDTProposalCollector(tran);
-	}
-	
-	private JSDTTemplateAssistProcessor getTemplateCompletionProcessor() {
-		if (fTemplateAssistProcessor == null) {
-			fTemplateAssistProcessor = new JSDTTemplateAssistProcessor();
-		}
-		return fTemplateAssistProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java
deleted file mode 100644
index ac367f2..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContentAssistantProcessor.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentassist.AbstractContentAssistProcessor;
-import org.osgi.framework.Bundle;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTContentAssistantProcessor extends AbstractContentAssistProcessor {
-	private static final String JSDT_CORE_PLUGIN_ID = "org.eclipse.wst.jsdt.core"; //$NON-NLS-1$
-//	static {
-//		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jsptranslation"); //$NON-NLS-1$
-//		//DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-//	}
-	protected String fErrorMessage = null;
-	protected int fJspSourcePosition, fJavaPosition;
-	private JSDTProposalCollector fProposalCollector;
-	private JsTranslationAdapter fTranslationAdapter = null;
-	protected StructuredTextViewer fViewer = null;
-	
-	public JSDTContentAssistantProcessor() {
-		super();
-	}
-	
-	/**
-	 * Returns a list of completion proposals based on the specified location
-	 * within the document that corresponds to the current cursor position
-	 * within the text viewer.
-	 * 
-	 * @param viewer
-	 *            the viewer whose document is used to compute the proposals
-	 * @param documentPosition
-	 *            an offset within the document for which completions should be
-	 *            computed
-	 * @return an array of completion proposals or <code>null</code> if no
-	 *         proposals are possible
-	 */
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int pos) {
-		initialize(pos);
-		JSDTProposalCollector collector = null;
-		IDOMModel xmlModel = null;
-		try {
-			if (viewer instanceof StructuredTextViewer) {
-				fViewer = (StructuredTextViewer) viewer;
-			}
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(fViewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			if (fTranslationAdapter == null) {
-				fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			}
-			if (fTranslationAdapter != null) {
-				IJsTranslation translation = fTranslationAdapter.getJsTranslation(true);
-				fJavaPosition = getDocumentPosition();
-				try {
-					IJavaScriptUnit cu = translation.getCompilationUnit();
-					// can't get java proposals w/out a compilation unit
-					// or without a valid position
-					if (cu == null || -1 == fJavaPosition) {
-						return new ICompletionProposal[0];
-					}
-					collector = getProposalCollector();
-					synchronized (cu) {
-						cu.codeComplete(fJavaPosition, collector, null);
-					}
-				} catch (CoreException coreEx) {
-					// a possible Java Model Exception due to not being a Web
-					// (Java) Project
-					coreEx.printStackTrace();
-				}
-			}
-		} catch (Exception exc) {
-			exc.printStackTrace();
-			// throw out exceptions on code assist.
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		ICompletionProposal[] results = new ICompletionProposal[0];
-		if (collector != null) {
-			results = collector.getJSPCompletionProposals();
-			if (results == null || results.length < 1) {
-				fErrorMessage = JsUIMessages.Java_Content_Assist_is_not_UI_;
-			}
-		}
-		return results;
-	}
-	
-	/**
-	 * Returns information about possible contexts based on the specified
-	 * location within the document that corresponds to the current cursor
-	 * position within the text viewer.
-	 * 
-	 * @param viewer
-	 *            the viewer whose document is used to compute the possible
-	 *            contexts
-	 * @param documentPosition
-	 *            an offset within the document for which context information
-	 *            should be computed
-	 * @return an array of context information objects or <code>null</code> if
-	 *         no context could be found
-	 */
-	
-	public org.eclipse.jface.text.contentassist.IContextInformation[] computeContextInformation(org.eclipse.jface.text.ITextViewer viewer, int documentOffset) {
-		return null;
-	}
-	
-	/**
-	 * Returns a string of characters which when pressed should automatically
-	 * display content-assist proposals.
-	 * 
-	 * @return string of characters
-	 */
-	public java.lang.String getAutoProposalInvocationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns a string of characters which when pressed should automatically
-	 * display a content-assist tip.
-	 * 
-	 * @return string of characters
-	 */
-	public java.lang.String getAutoTipInvocationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of possible completions.
-	 * 
-	 * @return the auto activation characters for completion proposal or
-	 *         <code>null</code> if no auto activation is desired
-	 */
-	
-	public char[] getCompletionProposalAutoActivationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of context information.
-	 * 
-	 * @return the auto activation characters for presenting context information
-	 *         or <code>null</code> if no auto activation is desired
-	 */
-	
-	public char[] getContextInformationAutoActivationCharacters() {
-		return null;
-	}
-	
-	/**
-	 * Returns a validator used to determine when displayed context information
-	 * should be dismissed. May only return <code>null</code> if the processor
-	 * is incapable of computing context information.
-	 * 
-	 * @return a context information validator, or <code>null</code> if the
-	 *         processor is incapable of computing context information
-	 */
-	
-	public org.eclipse.jface.text.contentassist.IContextInformationValidator getContextInformationValidator() {
-		return null;
-	}
-	
-	protected int getDocumentPosition() {
-		return fJspSourcePosition;
-	}
-	
-	
-	public String getErrorMessage() {
-		// TODO: get appropriate error message
-		// if (fCollector.getErrorMessage() != null &&
-		// fCollector.getErrorMessage().length() > 0)
-		// return fCollector.getErrorMessage();
-		return fErrorMessage;
-	}
-	
-	protected JSDTProposalCollector getProposalCollector() {
-		return fProposalCollector;
-		// return new JSPProposalCollector(translation);
-	}
-	
-	/**
-	 * Initialize the code assist processor.
-	 */
-	protected void initialize(int pos) {
-		initializeJavaPlugins();
-		fJspSourcePosition = pos;
-		fErrorMessage = null;
-	}
-	
-	/**
-	 * Initialize the Java Plugins that the JSP processor requires. See
-	 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=143765 We should not call
-	 * "start", because that will cause that state to be remembered, and
-	 * re-started automatically during the next boot up sequence.
-	 * 
-	 * ISSUE: we may be able to get rid of this all together, in future, since
-	 * 99% we probably have already used some JDT class by the time we need JDT
-	 * to be active ... but ... this is the safest fix for this point in 1.5
-	 * stream. Next release, let's just remove this, re-discover what ever bug
-	 * this was fixing (if any) and if there is one, then we'll either put back
-	 * in, as is, or come up with a more appropriate fix.
-	 * 
-	 */
-	protected void initializeJavaPlugins() {
-		try {
-			Bundle bundle = Platform.getBundle(JSDTContentAssistantProcessor.JSDT_CORE_PLUGIN_ID);
-			bundle.loadClass("dummyClassNameThatShouldNeverExist"); //$NON-NLS-1$
-		} catch (ClassNotFoundException e) {
-			// this is the expected result, we just want to
-			// nudge the bundle to be sure its activated.
-		}
-	}
-	
-	
-	public void release() {
-		fTranslationAdapter = null;
-	}
-	
-	public void setProposalCollector(JSDTProposalCollector translation) {
-		this.fProposalCollector = translation;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java
deleted file mode 100644
index dcd07a8..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTContetAssistInvocationContext.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.wst.jsdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTContetAssistInvocationContext extends JavaContentAssistInvocationContext {
-	public static JSDTContetAssistInvocationContext getInstance(ITextViewer viewer, int offset, JSDTProposalCollector theCollector) {
-		JSDTContetAssistInvocationContext.getJSPTranslation(viewer);
-		return new JSDTContetAssistInvocationContext(viewer, offset, theCollector);
-	}
-	
-	private static IJsTranslation getJSPTranslation(ITextViewer viewer) {
-		IJsTranslation fTranslation = null;
-		
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(viewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			JsTranslationAdapter fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			if (fTranslationAdapter != null) {
-				fTranslation = fTranslationAdapter.getJsTranslation(true);
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return fTranslation;
-	}
-	ITextViewer viewer;
-	
-	private JSDTContetAssistInvocationContext(ITextViewer viewer, int offset, JSDTProposalCollector theCollector) {
-		super(viewer, offset, null);
-		this.viewer = viewer;
-		// this.offset=getJSPTranslation().getJavaOffset(offset);
-		// CompletionProposalCollector theCollector = getProposalCollector();
-		super.setCollector(theCollector);
-	}
-	
-// public IDocument getDocument() {
-// return
-// ((JSPTranslationExtension)getJSPTranslation(viewer)).getJavaDocument();
-//      
-// }
-// protected CompletionProposalCollector getProposalCollector() {
-//       
-// return ((CompletionProposalCollector) ( new JSPProposalCollector(
-// getJSPTranslation()) ));
-// }
-	
-	public IDocument getDocument() {
-		return viewer.getDocument();
-	}
-// public IJavaScriptUnit getCompilationUnit() {
-// return getJSPTranslation(viewer).getCompilationUnit();
-// }
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java
deleted file mode 100644
index 21727a6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTHtmlCompletionProcessor.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTHtmlCompletionProcessor {
-	
-	public JSDTHtmlCompletionProcessor() {}
-	
-	
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-		/* add </script if necisary */
-		ArrayList allProposals = new ArrayList();
-		getJSPTranslation(viewer);
-		
-		return (ICompletionProposal[])allProposals.toArray(new ICompletionProposal[allProposals.size()]);
-	}
-	
-	public ICompletionProposal getEndScriptProposal(ITextViewer viewer, int offset) {
-		/* add </script if necisary */
-	
-		IJsTranslation tran = getJSPTranslation(viewer);
-		if(tran==null) return null;
-		
-		int missingAtOffset = tran.getMissingTagStart();
-		
-		if(offset>=missingAtOffset&& missingAtOffset>-1) {
-			
-			String allText = viewer.getDocument().get();
-			String text = "</script>"; //$NON-NLS-1$
-			
-			int startInTag = -1;
-			
-			for(int i=0;i<text.length() && allText.length()>offset-1;i++) {
-				if(allText.charAt(offset-1)==text.charAt(i)) {
-					startInTag = i;
-					break;
-				}
-			}
-			
-			if(startInTag==-1 ) {
-				String displayText = Messages.getString("JSDTHtmlCompletionProcessor.1"); //$NON-NLS-1$
-				return new CustomCompletionProposal("\n" + text + "\n" ,offset,0,offset,null,displayText,null,Messages.getString("JSDTHtmlCompletionProcessor.4"),100); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-			}
-			
-			String text1 = allText.substring(offset - startInTag - 1, offset).toLowerCase();
-			String text2 = text.substring(0, startInTag+1).toLowerCase();
-			if(startInTag>-1  && text2.compareTo(text1)==0 ) {
-				String displayText = Messages.getString("JSDTHtmlCompletionProcessor.5"); //$NON-NLS-1$
-				return new CustomCompletionProposal(text  ,offset-startInTag-1,0,text.length(),null,displayText,null,Messages.getString("JSDTHtmlCompletionProcessor.6"),100); //$NON-NLS-1$
-			}
-			
-		}
-		
-		return null;
-	}
-	private IJsTranslation getJSPTranslation(ITextViewer viewer) {
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(viewer.getDocument());
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			
-			JsTranslationAdapter fTranslationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			
-			if (fTranslationAdapter != null) {
-				return fTranslationAdapter.getJsTranslation(true);
-			}
-		} catch (Exception e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return null;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTProposalCollector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTProposalCollector.java
deleted file mode 100644
index c59550d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTProposalCollector.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.core.CompletionProposal;
-import org.eclipse.wst.jsdt.core.Signature;
-import org.eclipse.wst.jsdt.ui.text.java.CompletionProposalCollector;
-import org.eclipse.wst.jsdt.ui.text.java.CompletionProposalComparator;
-import org.eclipse.wst.jsdt.ui.text.java.IJavaCompletionProposal;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTProposalCollector extends CompletionProposalCollector {
-	static char[] getTypeTriggers() {
-		return CompletionProposalCollector.TYPE_TRIGGERS;
-	}
-	private Comparator fComparator;
-	private IJsTranslation fTranslation;
-	
-// public List getGeneratedFunctionNames(){
-// if(fGeneratedFunctionNames==null){
-// fGeneratedFunctionNames = fTranslation.getGeneratedFunctionNames();
-// }
-// return fGeneratedFunctionNames;
-// }
-	public JSDTProposalCollector(IJsTranslation translation) {
-		super(translation!=null?translation.getCompilationUnit():null);
-		if (translation == null) {
-			throw new IllegalArgumentException("JSPTranslation cannot be null"); //$NON-NLS-1$
-		}
-		fTranslation = translation;
-	}
-	
-	/**
-	 * Cacluates the where the cursor should be after applying this proposal.
-	 * eg. method(|) if the method proposal chosen had params.
-	 * 
-	 * @param proposal
-	 * @param completion
-	 * @return
-	 */
-	private int calculatePositionAfter(CompletionProposal proposal, String completion) {
-		int positionAfter = completion.length();
-		int kind = proposal.getKind();
-		// may need better logic here...
-		// put cursor inside parenthesis if there's params
-		// only checking for any kind of declaration
-		if (kind == CompletionProposal.ANONYMOUS_CLASS_DECLARATION || kind == CompletionProposal.METHOD_DECLARATION || kind == CompletionProposal.POTENTIAL_METHOD_DECLARATION || kind == CompletionProposal.METHOD_REF) {
-			int paramCount = Signature.getParameterCount(proposal.getSignature());
-			if (completion.length() > 0 && paramCount > 0) {
-				positionAfter--;
-			}
-		}
-		return positionAfter;
-	}
-	
-	/**
-	 * Overridden to: - translate Java -> JSP offsets - fix
-	 * cursor-position-after - fix mangled servlet name in display string -
-	 * remove unwanted proposals (servlet constructor)
-	 */
-	
-	protected IJavaCompletionProposal createJavaCompletionProposal(CompletionProposal proposal) {
-		JSDTCompletionProposal jspProposal = null;
-		// ignore constructor proposals (they're not relevant for our JSP
-		// proposal list)
-		if (!proposal.isConstructor()) {
-// if (proposal.getKind() == CompletionProposal.TYPE_REF) {
-// String signature = String.valueOf(proposal
-// .getDeclarationSignature());
-// String completion = String.valueOf(proposal.getCompletion());
-// if (completion.indexOf(signature) != -1) {
-// jspProposal = createAutoImportProposal(proposal);
-// }
-// }
-			// default behavior
-// if (jspProposal == null) {
-// for(int i = 0;i<getGeneratedFunctionNames().size();i++){
-// if((new
-// String(proposal.getName())).equalsIgnoreCase((String)getGeneratedFunctionNames().get(i)))
-// return jspProposal;
-// }
-			jspProposal = createJspProposal(proposal);
-			// }
-		}
-		return jspProposal;
-	}
-	
-// private JSPCompletionProposal createAutoImportProposal(
-// CompletionProposal proposal) {
-//
-// JSPCompletionProposal jspProposal = null;
-//
-// String signature = new String(proposal.getDeclarationSignature());
-// String completion = new String(proposal.getCompletion());
-//
-// // it's fully qualified so we should
-// // add an import statement
-// // create an autoimport proposal
-// String newCompletion = completion.replaceAll(signature + ".", "");
-// //$NON-NLS-1$ //$NON-NLS-2$
-//
-// // java offset
-// int offset = proposal.getReplaceStart();
-// // replacement length
-// int length = proposal.getReplaceEnd() - offset;
-// // translate offset from Java > JSP
-// offset = fTranslation.getJspOffset(offset);
-// // cursor position after must be calculated
-// int positionAfter = calculatePositionAfter(proposal, newCompletion,
-// offset);
-//
-// // from java proposal
-// IJavaCompletionProposal javaProposal = super
-// .createJavaCompletionProposal(proposal);
-// proposal.getDeclarationSignature();
-// Image image = javaProposal.getImage();
-// String displayString = javaProposal.getDisplayString();
-// displayString = getTranslation().fixupMangledName(displayString);
-// IContextInformation contextInformation = javaProposal
-// .getContextInformation();
-// // don't do this, it's slow
-// // String additionalInfo = javaProposal.getAdditionalProposalInfo();
-// int relevance = javaProposal.getRelevance();
-//
-// boolean updateLengthOnValidate = true;
-//
-// jspProposal = new AutoImportProposal(completion, newCompletion, offset,
-// length, positionAfter, image, displayString,
-// contextInformation, null, relevance, updateLengthOnValidate);
-//
-// // https://bugs.eclipse.org/bugs/show_bug.cgi?id=124483
-// // set wrapped java proposal so additional info can be calculated on
-// // demand
-// jspProposal.setJavaCompletionProposal(javaProposal);
-//
-// return jspProposal;
-// }
-	private JSDTCompletionProposal createJspProposal(CompletionProposal proposal) {
-		JSDTCompletionProposal jspProposal;
-		String completion = String.valueOf(proposal.getCompletion());
-		// java offset
-		int offset = proposal.getReplaceStart();
-		// replacement length
-		int length = proposal.getReplaceEnd() - offset;
-		// translate offset from Java > JSP
-		// cursor position after must be calculated
-		int positionAfter = calculatePositionAfter(proposal, completion);
-		// from java proposal
-		IJavaCompletionProposal javaProposal = super.createJavaCompletionProposal(proposal);
-		proposal.getDeclarationSignature();
-		Image image = javaProposal.getImage();
-		String displayString = javaProposal.getDisplayString();
-		displayString = getTranslation().fixupMangledName(displayString);
-// for(int i = 0;i<getGeneratedFunctionNames().size();i++){
-// displayString.replace((String)getGeneratedFunctionNames().get(i), "");
-// }
-		IContextInformation contextInformation = javaProposal.getContextInformation();
-		// String additionalInfo = javaProposal.getAdditionalProposalInfo();
-		int relevance = javaProposal.getRelevance();
-		boolean updateLengthOnValidate = true;
-		jspProposal = new JSDTCompletionProposal(completion, offset, length, positionAfter, image, displayString, contextInformation, null, relevance, updateLengthOnValidate);
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=124483
-		// set wrapped java proposal so additional info can be calculated on
-		// demand
-		jspProposal.setJavaCompletionProposal(javaProposal);
-		return jspProposal;
-	}
-	
-	private Comparator getComparator() {
-		if (fComparator == null) {
-			fComparator = new CompletionProposalComparator();
-		}
-		return fComparator;
-	}
-	
-	/**
-	 * Ensures that we only return JSPCompletionProposals.
-	 * 
-	 * @return an array of JSPCompletionProposals
-	 */
-	public JSDTCompletionProposal[] getJSPCompletionProposals() {
-		List results = new ArrayList();
-		IJavaCompletionProposal[] javaProposals = getJavaCompletionProposals();
-		// need to filter out non JSPCompletionProposals
-		// because their offsets haven't been translated
-		for (int i = 0; i < javaProposals.length; i++) {
-			if (javaProposals[i] instanceof JSDTCompletionProposal) {
-				results.add(javaProposals[i]);
-			}
-		}
-		Collections.sort(results, getComparator());
-		return (JSDTCompletionProposal[]) results.toArray(new JSDTCompletionProposal[results.size()]);
-	}
-	
-	public IJsTranslation getTranslation() {
-		return fTranslation;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java
deleted file mode 100644
index 1f98178..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/JSDTTemplateAssistProcessor.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.jsdt.internal.ui.text.java.TemplateCompletionProposalComputer;
-import org.eclipse.wst.jsdt.ui.text.java.JavaContentAssistInvocationContext;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTTemplateAssistProcessor {
-	TemplateCompletionProposalComputer fJavaTemplateCompletion;
-	JSDTProposalCollector fProposalCollector;
-	JsTranslationAdapter fTranslationAdapter;
-	IProgressMonitor monitor;
-	
-	public JSDTTemplateAssistProcessor() {
-		monitor = new NullProgressMonitor();
-	}
-	
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-		JavaContentAssistInvocationContext context = getInvocationContext(viewer, offset);
-		List props = getTemplateCompletionProposalComputer().computeCompletionProposals(context, monitor);
-		return (ICompletionProposal[]) props.toArray(new ICompletionProposal[] {});
-	}
-	
-	private JavaContentAssistInvocationContext getInvocationContext(ITextViewer viewer, int offset) {
-		return JSDTContetAssistInvocationContext.getInstance(viewer, offset, getProposalCollector());
-	}
-	
-	protected JSDTProposalCollector getProposalCollector() {
-		return fProposalCollector;
-		// return new JSPProposalCollector(translation);
-	}
-	
-	private TemplateCompletionProposalComputer getTemplateCompletionProposalComputer() {
-		if (fJavaTemplateCompletion == null) {
-			fJavaTemplateCompletion = new TemplateCompletionProposalComputer();
-		}
-		return fJavaTemplateCompletion;
-	}
-	
-	public void setProposalCollector(JSDTProposalCollector translation) {
-		this.fProposalCollector = translation;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/Messages.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/Messages.java
deleted file mode 100644
index d59e216..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/Messages.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.internal.contentassist;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.internal.contentassist.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/messages.properties b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/messages.properties
deleted file mode 100644
index fbdf808..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/contentassist/messages.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-JSDTHtmlCompletionProcessor.1=<> end with </script>
-JSDTHtmlCompletionProcessor.4=Close the script tag.
-JSDTHtmlCompletionProcessor.5=<> end with </script>
-JSDTHtmlCompletionProcessor.6=Close the script tag.
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/derived/SingleCharReader.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/derived/SingleCharReader.java
deleted file mode 100644
index e893d44..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/derived/SingleCharReader.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.derived;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public abstract class SingleCharReader extends Reader {
-	/**
-	 * Gets the content as a String
-	 */
-	public String getString() throws IOException {
-		StringBuffer buf = new StringBuffer();
-		int ch;
-		while ((ch = read()) != -1) {
-			buf.append((char) ch);
-		}
-		return buf.toString();
-	}
-	
-	/**
-	 * @see Reader#read()
-	 */
-	
-	public abstract int read() throws IOException;
-	
-	/**
-	 * @see Reader#read(char[],int,int)
-	 */
-	
-	public int read(char cbuf[], int off, int len) throws IOException {
-		int end = off + len;
-		for (int i = off; i < end; i++) {
-			int ch = read();
-			if (ch == -1) {
-				if (i == off) {
-					return -1;
-				}
-				return i - off;
-			}
-			cbuf[i] = (char) ch;
-		}
-		return len;
-	}
-	
-	/**
-	 * @see Reader#ready()
-	 */
-	
-	public boolean ready() throws IOException {
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/ActionContributorJSP.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/ActionContributorJSP.java
deleted file mode 100644
index 7a9f5d9..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/ActionContributorJSP.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.editor;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.RetargetTextEditorAction;
-import org.eclipse.wst.html.ui.internal.edit.ui.ActionContributorHTML;
-import org.eclipse.wst.jsdt.ui.actions.RefactorActionGroup;
-import org.eclipse.wst.jsdt.web.ui.internal.IActionConstantsJs;
-import org.eclipse.wst.jsdt.web.ui.internal.IActionDefinitionIdsJs;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class ActionContributorJSP extends ActionContributorHTML {
-	private static final String[] EDITOR_IDS = { "org.eclipse.wst.html.core.htmlsource.source", "org.eclipse.wst.sse.ui.StructuredTextEditor" }; //$NON-NLS-1$ //$NON-NLS-2$
-	private RetargetTextEditorAction moveElementAction = null;
-	private IMenuManager refactorMenu = null;
-	private RetargetTextEditorAction renameElementAction = null;
-	
-	public ActionContributorJSP() {
-		super();
-		ResourceBundle bundle = JsUIMessages.getResourceBundle();
-		this.renameElementAction = new RetargetTextEditorAction(bundle, IActionConstantsJs.ACTION_NAME_RENAME_ELEMENT + StructuredTextEditorActionConstants.UNDERSCORE);
-		this.renameElementAction.setActionDefinitionId(IActionDefinitionIdsJs.RENAME_ELEMENT);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.renameElementAction, IHelpContextIds.JSP_REFACTORRENAME_HELPID);
-		this.moveElementAction = new RetargetTextEditorAction(bundle, IActionConstantsJs.ACTION_NAME_MOVE_ELEMENT + StructuredTextEditorActionConstants.UNDERSCORE);
-		this.moveElementAction.setActionDefinitionId(IActionDefinitionIdsJs.MOVE_ELEMENT);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(this.moveElementAction, IHelpContextIds.JSP_REFACTORMOVE_HELPID);
-		// the refactor menu, add the menu itself to add all refactor actions
-		this.refactorMenu = new MenuManager(JsUIMessages.ActionContributorJSP_0, RefactorActionGroup.MENU_ID);
-		refactorMenu.add(this.renameElementAction);
-		refactorMenu.add(this.moveElementAction);
-	}
-	
-	
-	protected void addToMenu(IMenuManager menu) {
-		super.addToMenu(menu);
-		menu.insertAfter(IWorkbenchActionConstants.M_EDIT, this.refactorMenu);
-	}
-	
-	
-	protected String[] getExtensionIDs() {
-		return ActionContributorJSP.EDITOR_IDS;
-	}
-	
-	
-	public void setActiveEditor(IEditorPart activeEditor) {
-		super.setActiveEditor(activeEditor);
-		this.renameElementAction.setAction(getAction(getTextEditor(getActiveEditorPart()), IActionConstantsJs.ACTION_NAME_RENAME_ELEMENT));
-		this.moveElementAction.setAction(getAction(getTextEditor(getActiveEditorPart()), IActionConstantsJs.ACTION_NAME_MOVE_ELEMENT));
-	}
-	
-	
-	public void setViewerSpecificContributionsEnabled(boolean enabled) {
-		super.setViewerSpecificContributionsEnabled(enabled);
-		this.renameElementAction.setEnabled(enabled);
-		this.moveElementAction.setEnabled(enabled);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/IHelpContextIds.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/IHelpContextIds.java
deleted file mode 100644
index c4418fb..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/editor/IHelpContextIds.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.editor;
-
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IHelpContextIds {
-	// JSP Fragment Property Page
-	public static final String JSP_FRAGMENT_HELPID = IHelpContextIds.PREFIX + "jspf1000"; //$NON-NLS-1$
-	// // figured out on the fly
-	// // JSP Source page editor
-	// public static final String JSP_SOURCEVIEW_HELPID =
-	// ContentTypeIdForJSP.ContentTypeID_JSP +"_source_HelpId"; //$NON-NLS-1$
-	// JSP New File Wizard - Template Page
-	public static final String JSP_NEWWIZARD_TEMPLATE_HELPID = IHelpContextIds.PREFIX + "jspw0010"; //$NON-NLS-1$
-	// JSP Files Preference page
-	public static final String JSP_PREFWEBX_FILES_HELPID = IHelpContextIds.PREFIX + "webx0050"; //$NON-NLS-1$
-	// JSP Styles Preference page
-	public static final String JSP_PREFWEBX_STYLES_HELPID = IHelpContextIds.PREFIX + "webx0051"; //$NON-NLS-1$
-	// JSP Templates Preference page
-	public static final String JSP_PREFWEBX_TEMPLATES_HELPID = IHelpContextIds.PREFIX + "webx0052"; //$NON-NLS-1$
-	// Refactor Move
-	public static final String JSP_REFACTORMOVE_HELPID = IHelpContextIds.PREFIX + "jspr0020"; //$NON-NLS-1$
-	// JSP Source Editor Context Menu
-	// Refactor Rename
-	public static final String JSP_REFACTORRENAME_HELPID = IHelpContextIds.PREFIX + "jspr0010"; //$NON-NLS-1$
-	// org.eclipse.wst.jsdt.web.ui.
-	public static final String PREFIX = JsUIPlugin.ID + "."; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
deleted file mode 100644
index 3a9b26a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/format/FormattingStrategyJSDT.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.format;
-
-import java.util.LinkedList;
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IDocumentPartitioningListener;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.TypedPosition;
-import org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.jsdt.core.IJavaScriptProject;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.JavaScriptCore;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.core.formatter.CodeFormatter;
-import org.eclipse.wst.jsdt.internal.corext.util.CodeFormatterUtil;
-import org.eclipse.wst.jsdt.internal.formatter.DefaultCodeFormatter;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.text.BasicStructuredDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class FormattingStrategyJSDT extends ContextBasedFormattingStrategy {
-	private static final int regionStartIndentLevel = 1;
-	/** Documents to be formatted by this strategy */
-	private final LinkedList fDocuments = new LinkedList();
-	/** Partitions to be formatted by this strategy */
-	private final LinkedList fPartitions = new LinkedList();
-	private int startIndentLevel;
-	
-	/**
-	 * Creates a new java formatting strategy.
-	 */
-	public FormattingStrategyJSDT() {
-		super();
-	}
-	
-	class ModelIrritant implements IDocumentPartitioningListener {
-		public ModelIrritant(IDocument attachedDoc) {}
-		
-		public void documentPartitioningChanged(IDocument document) {
-			document.removeDocumentPartitioningListener(this);
-			if (document instanceof BasicStructuredDocument) {
-				try {
-					((BasicStructuredDocument) document).replace(0, document.getLength(), document.get());
-				} catch (BadLocationException ex) {
-					// TODO Auto-generated catch block
-					ex.printStackTrace();
-				}
-			}
-		}
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#format()
-	 */
-	
-	public void format() {
-		super.format();
-		final IStructuredDocument document = (IStructuredDocument) fDocuments.removeFirst();
-		final TypedPosition partition = (TypedPosition) fPartitions.removeFirst();
-		if (document != null) {
-			try {
-				// JSPTranslationUtil translationUtil = new
-				// JSPTranslationUtil(document);
-				IJsTranslation translation = getTranslation(document);
-				IJavaScriptUnit cu = translation.getCompilationUnit();
-				if (cu != null) {
-					String cuSource = cu.getSource();
-					int javaStart = partition.getOffset();
-					int javaLength = partition.getLength();
-					TextEdit edit = CodeFormatterUtil.format2(CodeFormatter.K_JAVASCRIPT_UNIT, cuSource, javaStart, javaLength, startIndentLevel, TextUtilities.getDefaultLineDelimiter(document), getPreferences());
-					IDocument doc = new Document(translation.getJsText());
-					/* error formating the code so abort */
-					if(edit==null) return;
-					edit.apply(doc);
-					String replaceText = TextUtilities.getDefaultLineDelimiter(document) + getIndentationString(getPreferences(), startIndentLevel) + (doc.get(edit.getOffset(), edit.getLength())).trim() + TextUtilities.getDefaultLineDelimiter(document);
-					/*
-					 * this is necisary since SSE disconnects document
-					 * partitioners.. Because of that, the replaced regions are
-					 * considered 'partitionless' when the linestyle provider
-					 * trys to color them.
-					 * 
-					 */
-					document.replaceText(document, partition.getOffset(), partition.getLength(), replaceText);
-				//	document.addDocumentPartitioningListener(new ModelIrritant(document));
-				}
-			} catch (BadLocationException e) {
-			} catch (JavaScriptModelException e) {
-			}
-		}
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext)
-	 */
-	
-	public void formatterStarts(final IFormattingContext context) {
-		fPartitions.addLast(context.getProperty(FormattingContextProperties.CONTEXT_PARTITION));
-		fDocuments.addLast(context.getProperty(FormattingContextProperties.CONTEXT_MEDIUM));
-		startIndentLevel = FormattingStrategyJSDT.regionStartIndentLevel + 0;
-		Map projectOptions = (Map) context.getProperty(FormattingContextProperties.CONTEXT_PREFERENCES);
-		if (projectOptions == null) {
-			IDocument doc = (IDocument) context.getProperty(FormattingContextProperties.CONTEXT_MEDIUM);
-			context.setProperty(FormattingContextProperties.CONTEXT_PREFERENCES, getProjectOptions(doc));
-		}
-		super.formatterStarts(context);
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStops()
-	 */
-	
-	public void formatterStops() {
-		super.formatterStops();
-		fPartitions.clear();
-		fDocuments.clear();
-		startIndentLevel = 0;
-	}
-	
-	public String getIndentationString(Map options, int indentationLevel) {
-		DefaultCodeFormatter formatter = new DefaultCodeFormatter(options);
-		return formatter.createIndentationString(indentationLevel);
-	}
-	
-	private Map getProjectOptions(IDocument baseDocument) {
-		IJavaScriptProject javaProject = null;
-		IDOMModel xmlModel = null;
-		Map options = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(baseDocument);
-			String baseLocation = xmlModel.getBaseLocation();
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-			IPath filePath = new Path(baseLocation);
-			IProject project = null;
-			if (filePath.segmentCount() > 0) {
-				project = root.getProject(filePath.segment(0));
-			}
-			if (project != null) {
-				javaProject = JavaScriptCore.create(project);
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		if (javaProject != null) {
-			options = javaProject.getOptions(true);
-		}
-		return options;
-	}
-	
-	public IJsTranslation getTranslation(IStructuredDocument document) {
-		IJsTranslation tran = null;
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			IDOMDocument xmlDoc = xmlModel.getDocument();
-			JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-			if (translationAdapter != null) {
-				tran = translationAdapter.getJsTranslation(true);
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return tran;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileEditorInput.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileEditorInput.java
deleted file mode 100644
index 018c424..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileEditorInput.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.editors.text.ILocationProvider;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class ExternalFileEditorInput implements IEditorInput, ILocationProvider {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	/**
-	 * The workbench adapter which simply provides the label.
-	 * 
-	 * @see Eclipse 3.1
-	 */
-	private class WorkbenchAdapter implements IWorkbenchAdapter {
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object o) {
-			return null;
-		}
-		
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
-		 */
-		public ImageDescriptor getImageDescriptor(Object object) {
-			return null;
-		}
-		
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
-		 */
-		public String getLabel(Object o) {
-			return ((ExternalFileEditorInput) o).getName();
-		}
-		
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object o) {
-			return null;
-		}
-	}
-	private File fFile;
-	private WorkbenchAdapter fWorkbenchAdapter = new WorkbenchAdapter();
-	
-	public ExternalFileEditorInput(File file) {
-		super();
-		fFile = file;
-		fWorkbenchAdapter = new WorkbenchAdapter();
-	}
-	
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		}
-		if (o instanceof ExternalFileEditorInput) {
-			ExternalFileEditorInput input = (ExternalFileEditorInput) o;
-			return fFile.equals(input.fFile);
-		}
-		if (o instanceof IPathEditorInput) {
-			IPathEditorInput input = (IPathEditorInput) o;
-			return getPath().equals(input.getPath());
-		}
-		return false;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return fFile.exists();
-	}
-	
-	/*
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (ILocationProvider.class.equals(adapter)) {
-			return this;
-		}
-		if (IWorkbenchAdapter.class.equals(adapter)) {
-			return fWorkbenchAdapter;
-		}
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return fFile.getName();
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IPathEditorInput#getPath()
-	 * @since 3.1
-	 */
-	public IPath getPath() {
-		return Path.fromOSString(fFile.getAbsolutePath());
-	}
-	
-	/*
-	 * @see org.eclipse.ui.editors.text.ILocationProvider#getPath(java.lang.Object)
-	 */
-	public IPath getPath(Object element) {
-		if (element instanceof ExternalFileEditorInput) {
-			ExternalFileEditorInput input = (ExternalFileEditorInput) element;
-			return Path.fromOSString(input.fFile.getAbsolutePath());
-		}
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return fFile.getAbsolutePath();
-	}
-	
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
-	
-	public int hashCode() {
-		return fFile.hashCode();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java
deleted file mode 100644
index d8905ef..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/ExternalFileHyperlink.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.io.File;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.html.ui.internal.HTMLUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class ExternalFileHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	private File fHyperlinkFile;
-	private IRegion fHyperlinkRegion;
-	
-	public ExternalFileHyperlink(IRegion region, File file) {
-		fHyperlinkFile = file;
-		fHyperlinkRegion = region;
-	}
-	
-	public IRegion getHyperlinkRegion() {
-		return fHyperlinkRegion;
-	}
-	
-	public String getHyperlinkText() {
-		String path = fHyperlinkFile.getPath();
-		if (path.length() > 60) {
-			path = path.substring(0, 25) + "..." + path.substring(path.length() - 25, path.length());
-		}
-		return NLS.bind(HTMLUIMessages.Open, path);
-	}
-	
-	public String getTypeLabel() {
-		return null;
-	}
-	
-	public void open() {
-		if (fHyperlinkFile != null) {
-			IEditorInput input = new ExternalFileEditorInput(fHyperlinkFile);
-			IEditorDescriptor descriptor;
-			try {
-				descriptor = IDE.getEditorDescriptor(input.getName(), true);
-				if (descriptor != null) {
-					IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-					IDE.openEditor(page, input, descriptor.getId(), true);
-				}
-			} catch (PartInitException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java
deleted file mode 100644
index b0c8096..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlink.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.internal.ui.actions.ActionMessages;
-import org.eclipse.wst.jsdt.ui.JavaScriptUI;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class JSDTHyperlink implements IHyperlink {
-	private IJavaScriptElement fElement;
-	private IRegion fRegion;
-	
-	public JSDTHyperlink(IRegion region, IJavaScriptElement element) {
-		fRegion = region;
-		fElement = element;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
-	 */
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		return ActionMessages.OpenAction_declaration_label;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
-	 */
-	public void open() {
-		try {
-			IEditorPart editor = JavaScriptUI.openInEditor(fElement);
-			if (editor != null) {
-				JavaScriptUI.revealInEditor(editor, fElement);
-			}
-		} catch (Exception e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java
deleted file mode 100644
index 2193098..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/JSDTHyperlinkDetector.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.wst.jsdt.core.IClassFile;
-import org.eclipse.wst.jsdt.core.IField;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.ILocalVariable;
-import org.eclipse.wst.jsdt.core.ISourceRange;
-import org.eclipse.wst.jsdt.core.ISourceReference;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.internal.core.JavaElement;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTHyperlinkDetector extends AbstractHyperlinkDetector {
-	private IHyperlink createHyperlink(IJavaScriptElement element, IRegion region, IDocument document) {
-		IHyperlink link = null;
-		if (region != null) {
-			// open local variable in the JSP file...
-			if (element instanceof ISourceReference) {
-				IFile file = null;
-				IPath outsidePath = null;
-				int jspOffset = 0;
-				IStructuredModel sModel = null;
-				// try to locate the file in the workspace
-				try {
-					sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-					if (sModel != null) {
-						//URIResolver resolver = sModel.getResolver();
-						//if (resolver != null) {
-						//	String uriString = resolver.getFileBaseLocation();
-						String uriString = sModel.getBaseLocation();
-							file = getFile(uriString);
-					//	}
-					}
-				} finally {
-					if (sModel != null) {
-						sModel.releaseFromRead();
-					}
-				}
-				// get Java range, translate coordinate to JSP
-				try {
-					ISourceRange range = null;
-					IJsTranslation jspTranslation = getJsTranslation(document);
-					if (jspTranslation != null) {
-						// link to local variable definitions
-						if (element instanceof ILocalVariable) {
-							range = ((ILocalVariable) element).getNameRange();
-							IJavaScriptElement unit=((ILocalVariable) element).getParent();
-							IJavaScriptUnit myUnit = jspTranslation.getCompilationUnit();
-							
-							while(!(unit instanceof IJavaScriptUnit || unit instanceof IClassFile || unit==null)) {
-								unit = ((JavaElement) unit).getParent();
-							}
-							if(unit instanceof IJavaScriptUnit) {
-								IJavaScriptUnit cu = (IJavaScriptUnit)unit;
-								if(cu!=myUnit) {
-									file = getFile(cu.getPath().toString());
-									if(file==null) {
-										outsidePath = cu.getPath();
-									}
-								}
-							}else if(unit instanceof IClassFile) {
-								IClassFile cu = (IClassFile)unit;
-								if(cu!=myUnit) {
-									file = getFile(cu.getPath().toString());
-									if(file==null) {
-										outsidePath = cu.getPath();
-									}
-								}
-							}
-							
-						}
-						// linking to fields of the same compilation unit
-						else if (element.getElementType() == IJavaScriptElement.FIELD) {
-							Object cu = ((IField) element).getJavaScriptUnit();
-							if (cu != null && cu.equals(jspTranslation.getCompilationUnit())) {
-								range = ((ISourceReference) element).getSourceRange();
-							}
-						}
-						// linking to methods of the same compilation unit
-						else if (element.getElementType() == IJavaScriptElement.METHOD) {
-							Object cu = ((IFunction) element).getJavaScriptUnit();
-							if (cu != null && cu.equals(jspTranslation.getCompilationUnit())) {
-								range = ((ISourceReference) element).getSourceRange();
-							}
-						}
-					}
-					if (range != null && file != null) {
-						jspOffset = range.getOffset();
-						if (jspOffset >= 0) {
-							link = new WorkspaceFileHyperlink(region, file, new Region(jspOffset, range.getLength()));
-						}
-					}else if (range!=null && outsidePath!=null) {
-						jspOffset = range.getOffset();
-						if (jspOffset >= 0) {
-							link = new ExternalFileHyperlink(region,outsidePath.toFile());
-						}
-					}
-				} catch (JavaScriptModelException jme) {
-					Logger.log(Logger.WARNING_DEBUG, jme.getMessage(), jme);
-				}
-			}
-			if (link == null) {
-				link = new JSDTHyperlink(region, element);
-			}
-		}
-		return link;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlinkDetector#detectHyperlinks(org.eclipse.jface.text.ITextViewer,
-	 *      org.eclipse.jface.text.IRegion, boolean)
-	 */
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-		List hyperlinks = new ArrayList(0);
-		if (region != null && textViewer != null) {
-			IDocument document = textViewer.getDocument();
-			IJsTranslation jsTranslation = getJsTranslation(document);
-			if (jsTranslation != null) {
-				IJavaScriptElement[] elements = jsTranslation.getElementsFromJsRange(region.getOffset(), region.getOffset() + region.getLength());
-				if (elements != null && elements.length > 0) {
-					// create a hyperlink for each JavaScript element
-					for (int i = 0; i < elements.length; ++i) {
-						IJavaScriptElement element = elements[i];
-						// find hyperlink range for Java element
-						IRegion hyperlinkRegion = selectWord(document, region.getOffset());
-						IHyperlink link = createHyperlink(element, hyperlinkRegion, document);
-						if (link != null) {
-							hyperlinks.add(link);
-						}
-					}
-				}
-			}
-		}
-		if (hyperlinks.size() == 0) {
-			return null;
-		}
-		return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-	}
-	
-	/**
-	 * Returns an IFile from the given uri if possible, null if cannot find file
-	 * from uri.
-	 * 
-	 * @param fileString
-	 *            file system path
-	 * @return returns IFile if fileString exists in the workspace
-	 */
-	private IFile getFile(String fileString) {
-		IFile file = null;
-		if (fileString != null) {
-			IResource resource  = ResourcesPlugin.getWorkspace().getRoot().findMember(fileString);
-			if(resource!=null && resource instanceof IFile) {
-				file = (IFile)resource;
-			}
-		}
-		return file;
-	}
-	
-	/**
-	 * Get JSP translation object
-	 * 
-	 * @return JSPTranslation if one exists, null otherwise
-	 */
-	private IJsTranslation getJsTranslation(IDocument document) {
-		IJsTranslation translation = null;
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (xmlModel != null) {
-				IDOMDocument xmlDoc = xmlModel.getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-				if (adapter != null) {
-					translation = adapter.getJsTranslation(true);
-				}
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return translation;
-	}
-	
-	/**
-	 * Java always selects word when defining region
-	 * 
-	 * @param document
-	 * @param anchor
-	 * @return IRegion
-	 */
-	private IRegion selectWord(IDocument document, int anchor) {
-		try {
-			int offset = anchor;
-			char c;
-			while (offset >= 0) {
-				c = document.getChar(offset);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				--offset;
-			}
-			int start = offset;
-			offset = anchor;
-			int length = document.getLength();
-			while (offset < length) {
-				c = document.getChar(offset);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				++offset;
-			}
-			int end = offset;
-			if (start == end) {
-				return new Region(start, 0);
-			}
-			return new Region(start + 1, end - start - 1);
-		} catch (BadLocationException x) {
-			return null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java
deleted file mode 100644
index ea48fbb..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/WorkspaceFileHyperlink.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.html.ui.internal.HTMLUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-class WorkspaceFileHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	private IFile fFile;
-	private IRegion fHighlightRange;
-	private IRegion fRegion;
-	
-	public WorkspaceFileHyperlink(IRegion region, IFile file) {
-		fRegion = region;
-		fFile = file;
-	}
-	
-	public WorkspaceFileHyperlink(IRegion region, IFile file, IRegion range) {
-		fRegion = region;
-		fFile = file;
-		fHighlightRange = range;
-	}
-	
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		String path = fFile.getFullPath().toString();
-		if (path.length() > 60) {
-			path = path.substring(0, 25) + "..." + path.substring(path.length() - 25, path.length());
-		}
-		return NLS.bind(HTMLUIMessages.Open, path);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	public void open() {
-		if (fFile != null && fFile.exists()) {
-			try {
-				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editor = IDE.openEditor(page, fFile, true);
-				// highlight range in editor if possible
-				if (fHighlightRange != null && editor instanceof ITextEditor) {
-					((ITextEditor) editor).selectAndReveal(fHighlightRange.getOffset(), fHighlightRange.getLength());
-				}
-			} catch (PartInitException pie) {
-				Logger.log(Logger.WARNING_DEBUG, pie.getMessage(), pie);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/XMLHyperlinkDetector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/XMLHyperlinkDetector.java
deleted file mode 100644
index bf603d0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/hyperlink/XMLHyperlinkDetector.java
+++ /dev/null
@@ -1,502 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.hyperlink;
-
-import java.io.File;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.URLHyperlink;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class XMLHyperlinkDetector implements IHyperlinkDetector {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.wst.jsdt.web.ui.internal.hyperlink
-	private final String HTTP_PROTOCOL = "http://";//$NON-NLS-1$
-	private final String NO_NAMESPACE_SCHEMA_LOCATION = "noNamespaceSchemaLocation"; //$NON-NLS-1$
-	private final String SCHEMA_LOCATION = "schemaLocation"; //$NON-NLS-1$
-	private final String XMLNS = "xmlns"; //$NON-NLS-1$
-	private final String XSI_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-	
-	/**
-	 * Create the appropriate hyperlink
-	 * 
-	 * @param uriString
-	 * @param hyperlinkRegion
-	 * @return IHyperlink
-	 */
-	private IHyperlink createHyperlink(String uriString, IRegion hyperlinkRegion, IDocument document, Node node) {
-		IHyperlink link = null;
-		if (isHttp(uriString)) {
-			link = new URLHyperlink(hyperlinkRegion, uriString);
-		} else {
-			// try to locate the file in the workspace
-			File systemFile = getFileFromUriString(uriString);
-			if (systemFile != null) {
-				String systemPath = systemFile.getPath();
-				IFile file = getFile(systemPath);
-				if (file != null) {
-					// this is a WorkspaceFileHyperlink since file exists in
-					// workspace
-					link = new WorkspaceFileHyperlink(hyperlinkRegion, file);
-				} else {
-					// this is an ExternalFileHyperlink since file does not
-					// exist in workspace
-					link = new ExternalFileHyperlink(hyperlinkRegion, systemFile);
-				}
-			}
-		}
-		return link;
-	}
-	
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-		// for now, only capable of creating 1 hyperlink
-		List hyperlinks = new ArrayList(0);
-		if (region != null && textViewer != null) {
-			IDocument document = textViewer.getDocument();
-			Node currentNode = getCurrentNode(document, region.getOffset());
-			if (currentNode != null) {
-				String uriString = null;
-				if (currentNode.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
-					// doctype nodes
-					uriString = getURIString(currentNode, document);
-				} else if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
-					// element nodes
-					Attr currentAttr = getCurrentAttrNode(currentNode, region.getOffset());
-					if (currentAttr != null) {
-						// try to find link for current attribute
-						// resolve attribute value
-						uriString = getURIString(currentAttr, document);
-						// verify validity of uri string
-						if (uriString == null || !isValidURI(uriString)) {
-							// reset current attribute
-							currentAttr = null;
-						}
-					}
-					if (currentAttr == null) {
-						// try to find a linkable attribute within element
-						currentAttr = getLinkableAttr((Element) currentNode);
-						if (currentAttr != null) {
-							uriString = getURIString(currentAttr, document);
-						}
-					}
-					currentNode = currentAttr;
-				}
-				// try to create hyperlink from information gathered
-				if (uriString != null && currentNode != null && isValidURI(uriString)) {
-					IRegion hyperlinkRegion = getHyperlinkRegion(currentNode);
-					IHyperlink hyperlink = createHyperlink(uriString, hyperlinkRegion, document, currentNode);
-					if (hyperlink != null) {
-						hyperlinks.add(hyperlink);
-					}
-				}
-			}
-		}
-		if (hyperlinks.size() == 0) {
-			return null;
-		}
-		return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-	}
-	
-	/**
-	 * Get the base location from the current model (local file system)
-	 */
-	private String getBaseLocation(IDocument document) {
-		String baseLoc = null;
-		// get the base location from the current model
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (sModel != null) {
-				IPath location = new Path(sModel.getBaseLocation());
-				if (location.toFile().exists()) {
-					baseLoc = location.toString();
-				} else {
-					if (location.segmentCount() > 1) {
-						baseLoc = ResourcesPlugin.getWorkspace().getRoot().getFile(location).getLocation().toString();
-					} else {
-						baseLoc = ResourcesPlugin.getWorkspace().getRoot().getLocation().append(location).toString();
-					}
-				}
-			}
-		} finally {
-			if (sModel != null) {
-				sModel.releaseFromRead();
-			}
-		}
-		return baseLoc;
-	}
-	
-	/**
-	 * Get the CMElementDeclaration for an element
-	 * 
-	 * @param element
-	 * @return CMElementDeclaration
-	 */
-	private CMElementDeclaration getCMElementDeclaration(Element element) {
-		CMElementDeclaration ed = null;
-		ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		if (mq != null) {
-			ed = mq.getCMElementDeclaration(element);
-		}
-		return ed;
-	}
-	
-	/**
-	 * Returns the attribute node within node at offset
-	 * 
-	 * @param node
-	 * @param offset
-	 * @return Attr
-	 */
-	private Attr getCurrentAttrNode(Node node, int offset) {
-		if ((node instanceof IndexedRegion) && ((IndexedRegion) node).contains(offset) && (node.hasAttributes())) {
-			NamedNodeMap attrs = node.getAttributes();
-			// go through each attribute in node and if attribute contains
-			// offset, return that attribute
-			for (int i = 0; i < attrs.getLength(); ++i) {
-				// assumption that if parent node is of type IndexedRegion,
-				// then its attributes will also be of type IndexedRegion
-				IndexedRegion attRegion = (IndexedRegion) attrs.item(i);
-				if (attRegion.contains(offset)) {
-					return (Attr) attrs.item(i);
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the node the cursor is currently on in the document. null if no
-	 * node is selected
-	 * 
-	 * @param offset
-	 * @return Node either element, doctype, text, or null
-	 */
-	private Node getCurrentNode(IDocument document, int offset) {
-		// get the current node at the offset (returns either: element,
-		// doctype, text)
-		IndexedRegion inode = null;
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			inode = sModel.getIndexedRegion(offset);
-			if (inode == null) {
-				inode = sModel.getIndexedRegion(offset - 1);
-			}
-		} finally {
-			if (sModel != null) {
-				sModel.releaseFromRead();
-			}
-		}
-		if (inode instanceof Node) {
-			return (Node) inode;
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns an IFile from the given uri if possible, null if cannot find file
-	 * from uri.
-	 * 
-	 * @param fileString
-	 *            file system path
-	 * @return returns IFile if fileString exists in the workspace
-	 */
-	private IFile getFile(String fileString) {
-		IFile file = null;
-		if (fileString != null) {
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(new Path(fileString));
-			for (int i = 0; i < files.length && file == null; i++) {
-				if (files[i].exists()) {
-					file = files[i];
-				}
-			}
-		}
-		return file;
-	}
-	
-	/**
-	 * Create a file from the given uri string
-	 * 
-	 * @param uriString -
-	 *            assumes uriString is not http://
-	 * @return File created from uriString if possible, null otherwise
-	 */
-	private File getFileFromUriString(String uriString) {
-		File file = null;
-		try {
-			// first just try to create a file directly from uriString as
-			// default in case create file from uri does not work
-			file = new File(uriString);
-			// try to create file from uri
-			URI uri = new URI(uriString);
-			file = new File(uri);
-		} catch (Exception e) {
-			// if exception is thrown while trying to create File just ignore
-			// and file will be null
-		}
-		return file;
-	}
-	
-	private IRegion getHyperlinkRegion(Node node) {
-		IRegion hyperRegion = null;
-		if (node != null) {
-			short nodeType = node.getNodeType();
-			if (nodeType == Node.DOCUMENT_TYPE_NODE) {
-				// handle doc type node
-				IDOMNode docNode = (IDOMNode) node;
-				hyperRegion = new Region(docNode.getStartOffset(), docNode.getEndOffset() - docNode.getStartOffset());
-			} else if (nodeType == Node.ATTRIBUTE_NODE) {
-				// handle attribute nodes
-				IDOMAttr att = (IDOMAttr) node;
-				// do not include quotes in attribute value region
-				int regOffset = att.getValueRegionStartOffset();
-				ITextRegion valueRegion = att.getValueRegion();
-				if (valueRegion != null) {
-					int regLength = valueRegion.getTextLength();
-					String attValue = att.getValueRegionText();
-					if (StringUtils.isQuoted(attValue)) {
-						++regOffset;
-						regLength = regLength - 2;
-					}
-					hyperRegion = new Region(regOffset, regLength);
-				}
-			}
-		}
-		return hyperRegion;
-	}
-	
-	/**
-	 * Attempts to find an attribute within element that is openable.
-	 * 
-	 * @param element -
-	 *            cannot be null
-	 * @return Attr attribute that can be used for open on, null if no attribute
-	 *         could be found
-	 */
-	private Attr getLinkableAttr(Element element) {
-		CMElementDeclaration ed = getCMElementDeclaration(element);
-		// get the list of attributes for this node
-		NamedNodeMap attrs = element.getAttributes();
-		for (int i = 0; i < attrs.getLength(); ++i) {
-			// check if this attribute is "openOn-able"
-			Attr att = (Attr) attrs.item(i);
-			if (isLinkableAttr(att, ed)) {
-				return att;
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Find the location hint for the given namespaceURI if it exists
-	 * 
-	 * @param elementNode -
-	 *            cannot be null
-	 * @param namespaceURI -
-	 *            cannot be null
-	 * @return location hint (systemId) if it was found, null otherwise
-	 */
-	private String getLocationHint(Element elementNode, String namespaceURI) {
-		Attr schemaLocNode = elementNode.getAttributeNodeNS(XSI_NAMESPACE_URI, SCHEMA_LOCATION);
-		if (schemaLocNode != null) {
-			StringTokenizer st = new StringTokenizer(schemaLocNode.getValue());
-			while (st.hasMoreTokens()) {
-				String publicId = st.hasMoreTokens() ? st.nextToken() : null;
-				String systemId = st.hasMoreTokens() ? st.nextToken() : null;
-				// found location hint
-				if (namespaceURI.equalsIgnoreCase(publicId)) {
-					return systemId;
-				}
-			}
-		}
-		return null;
-	}
-	
-	/**
-	 * Returns the URI string
-	 * 
-	 * @param node -
-	 *            assumes not null
-	 */
-	private String getURIString(Node node, IDocument document) {
-		String resolvedURI = null;
-		// need the base location, publicId, and systemId for URIResolver
-		String baseLoc = null;
-		String publicId = null;
-		String systemId = null;
-		short nodeType = node.getNodeType();
-		// handle doc type node
-		if (nodeType == Node.DOCUMENT_TYPE_NODE) {
-			baseLoc = getBaseLocation(document);
-			publicId = ((DocumentType) node).getPublicId();
-			systemId = ((DocumentType) node).getSystemId();
-		} else if (nodeType == Node.ATTRIBUTE_NODE) {
-			// handle attribute node
-			Attr attrNode = (Attr) node;
-			String attrName = attrNode.getName();
-			String attrValue = attrNode.getValue();
-			attrValue = StringUtils.strip(attrValue);
-			if (attrValue != null && attrValue.length() > 0) {
-				baseLoc = getBaseLocation(document);
-				// handle schemaLocation attribute
-				String prefix = DOMNamespaceHelper.getPrefix(attrName);
-				String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attrName);
-				if ((XMLNS.equals(prefix)) || (XMLNS.equals(unprefixedName))) {
-					publicId = attrValue;
-					systemId = getLocationHint(attrNode.getOwnerElement(), publicId);
-					if (systemId == null) {
-						systemId = attrValue;
-					}
-				} else if ((XSI_NAMESPACE_URI.equals(DOMNamespaceHelper.getNamespaceURI(attrNode))) && (SCHEMA_LOCATION.equals(unprefixedName))) {
-					// for now just use the first pair
-					// need to look into being more precise
-					StringTokenizer st = new StringTokenizer(attrValue);
-					publicId = st.hasMoreTokens() ? st.nextToken() : null;
-					systemId = st.hasMoreTokens() ? st.nextToken() : null;
-					// else check if xmlns publicId = value
-				} else {
-					systemId = attrValue;
-				}
-			}
-		}
-		resolvedURI = resolveURI(baseLoc, publicId, systemId);
-		return resolvedURI;
-	}
-	
-	/**
-	 * Returns true if this uriString is an http string
-	 * 
-	 * @param uriString
-	 * @return true if uriString is http string, false otherwise
-	 */
-	private boolean isHttp(String uriString) {
-		boolean isHttp = false;
-		if (uriString != null) {
-			String tempString = uriString.toLowerCase();
-			if (tempString.startsWith(HTTP_PROTOCOL)) {
-				isHttp = true;
-			}
-		}
-		return isHttp;
-	}
-	
-	/**
-	 * Checks to see if the given attribute is openable. Attribute is openable
-	 * if it is a namespace declaration attribute or if the attribute value is
-	 * of type URI.
-	 * 
-	 * @param attr
-	 *            cannot be null
-	 * @param cmElement
-	 *            CMElementDeclaration associated with the attribute (can be
-	 *            null)
-	 * @return true if this attribute is "openOn-able" false otherwise
-	 */
-	private boolean isLinkableAttr(Attr attr, CMElementDeclaration cmElement) {
-		String attrName = attr.getName();
-		String prefix = DOMNamespaceHelper.getPrefix(attrName);
-		String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attrName);
-		// determine if attribute is namespace declaration
-		if ((XMLNS.equals(prefix)) || (XMLNS.equals(unprefixedName))) {
-			return true;
-		}
-		// determine if attribute contains schema location
-		if ((XSI_NAMESPACE_URI.equals(DOMNamespaceHelper.getNamespaceURI(attr))) && ((SCHEMA_LOCATION.equals(unprefixedName)) || (NO_NAMESPACE_SCHEMA_LOCATION.equals(unprefixedName)))) {
-			return true;
-		}
-		// determine if attribute value is of type URI
-		if (cmElement != null) {
-			CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) cmElement.getAttributes().getNamedItem(attrName);
-			if ((attrDecl != null) && (attrDecl.getAttrType() != null) && (CMDataType.URI.equals(attrDecl.getAttrType().getDataTypeName()))) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * Checks whether the given uriString is really pointing to a file
-	 * 
-	 * @param uriString
-	 * @return boolean
-	 */
-	private boolean isValidURI(String uriString) {
-		boolean isValid = false;
-		if (isHttp(uriString)) {
-			isValid = true;
-		} else {
-			File file = getFileFromUriString(uriString);
-			if (file != null) {
-				isValid = file.isFile();
-			}
-		}
-		return isValid;
-	}
-	
-	/**
-	 * Resolves the given URI information
-	 * 
-	 * @param baseLocation
-	 * @param publicId
-	 * @param systemId
-	 * @return String resolved uri.
-	 */
-	private String resolveURI(String baseLocation, String publicId, String systemId) {
-		// dont resolve if there's nothing to resolve
-		if ((baseLocation == null) && (publicId == null) && (systemId == null)) {
-			return null;
-		}
-		return URIResolverPlugin.createResolver().resolve(baseLocation, publicId, systemId);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java
deleted file mode 100644
index e165f7d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/BasicRefactorSearchRequestor.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.DocumentChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.sse.core.internal.document.DocumentReader;
-import org.eclipse.wst.sse.core.internal.encoding.CodedStreamCreator;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class BasicRefactorSearchRequestor extends SearchRequestor {
-	/**
-	 * Change class that wraps a text edit on the jsp document
-	 */
-	private class RenameChange extends DocumentChange {
-		private String fDescription = JsUIMessages.BasicRefactorSearchRequestor_0;
-		private TextEdit fEdit = null;
-		private IDocument fJSPDoc = null;
-		private IFile fJSPFile = null;
-		
-		public RenameChange(IFile jspFile, IDocument jspDoc, TextEdit edit, String description) {
-			super(JsUIMessages.BasicRefactorSearchRequestor_6, jspDoc);
-			this.fEdit = edit;
-			this.fJSPFile = jspFile;
-			this.fJSPDoc = jspDoc;
-			this.fDescription = description;
-		}
-		
-		
-		public Object getModifiedElement() {
-			return getElement();
-		}
-		
-		
-		public String getName() {
-			return this.fDescription;
-		}
-		
-		
-		public IDocument getPreviewDocument(IProgressMonitor pm) throws CoreException {
-			IDocument copyDoc = new Document(fJSPDoc.get());
-			try {
-				fEdit.apply(copyDoc);
-			} catch (MalformedTreeException e) {
-				// ignore
-			} catch (BadLocationException e) {
-				// ignore
-			}
-			return copyDoc;
-		}
-		
-		/**
-		 * Checks if a document is open in an editor
-		 * 
-		 * @param jspDoc
-		 * @return
-		 */
-		private boolean isOpenInEditor(IDocument jspDoc) {
-			IWorkbenchWindow[] windows = PlatformUI.getWorkbench().getWorkbenchWindows();
-			IWorkbenchWindow w = null;
-			for (int i = 0; i < windows.length; i++) {
-				w = windows[i];
-				IWorkbenchPage page = w.getActivePage();
-				if (page != null) {
-					IEditorReference[] references = page.getEditorReferences();
-					IEditorPart editor = null;
-					Object o = null;
-					IDocument doc = null;
-					for (int j = 0; j < references.length; j++) {
-						editor = references[j].getEditor(true);
-						// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3764
-						// use adapter to get ITextEditor (for things like
-						// page designer)
-						o = editor.getAdapter(ITextEditor.class);
-						if (o != null && o instanceof ITextEditor) {
-							doc = ((ITextEditor) o).getDocumentProvider().getDocument(editor.getEditorInput());
-							if (doc != null && doc.equals(jspDoc)) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-			return false;
-		}
-		
-		
-		public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-			return new RefactoringStatus();
-		}
-		
-		
-		public Change perform(IProgressMonitor pm) throws CoreException {
-			RenameChange undoChange = null;
-			try {
-				if (!isOpenInEditor(this.fJSPDoc)) {
-					// apply edit to JSP doc AND save model
-					undoChange = new RenameChange(this.fJSPFile, this.fJSPDoc, this.fEdit.apply(fJSPDoc), this.fDescription);
-					saveFile(this.fJSPFile, this.fJSPDoc);
-				} else {
-					// just apply edit to JSP document
-					undoChange = new RenameChange(this.fJSPFile, this.fJSPDoc, this.fEdit.apply(fJSPDoc), this.fDescription);
-				}
-			} catch (MalformedTreeException e) {
-				Logger.logException(e);
-			} catch (BadLocationException e) {
-				Logger.logException(e);
-			}
-			return undoChange;
-		}
-		
-		/**
-		 * Performed in an operation since it modifies resources in the
-		 * workspace
-		 * 
-		 * @param jspDoc
-		 * @throws CoreException
-		 */
-		private void saveFile(IFile jspFile, IDocument jspDoc) {
-			SaveJspFileOp op = new SaveJspFileOp(jspFile, jspDoc);
-			try {
-				op.run(JsSearchSupport.getInstance().getProgressMonitor());
-			} catch (InvocationTargetException e) {
-				Logger.logException(e);
-			} catch (InterruptedException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-	// end inner class SaveJspFileOp
-	/**
-	 * Workspace operation to perform save on model for updated documents.
-	 * Should only be done on models not open in an editor.
-	 */
-	private class SaveJspFileOp extends WorkspaceModifyOperation {
-		private IDocument fJSPDoc = null;
-		private IFile fJSPFile = null;
-		
-		public SaveJspFileOp(IFile jspFile, IDocument jspDoc) {
-			this.fJSPDoc = jspDoc;
-			this.fJSPFile = jspFile;
-		}
-		
-		
-		protected void execute(IProgressMonitor monitor) throws CoreException, InvocationTargetException, InterruptedException {
-			// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3765
-			// save file w/ no intermediate model creation
-			CodedStreamCreator codedStreamCreator = new CodedStreamCreator();
-			Reader reader = new DocumentReader(this.fJSPDoc);
-			codedStreamCreator.set(this.fJSPFile, reader);
-			ByteArrayOutputStream codedByteStream = null;
-			InputStream codedStream = null;
-			try {
-				codedByteStream = codedStreamCreator.getCodedByteArrayOutputStream();
-				codedStream = new ByteArrayInputStream(codedByteStream.toByteArray());
-				if (this.fJSPFile.exists()) {
-					this.fJSPFile.setContents(codedStream, true, true, null);
-				} else {
-					this.fJSPFile.create(codedStream, false, null);
-				}
-			} catch (CoreException e) {
-				Logger.logException(e);
-			} catch (IOException e) {
-				Logger.logException(e);
-			} finally {
-				try {
-					if (codedByteStream != null) {
-						codedByteStream.close();
-					}
-					if (codedStream != null) {
-						codedStream.close();
-					}
-				} catch (IOException e) {
-					// unlikely
-				}
-			}
-		}
-	}
-	// end inner class RenameChange
-	/** The type being renamed (the old type) */
-	IJavaScriptElement fElement = null;
-	/** The new name of the type being renamed */
-	private String fNewName = ""; //$NON-NLS-1$
-	/** maps a JSPSearchDocument path -> MultiTextEdit for the java file */
-	private HashMap fSearchDocPath2JavaEditMap = null;
-	
-	public BasicRefactorSearchRequestor(IJavaScriptElement element, String newName) {
-		this.fNewName = newName;
-		this.fElement = element;
-		this.fSearchDocPath2JavaEditMap = new HashMap();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.wst.jsdt.core.search.SearchMatch)
-	 */
-	
-	public void acceptSearchMatch(SearchMatch javaMatch) throws CoreException {
-		String matchDocumentPath = javaMatch.getResource().getFullPath().toString();
-		SearchDocument searchDoc = JsSearchSupport.getInstance().getSearchDocument(matchDocumentPath);
-		if (searchDoc != null && searchDoc instanceof JSDTSearchDocumentDelegate) {
-			String renameText = getRenameText((JSDTSearchDocumentDelegate) searchDoc, javaMatch);
-			// add it for the correct document
-			addJavaEdit(searchDoc.getPath(), new ReplaceEdit(javaMatch.getOffset(), javaMatch.getLength(), renameText));
-		}
-	}
-	
-	/**
-	 * Adds to the multi edit for a give java document.
-	 * 
-	 * @param javaDocument
-	 * @param javaEdit
-	 */
-	private void addJavaEdit(String searchDocPath, ReplaceEdit javaEdit) {
-		Object o = this.fSearchDocPath2JavaEditMap.get(searchDocPath);
-		if (o != null) {
-			MultiTextEdit multi = (MultiTextEdit) o;
-			multi.addChild(javaEdit);
-		} else {
-			// use a multi edit so doc position offsets get updated
-			// automatically
-			// when adding multiple child edits
-			MultiTextEdit multi = new MultiTextEdit();
-			multi.addChild(javaEdit);
-			this.fSearchDocPath2JavaEditMap.put(searchDocPath, multi);
-		}
-	}
-	
-	private Change createChange(JSDTSearchDocumentDelegate searchDoc, TextEdit edit) {
-		IDocument doc = searchDoc.getJspTranslation().getHtmlDocument();
-		String file = searchDoc.getFile().getName();
-		String description = getDescription();
-		try {
-			// document lines are 0 based
-			String lineNumber = Integer.toString(doc.getLineOfOffset(edit.getOffset()) + 1);
-			description += " " + NLS.bind(JsUIMessages.BasicRefactorSearchRequestor_1, new String[] { file, lineNumber }); //$NON-NLS-1$
-		} catch (BadLocationException e) {
-			Logger.logException(e);
-		}
-		return new RenameChange(searchDoc.getFile(), doc, edit, description);
-	}
-	
-	/**
-	 * 
-	 * @return all JSP changes for the search matches for the given Type
-	 */
-	public Change[] getChanges() {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		List changes = new ArrayList();
-		Iterator keys = fSearchDocPath2JavaEditMap.keySet().iterator();
-		String searchDocPath = null;
-		SearchDocument delegate = null;
-		while (keys.hasNext()) {
-			// create on the fly
-			searchDocPath = (String) keys.next();
-			MultiTextEdit javaEdit = (MultiTextEdit) fSearchDocPath2JavaEditMap.get(searchDocPath);
-			delegate = support.getSearchDocument(searchDocPath);
-			if (delegate != null && delegate instanceof JSDTSearchDocumentDelegate) {
-				JSDTSearchDocumentDelegate javaDelegate = (JSDTSearchDocumentDelegate) delegate;
-				changes.add(createChange(javaDelegate, javaEdit));
-			}
-		}
-		return (Change[]) changes.toArray(new Change[changes.size()]);
-	}
-	
-	/**
-	 * Subclasses should override to better describe the change.
-	 * 
-	 * @return
-	 */
-	protected String getDescription() {
-		return ""; //$NON-NLS-1$
-	}
-	
-	public IJavaScriptElement getElement() {
-		return this.fElement;
-	}
-	
-	/**
-	 * @return the new name for the Type
-	 */
-	public String getNewName() {
-		return this.fNewName;
-	}
-	
-	/**
-	 * @param searchDoc
-	 * @return
-	 */
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		return getNewName();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java
deleted file mode 100644
index d671fcf..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPJavaSelectionProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class JSPJavaSelectionProvider {
-	static IJavaScriptElement[] getSelection(ITextEditor textEditor) {
-		IJavaScriptElement[] elements = null;
-		IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-		ISelection selection = textEditor.getSelectionProvider().getSelection();
-		if (selection instanceof ITextSelection) {
-			ITextSelection textSelection = (ITextSelection) selection;
-			// get the JSP translation object for this editor's document
-			IStructuredModel model = null;
-			try {
-				model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-				if (model instanceof IDOMModel) {
-					IDOMModel xmlModel = (IDOMModel) model;
-					IDOMDocument xmlDoc = xmlModel.getDocument();
-					JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-					if (adapter != null) {
-						IJsTranslation translation = adapter.getJsTranslation(true);
-						elements = translation.getElementsFromJsRange(textSelection.getOffset(), textSelection.getOffset() + textSelection.getLength());
-					}
-				}
-			} finally {
-				if (model != null) {
-					model.releaseFromRead();
-				}
-			}
-		}
-		if (elements == null) {
-			elements = new IJavaScriptElement[0];
-		}
-		return elements;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java
deleted file mode 100644
index 447afce..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameChange.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JSPMethodRenameChange extends Change {
-	public static Change[] createChangesFor(IFunction method, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		BasicRefactorSearchRequestor requestor = new JSPMethodRenameRequestor(method, newName);
-		support.searchRunnable(method, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		// pa_TODO Auto-generated method stub
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// pa_TODO return the "undo" change here
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java
deleted file mode 100644
index 27f7ddb..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameParticipant.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 6, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JSPMethodRenameParticipant extends RenameParticipant {
-	private IFunction fMethod = null;
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		Change[] changes = JSPMethodRenameChange.createChangesFor(this.fMethod, getArguments().getNewName());
-		CompositeChange multiChange = null;
-		if (changes.length > 0) {
-			multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-		}
-		return multiChange;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fMethod != null) {
-			try {
-				name = this.fMethod.getSource();
-			} catch (JavaScriptModelException e) {
-				Logger.logException(e);
-			}
-		}
-		return name;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IFunction) {
-			this.fMethod = (IFunction) element;
-			return true;
-		}else if (element instanceof IJavaWebNode) {
-			if(((IJavaWebNode)element).getJavaElement() instanceof IFunction) {
-				this.fMethod = (IFunction) ((IJavaWebNode)element).getJavaElement();
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java
deleted file mode 100644
index 11e6833..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMethodRenameRequestor.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import java.text.MessageFormat;
-
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JSPMethodRenameRequestor extends BasicRefactorSearchRequestor {
-	public JSPMethodRenameRequestor(IJavaScriptElement element, String newName) {
-		super(element, newName);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String methodName = getElement().getElementName();
-		String newName = getNewName();
-		String description = MessageFormat.format(JsUIMessages.BasicRefactorSearchRequestor_3, new String[] { methodName, newName });
-		return description;
-	}
-	
-	
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		String javaText = searchDoc.getJspTranslation().getJsText();
-		String methodText = javaText.substring(javaMatch.getOffset(), javaMatch.getOffset() + javaMatch.getLength());
-		String methodSuffix = methodText.substring(methodText.indexOf("(")); //$NON-NLS-1$
-		return getNewName() + methodSuffix;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java
deleted file mode 100644
index 0679a10..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPMoveElementActionDelegate.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * An action delegate that launches JDT move element wizard
- * 
- * Still relies heavily on internal API will change post 3.0 with public move
- * support https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
- */
-public class JSPMoveElementActionDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
-	// private IEditorPart fEditor;
-	public void dispose() {
-	// nulling out just in case
-	// fEditor = null;
-	}
-	
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(JsUIMessages.MoveElement_label);
-			action.setToolTipText(JsUIMessages.MoveElement_label);
-		}
-	}
-	
-	public void init(IViewPart view) {
-	// do nothing
-	}
-	
-	public void run(IAction action) {
-	// no-op until we know how we're supposed to use this
-	// eclipse 3.2M5
-	// public move support:
-	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=61817
-	// IJavaScriptElement[] elements = getSelectedElements();
-	// if (elements.length > 0) {
-	//
-	// // need to check if it's movable
-	// try {
-	// JavaMoveProcessor processor =
-	// JavaMoveProcessor.create(getResources(elements), elements);
-	//				
-	// Shell parent =
-	// PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
-	// MoveRefactoring refactoring = new MoveRefactoring(processor);
-	//
-	// RefactoringWizard wizard = createWizard(refactoring);
-	//
-	// /*
-	// * We want to get the shell from the refactoring dialog but
-	// * it's not known at this point, so we pass the wizard and
-	// * then, once the dialog is open, we will have access to its
-	// * shell.
-	// */
-	//
-	// processor.setCreateTargetQueries(new CreateTargetQueries(wizard));
-	// processor.setReorgQueries(new ReorgQueries(wizard));
-	// // String openRefactoringWizMsg =
-	// //
-	// RefactoringMessages.getString("OpenRefactoringWizardAction.refactoring");
-	// // //$NON-NLS-1$
-	// String openRefactoringWizMsg = JSPUIMessages.MoveElementWizard; //
-	// "Move
-	// // the
-	// // selected
-	// // elements";
-	// // //$NON-NLS-1$
-	// new RefactoringStarter().activate(refactoring, wizard, parent,
-	// openRefactoringWizMsg, true);
-	//
-	// PlatformStatusLineUtil.clearStatusLine();
-	//
-	// }
-	// catch (JavaScriptModelException e) {
-	// Logger.logException(e);
-	// }
-	// }
-	// else {
-	// PlatformStatusLineUtil.displayErrorMessage(JSPUIMessages.JSPMoveElementAction_0);
-	// //$NON-NLS-1$
-	// }
-	}
-	
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		PlatformStatusLineUtil.clearStatusLine();
-	}
-	
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-	// fEditor = targetEditor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameChange.java
deleted file mode 100644
index 8a8a378..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameChange.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JSPPackageRenameChange extends Change {
-	public static Change[] createChangesFor(IPackageFragment pkg, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		BasicRefactorSearchRequestor requestor = new JSPPackageRenameRequestor(pkg, newName);
-		support.searchRunnable(pkg, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		// return this.pkg;
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// TODO return the "undo" change here
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameParticipant.java
deleted file mode 100644
index 161f73a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameParticipant.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * Remember to change the plugin.xml file if the name of this class changes.
- * 
- * @author pavery
- */
-public class JSPPackageRenameParticipant extends RenameParticipant {
-	private IPackageFragment fPkg = null;
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		Change[] changes = JSPPackageRenameChange.createChangesFor(this.fPkg, getArguments().getNewName());
-		CompositeChange multiChange = null;
-		if (changes.length > 0) {
-			multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-		}
-		return multiChange;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fPkg != null) {
-			name = this.fPkg.getElementName();
-		}
-		return name;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IPackageFragment) {
-			this.fPkg = (IPackageFragment) element;
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java
deleted file mode 100644
index 6fa4592..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPPackageRenameRequestor.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JSPPackageRenameRequestor extends BasicRefactorSearchRequestor {
-	/**
-	 * Element is the old package. newName is the new package name.
-	 * 
-	 * @param element
-	 * @param newName
-	 */
-	public JSPPackageRenameRequestor(IJavaScriptElement element, String newName) {
-		super(element, newName);
-	}
-	
-	/*
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String packageName = getElement().getElementName();
-		String newName = getNewName();
-		String description = NLS.bind(JsUIMessages.BasicRefactorSearchRequestor_5, (new String[] { packageName, newName }));
-		return description;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java
deleted file mode 100644
index 7fd2fb5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPRenameElementActionDelegate.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IFunction;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.ui.refactoring.RenameSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSPRenameElementActionDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
-	private IEditorPart fEditor;
-	
-	public void dispose() {
-		// nulling out just in case
-		fEditor = null;
-	}
-	
-	private IJavaScriptElement getSelectedElement() {
-		IJavaScriptElement element = null;
-		if (fEditor instanceof ITextEditor) {
-			IJavaScriptElement[] elements = JSPJavaSelectionProvider.getSelection((ITextEditor) fEditor);
-			if (elements.length == 1) {
-				element = elements[0];
-			}
-		}
-		return element;
-	}
-	
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(JsUIMessages.RenameElement_label);
-			action.setToolTipText(JsUIMessages.RenameElement_label);
-		}
-	}
-	
-	public void init(IViewPart view) {
-	// do nothing
-	}
-	
-	public void run(IAction action) {
-		IJavaScriptElement element = getSelectedElement();
-		if (element != null) {
-			RenameSupport renameSupport = null;
-			try {
-				switch (element.getElementType()) {
-					case IJavaScriptElement.TYPE:
-						renameSupport = RenameSupport.create((IType) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
-					break;
-					case IJavaScriptElement.METHOD:
-						renameSupport = RenameSupport.create((IFunction) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
-					break;
-					case IJavaScriptElement.PACKAGE_FRAGMENT:
-						renameSupport = RenameSupport.create((IPackageFragment) element, element.getElementName(), RenameSupport.UPDATE_REFERENCES);
-					break;
-				}
-				if (renameSupport != null) {
-					renameSupport.openDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
-					PlatformStatusLineUtil.clearStatusLine();
-				}
-			} catch (CoreException e) {
-				Logger.logException(e);
-			}
-		} else {
-			PlatformStatusLineUtil.displayErrorMessage(JsUIMessages.JSPRenameElementAction_0);
-			PlatformStatusLineUtil.addOneTimeClearListener();
-		}
-	}
-	
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-	
-	public void selectionChanged(IAction action, ISelection selection) {
-		PlatformStatusLineUtil.clearStatusLine();
-	}
-	
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		fEditor = targetEditor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveChange.java
deleted file mode 100644
index 6eaa39b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveChange.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSPTypeMoveChange extends Change {
-	public static Change[] createChangesFor(IType type, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		JSPTypeMoveRequestor requestor = new JSPTypeMoveRequestor(type, newName);
-		support.searchRunnable(type, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// TODO return the "undo" change here
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveParticipant.java
deleted file mode 100644
index 8088e46..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveParticipant.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.MoveParticipant;
-import org.eclipse.wst.jsdt.core.IPackageFragment;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSPTypeMoveParticipant extends MoveParticipant {
-	IType fType = null;
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		if (pm != null && pm.isCanceled()) {
-			return null;
-		}
-		CompositeChange multiChange = null;
-		Object dest = getArguments().getDestination();
-		if (dest instanceof IPackageFragment) {
-			Change[] changes = JSPTypeMoveChange.createChangesFor(fType, ((IPackageFragment) dest).getElementName());
-			if (changes.length > 0) {
-				multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-			}
-		}
-		return multiChange;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fType != null) {
-			name = this.fType.getElementName();
-		}
-		return name;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IType) {
-			this.fType = (IType) element;
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java
deleted file mode 100644
index e760809..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeMoveRequestor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import java.text.MessageFormat;
-
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-//import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JSPTypeMoveRequestor extends BasicRefactorSearchRequestor {
-	/**
-	 * @param element
-	 * @param newName
-	 */
-	public JSPTypeMoveRequestor(IJavaScriptElement element, String newPackage) {
-		super(element, newPackage);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String typeName = getElement().getElementName();
-		String newName = getNewName();
-		String description = MessageFormat.format(JsUIMessages.BasicRefactorSearchRequestor_2, new String[] { typeName, newName });
-		return description;
-	}
-	
-	
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		String renameText = getElement().getElementName();
-	//	JsTranslation trans = searchDoc.getJspTranslation();
-		//String matchText = trans.getJsText().substring(javaMatch.getOffset(), javaMatch.getOffset() + javaMatch.getLength());
-		// if it's an import or jsp:useBean, we need to add the package name as
-		// well
-// if (trans.isImport(javaMatch.getOffset())
-//			
-// || isFullyQualified(matchText)) {
-// if (!getNewName().equals("")) {
-// // getNewName() is the pkg name
-// renameText = getNewName() + "." + renameText; //$NON-NLS-1$
-// }
-// }
-		return renameText;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameChange.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameChange.java
deleted file mode 100644
index 10ad88a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameChange.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JSPTypeRenameChange extends Change {
-	public static Change[] createChangesFor(IType type, String newName) {
-		JsSearchSupport support = JsSearchSupport.getInstance();
-		// should be handled by JSPIndexManager
-		// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=3036
-		// support.indexWorkspaceAndWait();
-		JSPTypeRenameRequestor requestor = new JSPTypeRenameRequestor(type, newName);
-		support.searchRunnable(type, new JsSearchScope(), requestor);
-		return requestor.getChanges();
-	}
-	
-	
-	public Object getModifiedElement() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	
-	public String getName() {
-		return JsUIMessages.JSP_changes;
-	}
-	
-	
-	public void initializeValidationData(IProgressMonitor pm) {
-	// pa_TODO implement
-	// must be implemented to decide correct value of isValid
-	}
-	
-	
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		// pa_TODO implement
-		// This method must ensure that the change object is still valid.
-		// This is in particular interesting when performing an undo change
-		// since the workspace could have changed since the undo change has
-		// been created.
-		return new RefactoringStatus();
-	}
-	
-	
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		// TODO return the "undo" change here
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java
deleted file mode 100644
index 56a46dd..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameParticipant.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * Remember to change the plugin.xml file if the name of this class changes.
- * 
- * @author pavery
- */
-public class JSPTypeRenameParticipant extends RenameParticipant {
-	private IType fType = null;
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#checkConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	
-	public RefactoringStatus checkConditions(IProgressMonitor pm, CheckConditionsContext context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	
-	public Change createChange(IProgressMonitor pm) throws CoreException {
-		Change[] changes = JSPTypeRenameChange.createChangesFor(fType, getArguments().getNewName());
-		CompositeChange multiChange = null;
-		if (changes.length > 0) {
-			multiChange = new CompositeChange(JsUIMessages.JSP_changes, changes);
-		}
-		return multiChange;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	
-	public String getName() {
-		String name = ""; //$NON-NLS-1$
-		if (this.fType != null) {
-			try {
-				name = this.fType.getSource();
-			} catch (JavaScriptModelException e) {
-				Logger.logException(e);
-			}
-		}
-		return name;
-	}
-	
-	/**
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	
-	protected boolean initialize(Object element) {
-		if (element instanceof IType) {
-			this.fType = (IType) element;
-			return true;
-		}else if (element instanceof IJavaWebNode) {
-			if(((IJavaWebNode)element).getJavaElement() instanceof IType) {
-				this.fType = (IType) ((IJavaWebNode)element).getJavaElement();
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameRequestor.java
deleted file mode 100644
index fbce86e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/refactoring/JSPTypeRenameRequestor.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.refactoring;
-
-import java.text.MessageFormat;
-
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-//import org.eclipse.wst.jsdt.web.core.internal.java.JsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * Creates document change(s) for a type rename. Changes are created for every
- * type "match" in the workspace
- * 
- * @author pavery
- */
-public class JSPTypeRenameRequestor extends BasicRefactorSearchRequestor {
-	public JSPTypeRenameRequestor(IType type, String newName) {
-		super(type, newName);
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.web.ui.internal.java.refactoring.BasicRefactorSearchRequestor#getDescription()
-	 */
-	
-	protected String getDescription() {
-		String typeName = getElement().getElementName();
-		String newName = getNewName();
-		String description = MessageFormat.format(JsUIMessages.BasicRefactorSearchRequestor_4, new String[] { typeName, newName });
-		return description;
-	}
-	
-	
-	protected String getRenameText(JSDTSearchDocumentDelegate searchDoc, SearchMatch javaMatch) {
-		String renameText = getNewName();
-	//	String pkg = getType().getPackageFragment().getElementName();
-	//	JsTranslation trans = searchDoc.getJspTranslation();
-	//	String matchText = trans.getJsText().substring(javaMatch.getOffset(), javaMatch.getOffset() + javaMatch.getLength());
-		// if it's an import or jsp:useBean or fully qualified type, we need to
-		// add the package name as well
-// if (trans.isImport(javaMatch.getOffset())
-// || /* trans.isUseBean(javaMatch.getOffset()) ||
-// */isFullyQualified(matchText)) {
-// if (!pkg.equals("")) {
-// renameText = pkg + "." + renameText; //$NON-NLS-1$
-// }
-// }
-		return renameText;
-	}
-	
-//	private IType getType() {
-//		return (IType) getElement();
-//	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/BasicJsSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/BasicJsSearchRequestor.java
deleted file mode 100644
index 31d10ba..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/BasicJsSearchRequestor.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.core.search.SearchMatch;
-import org.eclipse.wst.jsdt.core.search.SearchParticipant;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JSDTSearchDocumentDelegate;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class BasicJsSearchRequestor extends SearchRequestor {
-	// for debugging
-	private static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspsearch"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Maps java search coordinates to corresponding JSP coordinates. Adds the
-	 * matches to the Search Results view.
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#acceptSearchMatch(org.eclipse.wst.jsdt.core.search.SearchMatch)
-	 */
-	
-	public void acceptSearchMatch(SearchMatch match) throws CoreException {
-		if (JsSearchSupport.getInstance().isCanceled()) {
-			return;
-		}
-		String matchDocumentPath = match.getResource().getFullPath().toString();
-		SearchDocument searchDoc = JsSearchSupport.getInstance().getSearchDocument(matchDocumentPath);
-		if (searchDoc != null && searchDoc instanceof JSDTSearchDocumentDelegate) {
-			JSDTSearchDocumentDelegate javaSearchDoc = (JSDTSearchDocumentDelegate) searchDoc;
-			int jspStart = match.getOffset();
-			int jspEnd = match.getOffset() + match.getLength();
-			IJsTranslation trans = javaSearchDoc.getJspTranslation();
-			String jspText = trans.getHtmlText();
-			String javaText = javaSearchDoc.getJavaText();
-			if (BasicJsSearchRequestor.DEBUG) {
-				displayDebugInfo(match, jspStart, jspEnd, jspText, javaText);
-			}
-			if (jspStart > -1 && jspEnd > -1) {
-				addSearchMatch(new Document(trans.getHtmlText()), javaSearchDoc.getFile(), jspStart, jspEnd, jspText);
-			}
-		}
-	}
-	
-	/**
-	 * @param searchDoc
-	 * @param jspStart
-	 * @param jspEnd
-	 * @param jspTranslation
-	 * @param jspText
-	 * @throws CoreException
-	 */
-	protected void addSearchMatch(IDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-	// implement in subclass
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#beginReporting()
-	 */
-	
-	public void beginReporting() {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: beginReporting()"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * For debug.
-	 * 
-	 * @param origMatch
-	 * @param jspStart
-	 * @param jspEnd
-	 * @param jspText
-	 * @param javaText
-	 */
-	private void displayDebugInfo(SearchMatch origMatch, int jspStart, int jspEnd, String jspText, String javaText) {
-		if (origMatch == null || jspStart == -1 || jspEnd == -1 || jspEnd < jspStart || jspText == null || javaText == null) {
-			return;
-		}
-		System.out.println("+-----------------------------------------+"); //$NON-NLS-1$
-		System.out.println("accept possible match [jspDoc: " + origMatch.getResource().getFullPath().toOSString() + " " + origMatch.getOffset() + ":" + origMatch.getOffset() + origMatch.getLength() + "]?"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-		System.out.println("match info:"); //$NON-NLS-1$
-		System.out.println("the java text is:" + javaText.substring(origMatch.getOffset(), origMatch.getOffset() + origMatch.getLength())); //$NON-NLS-1$
-		System.out.println("java search match translates to jsp coords [start: " + jspStart + " end:" + jspEnd + "]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		System.out.println(" the jsp text is:" + jspText.substring(jspStart, jspEnd)); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#endReporting()
-	 */
-	
-	public void endReporting() {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: endReporting()"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#enterParticipant(org.eclipse.wst.jsdt.core.search.SearchParticipant)
-	 */
-	
-	public void enterParticipant(SearchParticipant participant) {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: enterParticipant()"); //$NON-NLS-1$
-		}
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.core.search.SearchRequestor#exitParticipant(org.eclipse.wst.jsdt.core.search.SearchParticipant)
-	 */
-	
-	public void exitParticipant(SearchParticipant participant) {
-		if (BasicJsSearchRequestor.DEBUG) {
-			System.out.println("JSP Search requestor: exitParticipant()"); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesActionDelegate.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesActionDelegate.java
deleted file mode 100644
index bbfc633..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesActionDelegate.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.html.ui.internal.search.HTMLFindOccurrencesProcessor;
-import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesActionDelegate;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsFindOccurrencesActionDelegate extends FindOccurrencesActionDelegate {
-	private List fProcessors;
-	
-	
-	protected List getProcessors() {
-		if (fProcessors == null) {
-			fProcessors = new ArrayList();
-			HTMLFindOccurrencesProcessor htmlProcessor = new HTMLFindOccurrencesProcessor();
-			fProcessors.add(htmlProcessor);
-			// temporary, workaround to disable function, since using the
-			// function
-			// can easily cause deadlock to occur.
-			// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=103662
-// JSPFindOccurrencesProcessor jspProcessor = new
-// JSPFindOccurrencesProcessor();
-// fProcessors.add(jspProcessor);
-		}
-		return fProcessors;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java
deleted file mode 100644
index f9b963f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsFindOccurrencesProcessor.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.jsdt.web.core.text.IJsPartitions;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsFindOccurrencesProcessor extends FindOccurrencesProcessor {
-	private IJavaScriptElement getJavaElement(IDocument document, ITextSelection textSelection) {
-		IJavaScriptElement[] elements = getJavaElementsForCurrentSelection(document, textSelection);
-		return elements.length > 0 ? elements[0] : null;
-	}
-	
-	/**
-	 * uses JSPTranslation to get currently selected Java elements.
-	 * 
-	 * @return currently selected IJavaElements
-	 */
-	private IJavaScriptElement[] getJavaElementsForCurrentSelection(IDocument document, ITextSelection selection) {
-		IJavaScriptElement[] elements = new IJavaScriptElement[0];
-		// get JSP translation object for this viewer's document
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (model != null && model instanceof IDOMModel) {
-				IDOMDocument xmlDoc = ((IDOMModel) model).getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-				if (adapter != null) {
-					IJsTranslation translation = adapter.getJsTranslation(true);
-					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=102211
-					elements = translation.getElementsFromJsRange(selection.getOffset(), selection.getOffset() + selection.getLength());
-				}
-			}
-		} finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-		return elements;
-	}
-	
-	
-	protected String[] getPartitionTypes() {
-		return new String[] { IJsPartitions.HtmlJsPartition };
-	}
-	
-	
-	protected String[] getRegionTypes() {
-		return new String[] { DOMRegionContext.BLOCK_TEXT };
-	}
-	
-	
-	protected ISearchQuery getSearchQuery(IFile file, IStructuredDocument document, String regionText, String regionType, ITextSelection textSelection) {
-		return new JsSearchQuery(file, getJavaElement(document, textSelection));
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsOccurrencesSearchResult.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsOccurrencesSearchResult.java
deleted file mode 100644
index 504987e..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsOccurrencesSearchResult.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.search.ui.ISearchQuery;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.wst.sse.ui.internal.search.OccurrencesSearchResult;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JsOccurrencesSearchResult extends OccurrencesSearchResult {
-	public JsOccurrencesSearchResult(ISearchQuery query) {
-		super(query);
-	}
-	
-	
-	public Match[] getMatches() {
-		return super.getMatches();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java
deleted file mode 100644
index d3807e0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchQuery.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.search.ui.ISearchResult;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.search.SearchDocument;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIMessages;
-import org.eclipse.wst.sse.ui.internal.search.BasicSearchQuery;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JsSearchQuery extends BasicSearchQuery {
-	/** the IJavaScriptElement we are searching for in the file * */
-	private IJavaScriptElement fElement = null;
-	
-	public JsSearchQuery(IFile file, IJavaScriptElement element) {
-		super(file);
-		this.fElement = element;
-	}
-	
-	
-	public boolean canRerun() {
-		return false;
-	}
-	
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#canRunInBackground()
-	 */
-	
-	public boolean canRunInBackground() {
-		return true;
-	}
-	
-	
-	protected IStatus doQuery() {
-		IStatus status = Status.OK_STATUS;
-		try {
-			JsSearchSupport support = JsSearchSupport.getInstance();
-			// index the file
-			SearchDocument delegate = support.addJspFile(getFile());
-			String scopePath = delegate.getPath();
-			JsSearchScope singleFileScope = new JsSearchScope(new String[] { getFile().getFullPath().toString(), scopePath });
-			// perform a searchs
-			// by passing in this jsp search query, requstor can add matches
-			// support.searchRunnable(getJavaElement(), singleFileScope, new
-			// JSPSingleFileSearchRequestor(getInstance()));
-			support.searchRunnable(getJavaElement(), singleFileScope, new JsSingleFileSearchRequestor(getInstance()));
-		} catch (Exception e) {
-			status = new Status(IStatus.ERROR, "org.eclipse.wst.sse.ui", IStatus.OK, "", null); //$NON-NLS-1$	//$NON-NLS-2$
-		}
-		return status;
-	}
-	
-	private String getFilename() {
-		String filename = JsUIMessages.OccurrencesSearchQuery_2;
-		if (getFile() != null) {
-			filename = getFile().getName();
-		}
-		return filename;
-	}
-	
-	// for access by inner class
-	public JsSearchQuery getInstance() {
-		return this;
-	}
-	
-	public IJavaScriptElement getJavaElement() {
-		return this.fElement;
-	}
-	
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#getLabel()
-	 */
-	
-	public String getLabel() {
-		String[] args = { getSearchText(), getOccurrencesCountText(), getFilename() };
-		return NLS.bind(JsUIMessages.OccurrencesSearchQuery_0, args);
-	}
-	
-	private String getOccurrencesCountText() {
-		String count = ""; //$NON-NLS-1$
-		// pa_TODO make dynamic
-		return count;
-	}
-	
-	/**
-	 * @see org.eclipse.search.ui.ISearchQuery#getSearchResult()
-	 */
-	
-	public ISearchResult getSearchResult() {
-		return new JsOccurrencesSearchResult(this);
-	}
-	
-	
-	protected String getSearchText() {
-		return fElement.getElementName();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchRequestor.java
deleted file mode 100644
index 33feb50..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSearchRequestor.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.wst.jsdt.ui.search.ISearchRequestor;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JsSearchRequestor extends BasicJsSearchRequestor {
-	private ISearchRequestor fJavaRequestor = null;
-	
-	public JsSearchRequestor() {
-		super();
-	}
-	
-	public JsSearchRequestor(ISearchRequestor javaRequestor) {
-		// need to report matches to javaRequestor
-		this.fJavaRequestor = javaRequestor;
-	}
-	
-	
-	protected void addSearchMatch(IDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-		if (!jspFile.exists()) {
-			return;
-		}
-		int lineNumber = -1;
-		try {
-			lineNumber = jspDocument.getLineOfOffset(jspStart);
-		} catch (BadLocationException e) {
-			Logger.logException("offset: " + Integer.toString(jspStart), e); //$NON-NLS-1$
-		}
-		createSearchMarker(jspFile, jspStart, jspEnd, lineNumber);
-		if (this.fJavaRequestor != null) {
-			Match match = new Match(jspFile, jspStart, jspEnd - jspStart);
-			this.fJavaRequestor.reportMatch(match);
-		}
-	}
-	
-	/**
-	 * @param jspFile
-	 * @param jspStart
-	 * @param jspEnd
-	 */
-	private void createSearchMarker(IFile jspFile, int jspStart, int jspEnd, int lineNumber) {
-		try {
-			IMarker marker = jspFile.createMarker(NewSearchUI.SEARCH_MARKER);
-			HashMap attributes = new HashMap(4);
-			attributes.put(IMarker.CHAR_START, new Integer(jspStart));
-			attributes.put(IMarker.CHAR_END, new Integer(jspEnd));
-			attributes.put(IMarker.LINE_NUMBER, new Integer(lineNumber));
-			marker.setAttributes(attributes);
-		} catch (CoreException e) {
-			Logger.logException(e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSingleFileSearchRequestor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSingleFileSearchRequestor.java
deleted file mode 100644
index 9556525..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/JsSingleFileSearchRequestor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IDocument;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JsSingleFileSearchRequestor extends BasicJsSearchRequestor {
-	private JsSearchQuery fQuery = null;
-	
-	public JsSingleFileSearchRequestor(JsSearchQuery query) {
-		this.fQuery = query;
-	}
-	
-	
-	protected void addSearchMatch(IDocument jspDocument, IFile jspFile, int jspStart, int jspEnd, String jspText) {
-		// add match to JSP query...
-		this.fQuery.addMatch(jspDocument, jspStart, jspEnd);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsMatchPresentation.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsMatchPresentation.java
deleted file mode 100644
index aaa8880..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsMatchPresentation.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search.ui;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.search.ui.text.Match;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.wst.jsdt.ui.search.IMatchPresentation;
-import org.eclipse.wst.sse.ui.internal.search.BasicSearchLabelProvider;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JsMatchPresentation implements IMatchPresentation {
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IMatchPresentation#createLabelProvider()
-	 */
-	public ILabelProvider createLabelProvider() {
-		return new BasicSearchLabelProvider();
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.jsdt.ui.search.IMatchPresentation#showMatch(org.eclipse.search.ui.text.Match,
-	 *      int, int, boolean)
-	 */
-	public void showMatch(Match match, int currentOffset, int currentLength, boolean activate) throws PartInitException {
-		// pa_TODO implement
-		// Object obj = match.getElement();
-		// show match in JSP editor
-		if (activate) {
-			// use show in target?
-		} else {
-			// just select
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java
deleted file mode 100644
index faf5291..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/java/search/ui/JsQueryParticipant.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.java.search.ui;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.search.SearchPattern;
-import org.eclipse.wst.jsdt.core.search.SearchRequestor;
-import org.eclipse.wst.jsdt.ui.search.ElementQuerySpecification;
-import org.eclipse.wst.jsdt.ui.search.IMatchPresentation;
-import org.eclipse.wst.jsdt.ui.search.IQueryParticipant;
-import org.eclipse.wst.jsdt.ui.search.ISearchRequestor;
-import org.eclipse.wst.jsdt.ui.search.PatternQuerySpecification;
-import org.eclipse.wst.jsdt.ui.search.QuerySpecification;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchScope;
-import org.eclipse.wst.jsdt.web.core.javascript.search.JsSearchSupport;
-import org.eclipse.wst.jsdt.web.ui.internal.java.search.JsSearchRequestor;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author pavery
- */
-public class JsQueryParticipant implements IQueryParticipant {
-	// for debugging
-	private static final boolean DEBUG;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.jsdt.web.core/debug/jspsearch"); //$NON-NLS-1$
-		DEBUG = value != null && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IQueryParticipant#estimateTicks(org.eclipse.wst.jsdt.ui.search.QuerySpecification)
-	 */
-	public int estimateTicks(QuerySpecification data) {
-		// pa_TODO use project file counter from JSPSearchSupport...
-		return 0;
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IQueryParticipant#getUIParticipant()
-	 */
-	public IMatchPresentation getUIParticipant() {
-		return new JsMatchPresentation();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.jsdt.ui.search.IQueryParticipant#search(org.eclipse.wst.jsdt.ui.search.ISearchRequestor,
-	 *      org.eclipse.wst.jsdt.ui.search.QuerySpecification,
-	 *      org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void search(ISearchRequestor requestor, QuerySpecification querySpecification, IProgressMonitor monitor) throws CoreException {
-		// indexIfNeeded();
-		// do search based on the particular Java query
-		if (querySpecification instanceof ElementQuerySpecification) {
-			// element search (eg. from global find references in Java file)
-			ElementQuerySpecification elementQuery = (ElementQuerySpecification) querySpecification;
-			IJavaScriptElement element = elementQuery.getElement();
-			if (JsQueryParticipant.DEBUG) {
-				System.out.println("JSP Query Participant searching on ELEMENT: " + element); //$NON-NLS-1$
-			}
-			SearchRequestor jspRequestor = new JsSearchRequestor(requestor);
-			// pa_TODO need to adapt JavaSearchScope to a JSPSearchScope
-			JsSearchSupport.getInstance().search(element, new JsSearchScope(), jspRequestor);
-		} else if (querySpecification instanceof PatternQuerySpecification) {
-			// pattern search (eg. from Java search page)
-			PatternQuerySpecification patternQuery = (PatternQuerySpecification) querySpecification;
-			String pattern = patternQuery.getPattern();
-			if (JsQueryParticipant.DEBUG) {
-				System.out.println("JSP Query Participant searching on PATTERN: " + pattern); //$NON-NLS-1$
-			}
-			SearchRequestor jspRequestor = new JsSearchRequestor(requestor);
-			JsSearchSupport.getInstance().search(pattern, new JsSearchScope(), patternQuery.getSearchFor(), patternQuery.getLimitTo(), SearchPattern.R_PATTERN_MATCH, false, jspRequestor);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/registry/AdapterFactoryProviderForJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/registry/AdapterFactoryProviderForJSDT.java
deleted file mode 100644
index f4b6a69..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/registry/AdapterFactoryProviderForJSDT.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.registry;
-
-import org.eclipse.wst.html.core.internal.modelhandler.ModelHandlerForHTML;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapterFactory;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.JFaceNodeAdapterFactoryForJSDT;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.sse.ui.internal.util.Assert;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class AdapterFactoryProviderForJSDT implements AdapterFactoryProvider {
-	/*
-	 * @see AdapterFactoryProvider#addAdapterFactories(IStructuredModel)
-	 */
-	public void addAdapterFactories(IStructuredModel structuredModel) {
-		// these are the main factories, on model's factory registry
-		addContentBasedFactories(structuredModel);
-		// -------
-		// Must update/add to propagating adapters here too
-		addPropagatingAdapters(structuredModel);
-	}
-	
-	protected void addContentBasedFactories(IStructuredModel structuredModel) {
-		FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
-		Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$
-		INodeAdapterFactory factory = null;
-		factory = factoryRegistry.getFactoryFor(IJFaceNodeAdapter.class);
-		if (!(factory instanceof JFaceNodeAdapterFactoryForJSDT)) {
-			factoryRegistry.removeFactoriesFor(IJFaceNodeAdapter.class);
-			factory = new JFaceNodeAdapterFactoryForJSDT(IJFaceNodeAdapter.class, true);
-			factoryRegistry.addFactory(factory);
-		}
-		
-		JsTranslationAdapterFactory.setupAdapterFactory(structuredModel);
-	}
-	
-	protected void addPropagatingAdapters(IStructuredModel structuredModel) {}
-	
-	/*
-	 * @see AdapterFactoryProvider#isFor(ContentTypeDescription)
-	 */
-	public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
-		// return (contentTypeDescription instanceof ModelHandlerForJSP);
-		return (contentTypeDescription instanceof ModelHandlerForHTML);
-	}
-	
-	public void reinitializeFactories(IStructuredModel structuredModel) {
-		addAdapterFactories(structuredModel);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/IStyleConstantsJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/IStyleConstantsJs.java
deleted file mode 100644
index 4a237d6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/IStyleConstantsJs.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.style;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IStyleConstantsJs {
-	public static final String JSP_CONTENT = "jsp_content"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/IStyleConstantsJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/IStyleConstantsJSDT.java
deleted file mode 100644
index 625fec6..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/IStyleConstantsJSDT.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.style.java;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IStyleConstantsJSDT {
-	String JAVA_DEFAULT = "default"; //$NON-NLS-1$
-	String JAVA_KEYWORD = "keyword"; //$NON-NLS-1$
-	String JAVA_SINGLE_LINE_COMMENT = "single_line_comment"; //$NON-NLS-1$
-	String JAVA_STRING = "string"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JSDTCodeScanner.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JSDTCodeScanner.java
deleted file mode 100644
index f74f1b0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JSDTCodeScanner.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.style.java;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.rules.EndOfLineRule;
-import org.eclipse.jface.text.rules.IRule;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.MultiLineRule;
-import org.eclipse.jface.text.rules.SingleLineRule;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.text.rules.WordRule;
-import org.eclipse.wst.jsdt.web.core.javascript.JsDataTypes;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class JSDTCodeScanner extends org.eclipse.jface.text.rules.RuleBasedScanner {
-	private static String[] fgConstants = JsDataTypes.CONSTANTS;
-	private static String[] fgKeywords = JsDataTypes.KEYWORDS;
-	private static String[] fgTypes = JsDataTypes.TYPES;
-	private IToken fDefaultToken;
-	private IToken fKeywordToken;
-	private IToken fSingleLineCommentToken;
-	private IToken fStringToken;
-	private IToken fTypeToken;
-	
-	/**
-	 * Creates a Java code scanner
-	 */
-	public JSDTCodeScanner() {
-		super();
-	}
-	
-	public void initializeRules() {
-		List rules = new ArrayList();
-		// Add rule for multiple line comments.
-		rules.add(new MultiLineRule("/*", "*/", fSingleLineCommentToken));//$NON-NLS-1$ //$NON-NLS-2$
-		// Add rule for single line comments.
-		rules.add(new EndOfLineRule("//", fSingleLineCommentToken));//$NON-NLS-1$
-		// Add rule for strings and character constants.
-		rules.add(new SingleLineRule("\"", "\"", fStringToken, '\\'));//$NON-NLS-2$//$NON-NLS-1$
-		rules.add(new SingleLineRule("'", "'", fStringToken, '\\'));//$NON-NLS-2$//$NON-NLS-1$
-		// Add generic whitespace rule.
-		// rules.add(new WhitespaceRule(new JavaWhitespaceDetector()));
-		// Add word rule for keywords, types, and constants.
-		WordRule wordRule = new WordRule(new JavaWordDetector(), fDefaultToken);
-		for (int i = 0; i < JSDTCodeScanner.fgKeywords.length; i++) {
-			wordRule.addWord(JSDTCodeScanner.fgKeywords[i], fKeywordToken);
-		}
-		for (int i = 0; i < JSDTCodeScanner.fgTypes.length; i++) {
-			wordRule.addWord(JSDTCodeScanner.fgTypes[i], fTypeToken);
-		}
-		for (int i = 0; i < JSDTCodeScanner.fgConstants.length; i++) {
-			wordRule.addWord(JSDTCodeScanner.fgConstants[i], fTypeToken);
-		}
-		rules.add(wordRule);
-		IRule[] result = new IRule[rules.size()];
-		rules.toArray(result);
-		setRules(result);
-	}
-	
-	public void setTokenData(String tokenKey, Object data) {
-		if (tokenKey == IStyleConstantsJSDT.JAVA_KEYWORD) {
-			fKeywordToken = new Token(data);
-			fTypeToken = new Token(data);
-		} else if (tokenKey == IStyleConstantsJSDT.JAVA_STRING) {
-			fStringToken = new Token(data);
-		} else if (tokenKey == IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT) {
-			fSingleLineCommentToken = new Token(data);
-		} else if (tokenKey == IStyleConstantsJSDT.JAVA_DEFAULT) {
-			fDefaultToken = new Token(data);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JavaWordDetector.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JavaWordDetector.java
deleted file mode 100644
index a16268a..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/JavaWordDetector.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.style.java;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JavaWordDetector implements org.eclipse.jface.text.rules.IWordDetector {
-	/**
-	 * @see org.eclipse.jface.text.rules.IWordDetector#isWordIdentifierPart
-	 */
-	public boolean isWordPart(char c) {
-		return Character.isJavaIdentifierPart(c);
-	}
-	
-	/**
-	 * @see org.eclipse.jface.text.rules.IWordDetector#isWordIdentifierStart
-	 */
-	public boolean isWordStart(char c) {
-		return Character.isJavaIdentifierStart(c);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/LineStyleProviderForJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/LineStyleProviderForJSDT.java
deleted file mode 100644
index fe6ad6d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/style/java/LineStyleProviderForJSDT.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.style.java;
-
-import java.util.Collection;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferenceConverter;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.rules.IToken;
-import org.eclipse.jface.text.rules.Token;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.wst.html.ui.internal.style.IStyleConstantsHTML;
-import org.eclipse.wst.jsdt.ui.PreferenceConstants;
-import org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin;
-import org.eclipse.wst.jsdt.web.ui.internal.style.IStyleConstantsJs;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class LineStyleProviderForJSDT extends AbstractLineStyleProvider implements LineStyleProvider {
-	/** The scanner it uses */
-	private JSDTCodeScanner fScanner;
-	
-	private IPropertyChangeListener fPreferenceListener = new IPropertyChangeListener() {
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse.jface.util.PropertyChangeEvent)
-		 */
-		public void propertyChange(PropertyChangeEvent event) {
-			// have to do it this way so others can override the method
-			handlePropertyChange(event);
-		}
-	};
-	
-	public LineStyleProviderForJSDT() {
-		super();
-		fScanner = new JSDTCodeScanner();
-	}
-	
-	/**
-	 * Looks up the colorKey in the preference store and adds the style
-	 * information to list of TextAttributes
-	 * 
-	 * @param colorKey
-	 */
-	private void addJavaTextAttribute(String colorKey) {
-		IPreferenceStore store = getJavaColorPreferences();
-		if (store != null && colorKey != null) {
-			TextAttribute ta = null;
-			if (colorKey == IStyleConstantsJSDT.JAVA_KEYWORD) {
-				// keyword
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_JAVA_KEYWORD_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			} else if (colorKey == IStyleConstantsJSDT.JAVA_STRING) {
-				// string
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_STRING_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_STRING_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_STRING_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_STRING_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_STRING_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			} else if (colorKey == IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT) {
-				// single line comment
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			} else if (colorKey == IStyleConstantsJSDT.JAVA_DEFAULT) {
-				// default
-				RGB foreground = PreferenceConverter.getColor(store, PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR);
-				boolean bold = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD);
-				boolean italics = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC);
-				boolean strikethrough = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_STRIKETHROUGH);
-				boolean underline = store.getBoolean(PreferenceConstants.EDITOR_JAVA_DEFAULT_UNDERLINE);
-				int style = SWT.NORMAL;
-				if (bold) {
-					style = style | SWT.BOLD;
-				}
-				if (italics) {
-					style = style | SWT.ITALIC;
-				}
-				if (strikethrough) {
-					style = style | TextAttribute.STRIKETHROUGH;
-				}
-				if (underline) {
-					style = style | TextAttribute.UNDERLINE;
-				}
-				ta = createTextAttribute(foreground, null, style);
-			}
-			if (ta != null) {
-				getTextAttributes().put(colorKey, ta);
-				fScanner.setTokenData(colorKey, ta);
-			}
-		}
-	}
-	
-	/**
-	 * Adds style information to the given text presentation.
-	 * 
-	 * @param presentation
-	 *            the text presentation to be extended
-	 * @param offset
-	 *            the offset of the range to be styled
-	 * @param length
-	 *            the length of the range to be styled
-	 * @param attr
-	 *            the attribute describing the style of the range to be styled
-	 */
-	private void addRange(Collection presentation, int offset, int length, TextAttribute attr) {
-		// support for user defined backgroud for JSP scriptlet regions
-		TextAttribute ta = (TextAttribute) getTextAttributes().get(IStyleConstantsJs.JSP_CONTENT);
-		Color bgColor = ta.getBackground();
-		if (bgColor == null) {
-			bgColor = attr.getBackground();
-		}
-		StyleRange result = new StyleRange(offset, length, attr.getForeground(), bgColor, attr.getStyle());
-		if ((attr.getStyle() & TextAttribute.STRIKETHROUGH) != 0) {
-			result.strikeout = true;
-		}
-		if ((attr.getStyle() & TextAttribute.UNDERLINE) != 0) {
-			result.underline = true;
-		}
-		presentation.add(result);
-	}
-	
-	protected IPreferenceStore getColorPreferences() {
-		return JsUIPlugin.getDefault().getPreferenceStore();
-	}
-	
-	private IPreferenceStore getJavaColorPreferences() {
-		return PreferenceConstants.getPreferenceStore();
-	}
-	
-	/**
-	 * Returns a text attribute encoded in the given token. If the token's data
-	 * is not <code>null</code> and a text attribute it is assumed that it is
-	 * the encoded text attribute. It returns the default text attribute if
-	 * there is no encoded text attribute found.
-	 * 
-	 * @param token
-	 *            the token whose text attribute is to be determined
-	 * @return the token's text attribute
-	 */
-	private TextAttribute getTokenTextAttribute(IToken token) {
-		TextAttribute ta = null;
-		Object data = token.getData();
-		if (data instanceof TextAttribute) {
-			ta = (TextAttribute) data;
-		} else {
-			ta = (TextAttribute) getTextAttributes().get(IStyleConstantsJSDT.JAVA_DEFAULT);
-		}
-		return ta;
-	}
-	
-	protected void handlePropertyChange(PropertyChangeEvent event) {
-		String styleKey = null;
-		String javaStyleKey = null;
-		if (event != null) {
-			String prefKey = event.getProperty();
-			// check if preference changed is a style preference
-			if (IStyleConstantsHTML.SCRIPT_AREA_BORDER.equals(prefKey)) {
-				styleKey = IStyleConstantsHTML.SCRIPT_AREA_BORDER;
-			} else if (IStyleConstantsXML.TAG_ATTRIBUTE_NAME.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_ATTRIBUTE_NAME;
-			} else if (IStyleConstantsXML.TAG_ATTRIBUTE_VALUE.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_ATTRIBUTE_VALUE;
-			} else if (IStyleConstantsJs.JSP_CONTENT.equals(prefKey)) {
-				styleKey = IStyleConstantsJs.JSP_CONTENT;
-			} else if (PreferenceConstants.EDITOR_JAVA_KEYWORD_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_JAVA_KEYWORD_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_JAVA_KEYWORD_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_KEYWORD;
-			} else if (PreferenceConstants.EDITOR_STRING_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_STRING_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_STRING_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_STRING;
-			} else if (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_SINGLE_LINE_COMMENT_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT;
-			} else if (PreferenceConstants.EDITOR_JAVA_DEFAULT_COLOR.equals(prefKey) || (PreferenceConstants.EDITOR_JAVA_DEFAULT_BOLD.equals(prefKey)) || (PreferenceConstants.EDITOR_JAVA_DEFAULT_ITALIC.equals(prefKey))) {
-				javaStyleKey = IStyleConstantsJSDT.JAVA_DEFAULT;
-			}
-		}
-		if (styleKey != null) {
-			// overwrite style preference with new value
-			addTextAttribute(styleKey);
-		}
-		if (javaStyleKey != null) {
-			// overwrite style preference with new value
-			addJavaTextAttribute(javaStyleKey);
-			fScanner.initializeRules();
-		}
-		if (styleKey != null || javaStyleKey != null) {
-			// force a full update of the text viewer
-			super.getHighlighter().refreshDisplay();
-		}
-	}
-	
-	protected void loadColors() {
-		addTextAttribute(IStyleConstantsHTML.SCRIPT_AREA_BORDER);
-		addTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		addTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		addTextAttribute(IStyleConstantsJs.JSP_CONTENT);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_KEYWORD);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_STRING);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_SINGLE_LINE_COMMENT);
-		addJavaTextAttribute(IStyleConstantsJSDT.JAVA_DEFAULT);
-		fScanner.initializeRules();
-	}
-	
-	public boolean prepareRegions(ITypedRegion typedRegion, int ssssrequestedStart, int ssssrequestedLength, Collection holdResults) {
-		boolean result = true;
-		/* Initialize the text attributes. Also load the colors and initialize the rules of the scanner */
-		getTextAttributes();
-		try {
-			// ideally, eventually, we'll have a "virtualDocument" we can
-			// refer to, but for now ... we'll simple rescan the one region.
-			// use simple adjustment (since "sub-content" starts at 0
-			int lastStart = typedRegion.getOffset();
-			int length = 0;
-			IToken lastToken = Token.UNDEFINED;
-			fScanner.setRange(getDocument(), lastStart, typedRegion.getLength());
-			while (true) {
-				IToken token = fScanner.nextToken();
-				if (token.isEOF()) {
-					if (!lastToken.isUndefined() && length != 0) {
-						addRange(holdResults, lastStart, length, getTokenTextAttribute(lastToken));
-					}
-					break;
-				}
-				if (token.isWhitespace()) {
-					length += fScanner.getTokenLength();
-					continue;
-				}
-				if (lastToken.isUndefined()) {
-					lastToken = token;
-					length += fScanner.getTokenLength();
-					continue;
-				}
-				if (token != lastToken) {
-					addRange(holdResults, lastStart, length, getTokenTextAttribute(lastToken));
-					lastToken = token;
-					lastStart = fScanner.getTokenOffset();
-					length = fScanner.getTokenLength();
-					continue;
-				}
-				length += fScanner.getTokenLength();
-			}
-		} catch (Exception e) {
-			// shouldn't happen, but we don't want it to stop other
-			// highlighting, if it does.
-			result = false;
-		}
-		return result;
-	}
-
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		return null;
-	}
-	
-	protected void registerPreferenceManager() {
-		getColorPreferences().addPropertyChangeListener(fPreferenceListener);
-		getJavaColorPreferences().addPropertyChangeListener(fPreferenceListener);
-	}
-	
-	public void release() {
-		super.release();
-		fScanner = null;
-	}
-	
-	protected void unRegisterPreferenceManager() {
-		getColorPreferences().removePropertyChangeListener(fPreferenceListener);
-		getJavaColorPreferences().removePropertyChangeListener(fPreferenceListener);
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/HTMLPrinter.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/HTMLPrinter.java
deleted file mode 100644
index bd00e78..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/HTMLPrinter.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.taginfo;
-
-import java.io.IOException;
-import java.io.Reader;
-import java.net.URL;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.SWTError;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.jsdt.web.ui.internal.Logger;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class HTMLPrinter {
-	static RGB BG_COLOR_RGB = null;
-	static {
-		final Display display = Display.getDefault();
-		if (display != null && !display.isDisposed()) {
-			try {
-				display.asyncExec(new Runnable() {
-					/*
-					 * @see java.lang.Runnable#run()
-					 */
-					public void run() {
-						HTMLPrinter.BG_COLOR_RGB = display.getSystemColor(SWT.COLOR_INFO_BACKGROUND).getRGB();
-					}
-				});
-			} catch (SWTError err) {
-				// see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=45294
-				if (err.code != SWT.ERROR_DEVICE_DISPOSED) {
-					throw err;
-				}
-			}
-		}
-	}
-	
-	public static void addBullet(StringBuffer buffer, String bullet) {
-		if (bullet != null) {
-			buffer.append("<li>"); //$NON-NLS-1$
-			buffer.append(bullet);
-			buffer.append("</li>"); //$NON-NLS-1$
-		}
-	}
-	
-	public static void addPageEpilog(StringBuffer buffer) {
-		buffer.append("</font></body></html>"); //$NON-NLS-1$
-	}
-	
-	public static void addPageProlog(StringBuffer buffer) {
-		HTMLPrinter.insertPageProlog(buffer, buffer.length());
-	}
-	
-	public static void addParagraph(StringBuffer buffer, Reader paragraphReader) {
-		if (paragraphReader != null) {
-			HTMLPrinter.addParagraph(buffer, HTMLPrinter.read(paragraphReader));
-		}
-	}
-	
-	public static void addParagraph(StringBuffer buffer, String paragraph) {
-		if (paragraph != null) {
-			buffer.append("<p>"); //$NON-NLS-1$
-			buffer.append(paragraph);
-		}
-	}
-	
-	public static void addSmallHeader(StringBuffer buffer, String header) {
-		if (header != null) {
-			buffer.append("<h5>"); //$NON-NLS-1$
-			buffer.append(header);
-			buffer.append("</h5>"); //$NON-NLS-1$
-		}
-	}
-	
-	private static void appendColor(StringBuffer buffer, RGB rgb) {
-		buffer.append('#');
-		buffer.append(Integer.toHexString(rgb.red));
-		buffer.append(Integer.toHexString(rgb.green));
-		buffer.append(Integer.toHexString(rgb.blue));
-	}
-	
-	private static void appendStyleSheetLink(StringBuffer buffer, URL styleSheetURL) {
-		if (styleSheetURL == null) {
-			return;
-		}
-		buffer.append("<head>"); //$NON-NLS-1$
-		buffer.append("<LINK REL=\"stylesheet\" HREF= \""); //$NON-NLS-1$
-		buffer.append(styleSheetURL);
-		buffer.append("\" CHARSET=\"ISO-8859-1\" TYPE=\"text/css\">"); //$NON-NLS-1$
-		buffer.append("</head>"); //$NON-NLS-1$
-	}
-	
-	public static String convertToHTMLContent(String content) {
-		content = HTMLPrinter.replace(content, '&', "&amp;"); //$NON-NLS-1$
-		content = HTMLPrinter.replace(content, '"', "&quot;"); //$NON-NLS-1$
-		content = HTMLPrinter.replace(content, '<', "&lt;"); //$NON-NLS-1$
-		return HTMLPrinter.replace(content, '>', "&gt;"); //$NON-NLS-1$
-	}
-	
-	public static void endBulletList(StringBuffer buffer) {
-		buffer.append("</ul>"); //$NON-NLS-1$
-	}
-	
-	private static RGB getBgColor() {
-		if (HTMLPrinter.BG_COLOR_RGB != null) {
-			return HTMLPrinter.BG_COLOR_RGB;
-		}
-		// RGB value of info bg color on WindowsXP
-		return new RGB(255, 255, 225);
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position) {
-		HTMLPrinter.insertPageProlog(buffer, position, HTMLPrinter.getBgColor());
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position, RGB bgRGB) {
-		if (bgRGB == null) {
-			HTMLPrinter.insertPageProlog(buffer, position);
-		} else {
-			StringBuffer pageProlog = new StringBuffer(60);
-			pageProlog.append("<html><body text=\"#000000\" bgcolor=\""); //$NON-NLS-1$
-			HTMLPrinter.appendColor(pageProlog, bgRGB);
-			pageProlog.append("\"><font size=-1>"); //$NON-NLS-1$
-			buffer.insert(position, pageProlog.toString());
-		}
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position, RGB bgRGB, URL styleSheetURL) {
-		if (bgRGB == null) {
-			HTMLPrinter.insertPageProlog(buffer, position, styleSheetURL);
-		} else {
-			StringBuffer pageProlog = new StringBuffer(300);
-			pageProlog.append("<html>"); //$NON-NLS-1$
-			HTMLPrinter.appendStyleSheetLink(pageProlog, styleSheetURL);
-			pageProlog.append("<body text=\"#000000\" bgcolor=\""); //$NON-NLS-1$
-			HTMLPrinter.appendColor(pageProlog, bgRGB);
-			pageProlog.append("\"><font size=-1>"); //$NON-NLS-1$
-			buffer.insert(position, pageProlog.toString());
-		}
-	}
-	
-	public static void insertPageProlog(StringBuffer buffer, int position, URL styleSheetURL) {
-		HTMLPrinter.insertPageProlog(buffer, position, HTMLPrinter.getBgColor(), styleSheetURL);
-	}
-	
-	static String read(Reader rd) {
-		StringBuffer buffer = new StringBuffer();
-		char[] readBuffer = new char[2048];
-		try {
-			int n = rd.read(readBuffer);
-			while (n > 0) {
-				buffer.append(readBuffer, 0, n);
-				n = rd.read(readBuffer);
-			}
-			return buffer.toString();
-		} catch (IOException x) {
-			// never expected
-			Logger.log(Logger.WARNING_DEBUG, x.getMessage(), x);
-		}
-		return null;
-	}
-	
-	private static String replace(String text, char c, String s) {
-		int previous = 0;
-		int current = text.indexOf(c, previous);
-		if (current == -1) {
-			return text;
-		}
-		StringBuffer buffer = new StringBuffer();
-		while (current > -1) {
-			buffer.append(text.substring(previous, current));
-			buffer.append(s);
-			previous = current + 1;
-			current = text.indexOf(c, previous);
-		}
-		buffer.append(text.substring(previous));
-		return buffer.toString();
-	}
-	
-	public static void startBulletList(StringBuffer buffer) {
-		buffer.append("<ul>"); //$NON-NLS-1$
-	}
-	
-	private HTMLPrinter() {
-	// nothing
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java
deleted file mode 100644
index d5e1669..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JSDTHoverProcessor.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.taginfo;
-
-import java.io.Reader;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.ui.JSdocContentAccess;
-import org.eclipse.wst.jsdt.ui.JavaScriptElementLabels;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.ui.internal.taginfo.AbstractHoverProcessor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JSDTHoverProcessor extends AbstractHoverProcessor {
-	/*
-	 * Bulk of the work was copied from
-	 * org.eclipse.wst.jsdt.internal.ui.text.java.hover.JavadocHover
-	 */
-	private final long LABEL_FLAGS = JavaScriptElementLabels.ALL_FULLY_QUALIFIED | JavaScriptElementLabels.M_PRE_RETURNTYPE | JavaScriptElementLabels.M_PARAMETER_TYPES | JavaScriptElementLabels.M_PARAMETER_NAMES | JavaScriptElementLabels.M_EXCEPTIONS | JavaScriptElementLabels.F_PRE_TYPE_SIGNATURE | JavaScriptElementLabels.M_PRE_TYPE_PARAMETERS | JavaScriptElementLabels.T_TYPE_PARAMETERS | JavaScriptElementLabels.USE_RESOLVED;
-	private final long LOCAL_VARIABLE_FLAGS = LABEL_FLAGS & ~JavaScriptElementLabels.F_FULLY_QUALIFIED | JavaScriptElementLabels.F_POST_QUALIFIED;
-	
-	private String getHoverInfo(IJavaScriptElement[] result) {
-		StringBuffer buffer = new StringBuffer();
-		int nResults = result.length;
-		if (nResults == 0) {
-			return null;
-		}
-		if (nResults > 1) {
-			for (int i = 0; i < result.length; i++) {
-				HTMLPrinter.startBulletList(buffer);
-				IJavaScriptElement curr = result[i];
-				if (curr instanceof IMember || curr.getElementType() == IJavaScriptElement.LOCAL_VARIABLE) {
-					HTMLPrinter.addBullet(buffer, getInfoText(curr));
-				}
-				HTMLPrinter.endBulletList(buffer);
-			}
-		} else {
-			IJavaScriptElement curr = result[0];
-			if (curr == null) {
-				return null;
-			}
-			if (curr instanceof IMember) {
-				IMember member = (IMember) curr;
-				HTMLPrinter.addSmallHeader(buffer, getInfoText(member));
-				Reader reader;
-				try {
-					reader = JSdocContentAccess.getHTMLContentReader(member, true, true);
-				} catch (JavaScriptModelException ex) {
-					return null;
-				}
-				if (reader != null) {
-					HTMLPrinter.addParagraph(buffer, reader);
-				}
-			} else if (curr.getElementType() == IJavaScriptElement.LOCAL_VARIABLE) {
-				HTMLPrinter.addSmallHeader(buffer, getInfoText(curr));
-			}
-		}
-		if (buffer.length() > 0) {
-			HTMLPrinter.insertPageProlog(buffer, 0);
-			HTMLPrinter.addPageEpilog(buffer);
-			return buffer.toString();
-		}
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer,
-	 *      org.eclipse.jface.text.IRegion)
-	 */
-	public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
-		// get JSP translation object for this viewer's document
-		IDOMModel xmlModel = null;
-		try {
-			xmlModel = (IDOMModel) StructuredModelManager.getModelManager().getExistingModelForRead(textViewer.getDocument());
-			if (xmlModel != null) {
-				IDOMDocument xmlDoc = xmlModel.getDocument();
-				JsTranslationAdapter adapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-				if (adapter != null) {
-					IJsTranslation translation = adapter.getJsTranslation(true);
-					IJavaScriptElement[] result = translation.getElementsFromJsRange(hoverRegion.getOffset(), hoverRegion.getOffset() + hoverRegion.getLength());
-// Vector filteredResults = new Vector();
-// List badFunctions = translation.getGeneratedFunctionNames();
-// boolean bad = false;
-// for(int i = 0;i<result.length;i++){
-// bad=false;
-// if(result[i] instanceof IFunction){
-// for(int j=0;j<badFunctions.size() && ! bad;j++){
-// if(((IFunction)result[i]).getElementName().equalsIgnoreCase((String)badFunctions.get(j))){
-// bad=true;
-// continue;
-// }
-// }
-// if(!bad)filteredResults.add(result[i]);
-// }
-// }
-// if(filteredResults.size()<1) return new String();
-//					
-// String filteredResult =
-// translation.fixupMangledName(getHoverInfo((IJavaScriptElement[])filteredResults.toArray(new
-// IJavaScriptElement[]{})));
-// for(int i = 0;i<badFunctions.size();i++){
-// filteredResult.replace((String)badFunctions.get(i), "");
-// }
-// return filteredResult;
-					return translation.fixupMangledName(getHoverInfo(result));
-				}
-			}
-		} finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-		return JsWordFinder.findWord(textViewer.getDocument(), offset);
-	}
-	
-	private String getInfoText(IJavaScriptElement member) {
-		long flags = member.getElementType() == IJavaScriptElement.LOCAL_VARIABLE ? LOCAL_VARIABLE_FLAGS : LABEL_FLAGS;
-		String label = JavaScriptElementLabels.getElementLabel(member, flags);
-		StringBuffer buf = new StringBuffer();
-		for (int i = 0; i < label.length(); i++) {
-			char ch = label.charAt(i);
-			if (ch == '<') {
-				buf.append("&lt;"); //$NON-NLS-1$
-			} else if (ch == '>') {
-				buf.append("&gt;"); //$NON-NLS-1$
-			} else {
-				buf.append(ch);
-			}
-		}
-		return buf.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JsWordFinder.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JsWordFinder.java
deleted file mode 100644
index b9311af..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/taginfo/JsWordFinder.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.taginfo;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class JsWordFinder {
-	public static IRegion findWord(IDocument document, int offset) {
-		int start = -1;
-		int end = -1;
-		try {
-			int pos = offset;
-			char c;
-			while (pos >= 0) {
-				c = document.getChar(pos);
-				// System.out.println("JavaWordFinder.findWord() Test java char
-				// (--):" + c);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				--pos;
-			}
-			start = pos;
-			pos = offset;
-			int length = document.getLength();
-			while (pos < length) {
-				c = document.getChar(pos);
-				// System.out.println("JavaWordFinder.findWord() Test java char
-				// (++):" + c);
-				if (!Character.isJavaIdentifierPart(c)) {
-					break;
-				}
-				++pos;
-			}
-			end = pos;
-			// System.out.println("Start:" + start + "End:"+end);
-			// System.out.println("JavaWordFinder.findWord() Retrieved java
-			// token of:" + document.get(start, end-start) );
-		} catch (BadLocationException x) {
-		}
-		if (start > -1 && end > -1) {
-			if (start == offset && end == offset) {
-				return new Region(offset, 0);
-			} else if (start == offset) {
-				return new Region(start, end - start);
-			} else {
-				return new Region(start + 1, end - start - 1);
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsCodeReader.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsCodeReader.java
deleted file mode 100644
index 29937d0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsCodeReader.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Sep 2, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.wst.jsdt.web.ui.internal.text;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.wst.jsdt.web.ui.internal.derived.SingleCharReader;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class JsCodeReader extends SingleCharReader {
-	/** The EOF character */
-	public static final int EOF = -1;
-	private int fCachedLineNumber = -1;
-	private int fCachedLineOffset = -1;
-	private IDocument fDocument;
-	private int fEnd = -1;
-	private boolean fForward = false;
-	private int fOffset;
-	private boolean fSkipComments = false;
-	private boolean fSkipStrings = false;
-	
-	public JsCodeReader() {}
-	
-	/*
-	 * @see Reader#close()
-	 */
-	
-	public void close() throws IOException {
-		fDocument = null;
-	}
-	
-	public void configureBackwardReader(IDocument document, int offset, boolean skipComments, boolean skipStrings) throws IOException {
-		fDocument = document;
-		fOffset = offset;
-		fSkipComments = skipComments;
-		fSkipStrings = skipStrings;
-		fForward = false;
-		try {
-			fCachedLineNumber = fDocument.getLineOfOffset(fOffset);
-		} catch (BadLocationException x) {
-			throw new IOException(x.getMessage());
-		}
-	}
-	
-	public void configureForwardReader(IDocument document, int offset, int length, boolean skipComments, boolean skipStrings) throws IOException {
-		fDocument = document;
-		fOffset = offset;
-		fSkipComments = skipComments;
-		fSkipStrings = skipStrings;
-		fForward = true;
-		fEnd = Math.min(fDocument.getLength(), fOffset + length);
-	}
-	
-	/**
-	 * Returns the offset of the last read character. Should only be called
-	 * after read has been called.
-	 */
-	public int getOffset() {
-		return fForward ? fOffset - 1 : fOffset;
-	}
-	
-	private void gotoCommentEnd() throws BadLocationException {
-		while (fOffset < fEnd) {
-			char current = fDocument.getChar(fOffset++);
-			if (current == '*') {
-				if (fOffset < fEnd && fDocument.getChar(fOffset) == '/') {
-					++fOffset;
-					return;
-				}
-			}
-		}
-	}
-	
-	private void gotoCommentStart() throws BadLocationException {
-		while (0 < fOffset) {
-			char current = fDocument.getChar(fOffset--);
-			if (current == '*' && 0 <= fOffset && fDocument.getChar(fOffset) == '/') {
-				return;
-			}
-		}
-	}
-	
-	private void gotoLineEnd() throws BadLocationException {
-		int line = fDocument.getLineOfOffset(fOffset);
-		fOffset = fDocument.getLineOffset(line + 1);
-	}
-	
-	private void gotoStringEnd(char delimiter) throws BadLocationException {
-		while (fOffset < fEnd) {
-			char current = fDocument.getChar(fOffset++);
-			if (current == '\\') {
-				// ignore escaped characters
-				++fOffset;
-			} else if (current == delimiter) {
-				return;
-			}
-		}
-	}
-	
-	private void gotoStringStart(char delimiter) throws BadLocationException {
-		while (0 < fOffset) {
-			char current = fDocument.getChar(fOffset);
-			if (current == delimiter) {
-				if (!(0 <= fOffset && fDocument.getChar(fOffset - 1) == '\\')) {
-					return;
-				}
-			}
-			--fOffset;
-		}
-	}
-	
-	private void handleSingleLineComment() throws BadLocationException {
-		int line = fDocument.getLineOfOffset(fOffset);
-		if (line < fCachedLineNumber) {
-			fCachedLineNumber = line;
-			fCachedLineOffset = fDocument.getLineOffset(line);
-			int offset = fOffset;
-			while (fCachedLineOffset < offset) {
-				char current = fDocument.getChar(offset--);
-				if (current == '/' && fCachedLineOffset <= offset && fDocument.getChar(offset) == '/') {
-					fOffset = offset;
-					return;
-				}
-			}
-		}
-	}
-	
-	/*
-	 * @see SingleCharReader#read()
-	 */
-	
-	public int read() throws IOException {
-		try {
-			return fForward ? readForwards() : readBackwards();
-		} catch (BadLocationException x) {
-			throw new IOException(x.getMessage());
-		}
-	}
-	
-	private int readBackwards() throws BadLocationException {
-		while (0 < fOffset) {
-			--fOffset;
-			handleSingleLineComment();
-			char current = fDocument.getChar(fOffset);
-			switch (current) {
-				case '/':
-					if (fSkipComments && fOffset > 1) {
-						char next = fDocument.getChar(fOffset - 1);
-						if (next == '*') {
-							// a comment ends, advance to the comment start
-							fOffset -= 2;
-							gotoCommentStart();
-							continue;
-						}
-					}
-					return current;
-				case '"':
-				case '\'':
-					if (fSkipStrings) {
-						--fOffset;
-						gotoStringStart(current);
-						continue;
-					}
-					return current;
-			}
-			return current;
-		}
-		return JsCodeReader.EOF;
-	}
-	
-	private int readForwards() throws BadLocationException {
-		while (fOffset < fEnd) {
-			char current = fDocument.getChar(fOffset++);
-			switch (current) {
-				case '/':
-					if (fSkipComments && fOffset < fEnd) {
-						char next = fDocument.getChar(fOffset);
-						if (next == '*') {
-							// a comment starts, advance to the comment end
-							++fOffset;
-							gotoCommentEnd();
-							continue;
-						} else if (next == '/') {
-							// '//'-comment starts, advance to the line end
-							gotoLineEnd();
-							continue;
-						}
-					}
-					return current;
-				case '"':
-				case '\'':
-					if (fSkipStrings) {
-						gotoStringEnd(current);
-						continue;
-					}
-					return current;
-			}
-			return current;
-		}
-		return JsCodeReader.EOF;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsDocumentRegionEdgeMatcher.java
deleted file mode 100644
index 86c10d8..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsDocumentRegionEdgeMatcher.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.text;
-
-import org.eclipse.wst.sse.ui.internal.text.DocumentRegionEdgeMatcher;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher {
-	protected final static char[] BRACKETS = { '{', '}', '(', ')', '[', ']' };
-	
-	/**
-	 * @param validContexts
-	 * @param nextMatcher
-	 */
-	public JsDocumentRegionEdgeMatcher() {
-		super(new String[] { DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_PI_OPEN,
-				DOMRegionContext.XML_PI_CONTENT }, new JsPairMatcher(JsDocumentRegionEdgeMatcher.BRACKETS));
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsPairMatcher.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsPairMatcher.java
deleted file mode 100644
index a1965a0..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/internal/text/JsPairMatcher.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.internal.text;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.source.ICharacterPairMatcher;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-class JsPairMatcher implements ICharacterPairMatcher {
-	protected int fAnchor;
-	protected IDocument fDocument;
-	protected int fEndPos;
-	protected int fOffset;
-	protected char[] fPairs;
-	protected JsCodeReader fReader = new JsCodeReader();
-	protected int fStartPos;
-	
-	public JsPairMatcher(char[] pairs) {
-		fPairs = pairs;
-	}
-	
-	/*
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#clear()
-	 */
-	public void clear() {
-		if (fReader != null) {
-			try {
-				fReader.close();
-			} catch (IOException x) {
-				// ignore
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#dispose()
-	 */
-	public void dispose() {
-		clear();
-		fDocument = null;
-		fReader = null;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#getAnchor()
-	 */
-	public int getAnchor() {
-		return fAnchor;
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#match(org.eclipse.jface.text.IDocument,
-	 *      int)
-	 */
-	public IRegion match(IDocument document, int offset) {
-		fOffset = offset;
-		if (fOffset < 0) {
-			return null;
-		}
-		fDocument = document;
-		if (fDocument != null && matchPairsAt() && fStartPos != fEndPos) {
-			return new Region(fStartPos, fEndPos - fStartPos + 1);
-		}
-		return null;
-	}
-	
-	protected boolean matchPairsAt() {
-		int i;
-		int pairIndex1 = fPairs.length;
-		int pairIndex2 = fPairs.length;
-		fStartPos = -1;
-		fEndPos = -1;
-		// get the chars preceding and following the start position
-		try {
-			char prevChar = fDocument.getChar(Math.max(fOffset - 1, 0));
-			// modified behavior for
-			// http://dev.eclipse.org/bugs/show_bug.cgi?id=16879
-			// char nextChar= fDocument.getChar(fOffset);
-			// search for opening peer character next to the activation point
-			for (i = 0; i < fPairs.length; i = i + 2) {
-				// if (nextChar == fPairs[i]) {
-				// fStartPos= fOffset;
-				// pairIndex1= i;
-				// } else
-				if (prevChar == fPairs[i]) {
-					fStartPos = fOffset - 1;
-					pairIndex1 = i;
-				}
-			}
-			// search for closing peer character next to the activation point
-			for (i = 1; i < fPairs.length; i = i + 2) {
-				if (prevChar == fPairs[i]) {
-					fEndPos = fOffset - 1;
-					pairIndex2 = i;
-				}
-				// else if (nextChar == fPairs[i]) {
-				// fEndPos= fOffset;
-				// pairIndex2= i;
-				// }
-			}
-			if (fEndPos > -1) {
-				fAnchor = ICharacterPairMatcher.RIGHT;
-				fStartPos = searchForOpeningPeer(fEndPos, fPairs[pairIndex2 - 1], fPairs[pairIndex2], fDocument);
-				if (fStartPos > -1) {
-					return true;
-				} else {
-					fEndPos = -1;
-				}
-			} else if (fStartPos > -1) {
-				fAnchor = ICharacterPairMatcher.LEFT;
-				fEndPos = searchForClosingPeer(fStartPos, fPairs[pairIndex1], fPairs[pairIndex1 + 1], fDocument);
-				if (fEndPos > -1) {
-					return true;
-				} else {
-					fStartPos = -1;
-				}
-			}
-		} catch (BadLocationException x) {
-		} catch (IOException x) {
-		}
-		return false;
-	}
-	
-	protected int searchForClosingPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException {
-		fReader.configureForwardReader(document, offset + 1, document.getLength(), true, true);
-		int stack = 1;
-		int c = fReader.read();
-		while (c != JsCodeReader.EOF) {
-			if (c == openingPeer && c != closingPeer) {
-				stack++;
-			} else if (c == closingPeer) {
-				stack--;
-			}
-			if (stack == 0) {
-				return fReader.getOffset();
-			}
-			c = fReader.read();
-		}
-		return -1;
-	}
-	
-	protected int searchForOpeningPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException {
-		fReader.configureBackwardReader(document, offset, true, true);
-		int stack = 1;
-		int c = fReader.read();
-		while (c != JsCodeReader.EOF) {
-			if (c == closingPeer && c != openingPeer) {
-				stack++;
-			} else if (c == openingPeer) {
-				stack--;
-			}
-			if (stack == 0) {
-				return fReader.getOffset();
-			}
-			c = fReader.read();
-		}
-		return -1;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/messages.properties b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/messages.properties
deleted file mode 100644
index c6061c4..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-WebProjectJsGlobalScopeContainerInitializer.0=Web Project support for JSDT
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/rino.jpg b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/rino.jpg
deleted file mode 100644
index b5a6af5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/rino.jpg
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java
deleted file mode 100644
index b69918f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/IJavaWebNode.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.w3c.dom.Node;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public interface IJavaWebNode {
-	public IJavaScriptElement getJavaElement();
-	
-	public Node getParentNode();
-		
-	public boolean hasChildren();
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterFactoryForJSDT.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterFactoryForJSDT.java
deleted file mode 100644
index 9afa956..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterFactoryForJSDT.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline.JsContentOutlineConfig;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JFaceNodeAdapterFactoryForJSDT extends JFaceNodeAdapterFactory {
-	public JFaceNodeAdapterFactoryForJSDT() {
-		this(IJFaceNodeAdapter.class, true);
-	}
-	
-	public JFaceNodeAdapterFactoryForJSDT(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-	
-	
-	public INodeAdapterFactory copy() {
-		return new JFaceNodeAdapterFactoryForJSDT(getAdapterKey(), isShouldRegisterAdapter());
-	}
-	
-	
-	protected INodeAdapter createAdapter(INodeNotifier node) {
-		if (singletonAdapter == null) {
-			// create the JFaceNodeAdapter
-			// singletonAdapter = new JFaceNodeAdapterForJSDT(this);
-			if (JsContentOutlineConfig.USE_ADVANCED) {
-				singletonAdapter = new org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline.JFaceNodeAdapterForJs(this);
-			} else {
-				singletonAdapter = new org.eclipse.wst.jsdt.web.ui.views.contentoutline.JFaceNodeAdapterForJs(this);
-			}
-			initAdapter(singletonAdapter, node);
-		}
-		return singletonAdapter;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java
deleted file mode 100644
index 456ef6f..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JFaceNodeAdapterForJs.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     bug:244839 - eugene@genuitec.com
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.text.Position;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.IJavaScriptUnit;
-import org.eclipse.wst.jsdt.core.IMember;
-import org.eclipse.wst.jsdt.core.ISourceRange;
-import org.eclipse.wst.jsdt.core.ISourceReference;
-import org.eclipse.wst.jsdt.core.IType;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.internal.core.JavaElement;
-import org.eclipse.wst.jsdt.internal.core.Member;
-import org.eclipse.wst.jsdt.internal.core.SourceRefElement;
-import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
-import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-import org.w3c.dom.Node;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JFaceNodeAdapterForJs extends JFaceNodeAdapterForHTML {
-	
-	public JFaceNodeAdapterForJs(JFaceNodeAdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-	
-	private IJavaScriptUnit lazyCu;
-	private IProgressMonitor monitor;
-	private JavaScriptElementLabelProvider javaElementLabelProvider;
-	
-	public Object[] getChildren(Object object) {
-		if (object instanceof IJavaScriptElement) {
-			return getJavaElementProvider().getChildren(object);
-		}
-		if (object instanceof IJavaWebNode) {
-			JavaElement enclosedElement = (JavaElement) ((IJavaWebNode) object).getJavaElement();
-			if (enclosedElement != null) {
-				try {
-					IJavaScriptElement[] children = enclosedElement.getChildren();
-					if (children == null) {
-						return new IJavaScriptElement[0];
-					}
-					Object[] nodes = new Object[children.length];
-					Node parent = ((IJavaWebNode) object).getParentNode();
-					
-					for (int i = 0; i < children.length; i++) {
-					//	int htmllength = ((SourceRefElement) (children[i])).getSourceRange().getLength();
-					//	int htmloffset = ((SourceRefElement) (children[i])).getSourceRange().getOffset();
-						IJavaScriptElement javaElement = children[i];
-						ISourceRange range = null;
-						if (javaElement instanceof Member) {
-								range = ((IMember) javaElement).getNameRange();
-						} else {
-								range = ((ISourceReference) javaElement).getSourceRange();
-						}
-						int htmllength = range.getLength();
-						int htmloffset = range.getOffset();
-
-						
-						Position position = new Position(htmloffset, htmllength);
-						nodes[i] = getJsNode(parent, javaElement, position);
-					}
-					return nodes;
-				} catch (JavaScriptModelException ex) {
-				}
-			}
-		}
-		Node node = (Node) object;
-		if (isJSElementParent(node)) {
-			Object[] results = getJSElementsFromNode(node.getFirstChild(), true);
-			
-			
-			return filter( results );
-		}
-		return super.getChildren(object);
-	}
-	
-	/*
-	 * @GINO: Anonymous -- matches anonymous types on the top level
-	 */
-	protected boolean matches(Object elementObj) {
-		
-		if( elementObj instanceof IJavaWebNode ){
-			IJavaScriptElement element = ((IJavaWebNode)elementObj).getJavaElement();
-			if (element.getElementType() == IJavaScriptElement.TYPE && element.getParent().getElementType() == IJavaScriptElement.JAVASCRIPT_UNIT ) {
-				
-				IType type = (IType)element;
-				try {
-					return type.isAnonymous();
-				} catch (JavaScriptModelException e) {
-					// TODO Auto-generated catch block
-					e.printStackTrace();
-				}
-			}
-		}
-		
-		return false;
-	}
-
-	/*
-	 * @GINO: Anonymous Filter from top level
-	 *
-	 */
-	protected Object[] filter(Object[] children) {
-		boolean initializers= false;
-		for (int i= 0; i < children.length; i++) {
-			if (matches(children[i])) {
-				initializers= true;
-				break;
-			}
-		}
-
-		if (!initializers)
-			return children;
-
-		Vector v= new Vector();
-		for (int i= 0; i < children.length; i++) {
-			if (matches(children[i]))
-				continue;
-			v.addElement(children[i]);
-		}
-
-		Object[] result= new Object[v.size()];
-		v.copyInto(result);
-		return result;
-	}
-	
-	public Object[] getElements(Object object) {
-		if (object instanceof IJavaScriptElement) {
-			return getJavaElementProvider().getElements(object);
-		}
-		return super.getElements(object);
-	}
-	
-	private JavaScriptElementLabelProvider getJavaElementLabelProvider() {
-		if(javaElementLabelProvider==null) {
-			javaElementLabelProvider = new JavaScriptElementLabelProvider();
-		}
-		return javaElementLabelProvider;
-	}
-	
-	private StandardJavaScriptElementContentProvider getJavaElementProvider() {
-		return new StandardJavaScriptElementContentProvider(true);
-	}
-	
-	private Object[] filterChildrenForRange(IJavaScriptElement[] allChildren, Node node) {
-	//	int javaPositionStart = ((NodeImpl) node).getStartOffset();
-	//	int javaPositionEnd   = ((NodeImpl) node).getEndOffset();
-		
-	//	Object[] result =new Object[0];
-		
-		int javaPositionEnd = ((NodeImpl) node).getEndOffset();
-		int javaPositionStart = ((NodeImpl) node).getStartOffset();
-
-		Vector validChildren = new Vector();
-		for (int i = 0; i < allChildren.length; i++) {
-			if (allChildren[i] instanceof IJavaScriptElement) {
-				ISourceRange range = null;
-				if (allChildren[i] instanceof Member) {
-					try {
-						range = ((Member) allChildren[i]).getNameRange();
-					} catch (JavaScriptModelException e) {
-											// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				} else if (allChildren[i]  instanceof SourceRefElement) {
-					try {
-						range = ((SourceRefElement)allChildren[i] ).getSourceRange();
-					} catch (JavaScriptModelException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-				if (allChildren[i].getElementType() == IJavaScriptElement.TYPE || (javaPositionStart <= range.getOffset() && range.getLength() + range.getOffset() <= (javaPositionEnd))) {
-					
-					
-							int htmllength = range == null ? 0 : range.getLength();
-							int htmloffset = range == null ? 0 : range.getOffset();
-							if (htmllength < 0 || htmloffset < 0) {
-								continue;
-							}
-							Position position = new Position(htmloffset, htmllength);
-							validChildren.add(getJsNode(node.getParentNode(), allChildren[i], position));
-					
-				
-				}
-			}
-		}
-		Object[] result = new Object[0];
-
-
-		if (validChildren.size() > 0) {
-			result = validChildren.toArray();
-		}
-		if (result == null || result.length == 0) {
-			return new IJavaScriptElement[0];
-		}
-		return result;
-	}
-	
-	private synchronized Object[] getJSElementsFromNode(Node node, boolean ensureConsistant) {
-				
-//		int startOffset = 0;
-//		int endOffset = 0;
-//		int type = node.getNodeType();
-		Object[] result = null;
-		//JsTranslation translation = null;
-		if (node.getNodeType() == Node.TEXT_NODE && (node instanceof NodeImpl)) {
-//			startOffset = ((NodeImpl) node).getStartOffset();
-//			endOffset = ((NodeImpl) node).getEndOffset();
-			IJavaScriptUnit unit = getLazyCu(node);
-	        // Genuitec Begin Fix 6149: Exception opening external HTML file
-			if (unit == null) {
-			    return new Object[0];
-			}
-	        // Genuitec End Fix 6149: Exception opening external HTML file
-			try {
-				if(ensureConsistant) unit.makeConsistent(getProgressMonitor());
-			} catch (JavaScriptModelException ex1) {
-				// TODO Auto-generated catch block
-				ex1.printStackTrace();
-			}
-			try {
-				result = filterChildrenForRange(unit.getChildren(),node);
-			} catch (JavaScriptModelException ex) {
-				// TODO Auto-generated catch block
-				ex.printStackTrace();
-				result = new Object[0];
-				lazyCu=null;
-			}
-			
-			//translation = getTranslation(node);
-			//result = translation.getAllElementsInJsRange(startOffset, endOffset);
-		}
-		return result;
-	}
-	
-	private IProgressMonitor getProgressMonitor() {
-		if(monitor==null) {
-			monitor = new NullProgressMonitor();
-		}
-		
-		return monitor;
-		
-	}
-	
-	private Object getJsNode(Node parent, IJavaScriptElement root, Position position) {
-		JsJfaceNode instance = null;
-		if (root.getElementType() == IJavaScriptElement.TYPE) {
-			instance = new JsJfaceNode(parent, root, position, ((SourceRefElement) root).getElementName());
-		} else if (root.getElementType() == IJavaScriptElement.FIELD) {
-			/* Field refrence, possibly to a type may need to implement later */
-			instance = new JsJfaceNode(parent, root,  position);
-		} else {
-			instance = new JsJfaceNode(parent, root, position);
-		}
-		String name = getJavaElementLabelProvider().getText(root);
-		instance.setName(name);
-		// ((JsJfaceNode)instance).setAdapterRegistry(registry);
-		INodeAdapter adapter = (instance).getAdapterFor(IJFaceNodeAdapter.class);
-		if (!(adapter instanceof JFaceNodeAdapterForJs)) {
-			(instance).removeAdapter(adapter);
-			(instance).addAdapter(this);
-		}
-		return instance;
-	}
-	
-	
-	public Image getLabelImage(Object node) {
-		if (node instanceof JsJfaceNode) {
-			return ((JsJfaceNode) node).getImage();
-		}
-		if (node instanceof IJavaScriptElement) {
-			return getJavaElementLabelProvider().getImage(node);
-		}
-		return super.getLabelImage(node);
-	}
-	
-	
-	public String getLabelText(Object node) {
-//		if (node instanceof JsJfaceNode) {
-//			return ((JsJfaceNode) node).getName();
-//		}
-		if (node instanceof IJavaScriptElement) {
-			return getJavaElementLabelProvider().getText(node);
-		}
-		return super.getLabelText(node);
-	}
-	
-	
-	public Object getParent(Object element) {
-		if (element instanceof IJavaScriptElement) {
-			return getJavaElementProvider().getParent(element);
-		}
-		return super.getParent(element);
-	}
-	
-	private IJavaScriptUnit getLazyCu(Node node) {
-		if(lazyCu==null) {
-			IJsTranslation tran = getTranslation(node);
-			if(tran== null) return null;
-			lazyCu = tran.getCompilationUnit();
-			if(lazyCu==null) return null;
-			
-			try {
-				lazyCu.makeConsistent( new NullProgressMonitor() );
-			} catch (JavaScriptModelException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-		return lazyCu;
-	}
-	
-	private IJsTranslation getTranslation(Node node) {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDOMDocument xmlDoc = null;
-		try {
-			if (modelManager != null) {
-				IStructuredDocument doc = ((NodeImpl) node).getStructuredDocument();
-				model = modelManager.getExistingModelForRead(doc);
-				// model = modelManager.getModelForRead(doc);
-			}
-			IDOMModel domModel = (IDOMModel) model;
-			if(domModel == null) return null;
-			xmlDoc = domModel.getDocument();
-		} catch (Exception e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				// model.changedModel();
-				model.releaseFromRead();
-			}
-		}
-		if (xmlDoc == null) {
-			return null;
-		}
-		JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-		return translationAdapter.getJsTranslation(true);
-	}
-	
-	
-	public boolean hasChildren(Object object) {
-		if (object instanceof IJavaScriptElement) {
-			return getJavaElementProvider().hasChildren(object);
-		}
-		Node node = (Node) object;
-		if (node instanceof IJavaWebNode) {
-			return ((IJavaWebNode) object).hasChildren();
-			
-		}
-		if (isJSElementParent(node)) {
-			Object[] nodes = getJSElementsFromNode(node.getFirstChild(),false);
-			boolean hasElements = (nodes != null && nodes.length > 0);
-			return hasElements;
-		}
-		return super.hasChildren(object);
-	}
-	
-	private boolean isJSElementParent(Node node) {
-		return (node.hasChildNodes() && node.getNodeName().equalsIgnoreCase("script")); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java
deleted file mode 100644
index 0f5b341..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/JsJfaceNode.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import java.util.Collection;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.core.JavaScriptModelException;
-import org.eclipse.wst.jsdt.internal.core.JavaElement;
-import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Node;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsJfaceNode extends ElementImpl implements IndexedRegion, INodeNotifier, Node, IJavaWebNode {
-	private class JsAdaptableNode extends AbstractNotifier {
-		
-		public FactoryRegistry getFactoryRegistry() {
-			return adapterRegistry;
-		}
-	}
-	private JsAdaptableNode adaptableDomNode = new JsAdaptableNode();
-	private FactoryRegistry adapterRegistry;
-	private Position fDocPosition;
-//	private Node parent;
-	private String typeName;
-	//private IJavaScriptElement dirtyElement;
-	private boolean hasChildren;
-	//private String name;
-	private Image me;
-	
-	public JsJfaceNode(Node parent, IJavaScriptElement originalElement, Position structureDocLocation) {
-		this(parent, originalElement, structureDocLocation, null);
-	}
-	
-	public JsJfaceNode(Node parent, IJavaScriptElement originalElement, Position structureDocLocation, String typeName) {
-		//super();
-		super(((ElementImpl)parent));
-		// super(parentObject, parentObject.getElementName());
-		fDocPosition = structureDocLocation;
-		//this.parent = parent;
-		this.typeName = typeName;
-		try {
-			hasChildren=((JavaElement)originalElement).hasChildren();
-		} catch (JavaScriptModelException ex) {
-			hasChildren=false;
-		}
-		removeAttributes();
-		me = (new JavaScriptElementLabelProvider(JavaScriptElementLabelProvider.SHOW_DEFAULT|JavaScriptElementLabelProvider.SHOW_SMALL_ICONS)).getImage(originalElement);
-	}
-	
-	public Image getImage() {
-		return me;
-	}
-
-	public boolean hasChildren() {
-//		try {
-//			return ((JavaElement)this.dirtyElement).hasChildren();
-//		} catch (JavaScriptModelException ex) {
-//			// TODO Auto-generated catch block
-//			ex.printStackTrace();
-//		}
-		return hasChildren;
-	}
-	
-
-	public void setName(String name) {
-		super.setTagName(name);
-	}
-		
-	public void addAdapter(INodeAdapter adapter) {
-		adaptableDomNode.addAdapter(adapter);
-	}
-	
-	
-	public boolean contains(int testPosition) {
-		return false;
-	}
-	
-	
-	public boolean equals(Object o) {
-		return (o != null && o instanceof JsJfaceNode && ((JsJfaceNode) o).fDocPosition == this.fDocPosition);
-	}
-	
-// public static Object getInstance(Object parent, Position structureDocLocation
-// ){
-// //return new JsJfaceNode((JavaElement)parent.getParent(),
-// parent.getElementName(),structureDocLocation);
-// Vector interfaces = new Vector();
-// interfaces.addAll(Arrays.asList(parent.getClass().getInterfaces()));
-// JsJfaceNode me = new JsJfaceNode(parent,structureDocLocation);
-// interfaces.addAll(Arrays.asList(me.getClass().getInterfaces()));
-// Object proxy = null;
-// try {
-// proxy= Proxy.newProxyInstance(
-// parent.getClass().getClassLoader(),
-// (Class[])interfaces.toArray(new Class[]{}),me);
-// } catch (Exception e) {
-// // TODO Auto-generated catch block
-// System.out.println(e);
-// }
-// return proxy;
-// }
-//   
-	
-	public INodeAdapter getAdapterFor(Object type) {
-		return adaptableDomNode.getAdapterFor(type);
-	}
-	
-	
-	public Collection getAdapters() {
-		return adaptableDomNode.getAdapters();
-	}
-	
-	
-	public int getEndOffset() {
-		return fDocPosition.getOffset() + fDocPosition.getLength();
-	}
-	
-	
-	public INodeAdapter getExistingAdapter(Object type) {
-		// TODO Auto-generated method stub
-		return adaptableDomNode.getExistingAdapter(type);
-	}
-	
-	public synchronized IJavaScriptElement getJavaElement() {
-		/*
-		 * since this may become 'stale' we need to rediscover our element every
-		 * time we're asked
-		 */
-		IJsTranslation tran = getTranslation();
-		int startOffset = getStartOffset();
-		int endOffset = getLength();
-		if (typeName != null) {
-			IJavaScriptElement myType = tran.getCompilationUnit().getType(typeName);
-			return myType;
-		}
-		IJavaScriptElement elements[] = tran.getAllElementsInJsRange(startOffset, startOffset + endOffset);
-		if (elements != null) {
-			return elements[0];
-		} else {
-			System.out.println(Messages.getString("JsJfaceNode.1")); //$NON-NLS-1$
-			return null;
-		}
-	}
-	
-	
-	public int getLength() {
-		return fDocPosition.getLength();
-	}
-	
-	
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xml.core.internal.document.NodeImpl#getOwnerDocument()
-	 */
-	
-
-	
-	
-
-	
-	
-	public int getStartOffset() {
-		return fDocPosition.getOffset();
-	}
-	
-// private Method[] getMethods(){
-// // returns the methods this class supports (as declared in interfaces)
-// Class[] interfaces = getClass().getInterfaces();
-// Vector vMethods = new Vector();
-// for(int i = 0;i<interfaces.length;i++){
-// Method methods[] = interfaces[i].getDeclaredMethods();
-// vMethods.addAll(Arrays.asList(methods));
-// }
-//        
-// return (Method[])vMethods.toArray();
-// }
-// public Object invoke(Object proxy, Method method, Object[] args) throws
-// Throwable {
-// Object result;
-// Method[] myMethods = getMethods();
-//        
-// try {
-// for(int i = 0;i<myMethods.length;i++){
-// if(myMethods[i]==method){
-// return method.invoke(this, args);
-// }
-// }
-// result = method.invoke(parentType, args);
-// } catch (InvocationTargetException e) {
-// throw e.getTargetException();
-// } catch (Exception e) {
-// throw new RuntimeException("unexpected invocation exception: " +
-// e.getMessage());
-// }
-//
-// return result;
-// }
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xml.core.internal.document.NodeImpl#getStructuredDocument()
-	 */
-	
-
-	
-	public IJsTranslation getTranslation() {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDOMDocument xmlDoc = null;
-		try {
-			if (modelManager != null) {
-				IStructuredDocument doc = getStructuredDocument();
-				model = modelManager.getExistingModelForRead(doc);
-				// model = modelManager.getModelForRead(doc);
-			}
-			IDOMModel domModel = (IDOMModel) model;
-			xmlDoc = domModel.getDocument();
-		} catch (Exception e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				// model.changedModel();
-				model.releaseFromRead();
-			}
-		}
-		if (xmlDoc == null) {
-			return null;
-		}
-		JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-		return translationAdapter.getJsTranslation(true);
-	}
-	
-	
-	public void notify(int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		adaptableDomNode.notify(eventType, changedFeature, oldValue, newValue, pos);
-	}
-	
-	
-	public void removeAdapter(INodeAdapter adapter) {
-		adaptableDomNode.removeAdapter(adapter);
-	}
-	
-	public void setAdapterRegistry(FactoryRegistry registry) {
-		this.adapterRegistry = registry;
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/Messages.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/Messages.java
deleted file mode 100644
index 8a44813..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/Messages.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.contentoutline;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*
- * @author childsb
- *
- */
-public class Messages {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.jsdt.web.ui.views.contentoutline.messages"; //$NON-NLS-1$
-
-	private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-	private Messages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return RESOURCE_BUNDLE.getString(key);
-		}
-		catch (MissingResourceException e) {
-			return '!' + key + '!';
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/messages.properties b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/messages.properties
deleted file mode 100644
index b36e5be..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/contentoutline/messages.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-###############################################################################
-# Copyright (c) 2007, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-JsJfaceNode.1=error in JsJfaceNode... I couldn't retrieve my java element from the original page
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java
deleted file mode 100644
index 6e47c34..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JFaceNodeAdapterForJs.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.html.ui.internal.contentoutline.JFaceNodeAdapterForHTML;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
-import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
-import org.eclipse.wst.jsdt.web.core.internal.Logger;
-import org.eclipse.wst.jsdt.web.core.javascript.IJsTranslation;
-import org.eclipse.wst.jsdt.web.core.javascript.JsTranslationAdapter;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.document.NodeImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-import org.w3c.dom.Node;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JFaceNodeAdapterForJs extends JFaceNodeAdapterForHTML {
-	public JFaceNodeAdapterForJs(JFaceNodeAdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-	
-	
-	public Object[] getChildren(Object object) {
-		if (object instanceof IJavaScriptElement) {
-			return getJavaElementProvider().getChildren(object);
-		}
-		Node node = (Node) object;
-		if (isJSElementParent(node)) {
-// Object[] results = getJSElementsFromNode(node.getFirstChild());
-// IMember[] allResults = new IMember[results.length];
-// for(int i = 0;i<results.length;i++) {
-// if(results[i]==null) continue;
-// IMember member = ((IMember)results[i]);
-// allResults[i] = member;
-			// }
-			return getJSElementsFromNode(node.getFirstChild());
-		}
-		return super.getChildren(object);
-	}
-	
-	
-	public Object[] getElements(Object object) {
-		if (object instanceof IJavaScriptElement) {
-			return getJavaElementProvider().getElements(object);
-		}
-		return super.getElements(object);
-	}
-	
-	private JavaScriptElementLabelProvider getJavaElementLabelProvider() {
-		return new JavaScriptElementLabelProvider();
-	}
-	
-	private StandardJavaScriptElementContentProvider getJavaElementProvider() {
-		return new StandardJavaScriptElementContentProvider(true);
-	}
-	
-	private synchronized Object[] getJSElementsFromNode(Node node) {
-		if (node == null) {
-			return new Object[0];
-		}
-		int startOffset = 0;
-		int endOffset = 0;
-		IJavaScriptElement[] result = null;
-		IJsTranslation translation = null;
-		if (node.getNodeType() == Node.TEXT_NODE && (node instanceof NodeImpl)) {
-			startOffset = ((NodeImpl) node).getStartOffset();
-			endOffset = ((NodeImpl) node).getEndOffset();
-			translation = getTranslation(node);
-			result = translation.getAllElementsInJsRange(startOffset, endOffset);
-		}
-		return result;
-//			
-// if (result == null) return null;
-// Object[] newResults = new Object[result.length];
-// for (int i = 0; i < result.length; i++) {
-// int htmllength = 0;
-// int htmloffset = 0;
-// Position position = null;
-// try {
-// htmllength = ((SourceRefElement) (result[i])).getSourceRange().getLength();
-// htmloffset = translation.getJspOffset(((SourceRefElement)
-// (result[i])).getSourceRange().getOffset());
-// position = new Position(htmloffset, htmllength);
-// } catch (JavaScriptModelException e) {
-// e.printStackTrace();
-// }
-// newResults[i] = getJsNode(node.getParentNode(), (IJavaScriptElement) result[i],
-// position);
-// }
-// return newResults;
-	}
-	
-	
-	public Image getLabelImage(Object node) {
-		if (node instanceof IJavaScriptElement) {
-			return getJavaElementLabelProvider().getImage(node);
-		}
-		return super.getLabelImage(node);
-	}
-	
-	
-	public String getLabelText(Object node) {
-		if (node instanceof IJavaScriptElement) {
-			return getJavaElementLabelProvider().getText(node);
-		}
-		return super.getLabelText(node);
-	}
-	
-	
-	public Object getParent(Object element) {
-		if (element instanceof IJavaScriptElement) {
-			return getJavaElementProvider().getParent(element);
-		}
-		return super.getParent(element);
-	}
-	
-	private IJsTranslation getTranslation(Node node) {
-		IStructuredModel model = null;
-		IModelManager modelManager = StructuredModelManager.getModelManager();
-		IDOMDocument xmlDoc = null;
-		try {
-			if (modelManager != null) {
-				IStructuredDocument doc = ((NodeImpl) node).getStructuredDocument();
-				model = modelManager.getExistingModelForRead(doc);
-				// model = modelManager.getModelForRead(doc);
-			}
-			IDOMModel domModel = (IDOMModel) model;
-			xmlDoc = domModel.getDocument();
-		} catch (Exception e) {
-			Logger.logException(e);
-		} finally {
-			if (model != null) {
-				// model.changedModel();
-				model.releaseFromRead();
-			}
-		}
-		if (xmlDoc == null) {
-			return null;
-		}
-		JsTranslationAdapter translationAdapter = (JsTranslationAdapter) xmlDoc.getAdapterFor(IJsTranslation.class);
-		return translationAdapter.getJsTranslation(true);
-	}
-	
-	
-	public boolean hasChildren(Object object) {
-		if (object instanceof IJavaScriptElement) {
-			return getJavaElementProvider().hasChildren(object);
-		}
-		Node node = (Node) object;
-		if (isJSElementParent(node)) {
-			Object[] results = getJSElementsFromNode(node.getFirstChild());
-			return (results != null && results.length > 0);
-		}
-		return super.hasChildren(object);
-	}
-	
-	private boolean isJSElementParent(Node node) {
-		return (node.getNodeName().equalsIgnoreCase("script")); //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsContentOutlineConfig.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsContentOutlineConfig.java
deleted file mode 100644
index 8889631..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsContentOutlineConfig.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.html.ui.views.contentoutline.HTMLContentOutlineConfiguration;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsContentOutlineConfig extends HTMLContentOutlineConfiguration {
-	public static final boolean USE_ADVANCED = false;
-	ILabelProvider fLabelProvider = null;
-	
-	public JsContentOutlineConfig() {}
-	
-	private ILabelProvider getJavaLabelProvider() {
-		if (fLabelProvider == null) {
-			fLabelProvider = new JsLabelProvider();
-		}
-		return fLabelProvider;
-	}
-	
-	
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		if (!JsContentOutlineConfig.USE_ADVANCED) {
-			return super.getLabelProvider(viewer);
-		}
-		return getJavaLabelProvider();
-	}
-	
-	
-	public IMenuListener getMenuListener(TreeViewer treeViewer) {
-		// if(!USE_ADVANCED)
-		// return super.getMenuListener(treeViewer);
-		return new JsMenuListener(treeViewer);
-	}
-	
-	
-	public ILabelProvider getStatusLineLabelProvider(TreeViewer treeViewer) {
-		if (!JsContentOutlineConfig.USE_ADVANCED) {
-			return super.getStatusLineLabelProvider(treeViewer);
-		}
-		return getJavaLabelProvider();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java
deleted file mode 100644
index 9c30f15..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsLabelProvider.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.jsdt.core.IJavaScriptElement;
-import org.eclipse.wst.jsdt.ui.JavaScriptElementLabelProvider;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsLabelProvider extends XMLLabelProvider {
-	JavaScriptElementLabelProvider fLabelProvider = null;
-	
-	
-	public Image getImage(Object o) {
-		if (o instanceof IJavaScriptElement) {
-			return getJavaElementLabelProvider().getImage(o);
-		}
-		return super.getImage(o);
-	}
-	
-	private JavaScriptElementLabelProvider getJavaElementLabelProvider() {
-		if (fLabelProvider == null) {
-			fLabelProvider = new JavaScriptElementLabelProvider();
-		}
-		return fLabelProvider;
-	}
-	
-	
-	public String getText(Object o) {
-		if (o instanceof IJavaScriptElement) {
-			return getJavaElementLabelProvider().getText(o);
-		}
-		return super.getText(o);
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java
deleted file mode 100644
index 1a0fd0b..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsMenuListener.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.jface.action.GroupMarker;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.jsdt.internal.ui.javaeditor.CompilationUnitEditorActionContributor;
-import org.eclipse.wst.jsdt.ui.IContextMenuConstants;
-import org.eclipse.wst.jsdt.web.ui.views.contentoutline.IJavaWebNode;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.IReleasable;
-import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsMenuListener extends XMLNodeActionManager implements IMenuListener, IReleasable {
-	public static final String EDIT_GROUP_ID = "group.edit"; //$NON-NLS-1$
-	CompilationUnitEditorActionContributor contrib;
-	private XMLNodeActionManager fActionManager;
-	private TreeViewer fTreeViewer;
-	ISelectionProvider selectionProvider;
-	
-	public JsMenuListener(TreeViewer viewer) {
-		super((IStructuredModel) viewer.getInput(), viewer);
-		contrib = new CompilationUnitEditorActionContributor();
-		fTreeViewer = viewer;
-//			
-// fActionGroups= new CompositeActionGroup(new ActionGroup[] {
-// new OpenViewActionGroup(getWorkbenchSite(), getSelectionProvider()),
-// new CCPActionGroup(getWorkbenchSite()),
-// new GenerateActionGroup(getWorkbenchSite()),
-// new RefactorActionGroup(getWorkbenchSite()),
-// new JavaSearchActionGroup(getWorkbenchSite())});
-	}
-	
-	public IAction[] getAllJsActions() {
-		return null;
-	}
-	
-//	private IWorkbenchSite getWorkbenchSite() {
-//		return InternalHandlerUtil.getActiveSite(fTreeViewer);
-//	}
-	
-	public void menuAboutToShow(IMenuManager manager) {
-		ISelection selection = fTreeViewer.getSelection();
-		if (selection instanceof TreeSelection) {
-			TreeSelection tselect = (TreeSelection) selection;
-			Object[] elements = tselect.toArray();
-			int javaCount = 0;
-			for (int i = 0; i < elements.length; i++) {
-				if (elements[i] instanceof IJavaWebNode) {
-					javaCount++;
-				}
-			}
-			//IContributionItem[] items = manager.getItems();
-// manager.add(new Separator(IContextMenuConstants.GROUP_NEW));
-// menu.add(new GroupMarker(IContextMenuConstants.GROUP_GOTO));
-// menu.add(new Separator(IContextMenuConstants.GROUP_OPEN));
-// manager.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
-// menu.add(new Separator(ICommonMenuConstants.GROUP_EDIT));
-// menu.add(new Separator(IContextMenuConstants.GROUP_REORGANIZE));
-// menu.add(new Separator(IContextMenuConstants.GROUP_GENERATE));
-// menu.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
-// menu.add(new Separator(IContextMenuConstants.GROUP_BUILD));
-// menu.add(new Separator(IContextMenuConstants.GROUP_ADDITIONS));
-// menu.add(new Separator(IContextMenuConstants.GROUP_VIEWER_SETUP));
-// menu.add(new Separator(IContextMenuConstants.GROUP_PROPERTIES));
-			if (javaCount == elements.length && javaCount != 0) {
-				// see plugin.xml for object contributions that populate these
-				// menus
-				/*
-				 * Menu for:
-				 * 
-				 * Open Type Hierarchy Open Call Hierarchy Show In--> Script
-				 * Explorer Navigator
-				 */
-				manager.add(new Separator(IContextMenuConstants.GROUP_SHOW));
-				manager.add(new GroupMarker(IContextMenuConstants.GROUP_SHOW));
-				/*
-				 * Menu for: Cut Copy Paste Delete
-				 */
-				manager.add(new Separator(JsMenuListener.EDIT_GROUP_ID));
-				manager.add(new GroupMarker(JsMenuListener.EDIT_GROUP_ID));
-				/*
-				 * Menu for:
-				 * 
-				 * Source--> Generate Element Comment
-				 * 
-				 * 
-				 * Refactor--> Rename Move Change Function Signature Inline
-				 * Introduce Indirection Infer Generic Type Arguments
-				 */
-				manager.add(new Separator(IContextMenuConstants.GROUP_SOURCE));
-				manager.add(new GroupMarker(IContextMenuConstants.GROUP_SOURCE));
-				/*
-				 * Menu for:
-				 * 
-				 * Refrences--> Workspace Project Hierarchy Working Set
-				 * 
-				 * Declerations--> Workspace Project Hierarchy Working Set
-				 * 
-				 */
-				manager.add(new Separator(IContextMenuConstants.GROUP_SEARCH));
-				manager.add(new GroupMarker(IContextMenuConstants.GROUP_SEARCH));
-				/* all Java Elements */
-//					
-//					
-//					
-// JavaScriptPlugin.createStandardGroups(manager);
-// String[] actionSets = JSDTActionSetUtil.getAllActionSets();
-//
-// IAction[] actions = JSDTActionSetUtil.getActionsFromSet(actionSets);
-// for(int i = 0;i<actions.length;i++) {
-// manager.add(actions[i]);
-// }
-// fActionGroups.setContext(new ActionContext(selection));
-// fActionGroups.fillContextMenu(manager);
-//					
-			} else if (javaCount == 0) {
-				fillContextMenu(manager, selection);
-			}
-		}
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.internal.IReleasable#release()
-	 */
-	public void release() {
-		fTreeViewer = null;
-		if (fActionManager != null) {
-			fActionManager.setModel(null);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java
deleted file mode 100644
index 1c0db53..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/JsWebElementProvider.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.wst.jsdt.ui.StandardJavaScriptElementContentProvider;
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class JsWebElementProvider extends StandardJavaScriptElementContentProvider {}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/XMLLabelProvider.java b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/XMLLabelProvider.java
deleted file mode 100644
index cf5c62c..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/views/provisional/contentoutline/XMLLabelProvider.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.jsdt.web.ui.views.provisional.contentoutline;
-
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
-*
-
-* Provisional API: This class/interface is part of an interim API that is still under development and expected to
-* change significantly before reaching stability. It is being made available at this early stage to solicit feedback
-* from pioneering adopters on the understanding that any code that uses this API will almost certainly be broken
-* (repeatedly) as the API evolves.
-*/
-public class XMLLabelProvider extends JFaceNodeLabelProvider {
-	boolean fShowAttributes = false;
-	
-	
-	public String getText(Object o) {
-		StringBuffer text = new StringBuffer(super.getText(o));
-		if (o instanceof Node) {
-			Node node = (Node) o;
-			if ((node.getNodeType() == Node.ELEMENT_NODE) && fShowAttributes) {
-				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=88444
-				if (node.hasAttributes()) {
-					Element element = (Element) node;
-					NamedNodeMap attributes = element.getAttributes();
-					Node idTypedAttribute = null;
-					Node requiredAttribute = null;
-					boolean hasId = false;
-					boolean hasName = false;
-					Node shownAttribute = null;
-					// try to get content model element
-					// declaration
-					CMElementDeclaration elementDecl = null;
-					ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-					if (mq != null) {
-						elementDecl = mq.getCMElementDeclaration(element);
-					}
-					// find an attribute of type (or just named)
-					// ID
-					if (elementDecl != null) {
-						int i = 0;
-						while ((i < attributes.getLength()) && (idTypedAttribute == null)) {
-							Node attr = attributes.item(i);
-							String attrName = attr.getNodeName();
-							CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) elementDecl.getAttributes().getNamedItem(attrName);
-							if (attrDecl != null) {
-								if ((attrDecl.getAttrType() != null) && (CMDataType.ID.equals(attrDecl.getAttrType().getDataTypeName()))) {
-									idTypedAttribute = attr;
-								} else if ((attrDecl.getUsage() == CMAttributeDeclaration.REQUIRED) && (requiredAttribute == null)) {
-									// as a backup, keep tabs on
-									// any required
-									// attributes
-									requiredAttribute = attr;
-								} else {
-									hasId = hasId || attrName.equals("id"); //$NON-NLS-1$
-									hasName = hasName || attrName.equals("name"); //$NON-NLS-1$
-								}
-							}
-							++i;
-						}
-					}
-					/*
-					 * If no suitable attribute was found, try using a
-					 * required attribute, if none, then prefer "id" or
-					 * "name", otherwise just use first attribute
-					 */
-					if (idTypedAttribute != null) {
-						shownAttribute = idTypedAttribute;
-					} else if (requiredAttribute != null) {
-						shownAttribute = requiredAttribute;
-					} else if (hasId) {
-						shownAttribute = attributes.getNamedItem("id"); //$NON-NLS-1$
-					} else if (hasName) {
-						shownAttribute = attributes.getNamedItem("name"); //$NON-NLS-1$
-					}
-					if (shownAttribute == null) {
-						shownAttribute = attributes.item(0);
-					}
-					// display the attribute and value (without quotes)
-					String attributeName = shownAttribute.getNodeName();
-					if ((attributeName != null) && (attributeName.length() > 0)) {
-						text.append(" " + attributeName); //$NON-NLS-1$
-						String attributeValue = shownAttribute.getNodeValue();
-						if ((attributeValue != null) && (attributeValue.length() > 0)) {
-							text.append("=" + StringUtils.strip(attributeValue)); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		}
-		return text.toString();
-	}
-}
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF
deleted file mode 100644
index a9a220d..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.GIF
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.JPG b/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.JPG
deleted file mode 100644
index 68bf9c5..0000000
--- a/bundles/org.eclipse.wst.jsdt.web.ui/src/org/eclipse/wst/jsdt/web/ui/web1.JPG
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.standard.schemas/.cvsignore b/bundles/org.eclipse.wst.standard.schemas/.cvsignore
deleted file mode 100644
index acd4764..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-
-build.xml
diff --git a/bundles/org.eclipse.wst.standard.schemas/.project b/bundles/org.eclipse.wst.standard.schemas/.project
deleted file mode 100644
index c587d82..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.standard.schemas</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/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 21d0e95..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon May 14 22:44:45 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 47925bd..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Wed Jun 15 14:14:46 EDT 2005
-compilers.p.deprecated=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-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/bundles/org.eclipse.wst.standard.schemas/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.standard.schemas/META-INF/MANIFEST.MF
deleted file mode 100644
index a374d39..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.standard.schemas;singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.wst.xml.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,2.0.0)"
diff --git a/bundles/org.eclipse.wst.standard.schemas/about.html b/bundles/org.eclipse.wst.standard.schemas/about.html
deleted file mode 100644
index fc2a7cd..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this
-plug-in ("Content"). Unless otherwise indicated below, the Content is
-provided to you under the terms and conditions of the Eclipse Public
-License Version 1.0 ("EPL"). A copy of the EPL is available at <a
-	href="http://www.eclipse.org/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>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>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third
-parties as set out below. If you did not receive this Content directly
-from the Eclipse Foundation, the following is provided for informational
-purposes only, and you should look to the Redistributor's license for
-terms and conditions of use.</p>
-
-<h4>Open Mobile Alliance DTDs</h4>
-
-<p>The plug-in is accompanied by document type definitions
-(&quot;WAP DTDs&quot;) defined by the Wireless Application Protocol
-(WAP) Forum. The WAP Forum has now been consolidated into the Open
-Mobile Alliance (OMA). The WAP DTDs are the following files located in
-the plug-in:</p>
-<ul>
-	<li><strong>wml11.dtd</strong> obtained from <a
-		href="http://www.wapforum.org/DTD/wml_1.1.xml" target="_blank">http://www.wapforum.org/DTD/wml_1.1.xml</a></li>
-	<li><strong>wml13.dtd</strong> obtained from <a
-		href="http://www.wapforum.org/DTD/wml13.dtd" target="_blank">http://www.wapforum.org/DTD/wml13.dtd</a></li>
-	<li><strong>xhtml-mobile10-flat.dtd</strong> obtained from <a
-		href="http://www.wapforum.org/DTD/xhtml-mobile10.dtd" target="_blank">http://www.wapforum.org/DTD/xhtml-mobile10.dtd</a></li>
-</ul>
-
-<p>Your use of the WAP DTDs is governed by the terms and conditions
-of the EPL.</p>
-
-<p>More information about the WAP and the OMA is available at <a
-	href="http://www.openmobilealliance.org/tech/affiliates/wap/wapindex.html">http://www.openmobilealliance.org/tech/affiliates/wap/wapindex.html</a>.</p>
-
-<h4>W3C DTDs</h4>
-
-<p>The plug-in is accompanied by document type definitions (&quot;
-W3C DTDs&quot;) defined by the the W3C Extensible HyperText Markup
-Language (XHTML) 1.1. XHTML is described at <a
-	href="http://www.w3.org/TR/xhtml11/">http://www.w3.org/TR/xhtml11/</a>.</p>
-The W3C DTDs are the following files located in the plug-in:
-<p>
-<ul>
-	<li><strong>xhtml11-flat.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd" target="_blank">http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd</a></li>
-	<li><strong>xhtml1-frameset.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd</a></li>
-	<li><strong>xhtml1-strict</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</a></li>
-	<li><strong>xhtml1-transitional.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd</a></li>
-	<li><strong>xhtml-basic10-f.dtd</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
-		target="_blank">http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd</a></li>
-	<li><strong>xhtml-lat1.ent</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent" target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent</a></li>
-	<li><strong>xhtml-special.ent</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent</a></li>
-	<li><strong>xhtml-symbol.ent</strong> obtained from <a
-		href="http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent"
-		target="_blank">http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent</a></li>
-</ul>
-
-<p>As described in section 5.10 of the FAQ located at <a
-	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD"
-	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD</a>,
-your use of the W3C DTDs is governed by the terms and conditions of the
-W3C Software License a copy of which is included in the file <a
-	href="about_files/copyright-software-19980720.htm">about_files/copyright-software-19980720.htm</a>
-and is also available at <a
-	href="http://www.w3.org/Consortium/Legal/copyright-software-19980720"
-	target="_blank">http://www.w3.org/Consortium/Legal/copyright-software-19980720</a>.</p>
-<h4>WSDL Schemas</h4>
-
-<p>The plug-in is accompanied by five schema files. Your use of the
-following files located in the xsd directory of the plug-in:</p>
-
-<ul>
-	<li><strong>http.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/http/" target="_blank">http://schemas.xmlsoap.org/wsdl/http/</a></li>
-	<li><strong>soap.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/soap/" target="_blank">http://schemas.xmlsoap.org/wsdl/soap/</a></li>
-	<li><strong>wsdl.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/" target="_blank">http://schemas.xmlsoap.org/wsdl/</a></li>
-	<li><strong>wsdl-mine.xsd</strong> obtained from <a
-		href="http://schemas.xmlsoap.org/wsdl/mime/" target="_blank">http://schemas.xmlsoap.org/wsdl/mime/</a></li>
-</ul>
-
-<p>is governed by the terms and conditions of the &quot;License for
-WSDL Schema Files&quot; a copy which is located in <a
-	href="about_files/wsdl-schema-files-license.txt">about_files/wsdl-schema-files-license.txt</a>.</p>
-
-<p>The following file located in the xsd directory of the plug-in:
-<p>
-<ul>
-	<li><strong>soap-enc.xsd</strong>
-</ul>
-
-<p>is governed by the terms and conditions of the W3C Software
-License as described in section 5.10 of the FAQ located at <a
-	href="http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD"
-	target="_blank">http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD</a>.
-A copy of the W3C Software License is located in <a
-	href="about_files/copyright-software-19980720.htm">about_files/copyright-software-19980720.htm</a>
-and is also avail
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720.htm b/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720.htm
deleted file mode 100644
index 502ac7d..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720.htm
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head>
-
-
-<meta name="generator" content="HTML Tidy, see www.w3.org">
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" type="text/css" href="copyright-software-19980720_files/base.css"><title>W3C IPR SOFTWARE NOTICE</title></head><body bgcolor="#ffffff" text="#000000">
-<h1>W3C<sup>®</sup> SOFTWARE NOTICE AND LICENSE</h1>
-
-<h3>Copyright © 1994-2002 <a href="http://www.w3.org/">World
-Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/</h3>
-
-<p>This W3C work (including software, documents, or other related
-items) is being provided by the copyright holders under the
-following license. By obtaining, using and/or copying this work,
-you (the licensee) agree that you have read, understood, and will
-comply with the following terms and conditions:</p>
-
-<p>Permission to use, copy, modify, and distribute this software
-and its documentation, with or without modification,&nbsp; for any
-purpose and without fee or royalty is hereby granted, provided that
-you include the following on ALL copies of the software and
-documentation or portions thereof, including modifications, that
-you make:</p>
-
-<ol>
-<li>The full text of this NOTICE in a location viewable to users of
-the redistributed or derivative work.</li>
-
-<li>Any pre-existing intellectual property disclaimers, notices, or
-terms and conditions. If none exist, a short notice of the
-following form (hypertext is preferred, text is permitted) should
-be used within the body of any redistributed or derivative code:
-"Copyright © [$date-of-software] <a href="http://www.w3.org/">World Wide Web Consortium</a>, (<a href="http://www.lcs.mit.edu/">Massachusetts Institute of
-Technology</a>, <a href="http://www.inria.fr/">Institut National de
-Recherche en Informatique et en Automatique</a>, <a href="http://www.keio.ac.jp/">Keio University</a>). All Rights
-Reserved. http://www.w3.org/Consortium/Legal/"</li>
-
-<li>Notice of any changes or modifications to the W3C files,
-including the date changes were made. (We recommend you provide
-URIs to the location from which the code is derived.)</li>
-</ol>
-
-<p>THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND
-COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
-MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE
-USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD
-PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.</p>
-
-<p>COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT,
-SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE
-SOFTWARE OR DOCUMENTATION.</p>
-
-<p>The name and trademarks of copyright holders may NOT be used in
-advertising or publicity pertaining to the software without
-specific, written prior permission. Title to copyright in this
-software and any associated documentation will at all times remain
-with copyright holders.</p>
-
-<p>____________________________________</p>
-
-<p>This formulation of W3C's notice and license became active on
-August 14 1998 so as to improve compatibility with GPL. This
-version ensures that W3C software licensing terms are no more
-restrictive than GPL and consequently W3C software may be
-distributed in GPL packages. See the <a href="http://www.w3.org/Consortium/Legal/copyright-software-19980519.html">older formulation</a> for
-the policy prior to this date. Please see our <a href="http://www.w3.org/Consortium/Legal/IPR-FAQ.html">Copyright FAQ</a> for common questions about
-using materials from our site, including specific terms and
-conditions for packages like libwww, Amaya, and Jigsaw. Other
-questions about this notice can be directed to <a href="mailto:site-policy@w3.org">site-policy@w3.org</a>.<br>
-&nbsp;</p>
-
-<p>&nbsp;</p>
-
-<address><a href="http://www.w3.org/Help/Webmaster.html">webmaster</a><br>
- (last updated $Date: 2007/05/15 02:42:24 $)</address>
-
-</body></html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720_files/base.css b/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720_files/base.css
deleted file mode 100644
index ce57ac6..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about_files/copyright-software-19980720_files/base.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright 1997-2003 W3C (MIT, ERCIM, Keio). All Rights Reserved.
-   The following software licensing rules apply:
-   http://www.w3.org/Consortium/Legal/copyright-software */
-
-/* $Id: base.css,v 1.1 2007/05/15 02:42:24 david_williams Exp $ */
-
-/* this style sheet defines the basic style for all W3C pages */
-/* you can point to this by adding:
-
-     <LINK rel="Stylesheet" href="/StyleSheets/base">
-
-
-   in the HEAD of your HTML document */
-
-body {
-  font-family: sans-serif;
-  color: black;
-  background: white;
-}
-
-a:link, a:active {
-  color: #00e;
-  background: transparent;
-}
-
-a:visited {
-  color: #529;
-  background: transparent;
-}
-
-div.intro {
-  margin-left: 5%;
-  margin-right: 5%;
-  font-style: italic
-}
-
-pre {
-  font-family: monospace
-}
-
-a:link img, a:visited img {
-   border-style: none
-}
-
-a img { color: white; }        /* hide the border in Netscape 4 */
-@media all {                   /* hide from Netscape 4 */
-  a img { color: inherit; }    /* undo the rule above */
-}
-
-ul.toc, ol.toc {
-  list-style: disc;
-  list-style: none;
-}
-
-div.issue {
-  padding: 0.5em;
-  border: none;
-  margin-right: 5%;
-}
-
-.hideme { display: none }
-
-@media print {
-
-  table {
-    page-break-inside: avoid
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/about_files/wsdl-schema-files-license.txt b/bundles/org.eclipse.wst.standard.schemas/about_files/wsdl-schema-files-license.txt
deleted file mode 100644
index b95f81f..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/about_files/wsdl-schema-files-license.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-    http://schemas.xmlsoap.org/wsdl/http/
-    http://schemas.xmlsoap.org/wsdl/soap/
-    http://schemas.xmlsoap.org/wsdl/
-    http://schemas.xmlsoap.org/wsdl/mime/
-    
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
diff --git a/bundles/org.eclipse.wst.standard.schemas/build.properties b/bundles/org.eclipse.wst.standard.schemas/build.properties
deleted file mode 100644
index f16450e..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/build.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = plugin.xml,\
-               dtds/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html,\
-               about_files/,\
-               xsd/
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-src.includes = xsd/,\
-               dtds/,\
-               about_files/,\
-               about.html
-generateSourceBundle=false
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLlat1.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLlat1.ent
deleted file mode 100644
index c644486..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLlat1.ent
+++ /dev/null
@@ -1,194 +0,0 @@
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1//EN//HTML">
-     %HTMLlat1;
--->
-
-<!ENTITY nbsp   CDATA "&#160;" -- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  CDATA "&#161;" -- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   CDATA "&#162;" -- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  CDATA "&#163;" -- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren CDATA "&#164;" -- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    CDATA "&#165;" -- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar CDATA "&#166;" -- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   CDATA "&#167;" -- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    CDATA "&#168;" -- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   CDATA "&#169;" -- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   CDATA "&#170;" -- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  CDATA "&#171;" -- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    CDATA "&#172;" -- not sign, U+00AC ISOnum -->
-<!ENTITY shy    CDATA "&#173;" -- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    CDATA "&#174;" -- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   CDATA "&#175;" -- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    CDATA "&#176;" -- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn CDATA "&#177;" -- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   CDATA "&#178;" -- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   CDATA "&#179;" -- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  CDATA "&#180;" -- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  CDATA "&#181;" -- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   CDATA "&#182;" -- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot CDATA "&#183;" -- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  CDATA "&#184;" -- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   CDATA "&#185;" -- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   CDATA "&#186;" -- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  CDATA "&#187;" -- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 CDATA "&#188;" -- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 CDATA "&#189;" -- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 CDATA "&#190;" -- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest CDATA "&#191;" -- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave CDATA "&#192;" -- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute CDATA "&#193;" -- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  CDATA "&#194;" -- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde CDATA "&#195;" -- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   CDATA "&#196;" -- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  CDATA "&#197;" -- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  CDATA "&#198;" -- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil CDATA "&#199;" -- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave CDATA "&#200;" -- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute CDATA "&#201;" -- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  CDATA "&#202;" -- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   CDATA "&#203;" -- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave CDATA "&#204;" -- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute CDATA "&#205;" -- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  CDATA "&#206;" -- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   CDATA "&#207;" -- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    CDATA "&#208;" -- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde CDATA "&#209;" -- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve CDATA "&#210;" -- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute CDATA "&#211;" -- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  CDATA "&#212;" -- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde CDATA "&#213;" -- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   CDATA "&#214;" -- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  CDATA "&#215;" -- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash CDATA "&#216;" -- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave CDATA "&#217;" -- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute CDATA "&#218;" -- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  CDATA "&#219;" -- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   CDATA "&#220;" -- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute CDATA "&#221;" -- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  CDATA "&#222;" -- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  CDATA "&#223;" -- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave CDATA "&#224;" -- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute CDATA "&#225;" -- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  CDATA "&#226;" -- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde CDATA "&#227;" -- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   CDATA "&#228;" -- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  CDATA "&#229;" -- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  CDATA "&#230;" -- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil CDATA "&#231;" -- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave CDATA "&#232;" -- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute CDATA "&#233;" -- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  CDATA "&#234;" -- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   CDATA "&#235;" -- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave CDATA "&#236;" -- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute CDATA "&#237;" -- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  CDATA "&#238;" -- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   CDATA "&#239;" -- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    CDATA "&#240;" -- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde CDATA "&#241;" -- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve CDATA "&#242;" -- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute CDATA "&#243;" -- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  CDATA "&#244;" -- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde CDATA "&#245;" -- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   CDATA "&#246;" -- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide CDATA "&#247;" -- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash CDATA "&#248;" -- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave CDATA "&#249;" -- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute CDATA "&#250;" -- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  CDATA "&#251;" -- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   CDATA "&#252;" -- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute CDATA "&#253;" -- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  CDATA "&#254;" -- latin small letter thorn,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   CDATA "&#255;" -- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLspecial.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLspecial.ent
deleted file mode 100644
index 5ce5c6a..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLspecial.ent
+++ /dev/null
@@ -1,77 +0,0 @@
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-       "-//W3C//ENTITIES Special//EN//HTML">
-     %HTMLspecial; -->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. CDATA values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are ISO 10646 names. 
-
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    CDATA "&#34;"   -- quotation mark = APL quote,
-                                    U+0022 ISOnum -->
-<!ENTITY amp     CDATA "&#38;"   -- ampersand, U+0026 ISOnum -->
-<!ENTITY lt      CDATA "&#60;"   -- less-than sign, U+003C ISOnum -->
-<!ENTITY gt      CDATA "&#62;"   -- greater-than sign, U+003E ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   CDATA "&#338;"  -- latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   CDATA "&#339;"  -- latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  CDATA "&#352;"  -- latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  CDATA "&#353;"  -- latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    CDATA "&#376;"  -- latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    CDATA "&#710;"  -- modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   CDATA "&#732;"  -- small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    CDATA "&#8194;" -- en space, U+2002 ISOpub -->
-<!ENTITY emsp    CDATA "&#8195;" -- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  CDATA "&#8201;" -- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    CDATA "&#8204;" -- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     CDATA "&#8205;" -- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     CDATA "&#8206;" -- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     CDATA "&#8207;" -- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   CDATA "&#8211;" -- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   CDATA "&#8212;" -- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   CDATA "&#8216;" -- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   CDATA "&#8217;" -- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   CDATA "&#8218;" -- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   CDATA "&#8220;" -- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   CDATA "&#8221;" -- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   CDATA "&#8222;" -- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  CDATA "&#8224;" -- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  CDATA "&#8225;" -- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  CDATA "&#8240;" -- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  CDATA "&#8249;" -- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  CDATA "&#8250;" -- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro   CDATA "&#8364;"  -- euro sign, U+20AC NEW -->
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLsymbol.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLsymbol.ent
deleted file mode 100644
index 524bfe1..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/HTMLsymbol.ent
+++ /dev/null
@@ -1,241 +0,0 @@
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-       "-//W3C//ENTITIES Symbols//EN//HTML">
-     %HTMLsymbol; -->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. CDATA values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are ISO 10646 names. 
-
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     CDATA "&#402;" -- latin small f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    CDATA "&#913;" -- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     CDATA "&#914;" -- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    CDATA "&#915;" -- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    CDATA "&#916;" -- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  CDATA "&#917;" -- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     CDATA "&#918;" -- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      CDATA "&#919;" -- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    CDATA "&#920;" -- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     CDATA "&#921;" -- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    CDATA "&#922;" -- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   CDATA "&#923;" -- greek capital letter lambda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       CDATA "&#924;" -- greek capital letter mu, U+039C -->
-<!ENTITY Nu       CDATA "&#925;" -- greek capital letter nu, U+039D -->
-<!ENTITY Xi       CDATA "&#926;" -- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  CDATA "&#927;" -- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       CDATA "&#928;" -- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      CDATA "&#929;" -- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    CDATA "&#931;" -- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      CDATA "&#932;" -- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  CDATA "&#933;" -- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      CDATA "&#934;" -- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      CDATA "&#935;" -- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      CDATA "&#936;" -- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    CDATA "&#937;" -- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    CDATA "&#945;" -- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     CDATA "&#946;" -- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    CDATA "&#947;" -- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    CDATA "&#948;" -- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  CDATA "&#949;" -- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     CDATA "&#950;" -- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      CDATA "&#951;" -- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    CDATA "&#952;" -- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     CDATA "&#953;" -- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    CDATA "&#954;" -- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   CDATA "&#955;" -- greek small letter lambda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       CDATA "&#956;" -- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       CDATA "&#957;" -- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       CDATA "&#958;" -- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  CDATA "&#959;" -- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       CDATA "&#960;" -- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      CDATA "&#961;" -- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   CDATA "&#962;" -- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    CDATA "&#963;" -- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      CDATA "&#964;" -- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  CDATA "&#965;" -- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      CDATA "&#966;" -- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      CDATA "&#967;" -- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      CDATA "&#968;" -- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    CDATA "&#969;" -- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym CDATA "&#977;" -- greek small letter theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    CDATA "&#978;" -- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      CDATA "&#982;" -- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     CDATA "&#8226;" -- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   CDATA "&#8230;" -- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    CDATA "&#8242;" -- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    CDATA "&#8243;" -- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    CDATA "&#8254;" -- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    CDATA "&#8260;" -- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   CDATA "&#8472;" -- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    CDATA "&#8465;" -- blackletter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     CDATA "&#8476;" -- blackletter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    CDATA "&#8482;" -- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  CDATA "&#8501;" -- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     CDATA "&#8592;" -- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     CDATA "&#8593;" -- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     CDATA "&#8594;" -- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     CDATA "&#8595;" -- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     CDATA "&#8596;" -- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    CDATA "&#8629;" -- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     CDATA "&#8656;" -- leftwards double arrow, U+21D0 ISOtech -->
-<!-- ISO 10646 does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     CDATA "&#8657;" -- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     CDATA "&#8658;" -- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- ISO 10646 does not say this is the 'implies' character but does not have 
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     CDATA "&#8659;" -- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     CDATA "&#8660;" -- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   CDATA "&#8704;" -- for all, U+2200 ISOtech -->
-<!ENTITY part     CDATA "&#8706;" -- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    CDATA "&#8707;" -- there exists, U+2203 ISOtech -->
-<!ENTITY empty    CDATA "&#8709;" -- empty set = null set = diameter,
-                                     U+2205 ISOamso -->
-<!ENTITY nabla    CDATA "&#8711;" -- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     CDATA "&#8712;" -- element of, U+2208 ISOtech -->
-<!ENTITY notin    CDATA "&#8713;" -- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       CDATA "&#8715;" -- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     CDATA "&#8719;" -- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      CDATA "&#8721;" -- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    CDATA "&#8722;" -- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   CDATA "&#8727;" -- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    CDATA "&#8730;" -- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     CDATA "&#8733;" -- proportional to, U+221D ISOtech -->
-<!ENTITY infin    CDATA "&#8734;" -- infinity, U+221E ISOtech -->
-<!ENTITY ang      CDATA "&#8736;" -- angle, U+2220 ISOamso -->
-<!ENTITY and      CDATA "&#8743;" -- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       CDATA "&#8744;" -- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      CDATA "&#8745;" -- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      CDATA "&#8746;" -- union = cup, U+222A ISOtech -->
-<!ENTITY int      CDATA "&#8747;" -- integral, U+222B ISOtech -->
-<!ENTITY there4   CDATA "&#8756;" -- therefore, U+2234 ISOtech -->
-<!ENTITY sim      CDATA "&#8764;" -- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     CDATA "&#8773;" -- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    CDATA "&#8776;" -- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       CDATA "&#8800;" -- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    CDATA "&#8801;" -- identical to, U+2261 ISOtech -->
-<!ENTITY le       CDATA "&#8804;" -- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       CDATA "&#8805;" -- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      CDATA "&#8834;" -- subset of, U+2282 ISOtech -->
-<!ENTITY sup      CDATA "&#8835;" -- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  --> 
-<!ENTITY nsub     CDATA "&#8836;" -- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     CDATA "&#8838;" -- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     CDATA "&#8839;" -- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    CDATA "&#8853;" -- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   CDATA "&#8855;" -- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     CDATA "&#8869;" -- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     CDATA "&#8901;" -- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    CDATA "&#8968;" -- left ceiling = apl upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    CDATA "&#8969;" -- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   CDATA "&#8970;" -- left floor = apl downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   CDATA "&#8971;" -- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     CDATA "&#9001;" -- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     CDATA "&#9002;" -- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      CDATA "&#9674;" -- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   CDATA "&#9824;" -- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    CDATA "&#9827;" -- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   CDATA "&#9829;" -- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    CDATA "&#9830;" -- black diamond suit, U+2666 ISOpub -->
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/frameset.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/frameset.dtd
deleted file mode 100644
index 2449dd4..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/frameset.dtd
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-    This is the HTML 4.01 Frameset DTD, which should be
-    used for documents with frames. This DTD is identical
-    to the HTML 4.01 Transitional DTD except for the
-    content model of the "HTML" element: in frameset 
-    documents, the "FRAMESET" element replaces the "BODY" 
-    element.
-
-          Draft: $Date: 2008/07/22 07:37:01 $
-
-          Authors:
-              Dave Raggett <dsr@w3.org>
-              Arnaud Le Hors <lehors@w3.org>
-              Ian Jacobs <ij@w3.org>
-
-    Further information about HTML 4.01 is available at:
-
-          http://www.w3.org/TR/1999/REC-html401-19991224.
--->
-<!ENTITY % HTML.Version "-//W3C//DTD HTML 4.01 Frameset//EN"
-  -- Typical usage:
-
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
-            "http://www.w3.org/TR/html4/frameset.dtd">
-    <html>
-    <head>
-    ...
-    </head>
-    <frameset>
-    ...
-    </frameset>
-    </html>
--->
-
-<!ENTITY % HTML.Frameset "INCLUDE">
-<!ENTITY % HTML4.dtd PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-%HTML4.dtd;
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/loose.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/loose.dtd
deleted file mode 100644
index 501fb48..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/loose.dtd
+++ /dev/null
@@ -1,1093 +0,0 @@
-<!--
-    This is the HTML 4.01 Transitional DTD, which includes
-    presentation attributes and elements that W3C expects to phase out
-    as support for style sheets matures. Authors should use the Strict
-    DTD when possible, but may use the Transitional DTD when support
-    for presentation attribute and elements is required.
-
-    HTML 4 includes mechanisms for style sheets, scripting,
-    embedding objects, improved support for right to left and mixed
-    direction text, and enhancements to forms for improved
-    accessibility for people with disabilities.
-
-          Draft: $Date: 2008/07/22 07:37:01 $
-
-          Authors:
-              Dave Raggett <dsr@w3.org>
-              Arnaud Le Hors <lehors@w3.org>
-              Ian Jacobs <ij@w3.org>
-
-    Further information about HTML 4.01 is available at:
-
-        http://www.w3.org/TR/1999/REC-html401-19991224
-
-
-    The HTML 4.01 specification includes additional
-    syntactic constraints that cannot be expressed within
-    the DTDs.
-
--->
-<!ENTITY % HTML.Version "-//W3C//DTD HTML 4.01 Transitional//EN"
-  -- Typical usage:
-
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-            "http://www.w3.org/TR/html4/loose.dtd">
-    <html>
-    <head>
-    ...
-    </head>
-    <body>
-    ...
-    </body>
-    </html>
-
-    The URI used as a system identifier with the public identifier allows
-    the user agent to download the DTD and entity sets as needed.
-
-    The FPI for the Strict HTML 4.01 DTD is:
-
-        "-//W3C//DTD HTML 4.01//EN"
-
-    This version of the strict DTD is:
-
-        http://www.w3.org/TR/1999/REC-html401-19991224/strict.dtd
-
-    Authors should use the Strict DTD unless they need the
-    presentation control for user agents that don't (adequately)
-    support style sheets.
-
-    If you are writing a document that includes frames, use 
-    the following FPI:
-
-        "-//W3C//DTD HTML 4.01 Frameset//EN"
-
-    This version of the frameset DTD is:
-
-        http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd
-
-    Use the following (relative) URIs to refer to 
-    the DTDs and entity definitions of this specification:
-
-    "strict.dtd"
-    "loose.dtd"
-    "frameset.dtd"
-    "HTMLlat1.ent"
-    "HTMLsymbol.ent"
-    "HTMLspecial.ent"
-
--->
-
-<!--================== Imported Names ====================================-->
-<!-- Feature Switch for frameset documents -->
-<!ENTITY % HTML.Frameset "IGNORE">
-
-<!ENTITY % ContentType "CDATA"
-    -- media type, as per [RFC2045]
-    -->
-
-<!ENTITY % ContentTypes "CDATA"
-    -- comma-separated list of media types, as per [RFC2045]
-    -->
-
-<!ENTITY % Charset "CDATA"
-    -- a character encoding, as per [RFC2045]
-    -->
-
-<!ENTITY % Charsets "CDATA"
-    -- a space-separated list of character encodings, as per [RFC2045]
-    -->
-
-<!ENTITY % LanguageCode "NAME"
-    -- a language code, as per [RFC1766]
-    -->
-
-<!ENTITY % Character "CDATA"
-    -- a single character from [ISO10646] 
-    -->
-
-<!ENTITY % LinkTypes "CDATA"
-    -- space-separated list of link types
-    -->
-
-<!ENTITY % MediaDesc "CDATA"
-    -- single or comma-separated list of media descriptors
-    -->
-
-<!ENTITY % URI "CDATA"
-    -- a Uniform Resource Identifier,
-       see [URI]
-    -->
-
-<!ENTITY % Datetime "CDATA" -- date and time information. ISO date format -->
-
-
-<!ENTITY % Script "CDATA" -- script expression -->
-
-<!ENTITY % StyleSheet "CDATA" -- style sheet data -->
-
-<!ENTITY % FrameTarget "CDATA" -- render in this frame -->
-
-
-<!ENTITY % Text "CDATA">
-
-
-<!-- Parameter Entities -->
-
-<!ENTITY % head.misc "SCRIPT|STYLE|META|LINK|OBJECT" -- repeatable head elements -->
-
-<!ENTITY % heading "H1|H2|H3|H4|H5|H6">
-
-<!ENTITY % list "UL | OL |  DIR | MENU">
-
-<!ENTITY % preformatted "PRE">
-
-<!ENTITY % Color "CDATA" -- a color using sRGB: #RRGGBB as Hex values -->
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
- -->
-
-<!ENTITY % bodycolors "
-  bgcolor     %Color;        #IMPLIED  -- document background color --
-  text        %Color;        #IMPLIED  -- document text color --
-  link        %Color;        #IMPLIED  -- color of links --
-  vlink       %Color;        #IMPLIED  -- color of visited links --
-  alink       %Color;        #IMPLIED  -- color of selected links --
-  ">
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin1//EN//HTML"
-   "HTMLlat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols//EN//HTML"
-   "HTMLsymbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special//EN//HTML"
-   "HTMLspecial.ent">
-%HTMLspecial;
-<!--=================== Generic Attributes ===============================-->
-
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED  -- document-wide unique id --
-  class       CDATA          #IMPLIED  -- space-separated list of classes --
-  style       %StyleSheet;   #IMPLIED  -- associated style info --
-  title       %Text;         #IMPLIED  -- advisory title --"
-  >
-
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED  -- language code --
-  dir         (ltr|rtl)      #IMPLIED  -- direction for weak/neutral text --"
-  >
-
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED  -- a pointer button was clicked --
-  ondblclick  %Script;       #IMPLIED  -- a pointer button was double clicked--
-  onmousedown %Script;       #IMPLIED  -- a pointer button was pressed down --
-  onmouseup   %Script;       #IMPLIED  -- a pointer button was released --
-  onmouseover %Script;       #IMPLIED  -- a pointer was moved onto --
-  onmousemove %Script;       #IMPLIED  -- a pointer was moved within --
-  onmouseout  %Script;       #IMPLIED  -- a pointer was moved away --
-  onkeypress  %Script;       #IMPLIED  -- a key was pressed and released --
-  onkeydown   %Script;       #IMPLIED  -- a key was pressed down --
-  onkeyup     %Script;       #IMPLIED  -- a key was released --"
-  >
-
-<!-- Reserved Feature Switch -->
-<!ENTITY % HTML.Reserved "IGNORE">
-
-<!-- The following attributes are reserved for possible future use -->
-<![ %HTML.Reserved; [
-<!ENTITY % reserved
- "datasrc     %URI;          #IMPLIED  -- a single or tabular Data Source --
-  datafld     CDATA          #IMPLIED  -- the property or column name --
-  dataformatas (plaintext|html) plaintext -- text or html --"
-  >
-]]>
-
-<!ENTITY % reserved "">
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!ENTITY % align "align (left|center|right|justify)  #IMPLIED"
-                   -- default is left for ltr paragraphs, right for rtl --
-  >
-
-<!--=================== Text Markup ======================================-->
-
-<!ENTITY % fontstyle
- "TT | I | B | U | S | STRIKE | BIG | SMALL">
-
-<!ENTITY % phrase "EM | STRONG | DFN | CODE |
-                   SAMP | KBD | VAR | CITE | ABBR | ACRONYM" >
-
-<!ENTITY % special
-   "A | IMG | APPLET | OBJECT | FONT | BASEFONT | BR | SCRIPT |
-    MAP | Q | SUB | SUP | SPAN | BDO | IFRAME">
-
-<!ENTITY % formctrl "INPUT | SELECT | TEXTAREA | LABEL | BUTTON">
-
-<!-- %inline; covers inline or "text-level" elements -->
-<!ENTITY % inline "#PCDATA | %fontstyle; | %phrase; | %special; | %formctrl;">
-
-<!ELEMENT (%fontstyle;|%phrase;) - - (%inline;)*>
-<!ATTLIST (%fontstyle;|%phrase;)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT (SUB|SUP) - - (%inline;)*    -- subscript, superscript -->
-<!ATTLIST (SUB|SUP)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT SPAN - - (%inline;)*         -- generic language/style container -->
-<!ATTLIST SPAN
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %reserved;			       -- reserved for possible future use --
-  >
-
-<!ELEMENT BDO - - (%inline;)*          -- I18N BiDi over-ride -->
-<!ATTLIST BDO
-  %coreattrs;                          -- id, class, style, title --
-  lang        %LanguageCode; #IMPLIED  -- language code --
-  dir         (ltr|rtl)      #REQUIRED -- directionality --
-  >
-
-<!ELEMENT BASEFONT - O EMPTY           -- base font size -->
-<!ATTLIST BASEFONT
-  id          ID             #IMPLIED  -- document-wide unique id --
-  size        CDATA          #REQUIRED -- base font size for FONT elements --
-  color       %Color;        #IMPLIED  -- text color --
-  face        CDATA          #IMPLIED  -- comma-separated list of font names --
-  >
-
-<!ELEMENT FONT - - (%inline;)*         -- local change to font -->
-<!ATTLIST FONT
-  %coreattrs;                          -- id, class, style, title --
-  %i18n;		               -- lang, dir --
-  size        CDATA          #IMPLIED  -- [+|-]nn e.g. size="+1", size="4" --
-  color       %Color;        #IMPLIED  -- text color --
-  face        CDATA          #IMPLIED  -- comma-separated list of font names --
-  >
-
-<!ELEMENT BR - O EMPTY                 -- forced line break -->
-<!ATTLIST BR
-  %coreattrs;                          -- id, class, style, title --
-  clear       (left|all|right|none) none -- control of text flow --
-  >
-
-<!--================== HTML content models ===============================-->
-
-<!--
-    HTML has two basic content models:
-
-        %inline;     character level elements and text strings
-        %block;      block-like elements e.g. paragraphs and lists
--->
-
-<!ENTITY % block
-     "P | %heading; | %list; | %preformatted; | DL | DIV | CENTER |
-      NOSCRIPT | NOFRAMES | BLOCKQUOTE | FORM | ISINDEX | HR |
-      TABLE | FIELDSET | ADDRESS">
-
-<!ENTITY % flow "%block; | %inline;">
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT BODY O O (%flow;)* +(INS|DEL) -- document body -->
-<!ATTLIST BODY
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  onload          %Script;   #IMPLIED  -- the document has been loaded --
-  onunload        %Script;   #IMPLIED  -- the document has been removed --
-  background      %URI;      #IMPLIED  -- texture tile for document
-                                          background --
-  %bodycolors;                         -- bgcolor, text, link, vlink, alink --
-  >
-
-<!ELEMENT ADDRESS - - ((%inline;)|P)*  -- information on author -->
-<!ATTLIST ADDRESS
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT DIV - - (%flow;)*            -- generic language/style container -->
-<!ATTLIST DIV
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!ELEMENT CENTER - - (%flow;)*         -- shorthand for DIV align=center -->
-<!ATTLIST CENTER
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-<!ENTITY % Coords "CDATA" -- comma-separated list of lengths -->
-
-<!ELEMENT A - - (%inline;)* -(A)       -- anchor -->
-<!ATTLIST A
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
-  type        %ContentType;  #IMPLIED  -- advisory content type --
-  name        CDATA          #IMPLIED  -- named link end --
-  href        %URI;          #IMPLIED  -- URI for linked resource --
-  hreflang    %LanguageCode; #IMPLIED  -- language code --
-  target      %FrameTarget;  #IMPLIED  -- render in this frame --
-  rel         %LinkTypes;    #IMPLIED  -- forward link types --
-  rev         %LinkTypes;    #IMPLIED  -- reverse link types --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  shape       %Shape;        rect      -- for use with client-side image maps --
-  coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  >
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT MAP - - ((%block;) | AREA)+ -- client-side image map -->
-<!ATTLIST MAP
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #REQUIRED -- for reference by usemap --
-  >
-
-<!ELEMENT AREA - O EMPTY               -- client-side image map area -->
-<!ATTLIST AREA
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  shape       %Shape;        rect      -- controls interpretation of coords --
-  coords      %Coords;       #IMPLIED  -- comma-separated list of lengths --
-  href        %URI;          #IMPLIED  -- URI for linked resource --
-  target      %FrameTarget;  #IMPLIED  -- render in this frame --
-  nohref      (nohref)       #IMPLIED  -- this region has no action --
-  alt         %Text;         #REQUIRED -- short description --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  >
-
-<!--================== The LINK Element ==================================-->
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the LINK element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel=stylesheet)
-   c) to make a link to a script (rel=script)
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a postscript or pdf version (rel=alternate media=print)
--->
-
-<!ELEMENT LINK - O EMPTY               -- a media-independent link -->
-<!ATTLIST LINK
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
-  href        %URI;          #IMPLIED  -- URI for linked resource --
-  hreflang    %LanguageCode; #IMPLIED  -- language code --
-  type        %ContentType;  #IMPLIED  -- advisory content type --
-  rel         %LinkTypes;    #IMPLIED  -- forward link types --
-  rev         %LinkTypes;    #IMPLIED  -- reverse link types --
-  media       %MediaDesc;    #IMPLIED  -- for rendering on these media --
-  target      %FrameTarget;  #IMPLIED  -- render in this frame --
-  >
-
-<!--=================== Images ===========================================-->
-
-<!-- Length defined in strict DTD for cellpadding/cellspacing -->
-<!ENTITY % Length "CDATA" -- nn for pixels or nn% for percentage length -->
-<!ENTITY % MultiLength "CDATA" -- pixel, percentage, or relative -->
-
-<![ %HTML.Frameset; [
-<!ENTITY % MultiLengths "CDATA" -- comma-separated list of MultiLength -->
-]]>
-
-<!ENTITY % Pixels "CDATA" -- integer representing length in pixels -->
-
-<!ENTITY % IAlign "(top|middle|bottom|left|right)" -- center? -->
-
-<!-- To avoid problems with text-only UAs as well as 
-   to make image content understandable and navigable 
-   to users of non-visual UAs, you need to provide
-   a description with ALT, and avoid server-side image maps -->
-<!ELEMENT IMG - O EMPTY                -- Embedded image -->
-<!ATTLIST IMG
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  src         %URI;          #REQUIRED -- URI of image to embed --
-  alt         %Text;         #REQUIRED -- short description --
-  longdesc    %URI;          #IMPLIED  -- link to long description
-                                          (complements alt) --
-  name        CDATA          #IMPLIED  -- name of image for scripting --
-  height      %Length;       #IMPLIED  -- override height --
-  width       %Length;       #IMPLIED  -- override width --
-  usemap      %URI;          #IMPLIED  -- use client-side image map --
-  ismap       (ismap)        #IMPLIED  -- use server-side image map --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
-  border      %Pixels;       #IMPLIED  -- link border width --
-  hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
-  vspace      %Pixels;       #IMPLIED  -- vertical gutter --
-  >
-
-<!-- USEMAP points to a MAP element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--==================== OBJECT ======================================-->
-<!--
-  OBJECT is used to embed objects as part of HTML pages 
-  PARAM elements should precede other content. SGML mixed content
-  model technicality precludes specifying this formally ...
--->
-
-<!ELEMENT OBJECT - - (PARAM | %flow;)*
- -- generic embedded object -->
-<!ATTLIST OBJECT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  declare     (declare)      #IMPLIED  -- declare but don't instantiate flag --
-  classid     %URI;          #IMPLIED  -- identifies an implementation --
-  codebase    %URI;          #IMPLIED  -- base URI for classid, data, archive--
-  data        %URI;          #IMPLIED  -- reference to object's data --
-  type        %ContentType;  #IMPLIED  -- content type for data --
-  codetype    %ContentType;  #IMPLIED  -- content type for code --
-  archive     CDATA          #IMPLIED  -- space-separated list of URIs --
-  standby     %Text;         #IMPLIED  -- message to show while loading --
-  height      %Length;       #IMPLIED  -- override height --
-  width       %Length;       #IMPLIED  -- override width --
-  usemap      %URI;          #IMPLIED  -- use client-side image map --
-  name        CDATA          #IMPLIED  -- submit as part of form --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
-  border      %Pixels;       #IMPLIED  -- link border width --
-  hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
-  vspace      %Pixels;       #IMPLIED  -- vertical gutter --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!ELEMENT PARAM - O EMPTY              -- named property value -->
-<!ATTLIST PARAM
-  id          ID             #IMPLIED  -- document-wide unique id --
-  name        CDATA          #REQUIRED -- property name --
-  value       CDATA          #IMPLIED  -- property value --
-  valuetype   (DATA|REF|OBJECT) DATA   -- How to interpret value --
-  type        %ContentType;  #IMPLIED  -- content type for value
-                                          when valuetype=ref --
-  >
-
-<!--=================== Java APPLET ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place PARAM elements before other content.
--->
-<!ELEMENT APPLET - - (PARAM | %flow;)* -- Java applet -->
-<!ATTLIST APPLET
-  %coreattrs;                          -- id, class, style, title --
-  codebase    %URI;          #IMPLIED  -- optional base URI for applet --
-  archive     CDATA          #IMPLIED  -- comma-separated archive list --
-  code        CDATA          #IMPLIED  -- applet class file --
-  object      CDATA          #IMPLIED  -- serialized applet file --
-  alt         %Text;         #IMPLIED  -- short description --
-  name        CDATA          #IMPLIED  -- allows applets to find each other --
-  width       %Length;       #REQUIRED -- initial width --
-  height      %Length;       #REQUIRED -- initial height --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
-  hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
-  vspace      %Pixels;       #IMPLIED  -- vertical gutter --
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT HR - O EMPTY -- horizontal rule -->
-<!ATTLIST HR
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT P - O (%inline;)*            -- paragraph -->
-<!ATTLIST P
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from H1 (the most important)
-  to H6 (the least important).
--->
-
-<!ELEMENT (%heading;)  - - (%inline;)* -- heading -->
-<!ATTLIST (%heading;)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- excludes markup for images and changes in font size -->
-<!ENTITY % pre.exclusion "IMG|OBJECT|APPLET|BIG|SMALL|SUB|SUP|FONT|BASEFONT">
-
-<!ELEMENT PRE - - (%inline;)* -(%pre.exclusion;) -- preformatted text -->
-<!ATTLIST PRE
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  width       NUMBER         #IMPLIED
-  >
-
-<!--===================== Inline Quotes ==================================-->
-
-<!ELEMENT Q - - (%inline;)*            -- short inline quotation -->
-<!ATTLIST Q
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  cite        %URI;          #IMPLIED  -- URI for source document or msg --
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT BLOCKQUOTE - - (%flow;)*     -- long quotation -->
-<!ATTLIST BLOCKQUOTE
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  cite        %URI;          #IMPLIED  -- URI for source document or msg --
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-
-<!-- INS/DEL are handled by inclusion on BODY -->
-<!ELEMENT (INS|DEL) - - (%flow;)*      -- inserted text, deleted text -->
-<!ATTLIST (INS|DEL)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  cite        %URI;          #IMPLIED  -- info on reason for change --
-  datetime    %Datetime;     #IMPLIED  -- date and time of change --
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- definition lists - DT for term, DD for its definition -->
-
-<!ELEMENT DL - - (DT|DD)+              -- definition list -->
-<!ATTLIST DL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  compact     (compact)      #IMPLIED  -- reduced interitem spacing --
-  >
-
-<!ELEMENT DT - O (%inline;)*           -- definition term -->
-<!ELEMENT DD - O (%flow;)*             -- definition description -->
-<!ATTLIST (DT|DD)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!-- Ordered lists (OL) Numbering style
-
-    1   arablic numbers     1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
-
-    This can't be expressed directly in SGML due to case folding.
--->
-
-<!ENTITY % OLStyle "CDATA"      -- constrained to: "(1|a|A|i|I)" -->
-
-<!ELEMENT OL - - (LI)+                 -- ordered list -->
-<!ATTLIST OL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  type        %OLStyle;      #IMPLIED  -- numbering style --
-  compact     (compact)      #IMPLIED  -- reduced interitem spacing --
-  start       NUMBER         #IMPLIED  -- starting sequence number --
-  >
-
-<!-- Unordered Lists (UL) bullet styles -->
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!ELEMENT UL - - (LI)+                 -- unordered list -->
-<!ATTLIST UL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  type        %ULStyle;      #IMPLIED  -- bullet style --
-  compact     (compact)      #IMPLIED  -- reduced interitem spacing --
-  >
-
-<!ELEMENT (DIR|MENU) - - (LI)+ -(%block;) -- directory list, menu list -->
-<!ATTLIST DIR
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  compact     (compact)      #IMPLIED -- reduced interitem spacing --
-  >
-<!ATTLIST MENU
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  compact     (compact)      #IMPLIED -- reduced interitem spacing --
-  >
-
-<!ENTITY % LIStyle "CDATA" -- constrained to: "(%ULStyle;|%OLStyle;)" -->
-
-<!ELEMENT LI - O (%flow;)*             -- list item -->
-<!ATTLIST LI
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  type        %LIStyle;      #IMPLIED  -- list item style --
-  value       NUMBER         #IMPLIED  -- reset sequence number --
-  >
-
-<!--================ Forms ===============================================-->
-<!ELEMENT FORM - - (%flow;)* -(FORM)   -- interactive form -->
-<!ATTLIST FORM
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  action      %URI;          #REQUIRED -- server-side form handler --
-  method      (GET|POST)     GET       -- HTTP method used to submit the form--
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
-  name        CDATA          #IMPLIED  -- name of form for scripting --
-  onsubmit    %Script;       #IMPLIED  -- the form was submitted --
-  onreset     %Script;       #IMPLIED  -- the form was reset --
-  target      %FrameTarget;  #IMPLIED  -- render in this frame --
-  accept-charset %Charsets;  #IMPLIED  -- list of supported charsets --
-  >
-
-<!-- Each label must not contain more than ONE field -->
-<!ELEMENT LABEL - - (%inline;)* -(LABEL) -- form field label text -->
-<!ATTLIST LABEL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  for         IDREF          #IMPLIED  -- matches field ID value --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  >
-
-<!ENTITY % InputType
-  "(TEXT | PASSWORD | CHECKBOX |
-    RADIO | SUBMIT | RESET |
-    FILE | HIDDEN | IMAGE | BUTTON)"
-   >
-
-<!-- attribute name required for all but submit and reset -->
-<!ELEMENT INPUT - O EMPTY              -- form control -->
-<!ATTLIST INPUT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  type        %InputType;    TEXT      -- what kind of widget is needed --
-  name        CDATA          #IMPLIED  -- submit as part of form --
-  value       CDATA          #IMPLIED  -- Specify for radio buttons and checkboxes --
-  checked     (checked)      #IMPLIED  -- for radio buttons and check boxes --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  readonly    (readonly)     #IMPLIED  -- for text and passwd --
-  size        CDATA          #IMPLIED  -- specific to each type of field --
-  maxlength   NUMBER         #IMPLIED  -- max chars for text fields --
-  src         %URI;          #IMPLIED  -- for fields with images --
-  alt         CDATA          #IMPLIED  -- short description --
-  usemap      %URI;          #IMPLIED  -- use client-side image map --
-  ismap       (ismap)        #IMPLIED  -- use server-side image map --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  onselect    %Script;       #IMPLIED  -- some text was selected --
-  onchange    %Script;       #IMPLIED  -- the element value was changed --
-  accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!ELEMENT SELECT - - (OPTGROUP|OPTION)+ -- option selector -->
-<!ATTLIST SELECT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #IMPLIED  -- field name --
-  size        NUMBER         #IMPLIED  -- rows visible --
-  multiple    (multiple)     #IMPLIED  -- default is single selection --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  onchange    %Script;       #IMPLIED  -- the element value was changed --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!ELEMENT OPTGROUP - - (OPTION)+ -- option group -->
-<!ATTLIST OPTGROUP
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  label       %Text;         #REQUIRED -- for use in hierarchical menus --
-  >
-
-<!ELEMENT OPTION - O (#PCDATA)         -- selectable choice -->
-<!ATTLIST OPTION
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  label       %Text;         #IMPLIED  -- for use in hierarchical menus --
-  value       CDATA          #IMPLIED  -- defaults to element content --
-  >
-
-<!ELEMENT TEXTAREA - - (#PCDATA)       -- multi-line text field -->
-<!ATTLIST TEXTAREA
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #IMPLIED
-  rows        NUMBER         #REQUIRED
-  cols        NUMBER         #REQUIRED
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  readonly    (readonly)     #IMPLIED
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  onselect    %Script;       #IMPLIED  -- some text was selected --
-  onchange    %Script;       #IMPLIED  -- the element value was changed --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!--
-  #PCDATA is to solve the mixed content problem,
-  per specification only whitespace is allowed there!
- -->
-<!ELEMENT FIELDSET - - (#PCDATA,LEGEND,(%flow;)*) -- form control group -->
-<!ATTLIST FIELDSET
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT LEGEND - - (%inline;)*       -- fieldset legend -->
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ATTLIST LEGEND
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  align       %LAlign;       #IMPLIED  -- relative to fieldset --
-  >
-
-<!ELEMENT BUTTON - -
-     (%flow;)* -(A|%formctrl;|FORM|ISINDEX|FIELDSET|IFRAME)
-     -- push button -->
-<!ATTLIST BUTTON
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED  -- sent to server when submitted --
-  type        (button|submit|reset) submit -- for use as form button --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The BORDER attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The FRAME attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the VALIGN attribute.
-
- The value "border" is included for backwards compatibility with
- <TABLE BORDER> which yields frame=border and border=implied
- For <TABLE BORDER=1> you get border=1 and frame=implied. In this
- case, it is appropriate to treat this as frame=border for backwards
- compatibility with deployed browsers.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The RULES attribute defines which rules to draw between cells:
-
- If RULES is absent then assume:
-     "none" if BORDER is absent or BORDER=0 otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents -->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for alignment char --"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT TABLE - -
-     (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+)>
-<!ELEMENT CAPTION  - - (%inline;)*     -- table caption -->
-<!ELEMENT THEAD    - O (TR)+           -- table header -->
-<!ELEMENT TFOOT    - O (TR)+           -- table footer -->
-<!ELEMENT TBODY    O O (TR)+           -- table body -->
-<!ELEMENT COLGROUP - O (COL)*          -- table column group -->
-<!ELEMENT COL      - O EMPTY           -- table column -->
-<!ELEMENT TR       - O (TH|TD)+        -- table row -->
-<!ELEMENT (TH|TD)  - O (%flow;)*       -- table header cell, table data cell-->
-
-<!ATTLIST TABLE                        -- table element --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  summary     %Text;         #IMPLIED  -- purpose/structure for speech output--
-  width       %Length;       #IMPLIED  -- table width --
-  border      %Pixels;       #IMPLIED  -- controls frame width around table --
-  frame       %TFrame;       #IMPLIED  -- which parts of frame to render --
-  rules       %TRules;       #IMPLIED  -- rulings between rows and cols --
-  cellspacing %Length;       #IMPLIED  -- spacing between cells --
-  cellpadding %Length;       #IMPLIED  -- spacing within cells --
-  align       %TAlign;       #IMPLIED  -- table position relative to window --
-  bgcolor     %Color;        #IMPLIED  -- background color for cells --
-  %reserved;                           -- reserved for possible future use --
-  datapagesize CDATA         #IMPLIED  -- reserved for possible future use --
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST CAPTION
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  align       %CAlign;       #IMPLIED  -- relative to table --
-  >
-
-<!--
-COLGROUP groups a set of COL elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST COLGROUP
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  span        NUMBER         1         -- default number of columns in group --
-  width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-<!--
- COL elements define the alignment properties for cells in
- one or more columns.
-
- The WIDTH attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The SPAN attribute causes the attributes of one
- COL element to apply to more than one column.
--->
-<!ATTLIST COL                          -- column groups and properties --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  span        NUMBER         1         -- COL attributes affect N columns --
-  width       %MultiLength;  #IMPLIED  -- column width specification --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-<!--
-    Use THEAD to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    TBODY sections are rendered in scrolling panel.
-
-    Use TFOOT to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    TBODY sections are rendered in scrolling panel.
-
-    Use multiple TBODY sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST (THEAD|TBODY|TFOOT)          -- table section --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-<!ATTLIST TR                           -- table row --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  bgcolor     %Color;        #IMPLIED  -- background color for row --
-  >
-
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- TH is for headers, TD for data, but for cells acting as both use TD -->
-<!ATTLIST (TH|TD)                      -- header or data cell --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  abbr        %Text;         #IMPLIED  -- abbreviation for header cell --
-  axis        CDATA          #IMPLIED  -- comma-separated list of related headers--
-  headers     IDREFS         #IMPLIED  -- list of id's for header cells --
-  scope       %Scope;        #IMPLIED  -- scope covered by header cells --
-  rowspan     NUMBER         1         -- number of rows spanned by cell --
-  colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  nowrap      (nowrap)       #IMPLIED  -- suppress word wrap --
-  bgcolor     %Color;        #IMPLIED  -- cell background color --
-  width       %Length;       #IMPLIED  -- width for cell --
-  height      %Length;       #IMPLIED  -- height for cell --
-  >
-
-<!--================== Document Frames ===================================-->
-
-<!--
-  The content model for HTML documents depends on whether the HEAD is
-  followed by a FRAMESET or BODY element. The widespread omission of
-  the BODY start tag makes it impractical to define the content model
-  without the use of a marked section.
--->
-
-<![ %HTML.Frameset; [
-<!ELEMENT FRAMESET - - ((FRAMESET|FRAME)+ & NOFRAMES?) -- window subdivision-->
-<!ATTLIST FRAMESET
-  %coreattrs;                          -- id, class, style, title --
-  rows        %MultiLengths; #IMPLIED  -- list of lengths,
-                                          default: 100% (1 row) --
-  cols        %MultiLengths; #IMPLIED  -- list of lengths,
-                                          default: 100% (1 col) --
-  onload      %Script;       #IMPLIED  -- all the frames have been loaded  -- 
-  onunload    %Script;       #IMPLIED  -- all the frames have been removed -- 
-  >
-]]>
-
-<![ %HTML.Frameset; [
-<!-- reserved frame names start with "_" otherwise starts with letter -->
-<!ELEMENT FRAME - O EMPTY              -- subwindow -->
-<!ATTLIST FRAME
-  %coreattrs;                          -- id, class, style, title --
-  longdesc    %URI;          #IMPLIED  -- link to long description
-                                          (complements title) --
-  name        CDATA          #IMPLIED  -- name of frame for targetting --
-  src         %URI;          #IMPLIED  -- source of frame content --
-  frameborder (1|0)          1         -- request frame borders? --
-  marginwidth %Pixels;       #IMPLIED  -- margin widths in pixels --
-  marginheight %Pixels;      #IMPLIED  -- margin height in pixels --
-  noresize    (noresize)     #IMPLIED  -- allow users to resize frames? --
-  scrolling   (yes|no|auto)  auto      -- scrollbar or none --
-  >
-]]>
-
-<!ELEMENT IFRAME - - (%flow;)*         -- inline subwindow -->
-<!ATTLIST IFRAME
-  %coreattrs;                          -- id, class, style, title --
-  longdesc    %URI;          #IMPLIED  -- link to long description
-                                          (complements title) --
-  name        CDATA          #IMPLIED  -- name of frame for targetting --
-  src         %URI;          #IMPLIED  -- source of frame content --
-  frameborder (1|0)          1         -- request frame borders? --
-  marginwidth %Pixels;       #IMPLIED  -- margin widths in pixels --
-  marginheight %Pixels;      #IMPLIED  -- margin height in pixels --
-  scrolling   (yes|no|auto)  auto      -- scrollbar or none --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
-  height      %Length;       #IMPLIED  -- frame height --
-  width       %Length;       #IMPLIED  -- frame width --
-  >
-
-<![ %HTML.Frameset; [
-<!ENTITY % noframes.content "(BODY) -(NOFRAMES)">
-]]>
-
-<!ENTITY % noframes.content "(%flow;)*">
-
-<!ELEMENT NOFRAMES - - %noframes.content;
- -- alternate content container for non frame-based rendering -->
-<!ATTLIST NOFRAMES
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--================ Document Head =======================================-->
-<!-- %head.misc; defined earlier on as "SCRIPT|STYLE|META|LINK|OBJECT" -->
-<!ENTITY % head.content "TITLE & ISINDEX? & BASE?">
-
-<!ELEMENT HEAD O O (%head.content;) +(%head.misc;) -- document head -->
-<!ATTLIST HEAD
-  %i18n;                               -- lang, dir --
-  profile     %URI;          #IMPLIED  -- named dictionary of meta info --
-  >
-
-<!-- The TITLE element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT TITLE - - (#PCDATA) -(%head.misc;) -- document title -->
-<!ATTLIST TITLE %i18n>
-
-<!ELEMENT ISINDEX - O EMPTY            -- single line prompt -->
-<!ATTLIST ISINDEX
-  %coreattrs;                          -- id, class, style, title --
-  %i18n;                               -- lang, dir --
-  prompt      %Text;         #IMPLIED  -- prompt message -->
-
-<!ELEMENT BASE - O EMPTY               -- document base URI -->
-<!ATTLIST BASE
-  href        %URI;          #IMPLIED  -- URI that acts as base URI --
-  target      %FrameTarget;  #IMPLIED  -- render in this frame --
-  >
-
-<!ELEMENT META - O EMPTY               -- generic metainformation -->
-<!ATTLIST META
-  %i18n;                               -- lang, dir, for use with content --
-  http-equiv  NAME           #IMPLIED  -- HTTP response header name  --
-  name        NAME           #IMPLIED  -- metainformation name --
-  content     CDATA          #REQUIRED -- associated information --
-  scheme      CDATA          #IMPLIED  -- select form of content --
-  >
-
-<!ELEMENT STYLE - - %StyleSheet        -- style info -->
-<!ATTLIST STYLE
-  %i18n;                               -- lang, dir, for use with title --
-  type        %ContentType;  #REQUIRED -- content type of style language --
-  media       %MediaDesc;    #IMPLIED  -- designed for use with these media --
-  title       %Text;         #IMPLIED  -- advisory title --
-  >
-
-<!ELEMENT SCRIPT - - %Script;          -- script statements -->
-<!ATTLIST SCRIPT
-  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
-  type        %ContentType;  #REQUIRED -- content type of script language --
-  language    CDATA          #IMPLIED  -- predefined script language name --
-  src         %URI;          #IMPLIED  -- URI for an external script --
-  defer       (defer)        #IMPLIED  -- UA may defer execution of script --
-  event       CDATA          #IMPLIED  -- reserved for possible future use --
-  for         %URI;          #IMPLIED  -- reserved for possible future use --
-  >
-
-<!ELEMENT NOSCRIPT - - (%flow;)*
-  -- alternate content container for non script-based rendering -->
-<!ATTLIST NOSCRIPT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--================ Document Structure ==================================-->
-<!ENTITY % version "version CDATA #FIXED '%HTML.Version;'">
-
-<![ %HTML.Frameset; [
-<!ENTITY % html.content "HEAD, FRAMESET">
-]]>
-
-<!ENTITY % html.content "HEAD, BODY">
-
-<!ELEMENT HTML O O (%html.content;)    -- document root element -->
-<!ATTLIST HTML
-  %i18n;                               -- lang, dir --
-  %version;
-  >
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/strict.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/strict.dtd
deleted file mode 100644
index 7032cb8..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/strict.dtd
+++ /dev/null
@@ -1,870 +0,0 @@
-<!--
-    This is HTML 4.01 Strict DTD, which excludes the presentation 
-    attributes and elements that W3C expects to phase out as 
-    support for style sheets matures. Authors should use the Strict
-    DTD when possible, but may use the Transitional DTD when support
-    for presentation attribute and elements is required.
-    
-    HTML 4 includes mechanisms for style sheets, scripting,
-    embedding objects, improved support for right to left and mixed
-    direction text, and enhancements to forms for improved
-    accessibility for people with disabilities.
-
-          Draft: $Date: 2008/07/22 07:37:01 $
-
-          Authors:
-              Dave Raggett <dsr@w3.org>
-              Arnaud Le Hors <lehors@w3.org>
-              Ian Jacobs <ij@w3.org>
-
-    Further information about HTML 4.01 is available at:
-
-        http://www.w3.org/TR/1999/REC-html401-19991224
-
-
-    The HTML 4.01 specification includes additional
-    syntactic constraints that cannot be expressed within
-    the DTDs.
-
--->
-<!--
-    Typical usage:
-
-    <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-            "http://www.w3.org/TR/html4/strict.dtd">
-    <html>
-    <head>
-    ...
-    </head>
-    <body>
-    ...
-    </body>
-    </html>
-
-    The URI used as a system identifier with the public identifier allows
-    the user agent to download the DTD and entity sets as needed.
-
-    The FPI for the Transitional HTML 4.01 DTD is:
-
-        "-//W3C//DTD HTML 4.01 Transitional//EN"
-
-    This version of the transitional DTD is:
-
-        http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd
-
-    If you are writing a document that includes frames, use 
-    the following FPI:
-
-        "-//W3C//DTD HTML 4.01 Frameset//EN"
-
-    This version of the frameset DTD is:
-
-        http://www.w3.org/TR/1999/REC-html401-19991224/frameset.dtd
-
-    Use the following (relative) URIs to refer to 
-    the DTDs and entity definitions of this specification:
-
-    "strict.dtd"
-    "loose.dtd"
-    "frameset.dtd"
-    "HTMLlat1.ent"
-    "HTMLsymbol.ent"
-    "HTMLspecial.ent"
-
--->
-
-<!--================== Imported Names ====================================-->
-<!-- Feature Switch for frameset documents -->
-<!ENTITY % HTML.Frameset "IGNORE">
-
-<!ENTITY % ContentType "CDATA"
-    -- media type, as per [RFC2045]
-    -->
-
-<!ENTITY % ContentTypes "CDATA"
-    -- comma-separated list of media types, as per [RFC2045]
-    -->
-
-<!ENTITY % Charset "CDATA"
-    -- a character encoding, as per [RFC2045]
-    -->
-
-<!ENTITY % Charsets "CDATA"
-    -- a space-separated list of character encodings, as per [RFC2045]
-    -->
-
-<!ENTITY % LanguageCode "NAME"
-    -- a language code, as per [RFC1766]
-    -->
-
-<!ENTITY % Character "CDATA"
-    -- a single character from [ISO10646] 
-    -->
-
-<!ENTITY % LinkTypes "CDATA"
-    -- space-separated list of link types
-    -->
-
-<!ENTITY % MediaDesc "CDATA"
-    -- single or comma-separated list of media descriptors
-    -->
-
-<!ENTITY % URI "CDATA"
-    -- a Uniform Resource Identifier,
-       see [URI]
-    -->
-
-<!ENTITY % Datetime "CDATA" -- date and time information. ISO date format -->
-
-
-<!ENTITY % Script "CDATA" -- script expression -->
-
-<!ENTITY % StyleSheet "CDATA" -- style sheet data -->
-
-
-
-<!ENTITY % Text "CDATA">
-
-
-<!-- Parameter Entities -->
-
-<!ENTITY % head.misc "SCRIPT|STYLE|META|LINK|OBJECT" -- repeatable head elements -->
-
-<!ENTITY % heading "H1|H2|H3|H4|H5|H6">
-
-<!ENTITY % list "UL | OL">
-
-<!ENTITY % preformatted "PRE">
-
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin1//EN//HTML"
-   "HTMLlat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols//EN//HTML"
-   "HTMLsymbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special//EN//HTML"
-   "HTMLspecial.ent">
-%HTMLspecial;
-<!--=================== Generic Attributes ===============================-->
-
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED  -- document-wide unique id --
-  class       CDATA          #IMPLIED  -- space-separated list of classes --
-  style       %StyleSheet;   #IMPLIED  -- associated style info --
-  title       %Text;         #IMPLIED  -- advisory title --"
-  >
-
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED  -- language code --
-  dir         (ltr|rtl)      #IMPLIED  -- direction for weak/neutral text --"
-  >
-
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED  -- a pointer button was clicked --
-  ondblclick  %Script;       #IMPLIED  -- a pointer button was double clicked--
-  onmousedown %Script;       #IMPLIED  -- a pointer button was pressed down --
-  onmouseup   %Script;       #IMPLIED  -- a pointer button was released --
-  onmouseover %Script;       #IMPLIED  -- a pointer was moved onto --
-  onmousemove %Script;       #IMPLIED  -- a pointer was moved within --
-  onmouseout  %Script;       #IMPLIED  -- a pointer was moved away --
-  onkeypress  %Script;       #IMPLIED  -- a key was pressed and released --
-  onkeydown   %Script;       #IMPLIED  -- a key was pressed down --
-  onkeyup     %Script;       #IMPLIED  -- a key was released --"
-  >
-
-<!-- Reserved Feature Switch -->
-<!ENTITY % HTML.Reserved "IGNORE">
-
-<!-- The following attributes are reserved for possible future use -->
-<![ %HTML.Reserved; [
-<!ENTITY % reserved
- "datasrc     %URI;          #IMPLIED  -- a single or tabular Data Source --
-  datafld     CDATA          #IMPLIED  -- the property or column name --
-  dataformatas (plaintext|html) plaintext -- text or html --"
-  >
-]]>
-
-<!ENTITY % reserved "">
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-
-<!--=================== Text Markup ======================================-->
-
-<!ENTITY % fontstyle
- "TT | I | B | BIG | SMALL">
-
-<!ENTITY % phrase "EM | STRONG | DFN | CODE |
-                   SAMP | KBD | VAR | CITE | ABBR | ACRONYM" >
-
-<!ENTITY % special
-   "A | IMG | OBJECT | BR | SCRIPT | MAP | Q | SUB | SUP | SPAN | BDO">
-
-<!ENTITY % formctrl "INPUT | SELECT | TEXTAREA | LABEL | BUTTON">
-
-<!-- %inline; covers inline or "text-level" elements -->
-<!ENTITY % inline "#PCDATA | %fontstyle; | %phrase; | %special; | %formctrl;">
-
-<!ELEMENT (%fontstyle;|%phrase;) - - (%inline;)*>
-<!ATTLIST (%fontstyle;|%phrase;)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT (SUB|SUP) - - (%inline;)*    -- subscript, superscript -->
-<!ATTLIST (SUB|SUP)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT SPAN - - (%inline;)*         -- generic language/style container -->
-<!ATTLIST SPAN
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %reserved;			       -- reserved for possible future use --
-  >
-
-<!ELEMENT BDO - - (%inline;)*          -- I18N BiDi over-ride -->
-<!ATTLIST BDO
-  %coreattrs;                          -- id, class, style, title --
-  lang        %LanguageCode; #IMPLIED  -- language code --
-  dir         (ltr|rtl)      #REQUIRED -- directionality --
-  >
-
-
-<!ELEMENT BR - O EMPTY                 -- forced line break -->
-<!ATTLIST BR
-  %coreattrs;                          -- id, class, style, title --
-  >
-
-<!--================== HTML content models ===============================-->
-
-<!--
-    HTML has two basic content models:
-
-        %inline;     character level elements and text strings
-        %block;      block-like elements e.g. paragraphs and lists
--->
-
-<!ENTITY % block
-     "P | %heading; | %list; | %preformatted; | DL | DIV | NOSCRIPT |
-      BLOCKQUOTE | FORM | HR | TABLE | FIELDSET | ADDRESS">
-
-<!ENTITY % flow "%block; | %inline;">
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT BODY O O (%block;|SCRIPT)+ +(INS|DEL) -- document body -->
-<!ATTLIST BODY
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  onload          %Script;   #IMPLIED  -- the document has been loaded --
-  onunload        %Script;   #IMPLIED  -- the document has been removed --
-  >
-
-<!ELEMENT ADDRESS - - (%inline;)* -- information on author -->
-<!ATTLIST ADDRESS
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT DIV - - (%flow;)*            -- generic language/style container -->
-<!ATTLIST DIV
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-
-<!--================== The Anchor Element ================================-->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-<!ENTITY % Coords "CDATA" -- comma-separated list of lengths -->
-
-<!ELEMENT A - - (%inline;)* -(A)       -- anchor -->
-<!ATTLIST A
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
-  type        %ContentType;  #IMPLIED  -- advisory content type --
-  name        CDATA          #IMPLIED  -- named link end --
-  href        %URI;          #IMPLIED  -- URI for linked resource --
-  hreflang    %LanguageCode; #IMPLIED  -- language code --
-  rel         %LinkTypes;    #IMPLIED  -- forward link types --
-  rev         %LinkTypes;    #IMPLIED  -- reverse link types --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  shape       %Shape;        rect      -- for use with client-side image maps --
-  coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  >
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT MAP - - ((%block;) | AREA)+ -- client-side image map -->
-<!ATTLIST MAP
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #REQUIRED -- for reference by usemap --
-  >
-
-<!ELEMENT AREA - O EMPTY               -- client-side image map area -->
-<!ATTLIST AREA
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  shape       %Shape;        rect      -- controls interpretation of coords --
-  coords      %Coords;       #IMPLIED  -- comma-separated list of lengths --
-  href        %URI;          #IMPLIED  -- URI for linked resource --
-  nohref      (nohref)       #IMPLIED  -- this region has no action --
-  alt         %Text;         #REQUIRED -- short description --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  >
-
-<!--================== The LINK Element ==================================-->
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the LINK element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel=stylesheet)
-   c) to make a link to a script (rel=script)
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a postscript or pdf version (rel=alternate media=print)
--->
-
-<!ELEMENT LINK - O EMPTY               -- a media-independent link -->
-<!ATTLIST LINK
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
-  href        %URI;          #IMPLIED  -- URI for linked resource --
-  hreflang    %LanguageCode; #IMPLIED  -- language code --
-  type        %ContentType;  #IMPLIED  -- advisory content type --
-  rel         %LinkTypes;    #IMPLIED  -- forward link types --
-  rev         %LinkTypes;    #IMPLIED  -- reverse link types --
-  media       %MediaDesc;    #IMPLIED  -- for rendering on these media --
-  >
-
-<!--=================== Images ===========================================-->
-
-<!-- Length defined in strict DTD for cellpadding/cellspacing -->
-<!ENTITY % Length "CDATA" -- nn for pixels or nn% for percentage length -->
-<!ENTITY % MultiLength "CDATA" -- pixel, percentage, or relative -->
-
-<![ %HTML.Frameset; [
-<!ENTITY % MultiLengths "CDATA" -- comma-separated list of MultiLength -->
-]]>
-
-<!ENTITY % Pixels "CDATA" -- integer representing length in pixels -->
-
-
-<!-- To avoid problems with text-only UAs as well as 
-   to make image content understandable and navigable 
-   to users of non-visual UAs, you need to provide
-   a description with ALT, and avoid server-side image maps -->
-<!ELEMENT IMG - O EMPTY                -- Embedded image -->
-<!ATTLIST IMG
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  src         %URI;          #REQUIRED -- URI of image to embed --
-  alt         %Text;         #REQUIRED -- short description --
-  longdesc    %URI;          #IMPLIED  -- link to long description
-                                          (complements alt) --
-  name        CDATA          #IMPLIED  -- name of image for scripting --
-  height      %Length;       #IMPLIED  -- override height --
-  width       %Length;       #IMPLIED  -- override width --
-  usemap      %URI;          #IMPLIED  -- use client-side image map --
-  ismap       (ismap)        #IMPLIED  -- use server-side image map --
-  >
-
-<!-- USEMAP points to a MAP element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--==================== OBJECT ======================================-->
-<!--
-  OBJECT is used to embed objects as part of HTML pages 
-  PARAM elements should precede other content. SGML mixed content
-  model technicality precludes specifying this formally ...
--->
-
-<!ELEMENT OBJECT - - (PARAM | %flow;)*
- -- generic embedded object -->
-<!ATTLIST OBJECT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  declare     (declare)      #IMPLIED  -- declare but don't instantiate flag --
-  classid     %URI;          #IMPLIED  -- identifies an implementation --
-  codebase    %URI;          #IMPLIED  -- base URI for classid, data, archive--
-  data        %URI;          #IMPLIED  -- reference to object's data --
-  type        %ContentType;  #IMPLIED  -- content type for data --
-  codetype    %ContentType;  #IMPLIED  -- content type for code --
-  archive     CDATA          #IMPLIED  -- space-separated list of URIs --
-  standby     %Text;         #IMPLIED  -- message to show while loading --
-  height      %Length;       #IMPLIED  -- override height --
-  width       %Length;       #IMPLIED  -- override width --
-  usemap      %URI;          #IMPLIED  -- use client-side image map --
-  name        CDATA          #IMPLIED  -- submit as part of form --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!ELEMENT PARAM - O EMPTY              -- named property value -->
-<!ATTLIST PARAM
-  id          ID             #IMPLIED  -- document-wide unique id --
-  name        CDATA          #REQUIRED -- property name --
-  value       CDATA          #IMPLIED  -- property value --
-  valuetype   (DATA|REF|OBJECT) DATA   -- How to interpret value --
-  type        %ContentType;  #IMPLIED  -- content type for value
-                                          when valuetype=ref --
-  >
-
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT HR - O EMPTY -- horizontal rule -->
-<!ATTLIST HR
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT P - O (%inline;)*            -- paragraph -->
-<!ATTLIST P
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from H1 (the most important)
-  to H6 (the least important).
--->
-
-<!ELEMENT (%heading;)  - - (%inline;)* -- heading -->
-<!ATTLIST (%heading;)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- excludes markup for images and changes in font size -->
-<!ENTITY % pre.exclusion "IMG|OBJECT|BIG|SMALL|SUB|SUP">
-
-<!ELEMENT PRE - - (%inline;)* -(%pre.exclusion;) -- preformatted text -->
-<!ATTLIST PRE
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--===================== Inline Quotes ==================================-->
-
-<!ELEMENT Q - - (%inline;)*            -- short inline quotation -->
-<!ATTLIST Q
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  cite        %URI;          #IMPLIED  -- URI for source document or msg --
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT BLOCKQUOTE - - (%block;|SCRIPT)+ -- long quotation -->
-<!ATTLIST BLOCKQUOTE
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  cite        %URI;          #IMPLIED  -- URI for source document or msg --
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-
-<!-- INS/DEL are handled by inclusion on BODY -->
-<!ELEMENT (INS|DEL) - - (%flow;)*      -- inserted text, deleted text -->
-<!ATTLIST (INS|DEL)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  cite        %URI;          #IMPLIED  -- info on reason for change --
-  datetime    %Datetime;     #IMPLIED  -- date and time of change --
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- definition lists - DT for term, DD for its definition -->
-
-<!ELEMENT DL - - (DT|DD)+              -- definition list -->
-<!ATTLIST DL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT DT - O (%inline;)*           -- definition term -->
-<!ELEMENT DD - O (%flow;)*             -- definition description -->
-<!ATTLIST (DT|DD)
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-
-<!ELEMENT OL - - (LI)+                 -- ordered list -->
-<!ATTLIST OL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!-- Unordered Lists (UL) bullet styles -->
-<!ELEMENT UL - - (LI)+                 -- unordered list -->
-<!ATTLIST UL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-
-
-<!ELEMENT LI - O (%flow;)*             -- list item -->
-<!ATTLIST LI
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--================ Forms ===============================================-->
-<!ELEMENT FORM - - (%block;|SCRIPT)+ -(FORM) -- interactive form -->
-<!ATTLIST FORM
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  action      %URI;          #REQUIRED -- server-side form handler --
-  method      (GET|POST)     GET       -- HTTP method used to submit the form--
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
-  name        CDATA          #IMPLIED  -- name of form for scripting --
-  onsubmit    %Script;       #IMPLIED  -- the form was submitted --
-  onreset     %Script;       #IMPLIED  -- the form was reset --
-  accept-charset %Charsets;  #IMPLIED  -- list of supported charsets --
-  >
-
-<!-- Each label must not contain more than ONE field -->
-<!ELEMENT LABEL - - (%inline;)* -(LABEL) -- form field label text -->
-<!ATTLIST LABEL
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  for         IDREF          #IMPLIED  -- matches field ID value --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  >
-
-<!ENTITY % InputType
-  "(TEXT | PASSWORD | CHECKBOX |
-    RADIO | SUBMIT | RESET |
-    FILE | HIDDEN | IMAGE | BUTTON)"
-   >
-
-<!-- attribute name required for all but submit and reset -->
-<!ELEMENT INPUT - O EMPTY              -- form control -->
-<!ATTLIST INPUT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  type        %InputType;    TEXT      -- what kind of widget is needed --
-  name        CDATA          #IMPLIED  -- submit as part of form --
-  value       CDATA          #IMPLIED  -- Specify for radio buttons and checkboxes --
-  checked     (checked)      #IMPLIED  -- for radio buttons and check boxes --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  readonly    (readonly)     #IMPLIED  -- for text and passwd --
-  size        CDATA          #IMPLIED  -- specific to each type of field --
-  maxlength   NUMBER         #IMPLIED  -- max chars for text fields --
-  src         %URI;          #IMPLIED  -- for fields with images --
-  alt         CDATA          #IMPLIED  -- short description --
-  usemap      %URI;          #IMPLIED  -- use client-side image map --
-  ismap       (ismap)        #IMPLIED  -- use server-side image map --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  onselect    %Script;       #IMPLIED  -- some text was selected --
-  onchange    %Script;       #IMPLIED  -- the element value was changed --
-  accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!ELEMENT SELECT - - (OPTGROUP|OPTION)+ -- option selector -->
-<!ATTLIST SELECT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #IMPLIED  -- field name --
-  size        NUMBER         #IMPLIED  -- rows visible --
-  multiple    (multiple)     #IMPLIED  -- default is single selection --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  onchange    %Script;       #IMPLIED  -- the element value was changed --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!ELEMENT OPTGROUP - - (OPTION)+ -- option group -->
-<!ATTLIST OPTGROUP
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  label       %Text;         #REQUIRED -- for use in hierarchical menus --
-  >
-
-<!ELEMENT OPTION - O (#PCDATA)         -- selectable choice -->
-<!ATTLIST OPTION
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  label       %Text;         #IMPLIED  -- for use in hierarchical menus --
-  value       CDATA          #IMPLIED  -- defaults to element content --
-  >
-
-<!ELEMENT TEXTAREA - - (#PCDATA)       -- multi-line text field -->
-<!ATTLIST TEXTAREA
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #IMPLIED
-  rows        NUMBER         #REQUIRED
-  cols        NUMBER         #REQUIRED
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  readonly    (readonly)     #IMPLIED
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  onselect    %Script;       #IMPLIED  -- some text was selected --
-  onchange    %Script;       #IMPLIED  -- the element value was changed --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!--
-  #PCDATA is to solve the mixed content problem,
-  per specification only whitespace is allowed there!
- -->
-<!ELEMENT FIELDSET - - (#PCDATA,LEGEND,(%flow;)*) -- form control group -->
-<!ATTLIST FIELDSET
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!ELEMENT LEGEND - - (%inline;)*       -- fieldset legend -->
-
-<!ATTLIST LEGEND
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  >
-
-<!ELEMENT BUTTON - -
-     (%flow;)* -(A|%formctrl;|FORM|FIELDSET)
-     -- push button -->
-<!ATTLIST BUTTON
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED  -- sent to server when submitted --
-  type        (button|submit|reset) submit -- for use as form button --
-  disabled    (disabled)     #IMPLIED  -- unavailable in this context --
-  tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  onfocus     %Script;       #IMPLIED  -- the element got the focus --
-  onblur      %Script;       #IMPLIED  -- the element lost the focus --
-  %reserved;                           -- reserved for possible future use --
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The BORDER attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The FRAME attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the VALIGN attribute.
-
- The value "border" is included for backwards compatibility with
- <TABLE BORDER> which yields frame=border and border=implied
- For <TABLE BORDER=1> you get border=1 and frame=implied. In this
- case, it is appropriate to treat this as frame=border for backwards
- compatibility with deployed browsers.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The RULES attribute defines which rules to draw between cells:
-
- If RULES is absent then assume:
-     "none" if BORDER is absent or BORDER=0 otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents -->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for alignment char --"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT TABLE - -
-     (CAPTION?, (COL*|COLGROUP*), THEAD?, TFOOT?, TBODY+)>
-<!ELEMENT CAPTION  - - (%inline;)*     -- table caption -->
-<!ELEMENT THEAD    - O (TR)+           -- table header -->
-<!ELEMENT TFOOT    - O (TR)+           -- table footer -->
-<!ELEMENT TBODY    O O (TR)+           -- table body -->
-<!ELEMENT COLGROUP - O (COL)*          -- table column group -->
-<!ELEMENT COL      - O EMPTY           -- table column -->
-<!ELEMENT TR       - O (TH|TD)+        -- table row -->
-<!ELEMENT (TH|TD)  - O (%flow;)*       -- table header cell, table data cell-->
-
-<!ATTLIST TABLE                        -- table element --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  summary     %Text;         #IMPLIED  -- purpose/structure for speech output--
-  width       %Length;       #IMPLIED  -- table width --
-  border      %Pixels;       #IMPLIED  -- controls frame width around table --
-  frame       %TFrame;       #IMPLIED  -- which parts of frame to render --
-  rules       %TRules;       #IMPLIED  -- rulings between rows and cols --
-  cellspacing %Length;       #IMPLIED  -- spacing between cells --
-  cellpadding %Length;       #IMPLIED  -- spacing within cells --
-  %reserved;                           -- reserved for possible future use --
-  datapagesize CDATA         #IMPLIED  -- reserved for possible future use --
-  >
-
-
-<!ATTLIST CAPTION
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--
-COLGROUP groups a set of COL elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST COLGROUP
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  span        NUMBER         1         -- default number of columns in group --
-  width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-<!--
- COL elements define the alignment properties for cells in
- one or more columns.
-
- The WIDTH attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The SPAN attribute causes the attributes of one
- COL element to apply to more than one column.
--->
-<!ATTLIST COL                          -- column groups and properties --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  span        NUMBER         1         -- COL attributes affect N columns --
-  width       %MultiLength;  #IMPLIED  -- column width specification --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-<!--
-    Use THEAD to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    TBODY sections are rendered in scrolling panel.
-
-    Use TFOOT to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    TBODY sections are rendered in scrolling panel.
-
-    Use multiple TBODY sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST (THEAD|TBODY|TFOOT)          -- table section --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-<!ATTLIST TR                           -- table row --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- TH is for headers, TD for data, but for cells acting as both use TD -->
-<!ATTLIST (TH|TD)                      -- header or data cell --
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  abbr        %Text;         #IMPLIED  -- abbreviation for header cell --
-  axis        CDATA          #IMPLIED  -- comma-separated list of related headers--
-  headers     IDREFS         #IMPLIED  -- list of id's for header cells --
-  scope       %Scope;        #IMPLIED  -- scope covered by header cells --
-  rowspan     NUMBER         1         -- number of rows spanned by cell --
-  colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
-  >
-
-
-<!--================ Document Head =======================================-->
-<!-- %head.misc; defined earlier on as "SCRIPT|STYLE|META|LINK|OBJECT" -->
-<!ENTITY % head.content "TITLE & BASE?">
-
-<!ELEMENT HEAD O O (%head.content;) +(%head.misc;) -- document head -->
-<!ATTLIST HEAD
-  %i18n;                               -- lang, dir --
-  profile     %URI;          #IMPLIED  -- named dictionary of meta info --
-  >
-
-<!-- The TITLE element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT TITLE - - (#PCDATA) -(%head.misc;) -- document title -->
-<!ATTLIST TITLE %i18n>
-
-
-<!ELEMENT BASE - O EMPTY               -- document base URI -->
-<!ATTLIST BASE
-  href        %URI;          #REQUIRED -- URI that acts as base URI --
-  >
-
-<!ELEMENT META - O EMPTY               -- generic metainformation -->
-<!ATTLIST META
-  %i18n;                               -- lang, dir, for use with content --
-  http-equiv  NAME           #IMPLIED  -- HTTP response header name  --
-  name        NAME           #IMPLIED  -- metainformation name --
-  content     CDATA          #REQUIRED -- associated information --
-  scheme      CDATA          #IMPLIED  -- select form of content --
-  >
-
-<!ELEMENT STYLE - - %StyleSheet        -- style info -->
-<!ATTLIST STYLE
-  %i18n;                               -- lang, dir, for use with title --
-  type        %ContentType;  #REQUIRED -- content type of style language --
-  media       %MediaDesc;    #IMPLIED  -- designed for use with these media --
-  title       %Text;         #IMPLIED  -- advisory title --
-  >
-
-<!ELEMENT SCRIPT - - %Script;          -- script statements -->
-<!ATTLIST SCRIPT
-  charset     %Charset;      #IMPLIED  -- char encoding of linked resource --
-  type        %ContentType;  #REQUIRED -- content type of script language --
-  src         %URI;          #IMPLIED  -- URI for an external script --
-  defer       (defer)        #IMPLIED  -- UA may defer execution of script --
-  event       CDATA          #IMPLIED  -- reserved for possible future use --
-  for         %URI;          #IMPLIED  -- reserved for possible future use --
-  >
-
-<!ELEMENT NOSCRIPT - - (%block;)+
-  -- alternate content container for non script-based rendering -->
-<!ATTLIST NOSCRIPT
-  %attrs;                              -- %coreattrs, %i18n, %events --
-  >
-
-<!--================ Document Structure ==================================-->
-<!ENTITY % html.content "HEAD, BODY">
-
-<!ELEMENT HTML O O (%html.content;)    -- document root element -->
-<!ATTLIST HTML
-  %i18n;                               -- lang, dir --
-  >
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/wml11.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/wml11.dtd
deleted file mode 100644
index b2b12bb..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/wml11.dtd
+++ /dev/null
@@ -1,355 +0,0 @@
-<!--
-Wireless Markup Language (WML) Document Type Definition.
-
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
-
-WML is an XML language.  Typical usage:
-   <?xml version="1.0"?>
-   <!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
-          "http://www.wapforum.org/DTD/wml_1.1.xml">
-   <wml>
-   ...
-   </wml>
-
-Terms and conditions of use are available from the Wireless 
-Application Protocol Forum Ltd. web site at
-http://www.wapforum.org/docs/copyright.htm.
--->
-
-<!ENTITY % length  "CDATA">    <!-- [0-9]+ for pixels or [0-9]+"%" for
-                                    percentage length -->
-<!ENTITY % vdata   "CDATA">    <!-- attribute value possibly containing
-                                    variable references -->
-<!ENTITY % HREF    "%vdata;">  <!-- URI, URL or URN designating a hypertext
-                                    node. May contain variable references -->
-<!ENTITY % boolean      "(true|false)">
-<!ENTITY % number  "NMTOKEN">  <!-- a number, with format [0-9]+ -->
-<!ENTITY % coreattrs  "id    ID     #IMPLIED 
-                       class CDATA  #IMPLIED">
-
-
-
-<!ENTITY % emph    "em | strong | b | i | u | big | small">
-<!ENTITY % layout  "br">
-
-<!ENTITY % text     "#PCDATA | %emph;">
-
-<!-- flow covers "card-level" elements, such as text and images -->
-<!ENTITY % flow     "%text; | %layout; | img | anchor | a | table">
-
-<!-- Task types -->
-<!ENTITY % task   "go | prev | noop | refresh">
-
-<!-- Navigation and event elements -->
-<!ENTITY % navelmts "do | onevent">
-
-<!--================ Decks and Cards ================-->
-
-<!ELEMENT wml ( head?, template?, card+ )>
-<!ATTLIST wml
-  xml:lang        NMTOKEN        #IMPLIED
-  %coreattrs;
-  >
-
-<!-- card intrinsic events -->
-<!ENTITY % cardev
- "onenterforward  %HREF;          #IMPLIED
-  onenterbackward %HREF;          #IMPLIED
-  ontimer         %HREF;          #IMPLIED"
-  >
-
-<!-- card field types -->
-<!ENTITY % fields  "%flow; | input | select | fieldset">
-
-<!ELEMENT card (onevent*, timer?, (do | p)*)>
-<!ATTLIST card
-  title           %vdata;       #IMPLIED
-  newcontext      %boolean;     "false"
-  ordered         %boolean;     "true"
-  xml:lang        NMTOKEN       #IMPLIED
-  %cardev;
-  %coreattrs;
-  >
-
-<!--================ Event Bindings ================-->
-
-<!ELEMENT do (%task;)>
-<!ATTLIST do
-  type         CDATA       #REQUIRED
-  label        %vdata;     #IMPLIED
-  name         NMTOKEN     #IMPLIED
-  optional     %boolean;   "false"
-  xml:lang     NMTOKEN     #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT onevent (%task;)>
-<!ATTLIST onevent
-  type         CDATA       #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Deck-level declarations ================-->
-
-<!ELEMENT head ( access | meta )+>
-<!ATTLIST head
-  %coreattrs;
-  >
-
-<!ELEMENT template (%navelmts;)*>
-<!ATTLIST template
-  %cardev;
-  %coreattrs;
-  >
-
-<!ELEMENT access EMPTY>
-<!ATTLIST access
-  domain       CDATA       #IMPLIED
-  path         CDATA       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  http-equiv     CDATA      #IMPLIED
-  name           CDATA      #IMPLIED
-  forua          %boolean;  #IMPLIED
-  content        CDATA      #REQUIRED
-  scheme         CDATA      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Tasks ================-->
-
-<!ELEMENT go (postfield | setvar)*>
-<!ATTLIST go
-  href            %HREF;           #REQUIRED
-  sendreferer     %boolean;       "false"
-  method          (post|get)      "get"
-  accept-charset  CDATA           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT prev (setvar)*>
-<!ATTLIST prev
-  %coreattrs;
-  >
-
-<!ELEMENT refresh (setvar)*>
-<!ATTLIST refresh
-  %coreattrs;
-  >
-
-<!ELEMENT noop EMPTY>
-<!ATTLIST noop
-  %coreattrs;
-  >
-
-<!--================ postfield ================-->
- 
-<!ELEMENT postfield EMPTY>
-<!ATTLIST postfield
-  name         %vdata;           #REQUIRED
-  value        %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ variables ================-->
-
-<!ELEMENT setvar EMPTY>
-<!ATTLIST setvar
-  name         %vdata;           #REQUIRED
-  value        %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Card Fields ================-->
-
-<!ELEMENT select (optgroup|option)+>
-<!ATTLIST select
-  title        %vdata;           #IMPLIED
-  name         NMTOKEN           #IMPLIED
-  value        %vdata;           #IMPLIED
-  iname        NMTOKEN           #IMPLIED
-  ivalue       %vdata;           #IMPLIED
-  multiple     %boolean;         "false"
-  tabindex     %number;          #IMPLIED
-  xml:lang     NMTOKEN           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT optgroup (optgroup|option)+ >
-<!ATTLIST optgroup
-  title      %vdata;    #IMPLIED
-  xml:lang   NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT option (#PCDATA | onevent)*>
-<!ATTLIST option
-  value      %vdata;    #IMPLIED
-  title      %vdata;    #IMPLIED
-  onpick     %HREF;     #IMPLIED
-  xml:lang   NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT input EMPTY>
-<!ATTLIST input
-  name       NMTOKEN           #REQUIRED
-  type       (text|password)   "text"
-  value      %vdata;           #IMPLIED
-  format     CDATA             #IMPLIED
-  emptyok    %boolean;         "false"
-  size       %number;          #IMPLIED
-  maxlength  %number;          #IMPLIED
-  tabindex   %number;          #IMPLIED
-  title      %vdata;           #IMPLIED
-  xml:lang   NMTOKEN           #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT fieldset (%fields; | do)* >
-<!ATTLIST fieldset
-  title           %vdata;      #IMPLIED
-  xml:lang        NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT timer EMPTY>
-<!ATTLIST timer
-  name       NMTOKEN           #IMPLIED
-  value      %vdata;           #REQUIRED
-  %coreattrs;
-  >
-
-<!--================ Images ================-->
-
-<!ENTITY % IAlign "(top|middle|bottom)" >
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  alt        %vdata;      #REQUIRED
-  src        %HREF;       #REQUIRED
-  localsrc   %vdata;      #IMPLIED
-  vspace     %length;     "0"
-  hspace     %length;     "0"
-  align      %IAlign;     "bottom"
-  height     %length;     #IMPLIED
-  width      %length;     #IMPLIED
-  xml:lang   NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Anchor ================-->
-
-<!ELEMENT anchor ( #PCDATA | br | img | go | prev | refresh )*>
-<!ATTLIST anchor
-  title        %vdata;      #IMPLIED
-  xml:lang     NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT a ( #PCDATA | br | img )*>
-<!ATTLIST a
-  href         %HREF;       #REQUIRED
-  title        %vdata;      #IMPLIED
-  xml:lang     NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Tables ================-->
-
-<!ELEMENT table (tr)+>
-<!ATTLIST table
-  title       %vdata;    #IMPLIED
-  align       CDATA      #IMPLIED
-  columns     %number;   #REQUIRED
-  xml:lang    NMTOKEN    #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT tr (td)+>
-<!ATTLIST tr
-  %coreattrs;
-  >
-
-<!ELEMENT td ( %text; | %layout; | img | anchor | a )*>
-<!ATTLIST td
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!--================ Text layout and line breaks ================-->
-
-<!ELEMENT em     (%flow;)*>
-<!ATTLIST em
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT strong (%flow;)*>
-<!ATTLIST strong
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT b      (%flow;)*>
-<!ATTLIST b
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT i      (%flow;)*>
-<!ATTLIST i
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT u      (%flow;)*>
-<!ATTLIST u
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT big    (%flow;)*>
-<!ATTLIST big
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT small  (%flow;)*>
-<!ATTLIST small
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ENTITY % TAlign "(left|right|center)">
-<!ENTITY % WrapMode "(wrap|nowrap)" >
-<!ELEMENT p (%fields; | do)*>
-<!ATTLIST p
-  align       %TAlign;     "left"
-  mode        %WrapMode;   #IMPLIED
-  xml:lang    NMTOKEN      #IMPLIED
-  %coreattrs;
-  >
-
-<!ELEMENT br EMPTY>
-<!ATTLIST br
-  xml:lang        NMTOKEN       #IMPLIED
-  %coreattrs;
-  >
-
-<!ENTITY quot  "&#34;">     <!-- quotation mark -->
-<!ENTITY amp   "&#38;#38;"> <!-- ampersand -->
-<!ENTITY apos  "&#39;">     <!-- apostrophe -->
-<!ENTITY lt    "&#38;#60;"> <!-- less than -->
-<!ENTITY gt    "&#62;">     <!-- greater than -->
-<!ENTITY nbsp  "&#160;">    <!-- non-breaking space -->
-<!ENTITY shy   "&#173;">    <!-- soft hyphen (discretionary hyphen) -->
-
-<!--
-Copyright Wireless Application Protocol Forum Ltd., 1998,1999.
-                      All rights reserved.  
--->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/wml13.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/wml13.dtd
deleted file mode 100644
index c7d85b1..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/wml13.dtd
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-basic10-f.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-basic10-f.dtd
deleted file mode 100644
index 5b3d25d..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-basic10-f.dtd
+++ /dev/null
@@ -1,3086 +0,0 @@
-<!-- XHTML Basic 1.0 DTD  ...................................................... -->
-<!-- file: xhtml-basic10.dtd -->
-
-<!-- XHTML Basic 1.0 DTD
-
-     This is XHTML Basic, a proper subset of XHTML.
-
-     The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2000 World Wide Web Consortium
-        (Massachusetts Institute of Technology, Institut National de
-         Recherche en Informatique et en Automatique, Keio University).
-         All Rights Reserved.
-
-     Permission to use, copy, modify and distribute the XHTML Basic DTD
-     and its accompanying documentation for any purpose and without fee is
-     hereby granted in perpetuity, provided that the above copyright notice
-     and this paragraph appear in all copies.  The copyright holders make
-     no representation about the suitability of the DTD for any purpose.
-
-     It is provided "as is" without expressed or implied warranty.
-
-        Editors:    Murray M. Altheim <mailto:altheim@eng.sun.com>
-                    Peter Stark       <mailto:Peter.Stark@ecs.ericsson.se>
-        Revision:   $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
--->
-<!-- This is the driver file for version 1.0 of the XHTML Basic DTD.
-
-     This DTD is identified by the PUBLIC and SYSTEM identifiers:
-
-     PUBLIC: "-//W3C//DTD XHTML Basic 1.0//EN"
-     SYSTEM: "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd"
--->
-<!ENTITY % XHTML.version  "-//W3C//DTD XHTML Basic 1.0//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
-         "http://www.w3.org/1999/xhtml"
-
-     See the Qualified Names module for information
-     on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- Reserved for use with the XLink namespace:
--->
-<!ENTITY % XLINK.xmlns "" >
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- For example, if you are using XHTML Basic 1.0 directly, use
-     the FPI in the DOCTYPE declaration, with the xmlns attribute
-     on the document element to identify the default namespace:
-
-         <?xml version="1.0"?>
-         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
-             "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd" >
-         <html xmlns="http://www.w3.org/1999/xhtml"
-               xml:lang="en" >
-         ...
-         </html>
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile  "" >
-
-<!-- Bidirectional Text features
-     This feature-test entity is used to declare elements
-     and attributes used for bidirectional text support.
--->
-<!ENTITY % XHTML.bidi  "IGNORE" >
-
-<?doc type="doctype" role="title" { XHTML Basic 1.0 } ?>
-
-<!-- :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!ENTITY % xhtml-events.module   "IGNORE" >
-<!ENTITY % xhtml-bdo.module      "%XHTML.bidi;" >
-
-<!ENTITY % xhtml-model.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-            "xhtml-basic10-model-1.mod" >
-
-<!ENTITY % xhtml-framework.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "xhtml-framework-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Modular Framework Module  ...................................... -->
-<!-- file: xhtml-framework-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-framework-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Modular Framework
-
-     This required module instantiates the modules needed
-     to support the XHTML modularization model, including:
-
-        +  notations
-        +  datatypes
-        +  namespace-qualified names
-        +  common attributes
-        +  document model
-        +  character entities
-
-     The Intrinsic Events module is ignored by default but
-     occurs in this module because it must be instantiated
-     prior to Attributes but after Datatypes.
--->
-
-<!ENTITY % xhtml-arch.module "INCLUDE" >
-<![%xhtml-arch.module;[
-<!ENTITY % xhtml-arch.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-            "xhtml-arch-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Architecture Module  ...................................... -->
-<!-- file: xhtml-arch-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-arch-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- This optional module includes declarations that enable XHTML to be used
-     as a base architecture according to the 'Architectural Forms Definition
-     Requirements' (Annex A.3, ISO/IEC 10744, 2nd edition). For more information
-     on use of architectural forms, see the HyTime web site at:
-
-         http://www.hytime.org/
--->
-
-<?IS10744 ArcBase xhtml ?>
-
-<!NOTATION xhtml PUBLIC "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN" >
-
-<!-- Entity declaration for associated Architectural DTD
--->
-<!ENTITY xhtml-arch.dtd
-      PUBLIC "-//W3C//DTD XHTML Architecture 1.1//EN"
-             "xhtml11-arch.dtd" >
-
-<?IS10744:arch xhtml
-    public-id       =  "-//W3C//NOTATION AFDR ARCBASE XHTML 1.1//EN"
-    dtd-public-id   =  "-//W3C//DTD XHTML 1.1//EN"
-    dtd-system-id   =  "xhtml11.dtd"
-    doc-elem-form   =  "html"
-    form-att        =  "html"
-    renamer-att     =  "htnames"
-    suppressor-att  =  "htsupp"
-    data-ignore-att =  "htign"
-    auto            =  "ArcAuto"
-    options         =  "HtModReq HtModOpt"
-    HtModReq        =  "Framework Text Hypertext Lists Structure"
-    HtModOpt        =  "Standard"
-?>
-
-<!-- end of xhtml-arch-1.mod -->
-]]>
-
-<!ENTITY % xhtml-notations.module "INCLUDE" >
-<![%xhtml-notations.module;[
-<!ENTITY % xhtml-notations.mod
-     PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "xhtml-notations-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module  .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-notations-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Notations
-
-     defines the following notations, many of these imported from 
-     other specifications and standards. When an existing FPI is
-     known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml 
-     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata 
-     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
-     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC1766] -->
-<!NOTATION languageCode 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris 
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-]]>
-
-<!ENTITY % xhtml-datatypes.module "INCLUDE" >
-<![%xhtml-datatypes.module;[
-<!ENTITY % xhtml-datatypes.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "xhtml-datatypes-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module  .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-datatypes-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Datatypes
-
-     defines containers for the following datatypes, many of
-     these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC1766] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-]]>
-
-<!-- placeholder for XLink support module -->
-<!ENTITY % xhtml-xlink.mod "" >
-
-
-<!ENTITY % xhtml-qname.module "INCLUDE" >
-<![%xhtml-qname.module;[
-<!ENTITY % xhtml-qname.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "xhtml-qname-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module  ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-qname-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
-     This module is contained in two parts, labeled Section 'A' and 'B':
-
-       Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing 
-       for XHTML and extensions.
-    
-       Section B declares parameter entities used to provide
-       namespace-qualified names for all XHTML element types:
-
-         %applet.qname;   the xmlns-qualified name for <applet>
-         %base.qname;     the xmlns-qualified name for <base>
-         ...
-
-     XHTML extensions would create a module similar to this one. 
-     Included in the XHTML distribution is a template module 
-     ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should 
-        inherit '%NS.prefixed;' from the DTD driver, so that unless 
-        overridden, the default behaviour follows the overall DTD 
-        prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing 
-        the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing 
-        is enabled. This may be overridden in the DTD driver or the
-        internal subset of an document instance. If no default prefix
-        is desired, this may be declared as an empty string.
-
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves 
-     as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the 
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when 
-        prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx  "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx  "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration 
-        attributes for namespaces embedded in XHTML. The default 
-        is an empty string.  XLink should be included here if used 
-        in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
-     all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether 
-     prefixing is active. 
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
-      %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all 
-     XML namespace declaration attributes used by XHTML, including
-     a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
-     "%NS.decl.attrib;
-      %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
-     "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
-        namespace-qualified names for all XHTML element types.
--->
-
-<!-- module:  xhtml-applet-1.mod -->
-<!ENTITY % applet.qname  "%XHTML.pfx;applet" >
-
-<!-- module:  xhtml-base-1.mod -->
-<!ENTITY % base.qname    "%XHTML.pfx;base" >
-
-<!-- module:  xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname     "%XHTML.pfx;bdo" >
-
-<!-- module:  xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname  "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname     "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname      "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname      "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname      "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname      "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname      "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname      "%XHTML.pfx;h6" >
-
-<!-- module:  xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname      "%XHTML.pfx;hr" >
-
-<!-- module:  xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname     "%XHTML.pfx;div" >
-<!ENTITY % p.qname       "%XHTML.pfx;p" >
-
-<!-- module:  xhtml-edit-1.mod -->
-<!ENTITY % ins.qname     "%XHTML.pfx;ins" >
-<!ENTITY % del.qname     "%XHTML.pfx;del" >
-
-<!-- module:  xhtml-form-1.mod -->
-<!ENTITY % form.qname    "%XHTML.pfx;form" >
-<!ENTITY % label.qname   "%XHTML.pfx;label" >
-<!ENTITY % input.qname   "%XHTML.pfx;input" >
-<!ENTITY % select.qname  "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname  "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname  "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname  "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname  "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname  "%XHTML.pfx;legend" >
-<!ENTITY % button.qname  "%XHTML.pfx;button" >
-
-<!-- module:  xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname       "%XHTML.pfx;a" >
-
-<!-- module:  xhtml-image-1.mod -->
-<!ENTITY % img.qname     "%XHTML.pfx;img" >
-
-<!-- module:  xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname    "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname    "%XHTML.pfx;cite" >
-<!ENTITY % code.qname    "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname     "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname      "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname     "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname       "%XHTML.pfx;q" >
-<!ENTITY % samp.qname    "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname  "%XHTML.pfx;strong" >
-<!ENTITY % var.qname     "%XHTML.pfx;var" >
-
-<!-- module:  xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname       "%XHTML.pfx;b" >
-<!ENTITY % big.qname     "%XHTML.pfx;big" >
-<!ENTITY % i.qname       "%XHTML.pfx;i" >
-<!ENTITY % small.qname   "%XHTML.pfx;small" >
-<!ENTITY % sub.qname     "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname     "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname      "%XHTML.pfx;tt" >
-
-<!-- module:  xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname      "%XHTML.pfx;br" >
-<!ENTITY % span.qname    "%XHTML.pfx;span" >
-
-<!-- module:  xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname     "%XHTML.pfx;map" >
-<!ENTITY % area.qname    "%XHTML.pfx;area" >
-
-<!-- module:  xhtml-link-1.mod -->
-<!ENTITY % link.qname    "%XHTML.pfx;link" >
-
-<!-- module:  xhtml-list-1.mod -->
-<!ENTITY % dl.qname      "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname      "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname      "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname      "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname      "%XHTML.pfx;ul" >
-<!ENTITY % li.qname      "%XHTML.pfx;li" >
-
-<!-- module:  xhtml-meta-1.mod -->
-<!ENTITY % meta.qname    "%XHTML.pfx;meta" >
-
-<!-- module:  xhtml-param-1.mod -->
-<!ENTITY % param.qname   "%XHTML.pfx;param" >
-
-<!-- module:  xhtml-object-1.mod -->
-<!ENTITY % object.qname  "%XHTML.pfx;object" >
-
-<!-- module:  xhtml-script-1.mod -->
-<!ENTITY % script.qname  "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
-
-<!-- module:  xhtml-struct-1.mod -->
-<!ENTITY % html.qname    "%XHTML.pfx;html" >
-<!ENTITY % head.qname    "%XHTML.pfx;head" >
-<!ENTITY % title.qname   "%XHTML.pfx;title" >
-<!ENTITY % body.qname    "%XHTML.pfx;body" >
-
-<!-- module:  xhtml-style-1.mod -->
-<!ENTITY % style.qname   "%XHTML.pfx;style" >
-
-<!-- module:  xhtml-table-1.mod -->
-<!ENTITY % table.qname   "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname   "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname   "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname   "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname  "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname     "%XHTML.pfx;col" >
-<!ENTITY % tr.qname      "%XHTML.pfx;tr" >
-<!ENTITY % th.qname      "%XHTML.pfx;th" >
-<!ENTITY % td.qname      "%XHTML.pfx;td" >
-
-
-<!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
-
-<!-- module:  xhtml-image-2.mod -->
-<!ENTITY % alt.qname     "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-]]>
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<![%xhtml-events.module;[
-<!ENTITY % xhtml-events.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-            "xhtml-events-1.mod" >
-%xhtml-events.mod;]]>
-
-<!ENTITY % xhtml-attribs.module "INCLUDE" >
-<![%xhtml-attribs.module;[
-<!ENTITY % xhtml-attribs.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "xhtml-attribs-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module  ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-attribs-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Common Attributes
-
-     This module declares many of the common attributes for the XHTML DTD.
-     %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
-     "id           ID                       #IMPLIED"
->
-
-<!ENTITY % class.attrib
-     "class        NMTOKENS                 #IMPLIED"
->
-
-<!ENTITY % title.attrib
-     "title        %Text.datatype;          #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
-     "%XHTML.xmlns.attrib;
-      %id.attrib;
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
-     "xml:lang     %LanguageCode.datatype;  #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
-     "dir          ( ltr | rtl )            #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
-     "%dir.attrib;
-      %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
-     "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
-     "%Core.attrib;
-      %I18n.attrib;
-      %Events.attrib;
-      %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-]]>
-
-<!-- placeholder for content model redeclarations -->
-<!ENTITY % xhtml-model.redecl "" >
-
-
-<!ENTITY % xhtml-model.module "INCLUDE" >
-<![%xhtml-model.module;[
-<!-- instantiate the Document Model module declared in the DTD driver
--->
-<!-- ....................................................................... -->
-<!-- XHTML Basic 1.0 Document Model Module  .................................... -->
-<!-- file: xhtml-basic10-model-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Basic 1.0 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-basic/xhtml-basic10-model-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- XHTML Basic Document Model
-
-     This module describes the groupings of elements that make up
-     common content models for XHTML elements.
--->
-
-<!-- Optional Elements in head  .............. -->
-
-<!ENTITY % HeadOpts.mix
-     "( %meta.qname; | %link.qname; | %object.qname; )*" >
-
-<!-- Miscellaneous Elements  ................. -->
-
-<!ENTITY % Misc.class "" >
-
-<!-- Inline Elements  ........................ -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
-     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
-      | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
-      | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class "" >
-
-<!ENTITY % I18n.class "" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
-
-<!ENTITY % InlForm.class
-     "| %input.qname; | %select.qname; | %textarea.qname;
-      | %label.qname;"
->
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Inline.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.mix
-     "%InlNoAnchor.class;
-      %Misc.class;"
->
-
-<!ENTITY % Inline.mix
-     "%Inline.class;
-      %Misc.class;"
->
-
-<!-- Block Elements  ......................... -->
-
-<!ENTITY % Heading.class
-     "%h1.qname; | %h2.qname; | %h3.qname;
-      | %h4.qname; | %h5.qname; | %h6.qname;"
->
-<!ENTITY % List.class  "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class  "| %form.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
-     "| %pre.qname; | %blockquote.qname; | %address.qname;"
->
-
-<!ENTITY % BlkPres.class "" >
-
-<!ENTITY % BlkSpecial.class
-     "%Table.class;
-      %Form.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!ENTITY % Block.class
-     "%BlkStruct.class;
-      %BlkPhras.class;
-      %BlkSpecial.class;
-      %Block.extra;"
->
-
-<!ENTITY % Block.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      %Misc.class;"
->
-
-<!-- All Content Elements  ................... -->
-
-<!-- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %Form.class;
-      %Block.extra;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!ENTITY % Flow.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!-- end of xhtml-basic10-model-1.mod -->
-]]>
-
-<!ENTITY % xhtml-charent.module "INCLUDE" >
-<![%xhtml-charent.module;[
-<!ENTITY % xhtml-charent.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "xhtml-charent-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module  ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-charent-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
-     This module declares the set of character entities for XHTML,
-     including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
-    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-           "xhtml-lat1.ent" >
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-    <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-    %HTMLlat1;
--->
-
-<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
-                                  U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;"> <!-- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
-
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-        "-//W3C//ENTITIES Symbols for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
-     %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
-                                     U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  --> 
-<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
-
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-        "-//W3C//ENTITIES Special for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
-     %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
-                                    U+0022 ISOnum -->
-<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
-<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-]]>
-
-<!-- end of xhtml-framework-1.mod -->
-
-
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %Inline.extra; )*"
->
-
-<!ENTITY % xhtml-text.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "xhtml-text-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Text Module  ................................................... -->
-<!-- file: xhtml-text-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-text-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Textual Content
-
-     The Text module includes declarations for all core 
-     text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-            "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module  ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Structural
-
-        br, span
-
-     This module declares the elements and their attributes 
-     used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element  "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content  "EMPTY" >
-<!ENTITY % br.qname  "br" >
-<!ELEMENT %br.qname;  %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist  "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
-      %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element  "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname  "span" >
-<!ELEMENT %span.qname;  %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist  "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
-      %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-            "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module  ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-inlphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Phrasal
-
-        abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
-     This module declares the elements and their attributes used to
-     support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element  "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname  "abbr" >
-<!ELEMENT %abbr.qname;  %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist  "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
-      %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element  "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname  "acronym" >
-<!ELEMENT %acronym.qname;  %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist  "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
-      %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element  "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname  "cite" >
-<!ELEMENT %cite.qname;  %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist  "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
-      %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element  "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname  "code" >
-<!ELEMENT %code.qname;  %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist  "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
-      %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element  "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname  "dfn" >
-<!ELEMENT %dfn.qname;  %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist  "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
-      %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element  "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname  "em" >
-<!ELEMENT %em.qname;  %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist  "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
-      %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element  "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname  "kbd" >
-<!ELEMENT %kbd.qname;  %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist  "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
-      %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element  "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname  "q" >
-<!ELEMENT %q.qname;  %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist  "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element  "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname  "samp" >
-<!ELEMENT %samp.qname;  %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist  "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
-      %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element  "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname  "strong" >
-<!ELEMENT %strong.qname;  %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist  "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
-      %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element  "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname  "var" >
-<!ELEMENT %var.qname;  %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist  "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
-      %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-            "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module  ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Structural
-
-        div, p
-
-     This module declares the elements and their attributes used to
-     support block-level structural markup.
--->
-
-<!ENTITY % div.element  "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname  "div" >
-<!ELEMENT %div.qname;  %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist  "INCLUDE" >
-<![%div.attlist;[
-<!-- end of div.attlist -->]]>
-<!ATTLIST %div.qname;
-      %Common.attrib;
->
-
-<!ENTITY % p.element  "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname  "p" >
-<!ELEMENT %p.qname;  %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist  "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
-      %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-            "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module  .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-blkphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Phrasal
-
-        address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
-     This module declares the elements and their attributes used to
-     support block-level phrasal markup.
--->
-
-<!ENTITY % address.element  "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname  "address" >
-<!ELEMENT %address.qname;  %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist  "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
-      %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element  "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
-     "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname  "blockquote" >
-<!ELEMENT %blockquote.qname;  %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist  "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element  "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
-     "( #PCDATA 
-      | %InlStruct.class;
-      %InlPhras.class;
-      | %tt.qname; | %i.qname; | %b.qname;
-      %I18n.class;
-      %Anchor.class;
-      | %script.qname; | %map.qname;
-      %Inline.extra; )*"
->
-<!ENTITY % pre.qname  "pre" >
-<!ELEMENT %pre.qname;  %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist  "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
-      %Common.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ...................  Heading Elements  ................... -->
-
-<!ENTITY % Heading.content  "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element  "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname  "h1" >
-<!ELEMENT %h1.qname;  %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist  "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
-      %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element  "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname  "h2" >
-<!ELEMENT %h2.qname;  %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist  "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
-      %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element  "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname  "h3" >
-<!ELEMENT %h3.qname;  %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist  "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
-      %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element  "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname  "h4" >
-<!ELEMENT %h4.qname;  %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist  "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
-      %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element  "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname  "h5" >
-<!ELEMENT %h5.qname;  %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist  "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
-      %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element  "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname  "h6" >
-<!ELEMENT %h6.qname;  %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist  "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
-      %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-
-
-<!ENTITY % xhtml-hypertext.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "xhtml-hypertext-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module  .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-hypertext-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Hypertext
-
-        a
-
-     This module declares the anchor ('a') element type, which
-     defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute 
-     rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............  Anchor Element  ............ -->
-
-<!ENTITY % a.element  "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
-     "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname  "a" >
-<!ELEMENT %a.qname;  %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist  "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-
-
-<!ENTITY % xhtml-list.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "xhtml-list-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module  .................................................. -->
-<!-- file: xhtml-list-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-list-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Lists
-
-        dl, dt, dd, ol, ul, li
-
-     This module declares the list-oriented element types
-     and their attributes.
--->
-
-<!ENTITY % dl.qname  "dl" >
-<!ENTITY % dt.qname  "dt" >
-<!ENTITY % dd.qname  "dd" >
-<!ENTITY % ol.qname  "ol" >
-<!ENTITY % ul.qname  "ul" >
-<!ENTITY % li.qname  "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element  "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content  "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname;  %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist  "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
-      %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element  "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname;  %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist  "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
-      %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element  "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname;  %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist  "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
-      %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element  "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content  "( %li.qname; )+" >
-<!ELEMENT %ol.qname;  %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist  "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
-      %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element  "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content  "( %li.qname; )+" >
-<!ELEMENT %ul.qname;  %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist  "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
-      %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element  "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname;  %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist  "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
-      %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Image Module  ............................................... -->
-<!ENTITY % xhtml-image.module "INCLUDE" >
-<![%xhtml-image.module;[
-<!ENTITY % xhtml-image.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "xhtml-image-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Images Module  ................................................. -->
-<!-- file: xhtml-image-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-image-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Images
-
-        img
-
-     This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
-     image content understandable and navigable to users of
-     non-visual UAs, you need to provide a description with
-     the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element  "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content  "EMPTY" >
-<!ENTITY % img.qname  "img" >
-<!ELEMENT %img.qname;  %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist  "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
-      %Common.attrib;
-      src          %URI.datatype;           #REQUIRED
-      alt          %Text.datatype;          #REQUIRED
-      longdesc     %URI.datatype;           #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-]]>
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.module "INCLUDE" >
-<![%xhtml-table.module;[
-<!ENTITY % xhtml-table.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "xhtml-basic-table-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Basic Table Module  ............................................. -->
-<!-- file: xhtml-basic-table-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-table-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Tables
-
-        table, caption, tr, th, td
-
-     This table module declares elements and attributes defining
-     a table model based fundamentally on features found in the
-     widely-deployed HTML 3.2 table model.  While this module
-     mimics the content model and table attributes of HTML 3.2
-     tables, the element types declared herein also includes all
-     HTML 4 common and most of the HTML 4 table attributes.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname  "table" >
-<!ENTITY % caption.qname  "caption" >
-<!ENTITY % tr.qname  "tr" >
-<!ENTITY % th.qname  "th" >
-<!ENTITY % td.qname  "td" >
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
-     "align        ( left
-                   | center
-                   | right )                #IMPLIED"
->
-
-<!-- vertical alignment attributes for cell contents
--->
-<!ENTITY % CellVAlign.attrib
-     "valign       ( top
-                   | middle
-                   | bottom )               #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
-     "scope        ( row | col  )           #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element  "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
-     "( %caption.qname;?, %tr.qname;+ )"
->
-<!ELEMENT %table.qname;  %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist  "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
-      %Common.attrib;
-      summary      %Text.datatype;          #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element  "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname;  %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist  "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
-      %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element  "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content  "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname;  %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist  "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
-     but for cells acting as both use td
--->
-
-<!ENTITY % th.element  "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %th.qname;  %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist  "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element  "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %td.qname;  %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist  "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-basic-table-1.mod -->
-]]>
-
-<!-- Forms Module  ............................................... -->
-<!ENTITY % xhtml-form.module "INCLUDE" >
-<![%xhtml-form.module;[
-<!ENTITY % xhtml-form.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "xhtml-basic-form-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Simplified Forms Module  ....................................... -->
-<!-- file: xhtml-basic-form-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-basic-form-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Forms
-
-     This forms module is based on the HTML 3.2 forms model, with
-     the WAI-requested addition of the label element. While this 
-     module essentially mimics the content model and attributes of 
-     HTML 3.2 forms, the element types declared herein also include
-     all HTML 4 common attributes.
-
-        form, label, input, select, option, textarea
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname  "form" >
-<!ENTITY % label.qname  "label" >
-<!ENTITY % input.qname  "input" >
-<!ENTITY % select.qname  "select" >
-<!ENTITY % option.qname  "option" >
-<!ENTITY % textarea.qname  "textarea" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
-     plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      | %table.qname; 
-      %Block.extra;
-      %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element  "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
-     "( %BlkNoForm.mix; )+"
->
-<!ELEMENT %form.qname;  %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist  "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
-      %Common.attrib;
-      action       %URI.datatype;           #REQUIRED
-      method       ( get | post )           'get'
-      enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!ENTITY % label.element  "INCLUDE" >
-<![%label.element;[
-<!-- Each label must not contain more than ONE field
--->
-<!ENTITY % label.content
-     "( #PCDATA 
-      | %input.qname; | %select.qname; | %textarea.qname;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %I18n.class;
-      %InlPres.class;
-      %InlSpecial.class;
-      %Misc.class; )*"
->
-<!ELEMENT %label.qname;  %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist  "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
-      %Common.attrib;
-      for          IDREF                    #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element  "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content  "EMPTY" >
-<!ELEMENT %input.qname;  %input.content; >
-<!-- end of input.element -->]]>
-
-<!-- Basic Forms removes 'image' and 'file' input types.
--->
-<!ENTITY % input.attlist  "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
-     "( text | password | checkbox | radio 
-      | submit | reset | hidden )"
->
-<!-- attribute name required for all but submit & reset
--->
-<!ATTLIST %input.qname;
-      %Common.attrib;
-      type         %InputType.class;        'text'
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      checked      ( checked )              #IMPLIED
-      size         CDATA                    #IMPLIED
-      maxlength    %Number.datatype;        #IMPLIED
-      src          %URI.datatype;           #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element  "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content  "( %option.qname; )+" >
-<!ELEMENT %select.qname;  %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist  "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      multiple     ( multiple )             #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element  "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content  "( #PCDATA )" >
-<!ELEMENT %option.qname;  %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist  "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
-      %Common.attrib;
-      selected     ( selected )             #IMPLIED
-      value        CDATA                    #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element  "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content  "( #PCDATA )" >
-<!ELEMENT %textarea.qname;  %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist  "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      rows         %Number.datatype;        #REQUIRED
-      cols         %Number.datatype;        #REQUIRED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- end of xhtml-basic-form-1.mod -->
-]]>
-
-<!-- Link Element Module  ........................................ -->
-<!ENTITY % xhtml-link.module "INCLUDE" >
-<![%xhtml-link.module;[
-<!ENTITY % xhtml-link.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "xhtml-link-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module  ........................................... -->
-<!-- file: xhtml-link-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-link-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Link element
-
-        link
-
-     This module declares the link element type and its attributes,
-     which could (in principle) be used to define document-level links
-     to external resources such as:
-
-     a) for document specific toolbars/menus, e.g. start, contents,
-        previous, next, index, end, help
-     b) to link to a separate style sheet (rel="stylesheet")
-     c) to make a link to a script (rel="script")
-     d) by stylesheets to control how collections of html nodes are
-        rendered into printed documents
-     e) to make a link to a printable version of this document
-        e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element  "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content  "EMPTY" >
-<!ENTITY % link.qname  "link" >
-<!ELEMENT %link.qname;  %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist  "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
-      %Common.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      href         %URI.datatype;           #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      media        %MediaDesc.datatype;     #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-]]>
-
-<!-- Document Metainformation Module  ............................ -->
-<!ENTITY % xhtml-meta.module "INCLUDE" >
-<![%xhtml-meta.module;[
-<!ENTITY % xhtml-meta.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "xhtml-meta-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module  ............................... -->
-<!-- file: xhtml-meta-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-meta-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Meta Information
-
-        meta
-
-     This module declares the meta element type and its attributes,
-     used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element  "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content  "EMPTY" >
-<!ENTITY % meta.qname  "meta" >
-<!ELEMENT %meta.qname;  %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist  "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      http-equiv   NMTOKEN                  #IMPLIED
-      name         NMTOKEN                  #IMPLIED
-      content      CDATA                    #REQUIRED
-      scheme       CDATA                    #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-]]>
-
-<!-- Base Element Module  ........................................ -->
-<!ENTITY % xhtml-base.module "INCLUDE" >
-<![%xhtml-base.module;[
-<!ENTITY % xhtml-base.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "xhtml-base-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module  ........................................... -->
-<!-- file: xhtml-base-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-base-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Base element
-
-        base
-
-     This module declares the base element type and its attributes,
-     used to define a base URI against which relative URIs in the
-     document will be resolved.
-
-     Note that this module also redeclares the content model for
-     the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element  "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content  "EMPTY" >
-<!ENTITY % base.qname  "base" >
-<!ELEMENT %base.qname;  %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist  "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
-      %XHTML.xmlns.attrib;
-      href         %URI.datatype;           #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
-    "( %HeadOpts.mix;,
-     ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
-     | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-]]>
-
-<!-- Param Element Module  ....................................... -->
-<!ENTITY % xhtml-param.module "INCLUDE" >
-<![%xhtml-param.module;[
-<!ENTITY % xhtml-param.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "xhtml-param-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module  ..................................... -->
-<!-- file: xhtml-param-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-param-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
-        param
-
-     This module provides declarations for the param element, 
-     used to provide named property values for the applet
-     and object elements. 
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element  "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content  "EMPTY" >
-<!ENTITY % param.qname  "param" >
-<!ELEMENT %param.qname;  %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist  "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib; 
-      %id.attrib;
-      name         CDATA                    #REQUIRED
-      value        CDATA                    #IMPLIED
-      valuetype    ( data | ref | object )  'data'
-      type         %ContentType.datatype;   #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-]]>
-
-<!-- Embedded Object Module  ..................................... -->
-<!ENTITY % xhtml-object.module "INCLUDE" >
-<![%xhtml-object.module;[
-<!ENTITY % xhtml-object.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "xhtml-object-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module  ........................................ -->
-<!-- file: xhtml-object-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-object-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Embedded Objects
-
-        object
-
-     This module declares the object element type and its attributes,
-     used to embed external objects as part of XHTML pages. In the
-     document, place param elements prior to the object elements 
-     that require their content.
-
-     Note that use of this module requires instantiation of the 
-     Param Element Module prior to this module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element  "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
-     "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname  "object" >
-<!ELEMENT %object.qname;  %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist  "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
-      %Common.attrib;
-      declare      ( declare )              #IMPLIED
-      classid      %URI.datatype;           #IMPLIED
-      codebase     %URI.datatype;           #IMPLIED
-      data         %URI.datatype;           #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      codetype     %ContentType.datatype;   #IMPLIED
-      archive      %URIs.datatype;          #IMPLIED
-      standby      %Text.datatype;          #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      name         CDATA                    #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-]]>
-
-<!ENTITY % xhtml-struct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "xhtml-struct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module  .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-basic10-f.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modulatization/DTD/xhtml-struct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Document Structure
-
-        title, head, body, html
-
-     The Structure Module defines the major structural elements and 
-     their attributes.
-
-     Note that the content model of the head element type is redeclared 
-     when the Base Module is included in the DTD.
-
-     The parameter entity containing the XML namespace URI value used 
-     for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
-     It should be displayed, for example as the page header or
-     window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element  "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content  "( #PCDATA )" >
-<!ENTITY % title.qname  "title" >
-<!ELEMENT %title.qname;  %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist  "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib; 
-      %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element  "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
-    "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname  "head" >
-<!ELEMENT %head.qname;  %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist  "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
-     "profile      %URI.datatype;           '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib; 
-      %I18n.attrib;
-      %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element  "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
-     "( %Block.mix; )+"
->
-<!ENTITY % body.qname  "body" >
-<!ELEMENT %body.qname;  %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist  "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
-      %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element  "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content  "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname  "html" >
-<!ELEMENT %html.qname;  %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist  "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
-     "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information 
-     on how to extend XHTML using XML namespaces 
--->
-<!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib; 
-      %XHTML.version.attrib;
-      %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-
-
-<!-- end of XHTML Basic 1.0 DTD  ........................................... -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-lat1.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-lat1.ent
deleted file mode 100644
index 92198ed..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-lat1.ent
+++ /dev/null
@@ -1,196 +0,0 @@
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-    <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-    %HTMLlat1;
--->
-
-<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = angled dash,
-                                  U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;"> <!-- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-mobile10-flat.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-mobile10-flat.dtd
deleted file mode 100644
index 1611503..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-mobile10-flat.dtd
+++ /dev/null
@@ -1,3216 +0,0 @@
-<!-- XHTML Mobile 1.0 DTD  ...................................................... -->
-<!-- file: xhtml-mobile10.dtd -->
-<!-- 
-     This is XHTML Mobile profile, a proper subset of XHTML.
-     
-     	@Wireless Application Protocol Forum, Ltd. 2001.
-
-	Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd. 
-	Web site (http://www.wapforum.org/what/copyright.htm).
-    
--->
-<!-- This is the driver file for version 1.0 of the XHTML Mobile DTD.
-
-     This DTD is identified by the PUBLIC and SYSTEM identifiers:
-
-     PUBLIC: "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-     SYSTEM: "http://www.wapforum.org/DTD/xhtml-mobile10.dtd"
--->
-<!ENTITY % XHTML.version  "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
-         "http://www.w3.org/1999/xhtml"
-
-     See the Qualified Names module for information
-     on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- For example, if you are using XHTML Mobile 1.0 directly, use
-     the FPI in the DOCTYPE declaration, with the xmlns attribute
-     on the document element to identify the default namespace:
-
-         <?xml version="1.0"?>
-         <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-             "http://www.wapforum.org/DTD/xhtml-mobile10.dtd" >
-         <html xmlns="http://www.w3.org/1999/xhtml"
-               xml:lang="en" >
-         ...
-         </html>
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile  "" >
-
-<!-- Inline Style Module  ........................................ -->
-<!ENTITY % xhtml-inlstyle.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Style Module  ........................................... -->
-<!-- file: xhtml-inlstyle-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Style
-
-     This module declares the 'style' attribute, used to support inline
-     style markup. This module must be instantiated prior to the XHTML
-     Common Attributes module in order to be included in %Core.attrib;.
--->
-
-<!ENTITY % style.attrib
-     "style        CDATA                    #IMPLIED"
->
-
-
-<!ENTITY % Core.extra.attrib
-     "%style.attrib;"
->
-
-<!-- end of xhtml-inlstyle-1.mod -->
-
-
-<!-- Document Model ........................................ -->
-<!ENTITY % xhtml-model.mod
-     PUBLIC "-//WAPFORUM//ENTITIES XHTML Mobile 1.0 Document Model 1.0//EN"
-            "http://www.wapforum.org/DTD/xhtml-mobile10-model-1.mod" >
-
-<!-- XHTML Framework ........................................ -->
-<!ENTITY % XHTML.bidi  "IGNORE" >
-<!ENTITY % xhtml-framework.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Modular Framework Module  ...................................... -->
-<!-- file: xhtml-framework-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Modular Framework
-
-     This required module instantiates the modules needed
-     to support the XHTML modularization model, including:
-
-        +  notations
-        +  datatypes
-        +  namespace-qualified names
-        +  common attributes
-        +  document model
-        +  character entities
-
-     The Intrinsic Events module is ignored by default but
-     occurs in this module because it must be instantiated
-     prior to Attributes but after Datatypes.
--->
-
-<!ENTITY % xhtml-arch.module "IGNORE" >
-<![%xhtml-arch.module;[
-<!ENTITY % xhtml-arch.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-            "xhtml-arch-1.mod" >
-%xhtml-arch.mod;]]>
-
-<!ENTITY % xhtml-notations.module "INCLUDE" >
-<![%xhtml-notations.module;[
-<!ENTITY % xhtml-notations.mod
-     PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "xhtml-notations-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module  .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Notations
-
-     defines the following notations, many of these imported from
-     other specifications and standards. When an existing FPI is
-     known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
-     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata
-     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
-     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-]]>
-
-<!ENTITY % xhtml-datatypes.module "INCLUDE" >
-<![%xhtml-datatypes.module;[
-<!ENTITY % xhtml-datatypes.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "xhtml-datatypes-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module  .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Datatypes
-
-     defines containers for the following datatypes, many of
-     these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- Color specification using color name or sRGB (#RRGGBB) values -->
-<!ENTITY % Color.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC3066] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-]]>
-
-<!-- placeholder for XLink support module -->
-<!ENTITY % xhtml-xlink.mod "" >
-
-
-<!ENTITY % xhtml-qname.module "INCLUDE" >
-<![%xhtml-qname.module;[
-<!ENTITY % xhtml-qname.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "xhtml-qname-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module  ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
-
-     Revisions:
-#2000-10-22: added qname declarations for ruby elements
-     ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
-     This module is contained in two parts, labeled Section 'A' and 'B':
-
-       Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
-       for XHTML and extensions.
-
-       Section B declares parameter entities used to provide
-       namespace-qualified names for all XHTML element types:
-
-         %applet.qname;   the xmlns-qualified name for <applet>
-         %base.qname;     the xmlns-qualified name for <base>
-         ...
-
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
-     ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
-        prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
-        the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
-        is enabled. This may be overridden in the DTD driver or the
-        internal subset of an document instance. If no default prefix
-        is desired, this may be declared as an empty string.
-
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
-     as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
-        prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx  "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx  "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
-        in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
-     all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
-      %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
-     XML namespace declaration attributes used by XHTML, including
-     a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
-     "%NS.decl.attrib;
-      %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
-     "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
-        namespace-qualified names for all XHTML element types.
--->
-
-<!-- module:  xhtml-applet-1.mod -->
-<!ENTITY % applet.qname  "%XHTML.pfx;applet" >
-
-<!-- module:  xhtml-base-1.mod -->
-<!ENTITY % base.qname    "%XHTML.pfx;base" >
-
-<!-- module:  xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname     "%XHTML.pfx;bdo" >
-
-<!-- module:  xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname  "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname     "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname      "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname      "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname      "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname      "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname      "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname      "%XHTML.pfx;h6" >
-
-<!-- module:  xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname      "%XHTML.pfx;hr" >
-
-<!-- module:  xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname     "%XHTML.pfx;div" >
-<!ENTITY % p.qname       "%XHTML.pfx;p" >
-
-<!-- module:  xhtml-edit-1.mod -->
-<!ENTITY % ins.qname     "%XHTML.pfx;ins" >
-<!ENTITY % del.qname     "%XHTML.pfx;del" >
-
-<!-- module:  xhtml-form-1.mod -->
-<!ENTITY % form.qname    "%XHTML.pfx;form" >
-<!ENTITY % label.qname   "%XHTML.pfx;label" >
-<!ENTITY % input.qname   "%XHTML.pfx;input" >
-<!ENTITY % select.qname  "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname  "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname  "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname  "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname  "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname  "%XHTML.pfx;legend" >
-<!ENTITY % button.qname  "%XHTML.pfx;button" >
-
-<!-- module:  xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname       "%XHTML.pfx;a" >
-
-<!-- module:  xhtml-image-1.mod -->
-<!ENTITY % img.qname     "%XHTML.pfx;img" >
-
-<!-- module:  xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname    "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname    "%XHTML.pfx;cite" >
-<!ENTITY % code.qname    "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname     "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname      "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname     "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname       "%XHTML.pfx;q" >
-<!ENTITY % samp.qname    "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname  "%XHTML.pfx;strong" >
-<!ENTITY % var.qname     "%XHTML.pfx;var" >
-
-<!-- module:  xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname       "%XHTML.pfx;b" >
-<!ENTITY % big.qname     "%XHTML.pfx;big" >
-<!ENTITY % i.qname       "%XHTML.pfx;i" >
-<!ENTITY % small.qname   "%XHTML.pfx;small" >
-<!ENTITY % sub.qname     "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname     "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname      "%XHTML.pfx;tt" >
-
-<!-- module:  xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname      "%XHTML.pfx;br" >
-<!ENTITY % span.qname    "%XHTML.pfx;span" >
-
-<!-- module:  xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname     "%XHTML.pfx;map" >
-<!ENTITY % area.qname    "%XHTML.pfx;area" >
-
-<!-- module:  xhtml-link-1.mod -->
-<!ENTITY % link.qname    "%XHTML.pfx;link" >
-
-<!-- module:  xhtml-list-1.mod -->
-<!ENTITY % dl.qname      "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname      "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname      "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname      "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname      "%XHTML.pfx;ul" >
-<!ENTITY % li.qname      "%XHTML.pfx;li" >
-
-<!-- module:  xhtml-meta-1.mod -->
-<!ENTITY % meta.qname    "%XHTML.pfx;meta" >
-
-<!-- module:  xhtml-param-1.mod -->
-<!ENTITY % param.qname   "%XHTML.pfx;param" >
-
-<!-- module:  xhtml-object-1.mod -->
-<!ENTITY % object.qname  "%XHTML.pfx;object" >
-
-<!-- module:  xhtml-script-1.mod -->
-<!ENTITY % script.qname  "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
-
-<!-- module:  xhtml-struct-1.mod -->
-<!ENTITY % html.qname    "%XHTML.pfx;html" >
-<!ENTITY % head.qname    "%XHTML.pfx;head" >
-<!ENTITY % title.qname   "%XHTML.pfx;title" >
-<!ENTITY % body.qname    "%XHTML.pfx;body" >
-
-<!-- module:  xhtml-style-1.mod -->
-<!ENTITY % style.qname   "%XHTML.pfx;style" >
-
-<!-- module:  xhtml-table-1.mod -->
-<!ENTITY % table.qname   "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname   "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname   "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname   "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname  "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname     "%XHTML.pfx;col" >
-<!ENTITY % tr.qname      "%XHTML.pfx;tr" >
-<!ENTITY % th.qname      "%XHTML.pfx;th" >
-<!ENTITY % td.qname      "%XHTML.pfx;td" >
-
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
-
-<!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
-
-<!-- module:  xhtml-image-2.mod -->
-<!ENTITY % alt.qname     "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-]]>
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<![%xhtml-events.module;[
-<!ENTITY % xhtml-events.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-            "xhtml-events-1.mod" >
-%xhtml-events.mod;]]>
-
-<!ENTITY % xhtml-attribs.module "INCLUDE" >
-<![%xhtml-attribs.module;[
-<!ENTITY % xhtml-attribs.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "xhtml-attribs-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module  ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Common Attributes
-
-     This module declares many of the common attributes for the XHTML DTD.
-     %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
-     "id           ID                       #IMPLIED"
->
-
-<!ENTITY % class.attrib
-     "class        NMTOKENS                 #IMPLIED"
->
-
-<!ENTITY % title.attrib
-     "title        %Text.datatype;          #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
-     "%XHTML.xmlns.attrib;
-      %id.attrib;
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
-     "xml:lang     %LanguageCode.datatype;  #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
-     "dir          ( ltr | rtl )            #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
-     "%dir.attrib;
-      %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
-     "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
-     "%Core.attrib;
-      %I18n.attrib;
-      %Events.attrib;
-      %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-]]>
-
-<!-- placeholder for content model redeclarations -->
-<!ENTITY % xhtml-model.redecl "" >
-
-
-<!ENTITY % xhtml-model.module "INCLUDE" >
-<![%xhtml-model.module;[
-<!-- instantiate the Document Model module declared in the DTD driver
--->
-<!-- ....................................................................... -->
-<!-- XHTML Mobile 1.0 Document Model Module  .................................... -->
-<!-- file: xhtml-mobile10-model-1.mod
-
-     This is XHTML Mobile, a proper subset of XHTML.
-     	@Wireless Application Protocol Forum, Ltd. 2001.
-
-	Terms and conditions of use are available from the Wireless Application Protocol Forum Ltd. 
-	Web site (http://www.wapforum.org/what/copyright.htm).
-    
--->
-<!-- XHTML Mobile Document Model
-
-     This module describes the groupings of elements that make up
-     common content models for XHTML elements.
--->
-
-<!-- Optional Elements in head  .............. -->
-
-<!ENTITY % HeadOpts.mix
-     "( %meta.qname; | %link.qname; | %object.qname; | %style.qname; )*" >
-
-<!-- Miscellaneous Elements  ................. -->
-
-<!ENTITY % Misc.class "" >
-
-<!-- Inline Elements  ........................ -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
-     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
-      | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
-      | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class
-     "| %i.qname; | %b.qname; | %big.qname; | %small.qname; " >
-
-
-<!ENTITY % I18n.class "" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class "| %img.qname; | %object.qname;" >
-
-<!ENTITY % InlForm.class
-     "| %input.qname; | %select.qname; | %textarea.qname;
-      | %label.qname;"
->
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Inline.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!ENTITY % InlNoAnchor.mix
-     "%InlNoAnchor.class;
-      %Misc.class;"
->
-
-<!ENTITY % Inline.mix
-     "%Inline.class;
-      %Misc.class;"
->
-
-<!-- Block Elements  ......................... -->
-
-<!ENTITY % Heading.class
-     "%h1.qname; | %h2.qname; | %h3.qname;
-      | %h4.qname; | %h5.qname; | %h6.qname;"
->
-<!ENTITY % List.class  "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class  "| %form.qname;" >
-
-<!ENTITY % Fieldset.class  "| %fieldset.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
-     "| %pre.qname; | %blockquote.qname; | %address.qname;"
->
-
-<!ENTITY % BlkPres.class "| %hr.qname;" >
-
-<!ENTITY % BlkSpecial.class
-     "%Table.class;
-      %Form.class;
-      %Fieldset.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!ENTITY % Block.class
-     "%BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %BlkSpecial.class;
-      %Block.extra;"
->
-
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %Table.class;
-      %Block.extra;
-      %Misc.class;"
->
-
-<!ENTITY % Block.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      %Misc.class;"
->
-
-<!-- All Content Elements  ................... -->
-
-<!-- declares all content except tables
--->
-<!ENTITY % FlowNoTable.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %Form.class;
-      %Block.extra;
-      | %Inline.class;
-      %Misc.class;"
->
-
-
-<!ENTITY % Flow.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!-- end of xhtml-mobile10-model-1.mod -->
-]]>
-
-<!ENTITY % xhtml-charent.module "INCLUDE" >
-<![%xhtml-charent.module;[
-<!ENTITY % xhtml-charent.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "xhtml-charent-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module  ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
-     This module declares the set of character entities for XHTML,
-     including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
-    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-           "xhtml-lat1.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Latin 1 Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-lat1.ent
-
-     Typical invocation:
-
-       <!ENTITY % xhtml-lat1
-           PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-                  "xhtml-lat1.ent" >
-       %xhtml-lat1;
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-lat1.ent"
-
-     Revision:  $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with conforming
-     SGML systems and applications as defined in ISO 8879, provided
-     this notice is included in all copies.
--->
-
-<!ENTITY nbsp   "&#160;" ><!-- no-break space = non-breaking space, U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;" ><!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;" ><!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;" ><!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;" ><!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;" ><!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;" ><!-- broken bar = broken vertical bar, U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;" ><!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;" ><!-- diaeresis = spacing diaeresis, U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;" ><!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;" ><!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;" ><!-- left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;" ><!-- not sign, U+00AC ISOnum -->
-<!ENTITY shy    "&#173;" ><!-- soft hyphen = discretionary hyphen, U+00AD ISOnum -->
-<!ENTITY reg    "&#174;" ><!-- registered sign = registered trade mark sign, U+00AE ISOnum -->
-<!ENTITY macr   "&#175;" ><!-- macron = spacing macron = overline = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;" ><!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;" ><!-- plus-minus sign = plus-or-minus sign, U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;" ><!-- superscript two = superscript digit two = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;" ><!-- superscript three = superscript digit three = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;" ><!-- acute accent = spacing acute, U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;" ><!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;" ><!-- pilcrow sign = paragraph sign, U+00B6 ISOnum -->
-<!ENTITY middot "&#183;" ><!-- middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;" ><!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;" ><!-- superscript one = superscript digit one, U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;" ><!-- masculine ordinal indicator, U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;" ><!-- right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;" ><!-- vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;" ><!-- vulgar fraction one half = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;" ><!-- vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;" ><!-- inverted question mark = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;" ><!-- latin capital A with grave = latin capital A grave, U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;" ><!-- latin capital A with acute, U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;" ><!-- latin capital A with circumflex, U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;" ><!-- latin capital A with tilde, U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;" ><!-- latin capital A with diaeresis, U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;" ><!-- latin capital A with ring above = latin capital A ring, U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;" ><!-- latin capital AE = latin capital ligature AE, U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;" ><!-- latin capital C with cedilla, U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;" ><!-- latin capital E with grave, U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;" ><!-- latin capital E with acute, U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;" ><!-- latin capital E with circumflex, U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;" ><!-- latin capital E with diaeresis, U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;" ><!-- latin capital I with grave, U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;" ><!-- latin capital I with acute, U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;" ><!-- latin capital I with circumflex, U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;" ><!-- latin capital I with diaeresis, U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;" ><!-- latin capital ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;" ><!-- latin capital N with tilde, U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;" ><!-- latin capital O with grave, U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;" ><!-- latin capital O with acute, U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;" ><!-- latin capital O with circumflex, U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;" ><!-- latin capital O with tilde, U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;" ><!-- latin capital O with diaeresis, U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;" ><!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;" ><!-- latin capital O with stroke = latin capital O slash, U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;" ><!-- latin capital U with grave, U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;" ><!-- latin capital U with acute, U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;" ><!-- latin capital U with circumflex, U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;" ><!-- latin capital U with diaeresis, U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;" ><!-- latin capital Y with acute, U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;" ><!-- latin capital THORN, U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;" ><!-- latin small sharp s = ess-zed, U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;" ><!-- latin small a with grave = latin small a grave, U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;" ><!-- latin small a with acute, U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;" ><!-- latin small a with circumflex, U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;" ><!-- latin small a with tilde, U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;" ><!-- latin small a with diaeresis, U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;" ><!-- latin small a with ring above = latin small a ring, U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;" ><!-- latin small ae = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;" ><!-- latin small c with cedilla, U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;" ><!-- latin small e with grave, U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;" ><!-- latin small e with acute, U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;" ><!-- latin small e with circumflex, U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;" ><!-- latin small e with diaeresis, U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;" ><!-- latin small i with grave, U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;" ><!-- latin small i with acute, U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;" ><!-- latin small i with circumflex, U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;" ><!-- latin small i with diaeresis, U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;" ><!-- latin small eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;" ><!-- latin small n with tilde, U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;" ><!-- latin small o with grave, U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;" ><!-- latin small o with acute, U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;" ><!-- latin small o with circumflex, U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;" ><!-- latin small o with tilde, U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;" ><!-- latin small o with diaeresis, U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;" ><!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;" ><!-- latin small o with stroke, = latin small o slash, U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;" ><!-- latin small u with grave, U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;" ><!-- latin small u with acute, U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;" ><!-- latin small u with circumflex, U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;" ><!-- latin small u with diaeresis, U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;" ><!-- latin small y with acute, U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;" ><!-- latin small thorn with, U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;" ><!-- latin small y with diaeresis, U+00FF ISOlat1 -->
-<!-- end of xhtml-lat1.ent -->
-
-
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!-- ...................................................................... -->
-<!-- ISO Math, Greek and Symbolic Character Entity Set for XHTML .......... -->
-<!-- file: xhtml-symbol.ent
-
-     Typical invocation:
-
-       <!ENTITY % xhtml-symbol
-           PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-                  "xhtml-symbol.ent" >
-       %xhtml-symbol;
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-symbol.ent"
-
-     Revision:  $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with conforming
-     SGML systems and applications as defined in ISO 8879, provided
-     this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 [SGML] list) do not clash with
-     any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
-     numbers are given for each character, in hex. Entity values are
-     decimal conversions of the ISO 10646 values and refer to the
-     document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;" ><!-- latin small f with hook = function
-                              = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;" ><!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;" ><!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;" ><!-- greek capital letter gamma, U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;" ><!-- greek capital letter delta, U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;" ><!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;" ><!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;" ><!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;" ><!-- greek capital letter theta, U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;" ><!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;" ><!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;" ><!-- greek capital letter lambda, U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;" ><!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;" ><!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;" ><!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;" ><!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;" ><!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;" ><!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;" ><!-- greek capital letter sigma, U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;" ><!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;" ><!-- greek capital letter upsilon,
-                              U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;" ><!-- greek capital letter phi, U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;" ><!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;" ><!-- greek capital letter psi, U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;" ><!-- greek capital letter omega, U+03A9 ISOgrk3 -->
-<!ENTITY alpha    "&#945;" ><!-- greek small letter alpha, U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;" ><!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;" ><!-- greek small letter gamma, U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;" ><!-- greek small letter delta, U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;" ><!-- greek small letter epsilon, U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;" ><!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;" ><!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;" ><!-- greek small letter theta, U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;" ><!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;" ><!-- greek small letter kappa, U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;" ><!-- greek small letter lambda, U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;" ><!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;" ><!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;" ><!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;" ><!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;" ><!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;" ><!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;" ><!-- greek small letter final sigma, U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;" ><!-- greek small letter sigma, U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;" ><!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;" ><!-- greek small letter upsilon, U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;" ><!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;" ><!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;" ><!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;" ><!-- greek small letter omega, U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;" ><!-- greek small letter theta symbol, U+03D1 NEW -->
-<!ENTITY upsih    "&#978;" ><!-- greek upsilon with hook symbol, U+03D2 NEW -->
-<!ENTITY piv      "&#982;" ><!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;" ><!-- bullet = black small circle, U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;" ><!-- horizontal ellipsis = three dot leader, U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;" ><!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;" ><!-- double prime = seconds = inches, U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;" ><!-- overline = spacing overscore, U+203E NEW -->
-<!ENTITY frasl    "&#8260;" ><!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;" ><!-- script capital P = power set = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;" ><!-- blackletter capital I = imaginary part, U+2111 ISOamso -->
-<!ENTITY real     "&#8476;" ><!-- blackletter capital R = real part symbol, U+211C ISOamso -->
-<!ENTITY trade    "&#8482;" ><!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;" ><!-- alef symbol = first transfinite cardinal, U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef, U+05D0 although
-     the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;" ><!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;" ><!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;" ><!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;" ><!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;" ><!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;" ><!-- downwards arrow with corner leftwards
-                               = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;" ><!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;" ><!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;" ><!-- rightwards double arrow, U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;" ><!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;" ><!-- left right double arrow, U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;" ><!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;" ><!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;" ><!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;" ><!-- empty set = null set = diameter, U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;" ><!-- nabla = backward difference, U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;" ><!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;" ><!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;" ><!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;" ><!-- n-ary product = product sign, U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;" ><!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;" ><!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;" ><!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;" ><!-- square root = radical sign, U+221A ISOtech -->
-<!ENTITY prop     "&#8733;" ><!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;" ><!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;" ><!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;" ><!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;" ><!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;" ><!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;" ><!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;" ><!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;" ><!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;" ><!-- tilde operator = varies with = similar to, U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;" ><!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;" ><!-- almost equal to = asymptotic to, U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;" ><!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;" ><!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;" ><!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;" ><!-- greater-than or equal to, U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;" ><!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;" ><!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  -->
-<!ENTITY nsub     "&#8836;" ><!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;" ><!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;" ><!-- superset of or equal to, U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;" ><!-- circled plus = direct sum, U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;" ><!-- circled times = vector product, U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;" ><!-- up tack = orthogonal to = perpendicular, U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;" ><!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;" ><!-- left ceiling = apl upstile, U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;" ><!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;" ><!-- left floor = apl downstile, U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;" ><!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;" ><!-- left-pointing angle bracket = bra, U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than'
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;" ><!-- right-pointing angle bracket = ket, U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than'
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;" ><!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;" ><!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;" ><!-- black club suit = shamrock, U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;" ><!-- black heart suit = valentine, U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;" ><!-- black diamond suit, U+2666 ISOpub -->
-
-<!-- end of xhtml-symbol.ent -->
-
-
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-<!-- ...................................................................... -->
-<!-- XML-compatible ISO Special Character Entity Set for XHTML ............ -->
-<!-- file: xhtml-special.ent
-
-     Typical invocation:
-
-       <!ENTITY % xhtml-special
-           PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-                  "xhtml-special.ent" >
-       %xhtml-special;
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-special.ent"
-
-     Revision:  $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with conforming
-     SGML systems and applications as defined in ISO 8879, provided
-     this notice is included in all copies.
-
-     Revisions:
-2000-10-28: added &apos; and altered XML Predefined Entities for compatibility
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 [SGML] list) do not clash with
-     any existing ISO 8879 entity names. ISO 10646 [ISO10646] character
-     numbers are given for each character, in hex. Entity values are
-     decimal conversions of the ISO 10646 values and refer to the
-     document character set. Names are Unicode [UNICODE] names.
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY lt      "&#38;&#60;" ><!-- less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;" ><!-- greater-than sign, U+003E ISOnum -->
-<!ENTITY amp     "&#38;&#38;" ><!-- ampersand, U+0026 ISOnum -->
-<!ENTITY apos    "&#39;" ><!-- apostrophe, U+0027 ISOnum -->
-<!ENTITY quot    "&#34;" ><!-- quotation mark = APL quote, U+0022 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;" ><!-- latin capital ligature OE, U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;" ><!-- latin small ligature oe, U+0153 ISOlat2 -->
-
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;" ><!-- latin capital letter S with caron, U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;" ><!-- latin small letter s with caron, U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;" ><!-- latin capital letter Y with diaeresis, U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;" ><!-- modifier letter circumflex accent, U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;" ><!-- small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;" ><!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;" ><!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;" ><!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;" ><!-- zero width non-joiner, U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;" ><!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;" ><!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;" ><!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;" ><!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;" ><!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;" ><!-- left single quotation mark, U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;" ><!-- right single quotation mark, U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;" ><!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;" ><!-- left double quotation mark, U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;" ><!-- right double quotation mark, U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;" ><!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;" ><!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;" ><!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;" ><!-- per mille sign, U+2030 ISOtech -->
-
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY lsaquo  "&#8249;" ><!-- single left-pointing angle quotation mark, U+2039 ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;" ><!-- single right-pointing angle quotation mark, U+203A ISO proposed -->
-<!ENTITY euro    "&#8364;" ><!-- euro sign, U+20AC NEW -->
-
-<!-- end of xhtml-special.ent -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-]]>
-
-<!-- end of xhtml-framework-1.mod -->
-
-
-<!-- XHTML Core Modules ........................................ -->
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      %Anchor.class;
-      %Inline.extra; )*"
->
-
-<!ENTITY % xhtml-text.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Text Module  ................................................... -->
-<!-- file: xhtml-text-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Textual Content
-
-     The Text module includes declarations for all core
-     text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-            "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module  ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Structural
-
-        br, span
-
-     This module declares the elements and their attributes
-     used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element  "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content  "EMPTY" >
-<!ENTITY % br.qname  "br" >
-<!ELEMENT %br.qname;  %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist  "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
-      %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element  "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname  "span" >
-<!ELEMENT %span.qname;  %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist  "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
-      %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-            "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module  ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Phrasal
-
-        abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
-     This module declares the elements and their attributes used to
-     support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element  "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname  "abbr" >
-<!ELEMENT %abbr.qname;  %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist  "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
-      %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element  "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname  "acronym" >
-<!ELEMENT %acronym.qname;  %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist  "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
-      %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element  "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname  "cite" >
-<!ELEMENT %cite.qname;  %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist  "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
-      %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element  "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname  "code" >
-<!ELEMENT %code.qname;  %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist  "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
-      %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element  "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname  "dfn" >
-<!ELEMENT %dfn.qname;  %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist  "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
-      %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element  "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname  "em" >
-<!ELEMENT %em.qname;  %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist  "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
-      %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element  "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname  "kbd" >
-<!ELEMENT %kbd.qname;  %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist  "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
-      %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element  "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname  "q" >
-<!ELEMENT %q.qname;  %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist  "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element  "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname  "samp" >
-<!ELEMENT %samp.qname;  %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist  "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
-      %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element  "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname  "strong" >
-<!ELEMENT %strong.qname;  %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist  "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
-      %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element  "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname  "var" >
-<!ELEMENT %var.qname;  %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist  "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
-      %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-            "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module  ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Structural
-
-        div, p
-
-     This module declares the elements and their attributes used to
-     support block-level structural markup.
--->
-
-<!ENTITY % div.element  "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname  "div" >
-<!ELEMENT %div.qname;  %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist  "INCLUDE" >
-<![%div.attlist;[
-<!ATTLIST %div.qname;
-      %Common.attrib;
->
-<!-- end of div.attlist -->]]>
-
-<!ENTITY % p.element  "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname  "p" >
-<!ELEMENT %p.qname;  %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist  "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
-      %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-            "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module  .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Phrasal
-
-        address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
-     This module declares the elements and their attributes used to
-     support block-level phrasal markup.
--->
-
-<!ENTITY % address.element  "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname  "address" >
-<!ELEMENT %address.qname;  %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist  "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
-      %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element  "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
-     "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname  "blockquote" >
-<!ELEMENT %blockquote.qname;  %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist  "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element  "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      | %tt.qname; | %i.qname; | %b.qname;
-      %I18n.class;
-      %Anchor.class;
-      | %script.qname; | %map.qname;
-      %Inline.extra; )*"
->
-<!ENTITY % pre.qname  "pre" >
-<!ELEMENT %pre.qname;  %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist  "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
-      %Common.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ...................  Heading Elements  ................... -->
-
-<!ENTITY % Heading.content  "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element  "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname  "h1" >
-<!ELEMENT %h1.qname;  %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist  "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
-      %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element  "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname  "h2" >
-<!ELEMENT %h2.qname;  %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist  "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
-      %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element  "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname  "h3" >
-<!ELEMENT %h3.qname;  %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist  "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
-      %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element  "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname  "h4" >
-<!ELEMENT %h4.qname;  %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist  "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
-      %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element  "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname  "h5" >
-<!ELEMENT %h5.qname;  %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist  "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
-      %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element  "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname  "h6" >
-<!ELEMENT %h6.qname;  %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist  "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
-      %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-
-
-<!ENTITY % xhtml-hypertext.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module  .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Hypertext
-
-        a
-
-     This module declares the anchor ('a') element type, which
-     defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
-     rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............  Anchor Element  ............ -->
-
-<!ENTITY % a.element  "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
-     "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname  "a" >
-<!ELEMENT %a.qname;  %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist  "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-
-
-<!ENTITY % xhtml-list.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module  .................................................. -->
-<!-- file: xhtml-list-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Lists
-
-        dl, dt, dd, ol, ul, li
-
-     This module declares the list-oriented element types
-     and their attributes.
--->
-
-<!ENTITY % dl.qname  "dl" >
-<!ENTITY % dt.qname  "dt" >
-<!ENTITY % dd.qname  "dd" >
-<!ENTITY % ol.qname  "ol" >
-<!ENTITY % ul.qname  "ul" >
-<!ENTITY % li.qname  "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element  "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content  "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname;  %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist  "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
-      %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element  "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname;  %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist  "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
-      %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element  "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname;  %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist  "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
-      %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element  "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content  "( %li.qname; )+" >
-<!ELEMENT %ol.qname;  %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist  "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
-      %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element  "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content  "( %li.qname; )+" >
-<!ELEMENT %ul.qname;  %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist  "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
-      %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element  "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname;  %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist  "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
-      %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-
-<!-- Extend lists with value and start attributes --> 
-<!ATTLIST %li.qname;
-      value        %Number.datatype;         #IMPLIED
->
-<!ATTLIST %ol.qname;
-      start        %Number.datatype;        #IMPLIED
->
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Image Module  ............................................... -->
-<!ENTITY % xhtml-image.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Images Module  ................................................. -->
-<!-- file: xhtml-image-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Images
-
-        img
-
-     This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
-     image content understandable and navigable to users of
-     non-visual UAs, you need to provide a description with
-     the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element  "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content  "EMPTY" >
-<!ENTITY % img.qname  "img" >
-<!ELEMENT %img.qname;  %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist  "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
-      %Common.attrib;
-      src          %URI.datatype;           #REQUIRED
-      alt          %Text.datatype;          #REQUIRED
-      longdesc     %URI.datatype;           #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Basic Table Module  ............................................. -->
-<!-- file: xhtml-basic-table-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-table-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Tables
-
-        table, caption, tr, th, td
-
-     This table module declares elements and attributes defining
-     a table model based fundamentally on features found in the
-     widely-deployed HTML 3.2 table model.  While this module
-     mimics the content model and table attributes of HTML 3.2
-     tables, the element types declared herein also includes all
-     HTML 4 common and most of the HTML 4 table attributes.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname  "table" >
-<!ENTITY % caption.qname  "caption" >
-<!ENTITY % tr.qname  "tr" >
-<!ENTITY % th.qname  "th" >
-<!ENTITY % td.qname  "td" >
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
-     "align        ( left
-                   | center
-                   | right )                #IMPLIED"
->
-
-<!-- vertical alignment attributes for cell contents
--->
-<!ENTITY % CellVAlign.attrib
-     "valign       ( top
-                   | middle
-                   | bottom )               #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
-     "scope        ( row | col  )           #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element  "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
-     "( %caption.qname;?, %tr.qname;+ )"
->
-<!ELEMENT %table.qname;  %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist  "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
-      %Common.attrib;
-      summary      %Text.datatype;          #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element  "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname;  %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist  "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
-      %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element  "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content  "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname;  %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist  "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
-     but for cells acting as both use td
--->
-
-<!ENTITY % th.element  "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %th.qname;  %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist  "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element  "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
-     "( #PCDATA | %FlowNoTable.mix; )*"
->
-<!ELEMENT %td.qname;  %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist  "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-basic-table-1.mod -->
-
-
-<!-- Forms Module  ............................................... 
-	XHTML basic forms module extended with optgroup and fieldset
--->
-<!ELEMENT %optgroup.qname; (%option.qname;)+>
-<!ATTLIST %optgroup.qname;
-	%Common.attrib; 
-	label %Text.datatype; #REQUIRED
->
-<!ENTITY % select.content "( %optgroup.qname; | %option.qname; )+">
-<!ELEMENT %fieldset.qname; (#PCDATA | %Flow.mix;)*>
-<!ATTLIST %fieldset.qname;
-	%Common.attrib; 
->
-<!ENTITY % form.content "( %BlkNoForm.mix; | %fieldset.qname; )+">
-<!ENTITY % xhtml-form.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Simplified Forms Module  ....................................... -->
-<!-- file: xhtml-basic-form-1.mod
-
-     This is XHTML Basic, a proper subset of XHTML.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Basic Forms 1.0//EN"  
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-basic-form-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Basic Forms
-
-     This forms module is based on the HTML 3.2 forms model, with
-     the WAI-requested addition of the label element. While this 
-     module essentially mimics the content model and attributes of 
-     HTML 3.2 forms, the element types declared herein also include
-     all HTML 4 common attributes.
-
-        form, label, input, select, option, textarea
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname  "form" >
-<!ENTITY % label.qname  "label" >
-<!ENTITY % input.qname  "input" >
-<!ENTITY % select.qname  "select" >
-<!ENTITY % option.qname  "option" >
-<!ENTITY % textarea.qname  "textarea" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
-     plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      | %table.qname; 
-      %Block.extra;
-      %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element  "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
-     "( %BlkNoForm.mix; )+"
->
-<!ELEMENT %form.qname;  %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist  "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
-      %Common.attrib;
-      action       %URI.datatype;           #REQUIRED
-      method       ( get | post )           'get'
-      enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!ENTITY % label.element  "INCLUDE" >
-<![%label.element;[
-<!-- Each label must not contain more than ONE field
--->
-<!ENTITY % label.content
-     "( #PCDATA 
-      | %input.qname; | %select.qname; | %textarea.qname;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %I18n.class;
-      %InlPres.class;
-      %InlSpecial.class;
-      %Misc.class; )*"
->
-<!ELEMENT %label.qname;  %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist  "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
-      %Common.attrib;
-      for          IDREF                    #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element  "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content  "EMPTY" >
-<!ELEMENT %input.qname;  %input.content; >
-<!-- end of input.element -->]]>
-
-<!-- Basic Forms removes 'image' and 'file' input types.
--->
-<!ENTITY % input.attlist  "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
-     "( text | password | checkbox | radio 
-      | submit | reset | hidden )"
->
-<!-- attribute name required for all but submit & reset
--->
-<!ATTLIST %input.qname;
-      %Common.attrib;
-      type         %InputType.class;        'text'
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      checked      ( checked )              #IMPLIED
-      size         CDATA                    #IMPLIED
-      maxlength    %Number.datatype;        #IMPLIED
-      src          %URI.datatype;           #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element  "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content  "( %option.qname; )+" >
-<!ELEMENT %select.qname;  %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist  "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      multiple     ( multiple )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element  "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content  "( #PCDATA )" >
-<!ELEMENT %option.qname;  %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist  "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
-      %Common.attrib;
-      selected     ( selected )             #IMPLIED
-      value        CDATA                    #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element  "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content  "( #PCDATA )" >
-<!ELEMENT %textarea.qname;  %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist  "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      rows         %Number.datatype;        #REQUIRED
-      cols         %Number.datatype;        #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- end of xhtml-basic-form-1.mod -->
-
-
-<!-- Link Element Module  ........................................ -->
-<!ENTITY % xhtml-link.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module  ........................................... -->
-<!-- file: xhtml-link-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Link element
-
-        link
-
-     This module declares the link element type and its attributes,
-     which could (in principle) be used to define document-level links
-     to external resources such as:
-
-     a) for document specific toolbars/menus, e.g. start, contents,
-        previous, next, index, end, help
-     b) to link to a separate style sheet (rel="stylesheet")
-     c) to make a link to a script (rel="script")
-     d) by style sheets to control how collections of html nodes are
-        rendered into printed documents
-     e) to make a link to a printable version of this document
-        e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element  "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content  "EMPTY" >
-<!ENTITY % link.qname  "link" >
-<!ELEMENT %link.qname;  %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist  "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
-      %Common.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      href         %URI.datatype;           #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      media        %MediaDesc.datatype;     #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-
-
-<!-- Document Metainformation Module  ............................ -->
-<!ENTITY % xhtml-meta.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module  ............................... -->
-<!-- file: xhtml-meta-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Meta Information
-
-        meta
-
-     This module declares the meta element type and its attributes,
-     used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element  "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content  "EMPTY" >
-<!ENTITY % meta.qname  "meta" >
-<!ELEMENT %meta.qname;  %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist  "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      http-equiv   NMTOKEN                  #IMPLIED
-      name         NMTOKEN                  #IMPLIED
-      content      CDATA                    #REQUIRED
-      scheme       CDATA                    #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-
-
-<!-- Base Element Module  ........................................ -->
-<!ENTITY % xhtml-base.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module  ........................................... -->
-<!-- file: xhtml-base-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Base element
-
-        base
-
-     This module declares the base element type and its attributes,
-     used to define a base URI against which relative URIs in the
-     document will be resolved.
-
-     Note that this module also redeclares the content model for
-     the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element  "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content  "EMPTY" >
-<!ENTITY % base.qname  "base" >
-<!ELEMENT %base.qname;  %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist  "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
-      %XHTML.xmlns.attrib;
-      href         %URI.datatype;           #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
-    "( %HeadOpts.mix;,
-     ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
-     | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-
-
-<!-- Stylesheets Module  ......................................... -->
-<!ENTITY % xhtml-style.mod PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module  ................................... -->
-<!-- file: xhtml-style-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Style Sheets
-
-        style
-
-     This module declares the style element type and its attributes,
-     used to embed style sheet information in the document head element.
--->
-
-<!-- style: Style Sheet Information .................... -->
-
-<!ENTITY % style.element  "INCLUDE" >
-<![%style.element;[
-<!ENTITY % style.content  "( #PCDATA )" >
-<!ENTITY % style.qname  "style" >
-<!ELEMENT %style.qname;  %style.content; >
-<!-- end of style.element -->]]>
-
-<!ENTITY % style.attlist  "INCLUDE" >
-<![%style.attlist;[
-<!ATTLIST %style.qname;
-      %XHTML.xmlns.attrib;
-      %title.attrib;
-      %I18n.attrib;
-      type         %ContentType.datatype;   #REQUIRED
-      media        %MediaDesc.datatype;     #IMPLIED
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of style.attlist -->]]>
-
-<!-- end of xhtml-style-1.mod -->
-
-
-<!-- Param Element Module  ....................................... -->
-<!ENTITY % xhtml-param.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module  ..................................... -->
-<!-- file: xhtml-param-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
-        param
-
-     This module provides declarations for the param element,
-     used to provide named property values for the applet
-     and object elements.
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element  "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content  "EMPTY" >
-<!ENTITY % param.qname  "param" >
-<!ELEMENT %param.qname;  %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist  "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
-      %id.attrib;
-      name         CDATA                    #REQUIRED
-      value        CDATA                    #IMPLIED
-      valuetype    ( data | ref | object )  'data'
-      type         %ContentType.datatype;   #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-
-
-<!-- Embedded Object Module  ..................................... -->
-<!ENTITY % xhtml-object.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module  ........................................ -->
-<!-- file: xhtml-object-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Embedded Objects
-
-        object
-
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
-
-     Note that use of this module requires instantiation of the Param
-     Element Module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element  "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
-     "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname  "object" >
-<!ELEMENT %object.qname;  %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist  "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
-      %Common.attrib;
-      declare      ( declare )              #IMPLIED
-      classid      %URI.datatype;           #IMPLIED
-      codebase     %URI.datatype;           #IMPLIED
-      data         %URI.datatype;           #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      codetype     %ContentType.datatype;   #IMPLIED
-      archive      %URIs.datatype;          #IMPLIED
-      standby      %Text.datatype;          #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      name         CDATA                    #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-
-
-<!-- Document Structure Module  ..................................... -->
-<!ENTITY % xhtml-struct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module  .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Document Structure
-
-        title, head, body, html
-
-     The Structure Module defines the major structural elements and
-     their attributes.
-
-     Note that the content model of the head element type is redeclared
-     when the Base Module is included in the DTD.
-
-     The parameter entity containing the XML namespace URI value used
-     for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
-     It should be displayed, for example as the page header or
-     window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element  "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content  "( #PCDATA )" >
-<!ENTITY % title.qname  "title" >
-<!ELEMENT %title.qname;  %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist  "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element  "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
-    "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname  "head" >
-<!ELEMENT %head.qname;  %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist  "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
-     "profile      %URI.datatype;           '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element  "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
-     "( %Block.mix; )+"
->
-<!ENTITY % body.qname  "body" >
-<!ELEMENT %body.qname;  %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist  "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
-      %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element  "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content  "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname  "html" >
-<!ELEMENT %html.qname;  %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist  "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
-     "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
--->
-<!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XHTML.version.attrib;
-      %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-
-
-<!-- Block Presentation ........................................ -->
-<!ENTITY % xhtml-blkpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
- 		"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Block Presentation Module  ..................................... -->
-<!-- file: xhtml-blkpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Presentational Elements
-
-        hr
-
-     This module declares the elements and their attributes used to
-     support block-level presentational markup.
--->
-
-<!ENTITY % hr.element  "INCLUDE" >
-<![%hr.element;[
-<!ENTITY % hr.content  "EMPTY" >
-<!ENTITY % hr.qname  "hr" >
-<!ELEMENT %hr.qname;  %hr.content; >
-<!-- end of hr.element -->]]>
-
-<!ENTITY % hr.attlist  "INCLUDE" >
-<![%hr.attlist;[
-<!ATTLIST %hr.qname;
-      %Common.attrib;
->
-<!-- end of hr.attlist -->]]>
-
-<!-- end of xhtml-blkpres-1.mod -->
-
-
-<!-- ========================================== -->
-<!-- 
-	Inline Presentation: b, big, i, small		
--->
-<!ENTITY % sub.element "IGNORE">
-<!ENTITY % sub.attlist "IGNORE">
-<!ENTITY % sup.element "IGNORE">
-<!ENTITY % sup.attlist "IGNORE">
-<!ENTITY % tt.element "IGNORE">
-<!ENTITY % tt.attlist "IGNORE">
-<!ENTITY % xhtml-inlpres.mod PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-		"http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod">
-<!-- ...................................................................... -->
-<!-- XHTML Inline Presentation Module  .................................... -->
-<!-- file: xhtml-inlpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml-mobile10-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Presentational Elements
-
-        b, big, i, small, sub, sup, tt
-
-     This module declares the elements and their attributes used to
-     support inline-level presentational markup.
--->
-
-<!ENTITY % b.element  "INCLUDE" >
-<![%b.element;[
-<!ENTITY % b.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % b.qname  "b" >
-<!ELEMENT %b.qname;  %b.content; >
-<!-- end of b.element -->]]>
-
-<!ENTITY % b.attlist  "INCLUDE" >
-<![%b.attlist;[
-<!ATTLIST %b.qname;
-      %Common.attrib;
->
-<!-- end of b.attlist -->]]>
-
-<!ENTITY % big.element  "INCLUDE" >
-<![%big.element;[
-<!ENTITY % big.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % big.qname  "big" >
-<!ELEMENT %big.qname;  %big.content; >
-<!-- end of big.element -->]]>
-
-<!ENTITY % big.attlist  "INCLUDE" >
-<![%big.attlist;[
-<!ATTLIST %big.qname;
-      %Common.attrib;
->
-<!-- end of big.attlist -->]]>
-
-<!ENTITY % i.element  "INCLUDE" >
-<![%i.element;[
-<!ENTITY % i.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % i.qname  "i" >
-<!ELEMENT %i.qname;  %i.content; >
-<!-- end of i.element -->]]>
-
-<!ENTITY % i.attlist  "INCLUDE" >
-<![%i.attlist;[
-<!ATTLIST %i.qname;
-      %Common.attrib;
->
-<!-- end of i.attlist -->]]>
-
-<!ENTITY % small.element  "INCLUDE" >
-<![%small.element;[
-<!ENTITY % small.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % small.qname  "small" >
-<!ELEMENT %small.qname;  %small.content; >
-<!-- end of small.element -->]]>
-
-<!ENTITY % small.attlist  "INCLUDE" >
-<![%small.attlist;[
-<!ATTLIST %small.qname;
-      %Common.attrib;
->
-<!-- end of small.attlist -->]]>
-
-<!ENTITY % sub.element  "INCLUDE" >
-<![%sub.element;[
-<!ENTITY % sub.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sub.qname  "sub" >
-<!ELEMENT %sub.qname;  %sub.content; >
-<!-- end of sub.element -->]]>
-
-<!ENTITY % sub.attlist  "INCLUDE" >
-<![%sub.attlist;[
-<!ATTLIST %sub.qname;
-      %Common.attrib;
->
-<!-- end of sub.attlist -->]]>
-
-<!ENTITY % sup.element  "INCLUDE" >
-<![%sup.element;[
-<!ENTITY % sup.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sup.qname  "sup" >
-<!ELEMENT %sup.qname;  %sup.content; >
-<!-- end of sup.element -->]]>
-
-<!ENTITY % sup.attlist  "INCLUDE" >
-<![%sup.attlist;[
-<!ATTLIST %sup.qname;
-      %Common.attrib;
->
-<!-- end of sup.attlist -->]]>
-
-<!ENTITY % tt.element  "INCLUDE" >
-<![%tt.element;[
-<!ENTITY % tt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % tt.qname  "tt" >
-<!ELEMENT %tt.qname;  %tt.content; >
-<!-- end of tt.element -->]]>
-
-<!ENTITY % tt.attlist  "INCLUDE" >
-<![%tt.attlist;[
-<!ATTLIST %tt.qname;
-      %Common.attrib;
->
-<!-- end of tt.attlist -->]]>
-
-<!-- end of xhtml-inlpres-1.mod -->
-
-
-<!-- end of XHTML Mobile 1.0 DTD  ........................................... -->
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-special.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-special.ent
deleted file mode 100644
index cf709d1..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-special.ent
+++ /dev/null
@@ -1,79 +0,0 @@
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-        "-//W3C//ENTITIES Special for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
-     %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
-                                    U+0022 ISOnum -->
-<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
-<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-symbol.ent b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-symbol.ent
deleted file mode 100644
index 16f876b..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml-symbol.ent
+++ /dev/null
@@ -1,242 +0,0 @@
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-        "-//W3C//ENTITIES Symbols for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
-     %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
-                                     U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  --> 
-<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-frameset.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-frameset.dtd
deleted file mode 100644
index 5d3f791..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-frameset.dtd
+++ /dev/null
@@ -1,1225 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Frameset DTD
-
-   This is the same as HTML 4.0 Frameset except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2007/05/15 02:42:22 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC1766] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character from [ISO10646] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special
-   "br | span | bdo |object | applet | img | map | iframe">
-
-<!ENTITY % fontstyle "tt | i | b | big | small | u
-                      | s | strike |font | basefont">
-
-<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc "ins | del | script | noscript">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex | fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     sub, sup, font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | br | span | bdo | map | tt | i | b | u | s |
-      %phrase; | %inline.forms;)*">
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, frameset)>
-<!ATTLIST html
-  %i18n;
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title %i18n;>
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- only one noframes element permitted per document -->
-
-<!ELEMENT frameset (frameset|frame|noframes)*>
-<!ATTLIST frameset
-  %coreattrs;
-  rows        %MultiLengths; #IMPLIED
-  cols        %MultiLengths; #IMPLIED
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  >
-
-<!-- reserved frame names start with "_" otherwise starts with letter -->
-
-<!-- tiled window within frameset -->
-
-<!ELEMENT frame EMPTY>
-<!ATTLIST frame
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  noresize    (noresize)     #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  >
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes (body)>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) --> 
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) --> 
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding 
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-   %attrs;
-  cite        %URI;          #IMPLIED
-   >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form |%inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=":"
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-strict.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-strict.dtd
deleted file mode 100644
index fdb11a0..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-strict.dtd
+++ /dev/null
@@ -1,988 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Strict DTD
-
-   This is the same as HTML 4.0 Strict except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2007/05/15 02:42:22 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC1766] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character from [ISO10646] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special
-   "br | span | bdo | object | img | map">
-
-<!ENTITY % fontstyle "tt | i | b | big | small">
-
-<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc "ins | del | script | noscript">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl">
-<!ENTITY % blocktext "pre | hr | blockquote | address">
-
-<!ENTITY % block
-     "p | %heading; | div | %lists; | %blocktext; | fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
-
-<!-- pre uses %Inline excluding img, object, big, small, sup or sup -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | br | span | bdo | map | tt | i | b |
-      %phrase; | %inline.forms;)*">
-
-<!-- form uses %Block; excluding form -->
-
-<!ENTITY % form.content "(%block; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form and form controls -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-    table | %special; | %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
-  %i18n;
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title %i18n;>
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  href        %URI;          #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Block;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Block;>
-<!ATTLIST body
-  %attrs;
-  onload          %Script;   #IMPLIED
-  onunload        %Script;   #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-   %attrs;
-   >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-   %attrs;
-   >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-   %attrs;
-   >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-   %attrs;
-   >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-   %attrs;
-   >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-   %attrs;
-   >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  >
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  >
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding "img|object|big|small|sub|sup" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  xml:space (preserve) #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Block;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
-   Note that in this DTD there is no name attribute. That
-   is only available in the transitional and frameset DTD.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form and form controls
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=':'
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  >
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-transitional.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-transitional.dtd
deleted file mode 100644
index 1fc9ee2..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml1-transitional.dtd
+++ /dev/null
@@ -1,1196 +0,0 @@
-<!--
-   Extensible HTML version 1.0 Transitional DTD
-
-   This is the same as HTML 4.0 Transitional except for
-   changes due to the differences between XML and SGML.
-
-   Namespace = http://www.w3.org/1999/xhtml
-
-   For further information, see: http://www.w3.org/TR/xhtml1
-
-   Copyright (c) 1998-2000 W3C (MIT, INRIA, Keio),
-   All Rights Reserved. 
-
-   This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-   PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   SYSTEM "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-
-   $Revision: 1.1 $
-   $Date: 2007/05/15 02:42:22 $
-
--->
-
-<!--================ Character mnemonic entities =========================-->
-
-<!ENTITY % HTMLlat1 PUBLIC
-   "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-   "xhtml-lat1.ent">
-%HTMLlat1;
-
-<!ENTITY % HTMLsymbol PUBLIC
-   "-//W3C//ENTITIES Symbols for XHTML//EN"
-   "xhtml-symbol.ent">
-%HTMLsymbol;
-
-<!ENTITY % HTMLspecial PUBLIC
-   "-//W3C//ENTITIES Special for XHTML//EN"
-   "xhtml-special.ent">
-%HTMLspecial;
-
-<!--================== Imported Names ====================================-->
-
-<!ENTITY % ContentType "CDATA">
-    <!-- media type, as per [RFC2045] -->
-
-<!ENTITY % ContentTypes "CDATA">
-    <!-- comma-separated list of media types, as per [RFC2045] -->
-
-<!ENTITY % Charset "CDATA">
-    <!-- a character encoding, as per [RFC2045] -->
-
-<!ENTITY % Charsets "CDATA">
-    <!-- a space separated list of character encodings, as per [RFC2045] -->
-
-<!ENTITY % LanguageCode "NMTOKEN">
-    <!-- a language code, as per [RFC1766] -->
-
-<!ENTITY % Character "CDATA">
-    <!-- a single character from [ISO10646] -->
-
-<!ENTITY % Number "CDATA">
-    <!-- one or more digits -->
-
-<!ENTITY % LinkTypes "CDATA">
-    <!-- space-separated list of link types -->
-
-<!ENTITY % MediaDesc "CDATA">
-    <!-- single or comma-separated list of media descriptors -->
-
-<!ENTITY % URI "CDATA">
-    <!-- a Uniform Resource Identifier, see [RFC2396] -->
-
-<!ENTITY % UriList "CDATA">
-    <!-- a space separated list of Uniform Resource Identifiers -->
-
-<!ENTITY % Datetime "CDATA">
-    <!-- date and time information. ISO date format -->
-
-<!ENTITY % Script "CDATA">
-    <!-- script expression -->
-
-<!ENTITY % StyleSheet "CDATA">
-    <!-- style sheet data -->
-
-<!ENTITY % Text "CDATA">
-    <!-- used for titles etc. -->
-
-<!ENTITY % FrameTarget "NMTOKEN">
-    <!-- render in this frame -->
-
-<!ENTITY % Length "CDATA">
-    <!-- nn for pixels or nn% for percentage length -->
-
-<!ENTITY % MultiLength "CDATA">
-    <!-- pixel, percentage, or relative -->
-
-<!ENTITY % MultiLengths "CDATA">
-    <!-- comma-separated list of MultiLength -->
-
-<!ENTITY % Pixels "CDATA">
-    <!-- integer representing length in pixels -->
-
-<!-- these are used for image maps -->
-
-<!ENTITY % Shape "(rect|circle|poly|default)">
-
-<!ENTITY % Coords "CDATA">
-    <!-- comma separated list of lengths -->
-
-<!-- used for object, applet, img, input and iframe -->
-<!ENTITY % ImgAlign "(top|middle|bottom|left|right)">
-
-<!-- a color using sRGB: #RRGGBB as Hex values -->
-<!ENTITY % Color "CDATA">
-
-<!-- There are also 16 widely known color names with their sRGB values:
-
-    Black  = #000000    Green  = #008000
-    Silver = #C0C0C0    Lime   = #00FF00
-    Gray   = #808080    Olive  = #808000
-    White  = #FFFFFF    Yellow = #FFFF00
-    Maroon = #800000    Navy   = #000080
-    Red    = #FF0000    Blue   = #0000FF
-    Purple = #800080    Teal   = #008080
-    Fuchsia= #FF00FF    Aqua   = #00FFFF
--->
-
-<!--=================== Generic Attributes ===============================-->
-
-<!-- core attributes common to most elements
-  id       document-wide unique id
-  class    space separated list of classes
-  style    associated style info
-  title    advisory title/amplification
--->
-<!ENTITY % coreattrs
- "id          ID             #IMPLIED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED"
-  >
-
-<!-- internationalization attributes
-  lang        language code (backwards compatible)
-  xml:lang    language code (as per XML 1.0 spec)
-  dir         direction for weak/neutral text
--->
-<!ENTITY % i18n
- "lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #IMPLIED"
-  >
-
-<!-- attributes for common UI events
-  onclick     a pointer button was clicked
-  ondblclick  a pointer button was double clicked
-  onmousedown a pointer button was pressed down
-  onmouseup   a pointer button was released
-  onmousemove a pointer was moved onto the element
-  onmouseout  a pointer was moved away from the element
-  onkeypress  a key was pressed and released
-  onkeydown   a key was pressed down
-  onkeyup     a key was released
--->
-<!ENTITY % events
- "onclick     %Script;       #IMPLIED
-  ondblclick  %Script;       #IMPLIED
-  onmousedown %Script;       #IMPLIED
-  onmouseup   %Script;       #IMPLIED
-  onmouseover %Script;       #IMPLIED
-  onmousemove %Script;       #IMPLIED
-  onmouseout  %Script;       #IMPLIED
-  onkeypress  %Script;       #IMPLIED
-  onkeydown   %Script;       #IMPLIED
-  onkeyup     %Script;       #IMPLIED"
-  >
-
-<!-- attributes for elements that can get the focus
-  accesskey   accessibility key character
-  tabindex    position in tabbing order
-  onfocus     the element got the focus
-  onblur      the element lost the focus
--->
-<!ENTITY % focus
- "accesskey   %Character;    #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED"
-  >
-
-<!ENTITY % attrs "%coreattrs; %i18n; %events;">
-
-<!-- text alignment for p, div, h1-h6. The default is
-     align="left" for ltr headings, "right" for rtl -->
-
-<!ENTITY % TextAlign "align (left|center|right) #IMPLIED">
-
-<!--=================== Text Elements ====================================-->
-
-<!ENTITY % special
-   "br | span | bdo | object | applet | img | map | iframe">
-
-<!ENTITY % fontstyle "tt | i | b | big | small | u
-                      | s | strike |font | basefont">
-
-<!ENTITY % phrase "em | strong | dfn | code | q | sub | sup |
-                   samp | kbd | var | cite | abbr | acronym">
-
-<!ENTITY % inline.forms "input | select | textarea | label | button">
-
-<!-- these can occur at block or inline level -->
-<!ENTITY % misc "ins | del | script | noscript">
-
-<!ENTITY % inline "a | %special; | %fontstyle; | %phrase; | %inline.forms;">
-
-<!-- %Inline; covers inline or "text-level" elements -->
-<!ENTITY % Inline "(#PCDATA | %inline; | %misc;)*">
-
-<!--================== Block level elements ==============================-->
-
-<!ENTITY % heading "h1|h2|h3|h4|h5|h6">
-<!ENTITY % lists "ul | ol | dl | menu | dir">
-<!ENTITY % blocktext "pre | hr | blockquote | address | center | noframes">
-
-<!ENTITY % block
-    "p | %heading; | div | %lists; | %blocktext; | isindex |fieldset | table">
-
-<!ENTITY % Block "(%block; | form | %misc;)*">
-
-<!-- %Flow; mixes Block and Inline and is used for list items etc. -->
-<!ENTITY % Flow "(#PCDATA | %block; | form | %inline; | %misc;)*">
-
-<!--================== Content models for exclusions =====================-->
-
-<!-- a elements use %Inline; excluding a -->
-
-<!ENTITY % a.content
-   "(#PCDATA | %special; | %fontstyle; | %phrase; | %inline.forms; | %misc;)*">
-
-<!-- pre uses %Inline excluding img, object, applet, big, small,
-     sub, sup, font, or basefont -->
-
-<!ENTITY % pre.content
-   "(#PCDATA | a | br | span | bdo | map | tt | i | b | u | s |
-      %phrase; | %inline.forms;)*">
-
-<!-- form uses %Flow; excluding form -->
-
-<!ENTITY % form.content "(#PCDATA | %block; | %inline; | %misc;)*">
-
-<!-- button uses %Flow; but excludes a, form, form controls, iframe -->
-
-<!ENTITY % button.content
-   "(#PCDATA | p | %heading; | div | %lists; | %blocktext; |
-      table | br | span | bdo | object | applet | img | map |
-      %fontstyle; | %phrase; | %misc;)*">
-
-<!--================ Document Structure ==================================-->
-
-<!-- the namespace URI designates the document profile -->
-
-<!ELEMENT html (head, body)>
-<!ATTLIST html
-  %i18n;
-  xmlns       %URI;          #FIXED 'http://www.w3.org/1999/xhtml'
-  >
-
-<!--================ Document Head =======================================-->
-
-<!ENTITY % head.misc "(script|style|meta|link|object|isindex)*">
-
-<!-- content model is %head.misc; combined with a single
-     title and an optional base element in any order -->
-
-<!ELEMENT head (%head.misc;,
-     ((title, %head.misc;, (base, %head.misc;)?) |
-      (base, %head.misc;, (title, %head.misc;))))>
-
-<!ATTLIST head
-  %i18n;
-  profile     %URI;          #IMPLIED
-  >
-
-<!-- The title element is not considered part of the flow of text.
-       It should be displayed, for example as the page header or
-       window title. Exactly one title is required per document.
-    -->
-<!ELEMENT title (#PCDATA)>
-<!ATTLIST title %i18n;>
-
-<!-- document base URI -->
-
-<!ELEMENT base EMPTY>
-<!ATTLIST base
-  href        %URI;          #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- generic metainformation -->
-<!ELEMENT meta EMPTY>
-<!ATTLIST meta
-  %i18n;
-  http-equiv  CDATA          #IMPLIED
-  name        CDATA          #IMPLIED
-  content     CDATA          #REQUIRED
-  scheme      CDATA          #IMPLIED
-  >
-
-<!--
-  Relationship values can be used in principle:
-
-   a) for document specific toolbars/menus when used
-      with the link element in document head e.g.
-        start, contents, previous, next, index, end, help
-   b) to link to a separate style sheet (rel="stylesheet")
-   c) to make a link to a script (rel="script")
-   d) by stylesheets to control how collections of
-      html nodes are rendered into printed documents
-   e) to make a link to a printable version of this document
-      e.g. a PostScript or PDF version (rel="alternate" media="print")
--->
-
-<!ELEMENT link EMPTY>
-<!ATTLIST link
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  type        %ContentType;  #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  media       %MediaDesc;    #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!-- style info, which may include CDATA sections -->
-<!ELEMENT style (#PCDATA)>
-<!ATTLIST style
-  %i18n;
-  type        %ContentType;  #REQUIRED
-  media       %MediaDesc;    #IMPLIED
-  title       %Text;         #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- script statements, which may include CDATA sections -->
-<!ELEMENT script (#PCDATA)>
-<!ATTLIST script
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #REQUIRED
-  language    CDATA          #IMPLIED
-  src         %URI;          #IMPLIED
-  defer       (defer)        #IMPLIED
-  xml:space   (preserve)     #FIXED 'preserve'
-  >
-
-<!-- alternate content container for non script-based rendering -->
-
-<!ELEMENT noscript %Flow;>
-<!ATTLIST noscript
-  %attrs;
-  >
-
-<!--======================= Frames =======================================-->
-
-<!-- inline subwindow -->
-
-<!ELEMENT iframe %Flow;>
-<!ATTLIST iframe
-  %coreattrs;
-  longdesc    %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  src         %URI;          #IMPLIED
-  frameborder (1|0)          "1"
-  marginwidth %Pixels;       #IMPLIED
-  marginheight %Pixels;      #IMPLIED
-  scrolling   (yes|no|auto)  "auto"
-  align       %ImgAlign;     #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!-- alternate content container for non frame-based rendering -->
-
-<!ELEMENT noframes %Flow;>
-<!ATTLIST noframes
-  %attrs;
-  >
-
-<!--=================== Document Body ====================================-->
-
-<!ELEMENT body %Flow;>
-<!ATTLIST body
-  %attrs;
-  onload      %Script;       #IMPLIED
-  onunload    %Script;       #IMPLIED
-  background  %URI;          #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  text        %Color;        #IMPLIED
-  link        %Color;        #IMPLIED
-  vlink       %Color;        #IMPLIED
-  alink       %Color;        #IMPLIED
-  >
-
-<!ELEMENT div %Flow;>  <!-- generic language/style container -->
-<!ATTLIST div
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Paragraphs =======================================-->
-
-<!ELEMENT p %Inline;>
-<!ATTLIST p
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Headings =========================================-->
-
-<!--
-  There are six levels of headings from h1 (the most important)
-  to h6 (the least important).
--->
-
-<!ELEMENT h1  %Inline;>
-<!ATTLIST h1
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h2 %Inline;>
-<!ATTLIST h2
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h3 %Inline;>
-<!ATTLIST h3
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h4 %Inline;>
-<!ATTLIST h4
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h5 %Inline;>
-<!ATTLIST h5
-  %attrs;
-  %TextAlign;
-  >
-
-<!ELEMENT h6 %Inline;>
-<!ATTLIST h6
-  %attrs;
-  %TextAlign;
-  >
-
-<!--=================== Lists ============================================-->
-
-<!-- Unordered list bullet styles -->
-
-<!ENTITY % ULStyle "(disc|square|circle)">
-
-<!-- Unordered list -->
-
-<!ELEMENT ul (li)+>
-<!ATTLIST ul
-  %attrs;
-  type        %ULStyle;     #IMPLIED
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- Ordered list numbering style
-
-    1   arabic numbers      1, 2, 3, ...
-    a   lower alpha         a, b, c, ...
-    A   upper alpha         A, B, C, ...
-    i   lower roman         i, ii, iii, ...
-    I   upper roman         I, II, III, ...
-
-    The style is applied to the sequence number which by default
-    is reset to 1 for the first list item in an ordered list.
--->
-<!ENTITY % OLStyle "CDATA">
-
-<!-- Ordered (numbered) list -->
-
-<!ELEMENT ol (li)+>
-<!ATTLIST ol
-  %attrs;
-  type        %OLStyle;      #IMPLIED
-  compact     (compact)      #IMPLIED
-  start       %Number;       #IMPLIED
-  >
-
-<!-- single column list (DEPRECATED) --> 
-<!ELEMENT menu (li)+>
-<!ATTLIST menu
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- multiple column list (DEPRECATED) --> 
-<!ELEMENT dir (li)+>
-<!ATTLIST dir
-  %attrs;
-  compact     (compact)     #IMPLIED
-  >
-
-<!-- LIStyle is constrained to: "(%ULStyle;|%OLStyle;)" -->
-<!ENTITY % LIStyle "CDATA">
-
-<!-- list item -->
-
-<!ELEMENT li %Flow;>
-<!ATTLIST li
-  %attrs;
-  type        %LIStyle;      #IMPLIED
-  value       %Number;       #IMPLIED
-  >
-
-<!-- definition lists - dt for term, dd for its definition -->
-
-<!ELEMENT dl (dt|dd)+>
-<!ATTLIST dl
-  %attrs;
-  compact     (compact)      #IMPLIED
-  >
-
-<!ELEMENT dt %Inline;>
-<!ATTLIST dt
-  %attrs;
-  >
-
-<!ELEMENT dd %Flow;>
-<!ATTLIST dd
-  %attrs;
-  >
-
-<!--=================== Address ==========================================-->
-
-<!-- information on author -->
-
-<!ELEMENT address %Inline;>
-<!ATTLIST address
-  %attrs;
-  >
-
-<!--=================== Horizontal Rule ==================================-->
-
-<!ELEMENT hr EMPTY>
-<!ATTLIST hr
-  %attrs;
-  align       (left|center|right) #IMPLIED
-  noshade     (noshade)      #IMPLIED
-  size        %Pixels;       #IMPLIED
-  width       %Length;       #IMPLIED
-  >
-
-<!--=================== Preformatted Text ================================-->
-
-<!-- content is %Inline; excluding 
-        "img|object|applet|big|small|sub|sup|font|basefont" -->
-
-<!ELEMENT pre %pre.content;>
-<!ATTLIST pre
-  %attrs;
-  width       %Number;      #IMPLIED
-  xml:space   (preserve)    #FIXED 'preserve'
-  >
-
-<!--=================== Block-like Quotes ================================-->
-
-<!ELEMENT blockquote %Flow;>
-<!ATTLIST blockquote
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!--=================== Text alignment ===================================-->
-
-<!-- center content -->
-<!ELEMENT center %Flow;>
-<!ATTLIST center
-  %attrs;
-  >
-
-<!--=================== Inserted/Deleted Text ============================-->
-
-<!--
-  ins/del are allowed in block and inline content, but its
-  inappropriate to include block content within an ins element
-  occurring in inline content.
--->
-<!ELEMENT ins %Flow;>
-<!ATTLIST ins
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!ELEMENT del %Flow;>
-<!ATTLIST del
-  %attrs;
-  cite        %URI;          #IMPLIED
-  datetime    %Datetime;     #IMPLIED
-  >
-
-<!--================== The Anchor Element ================================-->
-
-<!-- content is %Inline; except that anchors shouldn't be nested -->
-
-<!ELEMENT a %a.content;>
-<!ATTLIST a
-  %attrs;
-  charset     %Charset;      #IMPLIED
-  type        %ContentType;  #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  href        %URI;          #IMPLIED
-  hreflang    %LanguageCode; #IMPLIED
-  rel         %LinkTypes;    #IMPLIED
-  rev         %LinkTypes;    #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--===================== Inline Elements ================================-->
-
-<!ELEMENT span %Inline;> <!-- generic language/style container -->
-<!ATTLIST span
-  %attrs;
-  >
-
-<!ELEMENT bdo %Inline;>  <!-- I18N BiDi over-ride -->
-<!ATTLIST bdo
-  %coreattrs;
-  %events;
-  lang        %LanguageCode; #IMPLIED
-  xml:lang    %LanguageCode; #IMPLIED
-  dir         (ltr|rtl)      #REQUIRED
-  >
-
-<!ELEMENT br EMPTY>   <!-- forced line break -->
-<!ATTLIST br
-  %coreattrs;
-  clear       (left|all|right|none) "none"
-  >
-
-<!ELEMENT em %Inline;>   <!-- emphasis -->
-<!ATTLIST em %attrs;>
-
-<!ELEMENT strong %Inline;>   <!-- strong emphasis -->
-<!ATTLIST strong %attrs;>
-
-<!ELEMENT dfn %Inline;>   <!-- definitional -->
-<!ATTLIST dfn %attrs;>
-
-<!ELEMENT code %Inline;>   <!-- program code -->
-<!ATTLIST code %attrs;>
-
-<!ELEMENT samp %Inline;>   <!-- sample -->
-<!ATTLIST samp %attrs;>
-
-<!ELEMENT kbd %Inline;>  <!-- something user would type -->
-<!ATTLIST kbd %attrs;>
-
-<!ELEMENT var %Inline;>   <!-- variable -->
-<!ATTLIST var %attrs;>
-
-<!ELEMENT cite %Inline;>   <!-- citation -->
-<!ATTLIST cite %attrs;>
-
-<!ELEMENT abbr %Inline;>   <!-- abbreviation -->
-<!ATTLIST abbr %attrs;>
-
-<!ELEMENT acronym %Inline;>   <!-- acronym -->
-<!ATTLIST acronym %attrs;>
-
-<!ELEMENT q %Inline;>   <!-- inlined quote -->
-<!ATTLIST q
-  %attrs;
-  cite        %URI;          #IMPLIED
-  >
-
-<!ELEMENT sub %Inline;> <!-- subscript -->
-<!ATTLIST sub %attrs;>
-
-<!ELEMENT sup %Inline;> <!-- superscript -->
-<!ATTLIST sup %attrs;>
-
-<!ELEMENT tt %Inline;>   <!-- fixed pitch font -->
-<!ATTLIST tt %attrs;>
-
-<!ELEMENT i %Inline;>   <!-- italic font -->
-<!ATTLIST i %attrs;>
-
-<!ELEMENT b %Inline;>   <!-- bold font -->
-<!ATTLIST b %attrs;>
-
-<!ELEMENT big %Inline;>   <!-- bigger font -->
-<!ATTLIST big %attrs;>
-
-<!ELEMENT small %Inline;>   <!-- smaller font -->
-<!ATTLIST small %attrs;>
-
-<!ELEMENT u %Inline;>   <!-- underline -->
-<!ATTLIST u %attrs;>
-
-<!ELEMENT s %Inline;>   <!-- strike-through -->
-<!ATTLIST s %attrs;>
-
-<!ELEMENT strike %Inline;>   <!-- strike-through -->
-<!ATTLIST strike %attrs;>
-
-<!ELEMENT basefont EMPTY>  <!-- base font size -->
-<!ATTLIST basefont
-  id          ID             #IMPLIED
-  size        CDATA          #REQUIRED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!ELEMENT font %Inline;> <!-- local change to font -->
-<!ATTLIST font
-  %coreattrs;
-  %i18n;
-  size        CDATA          #IMPLIED
-  color       %Color;        #IMPLIED
-  face        CDATA          #IMPLIED
-  >
-
-<!--==================== Object ======================================-->
-<!--
-  object is used to embed objects as part of HTML pages.
-  param elements should precede other content. Parameters
-  can also be expressed as attribute/value pairs on the
-  object element itself when brevity is desired.
--->
-
-<!ELEMENT object (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST object
-  %attrs;
-  declare     (declare)      #IMPLIED
-  classid     %URI;          #IMPLIED
-  codebase    %URI;          #IMPLIED
-  data        %URI;          #IMPLIED
-  type        %ContentType;  #IMPLIED
-  codetype    %ContentType;  #IMPLIED
-  archive     %UriList;      #IMPLIED
-  standby     %Text;         #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Pixels;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--
-  param is used to supply a named property value.
-  In XML it would seem natural to follow RDF and support an
-  abbreviated syntax where the param elements are replaced
-  by attribute value pairs on the object start tag.
--->
-<!ELEMENT param EMPTY>
-<!ATTLIST param
-  id          ID             #IMPLIED
-  name        CDATA          #REQUIRED
-  value       CDATA          #IMPLIED
-  valuetype   (data|ref|object) "data"
-  type        %ContentType;  #IMPLIED
-  >
-
-<!--=================== Java applet ==================================-->
-<!--
-  One of code or object attributes must be present.
-  Place param elements before other content.
--->
-<!ELEMENT applet (#PCDATA | param | %block; | form | %inline; | %misc;)*>
-<!ATTLIST applet
-  %coreattrs;
-  codebase    %URI;          #IMPLIED
-  archive     CDATA          #IMPLIED
-  code        CDATA          #IMPLIED
-  object      CDATA          #IMPLIED
-  alt         %Text;         #IMPLIED
-  name        NMTOKEN        #IMPLIED
-  width       %Length;       #REQUIRED
-  height      %Length;       #REQUIRED
-  align       %ImgAlign;     #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!--=================== Images ===========================================-->
-
-<!--
-   To avoid accessibility problems for people who aren't
-   able to see the image, you should provide a text
-   description using the alt and longdesc attributes.
-   In addition, avoid the use of server-side image maps.
--->
-
-<!ELEMENT img EMPTY>
-<!ATTLIST img
-  %attrs;
-  src         %URI;          #REQUIRED
-  alt         %Text;         #REQUIRED
-  name        NMTOKEN        #IMPLIED
-  longdesc    %URI;          #IMPLIED
-  height      %Length;       #IMPLIED
-  width       %Length;       #IMPLIED
-  usemap      %URI;          #IMPLIED
-  ismap       (ismap)        #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  border      %Length;       #IMPLIED
-  hspace      %Pixels;       #IMPLIED
-  vspace      %Pixels;       #IMPLIED
-  >
-
-<!-- usemap points to a map element which may be in this document
-  or an external document, although the latter is not widely supported -->
-
-<!--================== Client-side image maps ============================-->
-
-<!-- These can be placed in the same document or grouped in a
-     separate document although this isn't yet widely supported -->
-
-<!ELEMENT map ((%block; | form | %misc;)+ | area+)>
-<!ATTLIST map
-  %i18n;
-  %events;
-  id          ID             #REQUIRED
-  class       CDATA          #IMPLIED
-  style       %StyleSheet;   #IMPLIED
-  title       %Text;         #IMPLIED
-  name        CDATA          #IMPLIED
-  >
-
-<!ELEMENT area EMPTY>
-<!ATTLIST area
-  %attrs;
-  shape       %Shape;        "rect"
-  coords      %Coords;       #IMPLIED
-  href        %URI;          #IMPLIED
-  nohref      (nohref)       #IMPLIED
-  alt         %Text;         #REQUIRED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--================ Forms ===============================================-->
-
-<!ELEMENT form %form.content;>   <!-- forms shouldn't be nested -->
-
-<!ATTLIST form
-  %attrs;
-  action      %URI;          #REQUIRED
-  method      (get|post)     "get"
-  name        NMTOKEN        #IMPLIED
-  enctype     %ContentType;  "application/x-www-form-urlencoded"
-  onsubmit    %Script;       #IMPLIED
-  onreset     %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  accept-charset %Charsets;  #IMPLIED
-  target      %FrameTarget;  #IMPLIED
-  >
-
-<!--
-  Each label must not contain more than ONE field
-  Label elements shouldn't be nested.
--->
-<!ELEMENT label %Inline;>
-<!ATTLIST label
-  %attrs;
-  for         IDREF          #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!ENTITY % InputType
-  "(text | password | checkbox |
-    radio | submit | reset |
-    file | hidden | image | button)"
-   >
-
-<!-- the name attribute is required for all but submit & reset -->
-
-<!ELEMENT input EMPTY>     <!-- form control -->
-<!ATTLIST input
-  %attrs;
-  type        %InputType;    "text"
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  checked     (checked)      #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  size        CDATA          #IMPLIED
-  maxlength   %Number;       #IMPLIED
-  src         %URI;          #IMPLIED
-  alt         CDATA          #IMPLIED
-  usemap      %URI;          #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  accept      %ContentTypes; #IMPLIED
-  align       %ImgAlign;     #IMPLIED
-  >
-
-<!ELEMENT select (optgroup|option)+>  <!-- option selector -->
-<!ATTLIST select
-  %attrs;
-  name        CDATA          #IMPLIED
-  size        %Number;       #IMPLIED
-  multiple    (multiple)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!ELEMENT optgroup (option)+>   <!-- option group -->
-<!ATTLIST optgroup
-  %attrs;
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #REQUIRED
-  >
-
-<!ELEMENT option (#PCDATA)>     <!-- selectable choice -->
-<!ATTLIST option
-  %attrs;
-  selected    (selected)     #IMPLIED
-  disabled    (disabled)     #IMPLIED
-  label       %Text;         #IMPLIED
-  value       CDATA          #IMPLIED
-  >
-
-<!ELEMENT textarea (#PCDATA)>     <!-- multi-line text field -->
-<!ATTLIST textarea
-  %attrs;
-  name        CDATA          #IMPLIED
-  rows        %Number;       #REQUIRED
-  cols        %Number;       #REQUIRED
-  disabled    (disabled)     #IMPLIED
-  readonly    (readonly)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  onselect    %Script;       #IMPLIED
-  onchange    %Script;       #IMPLIED
-  >
-
-<!--
-  The fieldset element is used to group form fields.
-  Only one legend element should occur in the content
-  and if present should only be preceded by whitespace.
--->
-<!ELEMENT fieldset (#PCDATA | legend | %block; | form | %inline; | %misc;)*>
-<!ATTLIST fieldset
-  %attrs;
-  >
-
-<!ENTITY % LAlign "(top|bottom|left|right)">
-
-<!ELEMENT legend %Inline;>     <!-- fieldset label -->
-<!ATTLIST legend
-  %attrs;
-  accesskey   %Character;    #IMPLIED
-  align       %LAlign;       #IMPLIED
-  >
-
-<!--
- Content is %Flow; excluding a, form, form controls, iframe
---> 
-<!ELEMENT button %button.content;>  <!-- push button -->
-<!ATTLIST button
-  %attrs;
-  name        CDATA          #IMPLIED
-  value       CDATA          #IMPLIED
-  type        (button|submit|reset) "submit"
-  disabled    (disabled)     #IMPLIED
-  tabindex    %Number;       #IMPLIED
-  accesskey   %Character;    #IMPLIED
-  onfocus     %Script;       #IMPLIED
-  onblur      %Script;       #IMPLIED
-  >
-
-<!-- single-line text input control (DEPRECATED) -->
-<!ELEMENT isindex EMPTY>
-<!ATTLIST isindex
-  %coreattrs;
-  %i18n;
-  prompt      %Text;         #IMPLIED
-  >
-
-<!--======================= Tables =======================================-->
-
-<!-- Derived from IETF HTML table standard, see [RFC1942] -->
-
-<!--
- The border attribute sets the thickness of the frame around the
- table. The default units are screen pixels.
-
- The frame attribute specifies which parts of the frame around
- the table should be rendered. The values are not the same as
- CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % TFrame "(void|above|below|hsides|lhs|rhs|vsides|box|border)">
-
-<!--
- The rules attribute defines which rules to draw between cells:
-
- If rules is absent then assume:
-     "none" if border is absent or border="0" otherwise "all"
--->
-
-<!ENTITY % TRules "(none | groups | rows | cols | all)">
-  
-<!-- horizontal placement of table relative to document -->
-<!ENTITY % TAlign "(left|center|right)">
-
-<!-- horizontal alignment attributes for cell contents
-
-  char        alignment char, e.g. char=':'
-  charoff     offset for alignment char
--->
-<!ENTITY % cellhalign
-  "align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED
-   charoff    %Length;       #IMPLIED"
-  >
-
-<!-- vertical alignment attributes for cell contents -->
-<!ENTITY % cellvalign
-  "valign     (top|middle|bottom|baseline) #IMPLIED"
-  >
-
-<!ELEMENT table
-     (caption?, (col*|colgroup*), thead?, tfoot?, (tbody+|tr+))>
-<!ELEMENT caption  %Inline;>
-<!ELEMENT thead    (tr)+>
-<!ELEMENT tfoot    (tr)+>
-<!ELEMENT tbody    (tr)+>
-<!ELEMENT colgroup (col)*>
-<!ELEMENT col      EMPTY>
-<!ELEMENT tr       (th|td)+>
-<!ELEMENT th       %Flow;>
-<!ELEMENT td       %Flow;>
-
-<!ATTLIST table
-  %attrs;
-  summary     %Text;         #IMPLIED
-  width       %Length;       #IMPLIED
-  border      %Pixels;       #IMPLIED
-  frame       %TFrame;       #IMPLIED
-  rules       %TRules;       #IMPLIED
-  cellspacing %Length;       #IMPLIED
-  cellpadding %Length;       #IMPLIED
-  align       %TAlign;       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!ENTITY % CAlign "(top|bottom|left|right)">
-
-<!ATTLIST caption
-  %attrs;
-  align       %CAlign;       #IMPLIED
-  >
-
-<!--
-colgroup groups a set of col elements. It allows you to group
-several semantically related columns together.
--->
-<!ATTLIST colgroup
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
- col elements define the alignment properties for cells in
- one or more columns.
-
- The width attribute specifies the width of the columns, e.g.
-
-     width=64        width in screen pixels
-     width=0.5*      relative width of 0.5
-
- The span attribute causes the attributes of one
- col element to apply to more than one column.
--->
-<!ATTLIST col
-  %attrs;
-  span        %Number;       "1"
-  width       %MultiLength;  #IMPLIED
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!--
-    Use thead to duplicate headers when breaking table
-    across page boundaries, or for static headers when
-    tbody sections are rendered in scrolling panel.
-
-    Use tfoot to duplicate footers when breaking table
-    across page boundaries, or for static footers when
-    tbody sections are rendered in scrolling panel.
-
-    Use multiple tbody sections when rules are needed
-    between groups of table rows.
--->
-<!ATTLIST thead
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tfoot
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tbody
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  >
-
-<!ATTLIST tr
-  %attrs;
-  %cellhalign;
-  %cellvalign;
-  bgcolor     %Color;        #IMPLIED
-  >
-
-<!-- Scope is simpler than headers attribute for common tables -->
-<!ENTITY % Scope "(row|col|rowgroup|colgroup)">
-
-<!-- th is for headers, td for data and for cells acting as both -->
-
-<!ATTLIST th
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
-<!ATTLIST td
-  %attrs;
-  abbr        %Text;         #IMPLIED
-  axis        CDATA          #IMPLIED
-  headers     IDREFS         #IMPLIED
-  scope       %Scope;        #IMPLIED
-  rowspan     %Number;       "1"
-  colspan     %Number;       "1"
-  %cellhalign;
-  %cellvalign;
-  nowrap      (nowrap)       #IMPLIED
-  bgcolor     %Color;        #IMPLIED
-  width       %Pixels;       #IMPLIED
-  height      %Pixels;       #IMPLIED
-  >
-
diff --git a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml11-flat.dtd b/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml11-flat.dtd
deleted file mode 100644
index 33a8517..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/dtds/xhtml11-flat.dtd
+++ /dev/null
@@ -1,4513 +0,0 @@
-<!-- ....................................................................... -->
-<!-- XHTML 1.1 DTD  ........................................................ -->
-<!-- file: xhtml11.dtd
--->
-
-<!-- XHTML 1.1 DTD
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-
-     The Extensible HyperText Markup Language (XHTML)
-     Copyright 1998-2000 World Wide Web Consortium
-        (Massachusetts Institute of Technology, Institut National de
-         Recherche en Informatique et en Automatique, Keio University).
-         All Rights Reserved.
-
-     Permission to use, copy, modify and distribute the XHTML DTD and its 
-     accompanying documentation for any purpose and without fee is hereby 
-     granted in perpetuity, provided that the above copyright notice and 
-     this paragraph appear in all copies.  The copyright holders make no 
-     representation about the suitability of the DTD for any purpose.
-
-     It is provided "as is" without expressed or implied warranty.
-
-        Author:     Murray M. Altheim <altheim@eng.sun.com>
-        Revision:   $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
--->
-<!-- This is the driver file for version 1.1 of the XHTML DTD.
-
-     Please use this formal public identifier to identify it:
-
-         "-//W3C//DTD XHTML 1.1//EN"
--->
-<!ENTITY % XHTML.version  "-//W3C//DTD XHTML 1.1//EN" >
-
-<!-- Use this URI to identify the default namespace:
-
-         "http://www.w3.org/1999/xhtml"
-
-     See the Qualified Names module for information
-     on the use of namespace prefixes in the DTD.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefix "" >
-
-<!-- Reserved for use with the XLink namespace:
--->
-<!ENTITY % XLINK.xmlns "" >
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- For example, if you are using XHTML 1.1 directly, use the FPI
-     in the DOCTYPE declaration, with the xmlns attribute on the
-     document element to identify the default namespace:
-
-       <?xml version="1.0"?>
-       <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "xhtml11.dtd">
-       <html xmlns="http://www.w3.org/1999/xhtml"
-             xml:lang="en">
-       ...
-       </html>
-
-     Revisions:
-     (none)
--->
-
-<!-- reserved for future use with document profiles -->
-<!ENTITY % XHTML.profile  "" >
-
-<!-- Bidirectional Text features
-     This feature-test entity is used to declare elements
-     and attributes used for bidirectional text support.
--->
-<!ENTITY % XHTML.bidi  "INCLUDE" >
-
-<?doc type="doctype" role="title" { XHTML 1.1 } ?>
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Pre-Framework Redeclaration placeholder  .................... -->
-<!-- this serves as a location to insert markup declarations
-     into the DTD prior to the framework declarations.
--->
-<!ENTITY % xhtml-prefw-redecl.module "IGNORE" >
-<![%xhtml-prefw-redecl.module;[
-%xhtml-prefw-redecl.mod;
-<!-- end of xhtml-prefw-redecl.module -->]]>
-
-<!ENTITY % xhtml-events.module "INCLUDE" >
-
-<!-- Inline Style Module  ........................................ -->
-<!ENTITY % xhtml-inlstyle.module "INCLUDE" >
-<![%xhtml-inlstyle.module;[
-<!ENTITY % xhtml-inlstyle.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Style 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Style Module  ........................................... -->
-<!-- file: xhtml-inlstyle-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Inline Style 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstyle-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Style
-
-     This module declares the 'style' attribute, used to support inline
-     style markup. This module must be instantiated prior to the XHTML
-     Common Attributes module in order to be included in %Core.attrib;.
--->
-
-<!ENTITY % style.attrib
-     "style        CDATA                    #IMPLIED"
->
-
-
-<!ENTITY % Core.extra.attrib
-     "%style.attrib;"
->
-
-<!-- end of xhtml-inlstyle-1.mod -->
-]]>
-
-<!-- declare Document Model module instantiated in framework
--->
-<!ENTITY % xhtml-model.mod
-     PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-            "xhtml11-model-1.mod" >
-
-<!-- Modular Framework Module (required) ......................... -->
-<!ENTITY % xhtml-framework.module "INCLUDE" >
-<![%xhtml-framework.module;[
-<!ENTITY % xhtml-framework.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Modular Framework Module  ...................................... -->
-<!-- file: xhtml-framework-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Modular Framework 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-framework-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Modular Framework
-
-     This required module instantiates the modules needed
-     to support the XHTML modularization model, including:
-
-        +  notations
-        +  datatypes
-        +  namespace-qualified names
-        +  common attributes
-        +  document model
-        +  character entities
-
-     The Intrinsic Events module is ignored by default but
-     occurs in this module because it must be instantiated
-     prior to Attributes but after Datatypes.
--->
-
-<!ENTITY % xhtml-arch.module "IGNORE" >
-<![%xhtml-arch.module;[
-<!ENTITY % xhtml-arch.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Architecture 1.0//EN"
-            "xhtml-arch-1.mod" >
-%xhtml-arch.mod;]]>
-
-<!ENTITY % xhtml-notations.module "INCLUDE" >
-<![%xhtml-notations.module;[
-<!ENTITY % xhtml-notations.mod
-     PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-            "xhtml-notations-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Notations Module  .............................................. -->
-<!-- file: xhtml-notations-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//NOTATIONS XHTML Notations 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-notations-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Notations
-
-     defines the following notations, many of these imported from
-     other specifications and standards. When an existing FPI is
-     known, it is incorporated here.
--->
-
-<!-- XML Notations ..................................... -->
-<!-- SGML and XML Notations ............................ -->
-
-<!-- W3C XML 1.0 Recommendation -->
-<!NOTATION w3c-xml
-     PUBLIC "ISO 8879//NOTATION Extensible Markup Language (XML) 1.0//EN" >
-
-<!-- XML 1.0 CDATA -->
-<!NOTATION cdata
-     PUBLIC "-//W3C//NOTATION XML 1.0: CDATA//EN" >
-
-<!-- SGML Formal Public Identifiers -->
-<!NOTATION fpi
-     PUBLIC "ISO 8879:1986//NOTATION Formal Public Identifier//EN" >
-
-<!-- XHTML Notations ................................... -->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!NOTATION length
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Length//EN" >
-
-<!-- space-separated list of link types -->
-<!NOTATION linkTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LinkTypes//EN" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!NOTATION mediaDesc
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MediaDesc//EN" >
-
-<!-- pixel, percentage, or relative -->
-<!NOTATION multiLength
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: MultiLength//EN" >
-
-<!-- one or more digits (NUMBER) -->
-<!NOTATION number
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Number//EN" >
-
-<!-- integer representing length in pixels -->
-<!NOTATION pixels
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Pixels//EN" >
-
-<!-- script expression -->
-<!NOTATION script
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Script//EN" >
-
-<!-- textual content -->
-<!NOTATION text
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Text//EN" >
-
-<!-- Imported Notations ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!NOTATION character
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Character//EN" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!NOTATION charset
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charset//EN" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!NOTATION charsets
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Charsets//EN" >
-
-<!-- media type, as per [RFC2045] -->
-<!NOTATION contentType
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentType//EN" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!NOTATION contentTypes
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: ContentTypes//EN" >
-
-<!-- date and time information. ISO date format -->
-<!NOTATION datetime
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: Datetime//EN" >
-
-<!-- a language code, as per [RFC3066] -->
-<!NOTATION languageCode
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: LanguageCode//EN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!NOTATION uri
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URI//EN" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!NOTATION uris
-    PUBLIC "-//W3C//NOTATION XHTML Datatype: URIs//EN" >
-
-<!-- end of xhtml-notations-1.mod -->
-]]>
-
-<!ENTITY % xhtml-datatypes.module "INCLUDE" >
-<![%xhtml-datatypes.module;[
-<!ENTITY % xhtml-datatypes.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-            "xhtml-datatypes-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Datatypes Module  .............................................. -->
-<!-- file: xhtml-datatypes-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Datatypes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-datatypes-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Datatypes
-
-     defines containers for the following datatypes, many of
-     these imported from other specifications and standards.
--->
-
-<!-- Length defined for cellpadding/cellspacing -->
-
-<!-- nn for pixels or nn% for percentage length -->
-<!ENTITY % Length.datatype "CDATA" >
-
-<!-- space-separated list of link types -->
-<!ENTITY % LinkTypes.datatype "NMTOKENS" >
-
-<!-- single or comma-separated list of media descriptors -->
-<!ENTITY % MediaDesc.datatype "CDATA" >
-
-<!-- pixel, percentage, or relative -->
-<!ENTITY % MultiLength.datatype "CDATA" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- integer representing length in pixels -->
-<!ENTITY % Pixels.datatype "CDATA" >
-
-<!-- script expression -->
-<!ENTITY % Script.datatype "CDATA" >
-
-<!-- textual content -->
-<!ENTITY % Text.datatype "CDATA" >
-
-<!-- Imported Datatypes ................................ -->
-
-<!-- a single character from [ISO10646] -->
-<!ENTITY % Character.datatype "CDATA" >
-
-<!-- a character encoding, as per [RFC2045] -->
-<!ENTITY % Charset.datatype "CDATA" >
-
-<!-- a space separated list of character encodings, as per [RFC2045] -->
-<!ENTITY % Charsets.datatype "CDATA" >
-
-<!-- media type, as per [RFC2045] -->
-<!ENTITY % ContentType.datatype "CDATA" >
-
-<!-- comma-separated list of media types, as per [RFC2045] -->
-<!ENTITY % ContentTypes.datatype "CDATA" >
-
-<!-- date and time information. ISO date format -->
-<!ENTITY % Datetime.datatype "CDATA" >
-
-<!-- formal public identifier, as per [ISO8879] -->
-<!ENTITY % FPI.datatype "CDATA" >
-
-<!-- a language code, as per [RFC3066] -->
-<!ENTITY % LanguageCode.datatype "NMTOKEN" >
-
-<!-- a Uniform Resource Identifier, see [URI] -->
-<!ENTITY % URI.datatype "CDATA" >
-
-<!-- a space-separated list of Uniform Resource Identifiers, see [URI] -->
-<!ENTITY % URIs.datatype "CDATA" >
-
-<!-- end of xhtml-datatypes-1.mod -->
-]]>
-
-<!-- placeholder for XLink support module -->
-<!ENTITY % xhtml-xlink.mod "" >
-
-
-<!ENTITY % xhtml-qname.module "INCLUDE" >
-<![%xhtml-qname.module;[
-<!ENTITY % xhtml-qname.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-            "xhtml-qname-1.mod" >
-<!-- ....................................................................... -->
-<!-- XHTML Qname Module  ................................................... -->
-<!-- file: xhtml-qname-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Qualified Names 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-qname-1.mod"
-
-     Revisions:
-#2000-10-22: added qname declarations for ruby elements
-     ....................................................................... -->
-
-<!-- XHTML Qname (Qualified Name) Module
-
-     This module is contained in two parts, labeled Section 'A' and 'B':
-
-       Section A declares parameter entities to support namespace-
-       qualified names, namespace declarations, and name prefixing
-       for XHTML and extensions.
-
-       Section B declares parameter entities used to provide
-       namespace-qualified names for all XHTML element types:
-
-         %applet.qname;   the xmlns-qualified name for <applet>
-         %base.qname;     the xmlns-qualified name for <base>
-         ...
-
-     XHTML extensions would create a module similar to this one.
-     Included in the XHTML distribution is a template module
-     ('template-qname-1.mod') suitable for this purpose.
--->
-
-<!-- Section A: XHTML XML Namespace Framework :::::::::::::::::::: -->
-
-<!-- 1. Declare a %XHTML.prefixed; conditional section keyword, used
-        to activate namespace prefixing. The default value should
-        inherit '%NS.prefixed;' from the DTD driver, so that unless
-        overridden, the default behaviour follows the overall DTD
-        prefixing scheme.
--->
-<!ENTITY % NS.prefixed "IGNORE" >
-<!ENTITY % XHTML.prefixed "%NS.prefixed;" >
-
-<!-- 2. Declare a parameter entity (eg., %XHTML.xmlns;) containing
-        the URI reference used to identify the XHTML namespace:
--->
-<!ENTITY % XHTML.xmlns  "http://www.w3.org/1999/xhtml" >
-
-<!-- 3. Declare parameter entities (eg., %XHTML.prefix;) containing
-        the default namespace prefix string(s) to use when prefixing
-        is enabled. This may be overridden in the DTD driver or the
-        internal subset of an document instance. If no default prefix
-        is desired, this may be declared as an empty string.
-
-     NOTE: As specified in [XMLNAMES], the namespace prefix serves
-     as a proxy for the URI reference, and is not in itself significant.
--->
-<!ENTITY % XHTML.prefix  "" >
-
-<!-- 4. Declare parameter entities (eg., %XHTML.pfx;) containing the
-        colonized prefix(es) (eg., '%XHTML.prefix;:') used when
-        prefixing is active, an empty string when it is not.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.pfx  "%XHTML.prefix;:" >
-]]>
-<!ENTITY % XHTML.pfx  "" >
-
-<!-- declare qualified name extensions here ............ -->
-<!ENTITY % xhtml-qname-extra.mod "" >
-
-
-<!-- 5. The parameter entity %XHTML.xmlns.extra.attrib; may be
-        redeclared to contain any non-XHTML namespace declaration
-        attributes for namespaces embedded in XHTML. The default
-        is an empty string.  XLink should be included here if used
-        in the DTD.
--->
-<!ENTITY % XHTML.xmlns.extra.attrib "" >
-
-<!-- The remainder of Section A is only followed in XHTML, not extensions. -->
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing
-     all XML Namespace declarations used in the DTD, plus the
-     xmlns declaration for XHTML, its form dependent on whether
-     prefixing is active.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % NS.decl.attrib
-     "xmlns:%XHTML.prefix;  %URI.datatype;   #FIXED '%XHTML.xmlns;'
-      %XHTML.xmlns.extra.attrib;"
->
-]]>
-<!ENTITY % NS.decl.attrib
-     "%XHTML.xmlns.extra.attrib;"
->
-
-<!-- This is a placeholder for future XLink support.
--->
-<!ENTITY % XLINK.xmlns.attrib "" >
-
-<!-- Declare a parameter entity %NS.decl.attrib; containing all
-     XML namespace declaration attributes used by XHTML, including
-     a default xmlns attribute when prefixing is inactive.
--->
-<![%XHTML.prefixed;[
-<!ENTITY % XHTML.xmlns.attrib
-     "%NS.decl.attrib;
-      %XLINK.xmlns.attrib;"
->
-]]>
-<!ENTITY % XHTML.xmlns.attrib
-     "xmlns        %URI.datatype;           #FIXED '%XHTML.xmlns;'
-      %XLINK.xmlns.attrib;"
->
-
-<!-- placeholder for qualified name redeclarations -->
-<!ENTITY % xhtml-qname.redecl "" >
-
-
-<!-- Section B: XHTML Qualified Names ::::::::::::::::::::::::::::: -->
-
-<!-- 6. This section declares parameter entities used to provide
-        namespace-qualified names for all XHTML element types.
--->
-
-<!-- module:  xhtml-applet-1.mod -->
-<!ENTITY % applet.qname  "%XHTML.pfx;applet" >
-
-<!-- module:  xhtml-base-1.mod -->
-<!ENTITY % base.qname    "%XHTML.pfx;base" >
-
-<!-- module:  xhtml-bdo-1.mod -->
-<!ENTITY % bdo.qname     "%XHTML.pfx;bdo" >
-
-<!-- module:  xhtml-blkphras-1.mod -->
-<!ENTITY % address.qname "%XHTML.pfx;address" >
-<!ENTITY % blockquote.qname  "%XHTML.pfx;blockquote" >
-<!ENTITY % pre.qname     "%XHTML.pfx;pre" >
-<!ENTITY % h1.qname      "%XHTML.pfx;h1" >
-<!ENTITY % h2.qname      "%XHTML.pfx;h2" >
-<!ENTITY % h3.qname      "%XHTML.pfx;h3" >
-<!ENTITY % h4.qname      "%XHTML.pfx;h4" >
-<!ENTITY % h5.qname      "%XHTML.pfx;h5" >
-<!ENTITY % h6.qname      "%XHTML.pfx;h6" >
-
-<!-- module:  xhtml-blkpres-1.mod -->
-<!ENTITY % hr.qname      "%XHTML.pfx;hr" >
-
-<!-- module:  xhtml-blkstruct-1.mod -->
-<!ENTITY % div.qname     "%XHTML.pfx;div" >
-<!ENTITY % p.qname       "%XHTML.pfx;p" >
-
-<!-- module:  xhtml-edit-1.mod -->
-<!ENTITY % ins.qname     "%XHTML.pfx;ins" >
-<!ENTITY % del.qname     "%XHTML.pfx;del" >
-
-<!-- module:  xhtml-form-1.mod -->
-<!ENTITY % form.qname    "%XHTML.pfx;form" >
-<!ENTITY % label.qname   "%XHTML.pfx;label" >
-<!ENTITY % input.qname   "%XHTML.pfx;input" >
-<!ENTITY % select.qname  "%XHTML.pfx;select" >
-<!ENTITY % optgroup.qname  "%XHTML.pfx;optgroup" >
-<!ENTITY % option.qname  "%XHTML.pfx;option" >
-<!ENTITY % textarea.qname  "%XHTML.pfx;textarea" >
-<!ENTITY % fieldset.qname  "%XHTML.pfx;fieldset" >
-<!ENTITY % legend.qname  "%XHTML.pfx;legend" >
-<!ENTITY % button.qname  "%XHTML.pfx;button" >
-
-<!-- module:  xhtml-hypertext-1.mod -->
-<!ENTITY % a.qname       "%XHTML.pfx;a" >
-
-<!-- module:  xhtml-image-1.mod -->
-<!ENTITY % img.qname     "%XHTML.pfx;img" >
-
-<!-- module:  xhtml-inlphras-1.mod -->
-<!ENTITY % abbr.qname    "%XHTML.pfx;abbr" >
-<!ENTITY % acronym.qname "%XHTML.pfx;acronym" >
-<!ENTITY % cite.qname    "%XHTML.pfx;cite" >
-<!ENTITY % code.qname    "%XHTML.pfx;code" >
-<!ENTITY % dfn.qname     "%XHTML.pfx;dfn" >
-<!ENTITY % em.qname      "%XHTML.pfx;em" >
-<!ENTITY % kbd.qname     "%XHTML.pfx;kbd" >
-<!ENTITY % q.qname       "%XHTML.pfx;q" >
-<!ENTITY % samp.qname    "%XHTML.pfx;samp" >
-<!ENTITY % strong.qname  "%XHTML.pfx;strong" >
-<!ENTITY % var.qname     "%XHTML.pfx;var" >
-
-<!-- module:  xhtml-inlpres-1.mod -->
-<!ENTITY % b.qname       "%XHTML.pfx;b" >
-<!ENTITY % big.qname     "%XHTML.pfx;big" >
-<!ENTITY % i.qname       "%XHTML.pfx;i" >
-<!ENTITY % small.qname   "%XHTML.pfx;small" >
-<!ENTITY % sub.qname     "%XHTML.pfx;sub" >
-<!ENTITY % sup.qname     "%XHTML.pfx;sup" >
-<!ENTITY % tt.qname      "%XHTML.pfx;tt" >
-
-<!-- module:  xhtml-inlstruct-1.mod -->
-<!ENTITY % br.qname      "%XHTML.pfx;br" >
-<!ENTITY % span.qname    "%XHTML.pfx;span" >
-
-<!-- module:  xhtml-ismap-1.mod (also csismap, ssismap) -->
-<!ENTITY % map.qname     "%XHTML.pfx;map" >
-<!ENTITY % area.qname    "%XHTML.pfx;area" >
-
-<!-- module:  xhtml-link-1.mod -->
-<!ENTITY % link.qname    "%XHTML.pfx;link" >
-
-<!-- module:  xhtml-list-1.mod -->
-<!ENTITY % dl.qname      "%XHTML.pfx;dl" >
-<!ENTITY % dt.qname      "%XHTML.pfx;dt" >
-<!ENTITY % dd.qname      "%XHTML.pfx;dd" >
-<!ENTITY % ol.qname      "%XHTML.pfx;ol" >
-<!ENTITY % ul.qname      "%XHTML.pfx;ul" >
-<!ENTITY % li.qname      "%XHTML.pfx;li" >
-
-<!-- module:  xhtml-meta-1.mod -->
-<!ENTITY % meta.qname    "%XHTML.pfx;meta" >
-
-<!-- module:  xhtml-param-1.mod -->
-<!ENTITY % param.qname   "%XHTML.pfx;param" >
-
-<!-- module:  xhtml-object-1.mod -->
-<!ENTITY % object.qname  "%XHTML.pfx;object" >
-
-<!-- module:  xhtml-script-1.mod -->
-<!ENTITY % script.qname  "%XHTML.pfx;script" >
-<!ENTITY % noscript.qname  "%XHTML.pfx;noscript" >
-
-<!-- module:  xhtml-struct-1.mod -->
-<!ENTITY % html.qname    "%XHTML.pfx;html" >
-<!ENTITY % head.qname    "%XHTML.pfx;head" >
-<!ENTITY % title.qname   "%XHTML.pfx;title" >
-<!ENTITY % body.qname    "%XHTML.pfx;body" >
-
-<!-- module:  xhtml-style-1.mod -->
-<!ENTITY % style.qname   "%XHTML.pfx;style" >
-
-<!-- module:  xhtml-table-1.mod -->
-<!ENTITY % table.qname   "%XHTML.pfx;table" >
-<!ENTITY % caption.qname "%XHTML.pfx;caption" >
-<!ENTITY % thead.qname   "%XHTML.pfx;thead" >
-<!ENTITY % tfoot.qname   "%XHTML.pfx;tfoot" >
-<!ENTITY % tbody.qname   "%XHTML.pfx;tbody" >
-<!ENTITY % colgroup.qname  "%XHTML.pfx;colgroup" >
-<!ENTITY % col.qname     "%XHTML.pfx;col" >
-<!ENTITY % tr.qname      "%XHTML.pfx;tr" >
-<!ENTITY % th.qname      "%XHTML.pfx;th" >
-<!ENTITY % td.qname      "%XHTML.pfx;td" >
-
-<!-- module:  xhtml-ruby-1.mod -->
-
-<!ENTITY % ruby.qname    "%XHTML.pfx;ruby" >
-<!ENTITY % rbc.qname     "%XHTML.pfx;rbc" >
-<!ENTITY % rtc.qname     "%XHTML.pfx;rtc" >
-<!ENTITY % rb.qname      "%XHTML.pfx;rb" >
-<!ENTITY % rt.qname      "%XHTML.pfx;rt" >
-<!ENTITY % rp.qname      "%XHTML.pfx;rp" >
-
-<!-- Provisional XHTML 2.0 Qualified Names  ...................... -->
-
-<!-- module:  xhtml-image-2.mod -->
-<!ENTITY % alt.qname     "%XHTML.pfx;alt" >
-
-<!-- end of xhtml-qname-1.mod -->
-]]>
-
-<!ENTITY % xhtml-events.module "IGNORE" >
-<![%xhtml-events.module;[
-<!ENTITY % xhtml-events.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-            "xhtml-events-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Intrinsic Events Module  ....................................... -->
-<!-- file: xhtml-events-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Intrinsic Events 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-events-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Intrinsic Event Attributes
-
-     These are the event attributes defined in HTML 4.0,
-     Section 18.2.3 "Intrinsic Events". This module must be
-     instantiated prior to the Attributes Module but after
-     the Datatype Module in the Modular Framework module.
-
-    "Note: Authors of HTML documents are advised that changes
-     are likely to occur in the realm of intrinsic events
-     (e.g., how scripts are bound to events). Research in
-     this realm is carried on by members of the W3C Document
-     Object Model Working Group (see the W3C Web site at
-     http://www.w3.org/ for more information)."
--->
-<!-- NOTE: Because the ATTLIST declarations in this module occur
-     before their respective ELEMENT declarations in other
-     modules, there may be a dependency on this module that
-     should be considered if any of the parameter entities used
-     for element type names (eg., %a.qname;) are redeclared.
--->
-
-<!ENTITY % Events.attrib
-     "onclick      %Script.datatype;        #IMPLIED
-      ondblclick   %Script.datatype;        #IMPLIED
-      onmousedown  %Script.datatype;        #IMPLIED
-      onmouseup    %Script.datatype;        #IMPLIED
-      onmouseover  %Script.datatype;        #IMPLIED
-      onmousemove  %Script.datatype;        #IMPLIED
-      onmouseout   %Script.datatype;        #IMPLIED
-      onkeypress   %Script.datatype;        #IMPLIED
-      onkeydown    %Script.datatype;        #IMPLIED
-      onkeyup      %Script.datatype;        #IMPLIED"
->
-
-<!-- additional attributes on anchor element
--->
-<!ATTLIST %a.qname;
-     onfocus      %Script.datatype;         #IMPLIED
-     onblur       %Script.datatype;         #IMPLIED
->
-
-<!-- additional attributes on form element
--->
-<!ATTLIST %form.qname;
-      onsubmit     %Script.datatype;        #IMPLIED
-      onreset      %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on label element
--->
-<!ATTLIST %label.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on input element
--->
-<!ATTLIST %input.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
-      onselect     %Script.datatype;        #IMPLIED
-      onchange     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on select element
--->
-<!ATTLIST %select.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
-      onchange     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on textarea element
--->
-<!ATTLIST %textarea.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
-      onselect     %Script.datatype;        #IMPLIED
-      onchange     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on button element
--->
-<!ATTLIST %button.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on body element
--->
-<!ATTLIST %body.qname;
-      onload       %Script.datatype;        #IMPLIED
-      onunload     %Script.datatype;        #IMPLIED
->
-
-<!-- additional attributes on area element
--->
-<!ATTLIST %area.qname;
-      onfocus      %Script.datatype;        #IMPLIED
-      onblur       %Script.datatype;        #IMPLIED
->
-
-<!-- end of xhtml-events-1.mod -->
-]]>
-
-<!ENTITY % xhtml-attribs.module "INCLUDE" >
-<![%xhtml-attribs.module;[
-<!ENTITY % xhtml-attribs.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-            "xhtml-attribs-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Common Attributes Module  ...................................... -->
-<!-- file: xhtml-attribs-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Common Attributes 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-attribs-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Common Attributes
-
-     This module declares many of the common attributes for the XHTML DTD.
-     %NS.decl.attrib; is declared in the XHTML Qname module.
--->
-
-<!ENTITY % id.attrib
-     "id           ID                       #IMPLIED"
->
-
-<!ENTITY % class.attrib
-     "class        NMTOKENS                 #IMPLIED"
->
-
-<!ENTITY % title.attrib
-     "title        %Text.datatype;          #IMPLIED"
->
-
-<!ENTITY % Core.extra.attrib "" >
-
-<!ENTITY % Core.attrib
-     "%XHTML.xmlns.attrib;
-      %id.attrib;
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;"
->
-
-<!ENTITY % lang.attrib
-     "xml:lang     %LanguageCode.datatype;  #IMPLIED"
->
-
-<![%XHTML.bidi;[
-<!ENTITY % dir.attrib
-     "dir          ( ltr | rtl )            #IMPLIED"
->
-
-<!ENTITY % I18n.attrib
-     "%dir.attrib;
-      %lang.attrib;"
->
-
-]]>
-<!ENTITY % I18n.attrib
-     "%lang.attrib;"
->
-
-<!ENTITY % Common.extra.attrib "" >
-
-<!-- intrinsic event attributes declared previously
--->
-<!ENTITY % Events.attrib "" >
-
-<!ENTITY % Common.attrib
-     "%Core.attrib;
-      %I18n.attrib;
-      %Events.attrib;
-      %Common.extra.attrib;"
->
-
-<!-- end of xhtml-attribs-1.mod -->
-]]>
-
-<!-- placeholder for content model redeclarations -->
-<!ENTITY % xhtml-model.redecl "" >
-
-
-<!ENTITY % xhtml-model.module "INCLUDE" >
-<![%xhtml-model.module;[
-<!-- instantiate the Document Model module declared in the DTD driver
--->
-<!-- ....................................................................... -->
-<!-- XHTML 1.1 Document Model Module  ...................................... -->
-<!-- file: xhtml11-model-1.mod
-
-     This is XHTML 1.1, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2000 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML 1.1 Document Model 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml11/DTD/xhtml11-model-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- XHTML 1.1 Document Model
-
-     This module describes the groupings of elements that make up
-     common content models for XHTML elements.
-
-     XHTML has three basic content models:
-
-         %Inline.mix;  character-level elements
-         %Block.mix;   block-like elements, eg., paragraphs and lists
-         %Flow.mix;    any block or inline elements
-
-     Any parameter entities declared in this module may be used
-     to create element content models, but the above three are
-     considered 'global' (insofar as that term applies here).
-
-     The reserved word '#PCDATA' (indicating a text string) is now
-     included explicitly with each element declaration that is
-     declared as mixed content, as XML requires that this token
-     occur first in a content model specification.
--->
-<!-- Extending the Model
-
-     While in some cases this module may need to be rewritten to
-     accommodate changes to the document model, minor extensions
-     may be accomplished by redeclaring any of the three *.extra;
-     parameter entities to contain extension element types as follows:
-
-         %Misc.extra;    whose parent may be any block or
-                         inline element.
-
-         %Inline.extra;  whose parent may be any inline element.
-
-         %Block.extra;   whose parent may be any block element.
-
-     If used, these parameter entities must be an OR-separated
-     list beginning with an OR separator ("|"), eg., "| a | b | c"
-
-     All block and inline *.class parameter entities not part
-     of the *struct.class classes begin with "| " to allow for
-     exclusion from mixes.
--->
-
-<!-- ..............  Optional Elements in head  .................. -->
-
-<!ENTITY % HeadOpts.mix
-     "( %script.qname; | %style.qname; | %meta.qname;
-      | %link.qname; | %object.qname; )*"
->
-
-<!-- .................  Miscellaneous Elements  .................. -->
-
-<!-- ins and del are used to denote editing changes
--->
-<!ENTITY % Edit.class "| %ins.qname; | %del.qname;" >
-
-<!-- script and noscript are used to contain scripts
-     and alternative content
--->
-<!ENTITY % Script.class "| %script.qname; | %noscript.qname;" >
-
-<!ENTITY % Misc.extra "" >
-
-<!-- These elements are neither block nor inline, and can
-     essentially be used anywhere in the document body.
--->
-<!ENTITY % Misc.class
-     "%Edit.class;
-      %Script.class;
-      %Misc.extra;"
->
-
-<!-- ....................  Inline Elements  ...................... -->
-
-<!ENTITY % InlStruct.class "%br.qname; | %span.qname;" >
-
-<!ENTITY % InlPhras.class
-     "| %em.qname; | %strong.qname; | %dfn.qname; | %code.qname;
-      | %samp.qname; | %kbd.qname; | %var.qname; | %cite.qname;
-      | %abbr.qname; | %acronym.qname; | %q.qname;" >
-
-<!ENTITY % InlPres.class
-     "| %tt.qname; | %i.qname; | %b.qname; | %big.qname;
-      | %small.qname; | %sub.qname; | %sup.qname;" >
-
-<!ENTITY % I18n.class "| %bdo.qname;" >
-
-<!ENTITY % Anchor.class "| %a.qname;" >
-
-<!ENTITY % InlSpecial.class
-     "| %img.qname; | %map.qname;
-      | %object.qname;" >
-
-<!ENTITY % InlForm.class
-     "| %input.qname; | %select.qname; | %textarea.qname;
-      | %label.qname; | %button.qname;" >
-
-<!ENTITY % Inline.extra "" >
-
-<!ENTITY % Ruby.class "| %ruby.qname;" >
-
-<!-- %Inline.class; includes all inline elements,
-     used as a component in mixes
--->
-<!ENTITY % Inline.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Ruby.class;
-      %Inline.extra;"
->
-
-<!-- %InlNoRuby.class; includes all inline elements
-     except ruby, used as a component in mixes
--->
-<!ENTITY % InlNoRuby.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Inline.extra;"
->
-
-<!-- %NoRuby.content; includes all inlines except ruby
--->
-<!ENTITY % NoRuby.content
-     "( #PCDATA
-      | %InlNoRuby.class;
-      %Misc.class; )*"
->
-
-<!-- %InlNoAnchor.class; includes all non-anchor inlines,
-     used as a component in mixes
--->
-<!ENTITY % InlNoAnchor.class
-     "%InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %InlSpecial.class;
-      %InlForm.class;
-      %Ruby.class;
-      %Inline.extra;"
->
-
-<!-- %InlNoAnchor.mix; includes all non-anchor inlines
--->
-<!ENTITY % InlNoAnchor.mix
-     "%InlNoAnchor.class;
-      %Misc.class;"
->
-
-<!-- %Inline.mix; includes all inline elements, including %Misc.class;
--->
-<!ENTITY % Inline.mix
-     "%Inline.class;
-      %Misc.class;"
->
-
-<!-- .....................  Block Elements  ...................... -->
-
-<!-- In the HTML 4.0 DTD, heading and list elements were included
-     in the %block; parameter entity. The %Heading.class; and
-     %List.class; parameter entities must now be included explicitly
-     on element declarations where desired.
--->
-
-<!ENTITY % Heading.class
-     "%h1.qname; | %h2.qname; | %h3.qname;
-      | %h4.qname; | %h5.qname; | %h6.qname;" >
-
-<!ENTITY % List.class "%ul.qname; | %ol.qname; | %dl.qname;" >
-
-<!ENTITY % Table.class "| %table.qname;" >
-
-<!ENTITY % Form.class  "| %form.qname;" >
-
-<!ENTITY % Fieldset.class  "| %fieldset.qname;" >
-
-<!ENTITY % BlkStruct.class "%p.qname; | %div.qname;" >
-
-<!ENTITY % BlkPhras.class
-     "| %pre.qname; | %blockquote.qname; | %address.qname;" >
-
-<!ENTITY % BlkPres.class "| %hr.qname;" >
-
-<!ENTITY % BlkSpecial.class
-     "%Table.class;
-      %Form.class;
-      %Fieldset.class;"
->
-
-<!ENTITY % Block.extra "" >
-
-<!-- %Block.class; includes all block elements,
-     used as an component in mixes
--->
-<!ENTITY % Block.class
-     "%BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %BlkSpecial.class;
-      %Block.extra;"
->
-
-<!-- %Block.mix; includes all block elements plus %Misc.class;
--->
-<!ENTITY % Block.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      %Misc.class;"
->
-
-<!-- ................  All Content Elements  .................. -->
-
-<!-- %Flow.mix; includes all text content, block and inline
--->
-<!ENTITY % Flow.mix
-     "%Heading.class;
-      | %List.class;
-      | %Block.class;
-      | %Inline.class;
-      %Misc.class;"
->
-
-<!-- end of xhtml11-model-1.mod -->
-]]>
-
-<!ENTITY % xhtml-charent.module "INCLUDE" >
-<![%xhtml-charent.module;[
-<!ENTITY % xhtml-charent.mod
-     PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-            "xhtml-charent-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Character Entities Module  ......................................... -->
-<!-- file: xhtml-charent-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ENTITIES XHTML Character Entities 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-charent-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Character Entities for XHTML
-
-     This module declares the set of character entities for XHTML,
-     including the Latin 1, Symbol and Special character collections.
--->
-
-<!ENTITY % xhtml-lat1
-    PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-           "xhtml-lat1.ent" >
-<!-- Portions (C) International Organization for Standardization 1986
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-<!-- Character entity set. Typical invocation:
-    <!ENTITY % HTMLlat1 PUBLIC
-       "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml-lat1.ent">
-    %HTMLlat1;
--->
-
-<!ENTITY nbsp   "&#160;"> <!-- no-break space = non-breaking space,
-                                  U+00A0 ISOnum -->
-<!ENTITY iexcl  "&#161;"> <!-- inverted exclamation mark, U+00A1 ISOnum -->
-<!ENTITY cent   "&#162;"> <!-- cent sign, U+00A2 ISOnum -->
-<!ENTITY pound  "&#163;"> <!-- pound sign, U+00A3 ISOnum -->
-<!ENTITY curren "&#164;"> <!-- currency sign, U+00A4 ISOnum -->
-<!ENTITY yen    "&#165;"> <!-- yen sign = yuan sign, U+00A5 ISOnum -->
-<!ENTITY brvbar "&#166;"> <!-- broken bar = broken vertical bar,
-                                  U+00A6 ISOnum -->
-<!ENTITY sect   "&#167;"> <!-- section sign, U+00A7 ISOnum -->
-<!ENTITY uml    "&#168;"> <!-- diaeresis = spacing diaeresis,
-                                  U+00A8 ISOdia -->
-<!ENTITY copy   "&#169;"> <!-- copyright sign, U+00A9 ISOnum -->
-<!ENTITY ordf   "&#170;"> <!-- feminine ordinal indicator, U+00AA ISOnum -->
-<!ENTITY laquo  "&#171;"> <!-- left-pointing double angle quotation mark
-                                  = left pointing guillemet, U+00AB ISOnum -->
-<!ENTITY not    "&#172;"> <!-- not sign = discretionary hyphen,
-                                  U+00AC ISOnum -->
-<!ENTITY shy    "&#173;"> <!-- soft hyphen = discretionary hyphen,
-                                  U+00AD ISOnum -->
-<!ENTITY reg    "&#174;"> <!-- registered sign = registered trade mark sign,
-                                  U+00AE ISOnum -->
-<!ENTITY macr   "&#175;"> <!-- macron = spacing macron = overline
-                                  = APL overbar, U+00AF ISOdia -->
-<!ENTITY deg    "&#176;"> <!-- degree sign, U+00B0 ISOnum -->
-<!ENTITY plusmn "&#177;"> <!-- plus-minus sign = plus-or-minus sign,
-                                  U+00B1 ISOnum -->
-<!ENTITY sup2   "&#178;"> <!-- superscript two = superscript digit two
-                                  = squared, U+00B2 ISOnum -->
-<!ENTITY sup3   "&#179;"> <!-- superscript three = superscript digit three
-                                  = cubed, U+00B3 ISOnum -->
-<!ENTITY acute  "&#180;"> <!-- acute accent = spacing acute,
-                                  U+00B4 ISOdia -->
-<!ENTITY micro  "&#181;"> <!-- micro sign, U+00B5 ISOnum -->
-<!ENTITY para   "&#182;"> <!-- pilcrow sign = paragraph sign,
-                                  U+00B6 ISOnum -->
-<!ENTITY middot "&#183;"> <!-- middle dot = Georgian comma
-                                  = Greek middle dot, U+00B7 ISOnum -->
-<!ENTITY cedil  "&#184;"> <!-- cedilla = spacing cedilla, U+00B8 ISOdia -->
-<!ENTITY sup1   "&#185;"> <!-- superscript one = superscript digit one,
-                                  U+00B9 ISOnum -->
-<!ENTITY ordm   "&#186;"> <!-- masculine ordinal indicator,
-                                  U+00BA ISOnum -->
-<!ENTITY raquo  "&#187;"> <!-- right-pointing double angle quotation mark
-                                  = right pointing guillemet, U+00BB ISOnum -->
-<!ENTITY frac14 "&#188;"> <!-- vulgar fraction one quarter
-                                  = fraction one quarter, U+00BC ISOnum -->
-<!ENTITY frac12 "&#189;"> <!-- vulgar fraction one half
-                                  = fraction one half, U+00BD ISOnum -->
-<!ENTITY frac34 "&#190;"> <!-- vulgar fraction three quarters
-                                  = fraction three quarters, U+00BE ISOnum -->
-<!ENTITY iquest "&#191;"> <!-- inverted question mark
-                                  = turned question mark, U+00BF ISOnum -->
-<!ENTITY Agrave "&#192;"> <!-- latin capital letter A with grave
-                                  = latin capital letter A grave,
-                                  U+00C0 ISOlat1 -->
-<!ENTITY Aacute "&#193;"> <!-- latin capital letter A with acute,
-                                  U+00C1 ISOlat1 -->
-<!ENTITY Acirc  "&#194;"> <!-- latin capital letter A with circumflex,
-                                  U+00C2 ISOlat1 -->
-<!ENTITY Atilde "&#195;"> <!-- latin capital letter A with tilde,
-                                  U+00C3 ISOlat1 -->
-<!ENTITY Auml   "&#196;"> <!-- latin capital letter A with diaeresis,
-                                  U+00C4 ISOlat1 -->
-<!ENTITY Aring  "&#197;"> <!-- latin capital letter A with ring above
-                                  = latin capital letter A ring,
-                                  U+00C5 ISOlat1 -->
-<!ENTITY AElig  "&#198;"> <!-- latin capital letter AE
-                                  = latin capital ligature AE,
-                                  U+00C6 ISOlat1 -->
-<!ENTITY Ccedil "&#199;"> <!-- latin capital letter C with cedilla,
-                                  U+00C7 ISOlat1 -->
-<!ENTITY Egrave "&#200;"> <!-- latin capital letter E with grave,
-                                  U+00C8 ISOlat1 -->
-<!ENTITY Eacute "&#201;"> <!-- latin capital letter E with acute,
-                                  U+00C9 ISOlat1 -->
-<!ENTITY Ecirc  "&#202;"> <!-- latin capital letter E with circumflex,
-                                  U+00CA ISOlat1 -->
-<!ENTITY Euml   "&#203;"> <!-- latin capital letter E with diaeresis,
-                                  U+00CB ISOlat1 -->
-<!ENTITY Igrave "&#204;"> <!-- latin capital letter I with grave,
-                                  U+00CC ISOlat1 -->
-<!ENTITY Iacute "&#205;"> <!-- latin capital letter I with acute,
-                                  U+00CD ISOlat1 -->
-<!ENTITY Icirc  "&#206;"> <!-- latin capital letter I with circumflex,
-                                  U+00CE ISOlat1 -->
-<!ENTITY Iuml   "&#207;"> <!-- latin capital letter I with diaeresis,
-                                  U+00CF ISOlat1 -->
-<!ENTITY ETH    "&#208;"> <!-- latin capital letter ETH, U+00D0 ISOlat1 -->
-<!ENTITY Ntilde "&#209;"> <!-- latin capital letter N with tilde,
-                                  U+00D1 ISOlat1 -->
-<!ENTITY Ograve "&#210;"> <!-- latin capital letter O with grave,
-                                  U+00D2 ISOlat1 -->
-<!ENTITY Oacute "&#211;"> <!-- latin capital letter O with acute,
-                                  U+00D3 ISOlat1 -->
-<!ENTITY Ocirc  "&#212;"> <!-- latin capital letter O with circumflex,
-                                  U+00D4 ISOlat1 -->
-<!ENTITY Otilde "&#213;"> <!-- latin capital letter O with tilde,
-                                  U+00D5 ISOlat1 -->
-<!ENTITY Ouml   "&#214;"> <!-- latin capital letter O with diaeresis,
-                                  U+00D6 ISOlat1 -->
-<!ENTITY times  "&#215;"> <!-- multiplication sign, U+00D7 ISOnum -->
-<!ENTITY Oslash "&#216;"> <!-- latin capital letter O with stroke
-                                  = latin capital letter O slash,
-                                  U+00D8 ISOlat1 -->
-<!ENTITY Ugrave "&#217;"> <!-- latin capital letter U with grave,
-                                  U+00D9 ISOlat1 -->
-<!ENTITY Uacute "&#218;"> <!-- latin capital letter U with acute,
-                                  U+00DA ISOlat1 -->
-<!ENTITY Ucirc  "&#219;"> <!-- latin capital letter U with circumflex,
-                                  U+00DB ISOlat1 -->
-<!ENTITY Uuml   "&#220;"> <!-- latin capital letter U with diaeresis,
-                                  U+00DC ISOlat1 -->
-<!ENTITY Yacute "&#221;"> <!-- latin capital letter Y with acute,
-                                  U+00DD ISOlat1 -->
-<!ENTITY THORN  "&#222;"> <!-- latin capital letter THORN,
-                                  U+00DE ISOlat1 -->
-<!ENTITY szlig  "&#223;"> <!-- latin small letter sharp s = ess-zed,
-                                  U+00DF ISOlat1 -->
-<!ENTITY agrave "&#224;"> <!-- latin small letter a with grave
-                                  = latin small letter a grave,
-                                  U+00E0 ISOlat1 -->
-<!ENTITY aacute "&#225;"> <!-- latin small letter a with acute,
-                                  U+00E1 ISOlat1 -->
-<!ENTITY acirc  "&#226;"> <!-- latin small letter a with circumflex,
-                                  U+00E2 ISOlat1 -->
-<!ENTITY atilde "&#227;"> <!-- latin small letter a with tilde,
-                                  U+00E3 ISOlat1 -->
-<!ENTITY auml   "&#228;"> <!-- latin small letter a with diaeresis,
-                                  U+00E4 ISOlat1 -->
-<!ENTITY aring  "&#229;"> <!-- latin small letter a with ring above
-                                  = latin small letter a ring,
-                                  U+00E5 ISOlat1 -->
-<!ENTITY aelig  "&#230;"> <!-- latin small letter ae
-                                  = latin small ligature ae, U+00E6 ISOlat1 -->
-<!ENTITY ccedil "&#231;"> <!-- latin small letter c with cedilla,
-                                  U+00E7 ISOlat1 -->
-<!ENTITY egrave "&#232;"> <!-- latin small letter e with grave,
-                                  U+00E8 ISOlat1 -->
-<!ENTITY eacute "&#233;"> <!-- latin small letter e with acute,
-                                  U+00E9 ISOlat1 -->
-<!ENTITY ecirc  "&#234;"> <!-- latin small letter e with circumflex,
-                                  U+00EA ISOlat1 -->
-<!ENTITY euml   "&#235;"> <!-- latin small letter e with diaeresis,
-                                  U+00EB ISOlat1 -->
-<!ENTITY igrave "&#236;"> <!-- latin small letter i with grave,
-                                  U+00EC ISOlat1 -->
-<!ENTITY iacute "&#237;"> <!-- latin small letter i with acute,
-                                  U+00ED ISOlat1 -->
-<!ENTITY icirc  "&#238;"> <!-- latin small letter i with circumflex,
-                                  U+00EE ISOlat1 -->
-<!ENTITY iuml   "&#239;"> <!-- latin small letter i with diaeresis,
-                                  U+00EF ISOlat1 -->
-<!ENTITY eth    "&#240;"> <!-- latin small letter eth, U+00F0 ISOlat1 -->
-<!ENTITY ntilde "&#241;"> <!-- latin small letter n with tilde,
-                                  U+00F1 ISOlat1 -->
-<!ENTITY ograve "&#242;"> <!-- latin small letter o with grave,
-                                  U+00F2 ISOlat1 -->
-<!ENTITY oacute "&#243;"> <!-- latin small letter o with acute,
-                                  U+00F3 ISOlat1 -->
-<!ENTITY ocirc  "&#244;"> <!-- latin small letter o with circumflex,
-                                  U+00F4 ISOlat1 -->
-<!ENTITY otilde "&#245;"> <!-- latin small letter o with tilde,
-                                  U+00F5 ISOlat1 -->
-<!ENTITY ouml   "&#246;"> <!-- latin small letter o with diaeresis,
-                                  U+00F6 ISOlat1 -->
-<!ENTITY divide "&#247;"> <!-- division sign, U+00F7 ISOnum -->
-<!ENTITY oslash "&#248;"> <!-- latin small letter o with stroke,
-                                  = latin small letter o slash,
-                                  U+00F8 ISOlat1 -->
-<!ENTITY ugrave "&#249;"> <!-- latin small letter u with grave,
-                                  U+00F9 ISOlat1 -->
-<!ENTITY uacute "&#250;"> <!-- latin small letter u with acute,
-                                  U+00FA ISOlat1 -->
-<!ENTITY ucirc  "&#251;"> <!-- latin small letter u with circumflex,
-                                  U+00FB ISOlat1 -->
-<!ENTITY uuml   "&#252;"> <!-- latin small letter u with diaeresis,
-                                  U+00FC ISOlat1 -->
-<!ENTITY yacute "&#253;"> <!-- latin small letter y with acute,
-                                  U+00FD ISOlat1 -->
-<!ENTITY thorn  "&#254;"> <!-- latin small letter thorn with,
-                                  U+00FE ISOlat1 -->
-<!ENTITY yuml   "&#255;"> <!-- latin small letter y with diaeresis,
-                                  U+00FF ISOlat1 -->
-
-
-<!ENTITY % xhtml-symbol
-    PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-           "xhtml-symbol.ent" >
-<!-- Mathematical, Greek and Symbolic characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLsymbol PUBLIC
-        "-//W3C//ENTITIES Symbols for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-symbol.ent">
-     %HTMLsymbol;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- Latin Extended-B -->
-<!ENTITY fnof     "&#402;"> <!-- latin small f with hook = function
-                                    = florin, U+0192 ISOtech -->
-
-<!-- Greek -->
-<!ENTITY Alpha    "&#913;"> <!-- greek capital letter alpha, U+0391 -->
-<!ENTITY Beta     "&#914;"> <!-- greek capital letter beta, U+0392 -->
-<!ENTITY Gamma    "&#915;"> <!-- greek capital letter gamma,
-                                    U+0393 ISOgrk3 -->
-<!ENTITY Delta    "&#916;"> <!-- greek capital letter delta,
-                                    U+0394 ISOgrk3 -->
-<!ENTITY Epsilon  "&#917;"> <!-- greek capital letter epsilon, U+0395 -->
-<!ENTITY Zeta     "&#918;"> <!-- greek capital letter zeta, U+0396 -->
-<!ENTITY Eta      "&#919;"> <!-- greek capital letter eta, U+0397 -->
-<!ENTITY Theta    "&#920;"> <!-- greek capital letter theta,
-                                    U+0398 ISOgrk3 -->
-<!ENTITY Iota     "&#921;"> <!-- greek capital letter iota, U+0399 -->
-<!ENTITY Kappa    "&#922;"> <!-- greek capital letter kappa, U+039A -->
-<!ENTITY Lambda   "&#923;"> <!-- greek capital letter lambda,
-                                    U+039B ISOgrk3 -->
-<!ENTITY Mu       "&#924;"> <!-- greek capital letter mu, U+039C -->
-<!ENTITY Nu       "&#925;"> <!-- greek capital letter nu, U+039D -->
-<!ENTITY Xi       "&#926;"> <!-- greek capital letter xi, U+039E ISOgrk3 -->
-<!ENTITY Omicron  "&#927;"> <!-- greek capital letter omicron, U+039F -->
-<!ENTITY Pi       "&#928;"> <!-- greek capital letter pi, U+03A0 ISOgrk3 -->
-<!ENTITY Rho      "&#929;"> <!-- greek capital letter rho, U+03A1 -->
-<!-- there is no Sigmaf, and no U+03A2 character either -->
-<!ENTITY Sigma    "&#931;"> <!-- greek capital letter sigma,
-                                    U+03A3 ISOgrk3 -->
-<!ENTITY Tau      "&#932;"> <!-- greek capital letter tau, U+03A4 -->
-<!ENTITY Upsilon  "&#933;"> <!-- greek capital letter upsilon,
-                                    U+03A5 ISOgrk3 -->
-<!ENTITY Phi      "&#934;"> <!-- greek capital letter phi,
-                                    U+03A6 ISOgrk3 -->
-<!ENTITY Chi      "&#935;"> <!-- greek capital letter chi, U+03A7 -->
-<!ENTITY Psi      "&#936;"> <!-- greek capital letter psi,
-                                    U+03A8 ISOgrk3 -->
-<!ENTITY Omega    "&#937;"> <!-- greek capital letter omega,
-                                    U+03A9 ISOgrk3 -->
-
-<!ENTITY alpha    "&#945;"> <!-- greek small letter alpha,
-                                    U+03B1 ISOgrk3 -->
-<!ENTITY beta     "&#946;"> <!-- greek small letter beta, U+03B2 ISOgrk3 -->
-<!ENTITY gamma    "&#947;"> <!-- greek small letter gamma,
-                                    U+03B3 ISOgrk3 -->
-<!ENTITY delta    "&#948;"> <!-- greek small letter delta,
-                                    U+03B4 ISOgrk3 -->
-<!ENTITY epsilon  "&#949;"> <!-- greek small letter epsilon,
-                                    U+03B5 ISOgrk3 -->
-<!ENTITY zeta     "&#950;"> <!-- greek small letter zeta, U+03B6 ISOgrk3 -->
-<!ENTITY eta      "&#951;"> <!-- greek small letter eta, U+03B7 ISOgrk3 -->
-<!ENTITY theta    "&#952;"> <!-- greek small letter theta,
-                                    U+03B8 ISOgrk3 -->
-<!ENTITY iota     "&#953;"> <!-- greek small letter iota, U+03B9 ISOgrk3 -->
-<!ENTITY kappa    "&#954;"> <!-- greek small letter kappa,
-                                    U+03BA ISOgrk3 -->
-<!ENTITY lambda   "&#955;"> <!-- greek small letter lambda,
-                                    U+03BB ISOgrk3 -->
-<!ENTITY mu       "&#956;"> <!-- greek small letter mu, U+03BC ISOgrk3 -->
-<!ENTITY nu       "&#957;"> <!-- greek small letter nu, U+03BD ISOgrk3 -->
-<!ENTITY xi       "&#958;"> <!-- greek small letter xi, U+03BE ISOgrk3 -->
-<!ENTITY omicron  "&#959;"> <!-- greek small letter omicron, U+03BF NEW -->
-<!ENTITY pi       "&#960;"> <!-- greek small letter pi, U+03C0 ISOgrk3 -->
-<!ENTITY rho      "&#961;"> <!-- greek small letter rho, U+03C1 ISOgrk3 -->
-<!ENTITY sigmaf   "&#962;"> <!-- greek small letter final sigma,
-                                    U+03C2 ISOgrk3 -->
-<!ENTITY sigma    "&#963;"> <!-- greek small letter sigma,
-                                    U+03C3 ISOgrk3 -->
-<!ENTITY tau      "&#964;"> <!-- greek small letter tau, U+03C4 ISOgrk3 -->
-<!ENTITY upsilon  "&#965;"> <!-- greek small letter upsilon,
-                                    U+03C5 ISOgrk3 -->
-<!ENTITY phi      "&#966;"> <!-- greek small letter phi, U+03C6 ISOgrk3 -->
-<!ENTITY chi      "&#967;"> <!-- greek small letter chi, U+03C7 ISOgrk3 -->
-<!ENTITY psi      "&#968;"> <!-- greek small letter psi, U+03C8 ISOgrk3 -->
-<!ENTITY omega    "&#969;"> <!-- greek small letter omega,
-                                    U+03C9 ISOgrk3 -->
-<!ENTITY thetasym "&#977;"> <!-- greek small letter theta symbol,
-                                    U+03D1 NEW -->
-<!ENTITY upsih    "&#978;"> <!-- greek upsilon with hook symbol,
-                                    U+03D2 NEW -->
-<!ENTITY piv      "&#982;"> <!-- greek pi symbol, U+03D6 ISOgrk3 -->
-
-<!-- General Punctuation -->
-<!ENTITY bull     "&#8226;"> <!-- bullet = black small circle,
-                                     U+2022 ISOpub  -->
-<!-- bullet is NOT the same as bullet operator, U+2219 -->
-<!ENTITY hellip   "&#8230;"> <!-- horizontal ellipsis = three dot leader,
-                                     U+2026 ISOpub  -->
-<!ENTITY prime    "&#8242;"> <!-- prime = minutes = feet, U+2032 ISOtech -->
-<!ENTITY Prime    "&#8243;"> <!-- double prime = seconds = inches,
-                                     U+2033 ISOtech -->
-<!ENTITY oline    "&#8254;"> <!-- overline = spacing overscore,
-                                     U+203E NEW -->
-<!ENTITY frasl    "&#8260;"> <!-- fraction slash, U+2044 NEW -->
-
-<!-- Letterlike Symbols -->
-<!ENTITY weierp   "&#8472;"> <!-- script capital P = power set
-                                     = Weierstrass p, U+2118 ISOamso -->
-<!ENTITY image    "&#8465;"> <!-- blackletter capital I = imaginary part,
-                                     U+2111 ISOamso -->
-<!ENTITY real     "&#8476;"> <!-- blackletter capital R = real part symbol,
-                                     U+211C ISOamso -->
-<!ENTITY trade    "&#8482;"> <!-- trade mark sign, U+2122 ISOnum -->
-<!ENTITY alefsym  "&#8501;"> <!-- alef symbol = first transfinite cardinal,
-                                     U+2135 NEW -->
-<!-- alef symbol is NOT the same as hebrew letter alef,
-     U+05D0 although the same glyph could be used to depict both characters -->
-
-<!-- Arrows -->
-<!ENTITY larr     "&#8592;"> <!-- leftwards arrow, U+2190 ISOnum -->
-<!ENTITY uarr     "&#8593;"> <!-- upwards arrow, U+2191 ISOnum-->
-<!ENTITY rarr     "&#8594;"> <!-- rightwards arrow, U+2192 ISOnum -->
-<!ENTITY darr     "&#8595;"> <!-- downwards arrow, U+2193 ISOnum -->
-<!ENTITY harr     "&#8596;"> <!-- left right arrow, U+2194 ISOamsa -->
-<!ENTITY crarr    "&#8629;"> <!-- downwards arrow with corner leftwards
-                                     = carriage return, U+21B5 NEW -->
-<!ENTITY lArr     "&#8656;"> <!-- leftwards double arrow, U+21D0 ISOtech -->
-<!-- Unicode does not say that lArr is the same as the 'is implied by' arrow
-    but also does not have any other character for that function. So ? lArr can
-    be used for 'is implied by' as ISOtech suggests -->
-<!ENTITY uArr     "&#8657;"> <!-- upwards double arrow, U+21D1 ISOamsa -->
-<!ENTITY rArr     "&#8658;"> <!-- rightwards double arrow,
-                                     U+21D2 ISOtech -->
-<!-- Unicode does not say this is the 'implies' character but does not have 
-     another character with this function so ?
-     rArr can be used for 'implies' as ISOtech suggests -->
-<!ENTITY dArr     "&#8659;"> <!-- downwards double arrow, U+21D3 ISOamsa -->
-<!ENTITY hArr     "&#8660;"> <!-- left right double arrow,
-                                     U+21D4 ISOamsa -->
-
-<!-- Mathematical Operators -->
-<!ENTITY forall   "&#8704;"> <!-- for all, U+2200 ISOtech -->
-<!ENTITY part     "&#8706;"> <!-- partial differential, U+2202 ISOtech  -->
-<!ENTITY exist    "&#8707;"> <!-- there exists, U+2203 ISOtech -->
-<!ENTITY empty    "&#8709;"> <!-- empty set = null set = diameter,
-                                     U+2205 ISOamso -->
-<!ENTITY nabla    "&#8711;"> <!-- nabla = backward difference,
-                                     U+2207 ISOtech -->
-<!ENTITY isin     "&#8712;"> <!-- element of, U+2208 ISOtech -->
-<!ENTITY notin    "&#8713;"> <!-- not an element of, U+2209 ISOtech -->
-<!ENTITY ni       "&#8715;"> <!-- contains as member, U+220B ISOtech -->
-<!-- should there be a more memorable name than 'ni'? -->
-<!ENTITY prod     "&#8719;"> <!-- n-ary product = product sign,
-                                     U+220F ISOamsb -->
-<!-- prod is NOT the same character as U+03A0 'greek capital letter pi' though
-     the same glyph might be used for both -->
-<!ENTITY sum      "&#8721;"> <!-- n-ary sumation, U+2211 ISOamsb -->
-<!-- sum is NOT the same character as U+03A3 'greek capital letter sigma'
-     though the same glyph might be used for both -->
-<!ENTITY minus    "&#8722;"> <!-- minus sign, U+2212 ISOtech -->
-<!ENTITY lowast   "&#8727;"> <!-- asterisk operator, U+2217 ISOtech -->
-<!ENTITY radic    "&#8730;"> <!-- square root = radical sign,
-                                     U+221A ISOtech -->
-<!ENTITY prop     "&#8733;"> <!-- proportional to, U+221D ISOtech -->
-<!ENTITY infin    "&#8734;"> <!-- infinity, U+221E ISOtech -->
-<!ENTITY ang      "&#8736;"> <!-- angle, U+2220 ISOamso -->
-<!ENTITY and      "&#8743;"> <!-- logical and = wedge, U+2227 ISOtech -->
-<!ENTITY or       "&#8744;"> <!-- logical or = vee, U+2228 ISOtech -->
-<!ENTITY cap      "&#8745;"> <!-- intersection = cap, U+2229 ISOtech -->
-<!ENTITY cup      "&#8746;"> <!-- union = cup, U+222A ISOtech -->
-<!ENTITY int      "&#8747;"> <!-- integral, U+222B ISOtech -->
-<!ENTITY there4   "&#8756;"> <!-- therefore, U+2234 ISOtech -->
-<!ENTITY sim      "&#8764;"> <!-- tilde operator = varies with = similar to,
-                                     U+223C ISOtech -->
-<!-- tilde operator is NOT the same character as the tilde, U+007E,
-     although the same glyph might be used to represent both  -->
-<!ENTITY cong     "&#8773;"> <!-- approximately equal to, U+2245 ISOtech -->
-<!ENTITY asymp    "&#8776;"> <!-- almost equal to = asymptotic to,
-                                     U+2248 ISOamsr -->
-<!ENTITY ne       "&#8800;"> <!-- not equal to, U+2260 ISOtech -->
-<!ENTITY equiv    "&#8801;"> <!-- identical to, U+2261 ISOtech -->
-<!ENTITY le       "&#8804;"> <!-- less-than or equal to, U+2264 ISOtech -->
-<!ENTITY ge       "&#8805;"> <!-- greater-than or equal to,
-                                     U+2265 ISOtech -->
-<!ENTITY sub      "&#8834;"> <!-- subset of, U+2282 ISOtech -->
-<!ENTITY sup      "&#8835;"> <!-- superset of, U+2283 ISOtech -->
-<!-- note that nsup, 'not a superset of, U+2283' is not covered by the Symbol 
-     font encoding and is not included. Should it be, for symmetry?
-     It is in ISOamsn  --> 
-<!ENTITY nsub     "&#8836;"> <!-- not a subset of, U+2284 ISOamsn -->
-<!ENTITY sube     "&#8838;"> <!-- subset of or equal to, U+2286 ISOtech -->
-<!ENTITY supe     "&#8839;"> <!-- superset of or equal to,
-                                     U+2287 ISOtech -->
-<!ENTITY oplus    "&#8853;"> <!-- circled plus = direct sum,
-                                     U+2295 ISOamsb -->
-<!ENTITY otimes   "&#8855;"> <!-- circled times = vector product,
-                                     U+2297 ISOamsb -->
-<!ENTITY perp     "&#8869;"> <!-- up tack = orthogonal to = perpendicular,
-                                     U+22A5 ISOtech -->
-<!ENTITY sdot     "&#8901;"> <!-- dot operator, U+22C5 ISOamsb -->
-<!-- dot operator is NOT the same character as U+00B7 middle dot -->
-
-<!-- Miscellaneous Technical -->
-<!ENTITY lceil    "&#8968;"> <!-- left ceiling = apl upstile,
-                                     U+2308 ISOamsc  -->
-<!ENTITY rceil    "&#8969;"> <!-- right ceiling, U+2309 ISOamsc  -->
-<!ENTITY lfloor   "&#8970;"> <!-- left floor = apl downstile,
-                                     U+230A ISOamsc  -->
-<!ENTITY rfloor   "&#8971;"> <!-- right floor, U+230B ISOamsc  -->
-<!ENTITY lang     "&#9001;"> <!-- left-pointing angle bracket = bra,
-                                     U+2329 ISOtech -->
-<!-- lang is NOT the same character as U+003C 'less than' 
-     or U+2039 'single left-pointing angle quotation mark' -->
-<!ENTITY rang     "&#9002;"> <!-- right-pointing angle bracket = ket,
-                                     U+232A ISOtech -->
-<!-- rang is NOT the same character as U+003E 'greater than' 
-     or U+203A 'single right-pointing angle quotation mark' -->
-
-<!-- Geometric Shapes -->
-<!ENTITY loz      "&#9674;"> <!-- lozenge, U+25CA ISOpub -->
-
-<!-- Miscellaneous Symbols -->
-<!ENTITY spades   "&#9824;"> <!-- black spade suit, U+2660 ISOpub -->
-<!-- black here seems to mean filled as opposed to hollow -->
-<!ENTITY clubs    "&#9827;"> <!-- black club suit = shamrock,
-                                     U+2663 ISOpub -->
-<!ENTITY hearts   "&#9829;"> <!-- black heart suit = valentine,
-                                     U+2665 ISOpub -->
-<!ENTITY diams    "&#9830;"> <!-- black diamond suit, U+2666 ISOpub -->
-
-
-<!ENTITY % xhtml-special
-    PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-           "xhtml-special.ent" >
-<!-- Special characters for HTML -->
-
-<!-- Character entity set. Typical invocation:
-     <!ENTITY % HTMLspecial PUBLIC
-        "-//W3C//ENTITIES Special for XHTML//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent">
-     %HTMLspecial;
--->
-
-<!-- Portions (C) International Organization for Standardization 1986:
-     Permission to copy in any form is granted for use with
-     conforming SGML systems and applications as defined in
-     ISO 8879, provided this notice is included in all copies.
--->
-
-<!-- Relevant ISO entity set is given unless names are newly introduced.
-     New names (i.e., not in ISO 8879 list) do not clash with any
-     existing ISO 8879 entity names. ISO 10646 character numbers
-     are given for each character, in hex. values are decimal
-     conversions of the ISO 10646 values and refer to the document
-     character set. Names are Unicode names. 
--->
-
-<!-- C0 Controls and Basic Latin -->
-<!ENTITY quot    "&#34;"> <!--  quotation mark = APL quote,
-                                    U+0022 ISOnum -->
-<!ENTITY amp     "&#38;#38;"> <!--  ampersand, U+0026 ISOnum -->
-<!ENTITY lt      "&#38;#60;"> <!--  less-than sign, U+003C ISOnum -->
-<!ENTITY gt      "&#62;"> <!--  greater-than sign, U+003E ISOnum -->
-<!ENTITY apos	 "&#39;"> <!--  apostrophe mark, U+0027 ISOnum -->
-
-<!-- Latin Extended-A -->
-<!ENTITY OElig   "&#338;"> <!--  latin capital ligature OE,
-                                    U+0152 ISOlat2 -->
-<!ENTITY oelig   "&#339;"> <!--  latin small ligature oe, U+0153 ISOlat2 -->
-<!-- ligature is a misnomer, this is a separate character in some languages -->
-<!ENTITY Scaron  "&#352;"> <!--  latin capital letter S with caron,
-                                    U+0160 ISOlat2 -->
-<!ENTITY scaron  "&#353;"> <!--  latin small letter s with caron,
-                                    U+0161 ISOlat2 -->
-<!ENTITY Yuml    "&#376;"> <!--  latin capital letter Y with diaeresis,
-                                    U+0178 ISOlat2 -->
-
-<!-- Spacing Modifier Letters -->
-<!ENTITY circ    "&#710;"> <!--  modifier letter circumflex accent,
-                                    U+02C6 ISOpub -->
-<!ENTITY tilde   "&#732;"> <!--  small tilde, U+02DC ISOdia -->
-
-<!-- General Punctuation -->
-<!ENTITY ensp    "&#8194;"> <!-- en space, U+2002 ISOpub -->
-<!ENTITY emsp    "&#8195;"> <!-- em space, U+2003 ISOpub -->
-<!ENTITY thinsp  "&#8201;"> <!-- thin space, U+2009 ISOpub -->
-<!ENTITY zwnj    "&#8204;"> <!-- zero width non-joiner,
-                                    U+200C NEW RFC 2070 -->
-<!ENTITY zwj     "&#8205;"> <!-- zero width joiner, U+200D NEW RFC 2070 -->
-<!ENTITY lrm     "&#8206;"> <!-- left-to-right mark, U+200E NEW RFC 2070 -->
-<!ENTITY rlm     "&#8207;"> <!-- right-to-left mark, U+200F NEW RFC 2070 -->
-<!ENTITY ndash   "&#8211;"> <!-- en dash, U+2013 ISOpub -->
-<!ENTITY mdash   "&#8212;"> <!-- em dash, U+2014 ISOpub -->
-<!ENTITY lsquo   "&#8216;"> <!-- left single quotation mark,
-                                    U+2018 ISOnum -->
-<!ENTITY rsquo   "&#8217;"> <!-- right single quotation mark,
-                                    U+2019 ISOnum -->
-<!ENTITY sbquo   "&#8218;"> <!-- single low-9 quotation mark, U+201A NEW -->
-<!ENTITY ldquo   "&#8220;"> <!-- left double quotation mark,
-                                    U+201C ISOnum -->
-<!ENTITY rdquo   "&#8221;"> <!-- right double quotation mark,
-                                    U+201D ISOnum -->
-<!ENTITY bdquo   "&#8222;"> <!-- double low-9 quotation mark, U+201E NEW -->
-<!ENTITY dagger  "&#8224;"> <!-- dagger, U+2020 ISOpub -->
-<!ENTITY Dagger  "&#8225;"> <!-- double dagger, U+2021 ISOpub -->
-<!ENTITY permil  "&#8240;"> <!-- per mille sign, U+2030 ISOtech -->
-<!ENTITY lsaquo  "&#8249;"> <!-- single left-pointing angle quotation mark,
-                                    U+2039 ISO proposed -->
-<!-- lsaquo is proposed but not yet ISO standardized -->
-<!ENTITY rsaquo  "&#8250;"> <!-- single right-pointing angle quotation mark,
-                                    U+203A ISO proposed -->
-<!-- rsaquo is proposed but not yet ISO standardized -->
-<!ENTITY euro   "&#8364;"> <!--  euro sign, U+20AC NEW -->
-
-
-<!-- end of xhtml-charent-1.mod -->
-]]>
-
-<!-- end of xhtml-framework-1.mod -->
-]]>
-
-<!-- Post-Framework Redeclaration placeholder  ................... -->
-<!-- this serves as a location to insert markup declarations
-     into the DTD following the framework declarations.
--->
-<!ENTITY % xhtml-postfw-redecl.module "IGNORE" >
-<![%xhtml-postfw-redecl.module;[
-%xhtml-postfw-redecl.mod;
-<!-- end of xhtml-postfw-redecl.module -->]]>
-
-<!-- Text Module (Required)  ..................................... -->
-<!ENTITY % xhtml-text.module "INCLUDE" >
-<![%xhtml-text.module;[
-<!ENTITY % xhtml-text.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Text Module  ................................................... -->
-<!-- file: xhtml-text-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Text 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-text-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Textual Content
-
-     The Text module includes declarations for all core
-     text container elements and their attributes.
--->
-
-<!ENTITY % xhtml-inlstruct.module "INCLUDE" >
-<![%xhtml-inlstruct.module;[
-<!ENTITY % xhtml-inlstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-            "xhtml-inlstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Structural Module  ...................................... -->
-<!-- file: xhtml-inlstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Structural
-
-        br, span
-
-     This module declares the elements and their attributes
-     used to support inline-level structural markup.
--->
-
-<!-- br: forced line break ............................. -->
-
-<!ENTITY % br.element  "INCLUDE" >
-<![%br.element;[
-
-<!ENTITY % br.content  "EMPTY" >
-<!ENTITY % br.qname  "br" >
-<!ELEMENT %br.qname;  %br.content; >
-
-<!-- end of br.element -->]]>
-
-<!ENTITY % br.attlist  "INCLUDE" >
-<![%br.attlist;[
-<!ATTLIST %br.qname;
-      %Core.attrib;
->
-<!-- end of br.attlist -->]]>
-
-<!-- span: generic inline container .................... -->
-
-<!ENTITY % span.element  "INCLUDE" >
-<![%span.element;[
-<!ENTITY % span.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % span.qname  "span" >
-<!ELEMENT %span.qname;  %span.content; >
-<!-- end of span.element -->]]>
-
-<!ENTITY % span.attlist  "INCLUDE" >
-<![%span.attlist;[
-<!ATTLIST %span.qname;
-      %Common.attrib;
->
-<!-- end of span.attlist -->]]>
-
-<!-- end of xhtml-inlstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-inlphras.module "INCLUDE" >
-<![%xhtml-inlphras.module;[
-<!ENTITY % xhtml-inlphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-            "xhtml-inlphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Phrasal Module  ......................................... -->
-<!-- file: xhtml-inlphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Phrasal
-
-        abbr, acronym, cite, code, dfn, em, kbd, q, samp, strong, var
-
-     This module declares the elements and their attributes used to
-     support inline-level phrasal markup.
--->
-
-<!ENTITY % abbr.element  "INCLUDE" >
-<![%abbr.element;[
-<!ENTITY % abbr.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % abbr.qname  "abbr" >
-<!ELEMENT %abbr.qname;  %abbr.content; >
-<!-- end of abbr.element -->]]>
-
-<!ENTITY % abbr.attlist  "INCLUDE" >
-<![%abbr.attlist;[
-<!ATTLIST %abbr.qname;
-      %Common.attrib;
->
-<!-- end of abbr.attlist -->]]>
-
-<!ENTITY % acronym.element  "INCLUDE" >
-<![%acronym.element;[
-<!ENTITY % acronym.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % acronym.qname  "acronym" >
-<!ELEMENT %acronym.qname;  %acronym.content; >
-<!-- end of acronym.element -->]]>
-
-<!ENTITY % acronym.attlist  "INCLUDE" >
-<![%acronym.attlist;[
-<!ATTLIST %acronym.qname;
-      %Common.attrib;
->
-<!-- end of acronym.attlist -->]]>
-
-<!ENTITY % cite.element  "INCLUDE" >
-<![%cite.element;[
-<!ENTITY % cite.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % cite.qname  "cite" >
-<!ELEMENT %cite.qname;  %cite.content; >
-<!-- end of cite.element -->]]>
-
-<!ENTITY % cite.attlist  "INCLUDE" >
-<![%cite.attlist;[
-<!ATTLIST %cite.qname;
-      %Common.attrib;
->
-<!-- end of cite.attlist -->]]>
-
-<!ENTITY % code.element  "INCLUDE" >
-<![%code.element;[
-<!ENTITY % code.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % code.qname  "code" >
-<!ELEMENT %code.qname;  %code.content; >
-<!-- end of code.element -->]]>
-
-<!ENTITY % code.attlist  "INCLUDE" >
-<![%code.attlist;[
-<!ATTLIST %code.qname;
-      %Common.attrib;
->
-<!-- end of code.attlist -->]]>
-
-<!ENTITY % dfn.element  "INCLUDE" >
-<![%dfn.element;[
-<!ENTITY % dfn.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % dfn.qname  "dfn" >
-<!ELEMENT %dfn.qname;  %dfn.content; >
-<!-- end of dfn.element -->]]>
-
-<!ENTITY % dfn.attlist  "INCLUDE" >
-<![%dfn.attlist;[
-<!ATTLIST %dfn.qname;
-      %Common.attrib;
->
-<!-- end of dfn.attlist -->]]>
-
-<!ENTITY % em.element  "INCLUDE" >
-<![%em.element;[
-<!ENTITY % em.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % em.qname  "em" >
-<!ELEMENT %em.qname;  %em.content; >
-<!-- end of em.element -->]]>
-
-<!ENTITY % em.attlist  "INCLUDE" >
-<![%em.attlist;[
-<!ATTLIST %em.qname;
-      %Common.attrib;
->
-<!-- end of em.attlist -->]]>
-
-<!ENTITY % kbd.element  "INCLUDE" >
-<![%kbd.element;[
-<!ENTITY % kbd.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % kbd.qname  "kbd" >
-<!ELEMENT %kbd.qname;  %kbd.content; >
-<!-- end of kbd.element -->]]>
-
-<!ENTITY % kbd.attlist  "INCLUDE" >
-<![%kbd.attlist;[
-<!ATTLIST %kbd.qname;
-      %Common.attrib;
->
-<!-- end of kbd.attlist -->]]>
-
-<!ENTITY % q.element  "INCLUDE" >
-<![%q.element;[
-<!ENTITY % q.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % q.qname  "q" >
-<!ELEMENT %q.qname;  %q.content; >
-<!-- end of q.element -->]]>
-
-<!ENTITY % q.attlist  "INCLUDE" >
-<![%q.attlist;[
-<!ATTLIST %q.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of q.attlist -->]]>
-
-<!ENTITY % samp.element  "INCLUDE" >
-<![%samp.element;[
-<!ENTITY % samp.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % samp.qname  "samp" >
-<!ELEMENT %samp.qname;  %samp.content; >
-<!-- end of samp.element -->]]>
-
-<!ENTITY % samp.attlist  "INCLUDE" >
-<![%samp.attlist;[
-<!ATTLIST %samp.qname;
-      %Common.attrib;
->
-<!-- end of samp.attlist -->]]>
-
-<!ENTITY % strong.element  "INCLUDE" >
-<![%strong.element;[
-<!ENTITY % strong.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % strong.qname  "strong" >
-<!ELEMENT %strong.qname;  %strong.content; >
-<!-- end of strong.element -->]]>
-
-<!ENTITY % strong.attlist  "INCLUDE" >
-<![%strong.attlist;[
-<!ATTLIST %strong.qname;
-      %Common.attrib;
->
-<!-- end of strong.attlist -->]]>
-
-<!ENTITY % var.element  "INCLUDE" >
-<![%var.element;[
-<!ENTITY % var.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % var.qname  "var" >
-<!ELEMENT %var.qname;  %var.content; >
-<!-- end of var.element -->]]>
-
-<!ENTITY % var.attlist  "INCLUDE" >
-<![%var.attlist;[
-<!ATTLIST %var.qname;
-      %Common.attrib;
->
-<!-- end of var.attlist -->]]>
-
-<!-- end of xhtml-inlphras-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkstruct.module "INCLUDE" >
-<![%xhtml-blkstruct.module;[
-<!ENTITY % xhtml-blkstruct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-            "xhtml-blkstruct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Structural Module  ....................................... -->
-<!-- file: xhtml-blkstruct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Structural 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkstruct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Structural
-
-        div, p
-
-     This module declares the elements and their attributes used to
-     support block-level structural markup.
--->
-
-<!ENTITY % div.element  "INCLUDE" >
-<![%div.element;[
-<!ENTITY % div.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % div.qname  "div" >
-<!ELEMENT %div.qname;  %div.content; >
-<!-- end of div.element -->]]>
-
-<!ENTITY % div.attlist  "INCLUDE" >
-<![%div.attlist;[
-<!ATTLIST %div.qname;
-      %Common.attrib;
->
-<!-- end of div.attlist -->]]>
-
-<!ENTITY % p.element  "INCLUDE" >
-<![%p.element;[
-<!ENTITY % p.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % p.qname  "p" >
-<!ELEMENT %p.qname;  %p.content; >
-<!-- end of p.element -->]]>
-
-<!ENTITY % p.attlist  "INCLUDE" >
-<![%p.attlist;[
-<!ATTLIST %p.qname;
-      %Common.attrib;
->
-<!-- end of p.attlist -->]]>
-
-<!-- end of xhtml-blkstruct-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkphras.module "INCLUDE" >
-<![%xhtml-blkphras.module;[
-<!ENTITY % xhtml-blkphras.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-            "xhtml-blkphras-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Phrasal Module  .......................................... -->
-<!-- file: xhtml-blkphras-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Phrasal 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkphras-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Phrasal
-
-        address, blockquote, pre, h1, h2, h3, h4, h5, h6
-
-     This module declares the elements and their attributes used to
-     support block-level phrasal markup.
--->
-
-<!ENTITY % address.element  "INCLUDE" >
-<![%address.element;[
-<!ENTITY % address.content
-     "( #PCDATA | %Inline.mix; )*" >
-<!ENTITY % address.qname  "address" >
-<!ELEMENT %address.qname;  %address.content; >
-<!-- end of address.element -->]]>
-
-<!ENTITY % address.attlist  "INCLUDE" >
-<![%address.attlist;[
-<!ATTLIST %address.qname;
-      %Common.attrib;
->
-<!-- end of address.attlist -->]]>
-
-<!ENTITY % blockquote.element  "INCLUDE" >
-<![%blockquote.element;[
-<!ENTITY % blockquote.content
-     "( %Block.mix; )+"
->
-<!ENTITY % blockquote.qname  "blockquote" >
-<!ELEMENT %blockquote.qname;  %blockquote.content; >
-<!-- end of blockquote.element -->]]>
-
-<!ENTITY % blockquote.attlist  "INCLUDE" >
-<![%blockquote.attlist;[
-<!ATTLIST %blockquote.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
->
-<!-- end of blockquote.attlist -->]]>
-
-<!ENTITY % pre.element  "INCLUDE" >
-<![%pre.element;[
-<!ENTITY % pre.content
-     "( #PCDATA
-      | %InlStruct.class;
-      %InlPhras.class;
-      | %tt.qname; | %i.qname; | %b.qname;
-      %I18n.class;
-      %Anchor.class;
-      | %script.qname; | %map.qname;
-      %Inline.extra; )*"
->
-<!ENTITY % pre.qname  "pre" >
-<!ELEMENT %pre.qname;  %pre.content; >
-<!-- end of pre.element -->]]>
-
-<!ENTITY % pre.attlist  "INCLUDE" >
-<![%pre.attlist;[
-<!ATTLIST %pre.qname;
-      %Common.attrib;
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of pre.attlist -->]]>
-
-<!-- ...................  Heading Elements  ................... -->
-
-<!ENTITY % Heading.content  "( #PCDATA | %Inline.mix; )*" >
-
-<!ENTITY % h1.element  "INCLUDE" >
-<![%h1.element;[
-<!ENTITY % h1.qname  "h1" >
-<!ELEMENT %h1.qname;  %Heading.content; >
-<!-- end of h1.element -->]]>
-
-<!ENTITY % h1.attlist  "INCLUDE" >
-<![%h1.attlist;[
-<!ATTLIST %h1.qname;
-      %Common.attrib;
->
-<!-- end of h1.attlist -->]]>
-
-<!ENTITY % h2.element  "INCLUDE" >
-<![%h2.element;[
-<!ENTITY % h2.qname  "h2" >
-<!ELEMENT %h2.qname;  %Heading.content; >
-<!-- end of h2.element -->]]>
-
-<!ENTITY % h2.attlist  "INCLUDE" >
-<![%h2.attlist;[
-<!ATTLIST %h2.qname;
-      %Common.attrib;
->
-<!-- end of h2.attlist -->]]>
-
-<!ENTITY % h3.element  "INCLUDE" >
-<![%h3.element;[
-<!ENTITY % h3.qname  "h3" >
-<!ELEMENT %h3.qname;  %Heading.content; >
-<!-- end of h3.element -->]]>
-
-<!ENTITY % h3.attlist  "INCLUDE" >
-<![%h3.attlist;[
-<!ATTLIST %h3.qname;
-      %Common.attrib;
->
-<!-- end of h3.attlist -->]]>
-
-<!ENTITY % h4.element  "INCLUDE" >
-<![%h4.element;[
-<!ENTITY % h4.qname  "h4" >
-<!ELEMENT %h4.qname;  %Heading.content; >
-<!-- end of h4.element -->]]>
-
-<!ENTITY % h4.attlist  "INCLUDE" >
-<![%h4.attlist;[
-<!ATTLIST %h4.qname;
-      %Common.attrib;
->
-<!-- end of h4.attlist -->]]>
-
-<!ENTITY % h5.element  "INCLUDE" >
-<![%h5.element;[
-<!ENTITY % h5.qname  "h5" >
-<!ELEMENT %h5.qname;  %Heading.content; >
-<!-- end of h5.element -->]]>
-
-<!ENTITY % h5.attlist  "INCLUDE" >
-<![%h5.attlist;[
-<!ATTLIST %h5.qname;
-      %Common.attrib;
->
-<!-- end of h5.attlist -->]]>
-
-<!ENTITY % h6.element  "INCLUDE" >
-<![%h6.element;[
-<!ENTITY % h6.qname  "h6" >
-<!ELEMENT %h6.qname;  %Heading.content; >
-<!-- end of h6.element -->]]>
-
-<!ENTITY % h6.attlist  "INCLUDE" >
-<![%h6.attlist;[
-<!ATTLIST %h6.qname;
-      %Common.attrib;
->
-<!-- end of h6.attlist -->]]>
-
-<!-- end of xhtml-blkphras-1.mod -->
-]]>
-
-<!-- end of xhtml-text-1.mod -->
-]]>
-
-<!-- Hypertext Module (required) ................................. -->
-<!ENTITY % xhtml-hypertext.module "INCLUDE" >
-<![%xhtml-hypertext.module;[
-<!ENTITY % xhtml-hypertext.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Hypertext Module  .............................................. -->
-<!-- file: xhtml-hypertext-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Hypertext 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-hypertext-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Hypertext
-
-        a
-
-     This module declares the anchor ('a') element type, which
-     defines the source of a hypertext link. The destination
-     (or link 'target') is identified via its 'id' attribute
-     rather than the 'name' attribute as was used in HTML.
--->
-
-<!-- ............  Anchor Element  ............ -->
-
-<!ENTITY % a.element  "INCLUDE" >
-<![%a.element;[
-<!ENTITY % a.content
-     "( #PCDATA | %InlNoAnchor.mix; )*"
->
-<!ENTITY % a.qname  "a" >
-<!ELEMENT %a.qname;  %a.content; >
-<!-- end of a.element -->]]>
-
-<!ENTITY % a.attlist  "INCLUDE" >
-<![%a.attlist;[
-<!ATTLIST %a.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of a.attlist -->]]>
-
-<!-- end of xhtml-hypertext-1.mod -->
-]]>
-
-<!-- Lists Module (required)  .................................... -->
-<!ENTITY % xhtml-list.module "INCLUDE" >
-<![%xhtml-list.module;[
-<!ENTITY % xhtml-list.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Lists Module  .................................................. -->
-<!-- file: xhtml-list-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Lists 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-list-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Lists
-
-        dl, dt, dd, ol, ul, li
-
-     This module declares the list-oriented element types
-     and their attributes.
--->
-
-<!ENTITY % dl.qname  "dl" >
-<!ENTITY % dt.qname  "dt" >
-<!ENTITY % dd.qname  "dd" >
-<!ENTITY % ol.qname  "ol" >
-<!ENTITY % ul.qname  "ul" >
-<!ENTITY % li.qname  "li" >
-
-<!-- dl: Definition List ............................... -->
-
-<!ENTITY % dl.element  "INCLUDE" >
-<![%dl.element;[
-<!ENTITY % dl.content  "( %dt.qname; | %dd.qname; )+" >
-<!ELEMENT %dl.qname;  %dl.content; >
-<!-- end of dl.element -->]]>
-
-<!ENTITY % dl.attlist  "INCLUDE" >
-<![%dl.attlist;[
-<!ATTLIST %dl.qname;
-      %Common.attrib;
->
-<!-- end of dl.attlist -->]]>
-
-<!-- dt: Definition Term ............................... -->
-
-<!ENTITY % dt.element  "INCLUDE" >
-<![%dt.element;[
-<!ENTITY % dt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %dt.qname;  %dt.content; >
-<!-- end of dt.element -->]]>
-
-<!ENTITY % dt.attlist  "INCLUDE" >
-<![%dt.attlist;[
-<!ATTLIST %dt.qname;
-      %Common.attrib;
->
-<!-- end of dt.attlist -->]]>
-
-<!-- dd: Definition Description ........................ -->
-
-<!ENTITY % dd.element  "INCLUDE" >
-<![%dd.element;[
-<!ENTITY % dd.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %dd.qname;  %dd.content; >
-<!-- end of dd.element -->]]>
-
-<!ENTITY % dd.attlist  "INCLUDE" >
-<![%dd.attlist;[
-<!ATTLIST %dd.qname;
-      %Common.attrib;
->
-<!-- end of dd.attlist -->]]>
-
-<!-- ol: Ordered List (numbered styles) ................ -->
-
-<!ENTITY % ol.element  "INCLUDE" >
-<![%ol.element;[
-<!ENTITY % ol.content  "( %li.qname; )+" >
-<!ELEMENT %ol.qname;  %ol.content; >
-<!-- end of ol.element -->]]>
-
-<!ENTITY % ol.attlist  "INCLUDE" >
-<![%ol.attlist;[
-<!ATTLIST %ol.qname;
-      %Common.attrib;
->
-<!-- end of ol.attlist -->]]>
-
-<!-- ul: Unordered List (bullet styles) ................ -->
-
-<!ENTITY % ul.element  "INCLUDE" >
-<![%ul.element;[
-<!ENTITY % ul.content  "( %li.qname; )+" >
-<!ELEMENT %ul.qname;  %ul.content; >
-<!-- end of ul.element -->]]>
-
-<!ENTITY % ul.attlist  "INCLUDE" >
-<![%ul.attlist;[
-<!ATTLIST %ul.qname;
-      %Common.attrib;
->
-<!-- end of ul.attlist -->]]>
-
-<!-- li: List Item ..................................... -->
-
-<!ENTITY % li.element  "INCLUDE" >
-<![%li.element;[
-<!ENTITY % li.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %li.qname;  %li.content; >
-<!-- end of li.element -->]]>
-
-<!ENTITY % li.attlist  "INCLUDE" >
-<![%li.attlist;[
-<!ATTLIST %li.qname;
-      %Common.attrib;
->
-<!-- end of li.attlist -->]]>
-
-<!-- end of xhtml-list-1.mod -->
-]]>
-
-<!-- ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
-
-<!-- Edit Module  ................................................ -->
-<!ENTITY % xhtml-edit.module "INCLUDE" >
-<![%xhtml-edit.module;[
-<!ENTITY % xhtml-edit.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Editing Elements 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Editing Elements Module  ....................................... -->
-<!-- file: xhtml-edit-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Editing Markup 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-edit-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Editing Elements
-
-        ins, del
-
-     This module declares element types and attributes used to indicate
-     inserted and deleted content while editing a document.
--->
-
-<!-- ins: Inserted Text  ............................... -->
-
-<!ENTITY % ins.element  "INCLUDE" >
-<![%ins.element;[
-<!ENTITY % ins.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % ins.qname  "ins" >
-<!ELEMENT %ins.qname;  %ins.content; >
-<!-- end of ins.element -->]]>
-
-<!ENTITY % ins.attlist  "INCLUDE" >
-<![%ins.attlist;[
-<!ATTLIST %ins.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
-      datetime     %Datetime.datatype;      #IMPLIED
->
-<!-- end of ins.attlist -->]]>
-
-<!-- del: Deleted Text  ................................ -->
-
-<!ENTITY % del.element  "INCLUDE" >
-<![%del.element;[
-<!ENTITY % del.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ENTITY % del.qname  "del" >
-<!ELEMENT %del.qname;  %del.content; >
-<!-- end of del.element -->]]>
-
-<!ENTITY % del.attlist  "INCLUDE" >
-<![%del.attlist;[
-<!ATTLIST %del.qname;
-      %Common.attrib;
-      cite         %URI.datatype;           #IMPLIED
-      datetime     %Datetime.datatype;      #IMPLIED
->
-<!-- end of del.attlist -->]]>
-
-<!-- end of xhtml-edit-1.mod -->
-]]>
-
-<!-- BIDI Override Module  ....................................... -->
-<!ENTITY % xhtml-bdo.module "%XHTML.bidi;" >
-<![%xhtml-bdo.module;[
-<!ENTITY % xhtml-bdo.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML BIDI Override Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML BDO Element Module ............................................. -->
-<!-- file: xhtml-bdo-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML BDO Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-bdo-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Bidirectional Override (bdo) Element
-
-     This modules declares the element 'bdo', used to override the
-     Unicode bidirectional algorithm for selected fragments of text.
-
-     DEPENDENCIES:
-     Relies on the conditional section keyword %XHTML.bidi; declared
-     as "INCLUDE". Bidirectional text support includes both the bdo
-     element and the 'dir' attribute.
--->
-
-<!ENTITY % bdo.element  "INCLUDE" >
-<![%bdo.element;[
-<!ENTITY % bdo.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % bdo.qname  "bdo" >
-<!ELEMENT %bdo.qname;  %bdo.content; >
-<!-- end of bdo.element -->]]>
-
-<!ENTITY % bdo.attlist  "INCLUDE" >
-<![%bdo.attlist;[
-<!ATTLIST %bdo.qname;
-      %Core.attrib;
-      xml:lang     %LanguageCode.datatype;  #IMPLIED
-      dir          ( ltr | rtl )            #REQUIRED
->
-]]>
-
-<!-- end of xhtml-bdo-1.mod -->
-]]>
-
-<!-- Ruby Module  ................................................ -->
-<!ENTITY % Ruby.common.attlists "INCLUDE" >
-<!ENTITY % Ruby.common.attrib "%Common.attrib;" >
-<!ENTITY % xhtml-ruby.module "INCLUDE" >
-<![%xhtml-ruby.module;[
-<!ENTITY % xhtml-ruby.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Ruby 1.0//EN"
-            "http://www.w3.org/TR/ruby/xhtml-ruby-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Ruby Module .................................................... -->
-<!-- file: xhtml-ruby-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1999-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $
-
-     This module is based on the W3C Ruby Annotation Specification:
-
-        http://www.w3.org/TR/ruby
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Ruby 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/ruby/xhtml-ruby-1.mod"
-
-     ...................................................................... -->
-
-<!-- Ruby Elements
-
-        ruby, rbc, rtc, rb, rt, rp
-
-     This module declares the elements and their attributes used to
-     support ruby annotation markup.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % ruby.qname  "ruby" >
-<!ENTITY % rbc.qname  "rbc" >
-<!ENTITY % rtc.qname  "rtc" >
-<!ENTITY % rb.qname  "rb" >
-<!ENTITY % rt.qname  "rt" >
-<!ENTITY % rp.qname  "rp" >
-
-<!-- rp fallback is included by default.
--->
-<!ENTITY % Ruby.fallback "INCLUDE" >
-<!ENTITY % Ruby.fallback.mandatory "IGNORE" >
-
-<!-- Complex ruby is included by default; it may be 
-     overridden by other modules to ignore it.
--->
-<!ENTITY % Ruby.complex "INCLUDE" >
-
-<!-- Fragments for the content model of the ruby element -->
-<![%Ruby.fallback;[
-<![%Ruby.fallback.mandatory;[
-<!ENTITY % Ruby.content.simple 
-     "( %rb.qname;, %rp.qname;, %rt.qname;, %rp.qname; )"
->
-]]>
-<!ENTITY % Ruby.content.simple 
-     "( %rb.qname;, ( %rt.qname; | ( %rp.qname;, %rt.qname;, %rp.qname; ) ) )"
->
-]]>
-<!ENTITY % Ruby.content.simple "( %rb.qname;, %rt.qname; )" >
-
-<![%Ruby.complex;[
-<!ENTITY % Ruby.content.complex 
-     "| ( %rbc.qname;, %rtc.qname;, %rtc.qname;? )"
->
-]]>
-<!ENTITY % Ruby.content.complex "" >
-
-<!-- Content models of the rb and the rt elements are intended to
-     allow other inline-level elements of its parent markup language,
-     but it should not include ruby descendent elements. The following
-     parameter entity %NoRuby.content; can be used to redefine
-     those content models with minimum effort.  It's defined as
-     '( #PCDATA )' by default.
--->
-<!ENTITY % NoRuby.content "( #PCDATA )" >
-
-<!-- one or more digits (NUMBER) -->
-<!ENTITY % Number.datatype "CDATA" >
-
-<!-- ruby element ...................................... -->
-
-<!ENTITY % ruby.element  "INCLUDE" >
-<![%ruby.element;[
-<!ENTITY % ruby.content
-     "( %Ruby.content.simple; %Ruby.content.complex; )"
->
-<!ELEMENT %ruby.qname;  %ruby.content; >
-<!-- end of ruby.element -->]]>
-
-<![%Ruby.complex;[
-<!-- rbc (ruby base component) element ................. -->
-
-<!ENTITY % rbc.element  "INCLUDE" >
-<![%rbc.element;[
-<!ENTITY % rbc.content
-     "(%rb.qname;)+"
->
-<!ELEMENT %rbc.qname;  %rbc.content; >
-<!-- end of rbc.element -->]]>
-
-<!-- rtc (ruby text component) element ................. -->
-
-<!ENTITY % rtc.element  "INCLUDE" >
-<![%rtc.element;[
-<!ENTITY % rtc.content
-     "(%rt.qname;)+"
->
-<!ELEMENT %rtc.qname;  %rtc.content; >
-<!-- end of rtc.element -->]]>
-]]>
-
-<!-- rb (ruby base) element ............................ -->
-
-<!ENTITY % rb.element  "INCLUDE" >
-<![%rb.element;[
-<!-- %rb.content; uses %NoRuby.content; as its content model,
-     which is '( #PCDATA )' by default. It may be overridden
-     by other modules to allow other inline-level elements
-     of its parent markup language, but it should not include
-     ruby descendent elements.
--->
-<!ENTITY % rb.content "%NoRuby.content;" >
-<!ELEMENT %rb.qname;  %rb.content; >
-<!-- end of rb.element -->]]>
-
-<!-- rt (ruby text) element ............................ -->
-
-<!ENTITY % rt.element  "INCLUDE" >
-<![%rt.element;[
-<!-- %rt.content; uses %NoRuby.content; as its content model,
-     which is '( #PCDATA )' by default. It may be overridden
-     by other modules to allow other inline-level elements
-     of its parent markup language, but it should not include
-     ruby descendent elements.
--->
-<!ENTITY % rt.content "%NoRuby.content;" >
-
-<!ELEMENT %rt.qname;  %rt.content; >
-<!-- end of rt.element -->]]>
-
-<!-- rbspan attribute is used for complex ruby only ...... -->
-<![%Ruby.complex;[
-<!ENTITY % rt.attlist  "INCLUDE" >
-<![%rt.attlist;[
-<!ATTLIST %rt.qname;
-      rbspan         %Number.datatype;      "1"
->
-<!-- end of rt.attlist -->]]>
-]]>
-
-<!-- rp (ruby parenthesis) element ..................... -->
-
-<![%Ruby.fallback;[
-<!ENTITY % rp.element  "INCLUDE" >
-<![%rp.element;[
-<!ENTITY % rp.content
-     "( #PCDATA )"
->
-<!ELEMENT %rp.qname;  %rp.content; >
-<!-- end of rp.element -->]]>
-]]>
-
-<!-- Ruby Common Attributes
-
-     The following optional ATTLIST declarations provide an easy way
-     to define common attributes for ruby elements.  These declarations
-     are ignored by default.
-
-     Ruby elements are intended to have common attributes of its
-     parent markup language.  For example, if a markup language defines
-     common attributes as a parameter entity %attrs;, you may add
-     those attributes by just declaring the following parameter entities
-
-         <!ENTITY % Ruby.common.attlists  "INCLUDE" >
-         <!ENTITY % Ruby.common.attrib  "%attrs;" >
-
-     before including the Ruby module.
--->
-
-<!ENTITY % Ruby.common.attlists  "IGNORE" >
-<![%Ruby.common.attlists;[
-<!ENTITY % Ruby.common.attrib  "" >
-
-<!-- common attributes for ruby ........................ -->
-
-<!ENTITY % Ruby.common.attlist  "INCLUDE" >
-<![%Ruby.common.attlist;[
-<!ATTLIST %ruby.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Ruby.common.attlist -->]]>
-
-<![%Ruby.complex;[
-<!-- common attributes for rbc ......................... -->
-
-<!ENTITY % Rbc.common.attlist  "INCLUDE" >
-<![%Rbc.common.attlist;[
-<!ATTLIST %rbc.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rbc.common.attlist -->]]>
-
-<!-- common attributes for rtc ......................... -->
-
-<!ENTITY % Rtc.common.attlist  "INCLUDE" >
-<![%Rtc.common.attlist;[
-<!ATTLIST %rtc.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rtc.common.attlist -->]]>
-]]>
-
-<!-- common attributes for rb .......................... -->
-
-<!ENTITY % Rb.common.attlist  "INCLUDE" >
-<![%Rb.common.attlist;[
-<!ATTLIST %rb.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rb.common.attlist -->]]>
-
-<!-- common attributes for rt .......................... -->
-
-<!ENTITY % Rt.common.attlist  "INCLUDE" >
-<![%Rt.common.attlist;[
-<!ATTLIST %rt.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rt.common.attlist -->]]>
-
-<![%Ruby.fallback;[
-<!-- common attributes for rp .......................... -->
-
-<!ENTITY % Rp.common.attlist  "INCLUDE" >
-<![%Rp.common.attlist;[
-<!ATTLIST %rp.qname;
-      %Ruby.common.attrib;
->
-<!-- end of Rp.common.attlist -->]]>
-]]>
-]]>
-
-<!-- end of xhtml-ruby-1.mod -->
-]]>
-
-<!-- Presentation Module  ........................................ -->
-<!ENTITY % xhtml-pres.module "INCLUDE" >
-<![%xhtml-pres.module;[
-<!ENTITY % xhtml-pres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Presentation Module ............................................ -->
-<!-- file: xhtml-pres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-pres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Presentational Elements
-
-     This module defines elements and their attributes for
-     simple presentation-related markup.
--->
-
-<!ENTITY % xhtml-inlpres.module "INCLUDE" >
-<![%xhtml-inlpres.module;[
-<!ENTITY % xhtml-inlpres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-            "xhtml-inlpres-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Inline Presentation Module  .................................... -->
-<!-- file: xhtml-inlpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Inline Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-inlpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Inline Presentational Elements
-
-        b, big, i, small, sub, sup, tt
-
-     This module declares the elements and their attributes used to
-     support inline-level presentational markup.
--->
-
-<!ENTITY % b.element  "INCLUDE" >
-<![%b.element;[
-<!ENTITY % b.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % b.qname  "b" >
-<!ELEMENT %b.qname;  %b.content; >
-<!-- end of b.element -->]]>
-
-<!ENTITY % b.attlist  "INCLUDE" >
-<![%b.attlist;[
-<!ATTLIST %b.qname;
-      %Common.attrib;
->
-<!-- end of b.attlist -->]]>
-
-<!ENTITY % big.element  "INCLUDE" >
-<![%big.element;[
-<!ENTITY % big.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % big.qname  "big" >
-<!ELEMENT %big.qname;  %big.content; >
-<!-- end of big.element -->]]>
-
-<!ENTITY % big.attlist  "INCLUDE" >
-<![%big.attlist;[
-<!ATTLIST %big.qname;
-      %Common.attrib;
->
-<!-- end of big.attlist -->]]>
-
-<!ENTITY % i.element  "INCLUDE" >
-<![%i.element;[
-<!ENTITY % i.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % i.qname  "i" >
-<!ELEMENT %i.qname;  %i.content; >
-<!-- end of i.element -->]]>
-
-<!ENTITY % i.attlist  "INCLUDE" >
-<![%i.attlist;[
-<!ATTLIST %i.qname;
-      %Common.attrib;
->
-<!-- end of i.attlist -->]]>
-
-<!ENTITY % small.element  "INCLUDE" >
-<![%small.element;[
-<!ENTITY % small.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % small.qname  "small" >
-<!ELEMENT %small.qname;  %small.content; >
-<!-- end of small.element -->]]>
-
-<!ENTITY % small.attlist  "INCLUDE" >
-<![%small.attlist;[
-<!ATTLIST %small.qname;
-      %Common.attrib;
->
-<!-- end of small.attlist -->]]>
-
-<!ENTITY % sub.element  "INCLUDE" >
-<![%sub.element;[
-<!ENTITY % sub.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sub.qname  "sub" >
-<!ELEMENT %sub.qname;  %sub.content; >
-<!-- end of sub.element -->]]>
-
-<!ENTITY % sub.attlist  "INCLUDE" >
-<![%sub.attlist;[
-<!ATTLIST %sub.qname;
-      %Common.attrib;
->
-<!-- end of sub.attlist -->]]>
-
-<!ENTITY % sup.element  "INCLUDE" >
-<![%sup.element;[
-<!ENTITY % sup.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % sup.qname  "sup" >
-<!ELEMENT %sup.qname;  %sup.content; >
-<!-- end of sup.element -->]]>
-
-<!ENTITY % sup.attlist  "INCLUDE" >
-<![%sup.attlist;[
-<!ATTLIST %sup.qname;
-      %Common.attrib;
->
-<!-- end of sup.attlist -->]]>
-
-<!ENTITY % tt.element  "INCLUDE" >
-<![%tt.element;[
-<!ENTITY % tt.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ENTITY % tt.qname  "tt" >
-<!ELEMENT %tt.qname;  %tt.content; >
-<!-- end of tt.element -->]]>
-
-<!ENTITY % tt.attlist  "INCLUDE" >
-<![%tt.attlist;[
-<!ATTLIST %tt.qname;
-      %Common.attrib;
->
-<!-- end of tt.attlist -->]]>
-
-<!-- end of xhtml-inlpres-1.mod -->
-]]>
-
-<!ENTITY % xhtml-blkpres.module "INCLUDE" >
-<![%xhtml-blkpres.module;[
-<!ENTITY % xhtml-blkpres.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-            "xhtml-blkpres-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Block Presentation Module  ..................................... -->
-<!-- file: xhtml-blkpres-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Block Presentation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-blkpres-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Block Presentational Elements
-
-        hr
-
-     This module declares the elements and their attributes used to
-     support block-level presentational markup.
--->
-
-<!ENTITY % hr.element  "INCLUDE" >
-<![%hr.element;[
-<!ENTITY % hr.content  "EMPTY" >
-<!ENTITY % hr.qname  "hr" >
-<!ELEMENT %hr.qname;  %hr.content; >
-<!-- end of hr.element -->]]>
-
-<!ENTITY % hr.attlist  "INCLUDE" >
-<![%hr.attlist;[
-<!ATTLIST %hr.qname;
-      %Common.attrib;
->
-<!-- end of hr.attlist -->]]>
-
-<!-- end of xhtml-blkpres-1.mod -->
-]]>
-
-<!-- end of xhtml-pres-1.mod -->
-]]>
-
-<!-- Link Element Module  ........................................ -->
-<!ENTITY % xhtml-link.module "INCLUDE" >
-<![%xhtml-link.module;[
-<!ENTITY % xhtml-link.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Link Element Module  ........................................... -->
-<!-- file: xhtml-link-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Link Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-link-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Link element
-
-        link
-
-     This module declares the link element type and its attributes,
-     which could (in principle) be used to define document-level links
-     to external resources such as:
-
-     a) for document specific toolbars/menus, e.g. start, contents,
-        previous, next, index, end, help
-     b) to link to a separate style sheet (rel="stylesheet")
-     c) to make a link to a script (rel="script")
-     d) by stylesheets to control how collections of html nodes are
-        rendered into printed documents
-     e) to make a link to a printable version of this document
-        e.g. a postscript or pdf version (rel="alternate" media="print")
--->
-
-<!-- link: Media-Independent Link ...................... -->
-
-<!ENTITY % link.element  "INCLUDE" >
-<![%link.element;[
-<!ENTITY % link.content  "EMPTY" >
-<!ENTITY % link.qname  "link" >
-<!ELEMENT %link.qname;  %link.content; >
-<!-- end of link.element -->]]>
-
-<!ENTITY % link.attlist  "INCLUDE" >
-<![%link.attlist;[
-<!ATTLIST %link.qname;
-      %Common.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      href         %URI.datatype;           #IMPLIED
-      hreflang     %LanguageCode.datatype;  #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      rel          %LinkTypes.datatype;     #IMPLIED
-      rev          %LinkTypes.datatype;     #IMPLIED
-      media        %MediaDesc.datatype;     #IMPLIED
->
-<!-- end of link.attlist -->]]>
-
-<!-- end of xhtml-link-1.mod -->
-]]>
-
-<!-- Document Metainformation Module  ............................ -->
-<!ENTITY % xhtml-meta.module "INCLUDE" >
-<![%xhtml-meta.module;[
-<!ENTITY % xhtml-meta.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Metainformation Module  ............................... -->
-<!-- file: xhtml-meta-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Metainformation 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-meta-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Meta Information
-
-        meta
-
-     This module declares the meta element type and its attributes,
-     used to provide declarative document metainformation.
--->
-
-<!-- meta: Generic Metainformation ..................... -->
-
-<!ENTITY % meta.element  "INCLUDE" >
-<![%meta.element;[
-<!ENTITY % meta.content  "EMPTY" >
-<!ENTITY % meta.qname  "meta" >
-<!ELEMENT %meta.qname;  %meta.content; >
-<!-- end of meta.element -->]]>
-
-<!ENTITY % meta.attlist  "INCLUDE" >
-<![%meta.attlist;[
-<!ATTLIST %meta.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      http-equiv   NMTOKEN                  #IMPLIED
-      name         NMTOKEN                  #IMPLIED
-      content      CDATA                    #REQUIRED
-      scheme       CDATA                    #IMPLIED
->
-<!-- end of meta.attlist -->]]>
-
-<!-- end of xhtml-meta-1.mod -->
-]]>
-
-<!-- Base Element Module  ........................................ -->
-<!ENTITY % xhtml-base.module "INCLUDE" >
-<![%xhtml-base.module;[
-<!ENTITY % xhtml-base.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Base Element Module  ........................................... -->
-<!-- file: xhtml-base-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Base Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-base-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Base element
-
-        base
-
-     This module declares the base element type and its attributes,
-     used to define a base URI against which relative URIs in the
-     document will be resolved.
-
-     Note that this module also redeclares the content model for
-     the head element to include the base element.
--->
-
-<!-- base: Document Base URI ........................... -->
-
-<!ENTITY % base.element  "INCLUDE" >
-<![%base.element;[
-<!ENTITY % base.content  "EMPTY" >
-<!ENTITY % base.qname  "base" >
-<!ELEMENT %base.qname;  %base.content; >
-<!-- end of base.element -->]]>
-
-<!ENTITY % base.attlist  "INCLUDE" >
-<![%base.attlist;[
-<!ATTLIST %base.qname;
-      %XHTML.xmlns.attrib;
-      href         %URI.datatype;           #REQUIRED
->
-<!-- end of base.attlist -->]]>
-
-<!ENTITY % head.content
-    "( %HeadOpts.mix;,
-     ( ( %title.qname;, %HeadOpts.mix;, ( %base.qname;, %HeadOpts.mix; )? )
-     | ( %base.qname;, %HeadOpts.mix;, ( %title.qname;, %HeadOpts.mix; ))))"
->
-
-<!-- end of xhtml-base-1.mod -->
-]]>
-
-<!-- Scripting Module  ........................................... -->
-<!ENTITY % xhtml-script.module "INCLUDE" >
-<![%xhtml-script.module;[
-<!ENTITY % xhtml-script.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Scripting Module  ..................................... -->
-<!-- file: xhtml-script-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Scripting 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-script-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Scripting
-
-        script, noscript
-
-     This module declares element types and attributes used to provide
-     support for executable scripts as well as an alternate content
-     container where scripts are not supported.
--->
-
-<!-- script: Scripting Statement ....................... -->
-
-<!ENTITY % script.element  "INCLUDE" >
-<![%script.element;[
-<!ENTITY % script.content  "( #PCDATA )" >
-<!ENTITY % script.qname  "script" >
-<!ELEMENT %script.qname;  %script.content; >
-<!-- end of script.element -->]]>
-
-<!ENTITY % script.attlist  "INCLUDE" >
-<![%script.attlist;[
-<!ATTLIST %script.qname;
-      %XHTML.xmlns.attrib;
-      charset      %Charset.datatype;       #IMPLIED
-      type         %ContentType.datatype;   #REQUIRED
-      src          %URI.datatype;           #IMPLIED
-      defer        ( defer )                #IMPLIED
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of script.attlist -->]]>
-
-<!-- noscript: No-Script Alternate Content ............. -->
-
-<!ENTITY % noscript.element  "INCLUDE" >
-<![%noscript.element;[
-<!ENTITY % noscript.content
-     "( %Block.mix; )+"
->
-<!ENTITY % noscript.qname  "noscript" >
-<!ELEMENT %noscript.qname;  %noscript.content; >
-<!-- end of noscript.element -->]]>
-
-<!ENTITY % noscript.attlist  "INCLUDE" >
-<![%noscript.attlist;[
-<!ATTLIST %noscript.qname;
-      %Common.attrib;
->
-<!-- end of noscript.attlist -->]]>
-
-<!-- end of xhtml-script-1.mod -->
-]]>
-
-<!-- Style Sheets Module  ......................................... -->
-<!ENTITY % xhtml-style.module "INCLUDE" >
-<![%xhtml-style.module;[
-<!ENTITY % xhtml-style.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Style Sheets 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Document Style Sheet Module  .................................... -->
-<!-- file: xhtml-style-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//DTD XHTML Style Sheets 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-style-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Style Sheets
-
-        style
-
-     This module declares the style element type and its attributes,
-     used to embed stylesheet information in the document head element.
--->
-
-<!-- style: Style Sheet Information ..................... -->
-
-<!ENTITY % style.element  "INCLUDE" >
-<![%style.element;[
-<!ENTITY % style.content  "( #PCDATA )" >
-<!ENTITY % style.qname  "style" >
-<!ELEMENT %style.qname;  %style.content; >
-<!-- end of style.element -->]]>
-
-<!ENTITY % style.attlist  "INCLUDE" >
-<![%style.attlist;[
-<!ATTLIST %style.qname;
-      %XHTML.xmlns.attrib;
-      %title.attrib;
-      %I18n.attrib;
-      type         %ContentType.datatype;   #REQUIRED
-      media        %MediaDesc.datatype;     #IMPLIED
-      xml:space    ( preserve )             #FIXED 'preserve'
->
-<!-- end of style.attlist -->]]>
-
-<!-- end of xhtml-style-1.mod -->
-]]>
-
-<!-- Image Module  ............................................... -->
-<!ENTITY % xhtml-image.module "INCLUDE" >
-<![%xhtml-image.module;[
-<!ENTITY % xhtml-image.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Images Module  ................................................. -->
-<!-- file: xhtml-image-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Rovision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Images 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-image-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Images
-
-        img
-
-     This module provides markup to support basic image embedding.
--->
-
-<!-- To avoid problems with text-only UAs as well as to make
-     image content understandable and navigable to users of
-     non-visual UAs, you need to provide a description with
-     the 'alt' attribute, and avoid server-side image maps.
--->
-
-<!ENTITY % img.element  "INCLUDE" >
-<![%img.element;[
-<!ENTITY % img.content  "EMPTY" >
-<!ENTITY % img.qname  "img" >
-<!ELEMENT %img.qname;  %img.content; >
-<!-- end of img.element -->]]>
-
-<!ENTITY % img.attlist  "INCLUDE" >
-<![%img.attlist;[
-<!ATTLIST %img.qname;
-      %Common.attrib;
-      src          %URI.datatype;           #REQUIRED
-      alt          %Text.datatype;          #REQUIRED
-      longdesc     %URI.datatype;           #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
->
-<!-- end of img.attlist -->]]>
-
-<!-- end of xhtml-image-1.mod -->
-]]>
-
-<!-- Client-side Image Map Module  ............................... -->
-<!ENTITY % xhtml-csismap.module "INCLUDE" >
-<![%xhtml-csismap.module;[
-<!ENTITY % xhtml-csismap.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Client-side Image Map Module  .................................. -->
-<!-- file: xhtml-csismap-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Client-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-csismap-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Client-side Image Maps
-
-        area, map
-
-     This module declares elements and attributes to support client-side
-     image maps. This requires that the Image Module (or a module
-     declaring the img element type) be included in the DTD.
-
-     These can be placed in the same document or grouped in a
-     separate document, although the latter isn't widely supported
--->
-
-<!ENTITY % area.element  "INCLUDE" >
-<![%area.element;[
-<!ENTITY % area.content  "EMPTY" >
-<!ENTITY % area.qname  "area" >
-<!ELEMENT %area.qname;  %area.content; >
-<!-- end of area.element -->]]>
-
-<!ENTITY % Shape.datatype "( rect | circle | poly | default )">
-<!ENTITY % Coords.datatype "CDATA" >
-
-<!ENTITY % area.attlist  "INCLUDE" >
-<![%area.attlist;[
-<!ATTLIST %area.qname;
-      %Common.attrib;
-      href         %URI.datatype;           #IMPLIED
-      shape        %Shape.datatype;         'rect'
-      coords       %Coords.datatype;        #IMPLIED
-      nohref       ( nohref )               #IMPLIED
-      alt          %Text.datatype;          #REQUIRED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of area.attlist -->]]>
-
-<!-- modify anchor attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %a.qname;
-      shape        %Shape.datatype;         'rect'
-      coords       %Coords.datatype;        #IMPLIED
->
-
-<!-- modify img attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %img.qname;
-      usemap       IDREF                    #IMPLIED
->
-
-<!-- modify form input attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %input.qname;
-      usemap       IDREF                    #IMPLIED
->
-
-<!-- modify object attribute definition list
-     to allow for client-side image maps
--->
-<!ATTLIST %object.qname;
-      usemap       IDREF                    #IMPLIED
->
-
-<!-- 'usemap' points to the 'id' attribute of a <map> element,
-     which must be in the same document; support for external
-     document maps was not widely supported in HTML and is
-     eliminated in XHTML.
-
-     It is considered an error for the element pointed to by
-     a usemap IDREF to occur in anything but a <map> element.
--->
-
-<!ENTITY % map.element  "INCLUDE" >
-<![%map.element;[
-<!ENTITY % map.content
-     "(( %Block.mix; ) | %area.qname; )+"
->
-<!ENTITY % map.qname  "map" >
-<!ELEMENT %map.qname;  %map.content; >
-<!-- end of map.element -->]]>
-
-<!ENTITY % map.attlist  "INCLUDE" >
-<![%map.attlist;[
-<!ATTLIST %map.qname;
-      %XHTML.xmlns.attrib;
-      id           ID                       #REQUIRED
-      %class.attrib;
-      %title.attrib;
-      %Core.extra.attrib;
-      %I18n.attrib;
-      %Events.attrib;
->
-<!-- end of map.attlist -->]]>
-
-<!-- end of xhtml-csismap-1.mod -->
-]]>
-
-<!-- Server-side Image Map Module  ............................... -->
-<!ENTITY % xhtml-ssismap.module "INCLUDE" >
-<![%xhtml-ssismap.module;[
-<!ENTITY % xhtml-ssismap.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Server-side Image Map Module  .................................. -->
-<!-- file: xhtml-ssismap-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Server-side Image Maps 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-ssismap-1.mod"
-
-     Revisions:
-#2000-10-22: added declaration for 'ismap' on <input>
-     ....................................................................... -->
-
-<!-- Server-side Image Maps
-
-     This adds the 'ismap' attribute to the img and input elements
-     to support server-side processing of a user selection.
--->
-
-<!ATTLIST %img.qname;
-      ismap        ( ismap )                #IMPLIED
->
-
-<!ATTLIST %input.qname;
-      ismap        ( ismap )                #IMPLIED
->
-
-<!-- end of xhtml-ssismap-1.mod -->
-]]>
-
-<!-- Param Element Module  ....................................... -->
-<!ENTITY % xhtml-param.module "INCLUDE" >
-<![%xhtml-param.module;[
-<!ENTITY % xhtml-param.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Param Element Module  ..................................... -->
-<!-- file: xhtml-param-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Param Element 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-param-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Parameters for Java Applets and Embedded Objects
-
-        param
-
-     This module provides declarations for the param element,
-     used to provide named property values for the applet
-     and object elements.
--->
-
-<!-- param: Named Property Value ....................... -->
-
-<!ENTITY % param.element  "INCLUDE" >
-<![%param.element;[
-<!ENTITY % param.content  "EMPTY" >
-<!ENTITY % param.qname  "param" >
-<!ELEMENT %param.qname;  %param.content; >
-<!-- end of param.element -->]]>
-
-<!ENTITY % param.attlist  "INCLUDE" >
-<![%param.attlist;[
-<!ATTLIST %param.qname;
-      %XHTML.xmlns.attrib;
-      %id.attrib;
-      name         CDATA                    #REQUIRED
-      value        CDATA                    #IMPLIED
-      valuetype    ( data | ref | object )  'data'
-      type         %ContentType.datatype;   #IMPLIED
->
-<!-- end of param.attlist -->]]>
-
-<!-- end of xhtml-param-1.mod -->
-]]>
-
-<!-- Embedded Object Module  ..................................... -->
-<!ENTITY % xhtml-object.module "INCLUDE" >
-<![%xhtml-object.module;[
-<!ENTITY % xhtml-object.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Embedded Object Module  ........................................ -->
-<!-- file: xhtml-object-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Embedded Object 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-object-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Embedded Objects
-
-        object
-
-     This module declares the object element type and its attributes, used
-     to embed external objects as part of XHTML pages. In the document,
-     place param elements prior to other content within the object element.
-
-     Note that use of this module requires instantiation of the Param
-     Element Module.
--->
-
-<!-- object: Generic Embedded Object ................... -->
-
-<!ENTITY % object.element  "INCLUDE" >
-<![%object.element;[
-<!ENTITY % object.content
-     "( #PCDATA | %Flow.mix; | %param.qname; )*"
->
-<!ENTITY % object.qname  "object" >
-<!ELEMENT %object.qname;  %object.content; >
-<!-- end of object.element -->]]>
-
-<!ENTITY % object.attlist  "INCLUDE" >
-<![%object.attlist;[
-<!ATTLIST %object.qname;
-      %Common.attrib;
-      declare      ( declare )              #IMPLIED
-      classid      %URI.datatype;           #IMPLIED
-      codebase     %URI.datatype;           #IMPLIED
-      data         %URI.datatype;           #IMPLIED
-      type         %ContentType.datatype;   #IMPLIED
-      codetype     %ContentType.datatype;   #IMPLIED
-      archive      %URIs.datatype;          #IMPLIED
-      standby      %Text.datatype;          #IMPLIED
-      height       %Length.datatype;        #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      name         CDATA                    #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of object.attlist -->]]>
-
-<!-- end of xhtml-object-1.mod -->
-]]>
-
-<!-- Tables Module ............................................... -->
-<!ENTITY % xhtml-table.module "INCLUDE" >
-<![%xhtml-table.module;[
-<!ENTITY % xhtml-table.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Table Module  .................................................. -->
-<!-- file: xhtml-table-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Tables 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-table-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Tables
-
-        table, caption, thead, tfoot, tbody, colgroup, col, tr, th, td
-
-     This module declares element types and attributes used to provide
-     table markup similar to HTML 4.0, including features that enable
-     better accessibility for non-visual user agents.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % table.qname  "table" >
-<!ENTITY % caption.qname  "caption" >
-<!ENTITY % thead.qname  "thead" >
-<!ENTITY % tfoot.qname  "tfoot" >
-<!ENTITY % tbody.qname  "tbody" >
-<!ENTITY % colgroup.qname  "colgroup" >
-<!ENTITY % col.qname  "col" >
-<!ENTITY % tr.qname  "tr" >
-<!ENTITY % th.qname  "th" >
-<!ENTITY % td.qname  "td" >
-
-<!-- The frame attribute specifies which parts of the frame around
-     the table should be rendered. The values are not the same as
-     CALS to avoid a name clash with the valign attribute.
--->
-<!ENTITY % frame.attrib
-     "frame        ( void
-                   | above
-                   | below
-                   | hsides
-                   | lhs
-                   | rhs
-                   | vsides
-                   | box
-                   | border )               #IMPLIED"
->
-
-<!-- The rules attribute defines which rules to draw between cells:
-
-     If rules is absent then assume:
-
-       "none" if border is absent or border="0" otherwise "all"
--->
-<!ENTITY % rules.attrib
-     "rules        ( none
-                   | groups
-                   | rows
-                   | cols
-                   | all )                  #IMPLIED"
->
-
-<!-- horizontal alignment attributes for cell contents
--->
-<!ENTITY % CellHAlign.attrib
-     "align        ( left
-                   | center
-                   | right
-                   | justify
-                   | char )                 #IMPLIED
-      char         %Character.datatype;     #IMPLIED
-      charoff      %Length.datatype;        #IMPLIED"
->
-
-<!-- vertical alignment attribute for cell contents
--->
-<!ENTITY % CellVAlign.attrib
-     "valign       ( top
-                   | middle
-                   | bottom
-                   | baseline )             #IMPLIED"
->
-
-<!-- scope is simpler than axes attribute for common tables
--->
-<!ENTITY % scope.attrib
-     "scope        ( row
-                   | col
-                   | rowgroup
-                   | colgroup )             #IMPLIED"
->
-
-<!-- table: Table Element .............................. -->
-
-<!ENTITY % table.element  "INCLUDE" >
-<![%table.element;[
-<!ENTITY % table.content
-     "( %caption.qname;?, ( %col.qname;* | %colgroup.qname;* ),
-      (( %thead.qname;?, %tfoot.qname;?, %tbody.qname;+ ) | ( %tr.qname;+ )))"
->
-<!ELEMENT %table.qname;  %table.content; >
-<!-- end of table.element -->]]>
-
-<!ENTITY % table.attlist  "INCLUDE" >
-<![%table.attlist;[
-<!ATTLIST %table.qname;
-      %Common.attrib;
-      summary      %Text.datatype;          #IMPLIED
-      width        %Length.datatype;        #IMPLIED
-      border       %Pixels.datatype;        #IMPLIED
-      %frame.attrib;
-      %rules.attrib;
-      cellspacing  %Length.datatype;        #IMPLIED
-      cellpadding  %Length.datatype;        #IMPLIED
->
-<!-- end of table.attlist -->]]>
-
-<!-- caption: Table Caption ............................ -->
-
-<!ENTITY % caption.element  "INCLUDE" >
-<![%caption.element;[
-<!ENTITY % caption.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %caption.qname;  %caption.content; >
-<!-- end of caption.element -->]]>
-
-<!ENTITY % caption.attlist  "INCLUDE" >
-<![%caption.attlist;[
-<!ATTLIST %caption.qname;
-      %Common.attrib;
->
-<!-- end of caption.attlist -->]]>
-
-<!-- thead: Table Header ............................... -->
-
-<!-- Use thead to duplicate headers when breaking table
-     across page boundaries, or for static headers when
-     tbody sections are rendered in scrolling panel.
--->
-
-<!ENTITY % thead.element  "INCLUDE" >
-<![%thead.element;[
-<!ENTITY % thead.content  "( %tr.qname; )+" >
-<!ELEMENT %thead.qname;  %thead.content; >
-<!-- end of thead.element -->]]>
-
-<!ENTITY % thead.attlist  "INCLUDE" >
-<![%thead.attlist;[
-<!ATTLIST %thead.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of thead.attlist -->]]>
-
-<!-- tfoot: Table Footer ............................... -->
-
-<!-- Use tfoot to duplicate footers when breaking table
-     across page boundaries, or for static footers when
-     tbody sections are rendered in scrolling panel.
--->
-
-<!ENTITY % tfoot.element  "INCLUDE" >
-<![%tfoot.element;[
-<!ENTITY % tfoot.content  "( %tr.qname; )+" >
-<!ELEMENT %tfoot.qname;  %tfoot.content; >
-<!-- end of tfoot.element -->]]>
-
-<!ENTITY % tfoot.attlist  "INCLUDE" >
-<![%tfoot.attlist;[
-<!ATTLIST %tfoot.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tfoot.attlist -->]]>
-
-<!-- tbody: Table Body ................................. -->
-
-<!-- Use multiple tbody sections when rules are needed
-     between groups of table rows.
--->
-
-<!ENTITY % tbody.element  "INCLUDE" >
-<![%tbody.element;[
-<!ENTITY % tbody.content  "( %tr.qname; )+" >
-<!ELEMENT %tbody.qname;  %tbody.content; >
-<!-- end of tbody.element -->]]>
-
-<!ENTITY % tbody.attlist  "INCLUDE" >
-<![%tbody.attlist;[
-<!ATTLIST %tbody.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tbody.attlist -->]]>
-
-<!-- colgroup: Table Column Group ...................... -->
-
-<!-- colgroup groups a set of col elements. It allows you
-     to group several semantically-related columns together.
--->
-
-<!ENTITY % colgroup.element  "INCLUDE" >
-<![%colgroup.element;[
-<!ENTITY % colgroup.content  "( %col.qname; )*" >
-<!ELEMENT %colgroup.qname;  %colgroup.content; >
-<!-- end of colgroup.element -->]]>
-
-<!ENTITY % colgroup.attlist  "INCLUDE" >
-<![%colgroup.attlist;[
-<!ATTLIST %colgroup.qname;
-      %Common.attrib;
-      span         %Number.datatype;        '1'
-      width        %MultiLength.datatype;   #IMPLIED
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of colgroup.attlist -->]]>
-
-<!-- col: Table Column ................................. -->
-
-<!-- col elements define the alignment properties for
-     cells in one or more columns.
-
-     The width attribute specifies the width of the
-     columns, e.g.
-
-       width="64"        width in screen pixels
-       width="0.5*"      relative width of 0.5
-
-     The span attribute causes the attributes of one
-     col element to apply to more than one column.
--->
-
-<!ENTITY % col.element  "INCLUDE" >
-<![%col.element;[
-<!ENTITY % col.content  "EMPTY" >
-<!ELEMENT %col.qname;  %col.content; >
-<!-- end of col.element -->]]>
-
-<!ENTITY % col.attlist  "INCLUDE" >
-<![%col.attlist;[
-<!ATTLIST %col.qname;
-      %Common.attrib;
-      span         %Number.datatype;        '1'
-      width        %MultiLength.datatype;   #IMPLIED
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of col.attlist -->]]>
-
-<!-- tr: Table Row ..................................... -->
-
-<!ENTITY % tr.element  "INCLUDE" >
-<![%tr.element;[
-<!ENTITY % tr.content  "( %th.qname; | %td.qname; )+" >
-<!ELEMENT %tr.qname;  %tr.content; >
-<!-- end of tr.element -->]]>
-
-<!ENTITY % tr.attlist  "INCLUDE" >
-<![%tr.attlist;[
-<!ATTLIST %tr.qname;
-      %Common.attrib;
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of tr.attlist -->]]>
-
-<!-- th: Table Header Cell ............................. -->
-
-<!-- th is for header cells, td for data,
-     but for cells acting as both use td
--->
-
-<!ENTITY % th.element  "INCLUDE" >
-<![%th.element;[
-<!ENTITY % th.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %th.qname;  %th.content; >
-<!-- end of th.element -->]]>
-
-<!ENTITY % th.attlist  "INCLUDE" >
-<![%th.attlist;[
-<!ATTLIST %th.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of th.attlist -->]]>
-
-<!-- td: Table Data Cell ............................... -->
-
-<!ENTITY % td.element  "INCLUDE" >
-<![%td.element;[
-<!ENTITY % td.content
-     "( #PCDATA | %Flow.mix; )*"
->
-<!ELEMENT %td.qname;  %td.content; >
-<!-- end of td.element -->]]>
-
-<!ENTITY % td.attlist  "INCLUDE" >
-<![%td.attlist;[
-<!ATTLIST %td.qname;
-      %Common.attrib;
-      abbr         %Text.datatype;          #IMPLIED
-      axis         CDATA                    #IMPLIED
-      headers      IDREFS                   #IMPLIED
-      %scope.attrib;
-      rowspan      %Number.datatype;        '1'
-      colspan      %Number.datatype;        '1'
-      %CellHAlign.attrib;
-      %CellVAlign.attrib;
->
-<!-- end of td.attlist -->]]>
-
-<!-- end of xhtml-table-1.mod -->
-]]>
-
-<!-- Forms Module  ............................................... -->
-<!ENTITY % xhtml-form.module "INCLUDE" >
-<![%xhtml-form.module;[
-<!ENTITY % xhtml-form.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Forms Module  .................................................. -->
-<!-- file: xhtml-form-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Forms 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-form-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Forms
-
-        form, label, input, select, optgroup, option,
-        textarea, fieldset, legend, button
-
-     This module declares markup to provide support for online
-     forms, based on the features found in HTML 4.0 forms.
--->
-
-<!-- declare qualified element type names:
--->
-<!ENTITY % form.qname  "form" >
-<!ENTITY % label.qname  "label" >
-<!ENTITY % input.qname  "input" >
-<!ENTITY % select.qname  "select" >
-<!ENTITY % optgroup.qname  "optgroup" >
-<!ENTITY % option.qname  "option" >
-<!ENTITY % textarea.qname  "textarea" >
-<!ENTITY % fieldset.qname  "fieldset" >
-<!ENTITY % legend.qname  "legend" >
-<!ENTITY % button.qname  "button" >
-
-<!-- %BlkNoForm.mix; includes all non-form block elements,
-     plus %Misc.class;
--->
-<!ENTITY % BlkNoForm.mix
-     "%Heading.class;
-      | %List.class;
-      | %BlkStruct.class;
-      %BlkPhras.class;
-      %BlkPres.class;
-      %Table.class;
-      %Block.extra;
-      %Misc.class;"
->
-
-<!-- form: Form Element ................................ -->
-
-<!ENTITY % form.element  "INCLUDE" >
-<![%form.element;[
-<!ENTITY % form.content
-     "( %BlkNoForm.mix;
-      | %fieldset.qname; )+"
->
-<!ELEMENT %form.qname;  %form.content; >
-<!-- end of form.element -->]]>
-
-<!ENTITY % form.attlist  "INCLUDE" >
-<![%form.attlist;[
-<!ATTLIST %form.qname;
-      %Common.attrib;
-      action       %URI.datatype;           #REQUIRED
-      method       ( get | post )           'get'
-      enctype      %ContentType.datatype;   'application/x-www-form-urlencoded'
-      accept-charset %Charsets.datatype;    #IMPLIED
-      accept       %ContentTypes.datatype;  #IMPLIED
->
-<!-- end of form.attlist -->]]>
-
-<!-- label: Form Field Label Text ...................... -->
-
-<!-- Each label must not contain more than ONE field
--->
-
-<!ENTITY % label.element  "INCLUDE" >
-<![%label.element;[
-<!ENTITY % label.content
-     "( #PCDATA
-      | %input.qname; | %select.qname; | %textarea.qname; | %button.qname;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %I18n.class;
-      %InlPres.class;
-      %Anchor.class;
-      %InlSpecial.class;
-      %Inline.extra;
-      %Misc.class; )*"
->
-<!ELEMENT %label.qname;  %label.content; >
-<!-- end of label.element -->]]>
-
-<!ENTITY % label.attlist  "INCLUDE" >
-<![%label.attlist;[
-<!ATTLIST %label.qname;
-      %Common.attrib;
-      for          IDREF                    #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of label.attlist -->]]>
-
-<!-- input: Form Control ............................... -->
-
-<!ENTITY % input.element  "INCLUDE" >
-<![%input.element;[
-<!ENTITY % input.content  "EMPTY" >
-<!ELEMENT %input.qname;  %input.content; >
-<!-- end of input.element -->]]>
-
-<!ENTITY % input.attlist  "INCLUDE" >
-<![%input.attlist;[
-<!ENTITY % InputType.class
-     "( text | password | checkbox | radio | submit
-      | reset | file | hidden | image | button )"
->
-<!-- attribute 'name' required for all but submit & reset
--->
-<!ATTLIST %input.qname;
-      %Common.attrib;
-      type         %InputType.class;        'text'
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      checked      ( checked )              #IMPLIED
-      disabled     ( disabled )             #IMPLIED
-      readonly     ( readonly )             #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      maxlength    %Number.datatype;        #IMPLIED
-      src          %URI.datatype;           #IMPLIED
-      alt          %Text.datatype;          #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
-      accept       %ContentTypes.datatype;  #IMPLIED
->
-<!-- end of input.attlist -->]]>
-
-<!-- select: Option Selector ........................... -->
-
-<!ENTITY % select.element  "INCLUDE" >
-<![%select.element;[
-<!ENTITY % select.content
-     "( %optgroup.qname; | %option.qname; )+"
->
-<!ELEMENT %select.qname;  %select.content; >
-<!-- end of select.element -->]]>
-
-<!ENTITY % select.attlist  "INCLUDE" >
-<![%select.attlist;[
-<!ATTLIST %select.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      size         %Number.datatype;        #IMPLIED
-      multiple     ( multiple )             #IMPLIED
-      disabled     ( disabled )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
->
-<!-- end of select.attlist -->]]>
-
-<!-- optgroup: Option Group ............................ -->
-
-<!ENTITY % optgroup.element  "INCLUDE" >
-<![%optgroup.element;[
-<!ENTITY % optgroup.content  "( %option.qname; )+" >
-<!ELEMENT %optgroup.qname;  %optgroup.content; >
-<!-- end of optgroup.element -->]]>
-
-<!ENTITY % optgroup.attlist  "INCLUDE" >
-<![%optgroup.attlist;[
-<!ATTLIST %optgroup.qname;
-      %Common.attrib;
-      disabled     ( disabled )             #IMPLIED
-      label        %Text.datatype;          #REQUIRED
->
-<!-- end of optgroup.attlist -->]]>
-
-<!-- option: Selectable Choice ......................... -->
-
-<!ENTITY % option.element  "INCLUDE" >
-<![%option.element;[
-<!ENTITY % option.content  "( #PCDATA )" >
-<!ELEMENT %option.qname;  %option.content; >
-<!-- end of option.element -->]]>
-
-<!ENTITY % option.attlist  "INCLUDE" >
-<![%option.attlist;[
-<!ATTLIST %option.qname;
-      %Common.attrib;
-      selected     ( selected )             #IMPLIED
-      disabled     ( disabled )             #IMPLIED
-      label        %Text.datatype;          #IMPLIED
-      value        CDATA                    #IMPLIED
->
-<!-- end of option.attlist -->]]>
-
-<!-- textarea: Multi-Line Text Field ................... -->
-
-<!ENTITY % textarea.element  "INCLUDE" >
-<![%textarea.element;[
-<!ENTITY % textarea.content  "( #PCDATA )" >
-<!ELEMENT %textarea.qname;  %textarea.content; >
-<!-- end of textarea.element -->]]>
-
-<!ENTITY % textarea.attlist  "INCLUDE" >
-<![%textarea.attlist;[
-<!ATTLIST %textarea.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      rows         %Number.datatype;        #REQUIRED
-      cols         %Number.datatype;        #REQUIRED
-      disabled     ( disabled )             #IMPLIED
-      readonly     ( readonly )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of textarea.attlist -->]]>
-
-<!-- fieldset: Form Control Group ...................... -->
-
-<!-- #PCDATA is to solve the mixed content problem,
-     per specification only whitespace is allowed
--->
-
-<!ENTITY % fieldset.element  "INCLUDE" >
-<![%fieldset.element;[
-<!ENTITY % fieldset.content
-     "( #PCDATA | %legend.qname; | %Flow.mix; )*"
->
-<!ELEMENT %fieldset.qname;  %fieldset.content; >
-<!-- end of fieldset.element -->]]>
-
-<!ENTITY % fieldset.attlist  "INCLUDE" >
-<![%fieldset.attlist;[
-<!ATTLIST %fieldset.qname;
-      %Common.attrib;
->
-<!-- end of fieldset.attlist -->]]>
-
-<!-- legend: Fieldset Legend ........................... -->
-
-<!ENTITY % legend.element  "INCLUDE" >
-<![%legend.element;[
-<!ENTITY % legend.content
-     "( #PCDATA | %Inline.mix; )*"
->
-<!ELEMENT %legend.qname;  %legend.content; >
-<!-- end of legend.element -->]]>
-
-<!ENTITY % legend.attlist  "INCLUDE" >
-<![%legend.attlist;[
-<!ATTLIST %legend.qname;
-      %Common.attrib;
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of legend.attlist -->]]>
-
-<!-- button: Push Button ............................... -->
-
-<!ENTITY % button.element  "INCLUDE" >
-<![%button.element;[
-<!ENTITY % button.content
-     "( #PCDATA
-      | %BlkNoForm.mix;
-      | %InlStruct.class;
-      %InlPhras.class;
-      %InlPres.class;
-      %I18n.class;
-      %InlSpecial.class;
-      %Inline.extra; )*"
->
-<!ELEMENT %button.qname;  %button.content; >
-<!-- end of button.element -->]]>
-
-<!ENTITY % button.attlist  "INCLUDE" >
-<![%button.attlist;[
-<!ATTLIST %button.qname;
-      %Common.attrib;
-      name         CDATA                    #IMPLIED
-      value        CDATA                    #IMPLIED
-      type         ( button | submit | reset ) 'submit'
-      disabled     ( disabled )             #IMPLIED
-      tabindex     %Number.datatype;        #IMPLIED
-      accesskey    %Character.datatype;     #IMPLIED
->
-<!-- end of button.attlist -->]]>
-
-<!-- end of xhtml-form-1.mod -->
-]]>
-
-<!-- Legacy Markup ............................................... -->
-<!ENTITY % xhtml-legacy.module "IGNORE" >
-<![%xhtml-legacy.module;[
-<!ENTITY % xhtml-legacy.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Legacy Markup 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-legacy-1.mod" >
-%xhtml-legacy.mod;]]>
-
-<!-- Document Structure Module (required)  ....................... -->
-<!ENTITY % xhtml-struct.module "INCLUDE" >
-<![%xhtml-struct.module;[
-<!ENTITY % xhtml-struct.mod
-     PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-            "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod" >
-<!-- ...................................................................... -->
-<!-- XHTML Structure Module  .............................................. -->
-<!-- file: xhtml-struct-1.mod
-
-     This is XHTML, a reformulation of HTML as a modular XML application.
-     Copyright 1998-2001 W3C (MIT, INRIA, Keio), All Rights Reserved.
-     Revision: $Id: xhtml11-flat.dtd,v 1.1 2007/05/15 02:42:22 david_williams Exp $ SMI
-
-     This DTD module is identified by the PUBLIC and SYSTEM identifiers:
-
-       PUBLIC "-//W3C//ELEMENTS XHTML Document Structure 1.0//EN"
-       SYSTEM "http://www.w3.org/TR/xhtml-modularization/DTD/xhtml-struct-1.mod"
-
-     Revisions:
-     (none)
-     ....................................................................... -->
-
-<!-- Document Structure
-
-        title, head, body, html
-
-     The Structure Module defines the major structural elements and
-     their attributes.
-
-     Note that the content model of the head element type is redeclared
-     when the Base Module is included in the DTD.
-
-     The parameter entity containing the XML namespace URI value used
-     for XHTML is '%XHTML.xmlns;', defined in the Qualified Names module.
--->
-
-<!-- title: Document Title ............................. -->
-
-<!-- The title element is not considered part of the flow of text.
-     It should be displayed, for example as the page header or
-     window title. Exactly one title is required per document.
--->
-
-<!ENTITY % title.element  "INCLUDE" >
-<![%title.element;[
-<!ENTITY % title.content  "( #PCDATA )" >
-<!ENTITY % title.qname  "title" >
-<!ELEMENT %title.qname;  %title.content; >
-<!-- end of title.element -->]]>
-
-<!ENTITY % title.attlist  "INCLUDE" >
-<![%title.attlist;[
-<!ATTLIST %title.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
->
-<!-- end of title.attlist -->]]>
-
-<!-- head: Document Head ............................... -->
-
-<!ENTITY % head.element  "INCLUDE" >
-<![%head.element;[
-<!ENTITY % head.content
-    "( %HeadOpts.mix;, %title.qname;, %HeadOpts.mix; )"
->
-<!ENTITY % head.qname  "head" >
-<!ELEMENT %head.qname;  %head.content; >
-<!-- end of head.element -->]]>
-
-<!ENTITY % head.attlist  "INCLUDE" >
-<![%head.attlist;[
-<!-- reserved for future use with document profiles
--->
-<!ENTITY % profile.attrib
-     "profile      %URI.datatype;           '%XHTML.profile;'"
->
-
-<!ATTLIST %head.qname;
-      %XHTML.xmlns.attrib;
-      %I18n.attrib;
-      %profile.attrib;
->
-<!-- end of head.attlist -->]]>
-
-<!-- body: Document Body ............................... -->
-
-<!ENTITY % body.element  "INCLUDE" >
-<![%body.element;[
-<!ENTITY % body.content
-     "( %Block.mix; )+"
->
-<!ENTITY % body.qname  "body" >
-<!ELEMENT %body.qname;  %body.content; >
-<!-- end of body.element -->]]>
-
-<!ENTITY % body.attlist  "INCLUDE" >
-<![%body.attlist;[
-<!ATTLIST %body.qname;
-      %Common.attrib;
->
-<!-- end of body.attlist -->]]>
-
-<!-- html: XHTML Document Element ...................... -->
-
-<!ENTITY % html.element  "INCLUDE" >
-<![%html.element;[
-<!ENTITY % html.content  "( %head.qname;, %body.qname; )" >
-<!ENTITY % html.qname  "html" >
-<!ELEMENT %html.qname;  %html.content; >
-<!-- end of html.element -->]]>
-
-<!ENTITY % html.attlist  "INCLUDE" >
-<![%html.attlist;[
-<!-- version attribute value defined in driver
--->
-<!ENTITY % XHTML.version.attrib
-     "version      %FPI.datatype;           #FIXED '%XHTML.version;'"
->
-
-<!-- see the Qualified Names module for information
-     on how to extend XHTML using XML namespaces
--->
-<!ATTLIST %html.qname;
-      %XHTML.xmlns.attrib;
-      %XHTML.version.attrib;
-      %I18n.attrib;
->
-<!-- end of html.attlist -->]]>
-
-<!-- end of xhtml-struct-1.mod -->
-]]>
-
-<!-- end of XHTML 1.1 DTD  ................................................. -->
-<!-- ....................................................................... -->
diff --git a/bundles/org.eclipse.wst.standard.schemas/plugin.properties b/bundles/org.eclipse.wst.standard.schemas/plugin.properties
deleted file mode 100644
index d748df4..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-documentType.displayName.0 = XHTML 1.0 Strict
-documentType.displayName.1 = XHTML 1.0 Transitional
-documentType.displayName.2 = XHTML 1.0 Frameset
-documentType.displayName.3 = XHTML Basic 1.0
-documentType.displayName.4 = XHTML 1.1
-documentType.displayName.5 = XHTML MP 1.0
-documentType.displayName.6 = WML 1.3
-Bundle-Name.0 = Standard Schemas and DTDs
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/plugin.xml b/bundles/org.eclipse.wst.standard.schemas/plugin.xml
deleted file mode 100644
index 8f18237..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/plugin.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-    <!--==========================================-->
-    <!-- Catalog Contributions                    -->
-    <!-- Register well known Web DTDs and XSDs    -->
-    <!--==========================================-->
-
-    <!-- new form -->
-
-    <!-- 
-        See https://bugs.eclipse.org/bugs/show_bug.cgi?id=100481
-        you may have to comment out following extension if used 
-        in development environment. 
-        
-    -->
-
-    <extension point="org.eclipse.wst.xml.core.catalogContributions">
-        <catalogContribution id="default">
-
-
-            <public
-                publicId="-//WAPFORUM//DTD WML 1.1//EN"
-                uri="dtds/wml11.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML 1.0 Strict//EN"
-                uri="dtds/xhtml1-strict.dtd"
-                webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML 1.0 Transitional//EN"
-                uri="dtds/xhtml1-transitional.dtd"
-                webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-            </public>
-            <public
-                publicId="-//W3C//DTD XHTML 1.0 Frameset//EN"
-                uri="dtds/xhtml1-frameset.dtd"
-                webURL="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML Basic 1.0//EN"
-                uri="dtds/xhtml-basic10-f.dtd"
-                webURL="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
-            </public>
-
-            <public
-                publicId="-//W3C//DTD XHTML 1.1//EN"
-                uri="dtds/xhtml11-flat.dtd"
-                webURL="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-            </public>
-
-            <public
-                publicId="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-                uri="dtds/xhtml-mobile10-flat.dtd"
-                webURL="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-            </public>
-
-            <public
-                publicId="-//WAPFORUM//DTD WML 1.3//EN"
-                uri="dtds/wml13.dtd"
-                webURL="http://www.wapforum.org/DTD/wml13.dtd">
-            </public>
-            
-            
-            <public
-                publicId="-//W3C//DTD HTML 4.01 Frameset//EN"
-                uri="dtds/frameset.dtd"
-                webURL="http://www.w3.org/TR/html4/frameset.dtd">
-            </public>
-            
-            <public
-                publicId="-//W3C//ENTITIES Latin 1//EN//HTML"
-                uri="dtds/HTMLlat1.ent"
-                webURL="HTMLlat1.ent">
-            </public>
-            
-            <public
-                publicId="-//W3C//ENTITIES Special//EN//HTM"
-                uri="dtds/HTMLspecial.ent"
-                webURL="HTMLspecial.ent">
-            </public>
-            
-            <public
-                publicId="-//W3C//ENTITIES Symbols//EN//HTML"
-                uri="dtds/HTMLsymbol.ent"
-                webURL="HTMLsymbol.ent">
-            </public>
-            
-            <public
-                publicId="-//W3C//DTD HTML 4.01 Transitional//EN"
-                uri="dtds/loose.dtd"
-                webURL="http://www.w3.org/TR/html4/loose.dtd">
-            </public>
-        
-            <public
-                publicId="-//W3C//DTD HTML 4.01//EN"
-                uri="dtds/strict.dtd"
-                webURL="http://www.w3.org/TR/html4/strict.dtd">
-            </public>
-
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/"
-                uri="xsd/wsdl.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/soap/"
-                uri="xsd/soap.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/http/"
-                uri="xsd/http.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/wsdl/mime/"
-                uri="xsd/wsdl-mime.xsd" />
-            <uri
-                name="http://schemas.xmlsoap.org/soap/encoding/"
-                uri="xsd/soapenc.xsd" />
-
-
-            <!-- these are removed from the catalog, since they are -not- 
-            the same as those in the xsd.ui plugin, which 
-            point to the org.eclipse.xsd versions
-            <uri
-                name="http://www.w3.org/2001/XMLSchema"
-                uri="dtdsAndSchemas/XMLSchema.dtd" />
-                
-            <system
-                systemId="http://www.w3.org/2001/xml.xsd"
-                uri="dtdsAndSchemas/xml.xsd" />
-             -->
-        </catalogContribution>
-
-    </extension>
-
-
-
-
-    <extension point="org.eclipse.wst.sse.core.documentTypes">
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.0"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML 1.0 Strict//EN"
-            systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.1"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML 1.0 Transitional//EN"
-            defaultXHTML="true"
-            systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.2"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="true"
-            publicID="-//W3C//DTD XHTML 1.0 Frameset//EN"
-            systemID="http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.3"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML Basic 1.0//EN"
-            systemID="http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.4"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//W3C//DTD XHTML 1.1//EN"
-            systemID="http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-        </documentType>
-        <documentType
-            elementName="html"
-            displayName="%documentType.displayName.5"
-            namespaceURI="http://www.w3.org/1999/xhtml"
-            isXHTML="true"
-            hasFrameset="false"
-            publicID="-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-            systemID="http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-        </documentType>
-        <documentType
-            elementName="wml"
-            displayName="%documentType.displayName.6"
-            namespaceURI=""
-            isWML="true"
-            hasFrameset="false"
-            publicID="-//WAPFORUM//DTD WML 1.3//EN"
-            defaultWML="true"
-            systemID="http://www.wapforum.org/DTD/wml13.dtd">
-        </documentType>
-    </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/http.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/http.xsd
deleted file mode 100644
index d9466f6..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/http.xsd
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/http/wsdl-http.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
-
-  --> 
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        targetNamespace="http://schemas.xmlsoap.org/wsdl/http/">
-
-	<import namespace = "http://schemas.xmlsoap.org/wsdl/"/>
-
-   	<element name="address" type="http:addressType"/>
-
-   	<complexType name="addressType">
-		<complexContent>
-		<extension base="wsdl:tExtensibilityElement">
-			<sequence/>
-
-   			<attribute name="location" type="anyURI" use="required"/>
-		</extension>
-		</complexContent>
-   	</complexType>
-
-   	<element name="binding" type="http:bindingType"/>
-   	<complexType name="bindingType">
-		<complexContent>
-		<extension base="wsdl:tExtensibilityElement">
-
-			<sequence/>
-	      		<attribute name="verb" type="NMTOKEN" use="required"/>
-		</extension>
-		</complexContent>
-   	</complexType>
-
-   	<element name="operation" type="http:operationType"/>
-   	<complexType name="operationType">
-		<complexContent>
-
-		<extension base="wsdl:tExtensibilityElement">
-			<sequence/>
-	      		<attribute name="location" type="anyURI" use="required"/>
-		</extension>
-		</complexContent>
-	</complexType>
-
-   	<element name="urlEncoded">
-      		<complexType/>  		
-   	</element>
-
-   	<element name="urlReplacement">
-      		<complexType/>
-     	</element>
-</schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/soap.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/soap.xsd
deleted file mode 100644
index 3ef8527..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/soap.xsd
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/soap/2003-02-11.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/soap/" >
-
-  <xs:import namespace = "http://schemas.xmlsoap.org/wsdl/" />
-
-  <xs:simpleType name="encodingStyle" >
-    <xs:annotation>
-      <xs:documentation>
-      "encodingStyle" indicates any canonicalization conventions followed in the contents of the containing element.  For example, the value "http://schemas.xmlsoap.org/soap/encoding/" indicates the pattern described in SOAP specification
-      </xs:documentation>
-    </xs:annotation>
-
-    <xs:list itemType="xs:anyURI" />
-  </xs:simpleType>
-
-  <xs:element name="binding" type="soap:tBinding" />
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="transport" type="xs:anyURI" use="required" />
-        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
-
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:simpleType name="tStyleChoice" >
-    <xs:restriction base="xs:string" >
-      <xs:enumeration value="rpc" />
-      <xs:enumeration value="document" />
-    </xs:restriction>
-
-  </xs:simpleType>
-
-  <xs:element name="operation" type="soap:tOperation" />
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="soapAction" type="xs:anyURI" use="optional" />
-        <xs:attribute name="style" type="soap:tStyleChoice" use="optional" />
-      </xs:extension>
-
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="body" type="soap:tBody" />
-  <xs:attributeGroup name="tBodyAttributes" >
-    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />	   
-    <xs:attribute name="use" type="soap:useChoice" use="optional" />
-    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />
-  </xs:attributeGroup>
-  <xs:complexType name="tBody" >
-
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="parts" type="xs:NMTOKENS" use="optional" />
-        <xs:attributeGroup ref = "soap:tBodyAttributes" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:simpleType name="useChoice" >
-    <xs:restriction base="xs:string" >
-
-      <xs:enumeration value="literal" />
-      <xs:enumeration value="encoded" />
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:element name="fault" type="soap:tFault" />
-  <xs:complexType name="tFaultRes" abstract="true" >
-    <xs:complexContent>
-      <xs:restriction base="soap:tBody" >
-
-	    <xs:attribute ref="wsdl:required" use="optional" /> 
-        <xs:attribute name="parts" type="xs:NMTOKENS" use="prohibited" />
-		<xs:attributeGroup ref="soap:tBodyAttributes" />
-      </xs:restriction>
-    </xs:complexContent>  	
-  </xs:complexType>
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="soap:tFaultRes">
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-
-  <xs:element name="header" type="soap:tHeader" />
-  <xs:attributeGroup name="tHeaderAttributes" >
-    <xs:attribute name="message" type="xs:QName" use="required" />
-    <xs:attribute name="part" type="xs:NMTOKEN" use="required" />
-    <xs:attribute name="use" type="soap:useChoice" use="required" />
-
-    <xs:attribute name="encodingStyle" type="soap:encodingStyle" use="optional" />
-    <xs:attribute name="namespace" type="xs:anyURI" use="optional" />      
-  </xs:attributeGroup>
-  <xs:complexType name="tHeader" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:sequence>
-          <xs:element ref="soap:headerfault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-
-		<xs:attributeGroup ref="soap:tHeaderAttributes" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="headerfault" type="soap:tHeaderFault" />
-  <xs:complexType name="tHeaderFault" >
-	<xs:attributeGroup ref="soap:tHeaderAttributes" />
-  </xs:complexType>
-
-  <xs:element name="address" type="soap:tAddress" />
-  <xs:complexType name="tAddress" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibilityElement" >
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-</xs:schema>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/soapenc.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/soapenc.xsd
deleted file mode 100644
index 5ec80dc..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/soapenc.xsd
+++ /dev/null
@@ -1,585 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!-- Schema for the SOAP/1.1 encoding
-
-Portions © 2001 DevelopMentor. 
-© 2001 W3C (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved.  
- 
-This document is governed by the W3C Software License [1] as described in the FAQ [2].
-[1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-[2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD 
-By obtaining, using and/or copying this work, you (the licensee) agree that you have read, understood, and will comply with the following terms and conditions:
-
-Permission to use, copy, modify, and distribute this software and its documentation, with or without modification,  for any purpose and without fee or royalty is hereby granted, provided that you include the following on ALL copies of the software and documentation or portions thereof, including modifications, that you make:
-
-1.  The full text of this NOTICE in a location viewable to users of the redistributed or derivative work. 
-
-2.  Any pre-existing intellectual property disclaimers, notices, or terms and conditions. If none exist, a short notice of the following form (hypertext is preferred, text is permitted) should be used within the body of any redistributed or derivative code: "Copyright © 2001 World Wide Web Consortium, (Massachusetts Institute of Technology, Institut National de Recherche en Informatique et en Automatique, Keio University). All Rights Reserved. http://www.w3.org/Consortium/Legal/" 
-
-3.  Notice of any changes or modifications to the W3C files, including the date changes were made. (We recommend you provide URIs to the location from which the code is derived.)   
-
-Original W3C files; http://www.w3.org/2001/06/soap-encoding
-Changes made: 
-     - reverted namespace to http://schemas.xmlsoap.org/soap/encoding/
-     - reverted root to only allow 0 and 1 as lexical values
-	 - removed default value from root attribute declaration
-
-THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS.
-
-COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENTATION.
-
-The name and trademarks of copyright holders may NOT be used in advertising or publicity pertaining to the software without specific, written prior permission. Title to copyright in this software and any associated documentation will at all times remain with copyright holders.
-
--->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:tns="http://schemas.xmlsoap.org/soap/encoding/"
-           targetNamespace="http://schemas.xmlsoap.org/soap/encoding/" >
-        
- <xs:attribute name="root" >
-   <xs:annotation>
-     <xs:documentation>
-	   'root' can be used to distinguish serialization roots from other
-       elements that are present in a serialization but are not roots of
-       a serialized value graph 
-	 </xs:documentation>
-   </xs:annotation>
-   <xs:simpleType>
-
-     <xs:restriction base='xs:boolean'>
-	   <xs:pattern value='0|1' />
-	 </xs:restriction>
-   </xs:simpleType>
- </xs:attribute>
-
-  <xs:attributeGroup name="commonAttributes" >
-    <xs:annotation>
-	  <xs:documentation>
-
-	    Attributes common to all elements that function as accessors or 
-        represent independent (multi-ref) values.  The href attribute is
-        intended to be used in a manner like CONREF.  That is, the element
-        content should be empty iff the href attribute appears
-	  </xs:documentation>
-	</xs:annotation>
-    <xs:attribute name="id" type="xs:ID" />
-    <xs:attribute name="href" type="xs:anyURI" />
-    <xs:anyAttribute namespace="##other" processContents="lax" />
-  </xs:attributeGroup>
-
-  <!-- Global Attributes.  The following attributes are intended to be usable via qualified attribute names on any complex type referencing them. -->
-       
-  <!-- Array attributes. Needed to give the type and dimensions of an array's contents, and the offset for partially-transmitted arrays. -->
-
-   
-  <xs:simpleType name="arrayCoordinate" >
-    <xs:restriction base="xs:string" />
-  </xs:simpleType>
-          
-  <xs:attribute name="arrayType" type="xs:string" />
-  <xs:attribute name="offset" type="tns:arrayCoordinate" />
-  
-  <xs:attributeGroup name="arrayAttributes" >
-    <xs:attribute ref="tns:arrayType" />
-    <xs:attribute ref="tns:offset" />
-  </xs:attributeGroup>    
-  
-  <xs:attribute name="position" type="tns:arrayCoordinate" /> 
-  
-  <xs:attributeGroup name="arrayMemberAttributes" >
-
-    <xs:attribute ref="tns:position" />
-  </xs:attributeGroup>    
-
-  <xs:group name="Array" >
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-	</xs:sequence>
-  </xs:group>
-
-  <xs:element name="Array" type="tns:Array" />
-  <xs:complexType name="Array" >
-
-    <xs:annotation>
-	  <xs:documentation>
-	   'Array' is a complex type for accessors identified by position 
-	  </xs:documentation>
-	</xs:annotation>
-    <xs:group ref="tns:Array" minOccurs="0" />
-    <xs:attributeGroup ref="tns:arrayAttributes" />
-    <xs:attributeGroup ref="tns:commonAttributes" />
-  </xs:complexType> 
-
-  <!-- 'Struct' is a complex type for accessors identified by name. 
-       Constraint: No element may be have the same name as any other,
-       nor may any element have a maxOccurs > 1. -->
-
-   
-  <xs:element name="Struct" type="tns:Struct" />
-
-  <xs:group name="Struct" >
-    <xs:sequence>
-      <xs:any namespace="##any" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-	</xs:sequence>
-  </xs:group>
-
-  <xs:complexType name="Struct" >
-    <xs:group ref="tns:Struct" minOccurs="0" />
-
-    <xs:attributeGroup ref="tns:commonAttributes"/>
-  </xs:complexType> 
-
-  <!-- 'Base64' can be used to serialize binary data using base64 encoding
-       as defined in RFC2045 but without the MIME line length limitation. -->
-
-  <xs:simpleType name="base64" >
-    <xs:restriction base="xs:base64Binary" />
-  </xs:simpleType>
-
- <!-- Element declarations corresponding to each of the simple types in the 
-      XML Schemas Specification. -->
-
-  <xs:element name="duration" type="tns:duration" />
-
-  <xs:complexType name="duration" >
-    <xs:simpleContent>
-      <xs:extension base="xs:duration" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="dateTime" type="tns:dateTime" />
-
-  <xs:complexType name="dateTime" >
-    <xs:simpleContent>
-      <xs:extension base="xs:dateTime" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-
-
-  <xs:element name="NOTATION" type="tns:NOTATION" />
-  <xs:complexType name="NOTATION" >
-    <xs:simpleContent>
-      <xs:extension base="xs:QName" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  
-
-  <xs:element name="time" type="tns:time" />
-
-  <xs:complexType name="time" >
-    <xs:simpleContent>
-      <xs:extension base="xs:time" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="date" type="tns:date" />
-
-  <xs:complexType name="date" >
-    <xs:simpleContent>
-      <xs:extension base="xs:date" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gYearMonth" type="tns:gYearMonth" />
-
-  <xs:complexType name="gYearMonth" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gYearMonth" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gYear" type="tns:gYear" />
-
-  <xs:complexType name="gYear" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gYear" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gMonthDay" type="tns:gMonthDay" />
-
-  <xs:complexType name="gMonthDay" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gMonthDay" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gDay" type="tns:gDay" />
-
-  <xs:complexType name="gDay" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gDay" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="gMonth" type="tns:gMonth" />
-
-  <xs:complexType name="gMonth" >
-    <xs:simpleContent>
-      <xs:extension base="xs:gMonth" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-  
-  <xs:element name="boolean" type="tns:boolean" />
-  <xs:complexType name="boolean" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:boolean" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="base64Binary" type="tns:base64Binary" />
-  <xs:complexType name="base64Binary" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:base64Binary" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="hexBinary" type="tns:hexBinary" />
-  <xs:complexType name="hexBinary" >
-
-    <xs:simpleContent>
-     <xs:extension base="xs:hexBinary" >
-       <xs:attributeGroup ref="tns:commonAttributes" />
-     </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="float" type="tns:float" />
-  <xs:complexType name="float" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:float" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="double" type="tns:double" />
-  <xs:complexType name="double" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:double" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="anyURI" type="tns:anyURI" />
-  <xs:complexType name="anyURI" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:anyURI" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="QName" type="tns:QName" />
-  <xs:complexType name="QName" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:QName" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  
-  <xs:element name="string" type="tns:string" />
-  <xs:complexType name="string" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:string" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="normalizedString" type="tns:normalizedString" />
-  <xs:complexType name="normalizedString" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:normalizedString" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="token" type="tns:token" />
-  <xs:complexType name="token" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:token" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="language" type="tns:language" />
-  <xs:complexType name="language" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:language" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="Name" type="tns:Name" />
-  <xs:complexType name="Name" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:Name" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="NMTOKEN" type="tns:NMTOKEN" />
-  <xs:complexType name="NMTOKEN" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:NMTOKEN" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="NCName" type="tns:NCName" />
-  <xs:complexType name="NCName" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:NCName" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="NMTOKENS" type="tns:NMTOKENS" />
-  <xs:complexType name="NMTOKENS" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:NMTOKENS" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ID" type="tns:ID" />
-  <xs:complexType name="ID" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:ID" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="IDREF" type="tns:IDREF" />
-  <xs:complexType name="IDREF" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:IDREF" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ENTITY" type="tns:ENTITY" />
-  <xs:complexType name="ENTITY" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:ENTITY" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="IDREFS" type="tns:IDREFS" />
-  <xs:complexType name="IDREFS" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:IDREFS" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="ENTITIES" type="tns:ENTITIES" />
-  <xs:complexType name="ENTITIES" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:ENTITIES" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="decimal" type="tns:decimal" />
-  <xs:complexType name="decimal" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:decimal" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="integer" type="tns:integer" />
-  <xs:complexType name="integer" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:integer" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="nonPositiveInteger" type="tns:nonPositiveInteger" />
-  <xs:complexType name="nonPositiveInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:nonPositiveInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="negativeInteger" type="tns:negativeInteger" />
-  <xs:complexType name="negativeInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:negativeInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="long" type="tns:long" />
-  <xs:complexType name="long" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:long" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="int" type="tns:int" />
-  <xs:complexType name="int" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:int" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="short" type="tns:short" />
-  <xs:complexType name="short" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:short" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="byte" type="tns:byte" />
-  <xs:complexType name="byte" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:byte" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="nonNegativeInteger" type="tns:nonNegativeInteger" />
-  <xs:complexType name="nonNegativeInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:nonNegativeInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedLong" type="tns:unsignedLong" />
-  <xs:complexType name="unsignedLong" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedLong" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedInt" type="tns:unsignedInt" />
-  <xs:complexType name="unsignedInt" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedInt" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedShort" type="tns:unsignedShort" />
-  <xs:complexType name="unsignedShort" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedShort" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="unsignedByte" type="tns:unsignedByte" />
-  <xs:complexType name="unsignedByte" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:unsignedByte" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="positiveInteger" type="tns:positiveInteger" />
-  <xs:complexType name="positiveInteger" >
-
-    <xs:simpleContent>
-      <xs:extension base="xs:positiveInteger" >
-        <xs:attributeGroup ref="tns:commonAttributes" />
-      </xs:extension>
-    </xs:simpleContent>
-  </xs:complexType>
-
-  <xs:element name="anyType" />
-</xs:schema>
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl-mime.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl-mime.xsd
deleted file mode 100644
index a6dfbeb..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl-mime.xsd
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
- 
-Copyright 2001-2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/mime/2004-08-24.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
-  --> 
-<schema targetNamespace="http://schemas.xmlsoap.org/wsdl/mime/" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/">
-	<import namespace="http://schemas.xmlsoap.org/wsdl/"/>
-	<element name="content" type="mime:contentType"/>
-	<complexType name="contentType">
-		<complexContent>
-			<extension base="wsdl:tExtensibilityElement">
-				<sequence/>
-				<attribute name="type" type="string" use="optional"/>
-				<attribute name="part" type="NMTOKEN" use="optional"/>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="multipartRelated" type="mime:multipartRelatedType"/>
-	<complexType name="multipartRelatedType">
-		<complexContent>
-			<extension base="wsdl:tExtensibilityElement">
-				<sequence>
-					<element ref="mime:part" minOccurs="0" maxOccurs="unbounded"/>
-				</sequence>
-			</extension>
-		</complexContent>
-	</complexType>
-	<element name="part" type="mime:tPart"/>
-	<complexType name="tPart">
-		<sequence>
-			<any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-		<attribute name="name" type="NMTOKEN" use="optional"/>
-	</complexType>
-   	<element name="mimeXml" type = "mime:tMimeXml"/>
-   	<complexType name="tMimeXml">
-		<complexContent>
-			<extension base="wsdl:tExtensibilityElement">
-				<sequence/>
-				<attribute name="part" type="NMTOKEN" use="optional"/>
-			</extension>
-		</complexContent>
-   	</complexType>
-</schema>
diff --git a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl.xsd b/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl.xsd
deleted file mode 100644
index 9981d63..0000000
--- a/bundles/org.eclipse.wst.standard.schemas/xsd/wsdl.xsd
+++ /dev/null
@@ -1,322 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?> 
-<!-- 
- 
-Copyright 2001 - 2005, International Business Machines Corporation and Microsoft Corporation
-All Rights Reserved
-
-License for WSDL Schema Files
-
-The Authors grant permission to copy and distribute the WSDL Schema 
-Files in any medium without fee or royalty as long as this notice and 
-license are distributed with them.  The originals of these files can 
-be located at:
-
-http://schemas.xmlsoap.org/wsdl/2004-08-24.xsd
-
-THESE SCHEMA FILES ARE PROVIDED "AS IS," AND THE AUTHORS MAKE NO REPRESENTATIONS 
-OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THESE FILES, INCLUDING, BUT NOT 
-LIMITED TO, WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, 
-NON-INFRINGEMENT OR TITLE.  THE AUTHORS WILL NOT BE LIABLE FOR ANY DIRECT, 
-INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF OR 
-RELATING TO ANY USE OR DISTRIBUTION OF THESE FILES.
-
-The name and trademarks of the Authors may NOT be used in any manner, 
-including advertising or publicity pertaining to these files or any program 
-or service that uses these files, written prior permission.  Title to copyright 
-in these files will at all times remain with the Authors.
-
-No other rights are granted by implication, estoppel or otherwise.
-
-
---> 
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-           targetNamespace="http://schemas.xmlsoap.org/wsdl/"
-           elementFormDefault="qualified" >
-   
-  <xs:complexType mixed="true" name="tDocumentation" >
-    <xs:sequence>
-      <xs:any minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="tDocumented" >
-    <xs:annotation>
-      <xs:documentation>
-      This type is extended by  component types to allow them to be documented
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element name="documentation" type="wsdl:tDocumentation" minOccurs="0" />
-    </xs:sequence>
-  </xs:complexType>
-
- <!-- implemented resolution of swa124 -->
- <xs:complexType name="tExtensibleAttributesDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow attributes from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax" />   
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
- <!-- implemented resolution of swa124 -->
-  <xs:complexType name="tExtensibleDocumented" abstract="true" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tDocumented" >
-        <xs:annotation>
-          <xs:documentation>
-          This type is extended by component types to allow elements from other namespaces to be added.
-          </xs:documentation>
-        </xs:annotation>
-        <xs:sequence>
-          <xs:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax" />
-        </xs:sequence>
-        <xs:anyAttribute namespace="##other" processContents="lax" />   
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:element name="definitions" type="wsdl:tDefinitions" >
-    <xs:key name="message" >
-      <xs:selector xpath="wsdl:message" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="portType" >
-      <xs:selector xpath="wsdl:portType" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="binding" >
-      <xs:selector xpath="wsdl:binding" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="service" >
-      <xs:selector xpath="wsdl:service" />
-      <xs:field xpath="@name" />
-    </xs:key>
-    <xs:key name="import" >
-      <xs:selector xpath="wsdl:import" />
-      <xs:field xpath="@namespace" />
-    </xs:key>
-  </xs:element>
-
-  <xs:group name="anyTopLevelOptionalElement" >
-    <xs:annotation>
-      <xs:documentation>
-      Any top level optional element allowed to appear more then once - any child of definitions element except wsdl:types. Any extensibility element is allowed in any place.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:choice>
-      <xs:element name="import" type="wsdl:tImport" />
-      <xs:element name="types" type="wsdl:tTypes" />                     
-      <xs:element name="message"  type="wsdl:tMessage" >
-        <xs:unique name="part" >
-          <xs:selector xpath="wsdl:part" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-      </xs:element>
-      <xs:element name="portType" type="wsdl:tPortType" />
-      <xs:element name="binding"  type="wsdl:tBinding" />
-      <xs:element name="service"  type="wsdl:tService" >
-        <xs:unique name="port" >
-          <xs:selector xpath="wsdl:port" />
-          <xs:field xpath="@name" />
-        </xs:unique>
-	  </xs:element>
-    </xs:choice>
-  </xs:group>
-
-  <!-- implemented resolution of er015 and UPA fix. ASK -->
-  <xs:complexType name="tDefinitions">
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented">
-        <xs:sequence minOccurs="0">
-          <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
-          <xs:choice minOccurs="0" maxOccurs="unbounded">
-            <xs:group ref="wsdl:anyTopLevelOptionalElement"/>
-            <xs:any namespace="##other" processContents="lax"/>
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="targetNamespace" type="xs:anyURI" use=
-"optional"/>
-        <xs:attribute name="name" type="xs:NCName" use="optional"/>
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tImport" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="namespace" type="xs:anyURI" use="required" />
-        <xs:attribute name="location" type="xs:anyURI" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-   
-  <xs:complexType name="tTypes" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" />
-    </xs:complexContent>   
-  </xs:complexType>
-     
-  <xs:complexType name="tMessage" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="part" type="wsdl:tPart" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPart" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="element" type="xs:QName" use="optional" />
-        <xs:attribute name="type" type="xs:QName" use="optional" />    
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-
-  <xs:complexType name="tPortType" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-   
-  <xs:complexType name="tOperation" >
-    <xs:complexContent>   
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-	    <xs:sequence>
-          <xs:choice>
-            <xs:group ref="wsdl:request-response-or-one-way-operation" />
-            <xs:group ref="wsdl:solicit-response-or-notification-operation" />
-          </xs:choice>
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="parameterOrder" type="xs:NMTOKENS" use="optional" />
-      </xs:extension>
-    </xs:complexContent>   
-  </xs:complexType>
-    
-  <xs:group name="request-response-or-one-way-operation" >
-    <xs:sequence>
-      <xs:element name="input" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="output" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-      </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:group name="solicit-response-or-notification-operation" >
-    <xs:sequence>
-      <xs:element name="output" type="wsdl:tParam" />
-	  <xs:sequence minOccurs='0' >
-	    <xs:element name="input" type="wsdl:tParam" />
-		<xs:element name="fault" type="wsdl:tFault" minOccurs="0" maxOccurs="unbounded" />
-	  </xs:sequence>
-    </xs:sequence>
-  </xs:group>
-        
-  <xs:complexType name="tParam" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleAttributesDocumented" >
-        <xs:attribute name="name" type="xs:NCName"  use="required" />
-        <xs:attribute name="message" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tBinding" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="operation" type="wsdl:tBindingOperation" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="type" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-    
-  <xs:complexType name="tBindingOperationMessage" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="optional" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="tBindingOperationFault" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="tBindingOperation" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="input" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="output" type="wsdl:tBindingOperationMessage" minOccurs="0" />
-          <xs:element name="fault" type="wsdl:tBindingOperationFault" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tService" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:sequence>
-          <xs:element name="port" type="wsdl:tPort" minOccurs="0" maxOccurs="unbounded" />
-        </xs:sequence>
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-     
-  <xs:complexType name="tPort" >
-    <xs:complexContent>
-      <xs:extension base="wsdl:tExtensibleDocumented" >
-        <xs:attribute name="name" type="xs:NCName" use="required" />
-        <xs:attribute name="binding" type="xs:QName" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:attribute name="arrayType" type="xs:string" />
-  <xs:attribute name="required" type="xs:boolean" />
-  <xs:complexType name="tExtensibilityElement" abstract="true" >
-    <xs:attribute ref="wsdl:required" use="optional" />
-  </xs:complexType>
-
-</xs:schema>
diff --git a/bundles/org.eclipse.wst.xml.ui/.classpath b/bundles/org.eclipse.wst.xml.ui/.classpath
deleted file mode 100644
index 9d03c22..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.classpath
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="src" path="src-validation" />
-	<classpathentry kind="src" path="src-multipage" />
-	<classpathentry kind="src" path="src-wizards" />
-	<classpathentry kind="src" path="src-catalog" />
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/core/ValidationException" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/operations/LocalizedMessage/" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/core/IMessage" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/core/Message" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/core/IReporter" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/core/IValidationContext" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/core/IValidator" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/dnd/DefaultDragAndDropCommand" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/dialogs/SelectSingleFileDialog" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/core/IMessageAccess" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/core/IProjectValidationContext" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/core/IValidatorJob" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/viewers/SelectSingleFileView" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/dnd/DragAndDropCommand" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/dnd/DragAndDropManager" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/dnd/ObjectTransfer" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/dnd/ViewerDragAdapter" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/dnd/ViewerDropAdapter" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/ConfigurationManager" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/ProjectConfiguration" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/ValidationRegistryReader" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/ValidatorMetaData" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/ValidationFactory" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/common/ui/internal/viewers/*" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/ValidationConfiguration" />
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin" />
-</classpath>
diff --git a/bundles/org.eclipse.wst.xml.ui/.cvsignore b/bundles/org.eclipse.wst.xml.ui/.cvsignore
deleted file mode 100644
index 701c285..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-bin
-temp.folder
-build.xml
-xmleditor.jar
-org.eclipse.wst.xml.ui_1.0.0.jar
-org.eclipse.wst.xml.ui_1.0.0.zip
-xmleditorsrc.zip
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.xml.ui/.options b/bundles/org.eclipse.wst.xml.ui/.options
deleted file mode 100644
index 5acae8f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.options
+++ /dev/null
@@ -1 +0,0 @@
-org.eclipse.wst.xml.ui/projectionperf=false
diff --git a/bundles/org.eclipse.wst.xml.ui/.project b/bundles/org.eclipse.wst.xml.ui/.project
deleted file mode 100644
index 50dc4a8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.ui</name>
-	<comment></comment>
-	<projects></projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index a512da0..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Sat Mar 24 02:59:49 EDT 2007

-eclipse.preferences.version=1

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.builder.invalidClasspath=ignore

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.4

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

-org.eclipse.jdt.core.compiler.problem.deprecation=ignore

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled

-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning

-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore

-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unusedLabel=error

-org.eclipse.jdt.core.compiler.problem.unusedLocal=error

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.3

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 0ece7b5..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,51 +0,0 @@
-#Wed Nov 22 23:23:01 EST 2006
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=false
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_serial_version_id=true
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=true
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.format_comment=true
-cleanup.format_javadoc=true
-cleanup.format_multi_line_comment=true
-cleanup.format_single_line_comment=true
-cleanup.format_source_code=true
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=false
-cleanup.organize_imports=true
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=true
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.use_blocks=true
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=true
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=_SSE Team Styles
-cleanup_settings_version=2
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index de4a8be..0000000
--- a/bundles/org.eclipse.wst.xml.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,25 +0,0 @@
-#Wed Jun 04 20:07:47 EDT 2008
-compilers.f.unresolved-features=1
-compilers.f.unresolved-plugins=1
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.discouraged-class=1
-compilers.p.illegal-att-value=0
-compilers.p.internal=1
-compilers.p.missing-packages=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-identifier=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.s.create-docs=false
-compilers.s.doc-folder=doc
-compilers.s.open-tags=1
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9f70e01..0000000
--- a/bundles/org.eclipse.wst.xml.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,61 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xml.ui; singleton:=true
-Bundle-Version: 1.1.100.qualifier
-Bundle-Activator: org.eclipse.wst.xml.ui.internal.XMLUIPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xml.ui,
- org.eclipse.wst.xml.ui.internal;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.actions;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.autoedit;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.catalog;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.contentassist;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.contentoutline;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.correction;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.dialogs;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.dnd;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.doubleclick;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.editor;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.handlers;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.hyperlink;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.nsedit;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.perspective;x-friends:="org.eclipse.wst.xsl.ui",
- org.eclipse.wst.xml.ui.internal.preferences;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.projection;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.properties;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.provisional;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.registry;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.search;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.selection;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.spelling,
- org.eclipse.wst.xml.ui.internal.style;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.tabletree;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.taginfo;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.templates;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.text;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.util;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.validation;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.validation.core.errorinfo;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.internal.wizards;x-friends:="org.eclipse.wst.xsd.ui,org.eclipse.wst.dtd.ui",
- org.eclipse.wst.xml.ui.views.contentoutline,
- org.eclipse.wst.xml.ui.views.properties
-Import-Package: com.ibm.icu.util; version="3.8",
- com.ibm.icu.text; version="3.8"
-Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.views;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.301,1.2.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.500,1.2.0)",
- org.eclipse.wst.common.ui;bundle-version="[1.1.400,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.100,1.3.0)",
- org.eclipse.core.expressions;bundle-version="[3.4.100,4.0.0)"
-Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.wst.xml.ui.internal.validation.core.errorinfo"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.wst.xml.ui/about.html b/bundles/org.eclipse.wst.xml.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.xml.ui/about.ini b/bundles/org.eclipse.wst.xml.ui/about.ini
deleted file mode 100644
index 68af291..0000000
--- a/bundles/org.eclipse.wst.xml.ui/about.ini
+++ /dev/null
@@ -1,12 +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 "featureImage" contains path to feature image (32x32)
-featureImage=icons/WTP_icon_x32_v2.png
-
diff --git a/bundles/org.eclipse.wst.xml.ui/about.mappings b/bundles/org.eclipse.wst.xml.ui/about.mappings
deleted file mode 100644
index bddaab4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/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/bundles/org.eclipse.wst.xml.ui/about.properties b/bundles/org.eclipse.wst.xml.ui/about.properties
deleted file mode 100644
index 8f60396..0000000
--- a/bundles/org.eclipse.wst.xml.ui/about.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-# 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=Eclipse XML Editors and Tools\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others 2005, 2009.  All rights reserved.\n\
-Visit http://www.eclipse.org/webtools
diff --git a/bundles/org.eclipse.wst.xml.ui/build.properties b/bundles/org.eclipse.wst.xml.ui/build.properties
deleted file mode 100644
index f7dbd12..0000000
--- a/bundles/org.eclipse.wst.xml.ui/build.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-bin.includes = plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               templates/,\
-               examples/,\
-               META-INF/,\
-               .,\
-               .options,\
-               about.html,\
-               about.ini,\
-               about.properties,\
-               about.mappings
-bin.excludes = bin/**,\
-               @dot/**,\
-               temp.folder/**
-source.. = src/,\
-           src-multipage/,\
-           src-wizards/,\
-           src-catalog/,\
-           src-validation/
diff --git a/bundles/org.eclipse.wst.xml.ui/examples/EditingAndValidatingXML.zip b/bundles/org.eclipse.wst.xml.ui/examples/EditingAndValidatingXML.zip
deleted file mode 100644
index 6257767..0000000
--- a/bundles/org.eclipse.wst.xml.ui/examples/EditingAndValidatingXML.zip
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/WTP_icon_x32_v2.png b/bundles/org.eclipse.wst.xml.ui/icons/WTP_icon_x32_v2.png
deleted file mode 100644
index 6f09c2a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/WTP_icon_x32_v2.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/XMLFile.gif b/bundles/org.eclipse.wst.xml.ui/icons/XMLFile.gif
deleted file mode 100644
index 14eb1be..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/XMLFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/collapse.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/collapse.gif
deleted file mode 100644
index ce74721..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/collapse.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/collapse_all.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/collapse_all.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/collapse_all.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/constrainoff.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/constrainoff.gif
deleted file mode 100644
index 4bdceb8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/constrainoff.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/constrainon.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/constrainon.gif
deleted file mode 100644
index e823d57..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/constrainon.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/expand.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/expand.gif
deleted file mode 100644
index bc37b7a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/expand.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/expand_all.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/expand_all.gif
deleted file mode 100644
index 492c14f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/expand_all.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/new_xml.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/new_xml.gif
deleted file mode 100644
index e1cfdf7..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/new_xml.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/rldgrmr.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/rldgrmr.gif
deleted file mode 100644
index 49325dd..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/rldgrmr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/validate.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/validate.gif
deleted file mode 100644
index 561d146..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/dtool16/validate.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/collapse.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/collapse.gif
deleted file mode 100644
index b75bc19..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/collapse.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/collapse_all.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/collapse_all.gif
deleted file mode 100644
index a2d80a9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/collapse_all.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/constrainoff.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/constrainoff.gif
deleted file mode 100644
index c1ab04c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/constrainoff.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/constrainon.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/constrainon.gif
deleted file mode 100644
index 082f9c0..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/constrainon.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/expand.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/expand.gif
deleted file mode 100644
index b2f4530..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/expand.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/expand_all.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/expand_all.gif
deleted file mode 100644
index 0205b29..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/expand_all.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/new_xml.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/new_xml.gif
deleted file mode 100644
index 9dfb62d..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/new_xml.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/rldgrmr.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/rldgrmr.gif
deleted file mode 100644
index 049cac6..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/rldgrmr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/validate.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/validate.gif
deleted file mode 100644
index 2b347ac..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/etool16/validate.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/XSDFile.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/XSDFile.gif
deleted file mode 100644
index cc0eeb7..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/XSDFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/add_correction.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/add_correction.gif
deleted file mode 100644
index 252d7eb..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/add_correction.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/att_req_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/att_req_obj.gif
deleted file mode 100644
index a8c66d5..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/att_req_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/attribute_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/attribute_obj.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/attribute_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/cdatasection.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/cdatasection.gif
deleted file mode 100644
index 6b0872c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/cdatasection.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/choice.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/choice.gif
deleted file mode 100644
index d13ba2e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/choice.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/comment_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/comment_obj.gif
deleted file mode 100644
index 28c2ccb..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/comment_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/correction_change.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/correction_change.gif
deleted file mode 100644
index af83c52..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/correction_change.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/default.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/default.gif
deleted file mode 100644
index 9ced204..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/default.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/doctype.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/doctype.gif
deleted file mode 100644
index 3300f82..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/doctype.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/dtdfile.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/dtdfile.gif
deleted file mode 100644
index 3c0acad..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/dtdfile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/element_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/element_obj.gif
deleted file mode 100644
index 3567815..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/element_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/entity.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/entity.gif
deleted file mode 100644
index 61fd3d4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/entity.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/entity_reference.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/entity_reference.gif
deleted file mode 100644
index 3af9149..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/entity_reference.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/enum.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/enum.gif
deleted file mode 100644
index 5c0a481..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/enum.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/error-overlay.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/error-overlay.gif
deleted file mode 100644
index 119dccc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/error-overlay.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/localvariable_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/localvariable_obj.gif
deleted file mode 100644
index 3244b26..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/localvariable_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/notation.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/notation.gif
deleted file mode 100644
index 57ad089..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/notation.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/occurone_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/occurone_obj.gif
deleted file mode 100644
index 7bb65c9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/occurone_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/proinst_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/proinst_obj.gif
deleted file mode 100644
index 74436d8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/proinst_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/sort.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/sort.gif
deleted file mode 100644
index 23c5d0b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/sort.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag-generic.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag-generic.gif
deleted file mode 100644
index 65f516e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag-generic.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag-macro.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag-macro.gif
deleted file mode 100644
index 5d1f81b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag-macro.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag_generic_deemphasized_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag_generic_deemphasized_obj.gif
deleted file mode 100644
index cacb405..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag_generic_deemphasized_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag_generic_emphasized_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag_generic_emphasized_obj.gif
deleted file mode 100644
index 45c1db4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/tag_generic_emphasized_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/text.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/text.gif
deleted file mode 100644
index efa7a38..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/text.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/txtext.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/txtext.gif
deleted file mode 100644
index b226e41..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/txtext.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/warning_obj.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/warning_obj.gif
deleted file mode 100644
index 1e5f5eb..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/obj16/warning_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/error_ovr.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/error_ovr.gif
deleted file mode 100644
index 119dccc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/error_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/stale_error_ovr.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/stale_error_ovr.gif
deleted file mode 100644
index 5b0471b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/stale_error_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/warn_ovr.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/warn_ovr.gif
deleted file mode 100644
index c350704..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/ovr16/warn_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/view16/attibute.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/view16/attibute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/view16/attibute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/wizban/generatexml_wiz.png b/bundles/org.eclipse.wst.xml.ui/icons/full/wizban/generatexml_wiz.png
deleted file mode 100644
index b17e48a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/wizban/generatexml_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/full/xml_perspective.gif b/bundles/org.eclipse.wst.xml.ui/icons/full/xml_perspective.gif
deleted file mode 100644
index f439b47..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/full/xml_perspective.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/newSampleProject_wiz.gif b/bundles/org.eclipse.wst.xml.ui/icons/newSampleProject_wiz.gif
deleted file mode 100644
index dc96b10..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/newSampleProject_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/newSampleProject_wizbanner.png b/bundles/org.eclipse.wst.xml.ui/icons/newSampleProject_wizbanner.png
deleted file mode 100644
index be71474..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/newSampleProject_wizbanner.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/sourceEditor.gif b/bundles/org.eclipse.wst.xml.ui/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/icons/xmldoc.gif b/bundles/org.eclipse.wst.xml.ui/icons/xmldoc.gif
deleted file mode 100644
index 14eb1be..0000000
--- a/bundles/org.eclipse.wst.xml.ui/icons/xmldoc.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.properties b/bundles/org.eclipse.wst.xml.ui/plugin.properties
deleted file mode 100644
index 6290c96..0000000
--- a/bundles/org.eclipse.wst.xml.ui/plugin.properties
+++ /dev/null
@@ -1,140 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     David Carver / STAR Standards - added XML Catalog Import/Export Wizard
-#                                     bug 192568
-#     David Carver / STAR Standards - bug 212330 - migrate to org.eclipse.ui.menus 	
-###############################################################################
-providerName=Eclipse Web Tools Platform
-pluginName=Eclipse XML Editors and Tools
-XML.name=XML
-XML_Files.name=XML Files
-XML_Source.name=Editor
-XML_Validator.name=Validation
-XML_Templates.name=Templates
-XML_Styles.name=Styles
-XML_Syntax_Coloring=Syntax Coloring
-XML_Typing=Typing
-XML_Editor.name=XML Editor
-###############################################################################
-_UI_WIZARD_NEW_XML=XML File
-_UI_WIZARD_XML_CATEGORY=XML
-genMenuLabel=&Generate
-_UI_ACTION_CREATE_XML=&XML File...
-_UI_CREATE_NEW_XML_FILE=Create a new XML file
-_UI_WIZARD_IMPORT_EXPORT_XMLCATALOG=XML Catalog
-_UI_IMPORT_XML_CATALOG_FILE=Import an existing XML Catalog.
-_UI_EXPORT_XML_CATALOG_FILE=Export an XML Catalog.
-XMLExample.name=Editing and validating XML files
-XMLExampleProjectCreationWizard.description=Create a project containing XML sample files
-XMLExampleProjectCreationWizard.projectname=XMLExamples
-XMLExampleProjectCreationWizard.pagetitle=XML sample files for editing and validating
-XMLExampleProjectCreationWizard.pagedescription=Create a project containing XML sample files.
-XMLExampleProjectCreationWizard.label=&Project Name:
-###############################################################################
-All_XML_context_type_Extension_Element.name=All XML
-XML_New_context_type_Extension_Element.name=New XML
-XML_Tag_context_type_Extension_Element.name=XML Tag
-XML_Attribute_context_type_Extension_Element.name=XML Attribute
-XML_Attribute_value_context_type_Extension_Element.name=XML Attribute value
-###############################################################################
-AddTask.label=Add &Task...
-AddTask.tooltip=Add Task...
-AddBookmark.label=Add Boo&kmark...
-AddBookmark.tooltip=Add Bookmark...
-SelectRuler.label=Select Ruler
-###############################################################################
-XML_Catalog_File_Type_Extension_Point.name=XML Catalog file type extension point
-_UI_PREF_XML_CATALOG=XML Catalog
-_UI_PREF_DTD_FILES=DTD Files
-_UI_PREF_XSD_FILES=XSD Files
-_UI_PREF_TAGLIB_DEF_FILES=Taglib Definition Files
-###############################################################################
-_UI_XML_VALIDATOR                   = XML Validator
-_UI_REF_FILE_SHOW_DETAILS           = Show Details...
-_UI_MENU_VALIDATE_XML               = Validate XML File
-##
-CleanupDocument_label=Cleanup Document...
-CleanupDocument_tooltip=Cleanup Document
-ToggleComment_label=Toggle Comment
-ToggleComment_tooltip=Toggle Comment
-AddBlockComment_label=Add Block Comment
-AddBlockComment_tooltip=Add Block Comment
-RemoveBlockComment_label=Remove Block Comment
-RemoveBlockComment_tooltip=Remove Block Comment
-FindOccurrences_label=Occurrences in File
-##
-preferenceKeywords.files=editor xml creating saving files suffix specified encoding iana
-preferenceKeywords.source=editor xml source formatting line width split multiple attributes new clear blank indent tabs spaces size content assist automatically suggestions prompt characters inserted strategy lax strict grammar constraints inferred absence dtd schema
-preferenceKeywords.templates=editor xml templates snippet macros
-preferenceKeywords.styles=editor xml style customize syntax highlighting type text content foreground background bold color
-preferenceKeywords.xmlcatalog=xml catalog entries
-preferenceKeywords.severities=xml grammar errors warnings ignore options severity severities suppress project specific projectspecific
-
-##
-XML_Source_target_name=XML Editors
-XML_hyperlink=Tags And Attributes
-##
-DesignMenu_name=&Design
-ReloadDependencies_name=Reload Dependencies
-ReloadDependencies_description=Reload Dependencies
-ReloadDependencies_mnemonic=R
-Constraints_name=Turn off Grammar Constraints
-Constraints_description=Turn off grammar Constraints
-Constraints_mnemonic=T
-ExpandAll_name=Expand All
-CollapseAll_name=Collapse All
-ActionDefinition.nextSibling.name=Next Sibling
-ActionDefinition.nextSibling.description=Go to Next Sibling
-ActionDefinition.previousSibling.name=Previous Sibling
-ActionDefinition.previousSibling.description=Go to Previous Sibling
-ActionDefinition.gotoMatchingTag.name=Matching Tag
-ActionDefinition.gotoMatchingTag.description=Go to Matching Tag
-MatchingTagPreference.label=Matching Tags
-
-scope.structured.text.editor.xml.name=Editing XML Source
-scope.structured.text.editor.xml.description=Editing XML Source
-scope.structured.text.editor.xml.navigation.name=XML Source Navigation
-scope.structured.text.editor.xml.navigation.description=XML Source Navigation
-scope.structured.text.editor.xml.cleanup.name=XML Source Cleanup
-scope.structured.text.editor.xml.cleanup.description=XML Source Cleanup
-scope.structured.text.editor.xml.comments.name=XML Source Comments
-scope.structured.text.editor.xml.comments.description=XML Source Comments
-scope.structured.text.editor.xml.selection.name=XML Source Selection
-scope.structured.text.editor.xml.selection.description=XML Source Selection
-scope.structured.text.editor.xml.dependencies.name=XML Source Dependencies
-scope.structured.text.editor.xml.dependencies.description=XML Source Dependencies
-scope.structured.text.editor.xml.grammar.name=XML Source Grammar
-scope.structured.text.editor.xml.grammar.description=XML Source Grammar
-scope.structured.text.editor.xml.expand.name=XML Source Expand/Collapse
-scope.structured.text.editor.xml.expand.description=XML Source Expand/Collapse
-scope.structured.text.editor.xml.occurrences.name=XML Source Occurrences
-scope.structured.text.editor.xml.occurrences.description=XML Source Occurrences
-
-Colors.tagAttributeName=Tag Attribute Name
-Colors.tagAttributeValue=Tag Attribute Value
-Colors.commentBorder=Comment Border
-Colors.commentText=Comment Text
-Colors.declBorder=Declaration Border
-Colors.doctypeName=Doctype Name
-Colors.doctypeExternalPubref=Doctype External Public Reference
-Colors.doctypeExternalId=Doctype External Id
-Colors.doctypeExtrenalSysref=Doctype External System Reference
-Colors.tagBorder=Tag Border
-Colors.tagName=Tag Name
-Colors.piBorder=Processing Instruction Border
-Colors.cdataBorder=CDATA Border
-Colors.cdataText=CDATA Text
-Colors.entityReference=Entity Reference
-
-# Menu contributions
-command.toggle.comment.mnemonic=T
-command.add.block.comment.mnemonic=A
-command.remove.block.comment.mnemonic=R
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.ui/plugin.xml b/bundles/org.eclipse.wst.xml.ui/plugin.xml
deleted file mode 100644
index 16ef25a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/plugin.xml
+++ /dev/null
@@ -1,1665 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.3"?>
-<plugin>
-
-	<extension-point id="catalogFileType" name="%XML_Catalog_File_Type_Extension_Point.name" schema="schema/catalogFileType.exsd"/>
-
-	<extension point="org.eclipse.wst.xml.ui.catalogFileType">
-		<fileType
-			extensions="dtd, ent, mod"
-			description="%_UI_PREF_DTD_FILES"
-			id="org.eclipse.wst.xml.core.ui.catalogFileType.dtd">
-		</fileType>
-		<fileType
-			extensions="xsd"
-			description="%_UI_PREF_XSD_FILES"
-			id="org.eclipse.wst.xml.core.ui.catalogFileType.xsd">
-		</fileType>
-		<fileType
-			extensions="tld"
-			description="%_UI_PREF_TAGLIB_DEF_FILES"
-			id="org.eclipse.wst.xml.core.ui.catalogFileType.tld">
-		</fileType>
-	</extension>
-
-	<!--The org.eclipse.wst.xml.core.xmlsource content type is only for
-		handling some special cases of ill-formed xml in a reasonable
-		manner, and should not be emulated by clients. The two content
-		types are often used interchangeably by the XML component, but
-		please use org.eclipse.core.runtime.xml instead. -->
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<sourceViewerConfiguration
-			class="org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<contentOutlineConfiguration
-			class="org.eclipse.wst.xml.ui.views.contentoutline.XMLContentOutlineConfiguration"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<propertySheetConfiguration
-			class="org.eclipse.wst.xml.ui.views.properties.XMLPropertySheetConfiguration"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<documentationTextHover
-        	class="org.eclipse.wst.xml.ui.internal.taginfo.XMLTagInfoHoverProcessor"
-        	target="org.eclipse.wst.xml.XML_DEFAULT">
-  		</documentationTextHover>
-  		<doubleClickStrategy
-        	class="org.eclipse.wst.xml.ui.internal.doubleclick.XMLDoubleClickStrategy"
-        	target="org.eclipse.wst.xml.XML_DEFAULT">
-  		</doubleClickStrategy>
-		<provisionalConfiguration
-			type="sourceeditingtexttools"
-			class="org.eclipse.wst.xml.ui.internal.provisional.XMLSourceEditingTextTools"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<provisionalConfiguration
-			type="characterpairmatcher"
-			class="org.eclipse.wst.xml.ui.internal.text.XMLDocumentRegionEdgeMatcher"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<provisionalConfiguration
-			type="foldingstrategy"
-			class="org.eclipse.wst.xml.ui.internal.projection.XMLFoldingStrategy"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<provisionalConfiguration
-			type="org.eclipse.jface.text.quickassist.IQuickAssistProcessor"
-			class="org.eclipse.wst.xml.ui.internal.correction.XMLQuickAssistProcessor"
-			target="org.eclipse.wst.xml.XML_DEFAULT" />
-		<provisionalConfiguration
-			type="autoeditstrategy"
-			class="org.eclipse.wst.xml.ui.internal.autoedit.StructuredAutoEditStrategyXML"
-			target="org.eclipse.wst.xml.XML_DEFAULT" />
-		<provisionalDefinition
-			type="preferencepages"
-			value="org.eclipse.wst.xml.ui.preferences.xml.xml, org.eclipse.wst.sse.ui.preferences.xml.source, org.eclipse.wst.sse.ui.preferences.xml.templates, org.eclipse.wst.sse.ui.preferences.xml.colors"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<provisionalDefinition
-			type="spellingregions"
-			value="XML_COMMENT_TEXT, XML_CONTENT, XML_DEFAULT"
-			target="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.core.xmlsource" />
-		<provisionalDefinition
-			type="activecontexts"
-			value="org.eclipse.core.runtime.xml, org.eclipse.wst.xml.navigation, org.eclipse.wst.xml.cleanup, org.eclipse.wst.xml.comments, org.eclipse.wst.xml.selection, org.eclipse.wst.xml.dependencies, org.eclipse.wst.xml.grammar, org.eclipse.wst.xml.expand, org.eclipse.wst.xml.occurrences"
-        	target="org.eclipse.core.runtime.xml" />
-	</extension>
-	
-	<extension point="org.eclipse.ui.contexts">
-		<context
-			name="%scope.structured.text.editor.xml.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.description"
-			id="org.eclipse.core.runtime.xml">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.navigation.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.navigation.description"
-			id="org.eclipse.wst.xml.navigation">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.cleanup.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.cleanup.description"
-			id="org.eclipse.wst.xml.cleanup">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.comments.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.comments.description"
-			id="org.eclipse.wst.xml.comments">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.selection.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.selection.description"
-			id="org.eclipse.wst.xml.selection">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.dependencies.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.dependencies.description"
-			id="org.eclipse.wst.xml.dependencies">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.grammar.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.grammar.description"
-			id="org.eclipse.wst.xml.grammar">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.expand.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.expand.description"
-			id="org.eclipse.wst.xml.expand">
-		</context>
-		<context
-			name="%scope.structured.text.editor.xml.occurrences.name"
-			parentId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			description="%scope.structured.text.editor.xml.occurrences.description"
-			id="org.eclipse.wst.xml.occurrences">
-		</context>
-	</extension>
-	
-	<extension
-		point="org.eclipse.core.filebuffers.annotationModelCreation">
-		<factory
-			contentTypeId="org.eclipse.core.runtime.xml"
-			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
-		<factory
-			contentTypeId="org.eclipse.wst.xml.core.xmlsource"
-			class="org.eclipse.wst.sse.ui.internal.StructuredResourceMarkerAnnotationModelFactory" />
-	</extension>
-	<extension
-		point="org.eclipse.wst.sse.ui.adapterFactoryDescription">
-		<adapterFactoryDescription
-			class="org.eclipse.wst.xml.ui.internal.registry.AdapterFactoryProviderForXML">
-			<contentType id="org.eclipse.core.runtime.xml" />
-			<contentType id="org.eclipse.wst.xml.core.xmlsource" />
-		</adapterFactoryDescription>
-	</extension>
-	<extension point="org.eclipse.ui.preferencePages">
-		<!-- The "top-level" XML category -->
-		<page
-			name="%XML.name"
-			class="org.eclipse.wst.xml.ui.internal.preferences.EmptyFilePreferencePage"
-			id="org.eclipse.wst.xml.ui.preferences.xml">
-		</page>
-		<!-- The "lower level" XML Files category/page -->
-		<page
-			name="%XML_Files.name"
-			category="org.eclipse.wst.xml.ui.preferences.xml"
-			class="org.eclipse.wst.xml.ui.internal.preferences.XMLFilesPreferencePage"
-			id="org.eclipse.wst.xml.ui.preferences.xml.xml">
-         	<keywordReference id="org.eclipse.wst.xml.ui.files"/>
-        </page>
-		<!-- XML PREFERENCE PAGES -->
-		<page
-			name="%XML_Source.name"
-			category="org.eclipse.wst.xml.ui.preferences.xml.xml"
-			class="org.eclipse.wst.xml.ui.internal.preferences.XMLSourcePreferencePage"
-			id="org.eclipse.wst.sse.ui.preferences.xml.source">
-         	<keywordReference id="org.eclipse.wst.xml.ui.source"/>
-		</page>
-		<page
-			name="%XML_Templates.name"
-			category="org.eclipse.wst.sse.ui.preferences.xml.source"
-			class="org.eclipse.wst.xml.ui.internal.preferences.XMLTemplatePreferencePage"
-			id="org.eclipse.wst.sse.ui.preferences.xml.templates">
-         	<keywordReference id="org.eclipse.wst.xml.ui.templates"/>
-		</page>
-		<page
-			name="%XML_Syntax_Coloring"
-			category="org.eclipse.wst.sse.ui.preferences.xml.source"
-			class="org.eclipse.wst.xml.ui.internal.preferences.XMLSyntaxColoringPage"
-			id="org.eclipse.wst.sse.ui.preferences.xml.colors">
-         	<keywordReference id="org.eclipse.wst.xml.ui.styles"/>
-		</page>
-		<page
-			name="%_UI_PREF_XML_CATALOG"
-			category="org.eclipse.wst.xml.ui.preferences.xml"
-			class="org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogPreferencePage"
-			id="org.eclipse.wst.xml.core.ui.XMLCatalogPreferencePage">
-         	<keywordReference id="org.eclipse.wst.xml.ui.xmlcatalog"/>
-		</page>
-		<page
-			name="%XML_Typing"
-			category="org.eclipse.wst.sse.ui.preferences.xml.source"
-			class="org.eclipse.wst.xml.ui.internal.preferences.XMLTypingPreferencePage"
-			id="org.eclipse.wst.sse.ui.preferences.xml.typing">
-		</page>
-    	<page
-            name="%XML_Validator.name"
-            category="org.eclipse.wst.xml.ui.preferences.xml.xml"
-            class="org.eclipse.wst.xml.ui.internal.preferences.XMLValidatorPreferencePage"
-            id="org.eclipse.wst.sse.ui.preferences.xml.validation">
-       	    <keywordReference id="org.eclipse.wst.xml.ui.severities"/>
-    	</page>
-	</extension>
-	
-	<!-- Keywords for preference and properties pages -->
-	<extension point="org.eclipse.ui.keywords">
-		<keyword
-			label="%preferenceKeywords.files"
-			id="org.eclipse.wst.xml.ui.files"/>
-		<keyword
-			label="%preferenceKeywords.source"
-			id="org.eclipse.wst.xml.ui.source"/>
-		<keyword
-			label="%preferenceKeywords.templates"
-			id="org.eclipse.wst.xml.ui.templates"/>
-		<keyword
-			label="%preferenceKeywords.styles"
-			id="org.eclipse.wst.xml.ui.styles"/>
-		<keyword
-			label="%preferenceKeywords.xmlcatalog"
-			id="org.eclipse.wst.xml.ui.xmlcatalog"/>
-		<keyword
-			label="%preferenceKeywords.severities"
-			id="org.eclipse.wst.xml.ui.severities"/>
-    </extension>
-	
-	<!-- Editor actionsets -->
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part id="org.eclipse.core.runtime.xml.source"></part>
-			<part id="org.eclipse.core.runtime.xml.source2"></part>
-		</actionSetPartAssociation>
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.NavigateActionSet">
-			<part id="org.eclipse.core.runtime.xml.source"></part>
-			<part id="org.eclipse.core.runtime.xml.source2"></part>
-		</actionSetPartAssociation>
-	</extension>
-
-	<!-- Templates -->
-	<extension point="org.eclipse.ui.editors.templates">
-		<contextType
-			name="%All_XML_context_type_Extension_Element.name"
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xml_all">
-		</contextType>
-		<contextType
-			name="%XML_New_context_type_Extension_Element.name"
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xml_new">
-		</contextType>
-		<contextType
-			name="%XML_Tag_context_type_Extension_Element.name"
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xml_tag">
-		</contextType>
-		<contextType
-			name="%XML_Attribute_context_type_Extension_Element.name"
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xml_attribute">
-		</contextType>
-		<contextType
-			name="%XML_Attribute_value_context_type_Extension_Element.name"
-			class="org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeXML"
-			id="xml_attribute_value">
-		</contextType>
-		<include
-			file="templates/xmldefault-templates.xml"
-			translations="$nl$/templates/xmldefault-templates.properties">
-		</include>
-	</extension>
-
-	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%XML_Editor.name"
-			icon="$nl$/icons/xmldoc.gif"
-			contributorClass="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorActionBarContributor"
-			class="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"
-			symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-			id="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart">
-			<contentTypeBinding
-				contentTypeId="org.eclipse.core.runtime.xml" />
-			<contentTypeBinding
-				contentTypeId="org.eclipse.wst.xml.core.xmlsource" />
-
-		</editor>
-	</extension>
-
-	<!-- Editor actionsets -->
-	<extension point="org.eclipse.ui.actionSetPartAssociations">
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.edit.text.actionSet.annotationNavigation">
-			<part
-				id="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart">
-			</part>
-		</actionSetPartAssociation>
-		<actionSetPartAssociation
-			targetID="org.eclipse.ui.NavigateActionSet">
-			<part
-				id="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart">
-			</part>
-		</actionSetPartAssociation>
-	</extension>
-
-
-
-	<!-- ================================================== -->
-	<!-- Contribute a 'New Wizard' for XML files            -->
-	<!-- ================================================== -->
-	<extension point="org.eclipse.ui.newWizards">
-		<category
-			name="%_UI_WIZARD_XML_CATEGORY"
-			id="org.eclipse.wst.XMLCategory">
-		</category>
-		<wizard
-			name="%_UI_WIZARD_NEW_XML"
-			icon="/icons/full/etool16/new_xml.gif"
-			category="org.eclipse.wst.XMLCategory"
-			class="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard"
-			id="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard">
-			<description>%_UI_CREATE_NEW_XML_FILE</description>
-			<selection class="org.eclipse.core.resources.IResource">
-			</selection>
-		</wizard>
-	</extension>
-
-	<!-- =============================================================================== -->
-	<!-- Allow the 'New XML' wizard to be accessed via the 'Generate' menu on a XSD file -->
-	<!-- =============================================================================== -->
-<!--
-	<extension point="org.eclipse.ui.popupMenus">
-		<objectContribution
-			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.xsd"
-			id="org.eclipse.wst.xmlwizard.createXMLFromXSD">
-			<menu
-				label="%genMenuLabel"
-				path="additions"
-				id="generateXMLArtifacts">
-				<separator name="xml" />
-			</menu>
-			<action
-				label="%_UI_ACTION_CREATE_XML"
-				class="org.eclipse.wst.xml.ui.internal.wizards.XMLImportActionDelegate"
-				menubarPath="generateXMLArtifacts/xml"
-				enablesFor="1"
-				id="org.eclipse.wst.xmlwizard.createXMLFromXSDAction">
-			</action>
-		</objectContribution>
-	</extension>
--->
-
-	<!-- =============================================================================== -->
-	<!-- Allow the 'New XML' wizard to be accessed via the 'Generate' menu on a DTD file -->
-	<!-- =============================================================================== -->
-<!--	
-	<extension point="org.eclipse.ui.popupMenus">
-		<objectContribution
-			objectClass="org.eclipse.core.resources.IFile"
-			nameFilter="*.dtd"
-			id="org.eclipse.wst.xmlwizard.createXMLFromDTD">
-			<menu
-				label="%genMenuLabel"
-				path="additions"
-				id="generateXMLArtifacts">
-				<separator name="xml" />
-			</menu>
-			<action
-				label="%_UI_ACTION_CREATE_XML"
-				class="org.eclipse.wst.xml.ui.internal.wizards.XMLImportActionDelegate"
-				menubarPath="generateXMLArtifacts/xml"
-				enablesFor="1"
-				id="org.eclipse.wst.xmlwizard.createXMLFromDTDAction">
-			</action>
-		</objectContribution>
-	</extension>
--->
-
-	<!-- =============================================================================== -->
-	<!-- Contribute a New->Example... entry for Editing and Validating XML files         -->
-	<!-- =============================================================================== -->
-
-	<!-- define the XMLSamples project wizard -->
-	<extension point="org.eclipse.ui.newWizards">
-		<category
-			name="%_UI_WIZARD_NEW_XML"
-			parentCategory="org.eclipse.ui.Examples"
-			id="org.eclipse.wst.xml.examples">
-		</category>
-		<wizard
-			name="%XMLExample.name"
-			class="org.eclipse.wst.xml.ui.internal.wizards.ExampleProjectCreationWizard"
-			category="org.eclipse.ui.Examples/org.eclipse.wst.xml.examples"
-			id="org.eclipse.wst.xml.ui.XMLExampleProjectCreationWizard"
-			project="true"
-			icon="$nl$/icons/newSampleProject_wiz.gif">
-			<description>
-				%XMLExampleProjectCreationWizard.description
-			</description>
-		</wizard>
-	</extension>
-
-	<!-- configure the XMLSamples project wizard -->
-	<extension
-		point="org.eclipse.wst.common.ui.exampleProjectCreationWizard"
-		id="XMLExampleProjectCreationWizardExtension">
-		<wizard
-			id="org.eclipse.wst.xml.ui.XMLExampleProjectCreationWizard"
-			banner="icons/newSampleProject_wizbanner.png">
-			<projectsetup
-				pagetitle="%XMLExampleProjectCreationWizard.pagetitle"
-				name="%XMLExampleProjectCreationWizard.projectname"
-				label="%XMLExampleProjectCreationWizard.label"
-				pagedescription="%XMLExampleProjectCreationWizard.pagedescription"
-				open="readme.html">
-				<import
-					dest=""
-					src="examples/EditingAndValidatingXML.zip" />
-			</projectsetup>
-		</wizard>
-	</extension>
-
-	<extension point="org.eclipse.core.runtime.adapters">
-		<factory
-			adaptableType="org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel"
-			class="org.eclipse.wst.xml.ui.internal.editor.DOMSelectionConvertorFactory">
-			<adapter
-            	type="org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor"/>
-		</factory>
-		<factory
-			adaptableType="org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel"
-			class="org.eclipse.wst.xml.ui.internal.spelling.SpellcheckDelegateAdapterFactory">
-			<adapter
-            	type="org.eclipse.wst.sse.ui.internal.spelling.ISpellcheckDelegate"/>
-		</factory>
-	</extension>
-
-	<!-- initialize xml ui preferences -->
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceInitializer" />
-	</extension>
-
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidatorForXML"
-			id="org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidatorForXML">
-			<contentTypeIdentifier id="org.eclipse.core.runtime.xml">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT"/>
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
-			</contentTypeIdentifier>
-			<contentTypeIdentifier id="org.eclipse.wst.xml.core.xmlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
-				<partitionType id="org.eclipse.wst.xml.XML_COMMENT"/>
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-	
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.xml.ui.internal.validation.MarkupValidator"
-			id="org.eclipse.wst.xml.ui.internal.validation.markupvalidator">
-			<contentTypeIdentifier id="org.eclipse.core.runtime.xml">
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
-			</contentTypeIdentifier>
-			<contentTypeIdentifier id="org.eclipse.wst.xml.core.xmlsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT"/>
-				<partitionType id="org.eclipse.wst.sse.ST_DEFAULT"/>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-	
-   <extension point="org.eclipse.ui.editors.annotationTypes">
-      <type name="org.eclipse.wst.xml.ui.matching.tag"/>
-   </extension>
-   <extension point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-      		includeOnPreferencePage="true"
-            colorPreferenceValue="212,212,212"
-            annotationType="org.eclipse.wst.xml.ui.matching.tag"
-            colorPreferenceKey="matchingTagIndicationColor"
-            presentationLayer="4"
-            label="%MatchingTagPreference.label"
-            icon="icons/full/obj16/tag-generic.gif"
-            textPreferenceValue="false"
-            textPreferenceKey="matchingTagIndication"
-            highlightPreferenceKey="matchingTagHighlight"
-            highlightPreferenceValue="true"
-            verticalRulerPreferenceKey="matchingTagVerticalRuler"
-            verticalRulerPreferenceValue="false"
-            overviewRulerPreferenceKey="matchingTagIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            textStylePreferenceKey="matchingTagTextStyle"
-			textStylePreferenceValue="NONE">
-      </specification>
-   </extension>
-
-	<!--======================================================================================-->
-	<!-- Document provider for ExternalFileEditorInput                                        -->
-	<!--======================================================================================-->
-	<extension point="org.eclipse.ui.editors.documentProviders">
-		<provider
-			inputTypes="org.eclipse.wst.xml.ui.internal.hyperlink.ExternalFileEditorInput"
-			class="org.eclipse.ui.editors.text.TextFileDocumentProvider"
-			id="org.eclipse.wst.xml.ui.internal.ExternalFileDocumentProvider">
-		</provider>
-	</extension>
-
-	<!-- To Do: migrate this to the org.eclipse.ui.menus popup: format -->
-	<extension point="org.eclipse.ui.popupMenus">
-		<viewerContribution
-			targetID="org.eclipse.core.runtime.xml.source.RulerContext"
-			id="org.eclipse.ui.texteditor.ruler.context.actions">
-			<action
-				label="%AddTask.label"
-				helpContextId="org.eclipse.ui.AddTask_action_context"
-				class="org.eclipse.ui.texteditor.TaskRulerAction"
-				tooltip="%AddTask.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.TaskRulerAction">
-			</action>
-			<action
-				label="%AddBookmark.label"
-				helpContextId="org.eclipse.ui.bookmark_action_context"
-				class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-				tooltip="%AddBookmark.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-			</action>
-		</viewerContribution>
-	</extension>
-
-	<!--======================================================================================-->
-	<!-- Pop-up menu and associated command/handler for nested validation messages.           -->
-	<!--======================================================================================-->
-
-	<extension point="org.eclipse.ui.menus">
-      <menuContribution locationURI="popup:org.eclipse.ui.ide.MarkersView">
-          <command commandId="org.eclipse.wst.xml.ui.referencedFileErrors">
-             <visibleWhen checkEnabled="false">
-				<reference definitionId="org.eclipse.wst.xml.ui.referencedFileErrors" />
-             </visibleWhen>
-         </command>
-      </menuContribution>
-	</extension>
-	
-	<extension point="org.eclipse.ui.commands">
-		<command
-			description="%_UI_REF_FILE_SHOW_DETAILS"
-			id="org.eclipse.wst.xml.ui.referencedFileErrors" 
-			name="%_UI_REF_FILE_SHOW_DETAILS" />
-	</extension>
-	
-    <extension point="org.eclipse.ui.handlers">
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.validation.core.errorinfo.ReferencedFileErrorsHandler"
-             commandId="org.eclipse.wst.xml.ui.referencedFileErrors">
-             <enabledWhen>
-				<reference definitionId="org.eclipse.wst.xml.ui.referencedFileErrors" />
-             </enabledWhen>
-       </handler>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.propertyTesters">
-	   <propertyTester
-	         class="org.eclipse.wst.xml.ui.internal.validation.core.errorinfo.GroupNamePropertyTester"
-	         id="org.eclipse.wst.xml.ui.markerGroupNamePropertyTester"
-	         namespace="org.eclipse.wst.xml.ui"
-	         properties="groupNamePrefix"
-	         type="org.eclipse.core.resources.IMarker">
-	   </propertyTester>
-	</extension>
-	 
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.referencedFileErrors">
-                <and>
-                   <count value="1" />
-                   <with variable="selection">
-                   		<iterate operator="or">
-                      		<adapt type="org.eclipse.core.resources.IMarker">
-                            	<test property="org.eclipse.wst.xml.ui.groupNamePrefix" value="referencedFileError" forcePluginActivation="true" />
-                      		</adapt>
-                   		</iterate>
-                	</with>
-                </and>
-		</definition>
-	</extension>	 
-
-<!--	
-	<extension point="org.eclipse.ui.editorActions">
-		<editorContribution
-			id="org.eclipse.core.runtime.xml.source.editorActions"
-			targetID="org.eclipse.core.runtime.xml.source">
-			<action
-				id="CleanupDocument"
-				label="%CleanupDocument_label"
-				definitionId="org.eclipse.wst.sse.ui.cleanup.document"
-				tooltip="%CleanupDocument_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.CleanupActionXMLDelegate"
-				actionID="CleanupDocument">
-			</action>
-			<action
-				id="ToggleComment"
-				label="%ToggleComment_label"
-				definitionId="org.eclipse.wst.sse.ui.toggle.comment"
-				tooltip="%ToggleComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.ToggleCommentActionXMLDelegate"
-				actionID="ToggleComment">
-			</action>
-			<action
-				id="AddBlockComment"
-				label="%AddBlockComment_label"
-				definitionId="org.eclipse.wst.sse.ui.add.block.comment"
-				tooltip="%AddBlockComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.AddBlockCommentActionXMLDelegate"
-				actionID="AddBlockComment">
-			</action>
-			<action
-				id="RemoveBlockComment"
-				label="%RemoveBlockComment_label"
-				definitionId="org.eclipse.wst.sse.ui.remove.block.comment"
-				tooltip="%RemoveBlockComment_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.actions.RemoveBlockCommentActionXMLDelegate"
-				actionID="RemoveBlockComment">
-			</action>
-			<action
-				id="FindOccurrences"
-				label="%FindOccurrences_label"
-				definitionId="org.eclipse.wst.sse.ui.search.find.occurrences"
-				class="org.eclipse.wst.xml.ui.internal.search.XMLFindOccurrencesActionDelegate"
-				actionID="FindOccurrences">
-			</action>
-			<action
-				id="StructureSelectEnclosing"
-				label="%StructureSelectEnclosing_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.enclosing"
-				tooltip="%StructureSelectEnclosing_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectEnclosingXMLActionDelegate"
-				actionID="StructureSelectEnclosing">
-			</action>
-			<action
-				id="StructureSelectNext"
-				label="%StructureSelectNext_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.next"
-				tooltip="%StructureSelectNext_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectNextXMLActionDelegate"
-				actionID="StructureSelectNext">
-			</action>
-			<action
-				id="StructureSelectPrevious"
-				label="%StructureSelectPrevious_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.previous"
-				tooltip="%StructureSelectPrevious_tooltip"
-				class="org.eclipse.wst.xml.ui.internal.selection.StructuredSelectPreviousXMLActionDelegate"
-				actionID="StructureSelectPrevious">
-			</action>
-			<action
-				id="StructureSelectHistory"
-				label="%StructureSelectHistory_label"
-				definitionId="org.eclipse.wst.sse.ui.structure.select.last"
-				tooltip="%StructureSelectHistory_tooltip"
-				class="org.eclipse.wst.sse.ui.internal.selection.StructuredSelectHistoryActionDelegate"
-				actionID="StructureSelectHistory">
-			</action>
-		</editorContribution>
-        <editorContribution
-            targetID="org.eclipse.core.runtime.xml.source"
-            id="org.eclipse.core.runtime.xml.source.ruler.actions">
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%SelectRuler.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
--->
-
-	<extension
-		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
-		<target
-			id="org.eclipse.core.runtime.xml"
-			name="%XML_Source_target_name">
-		</target>
-	</extension>
-	<extension
-		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
-		<hyperlinkDetector
-			class="org.eclipse.wst.xml.ui.internal.hyperlink.XMLHyperlinkDetector"
-			id="org.eclipse.wst.xml.ui.internal.hyperlink.XMLHyperlinkDetector"
-			name="%XML_hyperlink"
-			targetId="org.eclipse.core.runtime.xml">
-		</hyperlinkDetector>
-   </extension>
- <extension
-       point="org.eclipse.ui.importWizards">
-    <category
-          id="org.eclipse.wst.XMLCategory"
-          name="%_UI_WIZARD_NEW_XML">
-    </category>
-    <wizard
-          category="org.eclipse.wst.XMLCategory"
-          class="org.eclipse.wst.xml.ui.internal.wizards.ImportXMLCatalogWizard"
-          icon="icons/xmldoc.gif"
-          id="org.eclipse.wst.xml.ui.internal.wizards.ImportXMLCatalogWizard"
-          name="%_UI_WIZARD_IMPORT_EXPORT_XMLCATALOG">
-       <description>
-          %_UI_IMPORT_XML_CATALOG_FILE
-       </description>
-    </wizard>
- </extension>
- <extension
-       point="org.eclipse.ui.exportWizards">
-    <category
-          id="org.eclipse.wst.XMLCategory"
-          name="%_UI_WIZARD_NEW_XML">
-    </category>
-    <wizard
-          category="org.eclipse.wst.XMLCategory"
-          class="org.eclipse.wst.xml.ui.internal.wizards.ExportXMLCatalogWizard"
-          icon="icons/xmldoc.gif"
-          id="org.eclipse.wst.xml.ui.internal.wizards.ExportXMLCatalogWizard"
-          name="%_UI_WIZARD_IMPORT_EXPORT_XMLCATALOG">
-       <description>
-          %_UI_EXPORT_XML_CATALOG_FILE
-       </description>
-    </wizard>
- </extension>
-
-	<extension point="org.eclipse.ui.commands">
-		<!-- Navigate commands -->
-		<command
-			name="%ActionDefinition.nextSibling.name"
-			description="%ActionDefinition.nextSibling.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.xml.ui.nextSibling">
-		</command>
-		<command
-			name="%ActionDefinition.previousSibling.name"
-			description="%ActionDefinition.previousSibling.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.xml.ui.previousSibling">
-		</command>
-		<command
-			name="%ActionDefinition.gotoMatchingTag.name"
-			description="%ActionDefinition.gotoMatchingTag.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.xml.ui.gotoMatchingTag">
-		</command>
-	</extension>
-
-	<extension point="org.eclipse.ui.bindings">
-      <!--  win32:  M1=CTRL,    M2=SHIFT, M3=ALT, M4=-
-            carbon: M1=COMMAND, M2=SHIFT, M3=ALT, M4=CTRL
-            gtk: ? 
-      -->
-      <!-- Navigate commands -->
-		<key
-			sequence="M1+M2+ARROW_UP"
-			contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			commandId="org.eclipse.wst.xml.ui.previousSibling"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-		<key
-			platform="carbon"
-			sequence="CTRL+SHIFT+ARROW_UP"
-			contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			commandId="org.eclipse.wst.xml.ui.previousSibling"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-		<key
-			sequence="M1+M2+ARROW_DOWN"
-			contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			commandId="org.eclipse.wst.xml.ui.nextSibling"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-		<key
-			platform="carbon"
-			sequence="CTRL+SHIFT+ARROW_DOWN"
-			contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			commandId="org.eclipse.wst.xml.ui.nextSibling"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-		<key
-			sequence="M1+M2+&gt;"
-			contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			commandId="org.eclipse.wst.xml.ui.gotoMatchingTag"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-		<key
-			platform="carbon"
-			sequence="CTRL+SHIFT+."
-			contextId="org.eclipse.wst.sse.ui.structuredTextEditorScope"
-			commandId="org.eclipse.wst.xml.ui.gotoMatchingTag"
-			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-			
-	</extension>
-	
-<!--
-   This section contains the new org.eclipse.ui.menus extions points and command handler
-   definitions.
- -->
- 
-	<extension point="org.eclipse.ui.menus">
-		<!-- Unable to contribute to Search menu at the moment due to bug 213385 -->
-<!--
-		<menuContribution locationURI="menu:org.eclipse.search.menu">
--->
-	    <menuContribution locationURI="menu:goTo?after=matchingEnd">
-<!--		
-	       <command commandId="org.eclipse.wst.xml.ui.gotoMatchingTag" id="GoToMatchingTag" label="%GoToMatchingTag_label" style="push">
-			   <visibleWhen checkEnabled="false">
-				   <reference definitionId="org.eclipse.wst.sse.ui.sseActiveContext.definition"></reference>
-			   </visibleWhen>
-	       </command>
--->		
-	       <separator name="goToSiblingsBegin" visible="true"></separator>
-	       <command commandId="org.eclipse.wst.xml.ui.nextSibling" id="GoToNextSibling" label="%ActionDefinition.nextSibling.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.xml.ui.navigation"></reference>
-				</visibleWhen>
-	       </command>
-	       <command commandId="org.eclipse.wst.xml.ui.previousSibling" id="GoToPreviousSibling" label="%ActionDefinition.previousSibling.name" style="push">
-			   <visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.xml.ui.navigation"></reference>
-				</visibleWhen>
-	       </command>
-	       <separator name="goToSiblingsEnd" visible="false"></separator>
-		</menuContribution>
-       <menuContribution
-           locationURI="menu:org.eclipse.ui.main.menu?before=window">
-        <menu
-              id="org.eclipse.wst.xml.ui.designMenuId"
-              label="%DesignMenu_name">
-           <separator
-                 name="designStart">
-           </separator>
-           <command
-                 commandId="org.eclipse.wst.xml.ui.disable.grammar.constraints"
-                 icon="icons/full/etool16/constrainon.gif"
-                 id="ToggleGrammarConstraints"
-                 mnemonic="%Constraints_mnemonic"
-                 style="push">
-                 <visibleWhen checkEnabled="false">
-                	 <and>
-                       <reference definitionId="org.eclipse.wst.xml.ui.grammar"/>
-                       <not>
-                         <reference definitionId="org.eclipse.wst.sse.ui.sseActiveContext.definition"/>
-                       </not>
-                    </and>
-                 </visibleWhen>
-           </command>
-           <command
-                 commandId="org.eclipse.wst.xml.ui.reload.dependecies"
-                 icon="icons/full/etool16/rldgrmr.gif"
-                 id="ReloadDependencies"
-                 mnemonic="%ReloadDependencies_mnemonic"
-                 style="push">
-                 <visibleWhen checkEnabled="false">
-                	<and>
-                       <reference definitionId="org.eclipse.wst.xml.ui.dependencies"/>
-                       <not>
-                         <reference definitionId="org.eclipse.wst.sse.ui.sseActiveContext.definition"/>
-                       </not>
-                    </and>
-                 </visibleWhen>
-           </command>
-           <separator
-                 name="expand"
-                 visible="true">
-           </separator>
-           
-           <command
-                 commandId="sed.tabletree.expandAll"
-                 icon="icons/full/etool16/expand_all.gif"
-                 id="ExpandAll"
-                 style="push">
-                 <visibleWhen checkEnabled="false">
-                    <and>
-                       <reference definitionId="org.eclipse.wst.xml.ui.expand"/>
-                       <not>
-                         <reference definitionId="org.eclipse.wst.sse.ui.sseActiveContext.definition"/>
-                       </not>
-                    </and>
-                 </visibleWhen>
-           </command>
-           <command
-                 commandId="sed.tabletree.collapseAll"
-                 icon="icons/full/etool16/collapse_all.gif"
-                 id="CollapseAll"
-                 style="push">
-                 <visibleWhen checkEnabled="false">
-                    <and>
-                       <reference definitionId="org.eclipse.wst.xml.ui.expand"/>
-                       <not>
-                         <reference definitionId="org.eclipse.wst.sse.ui.sseActiveContext.definition"/>
-                       </not>
-                    </and>
-                 </visibleWhen>
-           </command>
-           
-           <separator
-                 name="additions"
-                 visible="true">
-           </separator>
-           <separator
-                 name="designEnd"
-                 visible="false">
-           </separator>
-        </menu>
-     </menuContribution>
-     <menuContribution locationURI="menu:edit?after=additions">
-		<command commandId="org.eclipse.ui.edit.text.contentAssist.proposals" id="XMLContentAssist" style="push">
-		   <visibleWhen checkEnabled="false">
-				<reference definitionId="org.eclipse.wst.xml.ui.xmlSourceContributions.definition"></reference>
-			</visibleWhen>
-		</command>
-	</menuContribution>		
-     <menuContribution
-           locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-        <menu
-              id="generateMenuId"
-              label="%genMenuLabel">
-	        <command
-	              commandId="org.eclipse.wst.sse.ui.generate.xml"
-	              id="GenerateXML"
-	              style="push">
-	           <visibleWhen checkEnabled="false">
-	              <or>
-					<iterate ifEmpty="false">
-						<adapt
-							type="org.eclipse.core.resources.IFile">
-							<test
-								property="org.eclipse.wst.sse.core.resources.contentTypeId"
-                    			value="org.eclipse.wst.xsd.core.xsdsource">
-							</test>
-						</adapt>
-					</iterate>
-					<iterate ifEmpty="false">
-						<adapt
-							type="org.eclipse.core.resources.IFile">
-							<test
-								property="org.eclipse.wst.sse.core.resources.contentTypeId"
-                    			value="org.eclipse.wst.dtd.core.dtdsource">
-							</test>
-						</adapt>
-					</iterate>
-				 </or>	
-	           </visibleWhen>
-	        </command>
-        </menu>
-     </menuContribution>
-     
-     <menuContribution
-           locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-        <toolbar
-              id="org.eclipse.wst.xml.ui.design.DesignToolBar">
-           <separator
-                 name="sed.tabletree.separator.1"
-                 visible="true">
-           </separator>
-           <command
-                 commandId="org.eclipse.wst.xml.ui.disable.grammar.constraints"
-                 icon="icons/full/etool16/constrainon.gif"
-                 id="ToggleGrammarConstraints"
-                 style="push"
-                 tooltip="%Constraints_name">
-	           <visibleWhen
-	                 checkEnabled="false">
-	              <reference
-	                    definitionId="org.eclipse.wst.xml.ui.grammar">
-	              </reference>
-	           </visibleWhen>
-           </command>
-           <command
-                 commandId="org.eclipse.wst.xml.ui.reload.dependecies"
-                 icon="icons/full/etool16/rldgrmr.gif"
-                 id="ReloadDependencies"
-                 style="push">
-	           <visibleWhen
-	                 checkEnabled="false">
-	              <reference
-	                    definitionId="org.eclipse.wst.xml.ui.dependencies">
-	              </reference>
-	           </visibleWhen>
-           </command>
-        </toolbar>
-     </menuContribution>
-     
-     <menuContribution locationURI="menu:sourceMenuId?after=sourceBegin">
-			<command commandId="org.eclipse.wst.sse.ui.toggle.comment"
-			         id="ToggleComment"
-			         mnemonic="%command.toggle.comment.mnemonic"
-			         style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.wst.sse.ui.add.block.comment"
-			         id="AddBlockComment"
-			         mnemonic="%command.add.block.comment.mnemonic"
-			         style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-				</visibleWhen>
-			</command>
-			<command commandId="org.eclipse.wst.sse.ui.remove.block.comment"
-			         id="RemoveBlockComment"
-			         mnemonic="%command.remove.block.comment.mnemonic"
-			         style="push">
-				<visibleWhen checkEnabled="false">
-					<reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-				</visibleWhen>
-			</command>
-		</menuContribution>
-		
-		<menuContribution
-	           locationURI="popup:sourcePopupMenuId?after=sourceBegin">
-				<command commandId="org.eclipse.wst.sse.ui.toggle.comment" id="ToggleComment" style="push">
-					<visibleWhen checkEnabled="false">
-						<reference definitionId="org.eclipse.wst.xml.ui.comments"></reference>
-					</visibleWhen>
-				</command>
-				<command commandId="org.eclipse.wst.sse.ui.add.block.comment" id="AddBlockComment" style="push">
-					<visibleWhen checkEnabled="false">
-						<reference definitionId="org.eclipse.wst.xml.ui.comments"></reference>
-					</visibleWhen>
-				</command>
-				<command commandId="org.eclipse.wst.sse.ui.remove.block.comment" id="RemoveBlockComment" style="push">
-					<visibleWhen checkEnabled="false">
-						<reference definitionId="org.eclipse.wst.xml.ui.comments"></reference>
-					</visibleWhen>
-				</command>
-				<separator name="format" visible="true"></separator>
-		</menuContribution>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.xmlSourceContributions.definition">
-            <with variable="activeContexts">
-	           <iterate operator="or">
-	              <equals value="org.eclipse.core.runtime.xml"/>
-	           </iterate>
-            </with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.core">
-			<with variable="activeContexts">
-				<iterate operator="or">
-					<equals value="org.eclipse.core.runtime.xml"/>
-				</iterate>
-			</with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.occurrences">
-            <with variable="activeContexts">
-	           <iterate operator="or">
-	              <equals value="org.eclipse.wst.xml.occurrences"/>
-	           </iterate>
-            </with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.comments">
-			<with variable="activeContexts">
-				<iterate operator="or">
-					<equals value="org.eclipse.wst.xml.comments"/>
-				</iterate>
-			</with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.cleanup">
-			<with variable="activeContexts">
-				<iterate operator="or">
-					<equals value="org.eclipse.wst.xml.cleanup"/>
-				</iterate>
-			</with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.navigation">
-			<with variable="activeContexts">
-				<iterate operator="or">
-					<equals value="org.eclipse.wst.xml.navigation"/>
-				</iterate>
-			</with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.selection">
-			<with variable="activeContexts">
-				<iterate operator="or">
-					<equals value="org.eclipse.wst.xml.selection"/>
-				</iterate>
-			</with>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.dependencies">
-			<or>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"></equals>
-				</with>
-				<with variable="activeContexts">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.xml.dependencies"/>
-					</iterate>
-				</with>
-			</or>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.grammar">
-			<or>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"></equals>
-				</with>
-				<with variable="activeContexts">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.xml.grammar"/>
-					</iterate>
-				</with>
-			</or>
-		</definition>
-	</extension>
-	
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.expand">
-			<or>
-				<with variable="activeEditorId">
-					<equals value="org.eclipse.wst.xml.ui.internal.tabletree.XMLMultiPageEditorPart"></equals>
-				</with>
-				<with variable="activeContexts">
-					<iterate operator="or">
-						<equals value="org.eclipse.wst.xml.expand"/>
-					</iterate>
-				</with>
-			</or>
-		</definition>
-	</extension>
-	
-    <extension
-       point="org.eclipse.ui.handlers">
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.CleanupdocumentHandler"
-             commandId="org.eclipse.wst.sse.ui.cleanup.document">
-          <activeWhen>
-			 <reference definitionId="org.eclipse.wst.xml.ui.cleanup"/>
-          </activeWhen>
-          <enabledWhen>
-             <reference definitionId="org.eclipse.wst.xml.ui.cleanup"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.ToggleCommentHandler"
-             commandId="org.eclipse.wst.sse.ui.toggle.comment">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.AddBlockCommentHandler"
-             commandId="org.eclipse.wst.sse.ui.add.block.comment">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.RemoveBlockCommentHandler"
-             commandId="org.eclipse.wst.sse.ui.remove.block.comment">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.comments"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectEnclosingXMLHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.enclosing">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectNextXMLHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.next">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.StructuredSelectPreviousXMLHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.previous">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.sse.ui.internal.handlers.StructuredSelectHistoryHandler"
-             commandId="org.eclipse.wst.sse.ui.structure.select.last">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.selection"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.XMLFindOccurencesHandler"
-             commandId="org.eclipse.wst.sse.ui.search.find.occurrences">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.occurrences"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.occurrences"/>
-          </enabledWhen>
-       </handler>
-<!--
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.GoToMatchingTagHandler"
-             commandId="org.eclipse.wst.xml.ui.gotoMatchingTag">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </enabledWhen>
-       </handler>
--->
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.NextSiblingNavigationHandler"
-             commandId="org.eclipse.wst.xml.ui.nextSibling">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.PreviousSiblingNavigationHandler"
-             commandId="org.eclipse.wst.xml.ui.previousSibling">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.navigation"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.ReloadDependenciesHandler"
-             commandId="org.eclipse.wst.xml.ui.reload.dependecies">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.dependencies"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.dependencies"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.ToggleEditModeHandler"
-             commandId="org.eclipse.wst.xml.ui.disable.grammar.constraints">
-          <activeWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.grammar"/>
-          </activeWhen>
-          <enabledWhen>
-              <reference definitionId="org.eclipse.wst.xml.ui.grammar"/>
-          </enabledWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.wizards.NewXMLHandler"
-             commandId="org.eclipse.wst.sse.ui.generate.xml">
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.ExpandAllHandler"
-             commandId="sed.tabletree.expandAll">
-             <activeWhen>
-                 <not>
-		            <with variable="activeContexts">
-			           <iterate operator="or">
-			              <equals value="org.eclipse.wst.sse.ui.structuredTextEditorScope"/>
-			           </iterate>
-		            </with>
-                 </not>
-             </activeWhen>
-       </handler>
-       <handler
-             class="org.eclipse.wst.xml.ui.internal.handlers.CollapseAllHandler"
-             commandId="sed.tabletree.collapseAll">
-             <activeWhen>
-                 <not>
-		            <with variable="activeContexts">
-			           <iterate operator="or">
-			              <equals value="org.eclipse.wst.sse.ui.structuredTextEditorScope"/>
-			           </iterate>
-		            </with>
-                 </not>
-             </activeWhen>
-       </handler>
-    </extension>
-    
-    <extension
-       point="org.eclipse.ui.commands">
-	    <command
-	          id="org.eclipse.wst.sse.ui.generate.xml"
-	          name="%_UI_ACTION_CREATE_XML">
-	    </command>
-	    <command
-	          description="%ReloadDependencies_description"
-	          id="org.eclipse.wst.xml.ui.reload.dependecies"
-	          name="%ReloadDependencies_name">
-	    </command>
-	    <command
-	          description="%Constraints_description"
-	          id="org.eclipse.wst.xml.ui.disable.grammar.constraints"
-	          name="%Constraints_name">
-	    </command>
-	    <command
-	          id="sed.tabletree.expandAll"
-	          name="%ExpandAll_name">
-	    </command>
-	    <command
-	          id="sed.tabletree.collapseAll"
-	          name="%CollapseAll_name">
-	    </command>
-	</extension> 
-	
-	<!-- Define theme -->
-	<extension
-		point="org.eclipse.ui.themes">
-		<theme
-			id="org.eclipse.ui.ide.systemDefault">
-			<colorOverride
-				id="tagAttributeName"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="tagAttributeValue"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="commentBorder"
-				value="COLOR_LIST_SELECTION">
-			</colorOverride>
-			<colorOverride
-				id="commentText"
-				value="COLOR_LIST_SELECTION">
-			</colorOverride>
-			<colorOverride
-				id="declBoder"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="doctypeName"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="doctypeExternalPubref"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="doctypeExternalId"
-				value="COLOR_WIDGET_NORMAL_SHADOW">
-			</colorOverride>
-			<colorOverride
-				id="doctypeExtrenalSysref"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="tagBorder"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="tagName"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="piBorder"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="cdataBorder"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="cdataText"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-			<colorOverride
-				id="entityReference"
-				value="COLOR_LIST_FOREGROUND">
-			</colorOverride>
-		</theme>
-		<colorDefinition
-			id="tagAttributeName"
-			isEditable="false"
-			label="%Colors.tagAttributeName"
-			value="127, 0, 127">
-		</colorDefinition>
-		<colorDefinition
-			id="tagAttributeValue"
-			isEditable="false"
-			label="%Colors.tagAttributeValue"
-			value="42, 0, 255">
-		</colorDefinition>
-		<colorDefinition
-			id="commentBorder"
-			isEditable="false"
-			label="%Colors.commentBorder"
-			value="63, 95, 191">
-		</colorDefinition>
-		<colorDefinition
-			id="commentText"
-			isEditable="false"
-			label="%Colors.commentText"
-			value="63, 95, 191">
-		</colorDefinition>
-		<colorDefinition
-			id="declBoder"
-			isEditable="false"
-			label="%Colors.declBorder"
-			value="0, 128, 128">
-		</colorDefinition>
-		<colorDefinition
-			id="doctypeName"
-			isEditable="false"
-			label="%Colors.doctypeName"
-			value="0, 128, 128">
-		</colorDefinition>
-		<colorDefinition
-			id="doctypeExternalPubref"
-			isEditable="false"
-			label="%Colors.doctypeExternalPubref"
-			value="0, 128, 128">
-		</colorDefinition>
-		<colorDefinition
-			id="doctypeExternalId"
-			isEditable="false"
-			label="%Colors.doctypeExternalId"
-			value="128, 128, 128">
-		</colorDefinition>
-		<colorDefinition
-			id="doctypeExtrenalSysref"
-			isEditable="false"
-			label="%Colors.doctypeExtrenalSysref"
-			value="63, 127, 95">
-		</colorDefinition>
-		<colorDefinition
-			id="tagBorder"
-			isEditable="false"
-			label="%Colors.tagBorder"
-			value="0, 128, 128">
-		</colorDefinition>
-		<colorDefinition
-			id="tagName"
-			isEditable="false"
-			label="%Colors.tagName"
-			value="63, 127, 127">
-		</colorDefinition>
-		<colorDefinition
-			id="piBorder"
-			isEditable="false"
-			label="%Colors.piBorder"
-			value="0, 128, 128">
-		</colorDefinition>
-		<colorDefinition
-			id="cdataBorder"
-			isEditable="false"
-			label="%Colors.cdataBorder"
-			value="0, 128, 128">
-		</colorDefinition>
-		<colorDefinition
-			id="cdataText"
-			isEditable="false"
-			label="%Colors.cdataText"
-			value="0, 0, 0">
-		</colorDefinition>
-		<colorDefinition
-			id="entityReference"
-			isEditable="false"
-			label="%Colors.entityReference"
-			value="42, 0, 255">
-		</colorDefinition>
-	</extension>
-
-	<!-- Enable the FormatHandler for XML Content Type -->
-	<extension point="org.eclipse.ui.handlers">
-		<handler 
-			class="org.eclipse.wst.sse.ui.internal.handlers.FormatHandler"
-			commandId="org.eclipse.wst.sse.ui.format">
-			<activeWhen>
-				<reference definitionId="org.eclipse.wst.xml.ui.xmlContentType.definition"></reference>
-			</activeWhen>
-			<enabledWhen>
-				<reference definitionId="org.eclipse.wst.xml.ui.xmlContentType.definition"></reference>
-			</enabledWhen>
-		</handler>
-	</extension>
-	
-	<!-- Set up a definition for XML Content Types -->
-	<extension point="org.eclipse.core.expressions.definitions">
-		<definition id="org.eclipse.wst.xml.ui.xmlContentType.definition">
-			<or>
-            	<iterate ifEmpty="false">
-					<adapt type="org.eclipse.core.resources.IFile">
-						<!-- Force property tester to load, should not cause entire plug-in to start -->
-						<test property="org.eclipse.wst.sse.core.resources.contentTypeId" 
-							value="org.eclipse.wst.xml.core.xmlsource" forcePluginActivation="true"/>
-					</adapt>
-				</iterate>
-				<iterate ifEmpty="false">
-					<adapt type="org.eclipse.core.resources.IFile">
-						<!-- Force property tester to load, should not cause entire plug-in to start -->
-						<test property="org.eclipse.wst.sse.core.resources.contentTypeId"
-							value="org.eclipse.core.runtime.xml" forcePluginActivation="true"/>
-					</adapt>
-				</iterate>
-			</or>
-		</definition>
-	</extension>
-
-
-
-
-	<extension point="org.eclipse.ui.perspectives">
-		<perspective id="org.eclipse.wst.xml.ui.perspective"
-			class="org.eclipse.wst.xml.ui.internal.perspective.XMLPerspectiveFactory"
-			icon="$nl$/icons/full/xml_perspective.gif" 
-			name="%XML.name"/>
-	</extension>
-	
- <extension point="org.eclipse.ui.perspectiveExtensions">
-	<perspectiveExtension targetID="org.eclipse.wst.xml.ui.perspective">
-		<!-- ProjectExplorer on the left -->
-		<view id="org.eclipse.ui.navigator.ProjectExplorer" relative="org.eclipse.ui.editorss" relationship="left" ratio="0.23" />
-		<!-- XPath on the "bottom" left from its own UI plug-in since neither this bundle nor its owning feature require it -->
-		<!-- Content Outline on the right -->
-		<view id="org.eclipse.ui.views.ContentOutline" relative="org.eclipse.ui.editorss" relationship="right" ratio="0.7" />
-		<!-- Templates on the bottom right -->
-		<view id="org.eclipse.ui.texteditor.TemplatesView" relative="org.eclipse.ui.views.ContentOutline" relationship="bottom" ratio="0.6" />
-		<!-- everything else on the bottom -->
-		<view id="org.eclipse.ui.views.ProblemView" relative="org.eclipse.ui.editorss" relationship="bottom" ratio="0.6" />
-		<view id="org.eclipse.ui.views.PropertySheet" relative="org.eclipse.ui.views.ProblemView" relationship="stack"/>
-		<view id="org.eclipse.ui.console.ConsoleView" relative="org.eclipse.ui.views.ProblemView" relationship="stack" />
-		<view id="org.eclipse.wst.common.snippets.internal.ui.SnippetsView" relative="org.eclipse.ui.views.ProblemView" relationship="stack" />
-		<!-- view placeholders -->
-		<view id="org.eclipse.search.ui.views.SearchView" relative="org.eclipse.ui.views.ProblemView" relationship="stack" visible="false" />
-		<view id="org.eclipse.ui.views.ProgressView" relative="org.eclipse.ui.views.ProblemView" relationship="stack" visible="false" />
-
-		<actionSet id="org.eclipse.debug.ui.launchActionSet"/>
-	
-		<newWizardShortcut id="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard"/>
-		<newWizardShortcut id="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard"/>
-		<newWizardShortcut id="org.eclipse.wst.dtd.ui.internal.wizard.NewDTDWizard"/>
-		<newWizardShortcut id="org.eclipse.ui.wizards.new.folder"/>
-		<newWizardShortcut id="org.eclipse.ui.wizards.new.file"/>
-		<newWizardShortcut id="org.eclipse.ui.editors.wizards.UntitledTextFileWizard"/>
-
-		<viewShortcut id="org.eclipse.ui.navigator.ProjectExplorer"/>
-		<viewShortcut id="org.eclipse.ui.views.ResourceNavigator"/>
-		<viewShortcut id="org.eclipse.ui.views.ContentOutline"/>
-		<viewShortcut id="org.eclipse.ui.views.PropertySheet"/>
-		<viewShortcut id="org.eclipse.ui.views.ProblemView"/>
-		<viewShortcut id="org.eclipse.ui.console.ConsoleView"/>
-		<viewShortcut id="org.eclipse.ui.views.TaskList"/>
-		<viewShortcut id="org.eclipse.ui.texteditor.TemplatesView"/>
-		<viewShortcut id="org.eclipse.search.ui.views.SearchView"/>
-		<viewShortcut id="org.eclipse.ui.views.ProgressView"/>
-
-		<perspectiveShortcut id="org.eclipse.debug.ui.DebugPerspective"/>
-		<perspectiveShortcut id="org.eclipse.ui.resourcePerspective"/>
-	</perspectiveExtension>
-	
-	<perspectiveExtension targetID="org.eclipse.ui.resourcePerspective">
-		<perspectiveShortcut id="org.eclipse.wst.xml.ui.perspective"/>
-	</perspectiveExtension>
-	<perspectiveExtension targetID="org.eclipse.debug.ui.DebugPerspective">
-		<perspectiveShortcut id="org.eclipse.wst.xml.ui.perspective"/>
-	</perspectiveExtension>
- </extension>
-
- <extension point="org.eclipse.ui.navigator.navigatorContent">
-	<commonWizard type="new" wizardId="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard">
-		<enablement></enablement>
-	</commonWizard>
- </extension>
-
- <extension point="org.eclipse.ui.menus" name="%XML.name" id="XML">
-	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=additions">
-	 <toolbar id="org.eclipse.wst.xml.ui.perspective.NewFileToolBar">
-		<command
-				commandId="org.eclipse.ui.newWizard"
-				icon="$nl$/icons/full/etool16/new_xml.gif"
-				id="org.eclipse.wst.xml.ui.newXMLFile"
-				style="push"
-				tooltip="%XML_New_context_type_Extension_Element.name">
-			 <parameter name="newWizardId" value="org.eclipse.wst.xml.ui.internal.wizards.NewXMLWizard"/>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-				<equals value="org.eclipse.wst.xml.ui.perspective"/>
-			</with>
-           </visibleWhen>         
-        </command>
-       <separator name="additions" visible="false"/>
-      </toolbar> 
-     </menuContribution>
-  </extension>
- <extension
-       point="org.eclipse.wst.sse.ui.characterPairing">
-    <inserter
-          class="org.eclipse.wst.xml.ui.internal.text.CharacterPairInserter"
-          id="org.eclipse.wst.xml.ui.inserter">
-       <contentTypeIdentifier
-             id="org.eclipse.core.runtime.xml" partitions="org.eclipse.wst.xml.XML_DEFAULT,org.eclipse.wst.xml.XML_DECL">
-       </contentTypeIdentifier>
-       <contentTypeIdentifier
-             id="org.eclipse.wst.xml.core.xmlsource" partitions="org.eclipse.wst.xml.XML_DEFAULT,org.eclipse.wst.xml.XML_DECL">
-       </contentTypeIdentifier>
-    </inserter>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xml.ui/schema/catalogFileType.exsd b/bundles/org.eclipse.wst.xml.ui/schema/catalogFileType.exsd
deleted file mode 100644
index 3629659..0000000
--- a/bundles/org.eclipse.wst.xml.ui/schema/catalogFileType.exsd
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.xml.ui">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.xml.ui" id="catalogFileType" name="XML Catalog file type extension point"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="fileType" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="fileType">
-      <complexType>
-         <attribute name="extensions" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="description" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         &lt;b&gt;This extension point is internal and should not be used by any other plugins.&lt;/b&gt;
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         Copyright (c) 2000, 2005 IBM Corporation and others.&lt;br&gt;
-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 &lt;a
-href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/AdvancedOptionsDialog.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/AdvancedOptionsDialog.java
deleted file mode 100644
index ac1dec6..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/AdvancedOptionsDialog.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import java.io.ByteArrayInputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-public class AdvancedOptionsDialog extends Dialog {
-	protected ICatalog workingUserCatalog;
-
-	public AdvancedOptionsDialog(Shell parentShell, ICatalog workingUserCatalog) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.workingUserCatalog = workingUserCatalog;
-	}
-
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-	}
-
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		// WorkbenchHelp.setHelp(dialogArea, new
-		// ControlContextComputer(dialogArea,
-		// XMLBuilderContextIds.XMLP_PROJECT_DIALOG));
-
-		Composite composite = new Composite(dialogArea, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label label = new Label(composite, SWT.NONE);
-		label.setText(XMLCatalogMessages.UI_LABEL_DIALOG_DESCRIPTION);
-
-		Composite buttonComposite = new Composite(composite, SWT.NONE);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 3;
-		buttonComposite.setLayout(gridLayout);
-		buttonComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Composite placeHolder = new Composite(buttonComposite, SWT.NONE);
-		placeHolder.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		Composite buttonGroup = new Composite(buttonComposite, SWT.NONE);
-		gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		gridLayout.makeColumnsEqualWidth = true;
-		buttonGroup.setLayout(gridLayout);
-		buttonGroup.setLayoutData(createGridData());
-
-		Button importButton = new Button(buttonGroup, SWT.PUSH | SWT.CENTER);
-		importButton.setText("  " + XMLCatalogMessages.UI_BUTTON_IMPORT + "  "); //$NON-NLS-1$ //$NON-NLS-2$
-
-		Button exportButton = new Button(buttonGroup, SWT.PUSH | SWT.CENTER);
-		exportButton.setText("  " + XMLCatalogMessages.UI_BUTTON_EXPORT + "  "); //$NON-NLS-1$ //$NON-NLS-2$
-
-		placeHolder = new Composite(buttonComposite, SWT.NONE);
-		placeHolder.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		// add importButton listener
-		SelectionListener importButtonSelectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				invokeImportDialog();
-			}
-		};
-		importButton.addSelectionListener(importButtonSelectionListener);
-
-		// add exportButton listener
-		SelectionListener exportButtonSelectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				invokeExportDialog();
-			}
-		};
-		exportButton.addSelectionListener(exportButtonSelectionListener);
-
-		return dialogArea;
-	}
-
-	protected GridData createGridData() {
-		GridData gd = new GridData(GridData.CENTER);
-		gd.horizontalAlignment = GridData.HORIZONTAL_ALIGN_CENTER;
-		gd.verticalAlignment = GridData.VERTICAL_ALIGN_CENTER;
-		return gd;
-	}
-
-
-	protected void invokeImportDialog() {
-		SelectSingleFileDialog dialog = new SelectSingleFileDialog(getShell(), null, true);
-		String[] extensions = {".xmlcatalog", ".xml"}; //$NON-NLS-1$ //$NON-NLS-2$
-		dialog.addFilterExtensions(extensions);
-		dialog.create();
-		dialog.getShell().setText(XMLCatalogMessages.UI_LABEL_IMPORT_DIALOG_TITLE);
-		dialog.setTitle(XMLCatalogMessages.UI_LABEL_IMPORT_DIALOG_HEADING);
-		dialog.setMessage(XMLCatalogMessages.UI_LABEL_IMPORT_DIALOG_MESSAGE);
-		dialog.setBlockOnOpen(true);
-		int rc = dialog.open();
-		if (rc == Window.OK) {
-			IFile file = dialog.getFile();
-			if (file != null) {
-				String fileName = file.getLocation().toFile().toURI().toString();
-				try {
-					CatalogSet tempResourceSet = new CatalogSet();
-					ICatalog newCatalog = tempResourceSet.lookupOrCreateCatalog("temp", fileName); //$NON-NLS-1$
-					workingUserCatalog.addEntriesFromCatalog(newCatalog);
-				}
-				catch (Exception e) {
-					// TODO... give error message
-				}
-			}
-			close();
-		}
-	}
-
-
-	protected void invokeExportDialog() {
-		IPath originalFilePath = null;
-		IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
-		if (projects.length > 0) {
-			originalFilePath = projects[0].getFullPath().append(".xmlcatalog"); //$NON-NLS-1$
-		}
-
-		SaveAsDialog dialog = new SaveAsDialog(getShell());
-		if (originalFilePath != null) {
-			IFile originalFile = ResourcesPlugin.getWorkspace().getRoot().getFile(originalFilePath);
-			dialog.setOriginalFile(originalFile);
-		}
-		dialog.create();
-
-		dialog.getShell().setText(XMLCatalogMessages.UI_LABEL_EXPORT_DIALOG_TITLE);
-		dialog.setTitle(XMLCatalogMessages.UI_LABEL_EXPORT_DIALOG_HEADING);
-		dialog.setMessage(XMLCatalogMessages.UI_LABEL_EXPORT_DIALOG_MESSAGE);
-
-		dialog.setBlockOnOpen(true);
-		int rc = dialog.open();
-		if (rc == Window.OK) {
-			IPath path = dialog.getResult();
-			if (path != null) {
-				IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-				String fileName = file.getLocation().toFile().toURI().toString();
-
-				// here we save the catalog entries to the selected file
-				try {
-					createFileIfRequired(file);
-					workingUserCatalog.setLocation(fileName);
-					workingUserCatalog.save();
-				}
-				catch (Exception ex) {
-					try {
-						String title = XMLCatalogMessages.UI_LABEL_CATALOG_SAVE_ERROR;
-						String briefMessage = XMLCatalogMessages.UI_LABEL_CATALOG_COULD_NOT_BE_SAVED;
-						String reason = file.isReadOnly() ? NLS.bind(XMLCatalogMessages.UI_LABEL_FILE_IS_READ_ONLY, fileName) : NLS.bind(XMLCatalogMessages.ERROR_SAVING_FILE, fileName);
-						String details = NLS.bind(XMLCatalogMessages.ERROR_SAVING_FILE, fileName);
-
-						ErrorDialog.openError(Display.getCurrent().getActiveShell(), title, briefMessage, createStatus(reason, details));
-					}
-					catch (Exception ex2) {
-					}
-				}
-				close();
-			}
-		}
-	}
-
-	// TODO... This was copied from WindowUtility. Is there an easier way to
-	// create a status object?
-	// If not, we should open an eclipse bug or add a similar utility to
-	// baseExtensionsUI.
-	//
-	private static IStatus createStatus(String reason, String msg) {
-		String pluginId = XMLUIPlugin.getDefault().getBundle().getSymbolicName();
-		MultiStatus multiStatus = new MultiStatus(pluginId, 0, reason, null);
-		Status status = new Status(IStatus.ERROR, pluginId, 0, msg, null);
-		multiStatus.add(status);
-		return multiStatus;
-	}
-
-
-	protected void createFileIfRequired(IFile file) {
-		try {
-			if ((file != null) && !file.exists()) {
-				ByteArrayInputStream inputStream = new ByteArrayInputStream(new byte[0]);
-				file.create(inputStream, true, null);
-				// createEmptyXMLCatalog(file);
-			}
-		}
-		catch (Exception e) {
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/CatalogFileTypeRegistryReader.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/CatalogFileTypeRegistryReader.java
deleted file mode 100644
index 85b57d3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/CatalogFileTypeRegistryReader.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import java.util.Collection;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-public class CatalogFileTypeRegistryReader {
-	private static CatalogFileTypeRegistryReader _instance;
-
-	static final String ATT_DESCRIPTION = "description"; //$NON-NLS-1$
-
-	static final String ATT_EXTENSIONS = "extensions"; //$NON-NLS-1$
-
-	static final String ATT_ICON = "icon"; //$NON-NLS-1$
-
-	static final String ATT_ID = "id"; //$NON-NLS-1$
-
-	static final String EXTENSION_POINT_ID = "catalogFileType"; //$NON-NLS-1$
-
-	static final String TAG_NAME = "fileType"; //$NON-NLS-1$
-
-	private static CatalogFileTypeRegistryReader getInstance() {
-		if (_instance == null) {
-			_instance = new CatalogFileTypeRegistryReader();
-		}
-		return _instance;
-	}
-
-	public static Collection getXMLCatalogFileTypes() {
-		return getInstance().hashMap.values();
-	}
-
-	private HashMap hashMap;
-
-	public CatalogFileTypeRegistryReader() {
-		this.hashMap = new HashMap();
-		readRegistry();
-	}
-
-	private void readElement(IConfigurationElement element) {
-		if (element.getName().equals(TAG_NAME)) {
-			String id = element.getAttribute(ATT_ID);
-			if (id != null) {
-				XMLCatalogFileType fileType = (XMLCatalogFileType) hashMap.get(id);
-				if (fileType == null) {
-					fileType = new XMLCatalogFileType();
-					hashMap.put(id, fileType);
-				}
-				fileType.id = id;
-				if (fileType.description == null) {
-					String description = element.getAttribute(ATT_DESCRIPTION);
-					fileType.description = description;
-				}
-
-				fileType.addExtensions(element.getAttribute(ATT_EXTENSIONS));
-			}
-		}
-	}
-
-	private void readRegistry() {
-		readRegistry(EXTENSION_POINT_ID);
-	}
-
-	private void readRegistry(String extensionPointId) {
-		IExtensionRegistry pluginRegistry = Platform.getExtensionRegistry();
-		IExtensionPoint point = pluginRegistry.getExtensionPoint(XMLUIPlugin.ID, extensionPointId);
-		if (point != null) {
-			IConfigurationElement[] elements = point.getConfigurationElements();
-			for (int i = 0; i < elements.length; i++) {
-				readElement(elements[i]);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/EditCatalogEntryDialog.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/EditCatalogEntryDialog.java
deleted file mode 100644
index aca0e6c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/EditCatalogEntryDialog.java
+++ /dev/null
@@ -1,1047 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.common.uriresolver.internal.URI;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-public class EditCatalogEntryDialog extends Dialog {
-	protected static Image borwseImage = ImageFactory.INSTANCE.getImage("icons/obj16/file_expand.gif"); //$NON-NLS-1$
-	protected static Image catalogEntryToolBarImage = ImageFactory.INSTANCE.getImage("icons/etool50/catalogEntry.gif"); //$NON-NLS-1$
-	protected static Image nextCatalogToolBarImage = ImageFactory.INSTANCE.getImage("icons/etool50/nextCatalog.gif"); //$NON-NLS-1$
-
-	protected class CatalogEntryPage extends CatalogElementPage {
-
-		protected Button browseWorkspaceButton;
-		
-		protected Button browseFileSystemButton;
-
-		protected ICatalogEntry catalogEntry;
-
-		protected Button checkboxButton;
-
-		protected Label errorMessageLabel;
-
-		protected Text keyField;
-
-		protected Combo keyTypeCombo;
-
-		protected Text resourceLocationField;
-
-		protected Combo resourceTypeCombo;
-
-		protected Text webAddressField;
-		
-		protected String key;
-		
-		protected int type;
-
-		protected void computeErrorMessage() {
-			errorMessage = null;
-			warningMessage = null;
-
-			if (errorMessage == null) {
-				String fileName = resourceLocationField.getText();
-				if (fileName.trim().length() > 0) {
-					if ((fileName.indexOf("..") != -1) || (fileName.indexOf("./") != -1) || (fileName.indexOf("/.") != -1) || (fileName.indexOf(".\\") != -1) || (fileName.indexOf("\\.") != -1)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-						errorMessage = XMLCatalogMessages.UI_WARNING_URI_MUST_NOT_HAVE_DOTS;
-					}
-
-					String uri = fileName;
-					if (!URIHelper.hasProtocol(uri)) {
-						URIHelper.isAbsolute(uri);
-						uri = (URIHelper.isAbsolute(uri)) ? URIHelper.prependFileProtocol(uri) : URIHelper.prependPlatformResourceProtocol(uri);
-					}
-
-					if ((errorMessage == null) && !URIHelper.isReadableURI(uri, false)) {
-						errorMessage = XMLCatalogMessages.UI_WARNING_URI_NOT_FOUND_COLON + fileName;
-					}
-				}
-				else {
-					// this an error that is not actaully
-					// reported ... OK is just disabled
-					errorMessage = ""; //$NON-NLS-1$
-				}
-
-				// Make sure the key is a fully qualified URI in the cases
-				// where the key type is "System ID" or "Schema location"
-				if ((keyField.getText().length() > 0) && (getKeyType() == ICatalogEntry.ENTRY_TYPE_SYSTEM)) {
-					URI uri = URI.createURI(keyField.getText());
-					if (uri.scheme() == null) {
-						warningMessage = XMLCatalogMessages.UI_WARNING_SHOULD_BE_FULLY_QUALIFIED_URI;
-					}
-				}
-			}
-
-			if ((errorMessage == null) && checkboxButton.getSelection() && (webAddressField.getText().trim().length() == 0)) {
-				// this an error that is not actaully
-				// reported ... OK is just disabled
-				errorMessage = ""; //$NON-NLS-1$
-			}
-
-			if ((errorMessage == null) && (keyField.getText().trim().length() == 0)) {
-				// this an error that is not actaully
-				// reported ... OK is just disabled
-				errorMessage = ""; //$NON-NLS-1$
-			}
-		}
-
-		protected Control createCatalogEntryPanel(Composite parent) {
-
-			ModifyListener modifyListener = new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					if (e.widget == resourceLocationField) {
-						if (keyField.getText().length() == 0) {
-							String uri = resourceLocationField.getText();
-							if (uri.endsWith("xsd") && !URIHelper.hasProtocol(uri)) { //$NON-NLS-1$
-								uri = URIHelper.isAbsolute(uri) ? URIHelper.prependFileProtocol(uri) : URIHelper.prependPlatformResourceProtocol(uri);
-								String namespaceURI = XMLQuickScan.getTargetNamespaceURIForSchema(uri);
-								if (namespaceURI != null) {
-									keyField.setText(namespaceURI);
-								}
-							}
-						}
-					}
-					updateWidgets(e.widget);
-				}
-			};
-
-
-			Composite composite = new Composite(parent, SWT.NONE);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			composite.setLayoutData(gd);
-
-			GridLayout layout = new GridLayout();
-			composite.setLayout(layout);
-
-			Composite group = new Composite(composite, SWT.NONE);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			group.setLayoutData(gd);
-
-			layout = new GridLayout(2, false);
-			group.setLayout(layout);
-
-			Label resourceLocationLabel = new Label(group, SWT.NONE);
-			resourceLocationLabel.setText(XMLCatalogMessages.UI_LABEL_LOCATION_COLON);
-
-			resourceLocationField = new Text(group, SWT.SINGLE | SWT.BORDER);
-			gd = new GridData();
-			gd.horizontalAlignment = SWT.FILL;
-			gd.grabExcessHorizontalSpace = true;
-			resourceLocationField.setLayoutData(gd);
-
-			resourceLocationField.setText(getDisplayValue(URIUtils.convertURIToLocation(getEntry().getURI())));
-
-			// WorkbenchHelp.setHelp(resourceLocationField,
-			// XMLBuilderContextIds.XMLP_ENTRY_URI);
-			resourceLocationField.addModifyListener(modifyListener);
-
-			// WorkbenchHelp.setHelp(browseButton,
-			// XMLBuilderContextIds.XMLP_ENTRY_BROWSE);
-
-			Composite browseButtonsComposite = new Composite(group, SWT.NONE);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			gd.horizontalAlignment = GridData.END;
-			browseButtonsComposite.setLayoutData(gd);
-			
-			layout = new GridLayout();
-			layout.numColumns = 2;
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			layout.marginBottom = 5;
-			browseButtonsComposite.setLayout(layout);
-			
-			browseWorkspaceButton = new Button(browseButtonsComposite, SWT.PUSH);
-			browseWorkspaceButton.setText(XMLCatalogMessages.UI_BUTTON_MENU_BROWSE_WORKSPACE);
-			browseWorkspaceButton.addSelectionListener(new SelectionListener(){
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-
-				public void widgetSelected(SelectionEvent e) {
-					String value = invokeWorkspaceFileSelectionDialog();
-					if(value != null) {
-						resourceLocationField.setText(value);
-					}
-				}
-			});
-			
-			browseFileSystemButton = new Button(browseButtonsComposite, SWT.PUSH);
-			browseFileSystemButton.setText(XMLCatalogMessages.UI_BUTTON_MENU_BROWSE_FILE_SYSTEM);
-			browseFileSystemButton.addSelectionListener(new SelectionListener(){
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-
-				public void widgetSelected(SelectionEvent e) {
-					String value = invokeFileSelectionDialog();
-					if(value != null) {
-						resourceLocationField.setText(value);
-					}
-				}
-			});
-			
-			// Key Type
-			//
-			Label keyTypeLabel = new Label(group, SWT.NONE);
-			keyTypeLabel.setText(XMLCatalogMessages.UI_KEY_TYPE_COLON);
-
-			keyTypeCombo = new Combo(group, SWT.NONE);
-			gd = new GridData();
-			gd.horizontalAlignment = SWT.FILL;
-			gd.grabExcessHorizontalSpace = true;
-			keyTypeCombo.setLayoutData(gd);
-			updateKeyTypeCombo(getEntry().getEntryType());
-			keyTypeCombo.addModifyListener(modifyListener);
-			// WorkbenchHelp.setHelp(keyTypeCombo,
-			// XMLBuilderContextIds.XMLP_ENTRY_KEY_TYPE);
-
-			// Key
-			// 
-			Label keyValueLabel = new Label(group, SWT.NONE);
-			keyValueLabel.setText(XMLCatalogMessages.UI_LABEL_KEY_COLON);
-			keyField = new Text(group, SWT.SINGLE | SWT.BORDER);
-			// WorkbenchHelp.setHelp(keyField,
-			// XMLBuilderContextIds.XMLP_ENTRY_KEY);
-			keyField.setLayoutData(gd);
-			keyField.setText(getDisplayValue(getEntry().getKey()));
-			keyField.addModifyListener(modifyListener);
-
-			Composite group2 = new Composite(composite, SWT.NONE);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			group2.setLayoutData(gd);
-
-			layout = new GridLayout();
-			group2.setLayout(layout);
-
-			// checkbox -- note parent is dialogArea
-			//
-			checkboxButton = new Button(group2, SWT.CHECK);
-			// WorkbenchHelp.setHelp(checkboxButton,
-			// XMLBuilderContextIds.XMLP_ENTRY_SPECIFY_ALTERNATIVE);
-			checkboxButton.setText(XMLCatalogMessages.UI_LABEL_SPECIFY_ALTERNATIVE_WEB_URL);
-			checkboxButton.setLayoutData(new GridData());
-			checkboxButton.setSelection(getEntry().getAttributeValue(ICatalogEntry.ATTR_WEB_URL) != null);
-			SelectionListener buttonListener = new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent event) {
-					// no impl
-				}
-
-				public void widgetSelected(SelectionEvent event) {
-					if (event.widget == checkboxButton) {
-						updateWidgets(checkboxButton);
-					}
-				}
-			};
-			checkboxButton.addSelectionListener(buttonListener);
-
-			// Web Address field
-			//
-
-			ModifyListener webAddressFieldListener = new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					computeErrorMessage();
-					updateErrorMessageLabel(errorMessageLabel);
-					updateOKButtonState();
-				}
-			};
-
-			webAddressField = new Text(group2, SWT.SINGLE | SWT.BORDER);
-			// WorkbenchHelp.setHelp(webAddressField,
-			// XMLBuilderContextIds.XMLP_ENTRY_WEB_ADDRESS);
-			webAddressField.setLayoutData(gd);
-			webAddressField.setText(getDisplayValue(getEntry().getAttributeValue(ICatalogEntry.ATTR_WEB_URL)));
-			webAddressField.setEnabled(false);
-			webAddressField.addModifyListener(webAddressFieldListener);
-
-
-			errorMessageLabel = new Label(group2, SWT.NONE);
-			errorMessageLabel.setForeground(color);
-			errorMessageLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-			updateWidgets(null);
-			
-			key = getEntry().getKey();
-			type = getEntry().getEntryType();
-
-			return composite;
-		}
-
-		public Control createControl(Composite parent) {
-
-			fControl = createCatalogEntryPanel(parent);
-
-			return fControl;
-		}
-
-
-		public ICatalogElement getData() {
-			return getEntry();
-		}
-
-		protected ICatalogEntry getEntry() {
-			if (catalogEntry == null) {
-				if ((fCatalogElement != null) && (fCatalogElement.getType() == ICatalogElement.TYPE_ENTRY)) {
-					catalogEntry = (ICatalogEntry) fCatalogElement;
-				}
-				else {
-					if (catalog != null) {
-						catalogEntry = (ICatalogEntry) catalog.createCatalogElement(ICatalogElement.TYPE_ENTRY);
-					}
-				}
-			}
-			return catalogEntry;
-		}
-
-		protected int getKeyType() {
-			switch (keyTypeCombo.getSelectionIndex()) {
-				case 0 :
-					if ("schema".equals(keyTypeCombo.getData("keyType"))) { //$NON-NLS-1$ //$NON-NLS-2$
-						return ICatalogEntry.ENTRY_TYPE_URI; // xsd
-																// namespace
-																// is URI type
-																// key
-					}
-					return ICatalogEntry.ENTRY_TYPE_PUBLIC;
-				case 1 :
-					return ICatalogEntry.ENTRY_TYPE_SYSTEM;
-				case 2 :
-					return ICatalogEntry.ENTRY_TYPE_URI;
-				default :
-					return ICatalogEntry.ENTRY_TYPE_PUBLIC;
-			}
-		}
-
-		public void saveData() {
-			if (validateData()) {
-				getEntry().setURI(URIUtils.convertLocationToURI(resourceLocationField.getText()));
-				getEntry().setKey(keyField.getText());
-				getEntry().setEntryType(getKeyType());
-				getEntry().setAttributeValue(ICatalogEntry.ATTR_WEB_URL, checkboxButton.getSelection() ? webAddressField.getText() : null);
-				dataSaved = true;
-			}
-			else {
-				errorMessage = XMLCatalogMessages.UI_WARNING_DUPLICATE_ENTRY;
-				errorMessageLabel.setText(errorMessage);
-				updateOKButtonState();
-				dataSaved = false;
-			}
-		}
-		
-		/**
-		 * Validates that the data entered does not conflict with an existing entry in either catalog.
-		 * @return True if validated, false otherwise.
-		 */
-		protected boolean validateData() {
-		
-			String result = null;
-			if (key == null || !key.equals(keyField.getText()) || type != getKeyType())
-			{
-				try {
-					switch( getKeyType() )
-					{
-					case ICatalogEntry.ENTRY_TYPE_PUBLIC:
-						result = catalog.resolvePublic(keyField.getText(), null);		
-						break;
-					case ICatalogEntry.ENTRY_TYPE_SYSTEM:
-						result = catalog.resolveSystem(keyField.getText());
-						break;
-					case ICatalogEntry.ENTRY_TYPE_URI:
-						result = catalog.resolveURI(keyField.getText());
-						break;
-					}
-				}
-				catch (Exception e) {
-				}
-			}
-			
-			return (result == null);
-		}
-
-		protected void updateKeyTypeCombo(int type) {
-			keyTypeCombo.removeAll();
-			for (Iterator i = CatalogFileTypeRegistryReader.getXMLCatalogFileTypes().iterator(); i.hasNext();) {
-				XMLCatalogFileType theFileType = (XMLCatalogFileType) i.next();
-				if (theFileType.extensions != null) {
-					for (Iterator j = theFileType.extensions.iterator(); j.hasNext();) {
-						String extension = (String) j.next();
-						if (resourceLocationField.getText().endsWith(extension)) {
-							if ("org.eclipse.wst.xml.core.ui.catalogFileType.xsd".equals(theFileType.id)) { //$NON-NLS-1$
-								keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_XSD_PUBLIC);
-								keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_XSD_SYSTEM);
-								keyTypeCombo.setData("keyType", "schema"); //$NON-NLS-1$ //$NON-NLS-2$
-							}
-							else if ("org.eclipse.wst.xml.core.ui.catalogFileType.dtd".equals(theFileType.id)) { //$NON-NLS-1$
-								keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_DTD_PUBLIC);
-								keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_DTD_SYSTEM);
-								keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_URI);
-							}
-							else {
-								keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_URI);
-							}
-						}
-
-					}
-
-				}
-			}
-			if (keyTypeCombo.getItemCount() == 0) {
-				keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_DTD_PUBLIC);
-				keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_DTD_SYSTEM);
-				keyTypeCombo.add(XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_URI);
-			}
-
-			switch (type) {
-				case ICatalogEntry.ENTRY_TYPE_PUBLIC :
-					keyTypeCombo.select(0);
-					break;
-				case ICatalogEntry.ENTRY_TYPE_SYSTEM :
-					keyTypeCombo.select(1);
-					break;
-				case ICatalogEntry.ENTRY_TYPE_URI : // handle XML Schema,
-													// where namespace name is
-													// mapped to URI situation
-					if ("schema".equals(keyTypeCombo.getData("keyType"))) { //$NON-NLS-1$ //$NON-NLS-2$
-						keyTypeCombo.select(0); // namespace name as URI key
-												// type
-					}
-					else {
-						keyTypeCombo.select(2); // URI key type
-					}
-					break;
-				default :
-					if (keyTypeCombo.getItemCount() > 0) {
-						keyTypeCombo.select(0);
-					}
-					break;
-			}
-
-		}
-
-		protected void updateWebAddressWidgets(int keyType) {
-			boolean isPublicKeyType = (keyType == ICatalogEntry.ENTRY_TYPE_PUBLIC);
-			checkboxButton.setEnabled(isPublicKeyType);
-			webAddressField.setEnabled(isPublicKeyType && checkboxButton.getSelection());
-		}
-
-		protected void updateWidgets(Widget widget) {
-			if (widget != keyTypeCombo) {
-				updateKeyTypeCombo(getKeyType());
-			}
-			updateWebAddressWidgets(getKeyType());
-			computeErrorMessage();
-			updateErrorMessageLabel(errorMessageLabel);
-			updateOKButtonState();
-		}
-
-	}
-
-	protected abstract class CatalogElementPage {
-
-		Control fControl;
-
-		public CatalogElementPage() {
-			super();
-
-		}
-
-		public abstract Control createControl(Composite parent);
-
-		public Control getControl() {
-			return fControl;
-		}
-
-		public abstract ICatalogElement getData();
-
-		public abstract void saveData();
-	}
-
-	protected class FilterableSelectSingleFileDialog extends SelectSingleFileDialog implements SelectionListener {
-		protected Combo filterControl;
-
-		public FilterableSelectSingleFileDialog(Shell parentShell) {
-			super(parentShell, null, true);
-			setFilters(null);
-		}
-
-		public void createAndOpen() {
-			this.create();
-			setBlockOnOpen(true);
-			getShell().setText(XMLCatalogMessages.UI_LABEL_FILE_SELECTION);
-			this.setTitle(XMLCatalogMessages.UI_LABEL_SELECT_FILE);
-			this.setMessage(XMLCatalogMessages.UI_LABEL_CHOOSE_FILE_TO_ADD_TO_CATALOG);
-			open();
-		}
-
-		public void createFilterControl(Composite composite) {
-			Label label = new Label(composite, SWT.NONE);
-			label.setText(XMLCatalogMessages.UI_LABEL_SELECT_FILE_FILTER_CONTROL);
-
-			filterControl = new Combo(composite, SWT.NONE);
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			filterControl.setLayoutData(gd);
-
-			filterControl.setText(XMLCatalogMessages.UI_TEXT_SELECT_FILE_FILTER_CONTROL);
-			filterControl.add(XMLCatalogMessages.UI_TEXT_SELECT_FILE_FILTER_CONTROL);
-
-			for (Iterator i = CatalogFileTypeRegistryReader.getXMLCatalogFileTypes().iterator(); i.hasNext();) {
-				XMLCatalogFileType fileType = (XMLCatalogFileType) i.next();
-				if (fileType.description != null) {
-					filterControl.add(fileType.description);
-				}
-			}
-
-			filterControl.addSelectionListener(this);
-		}
-
-		protected void setFilters(XMLCatalogFileType fileType) {
-			if (fileType == null) {
-				// compute all the supported file extensions
-				List list = new ArrayList();
-				for (Iterator i = CatalogFileTypeRegistryReader.getXMLCatalogFileTypes().iterator(); i.hasNext();) {
-					XMLCatalogFileType theFileType = (XMLCatalogFileType) i.next();
-					if (theFileType.extensions != null) {
-						list.addAll(theFileType.extensions);
-					}
-				}
-				// Any files are now supported with Resource URI
-				selectSingleFileView.setFilterExtensions(createStringArray(list));
-			}
-			else {
-				if (fileType.extensions != null) {
-					selectSingleFileView.setFilterExtensions(createStringArray(fileType.extensions));
-				}
-			}
-		}
-
-		public void widgetDefaultSelected(SelectionEvent e) {
-			// do nothing
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-			String text = filterControl.getText();
-			XMLCatalogFileType fileType = getMatchingFileType(text);
-			setFilters(fileType);
-		}
-	}
-
-	protected class NextCatalogPage extends CatalogElementPage {
-		
-		protected Button browseWorkspaceButton;
-		
-		protected Button browseFileSystemButton;
-		
-		protected Text catalogLocationField;
-
-		protected INextCatalog nextCatalog;
-
-		protected Label errorMessageLabel;
-
-		protected void computeErrorMessage() {
-			errorMessage = null;
-
-			if (errorMessage == null) {
-				String fileName = catalogLocationField.getText();
-				if (fileName.trim().length() > 0) {
-					if ((fileName.indexOf("..") != -1) || (fileName.indexOf("./") != -1) || (fileName.indexOf("/.") != -1) || (fileName.indexOf(".\\") != -1) || (fileName.indexOf("\\.") != -1)) { //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-						errorMessage = XMLCatalogMessages.UI_WARNING_URI_MUST_NOT_HAVE_DOTS;
-					}
-
-					String uri = fileName;
-					if (!URIHelper.hasProtocol(uri)) {
-						uri = URIHelper.isAbsolute(uri) ? URIHelper.prependFileProtocol(uri) : URIHelper.prependPlatformResourceProtocol(uri);
-					}
-
-					if ((errorMessage == null) && !URIHelper.isReadableURI(uri, false)) {
-						errorMessage = XMLCatalogMessages.UI_WARNING_URI_NOT_FOUND_COLON + fileName;
-					}
-				}
-				else {
-					// this an error that is not actually
-					// reported ... OK is just disabled
-					errorMessage = ""; //$NON-NLS-1$
-				}
-			}
-
-		}
-
-		public Control createControl(Composite parent) {
-			fControl = createNextCatalogPanel(parent);
-			return fControl;
-		}
-
-		protected Control createNextCatalogPanel(Composite parent) {
-			ModifyListener modifyListener = new ModifyListener() {
-				public void modifyText(ModifyEvent e) {
-					updateWidgets(e.widget);
-				}
-			};
-
-			Composite composite = new Composite(parent, SWT.NONE);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			composite.setLayoutData(gd);
-
-			GridLayout layout = new GridLayout();
-			composite.setLayout(layout);
-
-			Composite group = new Composite(composite, SWT.NONE);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			group.setLayoutData(gd);
-
-			layout = new GridLayout();
-			group.setLayout(layout);
-
-			Label resourceLocationLabel = new Label(group, SWT.NONE);
-			resourceLocationLabel.setText(XMLCatalogMessages.UI_LABEL_CATALOG_URI_COLON);
-
-			catalogLocationField = new Text(group, SWT.SINGLE | SWT.BORDER);
-			catalogLocationField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			catalogLocationField.setText(URIUtils.convertURIToLocation(getDisplayValue(getNextCatalog().getCatalogLocation())));
-			// WorkbenchHelp.setHelp(resourceLocationField,
-			// XMLBuilderContextIds.XMLP_ENTRY_URI);
-			catalogLocationField.addModifyListener(modifyListener);
-			
-			Composite browseButtonsComposite = new Composite(group, SWT.FLAT);
-			gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.horizontalSpan = 2;
-			gd.horizontalAlignment = GridData.END;
-			browseButtonsComposite.setLayoutData(gd);
-			
-			layout = new GridLayout();
-			layout.numColumns = 2;
-			layout.marginWidth = 0;
-			layout.marginHeight = 0;
-			layout.marginBottom = 5;
-			browseButtonsComposite.setLayout(layout);
-			
-			browseWorkspaceButton = new Button(browseButtonsComposite, SWT.PUSH);
-			browseWorkspaceButton.setText(XMLCatalogMessages.UI_BUTTON_MENU_BROWSE_WORKSPACE);
-			browseWorkspaceButton.addSelectionListener(new SelectionListener(){
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-
-				public void widgetSelected(SelectionEvent e) {
-					String value = invokeWorkspaceFileSelectionDialog();
-					if(value != null) {
-						catalogLocationField.setText(value);
-					}
-				}
-			});
-			
-			browseFileSystemButton = new Button(browseButtonsComposite, SWT.PUSH);
-			browseFileSystemButton.setText(XMLCatalogMessages.UI_BUTTON_MENU_BROWSE_FILE_SYSTEM);
-			browseFileSystemButton.addSelectionListener(new SelectionListener(){
-
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-
-				public void widgetSelected(SelectionEvent e) {
-					String value = invokeFileSelectionDialog();
-					if(value != null) {
-						catalogLocationField.setText(value);
-					}
-				}
-			});
-
-			errorMessageLabel = new Label(group, SWT.NONE);
-			errorMessageLabel.setForeground(color);
-			errorMessageLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			updateWidgets(null);
-			return composite;
-		}
-
-		public ICatalogElement getData() {
-			return getNextCatalog();
-		}
-
-		protected INextCatalog getNextCatalog() {
-			if (nextCatalog == null) {
-				if ((fCatalogElement != null) && (fCatalogElement.getType() == ICatalogElement.TYPE_NEXT_CATALOG)) {
-					nextCatalog = (INextCatalog) fCatalogElement;
-				}
-				else {
-					if (catalog != null) {
-						nextCatalog = (INextCatalog) catalog.createCatalogElement(ICatalogElement.TYPE_NEXT_CATALOG);
-					}
-				}
-			}
-			return nextCatalog;
-		}
-
-		public void saveData() {
-			getNextCatalog().setCatalogLocation(URIUtils.convertLocationToURI(catalogLocationField.getText()));
-			dataSaved = true;
-		}
-
-		protected void updateWidgets(Widget widget) {
-			computeErrorMessage();
-			updateErrorMessageLabel(errorMessageLabel);
-			updateOKButtonState();
-		}
-	}
-
-	protected class ToolBarItemSelectionChangeListener implements SelectionListener {
-		public void widgetDefaultSelected(SelectionEvent e) {
-			// TODO Auto-generated method stub
-
-		}
-
-		public void widgetSelected(SelectionEvent e) {
-			Object selection = e.getSource();
-			if (selection instanceof ToolItem) {
-				if (!showPage((CatalogElementPage) ((ToolItem) selection).getData())) {
-					// Page flipping wasn't successful
-					// handleError();
-				}
-			}
-		}
-
-	}
-
-	public static String[] createStringArray(List list) {
-		String[] stringArray = new String[list.size()];
-		for (int i = 0; i < stringArray.length; i++) {
-			stringArray[i] = (String) list.get(i);
-		}
-		return stringArray;
-	}
-
-	public static String removeLeadingSlash(String uri) {
-		// remove leading slash from the value to avoid the whole leading
-		// slash
-		// ambiguity problem
-		//       
-		if (uri != null) {
-			while (uri.startsWith("/") || uri.startsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
-				uri = uri.substring(1);
-			}
-		}
-		return uri;
-	}
-
-	protected ICatalog catalog;
-
-	protected ICatalogElement fCatalogElement;
-
-	protected String errorMessage;
-
-	protected String warningMessage;
-
-	protected Button okButton;
-
-	protected PageBook pageContainer;
-
-	protected CatalogElementPage selectedPage;
-
-	// protected TreeViewer treeViewer;
-
-	protected ToolBar toolBar;
-
-	protected Color color;
-	protected boolean dataSaved;
-
-	public EditCatalogEntryDialog(Shell parentShell, ICatalog aCatalog) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.catalog = aCatalog;
-	}
-
-	public EditCatalogEntryDialog(Shell parentShell, ICatalogElement catalogElement, ICatalog aCatalog) {
-		this(parentShell, aCatalog);
-		this.fCatalogElement = catalogElement;
-		// TODO EB: fix his
-		// entry.setURI(URIHelper.removePlatformResourceProtocol(entry.getURI()));
-	}
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			selectedPage.saveData();
-			if (!dataSaved) {				
-				// do not exit edit dialog
-				return;
-			}
-		}
-		super.buttonPressed(buttonId);
-	}
-
-
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		okButton.setEnabled(false);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-		updateOKButtonState();
-	}
-
-	protected void createCatalogEntryButton() {
-		CatalogElementPage page = new CatalogEntryPage();
-		page.createControl(pageContainer);
-		ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH);
-		toolItem.setImage(catalogEntryToolBarImage);
-		toolItem.setText(XMLCatalogMessages.EditCatalogEntryDialog_catalogEntryLabel);
-		toolItem.setData(page);
-		toolItem.addSelectionListener(new ToolBarItemSelectionChangeListener());
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogAreaComposite = (Composite) super.createDialogArea(parent);
-		color = new Color(dialogAreaComposite.getDisplay(), 200, 0, 0);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		dialogAreaComposite.setLayout(layout);
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 500;
-		gd.heightHint = 250;
-		dialogAreaComposite.setLayoutData(gd);
-		createMainComponent(dialogAreaComposite);
-		return this.dialogArea;
-	}
-
-	public boolean close() {
-		if (color != null) {
-			color.dispose();
-		}
-		return super.close();
-	}
-
-	protected Composite createMainComponent(Composite composite) {
-		if (fCatalogElement != null) // "edit" action
-		{
-			Composite composite1 = new Composite(composite, SWT.NONE);
-			GridData data = new GridData(GridData.FILL_BOTH);
-			composite1.setLayoutData(data);
-			GridLayout layout = new GridLayout();
-			composite1.setLayout(layout);
-
-			pageContainer = new PageBook(composite1, SWT.NONE);
-			pageContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			if (fCatalogElement.getType() == ICatalogElement.TYPE_ENTRY) {
-				CatalogElementPage entryPage = new CatalogEntryPage();
-				entryPage.createControl(pageContainer);
-				showPage(entryPage);
-			}
-			else if (fCatalogElement.getType() == ICatalogElement.TYPE_NEXT_CATALOG) {
-				CatalogElementPage nextCatalogPage = new NextCatalogPage();
-				nextCatalogPage.createControl(pageContainer);
-				showPage(nextCatalogPage);
-			}
-
-			return composite1;
-		}
-		return createMainComponentWithToolbar(composite);
-
-	}
-
-	protected Composite createMainComponentWithToolbar(Composite composite) {
-
-		FormLayout formLayout = new FormLayout();
-		formLayout.marginHeight = 5;
-		formLayout.marginWidth = 5;
-		composite.setLayout(formLayout);
-
-		Label label = new Label(composite, SWT.NONE);
-		FormData data = new FormData();
-		data.top = new FormAttachment(0, 0);
-		data.left = new FormAttachment(0, 0);
-		data.right = new FormAttachment(100, 0);
-		label.setLayoutData(data);
-
-		toolBar = new ToolBar(composite, SWT.BORDER | SWT.FLAT | SWT.VERTICAL);
-
-		data = new FormData();
-		data.top = new FormAttachment(label, 0);
-		data.left = new FormAttachment(0, 0);
-		data.bottom = new FormAttachment(100, 0);
-		// data.height = 250;
-		// data.width = 50;
-		toolBar.setLayoutData(data);
-
-		Composite composite1 = new Composite(composite, SWT.BORDER);
-		data = new FormData();
-		data.top = new FormAttachment(label, 0);
-		data.left = new FormAttachment(toolBar, 0, SWT.DEFAULT);
-		data.right = new FormAttachment(100, 0);
-		data.bottom = new FormAttachment(100, 0);
-		composite1.setLayoutData(data);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite1.setLayout(layout);
-
-		// createPageBookPanel(composite1);
-		pageContainer = new PageBook(composite1, SWT.NONE);
-		pageContainer.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		// add pages for each type of catalog element
-		createCatalogEntryButton();
-		createNextCatalogButton();
-		if (toolBar.getItemCount() > 0) {
-			ToolItem item = toolBar.getItem(0);
-			showPage((CatalogElementPage) (item.getData()));
-		}
-		return composite1;
-	}
-
-	protected void createNextCatalogButton() {
-		CatalogElementPage page = new NextCatalogPage();
-		page.createControl(pageContainer);
-		ToolItem toolItem = new ToolItem(toolBar, SWT.PUSH);
-		toolItem.setImage(nextCatalogToolBarImage);
-		toolItem.setText(XMLCatalogMessages.EditCatalogEntryDialog_nextCatalogLabel);
-		toolItem.setData(page);
-		toolItem.addSelectionListener(new ToolBarItemSelectionChangeListener());
-
-	}
-
-	protected ICatalogElement getCatalogElement() {
-		return fCatalogElement;
-	}
-
-	protected String getDisplayValue(String string) {
-		return string != null ? string : ""; //$NON-NLS-1$
-	}
-
-	protected XMLCatalogFileType getMatchingFileType(String description) {
-		XMLCatalogFileType fileType = null;
-		for (Iterator i = CatalogFileTypeRegistryReader.getXMLCatalogFileTypes().iterator(); i.hasNext();) {
-			XMLCatalogFileType theFileType = (XMLCatalogFileType) i.next();
-			if ((theFileType.description != null) && theFileType.description.equals(description)) {
-				fileType = theFileType;
-			}
-		}
-		return fileType;
-	}
-
-	protected boolean showPage(CatalogElementPage page) {
-		if (pageContainer.isDisposed()) {
-			return false;
-		}
-		selectedPage = page;
-		pageContainer.setVisible(true);
-		pageContainer.showPage(selectedPage.getControl());
-		fCatalogElement = selectedPage.getData();
-		return true;
-	}
-
-	protected void updateErrorMessageLabel(Label errorMessageLabel) {
-		if (errorMessage != null) {
-			errorMessageLabel.setText(errorMessage);
-		}
-		else if (warningMessage != null) {
-			errorMessageLabel.setText(warningMessage);
-		}
-		else {
-			errorMessageLabel.setText("");
-		}
-	}
-
-	protected void updateOKButtonState() {
-		if (okButton != null) {
-			okButton.setEnabled(errorMessage == null);
-		}
-	}
-
-	protected Button createBrowseButton(Composite composite) {
-		Button browseButton = new Button(composite, SWT.PUSH);
-		// browseButton.setText(XMLCatalogMessages.
-		// UI_BUTTON_BROWSE"));
-		browseButton.setImage(borwseImage);
-		Rectangle r = borwseImage.getBounds();
-		GridData gd = new GridData();
-		int IMAGE_WIDTH_MARGIN = 6;
-		int IMAGE_HEIGHT_MARGIN = 6;
-		gd.heightHint = r.height + IMAGE_HEIGHT_MARGIN;
-		gd.widthHint = r.width + IMAGE_WIDTH_MARGIN;
-		browseButton.setLayoutData(gd);
-
-		return browseButton;
-
-	}
-	
-	protected Button createWorkspaceBrowseButton(Composite composite) {
-		Button browseWorkspaceButton = new Button(composite, SWT.PUSH);
-		browseWorkspaceButton.setText(XMLCatalogMessages.UI_BUTTON_MENU_BROWSE_WORKSPACE);
-		return browseWorkspaceButton;
-	}
-	
-	protected Button createFileSystemBrowseButton(Composite composite) {
-		Button browseFileSystemButton = new Button(composite, SWT.PUSH);
-		browseFileSystemButton.setText(XMLCatalogMessages.UI_BUTTON_MENU_BROWSE_WORKSPACE);
-		return browseFileSystemButton;
-	}
-
-	
-	String invokeWorkspaceFileSelectionDialog() {
-		FilterableSelectSingleFileDialog dialog = new FilterableSelectSingleFileDialog(getShell());
-		dialog.createAndOpen();
-		IFile file = dialog.getFile();
-		String uri = null;
-		if (file != null) {
-			// remove leading slash from the value to avoid the
-			// whole leading slash ambiguity problem
-			//                    
-			uri = file.getFullPath().toString();
-			while (uri.startsWith("/") || uri.startsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
-				uri = uri.substring(1);
-			}
-		}
-		return uri;
-	}
-
-	String invokeFileSelectionDialog() {
-		FileDialog dialog = new FileDialog(getShell(), SWT.SINGLE);
-		return dialog.open();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/ElementNodePage.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/ElementNodePage.java
deleted file mode 100644
index 0ec61e6..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/ElementNodePage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-
-
-public abstract class ElementNodePage {
-
-	Control fControl;
-
-	public ElementNodePage() {
-		super();
-
-	}
-
-	public abstract Control createControl(Composite parent);
-
-	public Control getControl() {
-		return fControl;
-	}
-
-	public abstract void saveData();
-
-	public abstract ICatalogElement getData();
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/ImageFactory.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/ImageFactory.java
deleted file mode 100644
index 3938a7e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/ImageFactory.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import java.util.Hashtable;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-public class ImageFactory {
-	public static final int TOP_LEFT = 1;
-	public static final int TOP_RIGHT = 2;
-	public static final int BOTTOM_LEFT = 3;
-	public static final int BOTTOM_RIGHT = 4;
-
-	protected static final int[][] OVERLAY_COORDINATE = {{0, 0}, {0, 2}, {2, 0}, {2, 2}};
-
-	protected static ImageFactory INSTANCE = new ImageFactory();
-
-	protected Hashtable compositeImageTable = new Hashtable();
-
-	public ImageFactory() {
-		super();
-	}
-
-	public Image getImage(String iconName) {
-		ImageRegistry imageRegistry = XMLUIPlugin.getDefault().getImageRegistry();
-
-		if (imageRegistry.get(iconName) != null) {
-			return imageRegistry.get(iconName);
-		}
-		else {
-			imageRegistry.put(iconName, ImageDescriptor.createFromFile(getClass(), iconName));
-			return imageRegistry.get(iconName);
-		}
-	}
-
-	public Image createCompositeImage(Image base, Image overlay, int overlayPosition) {
-		String key = base + "*" + overlay + "*" + overlayPosition; //$NON-NLS-1$ //$NON-NLS-2$
-		Image result = (Image) compositeImageTable.get(key);
-		if (result == null) {
-			ImageDescriptor overlays[][] = new ImageDescriptor[3][3];
-			int[] coord = OVERLAY_COORDINATE[overlayPosition];
-			overlays[coord[1]][coord[0]] = new ImageBasedImageDescriptor(overlay);
-			OverlayIcon icon = new OverlayIcon(new ImageBasedImageDescriptor(base), overlays, new Point(16, 16));
-			result = icon.createImage();
-			compositeImageTable.put(key, result);
-		}
-		return result;
-	}
-
-
-	public static ImageDescriptor createImageDescriptorWrapper(Image image) {
-		return new ImageBasedImageDescriptor(image);
-	}
-
-	/**
-	 * An OverlayIcon consists of a main icon and several adornments.
-	 */
-	class OverlayIcon extends CompositeImageDescriptor {
-
-		static final int DEFAULT_WIDTH = 22;
-
-		static final int DEFAULT_HEIGHT = 16;
-
-		private Point fSize = null;
-
-		private ImageDescriptor fBase;
-
-		private ImageDescriptor fOverlays[][];
-
-		public OverlayIcon(ImageDescriptor base, ImageDescriptor[][] overlays, Point size) {
-			fBase = base;
-			fOverlays = overlays;
-			fSize = size;
-		}
-
-		protected void drawBottomLeft(ImageDescriptor[] overlays) {
-			if (overlays == null) {
-				return;
-			}
-			int length = overlays.length;
-			int x = 0;
-			for (int i = 0; i < 3; i++) {
-				if ((i < length) && (overlays[i] != null)) {
-					ImageData id = overlays[i].getImageData();
-					drawImage(id, x, getSize().y - id.height);
-					x += id.width;
-				}
-			}
-		}
-
-		protected void drawBottomRight(ImageDescriptor[] overlays) {
-			if (overlays == null) {
-				return;
-			}
-			int length = overlays.length;
-			int x = getSize().x;
-			for (int i = 2; i >= 0; i--) {
-				if ((i < length) && (overlays[i] != null)) {
-					ImageData id = overlays[i].getImageData();
-					x -= id.width;
-					drawImage(id, x, getSize().y - id.height);
-				}
-			}
-		}
-
-		/**
-		 * @see CompositeImageDescriptor#drawCompositeImage(int, int)
-		 */
-		protected void drawCompositeImage(int width, int height) {
-			ImageData bg;
-			if ((fBase == null) || ((bg = fBase.getImageData()) == null)) {
-				bg = DEFAULT_IMAGE_DATA;
-			}
-			drawImage(bg, 0, 0);
-
-			if (fOverlays != null) {
-				if (fOverlays.length > 0) {
-					drawTopRight(fOverlays[0]);
-				}
-
-				if (fOverlays.length > 1) {
-					drawBottomRight(fOverlays[1]);
-				}
-
-				if (fOverlays.length > 2) {
-					drawBottomLeft(fOverlays[2]);
-				}
-
-				if (fOverlays.length > 3) {
-					drawTopLeft(fOverlays[3]);
-				}
-			}
-		}
-
-		protected void drawTopLeft(ImageDescriptor[] overlays) {
-			if (overlays == null) {
-				return;
-			}
-			int length = overlays.length;
-			int x = 0;
-			for (int i = 0; i < 3; i++) {
-				if ((i < length) && (overlays[i] != null)) {
-					ImageData id = overlays[i].getImageData();
-					drawImage(id, x, 0);
-					x += id.width;
-				}
-			}
-		}
-
-		protected void drawTopRight(ImageDescriptor[] overlays) {
-			if (overlays == null) {
-				return;
-			}
-			int length = overlays.length;
-			int x = getSize().x;
-			for (int i = 2; i >= 0; i--) {
-				if ((i < length) && (overlays[i] != null)) {
-					ImageData id = overlays[i].getImageData();
-					x -= id.width;
-					drawImage(id, x, 0);
-				}
-			}
-		}
-
-		/**
-		 * @see CompositeImageDescriptor#getSize()
-		 */
-		protected Point getSize() {
-			return fSize;
-		}
-	}
-
-	static class ImageBasedImageDescriptor extends ImageDescriptor {
-		protected Image image;
-
-		public ImageBasedImageDescriptor(Image image) {
-			this.image = image;
-		}
-
-		public ImageData getImageData() {
-			return image.getImageData();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/URIUtils.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/URIUtils.java
deleted file mode 100644
index ea0c2bc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/URIUtils.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-
-public class URIUtils {
-	
-	  private static final String PROTOCOL_PATTERN = ":"; 
-	  private static final String FILE_PROTOCOL = "file:";
-	  private static final String PLATFORM_RESOURCE_PROTOCOL = "platform:/resource/";
-	  private static final String LOCAL_FILE_PROTOCOL_FORWARD_SLASH = "\\\\\\";
-	  private static final String LOCAL_FILE_PROTOCOL_BACK_SLASH = "///";
-	  private static final char   PATH_SEPARATOR_FORWARD_SLASH = '/';
-	  private static final char   PATH_SEPARATOR_BACK_SLASH = '\\';
-	  
-	  public static String convertURIToLocation(String uri) {
-			String location = uri;
-			if (uri != null) {
-				if (uri.startsWith(FILE_PROTOCOL)) {
-					location = org.eclipse.wst.common.uriresolver.internal.URI.createURI(uri).toFileString();
-					if (location != null && (location.startsWith(LOCAL_FILE_PROTOCOL_BACK_SLASH)
-							|| location.startsWith(LOCAL_FILE_PROTOCOL_FORWARD_SLASH))) {
-						location = location.substring(LOCAL_FILE_PROTOCOL_BACK_SLASH.length());
-					}
-				} else if (uri.startsWith(PLATFORM_RESOURCE_PROTOCOL)) {
-					location = uri.substring(PLATFORM_RESOURCE_PROTOCOL.length());
-				}
-			}
-		return location;
-	  }
-	  
-	  public static String convertLocationToURI(String location) {
-		  String uri = location;
-			if (!URIHelper.hasProtocol(location)) {
-				uri = URIHelper.isAbsolute(location)? org.eclipse.wst.common.uriresolver.internal.URI.createFileURI(location).toString()
-						: URIHelper.prependPlatformResourceProtocol(location);
-			}
-			if (uri.startsWith(FILE_PROTOCOL) && uri.indexOf(PROTOCOL_PATTERN, FILE_PROTOCOL.length()) != -1) {
-				uri = URIHelper.ensureFileURIProtocolFormat(uri);
-			}
-			uri = uri.replace(PATH_SEPARATOR_BACK_SLASH, PATH_SEPARATOR_FORWARD_SLASH);
-			return uri;
-	  }
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogEntriesView.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogEntriesView.java
deleted file mode 100644
index 92f8bb5..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogEntriesView.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.catalog.Catalog;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-
-
-public class XMLCatalogEntriesView extends Composite {
-	protected Button newButton;
-	protected Button editButton;
-	protected Button deleteButton;
-	protected XMLCatalogTreeViewer tableViewer;
-	protected ICatalog workingUserCatalog;
-	protected ICatalog systemCatalog;
-
-	// protected boolean isPageEnabled = true;
-
-	public XMLCatalogEntriesView(Composite parent, ICatalog workingUserCatalog, ICatalog systemCatalog) {
-		super(parent, SWT.NONE);
-		this.workingUserCatalog = workingUserCatalog;
-		this.systemCatalog = systemCatalog;
-
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		this.setLayout(gridLayout);
-
-		tableViewer = createTableViewer(this);
-		tableViewer.setInput("dummy"); //$NON-NLS-1$
-		
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=202692
-		// specifically set size of tree before expanding it
-		Point initialSize = tableViewer.getTree().computeSize(SWT.DEFAULT, SWT.DEFAULT);
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-		gridData.widthHint = initialSize.x;
-		gridData.heightHint = initialSize.y;
-		tableViewer.getControl().setLayoutData(gridData);
-		
-		tableViewer.expandToLevel(2);
-		tableViewer.reveal(XMLCatalogTreeViewer.USER_SPECIFIED_ENTRIES_OBJECT);
-		
-		ISelectionChangedListener listener = new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateWidgetEnabledState();
-			}
-		};
-		tableViewer.addSelectionChangedListener(listener);
-
-		createButtons(this);
-	}
-
-	public static String removeLeadingSlash(String uri) {
-		// remove leading slash from the value to avoid the whole leading
-		// slash ambiguity problem
-		//       
-		if (uri != null) {
-			while (uri.startsWith("/") || uri.startsWith("\\")) //$NON-NLS-1$ //$NON-NLS-2$
-			{
-				uri = uri.substring(1);
-			}
-		}
-		return uri;
-	}
-
-	protected XMLCatalogTreeViewer createTableViewer(Composite parent) {
-		String headings[] = new String[2];
-		headings[0] = XMLCatalogMessages.UI_LABEL_KEY;
-		headings[1] = XMLCatalogMessages.UI_LABEL_URI;
-
-		XMLCatalogTreeViewer theTableViewer = new XMLCatalogTreeViewer(parent, workingUserCatalog, systemCatalog);
-		return theTableViewer;
-	}
-
-	protected void createButtons(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridData gd = new GridData();
-		gd.verticalAlignment = GridData.BEGINNING;
-		composite.setLayoutData(gd);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.marginHeight = 0;
-		gridLayout.marginWidth = 0;
-		gridLayout.marginLeft = 3;
-		composite.setLayout(gridLayout);
-
-		SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.widget == newButton) {
-					performNew();
-				}
-				else if (e.widget == editButton) {
-					performEdit();
-				}
-				else if (e.widget == deleteButton) {
-					performDelete();
-				}
-			}
-		};
-
-		// add the "New..." button
-		//
-		gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-
-		newButton = new Button(composite, SWT.NONE);
-		newButton.setText(XMLCatalogMessages.UI_BUTTON_NEW);
-		// WorkbenchHelp.setHelp(newButton,
-		// XMLBuilderContextIds.XMLP_MAPPING_NEW);
-		newButton.setLayoutData(gd);
-		newButton.addSelectionListener(selectionListener);
-
-		// add the "Edit..." button
-		//
-		gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		editButton = new Button(composite, SWT.NONE);
-		editButton.setText(XMLCatalogMessages.UI_BUTTON_EDIT);
-		// WorkbenchHelp.setHelp(editButton,
-		// XMLBuilderContextIds.XMLP_MAPPING_EDIT);
-		editButton.setLayoutData(gd);
-		editButton.addSelectionListener(selectionListener);
-
-		// add the "Delete" button
-		//
-		gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		deleteButton = new Button(composite, SWT.NONE);
-		deleteButton.setText(XMLCatalogMessages.UI_BUTTON_REMOVE);
-		// WorkbenchHelp.setHelp(deleteButton,
-		// XMLBuilderContextIds.XMLP_MAPPING_DELETE);
-		deleteButton.setLayoutData(gd);
-		deleteButton.addSelectionListener(selectionListener);
-		
-		gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		gd.horizontalSpan = 4;
-
-		Button hiddenButton = new Button(composite, SWT.NONE);
-		hiddenButton.setLayoutData(gd);
-		hiddenButton.setVisible(false);
-		hiddenButton.setEnabled(false);
-
-		// a cruddy hack so that the PreferenceDialog doesn't close every time
-		// we press 'enter'
-		//
-		getShell().setDefaultButton(hiddenButton);
-		updateWidgetEnabledState();
-	}
-
-	public void refresh() {
-		tableViewer.refresh();// XMLCatalogTreeViewer.USER_SPECIFIED_ENTRIES_OBJECT);
-	}
-
-	protected EditCatalogEntryDialog invokeDialog(String title, ICatalogElement entry, ICatalog catalog) {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		EditCatalogEntryDialog dialog = entry != null ? new EditCatalogEntryDialog(shell, entry, catalog) : new EditCatalogEntryDialog(shell, catalog);
-		dialog.create();
-		dialog.getShell().setText(title);
-		dialog.setBlockOnOpen(true);
-		dialog.open();
-		return dialog;
-	}
-
-	protected EditCatalogEntryDialog invokeDialog(String title, ICatalog catalog) {
-		return invokeDialog(title, null, catalog);
-	}
-
-
-	protected void performNew() {
-
-		// ICatalogEntry newEntry =
-		// (ICatalogEntry)workingUserCatalog.createCatalogElement(ICatalogElement.TYPE_ENTRY);
-		EditCatalogEntryDialog dialog = invokeDialog(XMLCatalogMessages.UI_LABEL_NEW_DIALOG_TITLE, workingUserCatalog);
-		ICatalogElement element = dialog.getCatalogElement();
-		if (dialog.getReturnCode() == Window.OK) {
-			workingUserCatalog.addCatalogElement(element);
-			tableViewer.setSelection(new StructuredSelection(element), true);
-			tableViewer.refresh();
-		}
-	}
-
-	protected void performEdit() {
-		ISelection selection = tableViewer.getSelection();
-		Object selectedObject = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-
-		if (selectedObject instanceof ICatalogElement) {
-			ICatalogElement oldEntry = (ICatalogElement) selectedObject;
-			ICatalogElement newEntry = (ICatalogElement) ((CatalogElement) oldEntry).clone();
-
-			EditCatalogEntryDialog dialog = invokeDialog(XMLCatalogMessages.UI_LABEL_EDIT_DIALOG_TITLE, newEntry, workingUserCatalog);
-			if (dialog.getReturnCode() == Window.OK) {
-				// delete the old value if the 'mapFrom' has changed
-				//
-				workingUserCatalog.removeCatalogElement(oldEntry);
-
-				// update the new mapping
-				//
-				workingUserCatalog.addCatalogElement(newEntry);
-				tableViewer.setSelection(new StructuredSelection(newEntry));
-			}
-		}
-	}
-
-	protected void performDelete() {
-		ISelection selection = tableViewer.getSelection();
-		if(selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-			Iterator iterator = structuredSelection.iterator();
-			while(iterator.hasNext()) {
-				Object selectedObject = iterator.next();
-				if (selectedObject instanceof ICatalogElement) {
-					ICatalogElement catalogElement = (ICatalogElement) selectedObject;
-					workingUserCatalog.removeCatalogElement(catalogElement);
-				}
-			}
-		}
-	}
-
-	protected void updateWidgetEnabledState() {
-		boolean isEditable = false;
-		ISelection selection = tableViewer.getSelection();
-		boolean multipleSelection = false;
-		if(selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-			if(structuredSelection.size() > 1) {
-				multipleSelection = true;
-			}
-			Object selectedObject = structuredSelection.getFirstElement();
-			if (selectedObject instanceof ICatalogElement) {
-				ICatalogElement[] elements = ((Catalog) workingUserCatalog).getCatalogElements();
-				// dw List entriesList = new ArrayList(elements.length);
-				for (int i = 0; i < elements.length; i++) {
-					ICatalogElement element = elements[i];
-					isEditable = selectedObject.equals(element);
-					if (isEditable) {
-						break;
-					}
-				}
-			}
-		}
-
-		// if (isPageEnabled)
-		{
-			editButton.setEnabled(isEditable & !multipleSelection);
-			deleteButton.setEnabled(isEditable);
-		}
-	}
-
-	/*
-	 * public void setPageEnabled(boolean enabled) { isPageEnabled = enabled;
-	 * 
-	 * tableViewer.getControl().setEnabled(isPageEnabled);
-	 * 
-	 * newButton.setEnabled(isPageEnabled);
-	 * editButton.setEnabled(isPageEnabled);
-	 * deleteButton.setEnabled(isPageEnabled); }
-	 */
-	public void updatePage() {
-		refresh();
-		updateWidgetEnabledState();
-	}
-
-	public Viewer getViewer() {
-		return tableViewer;
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogEntryDetailsView.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogEntryDetailsView.java
deleted file mode 100644
index fe97a1c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogEntryDetailsView.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-
-public class XMLCatalogEntryDetailsView {
-	protected Text detailsText;
-	protected ScrollBar verticalScroll, horizontalScroll;
-
-	public XMLCatalogEntryDetailsView(Composite parent) {
-		Color color = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-
-		detailsText = new Text(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
-		GridData data = new GridData(GridData.FILL_BOTH);
-		data.heightHint = 85;
-		detailsText.setLayoutData(data);
-
-		verticalScroll = detailsText.getVerticalBar();
-		// verticalScroll.setVisible(false);
-		horizontalScroll = detailsText.getHorizontalBar();
-		detailsText.setEditable(false);
-		detailsText.setBackground(color);
-	}
-
-	public void setCatalogElement(ICatalogEntry entry) {
-		if (entry == null) {
-			detailsText.setText(""); //$NON-NLS-1$
-			return;
-		}
-
-		String value = getDisplayValue(entry != null ? entry.getURI() : ""); //$NON-NLS-1$
-		String line1 = XMLCatalogMessages.UI_LABEL_DETAILS_URI_COLON + "\t\t" + value; //$NON-NLS-1$
-
-		String line0;
-		if (value.startsWith("jar:file:")) {
-			String jarFile = URIUtils.convertURIToLocation(URIHelper.ensureURIProtocolFormat(value.substring("jar:".length(), value.indexOf('!'))));
-			String internalFile = URIUtils.convertURIToLocation(URIHelper.ensureURIProtocolFormat("file://" + value.substring(value.indexOf('!') + 1)));
-			line0 = XMLCatalogMessages.UI_LABEL_DETAILS_URI_LOCATION + "\t" + internalFile + " " + XMLCatalogMessages.UI_LABEL_DETAILS_IN_JAR_FILE + " " + jarFile;
-		}
-		else {
-			value = URIUtils.convertURIToLocation(value);
-			line0 = XMLCatalogMessages.UI_LABEL_DETAILS_URI_LOCATION + "\t" + value; //$NON-NLS-1$
-
-		}
-
-		value = entry != null ? getKeyTypeValue(entry) : ""; //$NON-NLS-1$
-		String line2 = XMLCatalogMessages.UI_KEY_TYPE_DETAILS_COLON + "\t" + value; //$NON-NLS-1$
-
-		value = getDisplayValue(entry != null ? entry.getKey() : ""); //$NON-NLS-1$
-		String line3 = XMLCatalogMessages.UI_LABEL_DETAILS_KEY_COLON + "\t\t" + value; //$NON-NLS-1$
-
-		String entireString = "\n" + line0 + "\n" + line1 + "\n" + line2 + "\n" + line3; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		detailsText.setText(entireString);
-	}
-
-	public void setCatalogElement(INextCatalog nextCatalog) {
-		String value = getDisplayValue(nextCatalog != null ? nextCatalog.getCatalogLocation() : ""); //$NON-NLS-1$
-		String line1 = XMLCatalogMessages.UI_LABEL_DETAILS_URI_COLON + "\t\t" + value; //$NON-NLS-1$
-
-		String line0 = XMLCatalogMessages.UI_LABEL_DETAILS_URI_LOCATION + "\t" + URIUtils.convertURIToLocation(value);
-
-		String entireString = "\n" + line0 + "\n" + line1; //$NON-NLS-1$
-		detailsText.setText(entireString);
-	}
-
-	protected String getDisplayValue(String string) {
-		return string != null ? string : ""; //$NON-NLS-1$
-	}
-
-	protected String getKeyTypeValue(ICatalogEntry entry) {
-		String result = null;
-		if ((entry.getURI() != null) && entry.getURI().endsWith("xsd")) //$NON-NLS-1$
-		{
-			result = (entry.getEntryType() == ICatalogEntry.ENTRY_TYPE_URI) ? XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_XSD_PUBLIC : XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_XSD_SYSTEM;
-		}
-		else {
-			switch (entry.getEntryType()) {
-				case ICatalogEntry.ENTRY_TYPE_PUBLIC :
-					result = XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_DTD_PUBLIC;
-					break;
-				case ICatalogEntry.ENTRY_TYPE_SYSTEM :
-					result = XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_DTD_SYSTEM;
-					break;
-				default :
-					result = XMLCatalogMessages.UI_KEY_TYPE_DESCRIPTION_URI;
-					break;
-			}
-
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogFileType.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogFileType.java
deleted file mode 100644
index c3cbbe8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogFileType.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.swt.graphics.Image;
-
-
-public class XMLCatalogFileType {
-	public String description;
-    public String id;
-	public List extensions = new ArrayList();
-	public String iconFileName;
-	public Image icon;
-
-	public void addExtensions(String contributedExtensions) {
-		List list = parseExtensions(contributedExtensions);
-		for (Iterator i = list.iterator(); i.hasNext();) {
-			String extension = (String) i.next();
-			if (!extensions.contains(extension)) {
-				extensions.add(extension);
-			}
-		}
-	}
-
-	protected List parseExtensions(String string) {
-		List list = new ArrayList();
-		for (StringTokenizer st = new StringTokenizer(string, ", "); st.hasMoreTokens();) //$NON-NLS-1$
-		{
-			String token = st.nextToken();
-			if (token != null) {
-				list.add(token);
-			}
-		}
-		return list;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogMessages.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogMessages.java
deleted file mode 100644
index 177c196..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogMessages.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by XML Editor
- * 
- * @plannedfor 1.0
- */
-public class XMLCatalogMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogResources";//$NON-NLS-1$
-
-	public static String UI_WIZARD_SCHEMA_AND_NAME_SPACE_INFO;
-	public static String UI_LABEL_NAME_SPACE_PREFIX;
-	public static String UI_LABEL_NAME_SPACE_URI;
-	public static String UI_LABEL_XSD_LOCATION;
-	public static String UI_LABEL_DOCTYPE_INFORMATION;
-	public static String UI_LABEL_SYSTEM_ID;
-	public static String UI_LABEL_PUBLIC_ID;
-	public static String UI_LABEL_SELECT_FILE;
-	public static String UI_LABEL_KEY;
-	public static String UI_LABEL_KEY_COLON;
-	public static String UI_LABEL_DETAILS_KEY_COLON;
-	public static String UI_LABEL_DETAILS_IN_JAR_FILE;
-	public static String UI_LABEL_URI;
-	public static String UI_LABEL_LOCATION_COLON;
-	public static String UI_LABEL_CATALOG_URI_COLON;
-	public static String UI_LABEL_DETAILS_URI_COLON;
-	public static String UI_LABEL_DETAILS_URI_LOCATION;
-	public static String UI_KEY_TYPE_COLON;
-	public static String UI_KEY_TYPE_DETAILS_COLON;
-	public static String UI_KEY_TYPE_DESCRIPTION_XSD_PUBLIC;
-	public static String UI_KEY_TYPE_DESCRIPTION_XSD_SYSTEM;
-	public static String UI_KEY_TYPE_DESCRIPTION_DTD_PUBLIC;
-	public static String UI_KEY_TYPE_DESCRIPTION_DTD_SYSTEM;
-	public static String UI_KEY_TYPE_DESCRIPTION_URI;
-	public static String UI_LABEL_SPECIFY_ALTERNATIVE_WEB_URL;
-	public static String UI_WARNING_URI_MUST_NOT_HAVE_DOTS;
-	public static String UI_LABEL_FILE_SELECTION;
-	public static String UI_LABEL_CHOOSE_FILE_TO_ADD_TO_CATALOG;
-
-
-	public static String UI_WARNING_URI_NOT_FOUND_COLON;
-	public static String UI_WARNING_URI_NOT_FOUND_LONG;
-	public static String UI_WARNING_INVALID_FILE;
-	public static String UI_WARNING_INVALID_FILE_LONG;
-	public static String UI_WARNING_NO_ELEMENT;
-	public static String UI_WARNING_NO_ELEMENT_DTD_LONG;
-	public static String UI_WARNING_NO_ELEMENT_XSD_LONG;
-	public static String UI_WARNING_SHOULD_BE_FULLY_QUALIFIED_URI;
-	public static String UI_WARNING_DUPLICATE_ENTRY;
-
-
-	// NewModelWizard
-	public static String UI_INVALID_GRAMMAR_ERROR;
-	public static String UI_BUTTON_BROWSE;
-
-	// XMLCatalogIdMappingPage
-	public static String UI_LABEL_MAP_TO;
-	public static String UI_LABEL_MAP_FROM;
-	public static String UI_BUTTON_NEW;
-	public static String UI_BUTTON_EDIT;
-	public static String UI_BUTTON_DELETE;
-	public static String UI_BUTTON_REMOVE;
-	public static String UI_LABEL_NEW_DIALOG_TITLE;
-	public static String UI_LABEL_EDIT_DIALOG_TITLE;
-
-
-	// XMLCatalogPreferencePage
-	public static String UI_LABEL_USER_ENTRIES;
-	public static String UI_LABEL_USER_ENTRIES_TOOL_TIP;
-	public static String UI_LABEL_SYSTEM_ENTRIES;
-	public static String UI_LABEL_SYSTEM_ENTRIES_TOOL_TIP;
-	public static String UI_BUTTON_CHANGE;
-	public static String UI_LABEL_SELECT_PROJECT;
-	public static String UI_LABEL_SPECIFY_PROJECT_DESCRIPTION;
-	public static String UI_WARNING_NO_PROJECTS_CREATED;
-	public static String UI_WARNING_PROJECT_NOT_SPECIFIED;
-	public static String UI_WARNING_PROJECT_DOES_NOT_EXIST;
-	public static String UI_LABEL_PROJECT_TO_USE;
-	public static String UI_LABEL_CATALOG_SAVE_ERROR;
-	public static String UI_LABEL_CATALOG_COULD_NOT_BE_SAVED;
-	public static String UI_LABEL_ADVANCED;
-	public static String UI_LABEL_ADVANCED_XML_CATALOG_PREFS;
-	public static String UI_LABEL_SPECIFY_PERSISTENCE_FILE;
-	public static String UI_LABEL_SAVE_CATALOG_DIALOG_TITLE;
-	public static String UI_LABEL_SAVE_CATALOG_DIALOG_DESC;
-	public static String UI_LABEL_BROWSE_CATALOG_FILE_TITLE;
-	public static String UI_LABEL_BROWSE_CATALOG_FILE_DESC;
-	public static String UI_LABEL_DETAILS;
-	public static String UI_LABEL_USER_SPECIFIED_ENTRIES;
-	public static String UI_LABEL_PLUGIN_SPECIFIED_ENTRIES;
-	public static String UI_LABEL_PLATFORM_RESOURCE;
-	public static String UI_LABEL_FILE_SYSTEM_RESOURCE;
-	// AdvancedOptionsDialog
-	public static String UI_BUTTON_IMPORT;
-	public static String UI_BUTTON_EXPORT;
-
-	public static String UI_LABEL_IMPORT_DIALOG_TITLE;
-	public static String UI_LABEL_IMPORT_DIALOG_HEADING;
-	public static String UI_LABEL_IMPORT_DIALOG_MESSAGE;
-
-	public static String UI_LABEL_EXPORT_DIALOG_TITLE;
-	public static String UI_LABEL_EXPORT_DIALOG_HEADING;
-	public static String UI_LABEL_EXPORT_DIALOG_MESSAGE;
-	public static String ERROR_SAVING_FILE;
-	public static String UI_LABEL_FILE_IS_READ_ONLY;
-	public static String UI_LABEL_DIALOG_DESCRIPTION;
-
-	public static String EditCatalogEntryDialog_catalogEntryLabel;
-	public static String EditCatalogEntryDialog_nextCatalogLabel;
-	public static String UI_BUTTON_MENU_BROWSE_WORKSPACE;
-	public static String UI_BUTTON_MENU_BROWSE_FILE_SYSTEM;
-	public static String UI_LABEL_SELECT_FILE_FILTER_CONTROL;
-	public static String UI_TEXT_SELECT_FILE_FILTER_CONTROL;
-
-
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, XMLCatalogMessages.class);
-	}
-
-	private XMLCatalogMessages() {
-		// cannot create new instance
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java
deleted file mode 100644
index 7316e01..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogPreferencePage.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     David Carver/STAR Standard - d_a_carver@yahoo.com - bug 192568
- *            Removed Advanced button - Functionality is now in the
- *            Import/Export XML Catalog Wizards. 
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEvent;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogListener;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-public class XMLCatalogPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, ICatalogListener {
-
-	protected XMLCatalogEntriesView catalogEntriesView;
-
-	protected ICatalog workingUserCatalog;
-
-	protected ICatalog systemCatalog;
-
-	protected ICatalog userCatalog;
-
-	protected ICatalog defaultCatalog;
-
-	protected Button advancedButton;
-
-	public XMLCatalogPreferencePage() {
-		defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-		for (int i = 0; i < nextCatalogs.length; i++) {
-			INextCatalog catalog = nextCatalogs[i];
-			ICatalog referencedCatalog = catalog.getReferencedCatalog();
-			if (referencedCatalog != null) {
-				if (XMLCorePlugin.SYSTEM_CATALOG_ID.equals(referencedCatalog.getId())) {
-					systemCatalog = referencedCatalog;
-				}
-				else if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId())) {
-					userCatalog = referencedCatalog;
-				}
-			}
-		}
-	}
-
-	public void dispose() {
-		super.dispose();
-		workingUserCatalog.removeListener(this);
-	}
-
-	/**
-	 * Refresh the view in responce to an event sent by the Catalog
-	 */
-	public void catalogChanged(ICatalogEvent event) {
-		catalogEntriesView.updatePage();
-	}
-
-	/**
-	 * Creates preference page controls on demand.
-	 * 
-	 * @param parent
-	 *            the parent for the preference page
-	 */
-	protected Control createContents(Composite parent) {
-		// we create a working copy of the 'User Settings' for the Catalog
-		// that we can modify
-		CatalogSet tempCatalogSet = new CatalogSet();
-		workingUserCatalog = tempCatalogSet.lookupOrCreateCatalog("working", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
-		// TODO: add entries from the nested catalogs as well
-		workingUserCatalog.addEntriesFromCatalog(userCatalog);
-		workingUserCatalog.addListener(this);
-		noDefaultAndApplyButton();
-		Composite composite = new Composite(parent, SWT.NULL);
-		// WorkbenchHelp.setHelp(composite, new
-		// ControlContextComputer(composite,
-		// XMLBuilderContextIds.XMLP_CATALOG_PAGE));
-		composite.setLayout(new GridLayout());
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		createCatalogEntriesView(composite);
-		createCatalogDetailsView(composite);
-		//createAdvancedButton(composite);
-		// catalogEntriesView.updatePage();
-		applyDialogFont(composite);
-
-		return composite;
-	}
-
-	/**
-	 * @deprecated
-	 * @param composite
-	 */
-	protected void createAdvancedButton(Composite composite) {
-		Composite panel = new Composite(composite, SWT.NONE);
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 3;
-		panel.setLayout(gridLayout);
-		panel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		// TODO... is there a better way to expand the page width?
-		// This invisible label is created to force the width of the page to
-		// be
-		// wide enough to show
-		// the rather long uri and key fields of a catalog entry.
-		Label widthFudger = new Label(panel, SWT.NONE);
-		String widthFudgerString = ""; //$NON-NLS-1$
-		for (int i = 0; i < 55; i++) {
-			widthFudgerString += "x"; //$NON-NLS-1$
-		}
-		widthFudger.setText(widthFudgerString);
-		widthFudger.setVisible(false);
-		Composite placeHolder = new Composite(panel, SWT.NONE);
-		placeHolder.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		advancedButton = new Button(panel, SWT.NONE);
-		advancedButton.setText(XMLCatalogMessages.UI_LABEL_ADVANCED);
-		SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				AdvancedOptionsDialog dialog = new AdvancedOptionsDialog(getShell(), workingUserCatalog);
-				dialog.create();
-				dialog.getShell().setText(XMLCatalogMessages.UI_LABEL_ADVANCED_XML_CATALOG_PREFS);
-				dialog.setBlockOnOpen(true);
-				dialog.open();
-			}
-		};
-		advancedButton.addSelectionListener(selectionListener);
-	}
-
-	public boolean isSameFileName(String a, String b) {
-		boolean result = false;
-		if ((a == null) && (b == null)) {
-			result = true;
-		}
-		else if ((a != null) && (b != null)) {
-			result = a.equals(b);
-		}
-		return result;
-	}
-
-	protected void createCatalogEntriesView(Composite parent) {
-		Group group = new Group(parent, SWT.NONE);
-		group.setLayout(new GridLayout());
-		group.setLayoutData(new GridData(GridData.FILL_BOTH));
-		group.setText(XMLCatalogMessages.UI_LABEL_USER_ENTRIES);
-		group.setToolTipText(XMLCatalogMessages.UI_LABEL_USER_ENTRIES_TOOL_TIP);
-		// WorkbenchHelp.setHelp(userEntriesGroup, new
-		// ControlContextComputer(userEntriesGroup,
-		// XMLBuilderContextIds.XMLP_CATALOG_USER_GROUP));
-		catalogEntriesView = new XMLCatalogEntriesView(group, workingUserCatalog, systemCatalog);
-		catalogEntriesView.setLayoutData(new GridData(GridData.FILL_BOTH));
-	}
-
-	protected void createCatalogDetailsView(Composite parent) {
-		Group detailsGroup = new Group(parent, SWT.NONE);
-		detailsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		detailsGroup.setLayout(new GridLayout());
-		detailsGroup.setText(XMLCatalogMessages.UI_LABEL_DETAILS);
-		final XMLCatalogEntryDetailsView detailsView = new XMLCatalogEntryDetailsView(detailsGroup);
-		ISelectionChangedListener listener = new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				ISelection selection = event.getSelection();
-				Object selectedObject = (selection instanceof IStructuredSelection) && ((IStructuredSelection) selection).size() == 1 ? ((IStructuredSelection) selection).getFirstElement() : null;
-				if (selectedObject instanceof ICatalogEntry) {
-					ICatalogEntry entry = (ICatalogEntry) selectedObject;
-					detailsView.setCatalogElement(entry);
-				}
-				else if (selectedObject instanceof INextCatalog) {
-					INextCatalog entry = (INextCatalog) selectedObject;
-					detailsView.setCatalogElement(entry);
-				}
-				else {
-					detailsView.setCatalogElement((ICatalogEntry) null);
-				}
-
-			}
-		};
-		catalogEntriesView.getViewer().addSelectionChangedListener(listener);
-	}
-
-	/**
-	 * Do anything necessary because the OK button has been pressed.
-	 * 
-	 * @return whether it is okay to close the preference page
-	 */
-	public boolean performOk() {
-		return storeValues();
-	}
-
-	/**
-	 * @see IWorkbenchPreferencePage
-	 */
-	public void init(IWorkbench workbench) {
-	}
-
-	/**
-	 * Stores the values of the controls back to the preference store.
-	 */
-	private boolean storeValues() {
-		// dw Object fileObject = null;
-		try {
-			// update the userCatalog so that its the same as the working
-			// catalog
-			userCatalog.clear();
-			// TODO add entries from the nested catalogs?
-			userCatalog.addEntriesFromCatalog(workingUserCatalog);
-			// now save the userCatalog
-			userCatalog.save();
-		}
-		catch (Exception e) {
-		}
-		return true;
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogResources.properties b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogResources.properties
deleted file mode 100644
index 6fff466..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogResources.properties
+++ /dev/null
@@ -1,115 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     David Carver/STAR Standard, d_a_carver@yahoo.com, bug 192568
-#        - Fixed grammar in XML Catalog Import dialog.
-###############################################################################
-UI_WIZARD_SCHEMA_AND_NAME_SPACE_INFO = Schema and Namespace Information
-UI_LABEL_NAME_SPACE_PREFIX           = Namespace prefix:
-UI_LABEL_NAME_SPACE_URI              = Namespace URI:
-UI_LABEL_XSD_LOCATION                = Schema location:
-UI_LABEL_DOCTYPE_INFORMATION         = Document type information
-UI_LABEL_SYSTEM_ID                   = &System ID:
-UI_LABEL_PUBLIC_ID                   = &Public ID:
-UI_LABEL_SELECT_FILE                 = Select File
-UI_LABEL_KEY                         = Key
-UI_LABEL_KEY_COLON                   = &Key:
-UI_LABEL_DETAILS_KEY_COLON           = Key:
-UI_LABEL_DETAILS_IN_JAR_FILE		 = in jar file
-UI_LABEL_URI                         = URI
-UI_LABEL_LOCATION_COLON              = &Location:  
-UI_LABEL_CATALOG_URI_COLON		      = &Location of another XML Catalog file:
-UI_LABEL_DETAILS_URI_COLON           = URI:   
-UI_KEY_TYPE_COLON                    = Key &Type:
-UI_KEY_TYPE_DETAILS_COLON            = Key Type:
-UI_LABEL_DETAILS_URI_LOCATION        = Location:
-UI_KEY_TYPE_DESCRIPTION_XSD_PUBLIC   = Namespace Name
-UI_KEY_TYPE_DESCRIPTION_XSD_SYSTEM   = Schema Location
-UI_KEY_TYPE_DESCRIPTION_DTD_PUBLIC   = Public ID
-UI_KEY_TYPE_DESCRIPTION_DTD_SYSTEM   = System ID
-UI_KEY_TYPE_DESCRIPTION_URI   		  = URI
-UI_LABEL_SPECIFY_ALTERNATIVE_WEB_URL = Specify &alternative web address
-UI_WARNING_URI_MUST_NOT_HAVE_DOTS    = URI must not included '.' or '..'
-UI_LABEL_PLATFORM_RESOURCE 		 	 = Workspace
-UI_LABEL_FILE_SYSTEM_RESOURCE		 = File System
-
-UI_WARNING_URI_NOT_FOUND_COLON       = The specified resource can't be located :
-UI_WARNING_SHOULD_BE_FULLY_QUALIFIED_URI = Warning: the key value should be a fully qualified URI
-UI_WARNING_URI_NOT_FOUND_LONG        = The specified file cannot be found. It may have been moved to a different location. If the file is located remotely, a network connection cannot be established to the remote location. 
-UI_WARNING_INVALID_FILE              = The specified file is invalid.
-UI_WARNING_INVALID_FILE_LONG         = The specified file is invalid. A proper XML file cannot be generated from it. Open the DTD or XML schema file, edit it as necessary, validate it and try again.
-UI_WARNING_NO_ELEMENT                = The specified file must contain at least one element declaration.
-UI_WARNING_NO_ELEMENT_DTD_LONG       = The specified file must contain at least one element declaration that can be used as the root element in the generated XML file.
-UI_WARNING_NO_ELEMENT_XSD_LONG       = The specified file must contain at least one global element declaration that can be used as the root element in the generated XML file.
-UI_WARNING_DUPLICATE_ENTRY			 = The specified entry is invalid. An existing entry has the same key and key type.
-
-
-!NewModelWizard
-UI_INVALID_GRAMMAR_ERROR             = Invalid Grammar
-UI_BUTTON_BROWSE                     = &Browse...
-
-!XMLCatalogIdMappingPage
-UI_LABEL_MAP_TO                      = Map to:
-UI_LABEL_MAP_FROM                    = Map from:
-UI_BUTTON_NEW                        = &Add...
-UI_BUTTON_EDIT                       = &Edit...
-UI_BUTTON_DELETE                     = &Delete
-UI_BUTTON_REMOVE                     = &Remove
-UI_LABEL_NEW_DIALOG_TITLE            = Add XML Catalog Entry
-UI_LABEL_EDIT_DIALOG_TITLE           = Edit XML Catalog Entry
-
-
-!XMLCatalogPreferencePage
-UI_LABEL_USER_ENTRIES                = XML Catalog Entries
-UI_LABEL_USER_ENTRIES_TOOL_TIP       = XML Catalog entries that have been specified by the user
-UI_LABEL_SYSTEM_ENTRIES              = Plug-in specified entries
-UI_LABEL_SYSTEM_ENTRIES_TOOL_TIP     = XML Catalog entries that have been specified by a plug-in
-UI_BUTTON_CHANGE                     = Change...
-UI_LABEL_SELECT_PROJECT              = Select Project
-UI_LABEL_SPECIFY_PROJECT_DESCRIPTION = Specify the project to persist the XML Catalog information
-UI_WARNING_NO_PROJECTS_CREATED       = No projects have been created yet.
-UI_WARNING_PROJECT_NOT_SPECIFIED     = A project name has not been specified.
-UI_WARNING_PROJECT_DOES_NOT_EXIST    = The specified project does not exist.
-UI_LABEL_PROJECT_TO_USE              = Project to use to persist XML Catalog User Entries: 
-UI_LABEL_CATALOG_SAVE_ERROR          = XML Catalog Save Error
-UI_LABEL_CATALOG_COULD_NOT_BE_SAVED  = The XML Catalog entry could not be saved.
-UI_LABEL_ADVANCED                    = &Advanced...
-UI_LABEL_ADVANCED_XML_CATALOG_PREFS  = Advanced XML Catalog Preferences   
-UI_LABEL_SPECIFY_PERSISTENCE_FILE    = &Specify a file to use to persist the XML Catalog information.
-UI_LABEL_SAVE_CATALOG_DIALOG_TITLE   = Save Changes
-UI_LABEL_SAVE_CATALOG_DIALOG_DESC    = You have made unsaved changes to the current XML Catalog settings. Do you wish to save your changes before loading the new XML Catalog settings?   
-UI_LABEL_BROWSE_CATALOG_FILE_TITLE   = Select Folder
-UI_LABEL_BROWSE_CATALOG_FILE_DESC    = Select the folder that contains the '.xmlcatalog' file.   
-UI_LABEL_DETAILS                     = Details
-UI_LABEL_USER_SPECIFIED_ENTRIES      = User Specified Entries
-UI_LABEL_PLUGIN_SPECIFIED_ENTRIES    = Plugin Specified Entries
-UI_LABEL_FILE_SELECTION				 = File Selection
-UI_LABEL_CHOOSE_FILE_TO_ADD_TO_CATALOG				 = Choose a file to add to the XML Catalog
- 
-!AdvancedOptionsDialog
-UI_LABEL_DIALOG_DESCRIPTION          = Use the buttons below to import or export XML Catalog settings.
-UI_BUTTON_IMPORT                     = Import...
-UI_BUTTON_EXPORT                     = Export...
-                                   
-UI_LABEL_IMPORT_DIALOG_TITLE         = Import XML Catalog Settings
-UI_LABEL_IMPORT_DIALOG_HEADING       = Specify XML Catalog File
-UI_LABEL_IMPORT_DIALOG_MESSAGE       = Specify the file that will be used to load the XML Catalog Settings
-
-UI_LABEL_EXPORT_DIALOG_TITLE         = Export XML Catalog Settings
-UI_LABEL_EXPORT_DIALOG_HEADING       = Specify XML Catalog File
-UI_LABEL_EXPORT_DIALOG_MESSAGE       = Specify the file that will used to save the XML Catalog Setting
-ERROR_SAVING_FILE					 = Error saving file %1
-UI_LABEL_FILE_IS_READ_ONLY           = File %1 is read only
-
-EditCatalogEntryDialog_catalogEntryLabel=&Catalog Entry
-EditCatalogEntryDialog_nextCatalogLabel=&Next Catalog
-UI_BUTTON_MENU_BROWSE_WORKSPACE=&Workspace...
-UI_BUTTON_MENU_BROWSE_FILE_SYSTEM=&File System...
-UI_LABEL_SELECT_FILE_FILTER_CONTROL=Files of type:
-UI_TEXT_SELECT_FILE_FILTER_CONTROL=All Supported Files
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogTreeViewer.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogTreeViewer.java
deleted file mode 100644
index 30d4959..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLCatalogTreeViewer.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import com.ibm.icu.text.Collator;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogElement;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-
-public class XMLCatalogTreeViewer extends TreeViewer {
-	protected static Image xmlCatalogImage = ImageFactory.INSTANCE.getImage("icons/obj16/xmlcatalog_obj.gif"); //$NON-NLS-1$
-	protected static Image errorImage = ImageFactory.INSTANCE.getImage("icons/ovr16/error-overlay.gif"); //$NON-NLS-1$
-	protected static Image entryImage = ImageFactory.INSTANCE.getImage("icons/obj16/entry_obj.png"); //$NON-NLS-1$
-	protected static Image nextCatalogImage = ImageFactory.INSTANCE.getImage("icons/obj16/nextCatalog_obj.gif"); //$NON-NLS-1$
-
-	protected static String ERROR_STATE_KEY = "errorstatekey"; //$NON-NLS-1$
-
-	protected ICatalog fWorkingUserCatalog;
-	protected ICatalog fSystemCatalog;
-
-	public static String USER_SPECIFIED_ENTRIES_OBJECT = XMLCatalogMessages.UI_LABEL_USER_SPECIFIED_ENTRIES;
-	public static String PLUGIN_SPECIFIED_ENTRIES_OBJECT = XMLCatalogMessages.UI_LABEL_PLUGIN_SPECIFIED_ENTRIES;
-
-	public XMLCatalogTreeViewer(Composite parent, ICatalog workingUserCatalog, ICatalog systemCatalog) {
-		super(parent, SWT.MULTI | SWT.BORDER);
-		this.fWorkingUserCatalog = workingUserCatalog;
-		this.fSystemCatalog = systemCatalog;
-
-		setContentProvider(new CatalogEntryContentProvider());
-		setLabelProvider(new CatalogEntryLabelProvider());
-	}
-
-	public void setFilterExtensions(String[] extensions) {
-		resetFilters();
-		addFilter(new XMLCatalogTableViewerFilter(extensions));
-	}
-
-	public class CatalogEntryLabelProvider extends LabelProvider {
-		protected HashMap imageTable = new HashMap();
-
-		public String getText(Object object) {
-			String result = null;
-			if (object instanceof ICatalogEntry) {
-				ICatalogEntry catalogEntry = (ICatalogEntry) object;
-				result = catalogEntry.getKey();
-				// result = URIHelper.removePlatformResourceProtocol(result);
-			}
-			else if (object instanceof INextCatalog) {
-				INextCatalog nextCatalog = (INextCatalog) object;
-				// result = nextCatalog.getCatalogLocation();
-				result = URIUtils.convertURIToLocation(nextCatalog.getCatalogLocation());
-				if (nextCatalog.getCatalogLocation().startsWith("file:")) {
-					result += " (" + XMLCatalogMessages.UI_LABEL_FILE_SYSTEM_RESOURCE + ")";
-				}
-				else if (nextCatalog.getCatalogLocation().startsWith("platform:")) {
-					result += " (" + XMLCatalogMessages.UI_LABEL_PLATFORM_RESOURCE + ")";
-				}
-			}
-			return result != null ? result : object.toString();
-		}
-
-		public Image getImage(Object object) {
-			Image result = null;
-			Image base = null;
-			if (object instanceof String) {
-				result = xmlCatalogImage;
-			}
-			else if (object instanceof ICatalogEntry) {
-				ICatalogEntry catalogEntry = (ICatalogEntry) object;
-				String uri = catalogEntry.getURI();
-				IEditorRegistry er = PlatformUI.getWorkbench().getEditorRegistry();
-				ImageDescriptor imageDescriptor = er.getImageDescriptor(uri);
-				Image image = (Image) imageTable.get(imageDescriptor);
-				if (image == null) {
-					image = imageDescriptor.createImage();
-					imageTable.put(imageDescriptor, image);
-				}
-				base = image;
-
-				if (base != null) {
-					if (URIHelper.isReadableURI(uri, true)) {
-						result = base;
-					}
-					else {
-						result = ImageFactory.INSTANCE.createCompositeImage(base, errorImage, ImageFactory.BOTTOM_LEFT);
-					}
-				}
-			}
-			else if (object instanceof INextCatalog) {
-				// TODO: add image to the imageTable and add error overlay if
-				// next catalog URI is not readable
-				result = nextCatalogImage;
-			}
-			return result;
-		}
-
-		public void dispose() {
-			super.dispose();
-			for (Iterator it = imageTable.values().iterator(); it.hasNext();) {
-				((Image) it.next()).dispose();
-			}
-		}
-	}
-
-
-	public class CatalogEntryContentProvider implements ITreeContentProvider {
-		protected Object[] roots;
-
-		public CatalogEntryContentProvider() {
-			roots = new Object[2];
-			roots[0] = USER_SPECIFIED_ENTRIES_OBJECT;
-			roots[1] = PLUGIN_SPECIFIED_ENTRIES_OBJECT;
-		}
-
-		public boolean isRoot(Object object) {
-			return (object instanceof String) || (object instanceof INextCatalog);
-		}
-
-		public Object[] getElements(Object element) {
-			return roots;
-		}
-
-		public Object[] getChildren(Object parentElement) {
-			Object[] result = new Object[0];
-			if (parentElement == roots[0]) {
-				result = getChildrenHelper(fWorkingUserCatalog);
-			}
-			else if (parentElement == roots[1]) {
-				result = getChildrenHelper(fSystemCatalog);
-			}
-			else if (parentElement instanceof INextCatalog) {
-				ICatalog nextCatalog = ((INextCatalog) parentElement).getReferencedCatalog();
-				result = getChildrenHelper(nextCatalog);
-			}
-			return result;
-		}
-
-		protected Object[] getChildrenHelper(ICatalog catalog) {
-			// TODO add entries from the nested catalogs
-
-			ICatalogEntry[] entries = catalog.getCatalogEntries();
-			if (entries.length > 0) {
-				Comparator comparator = new Comparator() {
-					public int compare(Object o1, Object o2) {
-						int result = 0;
-						if ((o1 instanceof ICatalogEntry) && (o2 instanceof ICatalogEntry)) {
-							ICatalogEntry entry1 = (ICatalogEntry) o1;
-							ICatalogEntry entry2 = (ICatalogEntry) o2;
-							result = Collator.getInstance().compare(entry1.getKey(), entry2.getKey());
-						}
-						return result;
-					}
-				};
-				Arrays.sort(entries, comparator);
-			}
-			Vector result = new Vector();
-			result.addAll(Arrays.asList(entries));
-			INextCatalog[] nextCatalogs = catalog.getNextCatalogs();
-			List nextCatalogsList = Arrays.asList(nextCatalogs);
-			result.addAll(nextCatalogsList);
-
-			return result.toArray(new ICatalogElement[result.size()]);
-		}
-
-		public Object getParent(Object element) {
-			return (element instanceof String) ? null : USER_SPECIFIED_ENTRIES_OBJECT;
-		}
-
-		public boolean hasChildren(Object element) {
-			return isRoot(element) ? getChildren(element).length > 0 : false;
-		}
-
-		public void dispose() {
-			// nothing to dispose
-		}
-
-		public void inputChanged(Viewer viewer, Object old, Object newobj) {
-			// ISSUE: seems we should do something here
-		}
-
-		public boolean isDeleted(Object object) {
-			return false;
-		}
-	}
-
-
-	public void menuAboutToShow(IMenuManager menuManager) {
-		Action action = new Action("hello") { //$NON-NLS-1$
-			public void run() {
-				System.out.println("run!"); //$NON-NLS-1$
-			}
-		};
-		menuManager.add(action);
-	}
-
-
-	class XMLCatalogTableViewerFilter extends ViewerFilter {
-		protected String[] extensions;
-
-		public XMLCatalogTableViewerFilter(String[] extensions1) {
-			this.extensions = extensions1;
-		}
-
-		public boolean isFilterProperty(Object element, Object property) {
-			return false;
-		}
-
-		public boolean select(Viewer viewer, Object parent, Object element) {
-			boolean result = false;
-			if (element instanceof ICatalogEntry) {
-				ICatalogEntry catalogEntry = (ICatalogEntry) element;
-				for (int i = 0; i < extensions.length; i++) {
-					if (catalogEntry.getURI().endsWith(extensions[i])) {
-						result = true;
-						break;
-					}
-				}
-			}
-			else if (element.equals(XMLCatalogTreeViewer.PLUGIN_SPECIFIED_ENTRIES_OBJECT) || element.equals(XMLCatalogTreeViewer.USER_SPECIFIED_ENTRIES_OBJECT)) {
-				return true;
-			}
-			return result;
-		}
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLQuickScan.java b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLQuickScan.java
deleted file mode 100644
index 723539d..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/XMLQuickScan.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.catalog;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * 
- */
-public class XMLQuickScan {
-	public static String getTargetNamespaceURIForSchema(String uri) {
-		String result = null;
-		try {
-			URL url = new URL(uri);
-			InputStream inputStream = url.openStream();
-			result = XMLQuickScan.getTargetNamespaceURIForSchema(inputStream);
-		}
-		catch (Exception e) {
-		}
-		return result;
-	}
-
-	public static String getTargetNamespaceURIForSchema(InputStream input) {
-		TargetNamespaceURIContentHandler handler = new TargetNamespaceURIContentHandler();
-		ClassLoader prevClassLoader = Thread.currentThread().getContextClassLoader();
-		try {
-			Thread.currentThread().setContextClassLoader(XMLQuickScan.class.getClassLoader());
-			SAXParserFactory factory = SAXParserFactory.newInstance();
-			factory.setNamespaceAware(true);
-			SAXParser parser = factory.newSAXParser();
-			parser.parse(new InputSource(input), handler);
-		}
-		catch (StopParseException e) {
-			// this is a normal exception to stop parsing early,
-			// when info is found, so we can safely ignore
-		}
-		catch (ParserConfigurationException e) {
-			Logger.logException(e);
-		}
-		catch (SAXException e) {
-			Logger.logException(e);
-		}
-		catch (IOException e) {
-			Logger.logException(e);
-		}
-		finally {
-			Thread.currentThread().setContextClassLoader(prevClassLoader);
-		}
-		return handler.targetNamespaceURI;
-	}
-
-	/**
-	 * This is a special exception that is used to stop parsing when required
-	 * information is found.
-	 */
-	static class StopParseException extends org.xml.sax.SAXException {
-		static final long serialVersionUID = 1L;
-
-		/**
-		 * Constructor StopParseException.
-		 */
-		StopParseException() {
-			super("targetnamespace found, no need to continue the parse");
-		}
-	}
-
-	static class TargetNamespaceURIContentHandler extends DefaultHandler {
-		public String targetNamespaceURI;
-
-		public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-			if (localName.equals("schema")) //$NON-NLS-1$
-			{
-				int nAttributes = attributes.getLength();
-				for (int i = 0; i < nAttributes; i++) {
-					if (attributes.getLocalName(i).equals("targetNamespace")) //$NON-NLS-1$
-					{
-						targetNamespaceURI = attributes.getValue(i);
-						break;
-					}
-				}
-			}
-			throw new StopParseException();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/etool50/catalogEntry.gif b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/etool50/catalogEntry.gif
deleted file mode 100644
index d65b280..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/etool50/catalogEntry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/etool50/nextCatalog.gif b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/etool50/nextCatalog.gif
deleted file mode 100644
index 3a934b9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/etool50/nextCatalog.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/entry_obj.png b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/entry_obj.png
deleted file mode 100644
index be71474..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/entry_obj.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/file_expand.gif b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/file_expand.gif
deleted file mode 100644
index 85f9baa..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/file_expand.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/file_obj.gif b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/file_obj.gif
deleted file mode 100644
index 061161a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/file_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/nextCatalog_obj.gif b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/nextCatalog_obj.gif
deleted file mode 100644
index d4bfe79..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/nextCatalog_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/xmlcatalog_obj.gif b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/xmlcatalog_obj.gif
deleted file mode 100644
index a61441f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/obj16/xmlcatalog_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/ovr16/error-overlay.gif b/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/ovr16/error-overlay.gif
deleted file mode 100644
index 119dccc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-catalog/org/eclipse/wst/xml/ui/internal/catalog/icons/ovr16/error-overlay.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/DOMPropertyDescriptorFactory.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/DOMPropertyDescriptorFactory.java
deleted file mode 100644
index 5bebb72..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/DOMPropertyDescriptorFactory.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.properties.EnumeratedStringPropertyDescriptor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CDATASection;
-import org.w3c.dom.Comment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.EntityReference;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-
-public class DOMPropertyDescriptorFactory {
-
-	protected static final String HACK = "hack"; //$NON-NLS-1$
-
-	public DOMPropertyDescriptorFactory() {
-	}
-
-	public IPropertyDescriptor createAttributePropertyDescriptor(Attr attr) {
-		IPropertyDescriptor result = null;
-
-		String attributeName = attr.getName();
-
-		ModelQuery mq = ModelQueryUtil.getModelQuery(attr.getOwnerDocument());
-
-		if (mq != null) {
-			CMAttributeDeclaration ad = mq.getCMAttributeDeclaration(attr);
-			if (ad != null) {
-				String[] valuesArray = mq.getPossibleDataTypeValues(attr.getOwnerElement(), ad);
-				if ((valuesArray != null) && (valuesArray.length > 0)) {
-					result = new EnumeratedStringPropertyDescriptor(attributeName, attributeName, valuesArray);
-				}
-			}
-		}
-
-		if (result == null) {
-			result = createDefaultPropertyDescriptor(attributeName);
-		}
-		return result;
-	}
-
-	public IPropertyDescriptor createCDATASectionPropertyDescriptor(CDATASection cdataSection) {
-		return createDefaultPropertyDescriptor(HACK);
-	}
-
-	public IPropertyDescriptor createCommentPropertyDescriptor(Comment comment) {
-		return createDefaultPropertyDescriptor(HACK);
-	}
-
-	protected IPropertyDescriptor createDefaultPropertyDescriptor(String attributeName) {
-		TextPropertyDescriptor descriptor = new TextPropertyDescriptor(attributeName, attributeName);
-		return descriptor;
-	}
-
-	public IPropertyDescriptor createDocumentTypePropertyDescriptor(DocumentType documentType) {
-		return null; // new TextPropertyDescriptor(HACK, HACK);
-	}
-
-	public IPropertyDescriptor createElementPropertyDescriptor(Element element) {
-		return createDefaultPropertyDescriptor(HACK);
-	}
-
-	public IPropertyDescriptor createEntityReferencePropertyDescriptor(EntityReference entityReference) {
-		return createDefaultPropertyDescriptor(HACK);
-	}
-
-	public IPropertyDescriptor createProcessingInstructionPropertyDescriptor(ProcessingInstruction pi) {
-		return createDefaultPropertyDescriptor(HACK);
-	}
-
-	public IPropertyDescriptor createPropertyDescriptor(Object object) {
-		IPropertyDescriptor result = null;
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			int nodeType = node.getNodeType();
-			switch (nodeType) {
-				case Node.ATTRIBUTE_NODE : {
-					result = createAttributePropertyDescriptor((Attr) node);
-					break;
-				}
-				case Node.CDATA_SECTION_NODE : {
-					result = createCDATASectionPropertyDescriptor((CDATASection) node);
-					break;
-				}
-				case Node.COMMENT_NODE : {
-					result = createCommentPropertyDescriptor((Comment) node);
-					break;
-				}
-				case Node.DOCUMENT_TYPE_NODE : {
-					result = createDocumentTypePropertyDescriptor((DocumentType) node);
-					break;
-				}
-				case Node.ELEMENT_NODE : {
-					result = createElementPropertyDescriptor((Element) node);
-					break;
-				}
-				case Node.ENTITY_REFERENCE_NODE : {
-					result = createEntityReferencePropertyDescriptor((EntityReference) node);
-					break;
-				}
-				case Node.PROCESSING_INSTRUCTION_NODE : {
-					result = createProcessingInstructionPropertyDescriptor((ProcessingInstruction) node);
-					break;
-				}
-				case Node.TEXT_NODE : {
-					result = createTextPropertyDescriptor((Text) node);
-					break;
-				}
-			}
-		}
-		return result;
-	}
-
-	public IPropertyDescriptor createTextPropertyDescriptor(Text text) {
-		return createDefaultPropertyDescriptor(HACK);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/IDesignViewer.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/IDesignViewer.java
deleted file mode 100644
index f1be97f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/IDesignViewer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.widgets.Control;
-
-public interface IDesignViewer {
-	public Control getControl();
-
-	String getTitle();
-
-	void setDocument(IDocument document);
-
-	ISelectionProvider getSelectionProvider();
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/IDesignViewerActionBarContributor.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/IDesignViewerActionBarContributor.java
deleted file mode 100644
index 411a3f9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/IDesignViewerActionBarContributor.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-
-
-public interface IDesignViewerActionBarContributor extends ISourceViewerActionBarContributor {
-	public void initViewerSpecificContributions(IActionBars bars);
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/SourceEditorActionBarContributor.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/SourceEditorActionBarContributor.java
deleted file mode 100644
index 5d663e3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/SourceEditorActionBarContributor.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.ExtendedEditorActionBuilder;
-import org.eclipse.wst.sse.ui.internal.IExtendedContributor;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-
-
-public class SourceEditorActionBarContributor extends MultiPageEditorActionBarContributor implements IExtendedContributor {
-
-	protected IEditorActionBarContributor designViewerActionBarContributor = null;
-	protected IEditorActionBarContributor sourceViewerActionContributor = null;
-	protected MultiPageEditorPart multiPageEditor = null;
-
-	// EditorExtension
-	private static final String EDITOR_ID = "org.eclipse.wst.xml.ui.XMLMultiPageEditorPart"; //$NON-NLS-1$
-	private IExtendedContributor extendedContributor;
-
-	public SourceEditorActionBarContributor() {
-		super();
-
-		sourceViewerActionContributor = new SourcePageActionContributor();
-
-		// Read action extensions.
-		ExtendedEditorActionBuilder builder = new ExtendedEditorActionBuilder();
-		extendedContributor = builder.readActionExtensions(EDITOR_ID);
-	}
-
-	public void init(IActionBars actionBars) {
-		super.init(actionBars);
-
-		if (actionBars != null) {
-			initDesignViewerActionBarContributor(actionBars);
-			initSourceViewerActionContributor(actionBars);
-		}
-	}
-
-	protected void initDesignViewerActionBarContributor(IActionBars actionBars) {
-		if (designViewerActionBarContributor != null) {
-			designViewerActionBarContributor.init(actionBars, getPage());
-		}
-	}
-
-	protected void initSourceViewerActionContributor(IActionBars actionBars) {
-		if (sourceViewerActionContributor != null) {
-			sourceViewerActionContributor.init(actionBars, getPage());
-		}
-	}
-
-	public void dispose() {
-		super.dispose();
-
-		if (designViewerActionBarContributor != null) {
-			designViewerActionBarContributor.dispose();
-		}
-
-		if (sourceViewerActionContributor != null) {
-			sourceViewerActionContributor.dispose();
-		}
-
-		if (extendedContributor != null) {
-			extendedContributor.dispose();
-		}
-		
-		multiPageEditor = null;
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToMenu(IMenuManager)
-	 */
-	public final void contributeToMenu(IMenuManager menu) {
-		super.contributeToMenu(menu);
-
-		//addToMenu(menu);
-
-		if (extendedContributor != null) {
-			extendedContributor.contributeToMenu(menu);
-		}
-	}
-
-	protected void addToMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see IExtendedContributor#contributeToPopupMenu(IMenuManager)
-	 */
-	public final void contributeToPopupMenu(IMenuManager menu) {
-
-		addToPopupMenu(menu);
-
-		if (extendedContributor != null) {
-			extendedContributor.contributeToPopupMenu(menu);
-		}
-	}
-
-	protected void addToPopupMenu(IMenuManager menu) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToToolBar(IToolBarManager)
-	 */
-	public final void contributeToToolBar(IToolBarManager toolBarManager) {
-		super.contributeToToolBar(toolBarManager);
-
-		addToToolBar(toolBarManager);
-
-		if (extendedContributor != null) {
-			extendedContributor.contributeToToolBar(toolBarManager);
-		}
-	}
-
-	protected void addToToolBar(IToolBarManager toolBarManager) {
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToStatusLine(IStatusLineManager)
-	 */
-	public final void contributeToStatusLine(IStatusLineManager manager) {
-		super.contributeToStatusLine(manager);
-
-		addToStatusLine(manager);
-
-		if (extendedContributor != null) {
-			extendedContributor.contributeToStatusLine(manager);
-		}
-	}
-
-	protected void addToStatusLine(IStatusLineManager manager) {
-	}
-
-	/**
-	 * @see IExtendedContributor#updateToolbarActions()
-	 */
-	public void updateToolbarActions() {
-		if (extendedContributor != null) {
-			extendedContributor.updateToolbarActions();
-		}
-	}
-
-	public void setActiveEditor(IEditorPart targetEditor) {
-		// save multiPageEditor before calling
-		// super.setActiveEditor(targetEditor)
-		// super.setActiveEditor will call setActivePage(IEditorPart
-		// activeEditor)
-		// multiPageEditor is needed in setActivePage(IEditorPart
-		// activeEditor)
-		if (targetEditor instanceof MultiPageEditorPart) {
-			multiPageEditor = (MultiPageEditorPart) targetEditor;
-		}
-
-		super.setActiveEditor(targetEditor);
-
-		updateToolbarActions();
-
-		if (extendedContributor != null) {
-			extendedContributor.setActiveEditor(targetEditor);
-		}
-	}
-
-	public void setActivePage(IEditorPart activeEditor) {
-		// This contributor is designed for StructuredTextMultiPageEditorPart.
-		// To safe-guard this from problems caused by unexpected usage by
-		// other editors, the following
-		// check is added.
-		if (multiPageEditor != null) {
-			if ((activeEditor != null) && (activeEditor instanceof StructuredTextEditor)) {
-				activateSourcePage(activeEditor);
-			}
-			else {
-				activateDesignPage(activeEditor);
-			}
-		}
-
-		updateToolbarActions();
-
-		IActionBars actionBars = getActionBars();
-		if (actionBars != null) {
-			// update menu bar and tool bar
-			actionBars.updateActionBars();
-		}
-	}
-
-	protected void activateDesignPage(IEditorPart activeEditor) {
-		if ((designViewerActionBarContributor != null) && (designViewerActionBarContributor instanceof IDesignViewerActionBarContributor)) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if ((sourceViewerActionContributor != null) && (sourceViewerActionContributor instanceof ISourceViewerActionBarContributor)) {
-			// if design page is not really an IEditorPart, activeEditor ==
-			// null, so pass in multiPageEditor instead (d282414)
-			if (activeEditor == null) {
-				sourceViewerActionContributor.setActiveEditor(multiPageEditor);
-			}
-			else {
-				sourceViewerActionContributor.setActiveEditor(activeEditor);
-			}
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(false);
-		}
-	}
-
-	protected void activateSourcePage(IEditorPart activeEditor) {
-		if ((designViewerActionBarContributor != null) && (designViewerActionBarContributor instanceof IDesignViewerActionBarContributor)) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-		}
-
-		if ((sourceViewerActionContributor != null) && (sourceViewerActionContributor instanceof ISourceViewerActionBarContributor)) {
-			sourceViewerActionContributor.setActiveEditor(activeEditor);
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(true);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/SourcePageActionContributor.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/SourcePageActionContributor.java
deleted file mode 100644
index bd1e251..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/SourcePageActionContributor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML;
-
-
-/**
- * SourcePageActionContributor
- * 
- * This class is for multi page editor's source page contributor.
- * 
- * Use XMLEditorActionContributor for single page editor.
- */
-public class SourcePageActionContributor extends ActionContributorXML {
-
-	private IActionBars fBars;
-
-	/**
-	 * This method calls:
-	 * <ul>
-	 * <li><code>contributeToMenu</code> with <code>bars</code>' menu
-	 * manager</li>
-	 * <li><code>contributeToToolBar</code> with <code>bars</code>' tool
-	 * bar manager</li>
-	 * <li><code>contributeToStatusLine</code> with <code>bars</code>'
-	 * status line manager</li>
-	 * </ul>
-	 * The given action bars are also remembered and made accessible via
-	 * <code>getActionBars</code>.
-	 * 
-	 * @param bars
-	 *            the action bars
-	 * 
-	 */
-	public void init(IActionBars bars) {
-		fBars = bars;
-		contributeToMenu(bars.getMenuManager());
-		contributeToToolBar(bars.getToolBarManager());
-		contributeToStatusLine(bars.getStatusLineManager());
-	}
-
-	/**
-	 * Returns this contributor's action bars.
-	 * 
-	 * @return the action bars
-	 */
-	public IActionBars getActionBars() {
-		return fBars;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/TreeContentHelper.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/TreeContentHelper.java
deleted file mode 100644
index 9033227..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/TreeContentHelper.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMWriter;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-
-/**
- * This performs the work of taking a DOM tree and converting it to a
- * displayable 'UI' tree.
- * 
- * For example : - white space text nodes are ommited from the 'UI' tree -
- * adjacent Text and EntityReference nodes are combined into a single 'UI'
- * node - Elements with 'text only' children are diplayed without children
- * 
- */
-public class TreeContentHelper {
-
-	public static final int HIDE_WHITE_SPACE_TEXT_NODES = 8;
-	public static final int COMBINE_ADJACENT_TEXT_AND_ENTITY_REFERENCES = 16;
-	public static final int HIDE_ELEMENT_CHILD_TEXT_NODES = 32;
-
-	protected int style = HIDE_WHITE_SPACE_TEXT_NODES | COMBINE_ADJACENT_TEXT_AND_ENTITY_REFERENCES | HIDE_ELEMENT_CHILD_TEXT_NODES;
-
-	/**
-	 * 
-	 */
-	public boolean hasStyleFlag(int flag) {
-		return (style & flag) != 0;
-	}
-
-	/**
-	 * 
-	 */
-	public Object[] getChildren(Object element) {
-		Object[] result = null;
-
-		if (element instanceof Node) {
-			Node node = (Node) element;
-			List list = new ArrayList();
-			boolean textContentOnly = true;
-
-			NamedNodeMap map = node.getAttributes();
-			if (map != null) {
-				int length = map.getLength();
-				for (int i = 0; i < length; i++) {
-					list.add(map.item(i));
-					textContentOnly = false;
-				}
-			}
-
-			Node prevIncludedNode = null;
-			for (Node childNode = node.getFirstChild(); childNode != null; childNode = childNode.getNextSibling()) {
-				int childNodeType = childNode.getNodeType();
-				boolean includeNode = true;
-
-				if (includeNode && hasStyleFlag(HIDE_WHITE_SPACE_TEXT_NODES)) {
-					if (isIgnorableText(childNode)) {
-						// filter out the ignorable text node
-						includeNode = false;
-					}
-				}
-
-				if (includeNode && hasStyleFlag(COMBINE_ADJACENT_TEXT_AND_ENTITY_REFERENCES)) {
-					if (isTextOrEntityReferenceNode(childNode) && (prevIncludedNode != null) && isTextOrEntityReferenceNode(prevIncludedNode)) {
-						// we only show the first of a list of adjacent text
-						// or entity reference node in the tree
-						// so we filter out this subsequent one
-						includeNode = false;
-					}
-				}
-
-				if (hasStyleFlag(HIDE_ELEMENT_CHILD_TEXT_NODES)) {
-					if ((childNodeType != Node.TEXT_NODE) && (childNodeType != Node.ENTITY_REFERENCE_NODE)) {
-						textContentOnly = false;
-					}
-				}
-
-				if (includeNode) {
-					list.add(childNode);
-					prevIncludedNode = childNode;
-				}
-			}
-
-			if (hasStyleFlag(HIDE_ELEMENT_CHILD_TEXT_NODES) && textContentOnly) {
-				result = new Object[0];
-			}
-			else {
-				result = list.toArray();
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	protected boolean isTextOrEntityReferenceNode(Node node) {
-		return (node.getNodeType() == Node.TEXT_NODE) || (node.getNodeType() == Node.ENTITY_REFERENCE_NODE);
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isIgnorableText(Node node) {
-		boolean result = false;
-		if (node.getNodeType() == Node.TEXT_NODE) {
-			String data = ((Text) node).getData();
-			result = ((data == null) || (data.trim().length() == 0));
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isCombinedTextNode(Node node) {
-		boolean result = false;
-		if (node.getNodeType() == Node.TEXT_NODE) {
-			Node nextNode = node.getNextSibling();
-			if (nextNode != null) {
-				if (nextNode.getNodeType() == Node.ENTITY_REFERENCE_NODE) {
-					result = true;
-				}
-			}
-		}
-		else if (node.getNodeType() == Node.ENTITY_REFERENCE_NODE) {
-			result = true;
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	public List getCombinedTextNodeList(Node theNode) {
-		List list = new Vector();
-		boolean prevIsEntity = false;
-		for (Node node = theNode; node != null; node = node.getNextSibling()) {
-			int nodeType = node.getNodeType();
-			if (nodeType == Node.ENTITY_REFERENCE_NODE) {
-				prevIsEntity = true;
-				list.add(node);
-			}
-			else if ((nodeType == Node.TEXT_NODE) && (prevIsEntity || (node == theNode))) {
-				prevIsEntity = false;
-				list.add(node);
-			}
-			else {
-				break;
-			}
-		}
-		return list;
-	}
-
-	public String getElementTextValue(Element element) {
-		List list = _getElementTextContent(element);
-		return list != null ? getValueForTextContent(list) : null;
-	}
-
-	public void setElementTextValue(Element element, String value) {
-		setElementNodeValue(element, value);
-	}
-
-	private List _getElementTextContent(Element element) {
-		List result = null;
-
-		for (Node node = element.getFirstChild(); node != null; node = node.getNextSibling()) {
-			if ((node.getNodeType() == Node.TEXT_NODE) || (node.getNodeType() == Node.ENTITY_REFERENCE_NODE)) {
-				if (result == null) {
-					result = new Vector();
-				}
-				result.add(node);
-			}
-			else {
-				result = null;
-				break;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * If the element is has 'text only' content this method will return the
-	 * list of elements that compose the text only content
-	 */
-	public List getElementTextContent(Element element) {
-		List result = null;
-		if (!element.hasAttributes()) {
-			result = _getElementTextContent(element);
-		}
-		return result;
-	}
-
-
-	/**
-	 * 
-	 */
-	public String getNodeValue(Node node) {
-		String result = null;
-		int nodeType = node.getNodeType();
-		switch (nodeType) {
-			case Node.ATTRIBUTE_NODE : {
-				result = ((Attr) node).getValue();
-				break;
-			}
-			case Node.CDATA_SECTION_NODE :
-				// drop thru
-			case Node.COMMENT_NODE : {
-				result = ((CharacterData) node).getData();
-				break;
-			}
-			case Node.DOCUMENT_TYPE_NODE : {
-				result = getDocumentTypeValue((DocumentType) node);
-				break;
-			}
-			case Node.ELEMENT_NODE : {
-				result = getElementNodeValue((Element) node);
-				break;
-			}
-			case Node.ENTITY_REFERENCE_NODE :
-				// drop thru
-			case Node.TEXT_NODE : {
-				result = getTextNodeValue(node);
-				break;
-			}
-			case Node.PROCESSING_INSTRUCTION_NODE : {
-				result = ((ProcessingInstruction) node).getData();
-				break;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	public void setNodeValue(Node node, String value) {
-		setNodeValue(node, value, null);
-	}
-
-	/**
-	 * Checks that the resource backing the model is writeable utilizing <code>validateEdit</code>
-	 * on a given <tt>IWorkspace</tt>.
-	 * 
-	 * @param model the model to be checked
-	 * @param context the shell context for which <code>validateEdit</code> will be run
-	 * @return boolean result of checking <code>validateEdit</code>. If the resource is unwriteable, <code>status.isOK()</code>
-	 * will return true; otherwise, false.
-	 */
-	private boolean validateEdit(IStructuredModel model, Shell context) {
-		if (model != null && model.getBaseLocation() != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(model.getBaseLocation()));
-			return !file.isAccessible() || ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {file}, context).isOK();
-		}
-		return false;
-	}
-
-	/**
-	 * 
-	 */
-	public void setNodeValue(Node node, String value, Shell context) {
-		// Model should not be edited because base location is read-only
-		if (node instanceof IDOMNode && !validateEdit(((IDOMNode) node).getModel(), context)) {
-			return;
-		}
-		int nodeType = node.getNodeType();
-		try {
-			switch (nodeType) {
-				case Node.ATTRIBUTE_NODE : {
-					((Attr) node).setValue(value);
-					break;
-				}
-				case Node.CDATA_SECTION_NODE :
-					// drop thru
-				case Node.COMMENT_NODE : {
-					((CharacterData) node).setData(value);
-					break;
-				}
-				case Node.ELEMENT_NODE : {
-					setElementNodeValue((Element) node, value);
-					break;
-				}
-				case Node.ENTITY_REFERENCE_NODE :
-					// drop thru
-				case Node.TEXT_NODE : {
-					setTextNodeValue(node, value);
-					break;
-				}
-				case Node.PROCESSING_INSTRUCTION_NODE : {
-					((ProcessingInstruction) node).setData(value);
-					break;
-				}
-			}
-		}
-		catch (DOMException e) {
-			Display d = getDisplay();
-			if (d != null) {
-				d.beep();
-			}
-		}
-	}
-
-	private Display getDisplay() {
-
-		return PlatformUI.getWorkbench().getDisplay();
-	}
-
-
-	/**
-	 * 
-	 */
-	protected String getDocumentTypeValue(DocumentType documentType) {
-		return DOMWriter.getDocumentTypeData(documentType);
-	}
-
-	/**
-	 * 
-	 */
-	protected String getElementNodeValue(Element element) {
-		String result = null;
-		List list = getElementTextContent(element);
-		if (list != null) {
-			result = getValueForTextContent(list);
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	protected void setElementNodeValue(Element element, String value) {
-		List list = getElementTextContent(element);
-		if (list != null) {
-			setValueForTextContent(list, value);
-		}
-		else {
-			Document document = element.getOwnerDocument();
-			Text text = document.createTextNode(value);
-			element.appendChild(text);
-		}
-	}
-
-	/**
-	 * 
-	 */
-	protected String getTextNodeValue(Node node) {
-		String result = null;
-		List list = null;
-		if (isCombinedTextNode(node)) {
-			list = getCombinedTextNodeList(node);
-		}
-		else {
-			list = new Vector();
-			list.add(node);
-		}
-		result = getValueForTextContent(list);
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	protected void setTextNodeValue(Node node, String value) {
-		List list = null;
-		if (isCombinedTextNode(node)) {
-			list = getCombinedTextNodeList(node);
-		}
-		else {
-			list = new Vector();
-			list.add(node);
-		}
-		setValueForTextContent(list, value);
-	}
-
-	public Text getEffectiveTextNodeForCombinedNodeList(List list) {
-		Text result = null;
-		for (Iterator i = list.iterator(); i.hasNext();) {
-			Node node = (Node) i.next();
-			if (node.getNodeType() == Node.TEXT_NODE) {
-				result = (Text) node;
-				break;
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	protected String getValueForTextContent(List list) {
-		String result = null;
-		if (list.size() > 0) {
-			if (list.get(0) instanceof IDOMNode) {
-				IDOMNode first = (IDOMNode) list.get(0);
-				IDOMNode last = (IDOMNode) list.get(list.size() - 1);
-				IDOMModel model = first.getModel();
-				int start = first.getStartOffset();
-				int end = last.getEndOffset();
-				try {
-					result = model.getStructuredDocument().get(start,
-							end - start);
-				} catch (Exception e) {
-
-				}
-			}
-			else
-			{
-				if (list.get(0) instanceof Node)
-				{
-					Node n = (Node) list.get(0);
-					for (Node node = n.getFirstChild(); node != null; node = node.getNextSibling()) {
-						if (node.getNodeType() == Node.TEXT_NODE) {
-							String text = node.getNodeValue();
-							if(!((text == null) || (text.trim().length() == 0))) {
-								result = text.trim();
-							}
-						}
-					}
-				}
-			}	
-		}
-
-		// we trim the content so that it looks nice when viewed
-		// we need to be carfull to preserve the 'trimmed' text when the value
-		// is set (see setValueForTextContent)
-		if (result != null) {
-			result = result.trim();
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	protected void setValueForTextContent(List list, String value) {
-		// String oldValue = getValueForTextContent();
-		// we worry about preserving trimmed text
-		if (list.size() > 0) {
-			if (list.get(0) instanceof IDOMNode) {
-				IDOMNode first = (IDOMNode) list.get(0);
-				IDOMNode last = (IDOMNode) list.get(list.size() - 1);
-				int start = first.getStartOffset();
-				int end = last.getEndOffset();
-				first.getModel().getStructuredDocument().replaceText(this,
-						start, end - start, value);
-			}
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public boolean isEditable(Node node) {
-		int nodeType = node.getNodeType();
-		boolean result = false;
-		switch (nodeType) {
-			case Node.ATTRIBUTE_NODE :
-				// drop thru
-			case Node.CDATA_SECTION_NODE :
-				// drop thru
-			case Node.COMMENT_NODE :
-				// drop thru
-			case Node.ENTITY_REFERENCE_NODE :
-				// drop thru
-			case Node.TEXT_NODE :
-				// drop thru
-			case Node.PROCESSING_INSTRUCTION_NODE : {
-				result = true;
-				break;
-			}
-			case Node.ELEMENT_NODE : {
-				result = (getElementTextContent((Element) node) != null) || (node.getChildNodes().getLength() == 0);
-				break;
-			}
-		}
-		return result;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/TreeExtension.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/TreeExtension.java
deleted file mode 100644
index c9832cc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/TreeExtension.java
+++ /dev/null
@@ -1,557 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.ScrollBar;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-
-
-public class TreeExtension implements PaintListener {
-
-	protected Tree fTree;
-	protected EditManager editManager;
-	protected String[] fColumnProperties;
-	protected ICellModifier cellModifier;
-	protected int columnPosition = 300;
-	protected int columnHitWidth = 5;
-	protected Color tableLineColor;
-	protected int controlWidth;
-	protected DelayedDrawTimer delayedDrawTimer;
-	private boolean fisUnsupportedInput = false;
-
-	public TreeExtension(Tree tree) {
-		this.fTree = tree;
-		InternalMouseListener listener = new InternalMouseListener();
-		tree.addMouseMoveListener(listener);
-		tree.addMouseListener(listener);
-		tree.addPaintListener(this);
-		editManager = new EditManager(tree);
-		delayedDrawTimer = new DelayedDrawTimer(tree);
-
-		tableLineColor = tree.getDisplay().getSystemColor(SWT.COLOR_WIDGET_LIGHT_SHADOW);
-	}
-
-	public void dispose() {
-		tableLineColor.dispose();
-	}
-
-	public void setCellModifier(ICellModifier modifier) {
-		cellModifier = modifier;
-	}
-
-	public void resetCachedData() {
-		// todo: sure seems we should reset something?
-	}
-
-	public ICellModifier getCellModifier() {
-		return cellModifier;
-	}
-
-	public List getItemList() {
-		List list = new Vector();
-		getItemListHelper(fTree.getItems(), list);
-		return list;
-	}
-
-	protected void getItemListHelper(TreeItem[] items, List list) {
-		for (int i = 0; i < items.length; i++) {
-			TreeItem item = items[i];
-			list.add(item);
-			getItemListHelper(item.getItems(), list);
-		}
-	}
-
-	protected TreeItem getTreeItemOnRow(int px, int py) {
-		TreeItem result = null;
-		List list = getItemList();
-		for (Iterator i = list.iterator(); i.hasNext();) {
-			TreeItem item = (TreeItem) i.next();
-			Rectangle r = item.getBounds();
-			if ((r != null) && (px >= r.x) && (py >= r.y) && (py <= r.y + r.height)) {
-				result = item;
-			}
-		}
-		return result;
-	}
-
-	protected class InternalMouseListener extends MouseAdapter implements MouseMoveListener {
-		protected int columnDragged = -1;
-		protected boolean isDown = false;
-		protected int prevX = -1;
-		protected Cursor cursor = null;
-
-		public void mouseMove(MouseEvent e) {
-			if ((e.x > columnPosition - columnHitWidth) && (e.x < columnPosition + columnHitWidth)) {
-				if (cursor == null) {
-					cursor = new Cursor(fTree.getDisplay(), SWT.CURSOR_SIZEWE);
-					fTree.setCursor(cursor);
-				}
-			}
-			else {
-				if (cursor != null) {
-					fTree.setCursor(null);
-					cursor.dispose();
-					cursor = null;
-				}
-			}
-
-			if (columnDragged != -1) {
-				// using the delay timer will make redraws less flickery
-				if (e.x > 20) {
-					columnPosition = e.x;
-					delayedDrawTimer.reset(20);
-				}
-			}
-		}
-
-		public void mouseDown(MouseEvent e) {
-			// here we handle the column resizing by detect if the user has
-			// click on a column separator
-			//
-			columnDragged = -1;
-			editManager.deactivateCellEditor();
-
-			if ((e.x > columnPosition - columnHitWidth) && (e.x < columnPosition + columnHitWidth)) {
-				columnDragged = 0;
-			}
-
-			// here we handle selecting tree items when any thing on the 'row'
-			// is clicked
-			//
-			TreeItem item = fTree.getItem(new Point(e.x, e.y));
-			if (item == null) {
-				item = getTreeItemOnRow(e.x, e.y);
-				if (item != null) {
-					TreeItem[] items = new TreeItem[1];
-					items[0] = item;
-					fTree.setSelection(items);
-				}
-			}
-		}
-
-		public void mouseUp(MouseEvent e) {
-			columnDragged = -1;
-		}
-	}
-
-	public String[] getColumnProperties() {
-		return fColumnProperties;
-	}
-
-	public void setColumnProperties(String[] columnProperties) {
-		this.fColumnProperties = columnProperties;
-	}
-
-	public void paintControl(PaintEvent event) {
-		GC gc = event.gc;
-		Rectangle treeBounds = fTree.getBounds();
-
-		controlWidth = treeBounds.width;
-		Color bg = fTree.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-		Color bg2 = fTree.getDisplay().getSystemColor(SWT.COLOR_LIST_SELECTION);
-
-		gc.setBackground(bg2);
-
-		// // This next part causes problems on LINUX, so let's not do it
-		// there
-		// if (B2BHacks.IS_UNIX == false) {
-		// TreeItem[] selectedItems = tree.getSelection();
-		// if (selectedItems.length > 0) {
-		// for (int i = 0; i < selectedItems.length; i++) {
-		// TreeItem item = selectedItems[i];
-		// Rectangle bounds = item.getBounds();
-		// if (bounds != null) {
-		// gc.fillRectangle(bounds.x + bounds.width, bounds.y, controlWidth,
-		// bounds.height);
-		// }
-		// }
-		// }
-		// }
-		//
-		if (!fisUnsupportedInput) {
-			TreeItem[] items = fTree.getItems();
-			if (items.length > 0) {
-				gc.setForeground(tableLineColor);
-				gc.setBackground(bg);
-
-				gc.fillRectangle(columnPosition, treeBounds.x, treeBounds.width, treeBounds.height);
-
-				Rectangle itemBounds = items[0].getBounds();
-				int height = computeTreeItemHeight();
-
-				if (itemBounds != null) {
-					/*
-					 * Bounds will be for the first item, which will either be
-					 * visible at the top of the Tree, or scrolled off with
-					 * negative values
-					 */
-					int startY = itemBounds.y;
-
-					/* Only draw lines within the Tree boundaries */
-					for (int i = startY; i < treeBounds.height; i += height) {
-						if (i >= treeBounds.y) {
-							gc.drawLine(0, i, treeBounds.width, i);
-						}
-					}
-				}
-				gc.drawLine(columnPosition, 0, columnPosition, treeBounds.height);
-				paintItems(gc, items, treeBounds);
-
-			}
-			else {
-				addEmptyTreeMessage(gc);
-			}
-		}
-		else {
-			addUnableToPopulateTreeMessage(gc);
-		}
-	}
-
-	protected int computeTreeItemHeight() {
-		int result = -1;
-
-		/*
-		 * On GTK tree.getItemHeight() seems to lie to us. It reports that the
-		 * tree item occupies a few pixles less vertical space than it should
-		 * (possibly because of the image height vs. the text height?). This
-		 * foils our code that draws the 'row' lines since we assume that
-		 * lines should be drawn at 'itemHeight' increments. Don't trust
-		 * getItemHeight() to compute the increment... instead compute the
-		 * value based on distance between two TreeItems, and then use the
-		 * larger value.
-		 * 
-		 * This strategy only works on trees where the items are of even
-		 * height, however bug
-		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=117201 indicates that
-		 * this is no longer promised, at least on win32 and likely on other
-		 * platforms soon.
-		 */
-		if (fTree.getItemCount() > 0) {
-			TreeItem[] items = fTree.getItems();
-			Rectangle itemBounds = items[0].getBounds();
-
-			if (items[0].getExpanded()) {
-				TreeItem[] children = items[0].getItems();
-				if (children.length > 0) {
-					result = children[0].getBounds().y - itemBounds.y;
-				}
-			}
-			else if (items.length > 1) {
-				result = items[1].getBounds().y - itemBounds.y;
-			}
-		}
-
-		result = Math.max(fTree.getItemHeight(), result);
-		return result;
-	}
-
-	protected void addEmptyTreeMessage(GC gc) {
-		// nothing to add here
-	}
-
-	private void addUnableToPopulateTreeMessage(GC gc) {
-		// here we print a message when the document cannot be displayed just
-		// to give the
-		// user a visual cue
-		// so that they know how to proceed to edit the blank view
-		gc.setForeground(fTree.getDisplay().getSystemColor(SWT.COLOR_BLACK));
-		gc.setBackground(fTree.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-		gc.drawString(XMLEditorMessages.TreeExtension_0, 10, 10);
-	}
-
-	void setIsUnsupportedInput(boolean isUnsupported) {
-		fisUnsupportedInput = isUnsupported;
-	}
-
-	public void paintItems(GC gc, TreeItem[] items, Rectangle treeBounds) {
-		if (items != null) {
-			for (int i = 0; i < items.length; i++) {
-				TreeItem item = items[i];
-				if (item != null) {
-					Rectangle bounds = item.getBounds();
-					if (bounds != null) {
-						if (treeBounds.intersects(bounds)) {
-							paintItem(gc, item, bounds);
-						}
-					}
-
-					// defect 241039
-					//
-					if (item.getExpanded()) {
-						paintItems(gc, item.getItems(), treeBounds);
-					}
-				}
-			}
-		}
-	}
-
-	protected void paintItem(GC gc, TreeItem item, Rectangle bounds) {
-		// nothing to paint
-	}
-
-	public interface ICellEditorProvider {
-		CellEditor getCellEditor(Object o, int col);
-	}
-
-	/**
-	 * This class is used to improve drawing during a column resize.
-	 */
-	public class DelayedDrawTimer implements Runnable {
-		protected Control control;
-
-		public DelayedDrawTimer(Control control1) {
-			this.control = control1;
-		}
-
-		public void reset(int milliseconds) {
-			getDisplay().timerExec(milliseconds, this);
-		}
-
-		public void run() {
-			control.redraw();
-		}
-	}
-
-	Display getDisplay() {
-
-		return PlatformUI.getWorkbench().getDisplay();
-	}
-
-	/**
-	 * EditManager
-	 */
-	public class EditManager {
-		protected Tree fTree1;
-		protected Control cellEditorHolder;
-		protected CellEditorState cellEditorState;
-
-		public EditManager(Tree tree) {
-			this.fTree1 = tree;
-			this.cellEditorHolder = new Composite(tree, SWT.NONE);
-
-			final Tree theTree = tree;
-
-			MouseAdapter theMouseAdapter = new MouseAdapter() {
-				public void mouseDown(MouseEvent e) {
-					deactivateCellEditor();
-
-					if (e.x > columnPosition + columnHitWidth) {
-						TreeItem[] items = theTree.getSelection();
-						// No edit if more than one row is selected.
-						if (items.length == 1) {
-							Rectangle bounds = items[0].getBounds();
-							if ((bounds != null) && (e.y >= bounds.y) && (e.y <= bounds.y + bounds.height)) {
-								int columnToEdit = 1;
-								activateCellEditor(items[0], columnToEdit);
-							}
-						}
-					}
-				}
-			};
-
-			SelectionListener selectionListener = new SelectionListener() {
-				public void widgetDefaultSelected(SelectionEvent e) {
-					applyCellEditorValue();
-				}
-
-				public void widgetSelected(SelectionEvent e) {
-					applyCellEditorValue();
-				}
-			};
-
-			KeyListener keyListener = new KeyAdapter() {
-				public void keyPressed(KeyEvent e) {
-					if (e.character == SWT.CR) {
-						deactivateCellEditor();
-						TreeItem[] items = theTree.getSelection();
-						if (items.length == 1) {
-							activateCellEditor(items[0], 1);
-						}
-					}
-				}
-			};
-
-			tree.addMouseListener(theMouseAdapter);
-			tree.addKeyListener(keyListener);
-			ScrollBar hBar = tree.getHorizontalBar();
-			if (hBar != null) {
-				hBar.addSelectionListener(selectionListener);
-			}
-			ScrollBar vBar = tree.getVerticalBar();
-			if (vBar != null) {
-				vBar.addSelectionListener(selectionListener);
-			}
-		}
-
-		public boolean isCellEditorActive() {
-			return cellEditorState != null;
-		}
-
-		public void applyCellEditorValue() {
-			if ((cellEditorState != null) && (cellModifier != null)) {
-				TreeItem treeItem = cellEditorState.fTreeItem;
-
-				// The area below the cell editor needs to be explicity
-				// repainted on Linux
-				//
-				// Rectangle r = B2BHacks.IS_UNIX ? treeItem.getBounds() :
-				// null;
-
-				Object value = cellEditorState.fCellEditor.getValue();
-				String property = cellEditorState.fProperty;
-
-				deactivateCellEditor();
-
-				cellModifier.modify(treeItem, property, value);
-
-				// if (r != null) {
-				// tree.redraw(r.x, r.y, tree.getBounds().width, r.height,
-				// false);
-				// }
-			}
-		}
-
-		public void deactivateCellEditor() {
-			// Clean up any previous editor control
-			if (cellEditorState != null) {
-				cellEditorState.deactivate();
-				cellEditorState = null;
-			}
-		}
-
-		public void activateCellEditor(TreeItem treeItem, int column) {
-			if (cellModifier instanceof ICellEditorProvider) {
-				ICellEditorProvider cellEditorProvider = (ICellEditorProvider) cellModifier;
-				Object data = treeItem.getData();
-				if (fColumnProperties.length > column) {
-					String property = fColumnProperties[column];
-					if (cellModifier.canModify(data, property)) {
-						CellEditor newCellEditor = cellEditorProvider.getCellEditor(data, column);
-						if (newCellEditor != null) {
-							// The control that will be the editor must be a
-							// child of the columnPosition
-							Control control = newCellEditor.getControl();
-							if (control != null) {
-								cellEditorState = new CellEditorState(newCellEditor, control, treeItem, column, property);
-								cellEditorState.activate();
-							}
-						}
-					}
-				}
-			}
-		}
-
-		/**
-		 * this class holds the state that is need on a per cell editor
-		 * invocation basis
-		 */
-		public class CellEditorState implements ICellEditorListener, FocusListener {
-			public CellEditor fCellEditor;
-			public Control fControl;
-			public TreeItem fTreeItem;
-			public int fColumnNumber;
-			public String fProperty;
-
-			public CellEditorState(CellEditor cellEditor, Control control, TreeItem treeItem, int columnNumber, String property) {
-				this.fCellEditor = cellEditor;
-				this.fControl = control;
-				this.fTreeItem = treeItem;
-				this.fColumnNumber = columnNumber;
-				this.fProperty = property;
-			}
-
-			public void activate() {
-				Object element = fTreeItem.getData();
-				String value = cellModifier.getValue(element, fProperty).toString();
-				if (fControl instanceof Text) {
-					Text text = (Text) fControl;
-					int requiredSize = value.length() + 100;
-					if (text.getTextLimit() < requiredSize) {
-						text.setTextLimit(requiredSize);
-					}
-				}
-				Rectangle r = fTreeItem.getBounds();
-				if (r != null) {
-					fControl.setBounds(columnPosition + 5, r.y + 1, fTree1.getClientArea().width - (columnPosition + 5), r.height - 1);
-					fControl.setVisible(true);
-					fCellEditor.setValue(value);
-					fCellEditor.addListener(this);
-					fCellEditor.setFocus();
-					fControl.addFocusListener(this);
-				}
-			}
-
-			public void deactivate() {
-				fCellEditor.removeListener(this);
-				fControl.removeFocusListener(this);
-				fCellEditor.deactivate();
-				fTree1.forceFocus();
-			}
-
-			// ICellEditorListener methods
-			//
-			public void applyEditorValue() {
-				applyCellEditorValue();
-			}
-
-			public void cancelEditor() {
-				deactivateCellEditor();
-			}
-
-			public void editorValueChanged(boolean oldValidState, boolean newValidState) {
-				// nothing, for now
-			}
-
-			// FocusListener methods
-			//
-			public void focusGained(FocusEvent e) {
-				// do nothing
-			}
-
-			public void focusLost(FocusEvent e) {
-				applyCellEditorValue();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/ViewerExpandCollapseAction.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/ViewerExpandCollapseAction.java
deleted file mode 100644
index 02fd23c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/ViewerExpandCollapseAction.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class ViewerExpandCollapseAction extends Action {
-
-	protected boolean isExpandAction;
-	protected AbstractTreeViewer viewer = null;
-
-	public ViewerExpandCollapseAction(boolean isExpandAction) {
-		this.isExpandAction = isExpandAction;
-		if (isExpandAction) {
-			ImageDescriptor e_imageDescriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_ETOOL_EXPANDALL);
-			ImageDescriptor d_imageDescriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_DTOOL_EXPANDALL);
-
-			setImageDescriptor(e_imageDescriptor);
-			setDisabledImageDescriptor(d_imageDescriptor);
-			setToolTipText(XMLUIMessages._UI_INFO_EXPAND_ALL);
-		}
-		else {
-			ImageDescriptor e_imageDescriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_ETOOL_COLLAPSEALL);
-			ImageDescriptor d_imageDescriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_DTOOL_COLLAPSEALL);
-
-			setImageDescriptor(e_imageDescriptor);
-			setDisabledImageDescriptor(d_imageDescriptor);
-			setToolTipText(XMLUIMessages._UI_INFO_COLLAPSE_ALL);
-		}
-	}
-
-	public void setViewer(AbstractTreeViewer viewer) {
-		this.viewer = viewer;
-	}
-
-	public void run() {
-		if (viewer != null) {
-			// temporarily set the visibility to false
-			// this has a HUGE performance benefit
-			boolean isVisible = viewer.getControl().getVisible();
-			viewer.getControl().setVisible(false);
-
-			if (isExpandAction) {
-				viewer.expandAll();
-			}
-			else {
-				viewer.collapseAll();
-			}
-
-			// restore the previous visibility state
-			// 
-			viewer.getControl().setVisible(isVisible);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorActionDefinitionIds.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorActionDefinitionIds.java
deleted file mode 100644
index 1d380cf..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorActionDefinitionIds.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-
-
-/**
- * Defines the definitions ids for the XML editor actions.
- * 
- * @deprecated Use org.eclipse.wst.sse.ui.edit.util.ActionDefinitionIds
- *             instead
- */
-public interface XMLEditorActionDefinitionIds {
-	public final static String CLEANUP_DOCUMENT = "org.eclipse.wst.sse.ui.edit.ui.cleanup.document";//$NON-NLS-1$
-	public final static String FORMAT_DOCUMENT = "org.eclipse.wst.sse.ui.edit.ui.format.document";//$NON-NLS-1$
-	public final static String FORMAT_ACTIVE_ELEMENTS = "org.eclipse.wst.sse.ui.edit.ui.format.active.elements";//$NON-NLS-1$
-	public final static String OPEN_FILE = "org.eclipse.wst.sse.ui.edit.ui.open.file.from.source";//$NON-NLS-1$
-	// public final static String INFORMATION =
-	// "org.eclipse.wst.sse.ui.edit.ui.show.tooltip.information";//$NON-NLS-1$
-	public final static String INFORMATION = "org.eclipse.jdt.ui.edit.text.java.show.javadoc";//$NON-NLS-1$
-	public final static String ADD_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.add.breakpoints";//$NON-NLS-1$
-	public final static String MANAGE_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.manage.breakpoints";//$NON-NLS-1$
-	public final static String ENABLE_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.enable.breakpoints";//$NON-NLS-1$
-	public final static String DISABLE_BREAKPOINTS = "org.eclipse.wst.sse.ui.edit.ui.disable.breakpoints";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorMessages.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorMessages.java
deleted file mode 100644
index 4fbac12..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorMessages.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by XML Editor
- * 
- * @plannedfor 1.0
- */
-public class XMLEditorMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.ui.internal.tabletree.XMLEditorResources";//$NON-NLS-1$
-
-	public static String XMLTableTreeViewer_0;
-	public static String XMLTableTreeViewer_1;
-	public static String XMLTableTreeViewer_2;
-	public static String XMLMultiPageEditorPart_0;
-	public static String XMLTreeExtension_0;
-	public static String XMLTreeExtension_1;
-	public static String XMLTreeExtension_3;
-	public static String XMLTreeExtension_4;
-	public static String XMLTableTreeActionBarContributor_0;
-	public static String XMLTableTreeActionBarContributor_1;
-	public static String XMLTableTreeActionBarContributor_2;
-	public static String XMLTableTreeActionBarContributor_3;
-	public static String XMLTableTreeActionBarContributor_4;
-	public static String XMLTableTreeActionBarContributor_5;
-	public static String XMLTableTreeActionBarContributor_6;
-	public static String XMLTableTreeActionBarContributor_7;
-	public static String XMLTableTreeActionBarContributor_8;
-	public static String An_error_has_occurred_when1_ERROR_;
-	public static String Resource__does_not_exist;
-	public static String Editor_could_not_be_open;
-	public static String TreeExtension_0;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, XMLEditorMessages.class);
-	}
-
-	private XMLEditorMessages() {
-		// cannot create new instance
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorPluginImageHelper.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorPluginImageHelper.java
deleted file mode 100644
index b0d11df..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorPluginImageHelper.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-/**
- * Helper class to handle images provided by this plug-in.
- * 
- * NOTE: For internal use only. For images used externally, please use the
- * Shared***ImageHelper class instead.
- * 
- * @author amywu
- */
-public class XMLEditorPluginImageHelper {
-	private final String PLUGINID = XMLUIPlugin.ID;
-	private static XMLEditorPluginImageHelper instance = null;
-
-	// save a descriptor for each image
-	private HashMap fImageDescRegistry = null;
-
-	/**
-	 * Gets the instance.
-	 * 
-	 * @return Returns a XMLEditorPluginImageHelper
-	 */
-	public synchronized static XMLEditorPluginImageHelper getInstance() {
-		if (instance == null) {
-			instance = new XMLEditorPluginImageHelper();
-		}
-		return instance;
-	}
-
-	/**
-	 * Retrieves the image associated with resource from the image registry.
-	 * If the image cannot be retrieved, attempt to find and load the image at
-	 * the location specified in resource.
-	 * 
-	 * @param resource
-	 *            the image to retrieve
-	 * @return Image the image associated with resource or null if one could
-	 *         not be found
-	 */
-	public Image getImage(String resource) {
-		Image image = getImageRegistry().get(resource);
-		if (image == null) {
-			// create an image
-			image = createImage(resource);
-		}
-		return image;
-	}
-
-	/**
-	 * Retrieves the image descriptor associated with resource from the image
-	 * descriptor registry. If the image descriptor cannot be retrieved,
-	 * attempt to find and load the image descriptor at the location specified
-	 * in resource.
-	 * 
-	 * @param resource
-	 *            the image descriptor to retrieve
-	 * @return ImageDescriptor the image descriptor assocated with resource or
-	 *         the default "missing" image descriptor if one could not be
-	 *         found
-	 */
-	public ImageDescriptor getImageDescriptor(String resource) {
-		ImageDescriptor imageDescriptor = null;
-		Object o = getImageDescriptorRegistry().get(resource);
-		if (o == null) {
-			// create a descriptor
-			imageDescriptor = createImageDescriptor(resource);
-		}
-		else {
-			imageDescriptor = (ImageDescriptor) o;
-		}
-		return imageDescriptor;
-	}
-
-	/**
-	 * Returns the image descriptor registry for this plugin.
-	 * 
-	 * @return HashMap - image descriptor registry for this plugin
-	 */
-	private HashMap getImageDescriptorRegistry() {
-		if (fImageDescRegistry == null) {
-			fImageDescRegistry = new HashMap();
-		}
-		return fImageDescRegistry;
-	}
-
-	/**
-	 * Returns the image registry for this plugin.
-	 * 
-	 * @return ImageRegistry - image registry for this plugin
-	 */
-	private ImageRegistry getImageRegistry() {
-		return JFaceResources.getImageRegistry();
-	}
-
-	/**
-	 * Creates an image from the given resource and adds the image to the
-	 * image registry.
-	 * 
-	 * @param resource
-	 * @return Image
-	 */
-	private Image createImage(String resource) {
-		ImageDescriptor desc = getImageDescriptor(resource);
-		Image image = null;
-
-		if (desc != null) {
-			image = desc.createImage();
-			// dont add the missing image descriptor image to the image
-			// registry
-			if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) {
-				getImageRegistry().put(resource, image);
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * Creates an image descriptor from the given imageFilePath and adds the
-	 * image descriptor to the image descriptor registry. If an image
-	 * descriptor could not be created, the default "missing" image descriptor
-	 * is returned but not added to the image descriptor registry.
-	 * 
-	 * @param imageFilePath
-	 * @return ImageDescriptor image descriptor for imageFilePath or default
-	 *         "missing" image descriptor if resource could not be found
-	 */
-	private ImageDescriptor createImageDescriptor(String imageFilePath) {
-		ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGINID, imageFilePath);
-		if (imageDescriptor != null) {
-			getImageDescriptorRegistry().put(imageFilePath, imageDescriptor);
-		}
-		else {
-			imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-		}
-
-		return imageDescriptor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorPluginImages.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorPluginImages.java
deleted file mode 100644
index a35f00f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorPluginImages.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-/**
- * Bundle of most images used by the XML Editor plug-in.
- */
-public class XMLEditorPluginImages {
-	public static final String IMG_DTOOL_COLLAPSE = "icons/full/dtool16/collapse.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_COLLAPSE = "icons/full/etool16/collapse.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_COLLAPSEALL = "icons/full/dtool16/collapse_all.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_COLLAPSEALL = "icons/full/etool16/collapse_all.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_EXPAND = "icons/full/dtool16/expand.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_EXPAND = "icons/full/etool16/expand.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_EXPANDALL = "icons/full/dtool16/expand_all.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_EXPANDALL = "icons/full/etool16/expand_all.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_NEW_XML = "icons/full/dtool16/new_xml.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_NEW_XML = "icons/full/etool16/new_xml.gif"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorResources.properties b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorResources.properties
deleted file mode 100644
index 1943b11..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLEditorResources.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2004, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-XMLTableTreeViewer_0=Design
-XMLTableTreeViewer_1=Node
-XMLTableTreeViewer_2=Content
-XMLMultiPageEditorPart_0=Source
-XMLTreeExtension_0=Structure
-XMLTreeExtension_1=Value
-XMLTreeExtension_3=The document is empty.
-XMLTreeExtension_4=Right mouse click here to insert content.
-XMLTableTreeActionBarContributor_0=&XML
-XMLTableTreeActionBarContributor_1=&Expand All
-XMLTableTreeActionBarContributor_2=&Collapse All
-XMLTableTreeActionBarContributor_3=Turn Grammar Constraints Off
-XMLTableTreeActionBarContributor_4=&Turn Grammar Constraints Off
-XMLTableTreeActionBarContributor_5=Turn Grammar Constraints On
-XMLTableTreeActionBarContributor_6=&Turn Grammar Constraints On
-XMLTableTreeActionBarContributor_7=Reload Dependencies
-XMLTableTreeActionBarContributor_8=&Reload Dependencies
-##
-An_error_has_occurred_when1_ERROR_=An error has occurred when initializing the input for the the editor's source page.
-Resource__does_not_exist=Resource {0} does not exist.
-Editor_could_not_be_open=Editor could not be open on {0}
-TreeExtension_0=Cannot display document contents.
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorActionBarContributor.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorActionBarContributor.java
deleted file mode 100644
index 7d4ee4b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorActionBarContributor.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-
-
-public class XMLMultiPageEditorActionBarContributor extends SourceEditorActionBarContributor {
-
-	private boolean needsMultiInit = true;
-
-	public XMLMultiPageEditorActionBarContributor() {
-		super();
-	}
-
-	protected void initDesignViewerActionBarContributor(IActionBars actionBars) {
-		super.initDesignViewerActionBarContributor(actionBars);
-
-		if (designViewerActionBarContributor != null) {
-			if (designViewerActionBarContributor instanceof IDesignViewerActionBarContributor) {
-				((IDesignViewerActionBarContributor) designViewerActionBarContributor).initViewerSpecificContributions(actionBars);
-			}
-		}
-	}
-
-	protected void activateDesignPage(IEditorPart activeEditor) {
-		if ((sourceViewerActionContributor != null) && (sourceViewerActionContributor instanceof ISourceViewerActionBarContributor)) {
-			// if design page is not really an IEditorPart, activeEditor ==
-			// null, so pass in multiPageEditor instead (d282414)
-			if (activeEditor == null) {
-				sourceViewerActionContributor.setActiveEditor(multiPageEditor);
-			}
-			else {
-				sourceViewerActionContributor.setActiveEditor(activeEditor);
-			}
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(false);
-		}
-
-		if ((designViewerActionBarContributor != null) && (designViewerActionBarContributor instanceof IDesignViewerActionBarContributor)) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-			((IDesignViewerActionBarContributor) designViewerActionBarContributor).setViewerSpecificContributionsEnabled(true);
-		}
-	}
-
-	protected void activateSourcePage(IEditorPart activeEditor) {
-		if ((designViewerActionBarContributor != null) && (designViewerActionBarContributor instanceof IDesignViewerActionBarContributor)) {
-			designViewerActionBarContributor.setActiveEditor(multiPageEditor);
-			((IDesignViewerActionBarContributor) designViewerActionBarContributor).setViewerSpecificContributionsEnabled(false);
-		}
-
-		if ((sourceViewerActionContributor != null) && (sourceViewerActionContributor instanceof ISourceViewerActionBarContributor)) {
-			sourceViewerActionContributor.setActiveEditor(activeEditor);
-			((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(true);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#init(org.eclipse.ui.IActionBars)
-	 */
-	public void init(IActionBars actionBars) {
-		super.init(actionBars);
-		needsMultiInit = true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(org.eclipse.ui.IEditorPart)
-	 */
-	public void setActiveEditor(IEditorPart targetEditor) {
-		if (needsMultiInit) {
-			designViewerActionBarContributor = new XMLTableTreeActionBarContributor();
-			initDesignViewerActionBarContributor(getActionBars());
-			needsMultiInit = false;
-		}
-		super.setActiveEditor(targetEditor);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java
deleted file mode 100644
index 6450fbc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLMultiPageEditorPart.java
+++ /dev/null
@@ -1,1096 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextInputListener;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.source.projection.ProjectionViewer;
-import org.eclipse.jface.viewers.AbstractTreeViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.MultiPageEditorSite;
-import org.eclipse.ui.part.MultiPageSelectionProvider;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.core.internal.provisional.IXMLPreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XMLMultiPageEditorPart extends MultiPageEditorPart {
-
-	/**
-	 * Internal part activation listener, copied from AbstractTextEditor
-	 */
-	class ActivationListener implements IPartListener, IWindowListener {
-
-		/**
-		 * The maximum number of children the root nodes can have for the
-		 * design page to auto expand the root nodes
-		 */
-		private static final int MAX_NUM_CHILD_NODES_FOR_AUTO_EXPAND = 500;
-		
-		/** Cache of the active workbench part. */
-		private IWorkbenchPart fActivePart;
-		/** Indicates whether activation handling is currently be done. */
-		private boolean fIsHandlingActivation = false;
-		/**
-		 * The part service.
-		 * 
-		 * @since 3.1
-		 */
-		private IPartService fPartService;
-
-		/**
-		 * Creates this activation listener.
-		 * 
-		 * @param partService
-		 *            the part service on which to add the part listener
-		 * @since 3.1
-		 */
-		public ActivationListener(IPartService partService) {
-			fPartService = partService;
-			fPartService.addPartListener(this);
-			PlatformUI.getWorkbench().addWindowListener(this);
-		}
-
-		/**
-		 * Disposes this activation listener.
-		 * 
-		 * @since 3.1
-		 */
-		public void dispose() {
-			fPartService.removePartListener(this);
-			PlatformUI.getWorkbench().removeWindowListener(this);
-			fPartService = null;
-		}
-
-		/*
-		 * @see IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partActivated(IWorkbenchPart part) {
-			fActivePart = part;
-			handleActivation();
-		}
-
-		/*
-		 * @see IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partBroughtToTop(IWorkbenchPart part) {
-			// do nothing
-		}
-
-		/*
-		 * @see IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partClosed(IWorkbenchPart part) {
-			// do nothing
-		}
-
-		/*
-		 * @see IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partDeactivated(IWorkbenchPart part) {
-			fActivePart = null;
-		}
-
-		/*
-		 * @see IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-		 */
-		public void partOpened(IWorkbenchPart part) {
-			if (fDesignViewer instanceof AbstractTreeViewer) {
-				IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(getDocument());
-				try {
-					if (model instanceof IDOMModel) {
-						IDOMDocument modelDocument = ((IDOMModel) model).getDocument();
-						NodeList rootChildren = modelDocument.getChildNodes();
-
-						boolean tooManyChildren = (rootChildren.getLength() > MAX_NUM_CHILD_NODES_FOR_AUTO_EXPAND);
-						/*
-						 * For each root (there should really only be one
-						 * real root but there are also could be empty
-						 * text regions and doc type at the root level)
-						 * determine if it has to many children or not to
-						 * auto expand
-						 */
-						for (int i = 0; i < rootChildren.getLength() && !tooManyChildren; ++i) {
-							tooManyChildren = (rootChildren.item(i).getChildNodes().getLength() > MAX_NUM_CHILD_NODES_FOR_AUTO_EXPAND);
-						}
-
-						/*
-						 * if root node does not have to many children then
-						 * auto expand the root node
-						 */
-						if (!tooManyChildren) {
-							((AbstractTreeViewer) fDesignViewer).expandToLevel(2);
-						}
-					}
-				}
-				finally {
-					if (model != null) {
-						model.releaseFromRead();
-					}
-				}
-			}
-		}
-
-		/**
-		 * Handles the activation triggering a element state check in the
-		 * editor.
-		 */
-		void handleActivation() {
-			if (fIsHandlingActivation || (getTextEditor() == null)) {
-				return;
-			}
-
-			if (fActivePart == XMLMultiPageEditorPart.this) {
-				fIsHandlingActivation = true;
-				try {
-					getTextEditor().safelySanityCheckState(getEditorInput());
-				}
-				finally {
-					fIsHandlingActivation = false;
-				}
-			}
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowActivated(IWorkbenchWindow window) {
-			if (window == getEditorSite().getWorkbenchWindow()) {
-				/*
-				 * Workaround for problem described in
-				 * http://dev.eclipse.org/bugs/show_bug.cgi?id=11731 Will be
-				 * removed when SWT has solved the problem.
-				 */
-				window.getShell().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						handleActivation();
-					}
-				});
-			}
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowDeactivated(IWorkbenchWindow window) {
-			// do nothing
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowClosed(IWorkbenchWindow window) {
-			// do nothing
-		}
-
-		/*
-		 * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
-		 * @since 3.1
-		 */
-		public void windowOpened(IWorkbenchWindow window) {
-			// do nothing
-		}
-	}
-
-	/**
-	 * Listens for selection from the source page, applying it to the design
-	 * viewer.
-	 */
-	private class TextEditorPostSelectionAdapter extends UIJob implements ISelectionChangedListener {
-		boolean forcePostSelection = false;
-		ISelection selection = null;
-
-		public TextEditorPostSelectionAdapter() {
-			super(getTitle());
-			setUser(true);
-		}
-
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			if (selection != null) {
-				fDesignViewer.getSelectionProvider().setSelection(selection);
-			}
-			return Status.OK_STATUS;
-		}
-
-		public void selectionChanged(SelectionChangedEvent event) {
-			if ((fDesignViewer != null) && ((getActivePage() != fDesignPageIndex) || !XMLMultiPageEditorPart.this.equals(getSite().getPage().getActivePart()))) {
-				if (forcePostSelection) {
-					selection = event.getSelection();
-					schedule(200);
-				}
-				else {
-					fDesignViewer.getSelectionProvider().setSelection(event.getSelection());
-				}
-			}
-		}
-	}
-
-	private class PageInitializationData {
-		IConfigurationElement fElement;
-		String fPropertyName;
-		Object fData;
-
-		PageInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
-			super();
-			fElement = cfig;
-			fPropertyName = propertyName;
-			fData = data;
-		}
-
-		void sendInitializationData(IExecutableExtension executableExtension) {
-			try {
-				executableExtension.setInitializationData(fElement, fPropertyName, fData);
-			}
-			catch (CoreException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-
-	/**
-	 * Internal IPropertyListener on the source page
-	 */
-	class PropertyListener implements IPropertyListener {
-		public void propertyChanged(Object source, int propId) {
-			switch (propId) {
-				// had to implement input changed "listener" so that
-				// StructuredTextEditor could tell it containing editor that
-				// the input has change, when a 'resource moved' event is
-				// found.
-				case IEditorPart.PROP_INPUT : {
-					if (source == getTextEditor() && fDesignViewer instanceof XMLTableTreeViewer) {
-						IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(getDocument());
-						try {
-							if (model instanceof IDOMModel) {
-								IDOMDocument modelDocument = ((IDOMModel) model).getDocument();
-								Object designInput = ((XMLTableTreeViewer) fDesignViewer).getInput();
-								if (modelDocument != designInput)
-									setInput(getTextEditor().getEditorInput());
-							}
-						}
-						finally {
-							if (model != null)
-								model.releaseFromRead();
-						}
-					}
-				}
-				case IEditorPart.PROP_DIRTY : {
-					if (source == getTextEditor()) {
-						if (getTextEditor().getEditorInput() != getEditorInput()) {
-							setInput(getTextEditor().getEditorInput());
-							/*
-							 * title should always change when input changes.
-							 * create runnable for following post call
-							 */
-							Runnable runnable = new Runnable() {
-								public void run() {
-									_firePropertyChange(IWorkbenchPart.PROP_TITLE);
-								}
-							};
-							/*
-							 * Update is just to post things on the display
-							 * queue (thread). We have to do this to get the
-							 * dirty property to get updated after other
-							 * things on the queue are executed.
-							 */
-							((Control) getTextEditor().getAdapter(Control.class)).getDisplay().asyncExec(runnable);
-						}
-					}
-					break;
-				}
-				case IWorkbenchPart.PROP_TITLE : {
-					// update the input if the title is changed
-					if (source == getTextEditor()) {
-						if (getTextEditor().getEditorInput() != getEditorInput()) {
-							setInput(getTextEditor().getEditorInput());
-						}
-					}
-					break;
-				}
-				default : {
-					// propagate changes. Is this needed? Answer: Yes.
-					if (source == getTextEditor()) {
-						_firePropertyChange(propId);
-					}
-					break;
-				}
-			}
-
-		}
-	}
-
-	class TextInputListener implements ITextInputListener {
-		public void inputDocumentAboutToBeChanged(IDocument oldInput, IDocument newInput) {
-			// do nothing
-		}
-
-		public void inputDocumentChanged(IDocument oldInput, IDocument newInput) {
-			if ((fDesignViewer != null) && (newInput != null)) {
-				fDesignViewer.setDocument(newInput);
-			}
-		}
-	}
-
-	class StatusLineLabelProvider extends JFaceNodeLabelProvider {
-		public StatusLineLabelProvider() {
-		}
-
-		public String getText(Object element) {
-			if (element == null)
-				return null;
-
-			Node node = (Node) element;
-			if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-				return getText(((Attr) node).getOwnerElement());
-			}
-
-			StringBuffer s = new StringBuffer();
-			if (node.getNodeType() != Node.DOCUMENT_NODE) {
-				while (node != null && node instanceof INodeNotifier) {
-					INodeNotifier notifier = (INodeNotifier) node;
-					if (node.getNodeType() != Node.DOCUMENT_NODE) {
-						IJFaceNodeAdapter adapter = (IJFaceNodeAdapter) notifier.getAdapterFor(IJFaceNodeAdapter.class);
-						if (adapter != null) {
-							s.insert(0, adapter.getLabelText(node));
-						}
-					}
-					node = node.getParentNode();
-					if (node != null && node.getNodeType() != Node.DOCUMENT_NODE)
-						s.insert(0, IPath.SEPARATOR);
-				}
-			}
-			return s.toString();
-		}
-
-		public Image getImage(Object element) {
-			if (element == null)
-				return null;
-
-			Node node = (Node) element;
-			if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-				return getImage(((Attr) node).getOwnerElement());
-			}
-			return super.getImage(element);
-		}
-	}
-
-	/** The design page index. */
-	private int fDesignPageIndex;
-
-	/** The design viewer */
-	IDesignViewer fDesignViewer;
-
-	private ActivationListener fActivationListener;
-
-	IPropertyListener fPropertyListener = null;
-
-	/** The source page index. */
-	int fSourcePageIndex;
-
-	/** The text editor. */
-	private StructuredTextEditor fTextEditor;
-
-	private TextEditorPostSelectionAdapter fTextEditorSelectionListener;
-
-	private ILabelProvider fStatusLineLabelProvider;
-
-	private PageInitializationData fPageInitializer;
-	
-	private ToolBarManager fToolbarManager;
-
-	private boolean fAllocateToolbar = true;
-	
-	/**
-	 * StructuredTextMultiPageEditorPart constructor comment.
-	 */
-	public XMLMultiPageEditorPart() {
-		super();
-		fStatusLineLabelProvider = new StatusLineLabelProvider();
-	}
-
-	/*
-	 * This method is just to make firePropertyChanged accessible from some
-	 * (anonomous) inner classes.
-	 */
-	void _firePropertyChange(int property) {
-		super.firePropertyChange(property);
-	}
-
-	/**
-	 * Adds the source page of the multi-page editor.
-	 */
-	private void addSourcePage() throws PartInitException {
-		fSourcePageIndex = addPage(fTextEditor, getEditorInput());
-		setPageText(fSourcePageIndex, XMLEditorMessages.XMLMultiPageEditorPart_0);
-
-		firePropertyChange(PROP_TITLE);
-
-		// Changes to the Text Viewer's document instance should also
-		// force an
-		// input refresh
-		fTextEditor.getTextViewer().addTextInputListener(new TextInputListener());
-	}
-
-	/**
-	 * Connects the design viewer with the viewer selection manager. Should be
-	 * done after createSourcePage() is done because we need to get the
-	 * ViewerSelectionManager from the TextEditor. setModel is also done here
-	 * because getModel() needs to reference the TextEditor.
-	 */
-	private void connectDesignPage() {
-		if (fDesignViewer != null) {
-			fDesignViewer.setDocument(getDocument());
-		}
-
-		/*
-		 * Connect selection from the Design page to the selection provider
-		 * for the XMLMultiPageEditorPart so that selection changes in the
-		 * Design page will propogate across the workbench
-		 */
-		if (fDesignViewer.getSelectionProvider() instanceof IPostSelectionProvider) {
-			((IPostSelectionProvider) fDesignViewer.getSelectionProvider()).addPostSelectionChangedListener(new ISelectionChangedListener() {
-				public void selectionChanged(SelectionChangedEvent event) {
-					((MultiPageSelectionProvider) getSite().getSelectionProvider()).firePostSelectionChanged(event);
-				}
-			});
-		}
-		fDesignViewer.getSelectionProvider().addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				((MultiPageSelectionProvider) getSite().getSelectionProvider()).fireSelectionChanged(event);
-			}
-		});
-
-		/*
-		 * Connect selection from the Design page to the selection provider of
-		 * the Source page so that selection in the Design page will drive
-		 * selection in the Source page. Prefer post selection.
-		 */
-		if (fDesignViewer.getSelectionProvider() instanceof IPostSelectionProvider) {
-			((IPostSelectionProvider) fDesignViewer.getSelectionProvider()).addPostSelectionChangedListener(new ISelectionChangedListener() {
-				public void selectionChanged(final SelectionChangedEvent event) {
-					/*
-					 * Only force selection update if source page is not
-					 * active
-					 */
-					if (getActivePage() != fSourcePageIndex) {
-						getTextEditor().getSelectionProvider().setSelection(event.getSelection());
-					}
-				}
-			});
-		}
-		else {
-			fDesignViewer.getSelectionProvider().addSelectionChangedListener(new ISelectionChangedListener() {
-				public void selectionChanged(SelectionChangedEvent event) {
-					/*
-					 * Only force selection update if source page is not
-					 * active
-					 */
-					if (getActivePage() != fSourcePageIndex) {
-						getTextEditor().getSelectionProvider().setSelection(event.getSelection());
-					}
-					/*
-					 * Bug 210481 - Removed call to updateStatusLine because
-					 * this is already handled by the selection in the source
-					 * page
-					 */
-				}
-			});
-		}
-
-		/*
-		 * Handle double-click in the Design page by selecting the
-		 * corresponding amount of text in the Source page.
-		 */
-		fDesignViewer.getControl().addListener(SWT.MouseDoubleClick, new Listener() {
-			public void handleEvent(Event event) {
-				ISelection selection = fDesignViewer.getSelectionProvider().getSelection();
-				int start = -1;
-				int length = -1;
-				if (selection instanceof IStructuredSelection) {
-					/*
-					 * selection goes from the start of the first object to
-					 * the end of the last
-					 */
-					IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-					Object o = structuredSelection.getFirstElement();
-					Object o2 = null;
-					if (structuredSelection.size() > 1) {
-						o2 = structuredSelection.toArray()[structuredSelection.size() - 1];
-					}
-					else {
-						o2 = o;
-					}
-					if (o instanceof IndexedRegion) {
-						start = ((IndexedRegion) o).getStartOffset();
-						length = ((IndexedRegion) o2).getEndOffset() - start;
-					}
-					else if (o2 instanceof ITextRegion) {
-						start = ((ITextRegion) o).getStart();
-						length = ((ITextRegion) o2).getEnd() - start;
-					}
-				}
-				else if (selection instanceof ITextSelection) {
-					start = ((ITextSelection) selection).getOffset();
-					length = ((ITextSelection) selection).getLength();
-				}
-				if ((start > -1) && (length > -1)) {
-					getTextEditor().selectAndReveal(start, length);
-				}
-			}
-		});
-
-		/*
-		 * Connect selection from the Source page to the selection provider of
-		 * the Design page so that selection in the Source page will drive
-		 * selection in the Design page. Prefer post selection.
-		 */
-		ISelectionProvider provider = getTextEditor().getSelectionProvider();
-		if (fTextEditorSelectionListener == null) {
-			fTextEditorSelectionListener = new TextEditorPostSelectionAdapter();
-		}
-		if (provider instanceof IPostSelectionProvider) {
-			fTextEditorSelectionListener.forcePostSelection = false;
-			((IPostSelectionProvider) provider).addPostSelectionChangedListener(fTextEditorSelectionListener);
-		}
-		else {
-			fTextEditorSelectionListener.forcePostSelection = true;
-			provider.addSelectionChangedListener(fTextEditorSelectionListener);
-		}
-	}
-
-	/**
-	 * Create and Add the Design Page using a registered factory
-	 * 
-	 */
-	private void createAndAddDesignPage() {
-		IDesignViewer designViewer = createDesignPage();
-
-		fDesignViewer = designViewer;
-		// note: By adding the design page as a Control instead of an
-		// IEditorPart, page switches will indicate
-		// a "null" active editor when the design page is made active
-		fDesignPageIndex = addPage(designViewer.getControl());
-		setPageText(fDesignPageIndex, designViewer.getTitle());
-	}
-
-	protected IDesignViewer createDesignPage() {
-		XMLTableTreeViewer tableTreeViewer = new XMLTableTreeViewer(getContainer());
-		// Set the default info-pop for XML design viewer.
-		XMLUIPlugin.getInstance().getWorkbench().getHelpSystem().setHelp(tableTreeViewer.getControl(), XMLTableTreeHelpContextIds.XML_DESIGN_VIEW_HELPID);
-
-		if (fToolbarManager != null) {
-			addToolBarActions(fToolbarManager, tableTreeViewer);
-		}
-		return tableTreeViewer;
-	}
-
-	private void addToolBarActions(final ToolBarManager manager, IDesignViewer viewer) {
-		if (viewer instanceof AbstractTreeViewer) {
-			// "dual-mode" actions for both pages
-			final ViewerExpandCollapseAction expand = new ViewerExpandCollapseAction(true) {
-				public void run() {
-					if (getActivePage() == fDesignPageIndex) {
-						super.run();
-					}
-					else if (getActivePage() == fSourcePageIndex) {
-						ITextViewer viewer = fTextEditor.getTextViewer();
-						if (viewer instanceof ProjectionViewer) {
-							ProjectionViewer projectionViewer = (ProjectionViewer) viewer;
-							if (projectionViewer.isProjectionMode())
-								projectionViewer.doOperation(ProjectionViewer.EXPAND_ALL);
-						}
-					}
-				}
-			};
-			final ViewerExpandCollapseAction collapse = new ViewerExpandCollapseAction(false) {
-				public void run() {
-					if (getActivePage() == fDesignPageIndex) {
-						super.run();
-					}
-					else if (getActivePage() == fSourcePageIndex) {
-						ITextViewer viewer = fTextEditor.getTextViewer();
-						if (viewer instanceof ProjectionViewer) {
-							ProjectionViewer projectionViewer = (ProjectionViewer) viewer;
-							if (projectionViewer.isProjectionMode())
-								projectionViewer.doOperation(ProjectionViewer.COLLAPSE_ALL);
-						}
-					}
-				}
-			};
-			expand.setViewer((AbstractTreeViewer) viewer);
-			collapse.setViewer((AbstractTreeViewer) viewer);
-
-			manager.add(expand);
-			manager.add(collapse);
-			manager.getControl().pack(true);
-			manager.update(true);
-		}
-	}
-
-	protected Composite createPageContainer(Composite parent) {
-		if (fAllocateToolbar) {
-			Composite container = new Composite(super.createPageContainer(parent), SWT.NONE);
-			GridLayout layout = new GridLayout(1, true);
-			layout.horizontalSpacing = 0;
-			layout.verticalSpacing = 0;
-			layout.marginBottom = 0;
-			layout.marginTop = 0;
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			layout.marginLeft = 0;
-			layout.marginRight = 0;
-			layout.horizontalSpacing = 0;
-			container.setLayout(layout);
-
-			ToolBar toolbar = new ToolBar(container, SWT.FLAT);
-			fToolbarManager = new ToolBarManager(toolbar);
-			GridData data = GridDataFactory.fillDefaults().align(SWT.END, SWT.BEGINNING).grab(true, false).create();
-			toolbar.setLayoutData(data);
-
-			Composite composite = new Composite(container, SWT.NONE);
-			composite.setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
-
-			return composite;
-		}
-		return super.createPageContainer(parent);
-	}
-
-	/**
-	 * Creates the pages of this multi-page editor.
-	 * <p>
-	 * Subclasses of <code>MultiPageEditor</code> must implement this method.
-	 * </p>
-	 */
-	protected void createPages() {
-		try {
-			// source page MUST be created before design page, now
-			createSourcePage();
-
-			createAndAddDesignPage();
-			addSourcePage();
-			connectDesignPage();
-
-			// set the active editor in the action bar contributor first
-			// before setactivepage calls action bar contributor's
-			// setactivepage (bug141013 - remove when bug151488 is fixed)
-			IEditorActionBarContributor contributor = getEditorSite().getActionBarContributor();
-			if (contributor instanceof MultiPageEditorActionBarContributor) {
-				((MultiPageEditorActionBarContributor) contributor).setActiveEditor(this);
-			}
-
-			int activePageIndex = getPreferenceStore().getInt(IXMLPreferenceNames.LAST_ACTIVE_PAGE);
-			if ((activePageIndex >= 0) && (activePageIndex < getPageCount())) {
-				setActivePage(activePageIndex);
-			}
-			else {
-				setActivePage(fSourcePageIndex);
-			}
-		}
-		catch (PartInitException e) {
-			Logger.logException(e);
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createSite(org.eclipse.ui.IEditorPart)
-	 */
-	protected IEditorSite createSite(IEditorPart editor) {
-		IEditorSite site = null;
-		if (editor == fTextEditor) {
-			site = new MultiPageEditorSite(this, editor) {
-				/**
-				 * @see org.eclipse.ui.part.MultiPageEditorSite#getActionBarContributor()
-				 */
-				public IEditorActionBarContributor getActionBarContributor() {
-					IEditorActionBarContributor contributor = super.getActionBarContributor();
-					IEditorActionBarContributor multiContributor = XMLMultiPageEditorPart.this.getEditorSite().getActionBarContributor();
-					if (multiContributor instanceof XMLMultiPageEditorActionBarContributor) {
-						contributor = ((XMLMultiPageEditorActionBarContributor) multiContributor).sourceViewerActionContributor;
-					}
-					return contributor;
-				}
-
-				public String getId() {
-					// sets this id so nested editor is considered xml source
-					// page
-					return ContentTypeIdForXML.ContentTypeID_XML + ".source"; //$NON-NLS-1$;
-				}
-			};
-		}
-		else {
-			site = super.createSite(editor);
-		}
-		return site;
-	}
-
-	/**
-	 * Creates the source page of the multi-page editor.
-	 */
-	protected void createSourcePage() throws PartInitException {
-		fTextEditor = createTextEditor();
-		fTextEditor.setEditorPart(this);
-
-		/*
-		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=134301 - XML editor
-		 * does not remember font settings
-		 * 
-		 * @see
-		 * org.eclipse.ui.texteditor.AbstractTextEditor#getSymbolicFontName()
-		 */
-		fPageInitializer.sendInitializationData(fTextEditor);
-
-		if (fPropertyListener == null) {
-			fPropertyListener = new PropertyListener();
-		}
-		fTextEditor.addPropertyListener(fPropertyListener);
-	}
-
-	/**
-	 * Method createTextEditor.
-	 * 
-	 * @return StructuredTextEditor
-	 */
-	private StructuredTextEditor createTextEditor() {
-		return new StructuredTextEditor();
-	}
-
-	private void disconnectDesignPage() {
-		if (fDesignViewer != null) {
-			fDesignViewer.setDocument(null);
-		}
-	}
-
-	public void dispose() {
-		Logger.trace("Source Editor", "XMLMultiPageEditorPart::dispose entry"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		disconnectDesignPage();
-
-		if (fActivationListener != null) {
-			fActivationListener.dispose();
-			fActivationListener = null;
-		}
-
-		if ((fTextEditor != null) && (fPropertyListener != null)) {
-			fTextEditor.removePropertyListener(fPropertyListener);
-		}
-		
-		// moved to last when added window ... seems like
-		// we'd be in danger of losing some data, like site,
-		// or something.
-		super.dispose();
-
-		Logger.trace("Source Editor", "StructuredTextMultiPageEditorPart::dispose exit"); //$NON-NLS-1$ //$NON-NLS-2$
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISaveablePart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void doSave(IProgressMonitor monitor) {
-		fTextEditor.doSave(monitor);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISaveablePart#doSaveAs()
-	 */
-	public void doSaveAs() {
-		fTextEditor.doSaveAs();
-		/*
-		 * Update the design viewer since the editor input would have changed
-		 * to the new file.
-		 */
-		if (fDesignViewer != null) {
-			fDesignViewer.setDocument(getDocument());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class key) {
-		Object result = null;
-
-		// we extend superclass, not override it, so allow it first
-		// chance to satisfy request.
-		result = super.getAdapter(key);
-
-		if (result == null) {
-			if (key == IDesignViewer.class) {
-				result = fDesignViewer;
-
-			}
-			else if (key.equals(IGotoMarker.class)) {
-				result = new IGotoMarker() {
-					public void gotoMarker(IMarker marker) {
-						XMLMultiPageEditorPart.this.gotoMarker(marker);
-					}
-				};
-			}
-			else {
-				/*
-				 * DMW: I'm bullet-proofing this because its been reported (on
-				 * very early versions) a null pointer sometimes happens here
-				 * on startup, when an editor has been left open when
-				 * workbench shutdown.
-				 */
-				if (fTextEditor != null) {
-					result = fTextEditor.getAdapter(key);
-				}
-			}
-		}
-		return result;
-	}
-
-	private IDocument getDocument() {
-		IDocument document = null;
-		if (fTextEditor != null) {
-			document = fTextEditor.getDocumentProvider().getDocument(fTextEditor.getEditorInput());
-		}
-		return document;
-	}
-
-	private IPreferenceStore getPreferenceStore() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	StructuredTextEditor getTextEditor() {
-		return fTextEditor;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IWorkbenchPart#getTitle()
-	 */
-	public String getTitle() {
-		String title = null;
-		if (getTextEditor() == null) {
-			if (getEditorInput() != null) {
-				title = getEditorInput().getName();
-			}
-		}
-		else {
-			title = getTextEditor().getTitle();
-		}
-		if (title == null) {
-			title = getPartName();
-		}
-		return title;
-	}
-
-	void gotoMarker(IMarker marker) {
-		setActivePage(fSourcePageIndex);
-		IDE.gotoMarker(fTextEditor, marker);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.IEditorPart#init(org.eclipse.ui.IEditorSite,
-	 * org.eclipse.ui.IEditorInput)
-	 */
-	public void init(IEditorSite site, IEditorInput input) throws PartInitException {
-		try {
-			super.init(site, input);
-			// we want to listen for our own activation
-			fActivationListener = new ActivationListener(site.getWorkbenchWindow().getPartService());
-		}
-		catch (Exception e) {
-			Logger.logException("exception initializing " + getClass().getName(), e); //$NON-NLS-1$
-		}
-		setPartName(input.getName());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISaveablePart#isSaveAsAllowed()
-	 */
-	public boolean isSaveAsAllowed() {
-		return (fTextEditor != null) && fTextEditor.isSaveAsAllowed();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.ISaveablePart#isSaveOnCloseNeeded()
-	 */
-	public boolean isSaveOnCloseNeeded() {
-		// overriding super class since it does a lowly isDirty!
-		if (fTextEditor != null) {
-			return fTextEditor.isSaveOnCloseNeeded();
-		}
-		return isDirty();
-	}
-	
-	/**
-	 * Prevents the creation of the in-editor toolbar, if called before
-	 * createPageContainer() during editor initialization.
-	 */
-	protected final void noToolbar() {
-		fAllocateToolbar = false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#pageChange(int)
-	 */
-	protected void pageChange(int newPageIndex) {
-		super.pageChange(newPageIndex);
-		saveLastActivePageIndex(newPageIndex);
-
-		if (newPageIndex == fDesignPageIndex) {
-			// design page isn't an IEditorPart, therefore we have to send
-			// selection changes ourselves
-			ISelectionProvider selectionProvider = fDesignViewer.getSelectionProvider();
-			if (selectionProvider != null) {
-				SelectionChangedEvent event = new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection());
-				((MultiPageSelectionProvider) getSite().getSelectionProvider()).fireSelectionChanged(event);
-				((MultiPageSelectionProvider) getSite().getSelectionProvider()).firePostSelectionChanged(event);
-			}
-		}
-	}
-
-	private void saveLastActivePageIndex(int newPageIndex) {
-		// save the last active page index to preference manager
-		getPreferenceStore().setValue(IXMLPreferenceNames.LAST_ACTIVE_PAGE, newPageIndex);
-	}
-
-	public void setFocus() {
-		super.setFocus();
-		Control control = fDesignViewer.getControl();
-		control.setFocus();
-
-		if (control instanceof Tree) {
-			if (((Tree) control).getItemCount() > 0) {
-				TreeItem item = ((Tree) control).getItem(0);
-				((Tree) control).setSelection(item);
-			}
-		}
-		// 271382 - Focus not set properly after activating XML editor
-		control.forceFocus();
-	}
-
-	public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
-		super.setInitializationData(cfig, propertyName, data);
-		fPageInitializer = new PageInitializationData(cfig, propertyName, data);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.part.EditorPart#setInput(org.eclipse.ui.IEditorInput)
-	 */
-	protected void setInput(IEditorInput input) {
-		/*
-		 * If driven from the Source page, it's "model" may not be up to date
-		 * with (or even exist for) the input just yet. Later notification
-		 * from the TextViewer could set us straight, although it's not
-		 * guaranteed to happen after the model has been created.
-		 */
-		super.setInput(input);
-		if (fDesignViewer != null) {
-			fDesignViewer.setDocument(getDocument());
-		}
-		setPartName(input.getName());
-	}
-
-	void updateStatusLine(ISelection selection) {
-		IStatusLineManager statusLineManager = getEditorSite().getActionBars().getStatusLineManager();
-		if (fStatusLineLabelProvider != null && statusLineManager != null) {
-			String text = null;
-			Image image = null;
-			if (selection instanceof IStructuredSelection && !selection.isEmpty()) {
-				Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-				if (firstElement != null) {
-					text = fStatusLineLabelProvider.getText(firstElement);
-					image = fStatusLineLabelProvider.getImage((firstElement));
-				}
-			}
-			if (image == null) {
-				statusLineManager.setMessage(text);
-			}
-			else {
-				statusLineManager.setMessage(image, text);
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeActionBarContributor.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeActionBarContributor.java
deleted file mode 100644
index 9da1fef..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeActionBarContributor.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver - bug 212330 - migrate to org.eclipse.ui.menus extension point
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuManager;
-//import org.eclipse.jface.action.IToolBarManager;
-//import org.eclipse.jface.action.MenuManager;
-//import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-//import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.CMDocumentLoader;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.InferredGrammarBuildingCMDocumentLoader;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.util.SharedXMLEditorPluginImageHelper;
-import org.w3c.dom.Document;
-
-/**
- * 
- */
-public class XMLTableTreeActionBarContributor implements IDesignViewerActionBarContributor {
-
-	protected IEditorPart editorPart;
-	protected final static String DESIGN_VIEWER_SEPARATOR_1_ID = "sed.tabletree.separator.1"; //$NON-NLS-1$
-	protected final static String DESIGN_VIEWER_SEPARATOR_2_ID = "sed.tabletree.separator.2"; //$NON-NLS-1$
-	protected final static String VALIDATE_XML_ID = "sed.tabletree.validateXML"; //$NON-NLS-1$
-	protected final static String RELOAD_GRAMMAR_ID = "sed.tabletree.reloadGrammar"; //$NON-NLS-1$
-	protected final static String TOGGLE_EDIT_MODE_ID = "sed.tabletree.toggleEditMode"; //$NON-NLS-1$
-	protected final static String EXPAND_ALL_ID = "sed.tabletree.expandAll"; //$NON-NLS-1$
-	protected final static String COLLAPSE_ALL_ID = "sed.tabletree.collapseAll"; //$NON-NLS-1$
-
-	protected ToggleEditModeAction toggleAction;
-	protected ReloadGrammarAction reloadGrammarAction;
-	// protected ValidateXMLAction validateXMLAction;
-	protected ViewerExpandCollapseAction expandAction;
-	protected ViewerExpandCollapseAction collapseAction;
-	protected ViewerExpandCollapseAction xmlMenuExpandAction;
-	protected ViewerExpandCollapseAction xmlMenuCollapseAction;
-
-	public XMLTableTreeActionBarContributor() {
-	}
-
-	protected void removeContributions(IContributionManager manager) {
-/*		try {
-			doRemove(manager, DESIGN_VIEWER_SEPARATOR_1_ID);
-			doRemove(manager, DESIGN_VIEWER_SEPARATOR_2_ID);
-			doRemove(manager, VALIDATE_XML_ID);
-			doRemove(manager, RELOAD_GRAMMAR_ID);
-			doRemove(manager, TOGGLE_EDIT_MODE_ID);
-			doRemove(manager, EXPAND_ALL_ID);
-			doRemove(manager, COLLAPSE_ALL_ID);
-		}
-		catch (Exception e) {
-		}
-*/		
-	}
-
-	protected void doRemove(IContributionManager manager, String id) {
-/*		try {
-			if (manager.find(id) != null) {
-				manager.remove(id);
-			}
-		}
-		catch (Exception e) {
-		}
-*/	}
-
-	public void init(IActionBars bars, IWorkbenchPage page) {
-		init(bars);
-	}
-
-	public void init(IActionBars bars) {
-//		IToolBarManager tbm = bars.getToolBarManager();
-
-/*		IMenuManager xmlMenu = bars.getMenuManager().findMenuUsingPath("org.eclipse.core.runtime.xml.design.xmlmenu"); //$NON-NLS-1$
-
-		if (xmlMenu == null) {
-			xmlMenu = new MenuManager(XMLEditorMessages.XMLTableTreeActionBarContributor_0, "org.eclipse.core.runtime.xml.design.xmlmenu"); //$NON-NLS-1$
-			// For RCP usage
-			if (bars.getMenuManager().find(IWorkbenchActionConstants.M_WINDOW) != null) {
-				bars.getMenuManager().insertBefore(IWorkbenchActionConstants.M_WINDOW, xmlMenu);
-			}
-		}
-		else {
-			removeContributions(xmlMenu);
-		}
-
-		tbm.add(new Separator("DESIGN_VIEWER_SEPARATOR_1_ID")); //$NON-NLS-1$
-*/
-		// ToggleEditModeAction
-		//           
-/*		toggleAction = new ToggleEditModeAction();
-		toggleAction.setId(TOGGLE_EDIT_MODE_ID);
-		xmlMenu.add(toggleAction);
-		tbm.add(toggleAction);
-*/
-		// ReloadGrammarAction
-		//
-/*		reloadGrammarAction = new ReloadGrammarAction();
-		reloadGrammarAction.setId(RELOAD_GRAMMAR_ID);
-		tbm.add(reloadGrammarAction);
-		xmlMenu.add(reloadGrammarAction);
-
-		xmlMenu.add(new Separator());
-*/
-		// ExpandCollapseAction
-		//
-/*		xmlMenuExpandAction = new ViewerExpandCollapseAction(true);
-		xmlMenuExpandAction.setId(EXPAND_ALL_ID);
-		xmlMenuExpandAction.setText(XMLEditorMessages.XMLTableTreeActionBarContributor_1);
-		xmlMenu.add(xmlMenuExpandAction);
-
-		xmlMenuCollapseAction = new ViewerExpandCollapseAction(false);
-		xmlMenuCollapseAction.setId(COLLAPSE_ALL_ID);
-		xmlMenuCollapseAction.setId(EXPAND_ALL_ID);
-		xmlMenuCollapseAction.setText(XMLEditorMessages.XMLTableTreeActionBarContributor_2);
-		xmlMenu.add(xmlMenuCollapseAction);
-*/		
-	}
-
-	protected void addActionWithId(IMenuManager menuManager, Action action, String id) {
-		action.setId(id);
-		menuManager.add(action);
-	}
-
-	public void initViewerSpecificContributions(IActionBars bars) {
-/*		IToolBarManager tbm = bars.getToolBarManager();
-		tbm.add(new Separator(DESIGN_VIEWER_SEPARATOR_2_ID));
-
-		expandAction = new ViewerExpandCollapseAction(true);
-		expandAction.setId(EXPAND_ALL_ID);
-		tbm.add(expandAction);
-
-		collapseAction = new ViewerExpandCollapseAction(false);
-		collapseAction.setId(COLLAPSE_ALL_ID);
-		tbm.add(collapseAction);
-*/		
-	}
-
-	public void setViewerSpecificContributionsEnabled(boolean enabled) {
-/*		if (expandAction != null) {
-			expandAction.setEnabled(enabled);
-			xmlMenuExpandAction.setEnabled(enabled);
-		}
-
-		if (collapseAction != null) {
-			collapseAction.setEnabled(enabled);
-			xmlMenuCollapseAction.setEnabled(enabled);
-		}
-*/		
-	}
-
-	public void setActiveEditor(IEditorPart targetEditor) {
-		editorPart = targetEditor;
-
-//		IStructuredModel model = getModelForEditorPart(targetEditor);
-/*		reloadGrammarAction.setModel(model);
-		toggleAction.setModelQuery(ModelQueryUtil.getModelQuery(model));
-
-		XMLTableTreeViewer tableTreeViewer = getTableTreeViewerForEditorPart(editorPart);
-		if (tableTreeViewer != null) {
-			expandAction.setViewer(tableTreeViewer);
-			collapseAction.setViewer(tableTreeViewer);
-
-			xmlMenuExpandAction.setViewer(tableTreeViewer);
-			xmlMenuCollapseAction.setViewer(tableTreeViewer);
-		}
-*/
-		if (editorPart instanceof XMLMultiPageEditorPart) {
-			IWorkbenchPartSite site = editorPart.getSite();
-			if (site instanceof IEditorSite) {
-				ITextEditor textEditor = ((XMLMultiPageEditorPart) editorPart).getTextEditor();
-				IActionBars actionBars = ((IEditorSite) site).getActionBars();
-				actionBars.setGlobalActionHandler(ITextEditorActionConstants.UNDO, getAction(textEditor, ITextEditorActionConstants.UNDO));
-				actionBars.setGlobalActionHandler(ITextEditorActionConstants.REDO, getAction(textEditor, ITextEditorActionConstants.REDO));
-			}
-		}
-
-		// TODO... uncomment this and investigate NPE
-		//
-		// add the cut/copy/paste for text fields
-		// ActionHandlerPlugin.connectPart(editorPart);
-	}
-
-	protected final IAction getAction(ITextEditor editor, String actionId) {
-		return (editor == null ? null : editor.getAction(actionId));
-	}
-
-	protected IStructuredModel getModelForEditorPart(IEditorPart targetEditor) {
-		IStructuredModel result = null;
-		if (editorPart instanceof XMLMultiPageEditorPart) {
-			StructuredTextEditor textEditor = ((XMLMultiPageEditorPart) targetEditor).getTextEditor();
-			result = (textEditor != null) ? textEditor.getModel() : null;
-		}
-		return result;
-	}
-
-	protected XMLTableTreeViewer getTableTreeViewerForEditorPart(IEditorPart targetEditor) {
-		XMLTableTreeViewer result = null;
-		Object object = targetEditor.getAdapter(IDesignViewer.class);
-		if (object instanceof XMLTableTreeViewer) {
-			result = (XMLTableTreeViewer) object;
-		}
-		return result;
-	}
-
-	/**
-	 * 
-	 */
-	public class ToggleEditModeAction extends Action {
-		protected ImageDescriptor onImage = SharedXMLEditorPluginImageHelper.getImageDescriptor(SharedXMLEditorPluginImageHelper.IMG_ETOOL_CONSTRAINON);
-		protected ImageDescriptor offImage = SharedXMLEditorPluginImageHelper.getImageDescriptor(SharedXMLEditorPluginImageHelper.IMG_ETOOL_CONSTRAINOFF);
-		protected ModelQuery modelQuery;
-
-		public ToggleEditModeAction() {
-			setAppearanceForEditMode(ModelQuery.EDIT_MODE_CONSTRAINED_STRICT);
-		}
-
-		public void run() {
-			if (modelQuery != null) {
-				int newState = getNextState(modelQuery.getEditMode());
-				modelQuery.setEditMode(newState);
-				setAppearanceForEditMode(newState);
-			}
-		}
-
-		public void setModelQuery(ModelQuery newModelQuery) {
-			modelQuery = newModelQuery;
-			if (modelQuery != null) {
-				setAppearanceForEditMode(modelQuery.getEditMode());
-			}
-		}
-
-		public void setAppearanceForEditMode(int editMode) {
-			if (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) {
-				setToolTipText(XMLEditorMessages.XMLTableTreeActionBarContributor_3);
-				setText(XMLEditorMessages.XMLTableTreeActionBarContributor_4);
-				setImageDescriptor(onImage);
-			}
-			else {
-				setToolTipText(XMLEditorMessages.XMLTableTreeActionBarContributor_5);
-				setText(XMLEditorMessages.XMLTableTreeActionBarContributor_6);
-				setImageDescriptor(offImage);
-			}
-		}
-
-		public int getNextState(int editMode) {
-			int result = -1;
-			if (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) {
-				result = ModelQuery.EDIT_MODE_UNCONSTRAINED;
-			}
-			else {
-				result = ModelQuery.EDIT_MODE_CONSTRAINED_STRICT;
-			}
-			return result;
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public class ReloadGrammarAction extends Action {
-		protected IStructuredModel model;
-
-		public ReloadGrammarAction() {
-			setDisabledImageDescriptor(SharedXMLEditorPluginImageHelper.getImageDescriptor(SharedXMLEditorPluginImageHelper.IMG_DTOOL_RLDGRMR));
-			setImageDescriptor(SharedXMLEditorPluginImageHelper.getImageDescriptor(SharedXMLEditorPluginImageHelper.IMG_ETOOL_RLDGRMR));
-			setToolTipText(XMLEditorMessages.XMLTableTreeActionBarContributor_7);
-			setText(XMLEditorMessages.XMLTableTreeActionBarContributor_8);
-		}
-
-		public void setModel(IStructuredModel newModel) {
-			this.model = newModel;
-		}
-
-		public void run() {
-			if (model != null) {
-				ModelQuery modelQuery = ModelQueryUtil.getModelQuery(model);
-				Document document = ((IDOMModel) model).getDocument();
-				if ((modelQuery != null) && (modelQuery.getCMDocumentManager() != null)) {
-					modelQuery.getCMDocumentManager().getCMDocumentCache().clear();
-					// TODO... need to figure out how to access the
-					// DOMObserver via ModelQuery
-					// ...why?
-					CMDocumentLoader loader = new InferredGrammarBuildingCMDocumentLoader(document, modelQuery);
-					loader.loadCMDocuments();
-				}
-			}
-		}
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorActionBarContributor#dispose()
-	 */
-	public void dispose() {
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeContentProvider.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeContentProvider.java
deleted file mode 100644
index 95125b6..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeContentProvider.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITableColorProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapterFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManagerListener;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.util.SharedXMLEditorPluginImageHelper;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-
-public class XMLTableTreeContentProvider implements ITreeContentProvider, ITableLabelProvider, ITableColorProvider, ILabelProvider, CMDocumentManagerListener {
-
-	protected CMDocumentManager documentManager;
-
-	StructuredViewer fViewer = null;
-
-	private TreeContentHelper treeContentHelper = new TreeContentHelper();
-
-	private CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
-
-	private Color fCMColor = null;
-
-	public XMLTableTreeContentProvider() {
-		super();
-	}
-
-	//
-	// ILabelProvider stuff
-	//
-	public void addListener(ILabelProviderListener listener) {
-		// since we always return 'false' for "isLabelProperty",
-		// not need to listen. Maybe that should change some day?
-	}
-
-	// CMDocumentManagerListener
-	//
-	public void cacheCleared(CMDocumentCache cache) {
-		doDelayedRefreshForViewers();
-	}
-
-	public void cacheUpdated(CMDocumentCache cache, final String uri, int oldStatus, int newStatus, CMDocument cmDocument) {
-		if ((newStatus == CMDocumentCache.STATUS_LOADED) || (newStatus == CMDocumentCache.STATUS_ERROR)) {
-			doDelayedRefreshForViewers();
-		}
-	}
-
-	public void dispose() {
-		if (documentManager != null) {
-			documentManager.removeListener(this);
-		}
-		if (fViewer != null && fViewer.getInput() != null) {
-			if (fViewer.getInput() instanceof IDOMNode) {
-				IJFaceNodeAdapterFactory factory = (IJFaceNodeAdapterFactory) ((IDOMNode) fViewer.getInput()).getModel().getFactoryRegistry().getFactoryFor(IJFaceNodeAdapter.class);
-				if (factory != null) {
-					factory.removeListener(fViewer);
-				}
-			}
-		}
-		if (fCMColor != null) {
-			fCMColor.dispose();
-		}
-	}
-
-	private void doDelayedRefreshForViewers() {
-		if ((fViewer != null) && !fViewer.getControl().isDisposed()) {
-			fViewer.getControl().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					if ((fViewer != null) && !fViewer.getControl().isDisposed()) {
-						fViewer.refresh(true);
-					}
-				}
-			});
-		}
-	}
-
-	public Object[] getChildren(Object element) {
-		if (element instanceof INodeNotifier) {
-			((INodeNotifier) element).getAdapterFor(IJFaceNodeAdapter.class);
-		}
-		return treeContentHelper.getChildren(element);
-	}
-
-	public Image getColumnImage(Object object, int columnIndex) {
-		return (columnIndex == 0) ? getImage(object) : null;
-	}
-
-	//
-	// ITableLabelProvider stuff
-	//
-	public String getColumnText(Object object, int column) {
-		String result = null;
-		if (column == 0) {
-			result = getText(object);
-		}
-		else if ((column == 1) && (object instanceof Node)) {
-			result = treeContentHelper.getNodeValue((Node) object);
-			if (result == null)
-				result = getElementValueHelper((Element) object);
-				
-		}
-		return result != null ? result : ""; //$NON-NLS-1$
-	}
-	
-	private String getElementValueHelper(Element element) {
-		String result = null;
-
-		ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		if ((result == null) && (mq != null)) {
-			CMElementDeclaration ed = mq.getCMElementDeclaration(element);
-			if ((ed != null) && !Boolean.TRUE.equals(ed.getProperty("isInferred"))) { //$NON-NLS-1$
-				result = descriptionBuilder.buildDescription(ed);
-			}
-		}
-		return result != null ? result : ""; //$NON-NLS-1$
-	}
-
-	public Object[] getElements(Object element) {
-		return getChildren(element);
-	}
-
-	public Image getImage(Object object) {
-		if (object instanceof INodeNotifier) {
-			((INodeNotifier) object).getAdapterFor(IJFaceNodeAdapter.class);
-		}
-
-		Image image = null;
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			switch (node.getNodeType()) {
-				case Node.ATTRIBUTE_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ATTRIBUTE);
-					break;
-				}
-				case Node.CDATA_SECTION_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_CDATASECTION);
-					break;
-				}
-				case Node.COMMENT_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_COMMENT);
-					break;
-				}
-				case Node.DOCUMENT_TYPE_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_DOCTYPE);
-					break;
-				}
-				case Node.ELEMENT_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ELEMENT);
-					break;
-				}
-				case Node.PROCESSING_INSTRUCTION_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_PROCESSINGINSTRUCTION);
-					break;
-				}
-				case Node.TEXT_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_TXTEXT);
-					break;
-				}
-				case Node.ENTITY_REFERENCE_NODE : {
-					image = SharedXMLEditorPluginImageHelper.getImage(SharedXMLEditorPluginImageHelper.IMG_OBJ_ENTITY_REFERENCE);
-					break;
-				}
-			}
-
-			// if (image != null) {
-			// Image markerOverlayImage =
-			// overlayIconManager.getOverlayImageForObject(node);
-			// if (markerOverlayImage != null) {
-			// image = imageFactory.createCompositeImage(image,
-			// markerOverlayImage, ImageFactory.BOTTOM_LEFT);
-			// }
-			// }
-		}
-		return image;
-	}
-
-	public Object getParent(Object o) {
-		if (o instanceof INodeNotifier) {
-			((INodeNotifier) o).getAdapterFor(IJFaceNodeAdapter.class);
-		}
-
-		Object result = null;
-		if (o instanceof Node) {
-			Node node = (Node) o;
-			if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-				result = ((Attr) node).getOwnerElement();
-			}
-			else {
-				result = node.getParentNode();
-			}
-		}
-		return result;
-	}
-
-	public Element getRootElement(Document document) {
-		Element rootElement = null;
-
-		for (Node childNode = document.getFirstChild(); childNode != null; childNode = childNode.getNextSibling()) {
-			if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-				rootElement = (Element) childNode;
-				break;
-			}
-		}
-		return rootElement;
-	}
-
-	public String getText(Object object) {
-		if (object instanceof INodeNotifier) {
-			((INodeNotifier) object).getAdapterFor(IJFaceNodeAdapter.class);
-		}
-
-		String result = null;
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			switch (node.getNodeType()) {
-				case Node.ATTRIBUTE_NODE : {
-					result = node.getNodeName();
-					break;
-				}
-				case Node.DOCUMENT_TYPE_NODE : {
-					result = "DOCTYPE"; //$NON-NLS-1$
-					break;
-				}
-				case Node.ELEMENT_NODE : {
-					result = node.getNodeName();
-					break;
-				}
-				case Node.PROCESSING_INSTRUCTION_NODE : {
-					result = ((ProcessingInstruction) node).getTarget();
-					break;
-				}
-			}
-		}
-		return result != null ? result : ""; //$NON-NLS-1$
-	}
-
-	public boolean hasChildren(Object element) {
-		return getChildren(element).length > 0;
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		// remove our listeners to the old state
-		if (oldInput != null) {
-			Document domDoc = (Document) oldInput;
-			ModelQuery mq = ModelQueryUtil.getModelQuery(domDoc);
-			if (mq != null) {
-				documentManager = mq.getCMDocumentManager();
-				if (documentManager != null) {
-					documentManager.removeListener(this);
-				}
-			}
-		}
-
-		if ((oldInput != null) && (oldInput instanceof IDOMNode)) {
-			IJFaceNodeAdapterFactory factory = (IJFaceNodeAdapterFactory) ((IDOMNode) oldInput).getModel().getFactoryRegistry().getFactoryFor(IJFaceNodeAdapter.class);
-			if (factory != null) {
-				factory.removeListener(viewer);
-			}
-		}
-
-		if (viewer instanceof StructuredViewer) {
-			fViewer = null;
-		}
-		else {
-			fViewer = (StructuredViewer) viewer;
-		}
-
-		if ((newInput != null) && (newInput instanceof IDOMNode)) {
-			IJFaceNodeAdapterFactory factory = (IJFaceNodeAdapterFactory) ((IDOMNode) newInput).getModel().getFactoryRegistry().getFactoryFor(IJFaceNodeAdapter.class);
-			if (factory != null) {
-				factory.addListener(viewer);
-			}
-		}
-
-		if (newInput != null) {
-			Document domDoc = (Document) newInput;
-			ModelQuery mq = ModelQueryUtil.getModelQuery(domDoc);
-
-			if (mq != null) {
-				documentManager = mq.getCMDocumentManager();
-				if (documentManager != null) {
-					documentManager.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, true);
-					documentManager.addListener(this);
-				}
-			}
-		}
-	}
-
-	public boolean isDeleted(Object element) {
-		return element != null;
-	}
-
-	// the following methods handle filtering aspects of the viewer
-	//
-	//
-	public boolean isIgnorableText(Node node) {
-		boolean result = false;
-		try {
-			if (node.getNodeType() == Node.TEXT_NODE) {
-				String data = ((Text) node).getData();
-				result = ((data == null) || (data.trim().length() == 0));
-			}
-		}
-		catch (Exception e) {
-			Logger.logException(e);
-		}
-		return result;
-	}
-
-	public boolean isLabelProperty(Object object, String property) {
-		return false;
-	}
-
-	public void propertyChanged(CMDocumentManager cmDocumentManager, String propertyName) {
-		if (cmDocumentManager.getPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD)) {
-			doDelayedRefreshForViewers();
-		}
-	}
-
-	public void removeListener(ILabelProviderListener listener) {
-		// since we always return 'false' for "isLabelProperty",
-		// not need to listen. Maybe that should change some day?
-	}
-
-	public Color getBackground(Object element, int columnIndex) {
-		return null;
-	}
-
-	public Color getForeground(Object element, int columnIndex) {
-		if (columnIndex == 1 && treeContentHelper.getNodeValue((Node) element) == null)
-			return getCMColor();
-		return null;
-	}
-	
-	private Color getCMColor() {
-		if (fCMColor == null) {
-			Color background = Display.getCurrent().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-			int r = Math.abs(background.getRed() - 125);
-			int g = Math.abs(background.getGreen() - 85);
-			int b = Math.abs(background.getBlue() - 105);
-			fCMColor = new Color(Display.getCurrent(), r, g, b);
-		}
-		return fCMColor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeHelpContextIds.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeHelpContextIds.java
deleted file mode 100644
index 60bc4df..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeHelpContextIds.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-
-
-/**
- * Help context ids for the TableTree view.
- * <p>
- * This interface contains constants only; it is not intended to be
- * implemented or extended.
- * </p>
- * 
- */
-public interface XMLTableTreeHelpContextIds {
-	// org.eclipse.wst.xml.ui.
-	public static final String PREFIX = XMLUIPlugin.ID + "."; //$NON-NLS-1$
-
-	// XML Design View
-	public static final String XML_DESIGN_VIEW_HELPID = PREFIX + "xmlm3000"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreePropertyDescriptorFactory.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreePropertyDescriptorFactory.java
deleted file mode 100644
index b929b4c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreePropertyDescriptorFactory.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import java.util.List;
-
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.properties.EnumeratedStringPropertyDescriptor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-
-public class XMLTableTreePropertyDescriptorFactory extends DOMPropertyDescriptorFactory {
-
-	protected TreeContentHelper treeContentHelper = new TreeContentHelper();
-
-	public XMLTableTreePropertyDescriptorFactory() {
-		super();
-	}
-
-	protected IPropertyDescriptor createPropertyDescriptorHelper(String name, Element element, CMNode cmNode) {
-		IPropertyDescriptor result = null;
-
-		ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		String[] valuesArray = null;
-		if (mq != null) {
-			valuesArray = mq.getPossibleDataTypeValues(element, cmNode);
-		}
-		if ((valuesArray != null) && (valuesArray.length > 0)) {
-			result = new EnumeratedStringPropertyDescriptor(name, name, valuesArray);
-		}
-		else {
-			result = createDefaultPropertyDescriptor(name);
-		}
-
-		return result;
-	}
-
-	public IPropertyDescriptor createTextPropertyDescriptor(Text text) {
-		IPropertyDescriptor result = null;
-		Node parentNode = text.getParentNode();
-		if ((parentNode != null) && (parentNode.getNodeType() == Node.ELEMENT_NODE)) {
-			Element parentElement = (Element) parentNode;
-			ModelQuery mq = ModelQueryUtil.getModelQuery(text.getOwnerDocument());
-			CMElementDeclaration ed = null;
-			if (mq != null) {
-				ed = mq.getCMElementDeclaration(parentElement);
-			}
-			if (ed != null) {
-				result = createPropertyDescriptorHelper(HACK, parentElement, ed);
-			}
-			else {
-				result = createDefaultPropertyDescriptor(parentElement.getNodeName());
-			}
-		}
-
-		if (result == null) {
-			result = new TextPropertyDescriptor(HACK, HACK);
-		}
-
-		return result;
-	}
-
-	public IPropertyDescriptor createAttributePropertyDescriptor(Attr attr) {
-		IPropertyDescriptor result = null;
-
-		String attributeName = attr.getName();
-		ModelQuery mq = ModelQueryUtil.getModelQuery(attr.getOwnerDocument());
-
-		CMAttributeDeclaration ad = null;
-		if (mq != null) {
-			ad = mq.getCMAttributeDeclaration(attr);
-		}
-		if (ad != null) {
-			result = createPropertyDescriptorHelper(attributeName, attr.getOwnerElement(), ad);
-		}
-
-		if (result == null) {
-			result = new TextPropertyDescriptor(attributeName, attributeName);
-		}
-
-		return result;
-	}
-
-	public IPropertyDescriptor createElementPropertyDescriptor(Element element) {
-		IPropertyDescriptor result = null;
-		List list = treeContentHelper.getElementTextContent(element);
-		if (list != null) {
-			Text text = treeContentHelper.getEffectiveTextNodeForCombinedNodeList(list);
-			if (text != null) {
-				result = createTextPropertyDescriptor(text);
-			}
-		}
-
-		if (result == null) {
-			result = new TextPropertyDescriptor(HACK, HACK);
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeViewer.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeViewer.java
deleted file mode 100644
index 922c841..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTableTreeViewer.java
+++ /dev/null
@@ -1,415 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- ****************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import java.util.Iterator;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DragSource;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
-import org.eclipse.swt.dnd.DropTarget;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.TreeColumn;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.actions.NodeAction;
-import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager;
-import org.eclipse.wst.xml.ui.internal.dnd.DragNodeCommand;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class XMLTableTreeViewer extends TreeViewer implements IDesignViewer {
-
-	class NodeActionMenuListener implements IMenuListener {
-		public void menuAboutToShow(IMenuManager menuManager) {
-			// used to disable NodeSelection listening while running
-			// NodeAction
-			XMLNodeActionManager nodeActionManager = new XMLNodeActionManager(((IDOMDocument) getInput()).getModel(), XMLTableTreeViewer.this) {
-				public void beginNodeAction(NodeAction action) {
-					super.beginNodeAction(action);
-				}
-
-				public void endNodeAction(NodeAction action) {
-					super.endNodeAction(action);
-				}
-			};
-			nodeActionManager.fillContextMenu(menuManager, getSelection());
-		}
-	}
-	
-	private class SelectionProvider implements IPostSelectionProvider {
-
-		public void addPostSelectionChangedListener(ISelectionChangedListener listener) {
-			XMLTableTreeViewer.this.addPostSelectionChangedListener(listener);
-		}
-
-		public void removePostSelectionChangedListener(ISelectionChangedListener listener) {
-			XMLTableTreeViewer.this.removePostSelectionChangedListener(listener);
-		}
-
-		public void addSelectionChangedListener(ISelectionChangedListener listener) {
-			XMLTableTreeViewer.this.addSelectionChangedListener(listener);
-		}
-
-		public ISelection getSelection() {
-			return XMLTableTreeViewer.this.getSelection();
-		}
-
-		public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-			XMLTableTreeViewer.this.removeSelectionChangedListener(listener);
-		}
-
-		public void setSelection(ISelection selection) {
-			boolean selectionSet = false;
-			if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-				IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-				if (selection instanceof ITextSelection) {
-					ITextSelection textSelection = (ITextSelection) selection;
-					
-					if (structuredSelection.size() == 1) {
-						if (structuredSelection.getFirstElement() instanceof IDOMNode) {
-							IDOMNode domNode = (IDOMNode) structuredSelection.getFirstElement();
-							IStructuredDocumentRegion startStructuredDocumentRegion = domNode.getStartStructuredDocumentRegion();
-							if (startStructuredDocumentRegion != null) {
-								ITextRegion matchingRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(textSelection.getOffset());
-								int allowedIterations = 40;
-								while (matchingRegion != null && !matchingRegion.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) && allowedIterations > 0) {
-									matchingRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(startStructuredDocumentRegion.getStartOffset(matchingRegion) - 1);
-									allowedIterations--;
-								}
-								if (matchingRegion != null && matchingRegion.getType().equals(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) {
-									String attrName = startStructuredDocumentRegion.getText(matchingRegion);
-									NamedNodeMap attributes = domNode.getAttributes();
-									if (attributes != null && attrName.length() > 0) {
-										Node attr = attributes.getNamedItem(attrName);
-										if (attr != null) {
-											selectionSet = true;
-											XMLTableTreeViewer.this.setSelection(new StructuredSelection(attr));
-										}
-									}
-								}
-							}
-						}
-					}
-				}
-			}
-			if (!selectionSet) {
-				XMLTableTreeViewer.this.setSelection(selection);
-			}
-		}
-	}
-
-	private PaintListener fContentPaintListener = new PaintListener() {
-
-		public void paintControl(PaintEvent e) {
-			GC gc = e.gc;
-			if (getTree().getItemCount() == 0) {
-				gc.setForeground(getTree().getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND));
-				gc.setBackground(getTree().getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-				gc.drawString(XMLEditorMessages.XMLTreeExtension_3, 10, 10);
-				gc.drawString(XMLEditorMessages.XMLTreeExtension_4, 10, 10 + gc.getFontMetrics().getHeight());
-			}
-		}
-		
-	};
-
-	private ISelectionProvider fSelectionProvider = new SelectionProvider();
-
-	public XMLTableTreeViewer(Composite parent) {
-		super(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
-		
-		TableLayout layout = new TableLayout();
-		
-		layout.addColumnData(new ColumnWeightData(40));
-		TreeColumn column = new TreeColumn(this.getTree(), SWT.LEFT);
-		column.setText(XMLEditorMessages.XMLTableTreeViewer_1);
-
-		layout.addColumnData(new ColumnWeightData(60));
-		column = new TreeColumn(this.getTree(), SWT.LEFT);
-		column.setText(XMLEditorMessages.XMLTableTreeViewer_2);
-
-		this.getTree().setHeaderVisible(true);
-		this.getTree().setLinesVisible(true);
-		this.getTree().setLayout(layout);
-
-		// set up providers
-		propertyDescriptorFactory = new XMLTableTreePropertyDescriptorFactory();
-
-		XMLTableTreeContentProvider provider = new XMLTableTreeContentProvider();
-		setContentProvider(provider);
-		setLabelProvider(provider);
-
-		setColumnProperties(new String[] {STRUCTURE_PROPERTY, VALUE_PROPERTY});
-		setCellEditors(new CellEditor[] {null, new TextCellEditor(this.getTree())});
-
-		setCellModifier(new XMLCMCellModifier());
-		createContextMenu();
-
-		DragSource dragSource = new DragSource(getControl(), DND.DROP_COPY | DND.DROP_MOVE);
-		dragSource.addDragListener(createDragSourceListener());
-		dragSource.setTransfer(new Transfer[] {LocalSelectionTransfer.getTransfer()});
-		DropTarget dropTarget = new DropTarget(getControl(), DND.DROP_COPY | DND.DROP_MOVE);
-		dropTarget.addDropListener(createDropTargetListener());
-		dropTarget.setTransfer(new Transfer[] {LocalSelectionTransfer.getTransfer()});
-
-		this.getTree().addPaintListener(fContentPaintListener);
-	}
-
-	/**
-	 * This creates a context menu for the viewer and adds a listener as well
-	 * registering the menu for extension.
-	 */
-	protected void createContextMenu() {
-		MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
-		contextMenu.add(new Separator("additions")); //$NON-NLS-1$
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(new NodeActionMenuListener());
-		Menu menu = contextMenu.createContextMenu(getControl());
-		getControl().setMenu(menu);
-	}
-
-	private DragSourceListener createDragSourceListener() {
-		return new DragSourceListener() {
-			public void dragFinished(DragSourceEvent event) {
-				LocalSelectionTransfer.getTransfer().setSelection(null);
-			}
-
-			public void dragSetData(DragSourceEvent event) {
-			}
-
-			public void dragStart(DragSourceEvent event) {
-				LocalSelectionTransfer.getTransfer().setSelection(getSelection());
-			}
-		};
-	}
-
-	private DropTargetListener createDropTargetListener() {
-		return new DropTargetListener() {
-			public void dragEnter(DropTargetEvent event) {
-			}
-
-			public void dragLeave(DropTargetEvent event) {
-			}
-
-			public void dragOperationChanged(DropTargetEvent event) {
-			}
-
-			public void drop(DropTargetEvent event) {
-				if (event.operations != DND.DROP_NONE && LocalSelectionTransfer.getTransfer().getSelection() instanceof IStructuredSelection) {
-					dragOver(event);
-					IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
-					if (selection != null && !selection.isEmpty() && event.item != null && event.item.getData() != null) {
-						/*
-						 * the command uses these numbers instead of the
-						 * feedback constants (even though it converts in
-						 * the other direction as well)
-						 */
-						float feedbackFloat = getHeightInItem(event);
-
-						final DragNodeCommand command = new DragNodeCommand(event.item.getData(), feedbackFloat, event.operations, event.detail, selection.toList(), XMLTableTreeViewer.this);
-						if (command != null && command.canExecute()) {
-							SafeRunnable.run(new SafeRunnable() {
-								public void run() throws Exception {
-									command.execute();
-								}
-							});
-						}
-					}
-				}
-			}
-
-			public void dropAccept(DropTargetEvent event) {
-			}
-
-			public void dragOver(DropTargetEvent event) {
-				event.feedback = DND.FEEDBACK_SELECT;
-				float feedbackFloat = getHeightInItem(event);
-				if (feedbackFloat > 0.75) {
-					event.feedback = DND.FEEDBACK_INSERT_AFTER;
-				}
-				else if (feedbackFloat < 0.25) {
-					event.feedback = DND.FEEDBACK_INSERT_BEFORE;
-				}
-				event.feedback |= DND.FEEDBACK_EXPAND | DND.FEEDBACK_SCROLL;
-				if ( getLocalNodeSelection(event) == null){
-					event.detail = DND.DROP_NONE;
-				}
-			}
-
-			private IStructuredSelection getLocalNodeSelection(DropTargetEvent event){
-				IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
-				if (selection != null && !selection.isEmpty() ) {
-					for (Iterator i = selection.iterator(); i.hasNext();) {
-						Object node = i.next();
-						if (node instanceof Node){
-							return selection;
-						}
-					}
-				}
-				return null;
-			}
-			private float getHeightInItem(DropTargetEvent event) {
-				if(event.item == null) return .5f;
-				if (event.item instanceof TreeItem) {
-					TreeItem treeItem = (TreeItem) event.item;
-					Control control = treeItem.getParent();
-					Point point = control.toControl(new Point(event.x, event.y));
-					Rectangle bounds = treeItem.getBounds();
-					return (float) (point.y - bounds.y) / (float) bounds.height;
-				}
-				else if (event.item instanceof TableItem) {
-					TableItem tableItem = (TableItem) event.item;
-					Control control = tableItem.getParent();
-					Point point = control.toControl(new Point(event.x, event.y));
-					Rectangle bounds = tableItem.getBounds(0);
-					return (float) (point.y - bounds.y) / (float) bounds.height;
-				}
-				else {
-					return 0.0F;
-				}
-			}
-		};
-	}
-	
-	protected void doRefresh(Object o, boolean fromDelayed) {
-		super.refresh(o);
-	}
-
-	public ISelectionProvider getSelectionProvider() {
-		return fSelectionProvider;
-	}
-
-	public String getTitle() {
-		return XMLEditorMessages.XMLTableTreeViewer_0;
-	}
-
-	protected void handleDispose(DisposeEvent event) {
-		super.handleDispose(event);
-		this.getTree().removePaintListener(fContentPaintListener);
-		setDocument(null);
-	}
-
-	public void setDocument(IDocument document) {
-		/*
-		 * let the text editor to be the one that manages the model's lifetime
-		 */
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-
-			if ((model != null) && (model instanceof IDOMModel)) {
-				Document domDoc = null;
-				domDoc = ((IDOMModel) model).getDocument();
-				setInput(domDoc);
-			}
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-
-	}
-	
-	protected TreeContentHelper treeContentHelper = new TreeContentHelper();
-	protected XMLTableTreePropertyDescriptorFactory propertyDescriptorFactory;
-	
-	private final static String STRUCTURE_PROPERTY = XMLEditorMessages.XMLTreeExtension_0;
-	private final static String VALUE_PROPERTY = XMLEditorMessages.XMLTreeExtension_1;
-	
-	public class XMLCMCellModifier implements ICellModifier, TreeExtension.ICellEditorProvider {
-		public boolean canModify(Object element, String property) {
-			boolean result = false;
-			if (element instanceof Node) {
-				Node node = (Node) element;
-				if (property == VALUE_PROPERTY) {
-					result = treeContentHelper.isEditable(node);
-					if (result) {
-						/* Set up the cell editor based on the element */
-						CellEditor[] editors = getCellEditors();
-						if (editors.length > 0) {
-							if (editors[1] != null)
-								editors[1].dispose();
-							editors[1] = getCellEditor(element, 1);
-						}
-					}
-					
-				}
-			}
-			return result;
-		}
-
-		public Object getValue(Object object, String property) {
-			String result = null;
-			if (object instanceof Node) {
-				result = treeContentHelper.getNodeValue((Node) object);
-			}
-			return (result != null) ? result : ""; //$NON-NLS-1$
-		}
-
-		public void modify(Object element, String property, Object value) {
-			Item item = (Item) element;
-			String oldValue = treeContentHelper.getNodeValue((Node) item.getData());
-			String newValue = value.toString();
-			if ((newValue != null) && !newValue.equals(oldValue)) {
-				treeContentHelper.setNodeValue((Node) item.getData(), value.toString(), getControl().getShell());
-			}
-		}
-
-		public CellEditor getCellEditor(Object o, int col) {
-			IPropertyDescriptor pd = propertyDescriptorFactory.createPropertyDescriptor(o);
-			return pd != null ? pd.createPropertyEditor(XMLTableTreeViewer.this.getTree()) : null;
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTreeExtension.java b/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTreeExtension.java
deleted file mode 100644
index b8601f8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-multipage/org/eclipse/wst/xml/ui/internal/tabletree/XMLTreeExtension.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.tabletree;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Item;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * 
- * @deprecated No longer used
- */
-public class XMLTreeExtension extends TreeExtension {
-
-	public final static String STRUCTURE_PROPERTY = XMLEditorMessages.XMLTreeExtension_0;
-	public final static String VALUE_PROPERTY = XMLEditorMessages.XMLTreeExtension_1;
-
-	protected Composite control;
-	protected MyCellModifier modifier;
-	protected XMLTableTreePropertyDescriptorFactory propertyDescriptorFactory;
-	protected CMDescriptionBuilder decriptionBuilder = new CMDescriptionBuilder();
-	protected TreeContentHelper treeContentHelper = new TreeContentHelper();
-
-	protected Color f1, f2, b1, b2;
-	protected boolean cachedDataIsValid = true;
-
-	public XMLTreeExtension(Tree tree) {
-		super(tree);
-		control = tree;
-		modifier = new MyCellModifier();
-		setCellModifier(modifier);
-		String[] properties = {STRUCTURE_PROPERTY, VALUE_PROPERTY};
-		setColumnProperties(properties);
-
-		/* https://bugs.eclipse.org/bugs/show_bug.cgi?id=185851 - Used to be hardcoded as COLOR_BLACK */
-		f1 = tree.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-		Color background = tree.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-
-		int r = Math.abs(background.getRed() - 125);
-		int g = Math.abs(background.getGreen() - 85);
-		int b = Math.abs(background.getBlue() - 105);
-
-		f2 = new Color(tree.getDisplay(), r, g, b);
-		b1 = tree.getDisplay().getSystemColor(SWT.COLOR_LIST_SELECTION);
-		b2 = background;
-
-		propertyDescriptorFactory = new XMLTableTreePropertyDescriptorFactory();
-	}
-
-	public void dispose() {
-		super.dispose();
-		f2.dispose();
-	}
-
-	public void resetCachedData() {
-		cachedDataIsValid = false;
-	}
-
-	public void paintItems(GC gc, TreeItem[] items, Rectangle treeBounds) {
-		super.paintItems(gc, items, treeBounds);
-		cachedDataIsValid = true;
-	}
-
-	protected Object[] computeTreeExtensionData(Object object) {
-		Color color = f1;
-		String string = ""; //$NON-NLS-1$
-		if (string.length() == 0) {
-			string = (String) modifier.getValue(object, VALUE_PROPERTY);
-			color = f1;
-		}
-		if ((string.length() == 0) && (object instanceof Element)) {
-			string = getElementValueHelper((Element) object);
-			color = f2;
-		}
-		Object[] data = new Object[2];
-		data[0] = string;
-		data[1] = color;
-		return data;
-	}
-
-	protected void paintItem(GC gc, TreeItem item, Rectangle bounds) {
-		super.paintItem(gc, item, bounds);
-		Object[] data = computeTreeExtensionData(item.getData());
-		if ((data != null) && (data.length == 2)) {
-			gc.setClipping(columnPosition, bounds.y + 1, controlWidth, bounds.height);
-			gc.setForeground((Color) data[1]);
-			gc.drawString((String) data[0], columnPosition + 5, bounds.y + 1);
-			gc.setClipping((Rectangle) null);
-		}
-	}
-
-	protected void addEmptyTreeMessage(GC gc) {
-		// here we print a message when the document is empty just to give the
-		// user a visual cue
-		// so that they know how to proceed to edit the blank view
-		gc.setForeground(fTree.getDisplay().getSystemColor(SWT.COLOR_BLACK));
-		gc.setBackground(fTree.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND));
-		gc.drawString(XMLEditorMessages.XMLTreeExtension_3, 10, 10);
-		gc.drawString(XMLEditorMessages.XMLTreeExtension_4, 10, 10 + gc.getFontMetrics().getHeight());
-	}
-
-	public String getElementValueHelper(Element element) {
-		String result = null;
-
-		ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		if ((result == null) && (mq != null)) {
-			CMElementDeclaration ed = mq.getCMElementDeclaration(element);
-			if ((ed != null) && !Boolean.TRUE.equals(ed.getProperty("isInferred"))) { //$NON-NLS-1$
-				result = decriptionBuilder.buildDescription(ed);
-			}
-		}
-		return result != null ? result : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * 
-	 */
-	public class MyCellModifier implements ICellModifier, TreeExtension.ICellEditorProvider {
-		public boolean canModify(Object element, String property) {
-			boolean result = false;
-			if (element instanceof Node) {
-				Node node = (Node) element;
-				result = (property == VALUE_PROPERTY) && treeContentHelper.isEditable(node);
-			}
-			return result;
-		}
-
-		public Object getValue(Object object, String property) {
-			String result = null;
-			if (object instanceof Node) {
-				result = treeContentHelper.getNodeValue((Node) object);
-			}
-			return (result != null) ? result : ""; //$NON-NLS-1$
-		}
-
-		public void modify(Object element, String property, Object value) {
-			// enableNodeSelectionListener(false);
-			Item item = (Item) element;
-			String oldValue = treeContentHelper.getNodeValue((Node) item.getData());
-			String newValue = value.toString();
-			if ((newValue != null) && !newValue.equals(oldValue)) {
-				treeContentHelper.setNodeValue((Node) item.getData(), value.toString());
-			}
-			// enableNodeSelectionListener(true);
-		}
-
-		public CellEditor getCellEditor(Object o, int col) {
-			IPropertyDescriptor pd = propertyDescriptorFactory.createPropertyDescriptor(o);
-			return pd != null ? pd.createPropertyEditor(control) : null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/XMLValidationUIMessages.java b/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/XMLValidationUIMessages.java
deleted file mode 100644
index ff3bea2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/XMLValidationUIMessages.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by XML Validation
- */
-public class XMLValidationUIMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.ui.internal.validation.xmlvalidation"; //$NON-NLS-1$
-
-	private XMLValidationUIMessages() {
-		// cannot create new instance
-	}
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, XMLValidationUIMessages.class);
-	}
-	public static String _UI_REF_FILE_ERROR_DESCRIPTION;
-	public static String _UI_REF_FILE_ERROR_MESSAGE;
-	public static String _UI_REF_FILE_ERROR_DETAILS;
-	public static String _UI_DETAILS_INFORMATION_UNAVAILABLE;
-	public static String _UI_DETAILS_INFO_REVALIDATE_TO_REGENERATE;
-	public static String _UI_SAVE_DIRTY_FILE_MESSAGE;
-	public static String _UI_SAVE_DIRTY_FILE_TITLE;
-	public static String TaskListTableViewer_0;
-	public static String TaskListTableViewer_1;
-	public static String TaskListTableViewer_2;
-	public static String TaskListTableViewer_3;
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/GroupNamePropertyTester.java b/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/GroupNamePropertyTester.java
deleted file mode 100644
index 7c3e9bc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/GroupNamePropertyTester.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.validation.core.errorinfo;
-
-
-import org.eclipse.core.expressions.PropertyTester;
-import org.eclipse.core.resources.IMarker;
-
-
-/**
- * Custom property tester used to determine if the groupName attribute is
- * present on a marker and that its value starts with a given expected value.
- */
-public class GroupNamePropertyTester extends PropertyTester
-{
-  /**
-   * The group name prefix property name.
-   */
-  private static final String GROUP_NAME_PREFIX = "groupNamePrefix"; //$NON-NLS-1$  
-
-  /**
-   * The group name marker attribute.
-   */
-  private static final String GROUP_NAME = "groupName"; //$NON-NLS-1$
-
-  public boolean test(Object receiver, String property, Object[] args, Object expectedValue)
-  {
-    if (GROUP_NAME_PREFIX.equals(property))
-    {
-      if (receiver instanceof IMarker)
-      {
-        IMarker marker = (IMarker)receiver;
-
-        String groupName = marker.getAttribute(GROUP_NAME, null);
-
-        boolean testValue = groupName != null && expectedValue instanceof String && groupName.startsWith((String)expectedValue);
-        return testValue;
-      }
-    }
-
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorDialog.java b/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorDialog.java
deleted file mode 100644
index 4cc9f29..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorDialog.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation.core.errorinfo;
-
-import java.util.List;
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseMoveListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.ui.internal.validation.XMLValidationUIMessages;
-
-
-public class ReferencedFileErrorDialog extends Dialog {
-	protected TaskListTableViewer tableViewer;
-	protected List errorList;
-	protected String markedUpDetailsMessage;
-	protected String contextFile;
-	protected String referencedFile;
-	protected StyledText styledText;
-	protected Text fullFileNameField;
-
-	public ReferencedFileErrorDialog(Shell parentShell, List errorList, String contextFile, String referencedFile) {
-		super(parentShell);
-
-		int styleBits = getShellStyle() | SWT.RESIZE;
-		styleBits &= ~SWT.APPLICATION_MODAL;
-
-		setShellStyle(styleBits);
-		this.errorList = errorList;
-
-		this.referencedFile = referencedFile;
-		this.contextFile = contextFile;
-		this.markedUpDetailsMessage = getMarkedUpDetailsMessage();
-	}
-
-	public int createAndOpen() {
-		create();
-		getShell().setText(XMLValidationUIMessages._UI_REF_FILE_ERROR_DETAILS);
-
-		setBlockOnOpen(false);
-		return open();
-	}
-
-
-	protected Control createButtonBar(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(2, false));
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		fullFileNameField = new Text(composite, SWT.NONE);
-		fullFileNameField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fullFileNameField.setBackground(parent.getBackground());
-		fullFileNameField.setEditable(false);
-
-		super.createButtonBar(composite);
-
-		return composite;
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		dialogArea.setLayout(new GridLayout());
-
-		Composite c = new Composite(dialogArea, SWT.NONE);
-		c.setLayout(new GridLayout());
-		c.setLayoutData(createGridData(true, -1, 200));
-
-		styledText = new StyledText(c, SWT.MULTI | SWT.WRAP);
-		styledText.setBackground(c.getBackground());
-		setStyledText(styledText, markedUpDetailsMessage);
-		styledText.setEditable(false);
-		styledText.setLayoutData(createGridData(false, 650, -1));
-
-		MouseListener mouseListener = new MouseListener();
-		styledText.addMouseMoveListener(mouseListener);
-
-		tableViewer = new TaskListTableViewer(c, 10);
-		tableViewer.setInput(errorList);
-		tableViewer.addSelectionChangedListener(new InternalSelectionListener());
-		tableViewer.getControl().setLayoutData(createGridData(true, 700, -1));
-		return dialogArea;
-	}
-
-	String getFullURI(int offset) {
-		String uri = ""; //$NON-NLS-1$
-		int index = getIndex(offset);
-		if (index != -1) {
-			if ((index == 0) || (index == 2) || (index == 3)) {
-				uri = referencedFile;
-			}
-			else {
-				uri = contextFile;
-			}
-		}
-		return uri;
-	}
-
-	private int getIndex(int offset) {
-		int result = -1;
-		StyleRange[] range = styledText.getStyleRanges();
-		for (int i = 0; i < range.length; i++) {
-			int l = range[i].start;
-			int r = l + range[i].length;
-			if ((l <= offset) && (r >= offset)) {
-				result = i;
-				break;
-			}
-		}
-		return result;
-	}
-
-	class MouseListener implements MouseMoveListener {
-		public void mouseMove(MouseEvent event) {
-			String toolTipText = ""; //$NON-NLS-1$
-			try {
-
-				int offset = styledText.getOffsetAtLocation(new Point(event.x, event.y));
-				toolTipText = getFullURI(offset);
-
-			}
-			catch (Exception e) {
-				// Do nothing.
-			}
-			styledText.setToolTipText(toolTipText);
-			if ((toolTipText != null) && (toolTipText.length() > 0)) {
-				fullFileNameField.setText(toolTipText);
-			}
-		}
-	}
-
-	private String getMarkedUpDetailsMessage() {
-		String detailsMessage = ""; //$NON-NLS-1$
-		// TODO... need to move '_UI_REF_FILE_ERROR_DESCRIPTION' to this
-		// plugin's properties file
-		//			
-		String string = XMLValidationUIMessages._UI_REF_FILE_ERROR_DESCRIPTION;
-		// TODO... need to edit the properties file to remove "'" characters
-		// from the string
-		// I'm using these characters to markup the bold font. It's safer if I
-		// add these programtically.
-		//
-		string = removePattern(string, "'"); //$NON-NLS-1$
-
-		String c = "'" + getLastSegment(contextFile) + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-		String r = "'" + getLastSegment(referencedFile) + "'"; //$NON-NLS-1$ //$NON-NLS-2$
-
-		detailsMessage = NLS.bind(string, new Object[]{r, c, r, c});
-		return detailsMessage;
-	}
-
-	private String removePattern(String string, String pattern) {
-		while (true) {
-			int index = string.indexOf(pattern);
-			if (index != -1) {
-				string = string.substring(0, index) + string.substring(index + pattern.length());
-			}
-			else {
-				break;
-			}
-		}
-		return string;
-	}
-
-	private void setStyledText(StyledText styledText, String text) {
-		String visibleMessage = ""; //$NON-NLS-1$
-		for (StringTokenizer st = new StringTokenizer(markedUpDetailsMessage, "'", false); st.hasMoreTokens();) //$NON-NLS-1$
-		{
-			String token = st.nextToken();
-			visibleMessage += token;
-		}
-
-		styledText.setText(visibleMessage);
-		// dw Font font = styledText.getFont();
-
-		boolean inQuote = false;
-		int position = 0;
-		for (StringTokenizer st = new StringTokenizer(markedUpDetailsMessage, "'", true); st.hasMoreTokens();) //$NON-NLS-1$
-		{
-			String token = st.nextToken();
-
-			if (token.equals("'")) //$NON-NLS-1$
-			{
-				inQuote = !inQuote;
-			}
-			else {
-				if (inQuote) {
-					try {
-
-						StyleRange style = new StyleRange(position, token.length(), styledText.getForeground(), styledText.getBackground(), SWT.BOLD);
-						styledText.setStyleRange(style);
-					}
-					catch (Exception e) {
-						e.printStackTrace();
-					}
-				}
-				position = position + token.length();
-			}
-		}
-	}
-
-	private static GridData createGridData(boolean fillBoth, int w, int h) {
-		GridData gd = new GridData(fillBoth ? GridData.FILL_BOTH : GridData.FILL_HORIZONTAL);
-		gd.widthHint = w;
-		gd.heightHint = h;
-		return gd;
-	}
-
-	private static String getLastSegment(String uri) {
-		String result = uri;
-		int index = Math.max(uri.lastIndexOf("/"), uri.lastIndexOf("\\")); //$NON-NLS-1$ //$NON-NLS-2$
-		if (index != -1) {
-			result = uri.substring(index + 1);
-		}
-		return result;
-	}
-
-	protected class InternalSelectionListener implements ISelectionChangedListener {
-		public void selectionChanged(SelectionChangedEvent event) {
-			ISelection selection = event.getSelection();
-			if (selection instanceof StructuredSelection) {
-				ValidationMessage validationMessage = (ValidationMessage) ((StructuredSelection) selection).getFirstElement();
-				if (validationMessage != null) {
-					String uristring = validationMessage.getUri();
-					ReferencedFileErrorUtility.openEditorAndGotoError(uristring, validationMessage.getLineNumber(), validationMessage.getColumnNumber());
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorUtility.java b/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorUtility.java
deleted file mode 100644
index 378ee89..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorUtility.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation.core.errorinfo;
-
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorRegistry;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.editors.text.TextEditor;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.wst.xml.core.internal.validation.core.logging.LoggerFactory;
-
-
-public class ReferencedFileErrorUtility {
-	public static void openEditorAndGotoError(String uristring, final int line, final int column) {
-		if (uristring != null) {
-			try {
-				URL uri = new URL(uristring);
-				if (uri != null) {
-					if ("file".equals(uri.getProtocol())) //$NON-NLS-1$
-					{
-						String pathString = uri.getPath();
-						IPath path = new Path(pathString);
-						String device = path.getDevice();
-						if ((device != null) && device.startsWith("/")) //$NON-NLS-1$
-						{
-							path = path.setDevice(device.substring(1));
-						}
-						final IFile iFile = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
-						if ((iFile != null) && iFile.exists()) {
-							// Open the editor for this file.
-							final IWorkbench workbench = PlatformUI.getWorkbench();
-							final IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-
-							Display.getDefault().asyncExec(new Runnable() {
-								public void run() {
-									try {
-										IContentType contentType = iFile.getContentDescription().getContentType();
-										IEditorRegistry editorRegistry = workbench.getEditorRegistry();
-										String fileName = iFile.getName();
-										IEditorDescriptor descriptor = editorRegistry.getDefaultEditor(fileName, contentType);
-										String editorId;
-										if (descriptor != null) {
-											editorId = descriptor.getId();
-										}
-										else {
-											descriptor = editorRegistry.getDefaultEditor(fileName + ".txt"); //$NON-NLS-1$
-											editorId = descriptor.getId(); 
-										}
-										
-										if (editorId != null)
-										{
-										  FileEditorInput editorInput = new FileEditorInput(iFile);
-										  IWorkbenchPage activePage = workbenchWindow.getActivePage();
-										  activePage.openEditor(editorInput, editorId);
-										}
-									}
-									catch (Exception ex) {
-										LoggerFactory.getLoggerInstance().logError("Exception encountered when attempting to open file: " + iFile + "\n\n", ex); //$NON-NLS-1$ //$NON-NLS-2$
-									}
-								}
-							});
-
-							Runnable runnable = new Runnable() {
-								public void run() {
-									IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-									gotoError(editorPart, line, column);
-								}
-							};
-							Display.getCurrent().asyncExec(runnable);
-						}
-					}
-				}
-			}
-			catch (Exception e) {
-				// Do nothing.
-			}
-		}
-	}
-
-	static void gotoError(IEditorPart editorPart, int line, int column) {
-		if (editorPart != null) {
-			TextEditor textEditor = (TextEditor) editorPart.getAdapter(TextEditor.class);
-			if (textEditor != null) {
-				try {
-					IDocumentProvider dp = textEditor.getDocumentProvider();
-					IDocument document = (dp != null) ? dp.getDocument(textEditor.getEditorInput()) : null;
-					textEditor.selectAndReveal(document.getLineOffset(line - 1) + column - 1, 0);
-				}
-				catch (BadLocationException x) {
-					// marker refers to invalid text position -> do nothing
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorsHandler.java b/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorsHandler.java
deleted file mode 100644
index 3db6243..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/ReferencedFileErrorsHandler.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.validation.core.errorinfo;
-
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.views.markers.MarkerViewHandler;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.ui.internal.validation.XMLValidationUIMessages;
-
-
-/**
- * Handler for the referenced file errors command. This class replaces the old
- * ReferencedFileErrorActionDelegate.
- */
-public class ReferencedFileErrorsHandler extends MarkerViewHandler
-{
-  public Object execute(ExecutionEvent event) throws ExecutionException
-  {
-    final IMarker[] selectedMarkers = getSelectedMarkers(event);
-
-    IMarker selectedMarker = selectedMarkers[0];
-
-    if (selectedMarker != null)
-    {
-      try
-      {
-
-        IResource resource = selectedMarker.getResource();
-        Map map = (Map)resource.getSessionProperty(ValidationMessage.ERROR_MESSAGE_MAP_QUALIFIED_NAME);
-        if (map == null)
-        {
-          String infoUnavailable = XMLValidationUIMessages._UI_DETAILS_INFORMATION_UNAVAILABLE;
-          String revalidateToRegenerateErrors = XMLValidationUIMessages._UI_DETAILS_INFO_REVALIDATE_TO_REGENERATE;
-          MessageDialog.openInformation(Display.getCurrent().getActiveShell(), infoUnavailable, revalidateToRegenerateErrors);
-        }
-        else
-        {
-          String uri = null;
-
-          String groupName = (String)selectedMarker.getAttribute("groupName"); //$NON-NLS-1$
-          if (groupName.startsWith("referencedFileError")) //$NON-NLS-1$
-          {
-            int index1 = groupName.indexOf("("); //$NON-NLS-1$
-            int index2 = groupName.lastIndexOf(")"); //$NON-NLS-1$
-            if ((index1 != -1) && (index2 > index1))
-            {
-              uri = groupName.substring(index1 + 1, index2);
-            }
-          }
-
-          if (uri != null)
-          {
-            List list = Collections.EMPTY_LIST;
-
-            ValidationMessage message = (ValidationMessage)map.get(uri);
-            if (message != null)
-            {
-              list = message.getNestedMessages();
-            }
-
-            IPath resourceLocation = resource.getLocation();
-            
-            if (resourceLocation != null)
-            {
-              String validatedFileURI = resourceLocation.toOSString();
-              validatedFileURI = "file:/" + validatedFileURI; //$NON-NLS-1$
-
-              ReferencedFileErrorDialog dialog = new ReferencedFileErrorDialog(
-                HandlerUtil.getActiveShell(event),
-                list,
-                validatedFileURI,
-                uri);
-              dialog.createAndOpen();
-            }
-          }
-        }
-      }
-      catch (CoreException e)
-      {
-        // Do nothing.
-      }
-    }
-
-    return this;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/TaskListTableViewer.java b/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/TaskListTableViewer.java
deleted file mode 100644
index 433edf7..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/core/errorinfo/TaskListTableViewer.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation.core.errorinfo;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.validation.XMLValidationUIMessages;
-
-
-
-public class TaskListTableViewer extends TableViewer {
-	protected static final int COLUMN_ICON = 0;
-	protected static final int COLUMN_DESCRIPTION = 1;
-	protected static final int COLUMN_RESOURCE = 3;
-	protected static final int COLUMN_LOCATION = 2;
-
-	protected static final String LABEL_ICON = ""; //$NON-NLS-1$
-	protected static final String LABEL_DESCRIPTION = XMLValidationUIMessages.TaskListTableViewer_0;
-	protected static final String LABEL_RESOURCE = XMLValidationUIMessages.TaskListTableViewer_1;
-	protected static final String LABEL_LOCATION = XMLValidationUIMessages.TaskListTableViewer_2;
-
-	protected int visibleRows = -1;
-
-	protected int getColumnWidth(int column) {
-		int result = 0;
-		switch (column) {
-			case COLUMN_ICON : {
-				result = 1;
-				break;
-			}
-			case COLUMN_DESCRIPTION : {
-				result = 20;
-				break;
-			}
-			case COLUMN_RESOURCE : {
-				result = 3;
-				break;
-			}
-			case COLUMN_LOCATION : {
-				result = 3;
-				break;
-			}
-		}
-		return result;
-	}
-
-	public TaskListTableViewer(Composite parent, int visibleRows) {
-		this(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER, visibleRows);
-	}
-
-	public TaskListTableViewer(Composite parent, int style, int visibleRows) {
-		super(new Table(parent, style));
-		getTable().setLinesVisible(true);
-
-		Provider provider = new Provider();
-		setContentProvider(provider);
-		setLabelProvider(provider);
-
-		String[] columnPropertiesArray = {LABEL_ICON, LABEL_DESCRIPTION, LABEL_LOCATION};
-		setColumnProperties(columnPropertiesArray);
-
-		Table table = getTable();
-		table.setHeaderVisible(true);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		TableLayout layout = new TableLayout();
-
-		for (int i = 0; i < columnPropertiesArray.length; i++) {
-			TableColumn column = new TableColumn(table, i);
-			column.setText(columnPropertiesArray[i]);
-			column.setAlignment(SWT.LEFT);
-			layout.addColumnData(new ColumnWeightData(getColumnWidth(i), true));
-		}
-
-		table.setLayout(layout);
-
-		this.visibleRows = visibleRows;
-	}
-
-	/**
-	 * NamespaceInfoTableLabelProvider
-	 */
-	protected class Provider extends LabelProvider implements ITableLabelProvider, IStructuredContentProvider {
-		Viewer viewer;
-		Image errorImage;
-		Image warnImage;
-
-		public Provider() {
-			errorImage = XMLUIPlugin.getInstance().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-
-			warnImage = XMLUIPlugin.getInstance().getImage(ISharedImages.IMG_OBJS_WARN_TSK);
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			this.viewer = viewer;
-		}
-
-		public Object[] getElements(Object inputElement) {
-			List list = (List) viewer.getInput();
-			return list != null ? list.toArray() : null;
-		}
-
-		public Image getColumnImage(Object object, int columnIndex) {
-			ValidationMessage validationMessage = (ValidationMessage) object;
-			Image result = null;
-			if (columnIndex == 0) {
-				int severity = validationMessage.getSeverity();
-				if ((severity == IMessage.HIGH_SEVERITY) || (severity == IMessage.NORMAL_SEVERITY)) {
-					result = errorImage;
-				}
-				else {
-					result = warnImage;
-				}
-			}
-			return result;
-		}
-
-		public String getColumnText(Object object, int column) {
-			ValidationMessage errorMessage = (ValidationMessage) object;
-			String result = ""; //$NON-NLS-1$
-			switch (column) {
-				case COLUMN_DESCRIPTION : {
-					result = errorMessage.getMessage();
-					break;
-				}
-				case COLUMN_LOCATION : {
-					result = XMLValidationUIMessages.TaskListTableViewer_3 + errorMessage.getLineNumber();
-					break;
-				}
-			}
-			return result;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/xmlvalidation.properties b/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/xmlvalidation.properties
deleted file mode 100644
index c35c849..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-validation/org/eclipse/wst/xml/ui/internal/validation/xmlvalidation.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-### Constants for strings  
-
-#
-# Referenced File Dialog Related Message
-#
-_UI_REF_FILE_ERROR_DESCRIPTION      = The errors below were detected when validating the file "{0}" via the file "{1}".  In most cases these errors can be detected by validating "{2}" directly.  However it is possible that errors will only occur when {2} is validated in the context of {3}.
-_UI_REF_FILE_ERROR_MESSAGE          = Referenced file contains errors ({0}).  For more information, right click on the message and select "Show Details..."
-_UI_REF_FILE_ERROR_DETAILS          = Referenced File Error Details
-
-_UI_DETAILS_INFORMATION_UNAVAILABLE       = Details Information Unavailable
-_UI_DETAILS_INFO_REVALIDATE_TO_REGENERATE = Details information currently unavailable.  Please revalidate the file to regenerate the error details.
-
-#
-# Dirty File Dialog Related Messages
-#
-TaskListTableViewer_0=Description
-TaskListTableViewer_1=Resource
-TaskListTableViewer_2=Location
-TaskListTableViewer_3=line 
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationOperation.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationOperation.java
deleted file mode 100644
index cd809c7..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationOperation.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.zip.ZipFile;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.wizards.datatransfer.ImportOperation;
-import org.eclipse.ui.wizards.datatransfer.ZipFileStructureProvider;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.osgi.framework.Bundle;
-
-public class ExampleProjectCreationOperation implements IRunnableWithProgress {
-
-	private IResource elementToOpen;
-
-	private IOverwriteQuery overwriteQuery;
-
-	private ExampleProjectCreationWizardPage[] pages;
-
-	/**
-	 * Constructor for ExampleProjectCreationOperation
-	 */
-	public ExampleProjectCreationOperation(ExampleProjectCreationWizardPage[] myPages, IOverwriteQuery myOverwriteQuery) {
-		elementToOpen = null;
-		pages = myPages;
-		overwriteQuery = myOverwriteQuery;
-	}
-
-	private IProject configNewProject(IWorkspaceRoot root, String name, String[] natureIds, IProject[] referencedProjects, IProgressMonitor monitor) throws InvocationTargetException {
-		try {
-			IProject project = root.getProject(name);
-			if (!project.exists()) {
-				project.create(null);
-			}
-			if (!project.isOpen()) {
-				project.open(null);
-			}
-			IProjectDescription desc = project.getDescription();
-			desc.setLocation(null);
-			desc.setNatureIds(natureIds);
-			desc.setReferencedProjects(referencedProjects);
-
-			project.setDescription(desc, new SubProgressMonitor(monitor, 1));
-
-			return project;
-		}
-		catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	private void createProject(IWorkspaceRoot root, ExampleProjectCreationWizardPage page, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		IConfigurationElement desc = page.getConfigurationElement();
-
-		IConfigurationElement[] imports = desc.getChildren("import"); //$NON-NLS-1$
-		IConfigurationElement[] natures = desc.getChildren("nature"); //$NON-NLS-1$
-		IConfigurationElement[] references = desc.getChildren("references"); //$NON-NLS-1$
-		int nImports = (imports == null) ? 0 : imports.length;
-		int nNatures = (natures == null) ? 0 : natures.length;
-		int nReferences = (references == null) ? 0 : references.length;
-
-		monitor.beginTask(XMLWizardsMessages.ExampleProjectCreationOperation_op_desc_proj, nImports + 1);
-
-		String name = page.getProjectName();
-
-		String[] natureIds = new String[nNatures];
-		for (int i = 0; i < nNatures; i++) {
-			natureIds[i] = natures[i].getAttribute("id"); //$NON-NLS-1$
-		}
-		IProject[] referencedProjects = new IProject[nReferences];
-		for (int i = 0; i < nReferences; i++) {
-			referencedProjects[i] = root.getProject(references[i].getAttribute("id")); //$NON-NLS-1$
-		}
-
-		IProject proj = configNewProject(root, name, natureIds, referencedProjects, monitor);
-
-		for (int i = 0; i < nImports; i++) {
-			doImports(proj, imports[i], new SubProgressMonitor(monitor, 1));
-		}
-
-		String open = desc.getAttribute("open"); //$NON-NLS-1$
-		if ((open != null) && (open.length() > 0)) {
-			IResource fileToOpen = proj.findMember(new Path(open));
-			if (fileToOpen != null) {
-				elementToOpen = fileToOpen;
-			}
-		}
-
-	}
-
-	private void doImports(IProject project, IConfigurationElement curr, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		try {
-			IPath destPath;
-			String name = curr.getAttribute("dest"); //$NON-NLS-1$
-			if ((name == null) || (name.length() == 0)) {
-				destPath = project.getFullPath();
-			}
-			else {
-				IFolder folder = project.getFolder(name);
-				if (!folder.exists()) {
-					folder.create(true, true, null);
-				}
-				destPath = folder.getFullPath();
-			}
-			String importPath = curr.getAttribute("src"); //$NON-NLS-1$
-			if (importPath == null) {
-				importPath = ""; //$NON-NLS-1$
-				Logger.log(Logger.ERROR, "projectsetup descriptor: import missing"); //$NON-NLS-1$
-				return;
-			}
-
-			ZipFile zipFile = getZipFileFromPluginDir(importPath, getContributingPlugin(curr));
-			importFilesFromZip(zipFile, destPath, new SubProgressMonitor(monitor, 1));
-		}
-		catch (CoreException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	private String getContributingPlugin(IConfigurationElement configurationElement) {
-		Object parent = configurationElement;
-		while (parent != null) {
-			if (parent instanceof IExtension) {
-				return ((IExtension) parent).getNamespace();
-			}
-			parent = ((IConfigurationElement) parent).getParent();
-		}
-		return null;
-	}
-
-	public IResource getElementToOpen() {
-		return elementToOpen;
-	}
-
-	private ZipFile getZipFileFromPluginDir(String pluginRelativePath, String symbolicName) throws CoreException {
-		try {
-			Bundle bundle = Platform.getBundle(symbolicName);
-			URL starterURL = new URL(bundle.getEntry("/"), pluginRelativePath); //$NON-NLS-1$
-			return new ZipFile(Platform.asLocalURL(starterURL).getFile());
-		}
-		catch (IOException e) {
-			String message = pluginRelativePath + ": " + e.getMessage(); //$NON-NLS-1$
-			Status status = new Status(IStatus.ERROR, XMLUIPlugin.ID, IStatus.ERROR, message, e);
-			throw new CoreException(status);
-		}
-	}
-
-	private void importFilesFromZip(ZipFile srcZipFile, IPath destPath, IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		ZipFileStructureProvider structureProvider = new ZipFileStructureProvider(srcZipFile);
-		ImportOperation op = new ImportOperation(destPath, structureProvider.getRoot(), structureProvider, overwriteQuery);
-		op.run(monitor);
-	}
-
-	/*
-	 * @see IRunnableWithProgress#run(IProgressMonitor)
-	 */
-	public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
-		if (monitor == null) {
-			monitor = new NullProgressMonitor();
-		}
-		try {
-			monitor.beginTask(XMLWizardsMessages.ExampleProjectCreationOperation_op_desc, pages.length);
-			IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-
-			for (int i = 0; i < pages.length; i++) {
-				createProject(root, pages[i], new SubProgressMonitor(monitor, 1));
-			}
-		}
-		finally {
-			monitor.done();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationWizard.java
deleted file mode 100644
index d968c92..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationWizard.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExecutableExtension;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation;
-import org.eclipse.ui.dialogs.IOverwriteQuery;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.wizards.newresource.BasicNewProjectResourceWizard;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-public class ExampleProjectCreationWizard extends Wizard implements INewWizard, IExecutableExtension {
-
-	private class ImportOverwriteQuery implements IOverwriteQuery {
-
-		private int openDialog(final String file) {
-			final int[] result = {IDialogConstants.CANCEL_ID};
-			getShell().getDisplay().syncExec(new Runnable() {
-				public void run() {
-					String title = XMLWizardsMessages.ExampleProjectCreationWizard_overwritequery_title;
-					String msg = NLS.bind(XMLWizardsMessages.ExampleProjectCreationWizard_overwritequery_message, file);
-					String[] options = {IDialogConstants.YES_LABEL, IDialogConstants.NO_LABEL, IDialogConstants.YES_TO_ALL_LABEL, IDialogConstants.CANCEL_LABEL};
-					MessageDialog dialog = new MessageDialog(getShell(), title, null, msg, MessageDialog.QUESTION, options, 0);
-					result[0] = dialog.open();
-				}
-			});
-			return result[0];
-		}
-
-		public String queryOverwrite(String file) {
-			String[] returnCodes = {YES, NO, ALL, CANCEL};
-			int returnVal = openDialog(file);
-			return returnVal < 0 ? CANCEL : returnCodes[returnVal];
-		}
-	}
-
-	private IConfigurationElement wizardConfigElement;
-	private IConfigurationElement exampleConfigElement;
-
-	private String EXAMPLE_WIZARD_XP_ID = "org.eclipse.wst.common.ui.exampleProjectCreationWizard"; //$NON-NLS-1$
-
-	private ExampleProjectCreationWizardPage[] pages;
-
-	private final String WEB_BROWSER_ID = "org.eclipse.ui.browser.editor"; //$NON-NLS-1$
-
-	public ExampleProjectCreationWizard() {
-		super();
-		setDialogSettings(XMLUIPlugin.getDefault().getDialogSettings());
-		setWindowTitle(XMLWizardsMessages.ExampleProjectCreationWizard_title);
-		setNeedsProgressMonitor(true);
-	}
-
-	/*
-	 * @see Wizard#addPages
-	 */
-	public void addPages() {
-		super.addPages();
-
-		if (exampleConfigElement == null) {
-			return;
-		}
-		IConfigurationElement[] children = exampleConfigElement.getChildren("projectsetup"); //$NON-NLS-1$
-		if ((children == null) || (children.length == 0)) {
-			Logger.log(Logger.ERROR, "descriptor must contain one ore more projectsetup tags"); //$NON-NLS-1$
-			return;
-		}
-
-		pages = new ExampleProjectCreationWizardPage[children.length];
-
-		for (int i = 0; i < children.length; i++) {
-			pages[i] = new ExampleProjectCreationWizardPage(i, children[i]);
-			addPage(pages[i]);
-		}
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		if (exampleConfigElement != null) {
-			String banner = exampleConfigElement.getAttribute("banner"); //$NON-NLS-1$
-			if (banner != null) {
-				URL imageURL = Platform.find(Platform.getBundle(exampleConfigElement.getDeclaringExtension().getNamespace()), new Path(banner));
-				ImageDescriptor desc = ImageDescriptor.createFromURL(imageURL);
-				setDefaultPageImageDescriptor(desc);
-			}
-		}
-	}
-
-	protected IConfigurationElement[] getExtendedConfigurationElements() {
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint exampleWizardXP = registry.getExtensionPoint(EXAMPLE_WIZARD_XP_ID);
-		if (exampleWizardXP == null) {
-			return new IConfigurationElement[0];
-		}
-		IExtension extension = exampleWizardXP.getExtension(getWizardExtensionId());
-		if (extension != null) {
-			return extension.getConfigurationElements();
-		}
-		IConfigurationElement[] exampleWizardCEs = exampleWizardXP.getConfigurationElements();
-		return exampleWizardCEs;
-	}
-
-	private void handleException(Throwable target) {
-		String title = XMLWizardsMessages.ExampleProjectCreationWizard_op_error_title;
-		String message = XMLWizardsMessages.ExampleProjectCreationWizard_op_error_message;
-		if (target instanceof CoreException) {
-			IStatus status = ((CoreException) target).getStatus();
-			ErrorDialog.openError(getShell(), title, message, status);
-			Logger.logException(status.getMessage(), status.getException());
-		}
-		else {
-			MessageDialog.openError(getShell(), title, target.getMessage());
-			Logger.logException(target);
-		}
-	}
-
-	private void openResource(final IResource resource) {
-		if (resource.getType() != IResource.FILE) {
-			return;
-		}
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window == null) {
-			return;
-		}
-		final IWorkbenchPage activePage = window.getActivePage();
-		if (activePage != null) {
-			final Display display = getShell().getDisplay();
-			display.asyncExec(new Runnable() {
-				public void run() {
-					try {
-						IDE.openEditor(activePage, (IFile) resource, WEB_BROWSER_ID, true);
-					}
-					catch (PartInitException e) {
-						Logger.logException(e);
-					}
-				}
-			});
-			BasicNewResourceWizard.selectAndReveal(resource, activePage.getWorkbenchWindow());
-		}
-	}
-
-	/*
-	 * @see Wizard#performFinish
-	 */
-	public boolean performFinish() {
-		ExampleProjectCreationOperation runnable = new ExampleProjectCreationOperation(pages, new ImportOverwriteQuery());
-
-		IRunnableWithProgress op = new WorkspaceModifyDelegatingOperation(runnable);
-		try {
-			getContainer().run(false, true, op);
-		}
-		catch (InvocationTargetException e) {
-			handleException(e.getTargetException());
-			return false;
-		}
-		catch (InterruptedException e) {
-			return false;
-		}
-		BasicNewProjectResourceWizard.updatePerspective(wizardConfigElement);
-		IResource res = runnable.getElementToOpen();
-		if (res != null) {
-			openResource(res);
-		}
-		return true;
-	}
-
-	/**
-	 * Stores the configuration element for the wizard. The config element
-	 * will be used in <code>performFinish</code> to set the result
-	 * perspective.
-	 */
-	public void setInitializationData(IConfigurationElement cfig, String propertyName, Object data) {
-		wizardConfigElement = cfig;
-		String title = wizardConfigElement.getAttribute("name"); //$NON-NLS-1$
-		if (title != null) {
-			setWindowTitle(title);
-		}
-		String wizardId = getWizardExtensionId();
-		IConfigurationElement[] exampleWizardCEs = getExtendedConfigurationElements();
-		for (int i = 0; i < exampleWizardCEs.length; i++) {
-			IConfigurationElement element = exampleWizardCEs[i];
-			String extWizardId = element.getAttribute("id"); //$NON-NLS-1$
-			if ((wizardId != null) && (extWizardId != null) && wizardId.equals(extWizardId)) {
-				exampleConfigElement = element;
-			}
-		}
-		// initializeDefaultPageImageDescriptor();
-	}
-
-	public String getWizardExtensionId() {
-		return wizardConfigElement.getAttribute("id"); //$NON-NLS-1$
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationWizardPage.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationWizardPage.java
deleted file mode 100644
index 3f13b33..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExampleProjectCreationWizardPage.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-public class ExampleProjectCreationWizardPage extends WizardNewProjectCreationPage {
-
-	private IConfigurationElement configurationElement;
-
-	public ExampleProjectCreationWizardPage(int pageNumber, IConfigurationElement elem) {
-
-		super("page" + pageNumber); //$NON-NLS-1$
-		configurationElement = elem;
-
-		String name = getAttribute(elem, "name"); //$NON-NLS-1$
-		setInitialProjectName(calculateInitialProjectName(name));
-
-		setDescription(getAttribute(configurationElement, "pagedescription")); //$NON-NLS-1$
-		setTitle(getAttribute(configurationElement, "pagetitle")); //$NON-NLS-1$
-
-	}
-
-	/*
-	 * Set the default project name that is to appear on the initialPage page
-	 * of this wizard.
-	 */
-	protected String calculateInitialProjectName(String projectName) {
-		IProject projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-		if (!projectHandle.exists()) {
-			return projectName;
-		}
-		// Change the name until it doesn't exists. Try 9 times and then
-		// give up.
-		for (int i = 1; i < 10; i++) {
-			projectHandle = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName + i);
-			if (!projectHandle.exists()) {
-				return projectName + i;
-			}
-		}
-		return projectName + "9"; //$NON-NLS-1$
-
-	}
-
-	private String getAttribute(IConfigurationElement elem, String tag) {
-		String res = elem.getAttribute(tag);
-		if (res == null) {
-			return '!' + tag + '!';
-		}
-		return res;
-	}
-
-
-
-	/**
-	 * Returns the configuration element of this page.
-	 * 
-	 * @return Returns a IConfigurationElement
-	 */
-	public IConfigurationElement getConfigurationElement() {
-		return configurationElement;
-	}
-
-	/**
-	 * @see org.eclipse.ui.dialogs.WizardNewProjectCreationPage#validatePage()
-	 */
-	protected boolean validatePage() {
-		if (!super.validatePage()) {
-			return false;
-		}
-
-		String projectName = getProjectName();
-		if (projectName == null) {
-			return false;
-		}
-
-		IWizard wizard = getWizard();
-		if (wizard instanceof ExampleProjectCreationWizard) {
-			IWizardPage[] pages = wizard.getPages();
-			for (int i = 0; i < pages.length; i++) {
-				if ((pages[i] != this) && (pages[i] instanceof ExampleProjectCreationWizardPage)) {
-					if (projectName.equals(((ExampleProjectCreationWizardPage) pages[i]).getProjectName())) {
-						setErrorMessage(XMLWizardsMessages.ExampleProjectCreationWizardPage_error_alreadyexists);
-						return false;
-					}
-				}
-			}
-		}
-
-		return true;
-	}
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExportXMLCatalogWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExportXMLCatalogWizard.java
deleted file mode 100644
index 478d459..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ExportXMLCatalogWizard.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Standards for Technology in Automotive Retail (STAR) 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:
- *     David Carver/STAR - dcarver@starstandard.org/d_a_carver@yahoo.com - bug 192568
- *            Initial API - This implements the functionality of the
- *            old Export Dialog for the XML Catalog. 
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.io.File;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IExportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.wizards.newresource.BasicNewFileResourceWizard;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-public class ExportXMLCatalogWizard extends BasicNewFileResourceWizard implements IExportWizard {
-
-	protected WizardNewFileCreationPage exportPage = null;
-	protected ICatalog workingUserCatalog = null;
-	protected ICatalog userCatalog = null;
-	
-	public ExportXMLCatalogWizard() {
-		setWindowTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_TITLE);
-		ImageDescriptor descriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_WIZBAN_GENERATEXML);
-		setDefaultPageImageDescriptor(descriptor);
-		ICatalog defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-		for (int i = 0; i < nextCatalogs.length; i++) {
-			INextCatalog catalog = nextCatalogs[i];
-			ICatalog referencedCatalog = catalog.getReferencedCatalog();
-			if (referencedCatalog != null) {
-				if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId())) {
-					userCatalog = referencedCatalog;
-				}
-			}
-		}
-		CatalogSet tempCatalogSet = new CatalogSet();
-		workingUserCatalog = tempCatalogSet.lookupOrCreateCatalog("working", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		workingUserCatalog.addEntriesFromCatalog(userCatalog);
-
-	}
-
-	public boolean performFinish() {
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IWorkspaceRoot workspaceRoot = workspace.getRoot();
-		String workspacePath = workspaceRoot.getLocation().toOSString();
-		String fullPath = workspacePath + exportPage.getContainerFullPath().toOSString();
-		String requiredString=fullPath + File.separator + exportPage.getFileName();
-		try {
-			IFile file = exportPage.createNewFile();
-			workingUserCatalog.setLocation(requiredString);
-			workingUserCatalog.save();
-			file.refreshLocal(IResource.DEPTH_ZERO, null);
-		} catch (Exception ex) {
-			return false;
-		}
-		return true;
-	}
-	
-	public void addPages() {
-		exportPage = new WizardNewFileCreationPage("XML Catalog Export",  getSelection());
-		exportPage.setTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_TITLE);
-		exportPage.setDescription(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_DESCRIPTION);
-		exportPage.setFileExtension("xml"); //$NON-NLS-1$
-		
-		addPage(exportPage);
-	}
-	
-	public void init(IWorkbench workbench, IStructuredSelection currentSelection) {
-		super.init(workbench, currentSelection);
-		setWindowTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_EXPORT_TITLE);
-		ImageDescriptor descriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_WIZBAN_GENERATEXML);
-		setDefaultPageImageDescriptor(descriptor);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/IXMLWizardHelpContextIds.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/IXMLWizardHelpContextIds.java
deleted file mode 100644
index e342efa..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/IXMLWizardHelpContextIds.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-/**
- * Help context ids for the xml wizard.
- * <p>
- * This interface contains constants only; it is not intended to be
- * implemented.
- * </p>
- */
-interface IXMLWizardHelpContextIds {
-	// org.eclipse.wst.xml.ui.
-	public static final String PREFIX = XMLUIPlugin.ID + "."; //$NON-NLS-1$
-	// Create XML file from a DTD file radio
-	public static final String XML_NEWWIZARD_CREATEXML1_HELPID = PREFIX + "xmlc0101"; //$NON-NLS-1$
-	// Create XML file from an XML schema file radio button
-	public static final String XML_NEWWIZARD_CREATEXML2_HELPID = PREFIX + "xmlc0102"; //$NON-NLS-1$
-	// Create XML file from scratch radio button
-	public static final String XML_NEWWIZARD_CREATEXML3_HELPID = PREFIX + "xmlc0103"; //$NON-NLS-1$
-	// Select Source file page
-	public static final String XML_NEWWIZARD_SELECTSOURCE_HELPID = PREFIX + "xmlc0500"; //$NON-NLS-1$
-	// Root element for both DTD and XML schema
-	public static final String XML_NEWWIZARD_SELECTROOTELEMENT_HELPID = PREFIX + "xmlc0410"; //$NON-NLS-1$
-	// Create Optional Attributes
-	public static final String XML_NEWWIZARD_SELECTROOTELEMENT1_HELPID = PREFIX + "xmlc0441"; //$NON-NLS-1$
-	// Create Optional Elements
-	public static final String XML_NEWWIZARD_SELECTROOTELEMENT2_HELPID = PREFIX + "xmlc0442"; //$NON-NLS-1$
-	// Create first choice of required choice
-	public static final String XML_NEWWIZARD_SELECTROOTELEMENT3_HELPID = PREFIX + "xmlc0443"; //$NON-NLS-1$
-	// Fill elements and attribute with data
-	public static final String XML_NEWWIZARD_SELECTROOTELEMENT4_HELPID = PREFIX + "xmlc0444"; //$NON-NLS-1$
-	// System ID for DTD
-	public static final String XML_NEWWIZARD_SELECTROOTELEMENT5_HELPID = PREFIX + "xmlc0210"; //$NON-NLS-1$
-	// Public ID for DTD
-	public static final String XML_NEWWIZARD_SELECTROOTELEMENT6_HELPID = PREFIX + "xmlc0220"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogPage.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogPage.java
deleted file mode 100644
index 38e3447..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogPage.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 Standards for Technology in Automotive Retail (STAR) 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:
- *     David Carver/STAR - dcarver@starstandard.org/d_a_carver@yahoo.com - bug 192568
- *            Initial API - This implements the functionality of the
- *            old Import Dialog for the XML Catalog. 
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.common.ui.internal.viewers.SelectSingleFileView;
-
-public class ImportXMLCatalogPage extends WizardPage {
-
-	protected SelectSingleFileView selectSingleFileView;
-	protected IStructuredSelection selection;
-	
-
-	public ImportXMLCatalogPage() {
-		super(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_TITLE);
-		setTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_TITLE);
-		selection = new StructuredSelection();
-		selectSingleFileView = new SelectSingleFileView(selection, false) {
-			public void createFilterControl(Composite composite) {
-				ImportXMLCatalogPage.this.createFilterControl(composite);
-			}
-		};
-
-	}
-
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NULL);
-		composite.setLayout(new GridLayout());
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.widthHint = 350;
-		gd.heightHint = 350;
-		composite.setLayoutData(gd);
-		String[] extensions = { ".xmlcatalog", ".xml" }; //$NON-NLS-1$ //$NON-NLS-2$
-		selectSingleFileView.addFilterExtensions(extensions);
-		selectSingleFileView.createControl(composite);
-		selectSingleFileView.setVisibleHelper(true);
-		selectSingleFileView.addSelectionChangedTreeListener(new ISelectionChangedListener(){
-			public void selectionChanged(SelectionChangedEvent event) {
-				ImportXMLCatalogPage.this.setPageComplete(selectSingleFileView.getFile() != null);
-			}
-		});
-		setControl(composite);
-	}
-
-	public void createFilterControl(Composite composite) {
-	}
-
-	public IFile getFile() {
-		return selectSingleFileView.getFile();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogWizard.java
deleted file mode 100644
index f1200a2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/ImportXMLCatalogWizard.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail (STAR) 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:
- *     David Carver/STAR - dcarver@starstandard.org/d_a_carver@yahoo.com - bug 192568
- *            Initial API - This implements the functionality of the
- *            old Import Dialog for the XML Catalog. 
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IImportWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogMessages;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-public class ImportXMLCatalogWizard extends Wizard implements IImportWizard {
-
-	protected ImportXMLCatalogPage importPage = null;
-	protected ICatalog workingUserCatalog = null;
-	protected ICatalog userCatalog = null;
-	
-	public ImportXMLCatalogWizard() {
-		setWindowTitle(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_TITLE);
-		ImageDescriptor descriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_WIZBAN_GENERATEXML);
-		setDefaultPageImageDescriptor(descriptor);
-		ICatalog defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-		for (int i = 0; i < nextCatalogs.length; i++) {
-			INextCatalog catalog = nextCatalogs[i];
-			ICatalog referencedCatalog = catalog.getReferencedCatalog();
-			if (referencedCatalog != null) {
-				if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId())) {
-					userCatalog = referencedCatalog;
-				}
-			}
-		}
-
-		CatalogSet tempCatalogSet = new CatalogSet();
-		workingUserCatalog = tempCatalogSet.lookupOrCreateCatalog("working", ""); //$NON-NLS-1$ //$NON-NLS-2$
-		workingUserCatalog.addEntriesFromCatalog(userCatalog);
-	}
-	
-	public boolean canFinish() {
-		return importPage.isPageComplete();
-	}
-
-	public boolean performFinish() {
-		IFile file = importPage.getFile();
-		if (file != null) {
-			String fileName = file.getLocation().toFile().toURI().toString();
-			try {
-				CatalogSet tempResourceSet = new CatalogSet();
-				ICatalog newCatalog = tempResourceSet.lookupOrCreateCatalog("temp", fileName); //$NON-NLS-1$
-				
-				workingUserCatalog.addEntriesFromCatalog(newCatalog);
-				userCatalog.clear();
-				userCatalog.addEntriesFromCatalog(workingUserCatalog);
-				userCatalog.save();
-			}
-			catch (Exception e) {
-				return false;
-			}
-		}
-		
-		return true;
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		// TODO Auto-generated method stub
-
-	}
-	
-	public void addPages() {
-		importPage = new ImportXMLCatalogPage();
-		importPage.setTitle(XMLCatalogMessages.UI_LABEL_IMPORT_DIALOG_HEADING);
-		importPage.setDescription(XMLWizardsMessages._UI_DIALOG_XMLCATALOG_IMPORT_DESCRIPTION);
-		importPage.setMessage(XMLCatalogMessages.UI_LABEL_IMPORT_DIALOG_MESSAGE);
-		addPage(importPage);
-		importPage.setPageComplete(false);
-	}
-}
-
-
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
deleted file mode 100644
index 09eed81..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NamespaceInfoContentBuilder.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.ContentBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-
-public class NamespaceInfoContentBuilder extends ContentBuilder {
-	protected int count = 1;
-	public List list = new Vector();
-	protected Hashtable table = new Hashtable();
-
-	public NamespaceInfoContentBuilder() {
-		super();
-	}
-
-	public void visitCMElementDeclaration(CMElementDeclaration ed) {
-		if (ed.getProperty("http://org.eclipse.wst/cm/properties/definitionInfo") != null) //$NON-NLS-1$
-		{
-			super.visitCMElementDeclaration(ed);
-		}
-	}
-
-	protected void createAnyElementNode(CMAnyElement anyElement) {
-		String uri = anyElement.getNamespaceURI();
-		if ((uri != null) && !uri.startsWith("##")) //$NON-NLS-1$
-		{
-			if (table.get(uri) == null) {
-				NamespaceInfo info = new NamespaceInfo();
-				info.uri = uri;
-				info.prefix = "p" + count++; //$NON-NLS-1$
-				table.put(uri, info);
-				list.add(info);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewModelWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewModelWizard.java
deleted file mode 100644
index 9cfcd23..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewModelWizard.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-
-public class NewModelWizard extends Wizard implements INewWizard {
-
-	protected IStructuredSelection fSelection;
-	protected IWorkbench fWorkbench;
-	protected String fCurrentDirectory;
-
-	public NewModelWizard() {
-		super();
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.fWorkbench = workbench;
-		this.fSelection = selection;
-	}
-
-	public boolean performFinish() {
-		boolean result = true;
-		WizardPage currentPage = (WizardPage) getContainer().getCurrentPage();
-		if (currentPage != null) {
-			result = currentPage.isPageComplete();
-		}
-		return result;
-	}
-
-	/**
-	 * showFileDialog
-	 */
-	public FileDialog showFileDialog(Shell shell, String defaultDirectory, String defaultFile, String[] filterExtensions) {
-		FileDialog fileDialog = new FileDialog(shell, SWT.OPEN);
-
-		// Get the last visit directory if we haven't defined a particular one
-		// here.
-		if ((defaultDirectory == null) || (defaultDirectory.length() == 0)) {
-			// defaultDirectory =
-			// Locate.instance(this).getLastSelectedDirectory(getResourcePath());
-		}
-
-		if ((defaultDirectory != null) && (defaultDirectory.length() != 0)) {
-			fileDialog.setFilterPath(defaultDirectory);
-		}
-
-		fileDialog.setFileName(defaultFile);
-		fileDialog.setFilterExtensions(filterExtensions);
-
-		fileDialog.open();
-
-		return fileDialog;
-	}
-
-
-	public void setCurrentDirectory(String currentDirectory1) {
-		this.fCurrentDirectory = currentDirectory1;
-	}
-
-
-	public void createWorkbenchResource(IContainer container, String fileName) {
-		IPath path = container.getFullPath();
-		path = path.append(fileName);
-		IFile file = container.getWorkspace().getRoot().getFile(path);
-		if (!file.exists()) {
-			try {
-				file.create(null, true, null);
-			}
-			catch (CoreException e) {
-				// XMLBuilderPlugin.getPlugin().getMsgLogger().write("Encountered
-				// exception creating file: " + e.getMessage());
-			}
-		}
-	}
-
-	/**
-	 * StartPage
-	 */
-	public class StartPage extends WizardPage implements Listener {
-		protected int selectedButton;
-		protected String[] radioButtonLabel;
-		protected Button[] radioButton;
-
-		public StartPage(String pageName, String[] radioButtonLabel) {
-			super(pageName);
-			this.radioButtonLabel = radioButtonLabel;
-			radioButton = new Button[radioButtonLabel.length];
-		}
-
-		public Button getRadioButtonAtIndex(int i) {
-			Button result = null;
-			if ((i >= 0) && (i < radioButton.length)) {
-				result = radioButton[i];
-			}
-			return result;
-		}
-
-		public int getSelectedRadioButtonIndex() {
-			int result = -1;
-			for (int i = 0; i < radioButton.length; i++) {
-				if (radioButton[i].getSelection()) {
-					result = i;
-				}
-			}
-			return result;
-		}
-
-		public void createControl(Composite parent) {
-			Composite base = new Composite(parent, SWT.NONE);
-			base.setLayout(new GridLayout());
-
-			// radio buttons' container
-			Composite radioButtonsGroup = new Composite(base, SWT.NONE);
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 1;
-			layout.makeColumnsEqualWidth = true;
-			layout.marginWidth = 0;
-
-			radioButtonsGroup.setLayout(layout);
-			GridData gd = new GridData(GridData.FILL_BOTH);
-			gd.heightHint = 300;
-			gd.widthHint = 400;
-			radioButtonsGroup.setLayoutData(gd);
-
-			for (int i = 0; i < radioButtonLabel.length; i++) {
-				radioButton[i] = new Button(radioButtonsGroup, SWT.RADIO);
-				radioButton[i].setText(radioButtonLabel[i]);
-				radioButton[i].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				// radioButton[i].addListener(SWT.Modify, this);
-			}
-			setControl(base);
-			setPageComplete(isPageComplete());
-			Dialog.applyDialogFont(parent);
-		}
-
-		public void handleEvent(Event event) {
-			if (event.type == SWT.Modify) {
-				setPageComplete(isPageComplete());
-			}
-		}
-	}
-
-
-	/**
-	 * NewFilePage
-	 */
-	public class NewFilePage extends WizardNewFileCreationPage {
-		public String defaultName = "NewFile"; //$NON-NLS-1$
-		public String defaultFileExtension = ".txt"; //$NON-NLS-1$
-		public String[] filterExtensions = {"*.txt"}; //$NON-NLS-1$
-		private List fValidExtensions = null;
-
-		public NewFilePage(IStructuredSelection selection) {
-			super("", selection); //$NON-NLS-1$
-		}
-
-		protected String computeDefaultFileName() {
-			int count = 0;
-			String fileName = defaultName + defaultFileExtension;
-			IPath containerFullPath = getContainerFullPath();
-			if (containerFullPath != null) {
-				while (true) {
-					IPath path = containerFullPath.append(fileName);
-					if (ResourcesPlugin.getWorkspace().getRoot().exists(path)) {
-						count++;
-						fileName = defaultName + count + defaultFileExtension;
-					}
-					else {
-						break;
-					}
-				}
-			}
-			return fileName;
-		}
-
-		// returns true if file of specified name exists in any case for
-		// selected container
-		protected String existsFileAnyCase(String fileName) {
-			if ((getContainerFullPath() != null) && (getContainerFullPath().isEmpty() == false) && (fileName.compareTo("") != 0)) //$NON-NLS-1$
-			{
-				// look through all resources at the specified container -
-				// compare in upper case
-				IResource parent = ResourcesPlugin.getWorkspace().getRoot().findMember(getContainerFullPath());
-				if (parent instanceof IContainer) {
-					IContainer container = (IContainer) parent;
-					try {
-						IResource[] members = container.members();
-						String enteredFileUpper = fileName.toUpperCase();
-						for (int i = 0; i < members.length; i++) {
-							String resourceUpperName = members[i].getName().toUpperCase();
-							if (resourceUpperName.equals(enteredFileUpper)) {
-								return members[i].getName();
-							}
-						}
-					}
-					catch (CoreException e) {
-					}
-				}
-			}
-			return null;
-		}
-
-
-		protected boolean validatePage() {
-			String fullFileName = getFileName();
-			if (!extensionValidForContentType(fullFileName)) {
-				setErrorMessage(NLS.bind(XMLWizardsMessages._ERROR_BAD_FILENAME_EXTENSION, getValidExtensions().toString()));
-				return false;
-			}
-			// no fileExtension, let's check for this file with default file
-			// extension
-			fullFileName += defaultFileExtension;
-			if ((getContainerFullPath() != null) && (getContainerFullPath().isEmpty() == false) && (getFileName().compareTo("") != 0)) //$NON-NLS-1$
-			{
-				Path fullPath = new Path(getContainerFullPath().toString() + '/' + fullFileName);
-				IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(fullPath);
-				if (resource != null) {
-					setErrorMessage(XMLWizardsMessages._ERROR_FILE_ALREADY_EXISTS);
-					return false;
-				}
-			}
-
-			// check for file should be case insensitive
-			String sameName = existsFileAnyCase(fullFileName);
-			if (sameName != null) {
-				// ISSUE: is qualitifedFileName not needed, or is it supposed
-				// to be used in error message?
-				// String qualifiedFileName =
-				// getContainerFullPath().toString() + '/' + fullFileName;
-				setErrorMessage(XMLWizardsMessages._ERROR_FILE_ALREADY_EXISTS + " " + sameName); //$NON-NLS-1$
-				return false;
-			}
-
-			return super.validatePage();
-		}
-
-		public void createControl(Composite parent) {
-			// inherit default container and name specification widgets
-			super.createControl(parent);
-			this.setFileName(computeDefaultFileName());
-			setPageComplete(validatePage());
-		}
-
-		/**
-		 * Get list of valid extensions for XML Content type
-		 * 
-		 * @return List
-		 */
-		List getValidExtensions() {
-			if (fValidExtensions == null) {
-				IContentType type = Platform.getContentTypeManager().getContentType(ContentTypeIdForXML.ContentTypeID_XML);
-				fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
-			}
-			return fValidExtensions;
-		}
-
-		/**
-		 * Verifies if fileName is valid name for content type. Takes base
-		 * content type into consideration.
-		 * 
-		 * @param fileName
-		 * @return true if extension is valid for this content type
-		 */
-		boolean extensionValidForContentType(String fileName) {
-			boolean valid = false;
-
-			IContentType type = Platform.getContentTypeManager().getContentType(ContentTypeIdForXML.ContentTypeID_XML);
-			// there is currently an extension
-			if (fileName.lastIndexOf('.') != -1) {
-				// check what content types are associated with current
-				// extension
-				IContentType[] types = Platform.getContentTypeManager().findContentTypesFor(fileName);
-				int i = 0;
-				while ((i < types.length) && !valid) {
-					valid = types[i].isKindOf(type);
-					++i;
-				}
-			}
-			else {
-				valid = true; // no extension so valid
-			}
-			return valid;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
deleted file mode 100644
index 406a406..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLGenerator.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.ContentBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMWriter;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class NewXMLGenerator {
-
-	protected String grammarURI;
-	protected CMDocument cmDocument;
-	protected int buildPolicy;
-	protected String rootElementName;
-
-	protected ICatalogEntry xmlCatalogEntry;
-
-	// info for dtd
-	protected String publicId;
-	protected String systemId;
-	protected String defaultSystemId;
-
-	// info for xsd
-	public List namespaceInfoList;
-
-	public NewXMLGenerator() {
-		super();
-	}
-
-	public NewXMLGenerator(String grammarURI, CMDocument cmDocument) {
-		this.grammarURI = grammarURI;
-		this.cmDocument = cmDocument;
-	}
-
-
-	public static CMDocument createCMDocument(String uri, String[] errorInfo) {
-		String title = null;
-		String message = null;
-		List errorList = new Vector();
-		CMDocument cmDocument = null;
-
-		if (URIHelper.isReadableURI(uri, true)) {
-			// (cs) assume the uri has been provided in a normalized form
-			cmDocument = ContentModelManager.getInstance().createCMDocument(uri, null);
-
-			if (uri.endsWith(".dtd")) { //$NON-NLS-1$
-				if (errorList.size() > 0) {
-					title = XMLWizardsMessages._UI_INVALID_GRAMMAR_ERROR;
-					message = XMLWizardsMessages._UI_LABEL_ERROR_DTD_INVALID_INFO;
-				}
-			}
-			else // ".xsd"
-			{
-				// To be consistent with the schema editor validation
-				XMLSchemaValidationChecker validator = new XMLSchemaValidationChecker();
-				if (!validator.isValid(uri)) {
-					title = XMLWizardsMessages._UI_INVALID_GRAMMAR_ERROR;
-					message = XMLWizardsMessages._UI_LABEL_ERROR_SCHEMA_INVALID_INFO;
-				}
-				else if (cmDocument != null) {
-					int globalElementCount = cmDocument.getElements().getLength();
-					if (globalElementCount == 0) {
-						title = XMLWizardsMessages._UI_WARNING_TITLE_NO_ROOT_ELEMENTS;
-						message = XMLWizardsMessages._UI_WARNING_MSG_NO_ROOT_ELEMENTS;
-					}
-				}
-			}
-		}
-		else {
-			title = XMLWizardsMessages._UI_WARNING_TITLE_NO_ROOT_ELEMENTS;
-			message = XMLWizardsMessages._UI_WARNING_URI_NOT_FOUND_COLON + " " + uri; //$NON-NLS-1$
-		}
-		errorInfo[0] = title;
-		errorInfo[1] = message;
-
-		return cmDocument;
-	}
-	
-	private String applyLineDelimiter(IFile file, String text) {
-		String lineDelimiter = Platform.getPreferencesService().getString(Platform.PI_RUNTIME, Platform.PREF_LINE_SEPARATOR, System.getProperty("line.separator"), new IScopeContext[] {new ProjectScope(file.getProject()), new InstanceScope() });//$NON-NLS-1$
-		String convertedText = StringUtils.replace(text, "\r\n", "\n");
-		convertedText = StringUtils.replace(convertedText, "\r", "\n");
-		convertedText = StringUtils.replace(convertedText, "\n", lineDelimiter);
-		return convertedText;
-	}
-
-	/**
-	 * @deprecated use createTemplateXMLDocument(IFile, String) instead
-	 */
-	public void createEmptyXMLDocument(IFile newFile) throws Exception {
-		String charSet = getUserPreferredCharset();
-		String contents = "<?xml version=\"1.0\" encoding=\"" + charSet + "\"?>"; //$NON-NLS-1$ //$NON-NLS-2$
-		createTemplateXMLDocument(newFile, contents);
-	}
-	
-	void createTemplateXMLDocument(IFile newFile, String contents) throws Exception {
-		if (contents != null) {
-			String charSet = getUserPreferredCharset();
-			ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-	
-			PrintWriter writer = new PrintWriter(new OutputStreamWriter(outputStream, charSet));
-			contents = applyLineDelimiter(newFile, contents);
-			writer.println(contents);
-			writer.flush();
-			outputStream.close();
-	
-			ByteArrayInputStream inputStream = new ByteArrayInputStream(outputStream.toByteArray());
-			newFile.setContents(inputStream, true, true, null);
-			inputStream.close();
-		}
-	}
-
-	private String getUserPreferredCharset() {
-		Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-		String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-		return charSet;
-	}
-
-	public void createXMLDocument(String xmlFileName) throws Exception {
-		IContentType contentType = Platform.getContentTypeManager().findContentTypeFor(xmlFileName);
-		String charset = null;
-		if (contentType != null) {
-			charset = contentType.getDefaultCharset();
-		}
-		ByteArrayOutputStream outputStream = createXMLDocument(xmlFileName, charset);
-
-		File file = new File(xmlFileName);
-		FileOutputStream fos = new FileOutputStream(file);
-		outputStream.writeTo(fos);
-		fos.close();
-	}
-
-
-	public void createXMLDocument(IFile newFile, String xmlFileName) throws Exception {
-		String charset = newFile.getCharset();
-		ByteArrayOutputStream outputStream = createXMLDocument(xmlFileName, charset);
-
-		String contents = outputStream.toString(charset);
-		contents = applyLineDelimiter(newFile, contents);
-
-		ByteArrayInputStream inputStream = new ByteArrayInputStream(contents.getBytes(charset));
-		newFile.setContents(inputStream, true, true, null);
-		inputStream.close();
-	}
-
-
-	public ByteArrayOutputStream createXMLDocument(String xmlFileName, String charset) throws Exception {
-		if (charset == null) {
-			charset = getUserPreferredCharset();
-			if (charset == null) {
-				charset = "UTF-8"; //$NON-NLS-1$
-			}
-		}
-		CMDocument cmDocument = getCMDocument();
-
-		Assert.isNotNull(cmDocument);
-		Assert.isNotNull(getRootElementName());
-
-		// create the xml model
-		CMNamedNodeMap nameNodeMap = cmDocument.getElements();
-		CMElementDeclaration cmElementDeclaration = (CMElementDeclaration) nameNodeMap.getNamedItem(getRootElementName());
-
-		Document xmlDocument = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-		DOMContentBuilderImpl contentBuilder = new DOMContentBuilderImpl(xmlDocument);
-
-		// this 'uglyTempHack' flag is required in order to supress the
-		// creation a default encoding
-		// we'll handle this later in the domWriter.print() method used below
-		//
-		contentBuilder.supressCreationOfDoctypeAndXMLDeclaration = true;
-		contentBuilder.setBuildPolicy(buildPolicy);
-		contentBuilder.setExternalCMDocumentSupport(new MyExternalCMDocumentSupport(namespaceInfoList, xmlFileName));
-		contentBuilder.createDefaultRootContent(cmDocument, cmElementDeclaration, namespaceInfoList);
-
-		ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-		OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputStream, charset);
-
-		DOMWriter domWriter = new DOMWriter(outputStreamWriter);
-
-		// TODO... instead of relying on file extensions, we need to keep
-		// track of the grammar type
-		// better yet we should reate an SSE document so that we can format it
-		// nicely before saving
-		// then we won't need the DOMWriter at all
-		//
-		domWriter.print(xmlDocument, charset, cmDocument.getNodeName(), getNonWhitespaceString(getPublicId()), getNonWhitespaceString(getSystemId()));
-		outputStream.flush();
-		outputStream.close();
-
-		return outputStream;
-	}
-
-
-	public void createNamespaceInfoList() {
-		List result = new Vector();
-		if (cmDocument != null) {
-			result = (List) cmDocument.getProperty("http://org.eclipse.wst/cm/properties/completeNamespaceInfo"); //$NON-NLS-1$
-			if (result != null) {
-				int size = result.size();
-				for (int i = 0; i < size; i++) {
-					NamespaceInfo info = (NamespaceInfo) result.get(i);
-					if (i == 0) {
-						String locationInfo = null;
-						if (xmlCatalogEntry != null) {
-							if (xmlCatalogEntry.getEntryType() == ICatalogEntry.ENTRY_TYPE_PUBLIC) {
-								locationInfo = xmlCatalogEntry.getAttributeValue(ICatalogEntry.ATTR_WEB_URL);
-							}
-							else {
-								locationInfo = xmlCatalogEntry.getKey();
-							}
-						}
-						if (locationInfo == null) {
-							locationInfo = defaultSystemId;
-						}
-						info.locationHint = locationInfo;
-						info.setProperty("locationHint-readOnly", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-						info.setProperty("uri-readOnly", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-						info.setProperty("unremovable", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-					} else {
-						info.locationHint = null;
-					}
-				}
-			}
-
-			NamespaceInfoContentBuilder builder = new NamespaceInfoContentBuilder();
-			builder.setBuildPolicy(ContentBuilder.BUILD_ONLY_REQUIRED_CONTENT);
-			builder.visitCMNode(cmDocument);
-			result.addAll(builder.list);
-		}
-		namespaceInfoList = result;
-	}
-
-
-	public boolean isMissingNamespaceLocation() {
-		boolean result = false;
-		for (Iterator i = namespaceInfoList.iterator(); i.hasNext();) {
-			NamespaceInfo info = (NamespaceInfo) i.next();
-			if (info.locationHint == null) {
-				result = true;
-				break;
-			}
-		}
-		return result;
-	}
-
-
-	public String[] getNamespaceInfoErrors() {
-		String[] errorList = null;
-
-// No warnings should be given when namespaces entries have missing location hints
-// See https://bugs.eclipse.org/bugs/show_bug.cgi?id=105128		
-//		if ((namespaceInfoList != null) && isMissingNamespaceLocation()) {
-//			String title = XMLWizardsMessages._UI_LABEL_NO_LOCATION_HINT;
-//			String message = XMLWizardsMessages._UI_WARNING_MSG_NO_LOCATION_HINT_1 + " " + XMLWizardsMessages._UI_WARNING_MSG_NO_LOCATION_HINT_2 + "\n\n" + XMLWizardsMessages._UI_WARNING_MSG_NO_LOCATION_HINT_3; //$NON-NLS-1$ //$NON-NLS-2$
-//
-//			errorList = new String[2];
-//			errorList[0] = title;
-//			errorList[1] = message;
-//		}
-		return errorList;
-	}
-
-
-	public void setXMLCatalogEntry(ICatalogEntry catalogEntry) {
-		xmlCatalogEntry = catalogEntry;
-	}
-
-	public ICatalogEntry getXMLCatalogEntry() {
-		return xmlCatalogEntry;
-	}
-
-
-	public void setBuildPolicy(int policy) {
-		buildPolicy = policy;
-	}
-
-
-	public void setDefaultSystemId(String sysId) {
-		defaultSystemId = sysId;
-	}
-
-	public String getDefaultSystemId() {
-		return defaultSystemId;
-	}
-
-	public void setSystemId(String sysId) {
-		systemId = sysId;
-	}
-
-	public String getSystemId() {
-		return systemId;
-	}
-
-	public void setPublicId(String pubId) {
-		publicId = pubId;
-	}
-
-	public String getPublicId() {
-		return publicId;
-	}
-
-	public void setGrammarURI(String gramURI) {
-		grammarURI = gramURI;
-	}
-
-	public String getGrammarURI() {
-		return grammarURI;
-	}
-
-	public void setCMDocument(CMDocument cmDoc) {
-		cmDocument = cmDoc;
-	}
-
-	public CMDocument getCMDocument() {
-		return cmDocument;
-	}
-
-	public void setRootElementName(String rootName) {
-		rootElementName = rootName;
-	}
-
-	public String getRootElementName() {
-		return rootElementName;
-	}
-
-
-	protected class MyExternalCMDocumentSupport implements DOMContentBuilderImpl.ExternalCMDocumentSupport {
-		protected List namespaceInfoList1;
-		protected URIResolver idResolver;
-		protected String resourceLocation;
-
-		protected MyExternalCMDocumentSupport(List namespaceInfoListParam, String resourceLocation) {
-			this.namespaceInfoList1 = namespaceInfoListParam;
-			this.resourceLocation = resourceLocation;
-			idResolver = URIResolverPlugin.createResolver();
-		}
-
-		public CMDocument getCMDocument(Element element, String namespaceURI) {
-			CMDocument result = null;
-			if ((namespaceURI != null) && (namespaceURI.trim().length() > 0)) {
-				String locationHint = null;
-				for (Iterator i = namespaceInfoList1.iterator(); i.hasNext();) {
-					NamespaceInfo info = (NamespaceInfo) i.next();
-					if (namespaceURI.equals(info.uri)) {
-						locationHint = info.locationHint;
-						break;
-					}
-				}
-				if (locationHint != null) {
-					grammarURI = idResolver.resolve(resourceLocation, locationHint, locationHint);
-					result = ContentModelManager.getInstance().createCMDocument(getGrammarURI(), null);
-				}
-			}
-			else {
-				result = cmDocument;
-			}
-			return result;
-		}
-	}
-
-	public static String getNonWhitespaceString(String string) {
-		String result = null;
-		if (string != null) {
-			if (string.trim().length() > 0) {
-				result = string;
-			}
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLHandler.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLHandler.java
deleted file mode 100644
index 38c2669..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLHandler.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.util.Iterator;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-public class NewXMLHandler extends AbstractHandler implements IHandler {
-
-	/**
-	 * 
-	 */
-	public NewXMLHandler() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IWorkbenchWindow workbenchWindow = 	HandlerUtil.getActiveWorkbenchWindow(event);
-		ISelection selection = workbenchWindow.getSelectionService().getSelection();
-		Object selectedObject = getSelection(selection);
-
-		if ((selectedObject instanceof IFile) && (selection instanceof IStructuredSelection)) {
-			IFile file = (IFile) selectedObject;
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			try {
-				NewXMLWizard.showDialog(workbenchWindow.getShell(), file, structuredSelection);
-			}
-			catch (Exception e) {
-				// XMLCorePlugin.getDefault().getLog().log();
-			}
-		}
-		return null;
-	}
-	
-	public static Object getSelection(ISelection selection) {
-		if (selection == null) {
-			return null;
-		} 
-
-		Object result = null;
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection es = (IStructuredSelection) selection;
-			Iterator i = es.iterator();
-			if (i.hasNext()) {
-				result = i.next();
-			}
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLTemplatesWizardPage.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLTemplatesWizardPage.java
deleted file mode 100644
index b15eeac..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLTemplatesWizardPage.java
+++ /dev/null
@@ -1,515 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.preference.PreferenceDialog;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.Document;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.DocumentTemplateContext;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerSorter;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeIdsXML;
-
-/**
- * Templates page in new file wizard. Allows users to select a new file
- * template to be applied in new file.
- * 
- */
-public class NewXMLTemplatesWizardPage extends WizardPage {
-
-	/**
-	 * Content provider for templates
-	 */
-	private class TemplateContentProvider implements IStructuredContentProvider {
-		/** The template store. */
-		private TemplateStore fStore;
-
-		/*
-		 * @see IContentProvider#dispose()
-		 */
-		public void dispose() {
-			fStore = null;
-		}
-
-		/*
-		 * @see IStructuredContentProvider#getElements(Object)
-		 */
-		public Object[] getElements(Object input) {
-			return fStore.getTemplates(TemplateContextTypeIdsXML.NEW);
-		}
-
-		/*
-		 * @see IContentProvider#inputChanged(Viewer, Object, Object)
-		 */
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			fStore = (TemplateStore) newInput;
-		}
-	}
-
-	/**
-	 * Label provider for templates.
-	 */
-	private class TemplateLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		/*
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnImage(java.lang.Object,
-		 *      int)
-		 */
-		public Image getColumnImage(Object element, int columnIndex) {
-			return null;
-		}
-
-		/*
-		 * @see org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang.Object,
-		 *      int)
-		 */
-		public String getColumnText(Object element, int columnIndex) {
-			Template template = (Template) element;
-
-			switch (columnIndex) {
-				case 0 :
-					return template.getName();
-				case 1 :
-					return template.getDescription();
-				default :
-					return ""; //$NON-NLS-1$
-			}
-		}
-	}
-
-	/** Last selected template name */
-	private String fLastSelectedTemplateName;
-	/** The viewer displays the pattern of selected template. */
-	private SourceViewer fPatternViewer;
-	/** The table presenting the templates. */
-	private TableViewer fTableViewer;
-	/** Template store used by this wizard page */
-	private TemplateStore fTemplateStore;
-	/** Checkbox for using templates. */
-	private Button fUseTemplateButton;
-
-	public NewXMLTemplatesWizardPage() {
-		super("NewXMLTemplatesWizardPage", XMLWizardsMessages.NewXMLTemplatesWizardPage_0, null); //$NON-NLS-1$
-		setDescription(XMLWizardsMessages.NewXMLTemplatesWizardPage_1);
-	}
-
-	/**
-	 * Correctly resizes the table so no phantom columns appear
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @param buttons
-	 *            the buttons
-	 * @param table
-	 *            the table
-	 * @param column1
-	 *            the first column
-	 * @param column2
-	 *            the second column
-	 * @param column3
-	 *            the third column
-	 */
-	private void configureTableResizing(final Composite parent, final Table table, final TableColumn column1, final TableColumn column2) {
-		parent.addControlListener(new ControlAdapter() {
-			public void controlResized(ControlEvent e) {
-				Rectangle area = parent.getClientArea();
-				Point preferredSize = table.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-				int width = area.width - 2 * table.getBorderWidth();
-				if (preferredSize.y > area.height) {
-					// Subtract the scrollbar width from the total column
-					// width
-					// if a vertical scrollbar will be required
-					Point vBarSize = table.getVerticalBar().getSize();
-					width -= vBarSize.x;
-				}
-
-				Point oldSize = table.getSize();
-				if (oldSize.x > width) {
-					// table is getting smaller so make the columns
-					// smaller first and then resize the table to
-					// match the client area width
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-					table.setSize(width, area.height);
-				}
-				else {
-					// table is getting bigger so make the table
-					// bigger first and then make the columns wider
-					// to match the client area width
-					table.setSize(width, area.height);
-					column1.setWidth(width / 2);
-					column2.setWidth(width / 2);
-				}
-			}
-		});
-	}
-
-	public void createControl(Composite ancestor) {
-		Composite parent = new Composite(ancestor, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		parent.setLayout(layout);
-
-		// create checkbox for user to use XML Template
-		fUseTemplateButton = new Button(parent, SWT.CHECK);
-		fUseTemplateButton.setText(XMLWizardsMessages.NewXMLTemplatesWizardPage_4);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		fUseTemplateButton.setLayoutData(data);
-		fUseTemplateButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				enableTemplates();
-			}
-		});
-
-		// create composite for Templates table
-		Composite innerParent = new Composite(parent, SWT.NONE);
-		GridLayout innerLayout = new GridLayout();
-		innerLayout.numColumns = 2;
-		innerLayout.marginHeight = 0;
-		innerLayout.marginWidth = 0;
-		innerParent.setLayout(innerLayout);
-		GridData gd = new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1);
-		innerParent.setLayoutData(gd);
-
-		Label label = new Label(innerParent, SWT.NONE);
-		label.setText(XMLWizardsMessages.NewXMLTemplatesWizardPage_7);
-		data = new GridData(SWT.FILL, SWT.FILL, true, false, 2, 1);
-		label.setLayoutData(data);
-
-		// create table that displays templates
-		Table table = new Table(innerParent, SWT.BORDER | SWT.FULL_SELECTION);
-
-		data = new GridData(GridData.FILL_BOTH);
-		data.widthHint = convertWidthInCharsToPixels(2);
-		data.heightHint = convertHeightInCharsToPixels(10);
-		data.horizontalSpan = 2;
-		table.setLayoutData(data);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-		TableLayout tableLayout = new TableLayout();
-		table.setLayout(tableLayout);
-
-		TableColumn column1 = new TableColumn(table, SWT.NONE);
-		column1.setText(XMLWizardsMessages.NewXMLTemplatesWizardPage_2);
-
-		TableColumn column2 = new TableColumn(table, SWT.NONE);
-		column2.setText(XMLWizardsMessages.NewXMLTemplatesWizardPage_3);
-
-		fTableViewer = new TableViewer(table);
-		fTableViewer.setLabelProvider(new TemplateLabelProvider());
-		fTableViewer.setContentProvider(new TemplateContentProvider());
-
-		fTableViewer.setSorter(new ViewerSorter() {
-			public int compare(Viewer viewer, Object object1, Object object2) {
-				if ((object1 instanceof Template) && (object2 instanceof Template)) {
-					Template left = (Template) object1;
-					Template right = (Template) object2;
-					int result = left.getName().compareToIgnoreCase(right.getName());
-					if (result != 0) {
-						return result;
-					}
-					return left.getDescription().compareToIgnoreCase(right.getDescription());
-				}
-				return super.compare(viewer, object1, object2);
-			}
-
-			public boolean isSorterProperty(Object element, String property) {
-				return true;
-			}
-		});
-
-		fTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent e) {
-				updateViewerInput();
-			}
-		});
-
-		// create viewer that displays currently selected template's contents
-		fPatternViewer = doCreateViewer(parent);
-
-		fTemplateStore = XMLUIPlugin.getDefault().getTemplateStore();
-		fTableViewer.setInput(fTemplateStore);
-
-		// Create linked text to just to templates preference page
-		Link link = new Link(parent, SWT.NONE);
-		link.setText(XMLWizardsMessages.NewXMLTemplatesWizardPage_6);
-		data = new GridData(SWT.END, SWT.FILL, true, false, 2, 1);
-		link.setLayoutData(data);
-		link.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				linkClicked();
-			}
-		});
-
-		configureTableResizing(innerParent, table, column1, column2);
-		loadLastSavedPreferences();
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, IHelpContextIds.XML_NEWWIZARD_TEMPLATE_HELPID);
-		Dialog.applyDialogFont(parent);
-		setControl(parent);
-	}
-
-	/**
-	 * Creates, configures and returns a source viewer to present the template
-	 * pattern on the preference page. Clients may override to provide a
-	 * custom source viewer featuring e.g. syntax coloring.
-	 * 
-	 * @param parent
-	 *            the parent control
-	 * @return a configured source viewer
-	 */
-	private SourceViewer createViewer(Composite parent) {
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationXML();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		SourceViewer viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(ContentTypeIdForXML.ContentTypeID_XML);
-		IDocument document = scratchModel.getStructuredDocument();
-		viewer.configure(sourceViewerConfiguration);
-		viewer.setDocument(document);
-		return viewer;
-	}
-
-	private SourceViewer doCreateViewer(Composite parent) {
-		Label label = new Label(parent, SWT.NONE);
-		label.setText(XMLWizardsMessages.NewXMLTemplatesWizardPage_5);
-		GridData data = new GridData();
-		data.horizontalSpan = 2;
-		label.setLayoutData(data);
-
-		SourceViewer viewer = createViewer(parent);
-		viewer.setEditable(false);
-
-		Control control = viewer.getControl();
-		data = new GridData(GridData.FILL_BOTH);
-		data.horizontalSpan = 2;
-		data.heightHint = convertHeightInCharsToPixels(5);
-		// [261274] - source viewer was growing to fit the max line width of the template
-		data.widthHint = convertWidthInCharsToPixels(2);
-		control.setLayoutData(data);
-
-		return viewer;
-	}
-
-	/**
-	 * Enable/disable controls in page based on fUseTemplateButton's current
-	 * state.
-	 */
-	void enableTemplates() {
-		boolean enabled = fUseTemplateButton.getSelection();
-
-		if (!enabled) {
-			// save last selected template
-			Template template = getSelectedTemplate();
-			if (template != null) {
-				fLastSelectedTemplateName = template.getName();
-			}
-			else {
-				fLastSelectedTemplateName = ""; //$NON-NLS-1$
-			}
-
-			fTableViewer.setSelection(null);
-		}
-		else {
-			setSelectedTemplate(fLastSelectedTemplateName);
-		}
-
-		fTableViewer.getControl().setEnabled(enabled);
-		fPatternViewer.getControl().setEnabled(enabled);
-	}
-
-	/**
-	 * Return the template preference page id
-	 * 
-	 * @return
-	 */
-	private String getPreferencePageId() {
-		return "org.eclipse.wst.sse.ui.preferences.xml.templates"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Get the currently selected template.
-	 * 
-	 * @return
-	 */
-	private Template getSelectedTemplate() {
-		Template template = null;
-		IStructuredSelection selection = (IStructuredSelection) fTableViewer.getSelection();
-
-		if (selection.size() == 1) {
-			template = (Template) selection.getFirstElement();
-		}
-		return template;
-	}
-
-	/**
-	 * Returns template string to insert.
-	 * 
-	 * @return String to insert or null if none is to be inserted
-	 */
-	String getTemplateString() {
-		String templateString = null;
-
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			TemplateContextType contextType = XMLUIPlugin.getDefault().getTemplateContextRegistry().getContextType(TemplateContextTypeIdsXML.NEW);
-			IDocument document = new Document();
-			TemplateContext context = new DocumentTemplateContext(contextType, document, 0, 0);
-			try {
-				TemplateBuffer buffer = context.evaluate(template);
-				templateString = buffer.getString();
-			}
-			catch (Exception e) {
-				Logger.log(Logger.WARNING_DEBUG, "Could not create template for new xml", e); //$NON-NLS-1$
-			}
-		}
-
-		return templateString;
-	}
-
-	void linkClicked() {
-		String pageId = getPreferencePageId();
-		PreferenceDialog dialog = PreferencesUtil.createPreferenceDialogOn(getShell(), pageId, new String[]{pageId}, null);
-		dialog.open();
-		fTableViewer.refresh();
-	}
-
-	/**
-	 * Load the last template name used in New XML File wizard.
-	 */
-	private void loadLastSavedPreferences() {
-		String templateName = XMLUIPlugin.getDefault().getPreferenceStore().getString(XMLUIPreferenceNames.NEW_FILE_TEMPLATE_NAME);
-		if ((templateName == null) || (templateName.length() == 0)) {
-			fLastSelectedTemplateName = ""; //$NON-NLS-1$
-			fUseTemplateButton.setSelection(false);
-		}
-		else {
-			fLastSelectedTemplateName = templateName;
-			fUseTemplateButton.setSelection(true);
-		}
-		enableTemplates();
-	}
-
-	/**
-	 * Save template name used for next call to New XML File wizard.
-	 */
-	void saveLastSavedPreferences() {
-		String templateName = ""; //$NON-NLS-1$
-
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			templateName = template.getName();
-		}
-
-		XMLUIPlugin.getDefault().getPreferenceStore().setValue(XMLUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
-		XMLUIPlugin.getDefault().savePluginPreferences();
-	}
-
-	/**
-	 * Select a template in the table viewer given the template name. If
-	 * template name cannot be found or templateName is null, just select
-	 * first item in table. If no items in table select nothing.
-	 * 
-	 * @param templateName
-	 */
-	private void setSelectedTemplate(String templateName) {
-		Object template = null;
-
-		if ((templateName != null) && (templateName.length() > 0)) {
-			// pick the last used template
-			template = fTemplateStore.findTemplate(templateName, TemplateContextTypeIdsXML.NEW);
-		}
-
-		// no record of last used template so just pick first element
-		if (template == null) {
-			// just pick first element
-			template = fTableViewer.getElementAt(0);
-		}
-
-		if (template != null) {
-			IStructuredSelection selection = new StructuredSelection(template);
-			fTableViewer.setSelection(selection, true);
-		}
-	}
-
-	/**
-	 * Updates the pattern viewer.
-	 */
-	void updateViewerInput() {
-		Template template = getSelectedTemplate();
-		if (template != null) {
-			fPatternViewer.getDocument().set(template.getPattern());
-		}
-		else {
-			fPatternViewer.getDocument().set(""); //$NON-NLS-1$
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
deleted file mode 100644
index c8d9e03..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/NewXMLWizard.java
+++ /dev/null
@@ -1,879 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.ui.wizards.newresource.BasicNewResourceWizard;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.dialogs.NamespaceInfoErrorHelper;
-import org.eclipse.wst.xml.ui.internal.dialogs.SelectFileOrXMLCatalogIdPanel;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesDialog;
-
-import com.ibm.icu.text.Collator;
-
-public class NewXMLWizard extends NewModelWizard {
-	protected static final int CREATE_FROM_DTD = 0;
-	protected static final int CREATE_FROM_XSD = 1;
-	protected static final int CREATE_FROM_SCRATCH = 2;
-
-	protected static final String[] createFromRadioButtonLabel = {XMLWizardsMessages._UI_RADIO_XML_FROM_DTD, XMLWizardsMessages._UI_RADIO_XML_FROM_SCHEMA, XMLWizardsMessages._UI_RADIO_XML_FROM_SCRATCH};
-
-	protected static final String[] filePageFilterExtensions = {".xml"}; //$NON-NLS-1$
-	protected static final String[] browseXSDFilterExtensions = {".xsd"}; //$NON-NLS-1$
-	protected static final String[] browseDTDFilterExtensions = {".dtd"}; //$NON-NLS-1$
-
-	protected NewFilePage newFilePage;
-	/**
-	 * @deprecated clients should not be allowed to change start page
-	 */
-	protected StartPage startPage;
-	private StartPage fCreateXMLFromWizardPage;
-	protected SelectGrammarFilePage selectGrammarFilePage;
-	protected SelectRootElementPage selectRootElementPage;
-
-	protected String cmDocumentErrorMessage;
-
-	protected NewXMLGenerator generator;
-	private NewXMLTemplatesWizardPage fNewXMLTemplatesWizardPage;
-
-
-	public NewXMLWizard() {
-		setWindowTitle(XMLWizardsMessages._UI_WIZARD_CREATE_NEW_TITLE);
-		ImageDescriptor descriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_WIZBAN_GENERATEXML);
-		setDefaultPageImageDescriptor(descriptor);
-		generator = new NewXMLGenerator();
-	}
-
-
-	public NewXMLWizard(IFile file, CMDocument cmDocument) {
-		this();
-
-		generator.setGrammarURI(URIHelper.getPlatformURI(file));
-		generator.setCMDocument(cmDocument);
-	}
-
-
-	public static void showDialog(Shell shell, IFile file, IStructuredSelection structuredSelection) {
-		String[] errorInfo = new String[2];
-		// (cs) the URI argument to createCMDocument needs to be a fully
-		// qualified URI
-		//
-		CMDocument cmDocument = NewXMLGenerator.createCMDocument(URIHelper.getPlatformURI(file), errorInfo);
-		if (errorInfo[0] == null) {
-			NewXMLWizard wizard = new NewXMLWizard(file, cmDocument);
-			wizard.init(PlatformUI.getWorkbench(), structuredSelection);
-			wizard.setNeedsProgressMonitor(true);
-			WizardDialog dialog = new WizardDialog(shell, wizard);
-			dialog.create();
-			dialog.getShell().setText(XMLWizardsMessages._UI_DIALOG_NEW_TITLE);
-			dialog.setBlockOnOpen(true);
-			dialog.open();
-		}
-		else {
-			MessageDialog.openInformation(shell, errorInfo[0], errorInfo[1]);
-		}
-	}
-
-	public void addPages() {
-		String grammarURI = generator.getGrammarURI();
-		
-		// new file page
-		newFilePage = new NewFilePage(fSelection);
-		newFilePage.setTitle(XMLWizardsMessages._UI_WIZARD_CREATE_XML_FILE_HEADING);
-		newFilePage.setDescription(XMLWizardsMessages._UI_WIZARD_CREATE_XML_FILE_EXPL);
-		newFilePage.defaultName = (grammarURI != null) ? URIHelper.removeFileExtension(URIHelper.getLastSegment(grammarURI)) : "NewFile"; //$NON-NLS-1$
-		Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-		String ext = preference.getString(XMLCorePreferenceNames.DEFAULT_EXTENSION);
-		newFilePage.defaultFileExtension = "." + ext; //$NON-NLS-1$
-		newFilePage.filterExtensions = filePageFilterExtensions;
-		addPage(newFilePage);
-
-		if (grammarURI == null) {
-			// create xml from page
-			fCreateXMLFromWizardPage = new StartPage("StartPage", createFromRadioButtonLabel) //$NON-NLS-1$
-			{
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-				}
-
-				public void setVisible(boolean visible) {
-					super.setVisible(visible);
-					getRadioButtonAtIndex(getCreateMode()).setSelection(true);
-					getRadioButtonAtIndex(getCreateMode()).setFocus();
-
-					// Set the help context for each button
-					PlatformUI.getWorkbench().getHelpSystem().setHelp(fCreateXMLFromWizardPage.getRadioButtonAtIndex(0), IXMLWizardHelpContextIds.XML_NEWWIZARD_CREATEXML1_HELPID);
-					PlatformUI.getWorkbench().getHelpSystem().setHelp(fCreateXMLFromWizardPage.getRadioButtonAtIndex(1), IXMLWizardHelpContextIds.XML_NEWWIZARD_CREATEXML2_HELPID);
-					PlatformUI.getWorkbench().getHelpSystem().setHelp(fCreateXMLFromWizardPage.getRadioButtonAtIndex(2), IXMLWizardHelpContextIds.XML_NEWWIZARD_CREATEXML3_HELPID);
-				}
-			};
-
-
-			fCreateXMLFromWizardPage.setTitle(XMLWizardsMessages._UI_WIZARD_CREATE_XML_HEADING);
-			fCreateXMLFromWizardPage.setDescription(XMLWizardsMessages._UI_WIZARD_CREATE_XML_EXPL);
-			addPage(fCreateXMLFromWizardPage);
-		}
-
-		// selectGrammarFilePage
-		selectGrammarFilePage = new SelectGrammarFilePage();
-		addPage(selectGrammarFilePage);
-
-		// select root element page
-		selectRootElementPage = new SelectRootElementPage();
-		selectRootElementPage.setTitle(XMLWizardsMessages._UI_WIZARD_SELECT_ROOT_HEADING);
-		selectRootElementPage.setDescription(XMLWizardsMessages._UI_WIZARD_SELECT_ROOT_EXPL);
-		addPage(selectRootElementPage);
-
-		// from "scratch"
-		fNewXMLTemplatesWizardPage = new NewXMLTemplatesWizardPage();
-		addPage(fNewXMLTemplatesWizardPage);
-	}
-
-
-	public IWizardPage getStartingPage() {
-		WizardPage result = null;
-		if (startPage != null) {
-			result = startPage;
-		}
-		else {
-			result = newFilePage;
-		}
-		return result;
-	}
-
-
-	public int getCreateMode() {
-		String grammarURI = generator.getGrammarURI();
-
-		int result = CREATE_FROM_SCRATCH;
-		if (grammarURI != null) {
-			if (grammarURI.endsWith(".dtd")) //$NON-NLS-1$
-			{
-				result = CREATE_FROM_DTD;
-			}
-			else if (grammarURI.endsWith(".xsd")) //$NON-NLS-1$
-			{
-				result = CREATE_FROM_XSD;
-			}
-		}
-		else if (fCreateXMLFromWizardPage != null) {
-			int selectedIndex = fCreateXMLFromWizardPage.getSelectedRadioButtonIndex();
-			if (selectedIndex != -1) {
-				result = selectedIndex;
-			}
-		}
-		return result;
-	}
-
-
-	public IWizardPage getNextPage(IWizardPage currentPage) {
-		WizardPage nextPage = null;
-		if (currentPage == startPage) {
-			nextPage = newFilePage;
-		}
-		else if (currentPage == newFilePage) {
-			if (generator.getGrammarURI() == null)
-				nextPage = fCreateXMLFromWizardPage;
-			else
-				nextPage = selectRootElementPage;
-		}
-		else if (currentPage == fCreateXMLFromWizardPage) {
-			if (getCreateMode() == CREATE_FROM_SCRATCH) {
-				nextPage = fNewXMLTemplatesWizardPage;
-			}
-			else if (generator.getGrammarURI() == null) {
-				nextPage = selectGrammarFilePage;
-			}
-			else {
-				nextPage = selectRootElementPage;
-			}
-		}
-		else if (currentPage == selectGrammarFilePage) {
-			nextPage = selectRootElementPage;
-		}
-		return nextPage;
-	}
-
-
-	public boolean canFinish() {
-		boolean result = false;
-
-		IWizardPage currentPage = getContainer().getCurrentPage();
-		// can finish on: new file page, create from & template page if creating from scratch, select root element page
-		if ((currentPage == newFilePage && generator.getGrammarURI() == null) || (fCreateXMLFromWizardPage != null && fCreateXMLFromWizardPage.getSelectedRadioButtonIndex() == CREATE_FROM_SCRATCH) || (currentPage == selectRootElementPage)) {
-			result = currentPage.isPageComplete();
-		}
-		return result;
-	}
-
-
-	public boolean performFinish() {
-		boolean result = super.performFinish();
-		// save user options for next use
-		fNewXMLTemplatesWizardPage.saveLastSavedPreferences();
-		
-		String fileName = null;
-		try {
-
-			String[] namespaceErrors = generator.getNamespaceInfoErrors();
-			if (namespaceErrors != null) {
-				String title = namespaceErrors[0];
-				String message = namespaceErrors[1];
-				result = MessageDialog.openQuestion(getShell(), title, message);
-			}
-
-			if (result) {
-				fileName = newFilePage.getFileName();
-				if ((new Path(fileName)).getFileExtension() == null) {
-					newFilePage.setFileName(fileName.concat(newFilePage.defaultFileExtension));
-				}
-
-				IFile newFile = newFilePage.createNewFile();
-				String xmlFileName = newFile.getLocation().toOSString();
-
-				if (getContainer().getCurrentPage() == selectRootElementPage) {
-
-					generator.createXMLDocument(newFile, xmlFileName);
-				}
-				else {
-					// put template contents into file
-					String templateString = fNewXMLTemplatesWizardPage.getTemplateString();
-					generator.createTemplateXMLDocument(newFile, templateString);
-				}
-
-				newFile.refreshLocal(IResource.DEPTH_ONE, null);
-
-				IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-				BasicNewResourceWizard.selectAndReveal(newFile, workbenchWindow);
-				openEditor(newFile);
-			}
-		}
-		catch (Exception e) {
-			Logger.logException("Exception completing New XML wizard " + fileName, e); //$NON-NLS-1$
-		}
-		return result;
-	}
-
-	public void openEditor(IFile file) {
-		// Open editor on new file.
-		String editorId = null;
-		try {
-			IEditorDescriptor editor = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(file.getFullPath().toString(), file.getContentDescription().getContentType());
-			if (editor != null) {
-				editorId = editor.getId();
-			}
-		}
-		catch (CoreException e1) {
-			// editor id could not be retrieved, so we can not open editor
-			return;
-		}
-		IWorkbenchWindow dw = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		try {
-			if (dw != null) {
-				IWorkbenchPage page = dw.getActivePage();
-				if (page != null) {
-					page.openEditor(new FileEditorInput(file), editorId, true);
-				}
-			}
-		}
-		catch (PartInitException e) {
-			// editor can not open for some reason
-			return;
-		}
-
-	}
-
-
-	protected String getDefaultSystemId() {
-		String relativePath = "platform:/resource/" + newFilePage.getContainerFullPath().toString() + "/dummy"; //$NON-NLS-1$ //$NON-NLS-2$
-		return URIHelper.getRelativeURI(generator.getGrammarURI(), relativePath);
-	}
-
-
-	/**
-	 * SelectGrammarFilePage
-	 */
-	class SelectGrammarFilePage extends WizardPage {
-		protected SelectFileOrXMLCatalogIdPanel panel;
-
-		SelectGrammarFilePage() {
-			super("SelectGrammarFilePage"); //$NON-NLS-1$
-		}
-
-		public void createControl(Composite parent) {
-			Composite composite = new Composite(parent, SWT.NONE);
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTSOURCE_HELPID);
-			composite.setLayout(new GridLayout());
-			composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-			setControl(composite);
-
-			panel = new SelectFileOrXMLCatalogIdPanel(composite);
-			panel.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			SelectFileOrXMLCatalogIdPanel.Listener listener = new SelectFileOrXMLCatalogIdPanel.Listener() {
-				public void completionStateChanged() {
-					updateErrorMessage();
-				}
-			};
-			panel.setListener(listener);
-			Dialog.applyDialogFont(parent);
-		}
-
-		public void setVisible(boolean visible) {
-			super.setVisible(visible);
-			if (visible) {
-				if (getCreateMode() == CREATE_FROM_DTD) {
-					setTitle(XMLWizardsMessages._UI_WIZARD_SELECT_DTD_FILE_TITLE);
-					setDescription(XMLWizardsMessages._UI_WIZARD_SELECT_DTD_FILE_DESC);
-					panel.setFilterExtensions(browseDTDFilterExtensions);
-				}
-				else {
-					setTitle(XMLWizardsMessages._UI_WIZARD_SELECT_XSD_FILE_TITLE);
-					setDescription(XMLWizardsMessages._UI_WIZARD_SELECT_XSD_FILE_DESC);
-					panel.setFilterExtensions(browseXSDFilterExtensions);
-				}
-				generator.setGrammarURI(null);
-				generator.setCMDocument(null);
-				cmDocumentErrorMessage = null;
-			}
-			panel.setVisibleHelper(visible);
-		}
-
-		public String getURI() {
-			String uri = panel.getXMLCatalogURI();
-			if (uri == null) {
-				IFile file = panel.getFile();
-				if (file != null) {
-					uri = URIHelper.getPlatformURI(file);
-				}
-			}
-			return uri;
-		}
-
-		public boolean isPageComplete() {
-			return (getURI() != null) && (getErrorMessage() == null);
-		}
-
-		public String getXMLCatalogId() {
-			return panel.getXMLCatalogId();
-		}
-
-		public ICatalogEntry getXMLCatalogEntry() {
-			return panel.getXMLCatalogEntry();
-		}
-
-		public String computeErrorMessage() {
-			String errorMessage = null;
-			String uri = getURI();
-			if (uri != null) {
-				if (!URIHelper.isReadableURI(uri, false)) {
-					errorMessage = XMLWizardsMessages._UI_LABEL_ERROR_CATALOG_ENTRY_INVALID;
-				}
-			}
-			return errorMessage;
-		}
-
-
-		public void updateErrorMessage() {
-			String errorMessage = computeErrorMessage();
-			setErrorMessage(errorMessage);
-			setPageComplete(isPageComplete());
-		}
-	}
-
-
-	/**
-	 * SelectRootElementPage
-	 */
-	class SelectRootElementPage extends WizardPage implements SelectionListener {
-		protected Combo combo;
-		protected Button[] radioButton;
-		protected PageBook pageBook;
-		protected XSDOptionsPanel xsdOptionsPanel;
-		protected DTDOptionsPanel dtdOptionsPanel;
-
-
-		SelectRootElementPage() {
-			super("SelectRootElementPage"); //$NON-NLS-1$
-		}
-
-		public void createControl(Composite parent) {
-			// container group
-			Composite containerGroup = new Composite(parent, SWT.NONE);
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(containerGroup, IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTROOTELEMENT_HELPID);
-			containerGroup.setLayout(new GridLayout());
-			containerGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			setControl(containerGroup);
-
-			// select root element
-			Label containerLabel = new Label(containerGroup, SWT.NONE);
-			containerLabel.setText(XMLWizardsMessages._UI_LABEL_ROOT_ELEMENT);
-			combo = new Combo(containerGroup, SWT.DROP_DOWN | SWT.READ_ONLY);
-			combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			combo.addSelectionListener(this);
-
-			// Options
-			{
-				Group group = new Group(containerGroup, SWT.NONE);
-				group.setText(XMLWizardsMessages._UI_WIZARD_CONTENT_OPTIONS);
-
-				GridLayout layout = new GridLayout();
-				layout.numColumns = 1;
-				layout.makeColumnsEqualWidth = true;
-				layout.marginWidth = 0;
-				group.setLayout(layout);
-				group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-				radioButton = new Button[4];
-
-				radioButton[0] = new Button(group, SWT.CHECK);
-				radioButton[0].setText(XMLWizardsMessages._UI_WIZARD_CREATE_OPTIONAL_ATTRIBUTES);
-				radioButton[0].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				radioButton[0].setSelection(false);
-				PlatformUI.getWorkbench().getHelpSystem().setHelp(radioButton[0], IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTROOTELEMENT1_HELPID);
-
-				radioButton[1] = new Button(group, SWT.CHECK);
-				radioButton[1].setText(XMLWizardsMessages._UI_WIZARD_CREATE_OPTIONAL_ELEMENTS);
-				radioButton[1].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				radioButton[1].setSelection(false);
-				PlatformUI.getWorkbench().getHelpSystem().setHelp(radioButton[1], IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTROOTELEMENT2_HELPID);
-
-				radioButton[2] = new Button(group, SWT.CHECK);
-				radioButton[2].setText(XMLWizardsMessages._UI_WIZARD_CREATE_FIRST_CHOICE);
-				radioButton[2].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				radioButton[2].setSelection(true);
-				PlatformUI.getWorkbench().getHelpSystem().setHelp(radioButton[2], IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTROOTELEMENT3_HELPID);
-
-				radioButton[3] = new Button(group, SWT.CHECK);
-				radioButton[3].setText(XMLWizardsMessages._UI_WIZARD_FILL_ELEMENTS_AND_ATTRIBUTES);
-				radioButton[3].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-				radioButton[3].setSelection(true);
-				PlatformUI.getWorkbench().getHelpSystem().setHelp(radioButton[3], IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTROOTELEMENT4_HELPID);
-				/*
-				 * radioButton = new Button[2];
-				 * 
-				 * radioButton[0] = new Button(group, SWT.RADIO);
-				 * radioButton[0].setText(XMLWizardsMessages.getString("_UI_WIZARD_CREATE_REQUIRED"));
-				 * radioButton[0].setLayoutData(new
-				 * GridData(GridData.FILL_HORIZONTAL));
-				 * radioButton[0].setSelection(true);
-				 * WorkbenchHelp.setHelp(radioButton[0],
-				 * XMLBuilderContextIds.XMLC_CREATE_REQUIRED_ONLY);
-				 * 
-				 * radioButton[1] = new Button(group, SWT.RADIO);
-				 * radioButton[1].setText(XMLWizardsMessages.getString("_UI_WIZARD_CREATE_OPTIONAL"));
-				 * radioButton[1].setLayoutData(new
-				 * GridData(GridData.FILL_HORIZONTAL));
-				 * WorkbenchHelp.setHelp(radioButton[1],
-				 * XMLBuilderContextIds.XMLC_CREATE_REQUIRED_AND_OPTION);
-				 */
-			}
-
-			// add the grammar specific generation options
-			//
-			{
-				pageBook = new PageBook(containerGroup, SWT.NONE);
-				pageBook.setLayoutData(new GridData(GridData.FILL_BOTH));
-				xsdOptionsPanel = new XSDOptionsPanel(this, pageBook);
-				dtdOptionsPanel = new DTDOptionsPanel(this, pageBook);
-				pageBook.showPage(xsdOptionsPanel);
-			}
-		}
-
-		public void widgetSelected(SelectionEvent event) {
-			int index = combo.getSelectionIndex();
-			String rootElementName = (index != -1) ? combo.getItem(index) : null;
-			generator.setRootElementName(rootElementName);
-		}
-
-		public void widgetDefaultSelected(SelectionEvent event) {
-			// do nothing
-		}
-
-		public void setVisible(boolean visible) {
-			super.setVisible(visible);
-
-			if (visible) {
-				try {
-					if (generator.getGrammarURI() == null) {
-						generator.setGrammarURI(selectGrammarFilePage.getURI());
-						generator.setXMLCatalogEntry(selectGrammarFilePage.getXMLCatalogEntry());
-					}
-					Assert.isNotNull(generator.getGrammarURI());
-
-					if (generator.getCMDocument() == null) {
-						final String[] errorInfo = new String[2];
-						final CMDocument[] cmdocs = new CMDocument[1];
-						Runnable r = new Runnable() {
-							public void run() {
-								cmdocs[0] = NewXMLGenerator.createCMDocument(generator.getGrammarURI(), errorInfo);
-							}
-						};
-						org.eclipse.swt.custom.BusyIndicator.showWhile(Display.getCurrent(), r);
-
-						generator.setCMDocument(cmdocs[0]);
-						cmDocumentErrorMessage = errorInfo[1];
-					}
-
-					combo.removeAll();
-					if ((generator.getCMDocument() != null) && (cmDocumentErrorMessage == null)) {
-						CMNamedNodeMap nameNodeMap = generator.getCMDocument().getElements();
-						Vector nameNodeVector = new Vector();
-
-						for (int i = 0; i < nameNodeMap.getLength(); i++) {
-							CMElementDeclaration cmElementDeclaration = (CMElementDeclaration) nameNodeMap.item(i);
-							Object value = cmElementDeclaration.getProperty("Abstract"); //$NON-NLS-1$
-							if (value != Boolean.TRUE) {
-								nameNodeVector.add(cmElementDeclaration.getElementName());
-							}
-						}
-
-						Object[] nameNodeArray = nameNodeVector.toArray();
-						if (nameNodeArray.length > 0) {
-							Arrays.sort(nameNodeArray, Collator.getInstance());
-						}
-
-						String defaultRootName = (String) (generator.getCMDocument()).getProperty("http://org.eclipse.wst/cm/properties/defaultRootName"); //$NON-NLS-1$
-						int defaultRootIndex = -1;
-						for (int i = 0; i < nameNodeArray.length; i++) {
-							String elementName = (String) nameNodeArray[i];
-
-							combo.add(elementName);
-							if ((defaultRootName != null) && defaultRootName.equals(elementName)) {
-								defaultRootIndex = i;
-							}
-						}
-
-						if (nameNodeArray.length > 0) {
-							defaultRootIndex = defaultRootIndex != -1 ? defaultRootIndex : 0;
-							combo.select(defaultRootIndex);
-							generator.setRootElementName(combo.getItem(defaultRootIndex));
-						}
-					}
-
-					if (generator.getGrammarURI().endsWith("xsd")) //$NON-NLS-1$
-					{
-						pageBook.showPage(xsdOptionsPanel);
-						generator.setDefaultSystemId(getDefaultSystemId());
-						generator.createNamespaceInfoList();
-
-						// Provide default namespace prefix if none
-						for (int i = 0; i < generator.namespaceInfoList.size(); i++) {
-							NamespaceInfo nsinfo = (NamespaceInfo) generator.namespaceInfoList.get(i);
-							if (((nsinfo.prefix == null) || (nsinfo.prefix.trim().length() == 0)) && ((nsinfo.uri != null) && (nsinfo.uri.trim().length() != 0))) {
-								nsinfo.prefix = getDefaultPrefix(generator.namespaceInfoList);
-							}
-						}
-						xsdOptionsPanel.setNamespaceInfoList(generator.namespaceInfoList);
-					}
-					else if (generator.getGrammarURI().endsWith("dtd")) //$NON-NLS-1$
-					{
-						pageBook.showPage(dtdOptionsPanel);
-						dtdOptionsPanel.update();
-					}
-				}
-				catch (Exception e) {
-					// XMLBuilderPlugin.getPlugin().getMsgLogger().writeCurrentThread();
-				}
-
-				/*
-				 * String errorMessage = computeErrorMessage(); if
-				 * (errorMessage == null) super.setVisible(visible);
-				 */
-
-				updateErrorMessage();
-			}
-		}
-
-		private String getDefaultPrefix(List nsInfoList) {
-			String defaultPrefix = "p"; //$NON-NLS-1$
-			if (nsInfoList == null) {
-				return defaultPrefix;
-			}
-
-			Vector v = new Vector();
-			for (int i = 0; i < nsInfoList.size(); i++) {
-				NamespaceInfo nsinfo = (NamespaceInfo) nsInfoList.get(i);
-				if (nsinfo.prefix != null) {
-					v.addElement(nsinfo.prefix);
-				}
-			}
-
-			if (v.contains(defaultPrefix)) {
-				String s = defaultPrefix;
-				for (int j = 0; v.contains(s); j++) {
-					s = defaultPrefix + Integer.toString(j);
-				}
-				return s;
-			}
-			return defaultPrefix;
-		}
-
-		public boolean isPageComplete() {
-			boolean complete = ((generator.getRootElementName() != null) && (generator.getRootElementName().length() > 0)) && (getErrorMessage() == null);
-
-			if (complete) {
-				/*
-				 * int buildPolicy = radioButton[0].getSelection() ?
-				 * DOMContentBuilder.BUILD_ONLY_REQUIRED_CONTENT :
-				 * DOMContentBuilder.BUILD_ALL_CONTENT;
-				 */
-				int buildPolicy = 0;
-				if (radioButton[0].getSelection()) {
-					buildPolicy = buildPolicy | DOMContentBuilder.BUILD_OPTIONAL_ATTRIBUTES;
-				}
-				if (radioButton[1].getSelection()) {
-					buildPolicy = buildPolicy | DOMContentBuilder.BUILD_OPTIONAL_ELEMENTS;
-				}
-				if (radioButton[2].getSelection()) {
-					buildPolicy = buildPolicy | DOMContentBuilder.BUILD_FIRST_CHOICE | DOMContentBuilder.BUILD_FIRST_SUBSTITUTION;
-				}
-				if (radioButton[3].getSelection()) {
-					buildPolicy = buildPolicy | DOMContentBuilder.BUILD_TEXT_NODES;
-				}
-
-				generator.setBuildPolicy(buildPolicy);
-			}
-
-			return complete;
-		}
-
-		public String computeErrorMessage() {
-			String errorMessage = null;
-
-			if (cmDocumentErrorMessage != null) {
-				errorMessage = cmDocumentErrorMessage;
-			}
-			else if ((generator.getRootElementName() == null) || (generator.getRootElementName().length() == 0)) {
-				errorMessage = XMLWizardsMessages._ERROR_ROOT_ELEMENT_MUST_BE_SPECIFIED;
-			}
-
-			return errorMessage;
-		}
-
-
-		public void updateErrorMessage() {
-			String errorMessage = computeErrorMessage();
-			if (errorMessage == null) {
-				if (xsdOptionsPanel.isVisible()) {
-
-					errorMessage = xsdOptionsPanel.computeErrorMessage();
-				}
-				else if (dtdOptionsPanel.isVisible()) {
-					errorMessage = dtdOptionsPanel.computeErrorMessage();
-				}
-			}
-			setErrorMessage(errorMessage);
-			setPageComplete(isPageComplete());
-		}
-	}
-
-	// //////////////End SelectRootElementPage
-
-
-
-	public static GridLayout createOptionsPanelLayout() {
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.marginWidth = 0;
-		gridLayout.horizontalSpacing = 0;
-		return gridLayout;
-	}
-
-
-
-	/**
-	 * 
-	 */
-	class XSDOptionsPanel extends Composite {
-		protected String errorMessage = null;
-		protected SelectRootElementPage parentPage;
-		protected CommonEditNamespacesDialog editNamespaces;
-		private IPath currentPath = null;
-
-		public XSDOptionsPanel(SelectRootElementPage parentPage, Composite parent) {
-			super(parent, SWT.NONE);
-			this.parentPage = parentPage;
-
-			setLayout(createOptionsPanelLayout());
-			setLayoutData(new GridData(GridData.FILL_BOTH));
-		}
-		
-		private CommonEditNamespacesDialog getEditNamespaces() {
-			if (editNamespaces == null) {
-				Composite co = new Composite(this, SWT.NONE);
-				co.setLayout(new GridLayout());
-				String tableTitle = XMLWizardsMessages._UI_LABEL_NAMESPACE_INFORMATION;
-				editNamespaces = new CommonEditNamespacesDialog(co, null, tableTitle, true, true);
-				this.layout();
-			}
-			return editNamespaces;
-		}
-
-		public void setNamespaceInfoList(List list) {
-			CommonEditNamespacesDialog editDialog = getEditNamespaces();
-			
-		    if (newFilePage != null) {
-		      IPath newPath = newFilePage.getContainerFullPath();
-		      if (newPath != null) {
-		        if (!newPath.equals(currentPath)) {
-	                String resourceURI = "platform:/resource" + newPath.toString() + "/dummy"; //$NON-NLS-1$ //$NON-NLS-2$
-	                String resolvedPath = URIHelper.normalize(resourceURI, null, null);
-	                resolvedPath = URIHelper.removeProtocol(resolvedPath);
-	                
-	                currentPath = new Path(resolvedPath);
-	                editDialog.setResourcePath(currentPath);
-		        }
-		      }
-		    }
-		    editDialog.setNamespaceInfoList(list);
-		    editDialog.updateErrorMessage(list);
-		}
-
-		public void updateErrorMessage(List namespaceInfoList) {
-			NamespaceInfoErrorHelper helper = new NamespaceInfoErrorHelper();
-			errorMessage = helper.computeErrorMessage(namespaceInfoList, null);
-			parentPage.updateErrorMessage();
-		}
-
-
-		public String computeErrorMessage() {
-			return errorMessage;
-		}
-	}
-
-
-	/**
-	 * 
-	 */
-	public class DTDOptionsPanel extends Composite implements ModifyListener {
-		protected Group group;
-		protected Text systemIdField;
-		protected Text publicIdField;
-		protected SelectRootElementPage parentPage;
-
-		public DTDOptionsPanel(SelectRootElementPage parentPage, Composite parent) {
-			super(parent, SWT.NONE);
-			this.parentPage = parentPage;
-			setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-			setLayout(createOptionsPanelLayout());
-			Group group = new Group(this, SWT.NONE);
-			group.setText(XMLWizardsMessages._UI_LABEL_DOCTYPE_INFORMATION);
-
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 2;
-			group.setLayout(layout);
-			group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-			Label publicIdLabel = new Label(group, SWT.NONE);
-			publicIdLabel.setText(XMLWizardsMessages._UI_LABEL_PUBLIC_ID);
-			publicIdField = new Text(group, SWT.SINGLE | SWT.BORDER);
-			publicIdField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			publicIdField.addModifyListener(this);
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(publicIdField, IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTROOTELEMENT5_HELPID);
-
-			Label systemIdLabel = new Label(group, SWT.NONE);
-			systemIdLabel.setText(XMLWizardsMessages._UI_LABEL_SYSTEM_ID);
-			systemIdField = new Text(group, SWT.SINGLE | SWT.BORDER);
-			systemIdField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			systemIdField.addModifyListener(this);
-			PlatformUI.getWorkbench().getHelpSystem().setHelp(systemIdField, IXMLWizardHelpContextIds.XML_NEWWIZARD_SELECTROOTELEMENT6_HELPID);
-		}
-
-		public void update() {
-			String thePublicId = null;
-			String theSystemId = null;
-			ICatalogEntry xmlCatalogEntry = generator.getXMLCatalogEntry();
-
-			if (xmlCatalogEntry != null) {
-				if (xmlCatalogEntry.getEntryType() == ICatalogEntry.ENTRY_TYPE_PUBLIC) {
-					thePublicId = xmlCatalogEntry.getKey();
-					theSystemId = xmlCatalogEntry.getAttributeValue(ICatalogEntry.ATTR_WEB_URL);
-					if (theSystemId == null) {
-						theSystemId = generator.getGrammarURI().startsWith("http:") ? generator.getGrammarURI() : URIHelper.getLastSegment(generator.getGrammarURI()); //$NON-NLS-1$
-					}
-				}
-				else {
-					theSystemId = xmlCatalogEntry.getKey();
-				}
-			}
-			else {
-				theSystemId = getDefaultSystemId();
-			}
-
-			publicIdField.setText(thePublicId != null ? thePublicId : ""); //$NON-NLS-1$
-			systemIdField.setText(theSystemId != null ? theSystemId : ""); //$NON-NLS-1$
-		}
-
-		public void modifyText(ModifyEvent e) {
-			generator.setSystemId(systemIdField.getText());
-			generator.setPublicId(publicIdField.getText());
-			parentPage.updateErrorMessage();
-		}
-
-		public String computeErrorMessage() {
-			return null;
-		}
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLImportActionDelegate.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLImportActionDelegate.java
deleted file mode 100644
index 4b923c4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLImportActionDelegate.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.util.Iterator;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-// TODO cs... rename this class NewXMLActionDelegate
-// we need to re-add pre-validation using the validation framework API's
-// since we also need to add validation to the 'New XML' case, this
-// prevalidation
-// function should really go into the NewWizard somewhere
-//
-public class XMLImportActionDelegate implements IActionDelegate {
-	/**
-	 * Checks the current selection and runs the separate browser to show the
-	 * content of the Readme file. This code shows how to launch separate
-	 * browsers that are not VA/Base desktop parts.
-	 * 
-	 * @param action
-	 *            the action that was performed
-	 */
-	public void run(IAction action) {
-		IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		ISelection selection = workbenchWindow.getSelectionService().getSelection();
-		Object selectedObject = getSelection(selection);
-
-		if ((selectedObject instanceof IFile) && (selection instanceof IStructuredSelection)) {
-			IFile file = (IFile) selectedObject;
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			try {
-				NewXMLWizard.showDialog(workbenchWindow.getShell(), file, structuredSelection);
-			}
-			catch (Exception e) {
-				// XMLCorePlugin.getDefault().getLog().log();
-			}
-		}
-	}
-
-	/**
-	 * unused
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		// unused
-	}
-
-	// scammed from WindowUtility
-	//
-	public static Object getSelection(ISelection selection) {
-		if (selection == null) {
-			return null;
-		} // end of if ()
-
-		Object result = null;
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection es = (IStructuredSelection) selection;
-			Iterator i = es.iterator();
-			if (i.hasNext()) {
-				result = i.next();
-			}
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLSchemaValidationChecker.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLSchemaValidationChecker.java
deleted file mode 100644
index e56a3d3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLSchemaValidationChecker.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-public class XMLSchemaValidationChecker {
-	public boolean isValid(IFile ifile) {
-		String xsdFileName = ifile.getLocation().toString();
-		return isValid(xsdFileName);
-	}
-
-	/**
-	 * Should this be implemented as a Validator and simply called as such
-	 * with a reporter that only checks the results for severity = error? Or
-	 * should the Xerces requirement be broken using a plug-in extension?
-	 */
-
-	public boolean isValid(String xsdFileName) {
-		// DOMASBuilderImpl builder = new DOMASBuilderImpl();
-		// DOMErrorHandler errorHandler = new DOMErrorHandler();
-		// builder.setErrorHandler(errorHandler);
-		try {
-			// String uri =
-			URIHelper.getURIForFilePath(xsdFileName);
-			// ASModel model = builder.parseASURI(uri);
-			// if (errorHandler.hasError())
-			// return false;
-		}
-		catch (Exception e) // invalid schema
-		{
-			return false;
-		}
-
-		return true;
-	}
-
-	// inner class
-	class DOMErrorHandler implements ErrorHandler {
-		private boolean hasError = false;
-
-		public boolean hasError() {
-			return hasError;
-		}
-
-		public void error(SAXParseException err) {
-			hasError = true;
-		}
-
-		public void fatalError(SAXParseException exception) throws SAXException {
-			hasError = true;
-		}
-
-		public void warning(SAXParseException exception) throws SAXException {
-			// not an error
-		}
-	} // end DOMErrorHandlerImpl
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizard.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizard.java
deleted file mode 100644
index ffea5d4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizard.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-
-public class XMLWizard {
-	protected static XMLWizard instance = new XMLWizard();
-
-	public synchronized static XMLWizard getInstance() {
-		return instance;
-	}
-
-	public XMLWizard() {
-		instance = this;
-
-	}
-
-	public ImageDescriptor getImageDescriptor(String name) {
-		try {
-			URL url = new URL(Platform.getBundle("org.eclipse.wst.xml.ui").getEntry("/"), name); //$NON-NLS-1$ //$NON-NLS-2$
-			return ImageDescriptor.createFromURL(url);
-		}
-		catch (MalformedURLException e) {
-			return ImageDescriptor.getMissingImageDescriptor();
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizardsMessages.java b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizardsMessages.java
deleted file mode 100644
index c2bec60..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/XMLWizardsMessages.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- * David Carver/STAR Standard - d_a_carver@yahoo.com - bug 192568
- **********************************************************************/
-package org.eclipse.wst.xml.ui.internal.wizards;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by XML Wizards
- * 
- * @plannedfor 1.0
- */
-public class XMLWizardsMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.ui.internal.wizards.wizardResource";//$NON-NLS-1$
-
-	public static String _UI_DIALOG_NEW_TITLE;
-	public static String _UI_DIALOG_TITLE_INVALID_GRAMMAR;
-	public static String _UI_DIALOG_MESSAGE_INVALID_GRAMMAR;
-	public static String _UI_WIZARD_CREATE_NEW_TITLE;
-	public static String _UI_RADIO_XML_FROM_DTD;
-	public static String _UI_RADIO_XML_FROM_SCHEMA;
-	public static String _UI_RADIO_XML_FROM_SCRATCH;
-	public static String _UI_WIZARD_CREATE_XML_HEADING;
-	public static String _UI_WIZARD_CREATE_XML_EXPL;
-	public static String _UI_WIZARD_CREATE_XML_FILE_HEADING;
-	public static String _UI_WIZARD_CREATE_XML_FILE_EXPL;
-	public static String _UI_WIZARD_SELECT_DTD_FILE_DESC;
-	public static String _UI_WIZARD_SELECT_DTD_FILE_TITLE;
-	public static String _UI_WIZARD_SELECT_XSD_FILE_DESC;
-	public static String _UI_WIZARD_SELECT_XSD_FILE_TITLE;
-	public static String _UI_WIZARD_SELECT_ROOT_HEADING;
-	public static String _UI_WIZARD_SELECT_ROOT_EXPL;
-	public static String _UI_LABEL_ROOT_ELEMENT;
-	public static String _UI_WARNING_TITLE_NO_ROOT_ELEMENTS;
-	public static String _UI_WARNING_MSG_NO_ROOT_ELEMENTS;
-	public static String _UI_LABEL_NO_LOCATION_HINT;
-	public static String _UI_WARNING_MSG_NO_LOCATION_HINT_1;
-	public static String _UI_WARNING_MSG_NO_LOCATION_HINT_2;
-	public static String _UI_WARNING_MSG_NO_LOCATION_HINT_3;
-	public static String _UI_WIZARD_CONTENT_OPTIONS;
-	public static String _UI_WIZARD_CREATE_REQUIRED;// commented out
-	public static String _UI_WIZARD_CREATE_OPTIONAL;// commented out
-	public static String _UI_WIZARD_CREATE_OPTIONAL_ATTRIBUTES;
-	public static String _UI_WIZARD_CREATE_OPTIONAL_ELEMENTS;
-	public static String _UI_WIZARD_CREATE_FIRST_CHOICE;
-	public static String _UI_WIZARD_FILL_ELEMENTS_AND_ATTRIBUTES;
-	public static String _UI_LABEL_DOCTYPE_INFORMATION;
-	public static String _UI_LABEL_SYSTEM_ID;
-	public static String _UI_LABEL_PUBLIC_ID;
-	public static String _UI_WARNING_URI_NOT_FOUND_COLON;
-	public static String _UI_INVALID_GRAMMAR_ERROR;
-	public static String _ERROR_BAD_FILENAME_EXTENSION;
-	public static String _ERROR_FILE_ALREADY_EXISTS;
-	public static String _ERROR_ROOT_ELEMENT_MUST_BE_SPECIFIED;
-	public static String _UI_LABEL_ERROR_SCHEMA_INVALID_INFO;
-	public static String _UI_LABEL_ERROR_DTD_INVALID_INFO;
-	public static String _UI_LABEL_ERROR_CATALOG_ENTRY_INVALID;
-	public static String _UI_LABEL_NAMESPACE_INFORMATION;
-	public static String Validation_Plugins_Unavailable;
-	public static String Validation_cannot_be_performed;
-	public static String ExampleProjectCreationOperation_op_desc;
-	public static String ExampleProjectCreationOperation_op_desc_proj;
-	public static String ExampleProjectCreationWizard_title;
-	public static String ExampleProjectCreationWizard_op_error_title;
-	public static String ExampleProjectCreationWizard_op_error_message;
-	public static String ExampleProjectCreationWizard_overwritequery_title;
-	public static String ExampleProjectCreationWizard_overwritequery_message;
-	public static String ExampleProjectCreationWizardPage_error_alreadyexists;
-
-	public static String NewXMLTemplatesWizardPage_0;
-	public static String NewXMLTemplatesWizardPage_1;
-	public static String NewXMLTemplatesWizardPage_2;
-	public static String NewXMLTemplatesWizardPage_3;
-	public static String NewXMLTemplatesWizardPage_4;
-	public static String NewXMLTemplatesWizardPage_5;
-	public static String NewXMLTemplatesWizardPage_6;
-	public static String NewXMLTemplatesWizardPage_7;
-	
-	public static String _UI_DIALOG_XMLCATALOG_IMPORT_TITLE;
-	public static String _UI_DIALOG_XMLCATALOG_EXPORT_TITLE;
-	public static String _UI_DIALOG_XMLCATALOG_EXPORT_DESCRIPTION;
-    public static String _UI_DIALOG_XMLCATALOG_IMPORT_DESCRIPTION;
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, XMLWizardsMessages.class);
-	}
-
-	private XMLWizardsMessages() {
-		// cannot create new instance
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/wizardResource.properties b/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/wizardResource.properties
deleted file mode 100644
index cfe6014..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src-wizards/org/eclipse/wst/xml/ui/internal/wizards/wizardResource.properties
+++ /dev/null
@@ -1,100 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     David Carver/STAR Standard - d_a_carver@yahoo.com - bug 192568
-###############################################################################
-! Properties file for component: XML Tools -  New XML Wizard
-! Packaged for translation in:  xml.zip
-
-!XMLImportActionDelegate
-_UI_DIALOG_NEW_TITLE        = New XML File
-_UI_DIALOG_TITLE_INVALID_GRAMMAR = Invalid Grammar
-_UI_DIALOG_MESSAGE_INVALID_GRAMMAR = The grammar file contains errors. If you proceed, an incorrect result file will be generated. Do you want to continue?
-
-!NewXMLBWizard
-_UI_WIZARD_CREATE_NEW_TITLE           = New XML File
-_UI_RADIO_XML_FROM_DTD                = Create XML file from a &DTD file
-_UI_RADIO_XML_FROM_SCHEMA             = Create XML file from an &XML schema file
-_UI_RADIO_XML_FROM_SCRATCH            = Create XML file from an XML &template
-_UI_WIZARD_CREATE_XML_HEADING         = Create XML File From
-_UI_WIZARD_CREATE_XML_EXPL            = Select how you would like to create your XML file.
-_UI_WIZARD_CREATE_XML_FILE_HEADING    = XML
-_UI_WIZARD_CREATE_XML_FILE_EXPL       = Create a new XML file.
-_UI_WIZARD_SELECT_DTD_FILE_DESC       = Select the DTD file to create the XML file.
-_UI_WIZARD_SELECT_DTD_FILE_TITLE      = Select DTD File
-_UI_WIZARD_SELECT_XSD_FILE_DESC       = Select the schema file to create the XML file.
-_UI_WIZARD_SELECT_XSD_FILE_TITLE      = Select XML Schema File
-_UI_WIZARD_SELECT_ROOT_HEADING        = Select Root Element
-_UI_WIZARD_SELECT_ROOT_EXPL           = Select the root element of the XML file.
-_UI_LABEL_ROOT_ELEMENT                = Root element:
-_UI_WARNING_TITLE_NO_ROOT_ELEMENTS    = No Root Elements
-_UI_WARNING_MSG_NO_ROOT_ELEMENTS      = No root element exists since the schema provided has no global elements.
-_UI_LABEL_NO_LOCATION_HINT            = Unspecified Namespace Location
-_UI_WARNING_MSG_NO_LOCATION_HINT_1    = You have not specified a location hint for one or more namespace entries.
-_UI_WARNING_MSG_NO_LOCATION_HINT_2    = Elements from these namespaces will not be generated. This may lead to an invalid generated document.
-_UI_WARNING_MSG_NO_LOCATION_HINT_3    = Click Yes to continue, Click No to go back and specify the location hints.
-_UI_WIZARD_CONTENT_OPTIONS            = Content options
-
-_UI_WIZARD_CREATE_REQUIRED            = &Create required content only
-_UI_WIZARD_CREATE_OPTIONAL            = Create required and &optional content
-
-_UI_WIZARD_CREATE_OPTIONAL_ATTRIBUTES = Create optional &attributes
-_UI_WIZARD_CREATE_OPTIONAL_ELEMENTS   = Create optional e&lements
-_UI_WIZARD_CREATE_FIRST_CHOICE        = Create first choice of required &choice
-_UI_WIZARD_FILL_ELEMENTS_AND_ATTRIBUTES = Fill elements and attributes with &data
-
-_UI_LABEL_DOCTYPE_INFORMATION         = Document type information
-_UI_LABEL_SYSTEM_ID                   = &System ID:
-_UI_LABEL_PUBLIC_ID                   = &Public ID:
-
-_UI_WARNING_URI_NOT_FOUND_COLON       = The specified resource cannot be located :
-
-!NewModelWizard
-_UI_INVALID_GRAMMAR_ERROR             = Invalid Grammar
-
-!NewModelWizard
-_ERROR_BAD_FILENAME_EXTENSION         = The file name must end in one of the following extensions {0}.
-_ERROR_FILE_ALREADY_EXISTS            = The same file already exists.
-_ERROR_ROOT_ELEMENT_MUST_BE_SPECIFIED = A root element must be specified.
-_UI_LABEL_ERROR_SCHEMA_INVALID_INFO   = The schema file contains errors. Open it in the XML schema editor for details.
-_UI_LABEL_ERROR_DTD_INVALID_INFO      = The DTD file contains errors. Open it in the DTD editor for details.
-
-_UI_LABEL_ERROR_CATALOG_ENTRY_INVALID = The selected catalog entry specifies a URI that can not be located.
-
-_UI_LABEL_NAMESPACE_INFORMATION=Namespace Information
-
-Validation_Plugins_Unavailable=Validation Plugins Unavailable
-Validation_cannot_be_performed=Validation cannot be performed because the validation plugins were disabled or not found.  The generated file may be invalid.  Do you wish to continue?
-
-!ImportXMLCatalogWizard
-_UI_DIALOG_XMLCATALOG_IMPORT_TITLE    = Import XML Catalog
-_UI_DIALOG_XMLCATALOG_IMPORT_DESCRIPTION = Import all entries from an existing XML Catalog into the User Catalog.
-
-!ExportXMLCatalogWizard
-_UI_DIALOG_XMLCATALOG_EXPORT_TITLE    = Export Existing XML Catalog
-_UI_DIALOG_XMLCATALOG_EXPORT_DESCRIPTION = Export all existing User Catalog entries.
-#
-# ExampleProject
-ExampleProjectCreationOperation_op_desc=Creating example projects...
-ExampleProjectCreationOperation_op_desc_proj=Configuring project...
-ExampleProjectCreationWizard_title=New Example Project
-ExampleProjectCreationWizard_op_error_title=Project Creation Failed
-ExampleProjectCreationWizard_op_error_message=Project could not be created.
-ExampleProjectCreationWizard_overwritequery_title=Overwrite
-ExampleProjectCreationWizard_overwritequery_message=Do you want to overwrite {0}?
-ExampleProjectCreationWizardPage_error_alreadyexists=Project already exists.
-
-NewXMLTemplatesWizardPage_0=Select XML Template
-NewXMLTemplatesWizardPage_1=Select a template as initial content in the XML page.
-NewXMLTemplatesWizardPage_2=Name
-NewXMLTemplatesWizardPage_3=Description
-NewXMLTemplatesWizardPage_4=&Use XML Template
-NewXMLTemplatesWizardPage_5=&Preview:
-NewXMLTemplatesWizardPage_6=Templates are 'New XML' templates found in the <a>XML Templates</a> preference page.
-NewXMLTemplatesWizardPage_7=&Templates:
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java
deleted file mode 100644
index 9fbb849..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/StructuredTextViewerConfigurationXML.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.formatter.IContentFormatter;
-import org.eclipse.jface.text.formatter.MultiPassContentFormatter;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.wst.sse.core.text.IStructuredPartitions;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.text.rules.StructuredTextPartitionerForXML;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-import org.eclipse.wst.xml.ui.internal.XMLFormattingStrategy;
-import org.eclipse.wst.xml.ui.internal.autoedit.AutoEditStrategyForTabs;
-import org.eclipse.wst.xml.ui.internal.contentassist.NoRegionContentAssistProcessor;
-import org.eclipse.wst.xml.ui.internal.contentassist.XMLContentAssistProcessor;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.eclipse.wst.xml.ui.internal.style.LineStyleProviderForXML;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-/**
- * Configuration for a source viewer which shows XML content.
- * <p>
- * Clients can subclass and override just those methods which must be specific
- * to their needs.
- * </p>
- * 
- * @see org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration
- * @since 1.0
- */
-public class StructuredTextViewerConfigurationXML extends StructuredTextViewerConfiguration {
-	/*
-	 * One instance per configuration because not sourceviewer-specific and
-	 * it's a String array
-	 */
-	private String[] fConfiguredContentTypes;
-	/*
-	 * One instance per configuration
-	 */
-	private LineStyleProvider fLineStyleProviderForXML;
-	private ILabelProvider fStatusLineLabelProvider;
-
-	/**
-	 * Create new instance of StructuredTextViewerConfigurationXML
-	 */
-	public StructuredTextViewerConfigurationXML() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-
-	public IAutoEditStrategy[] getAutoEditStrategies(ISourceViewer sourceViewer, String contentType) {
-		List allStrategies = new ArrayList(0);
-
-		IAutoEditStrategy[] superStrategies = super.getAutoEditStrategies(sourceViewer, contentType);
-		for (int i = 0; i < superStrategies.length; i++) {
-			allStrategies.add(superStrategies[i]);
-		}
-
-		// be sure this is last, so it can modify any results form previous
-		// commands that might on on same partiion type.
-		// add auto edit strategy that handles when tab key is pressed
-		allStrategies.add(new AutoEditStrategyForTabs());
-
-		return (IAutoEditStrategy[]) allStrategies.toArray(new IAutoEditStrategy[allStrategies.size()]);
-	}
-
-	public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-
-		if (fConfiguredContentTypes == null) {
-			String[] xmlTypes = StructuredTextPartitionerForXML.getConfiguredContentTypes();
-			fConfiguredContentTypes = new String[xmlTypes.length + 2];
-			fConfiguredContentTypes[0] = IStructuredPartitions.DEFAULT_PARTITION;
-			fConfiguredContentTypes[1] = IStructuredPartitions.UNKNOWN_PARTITION;
-			int index = 0;
-			System.arraycopy(xmlTypes, 0, fConfiguredContentTypes, index += 2, xmlTypes.length);
-		}
-		return fConfiguredContentTypes;
-	}
-
-	protected IContentAssistProcessor[] getContentAssistProcessors(ISourceViewer sourceViewer, String partitionType) {
-		IContentAssistProcessor[] processors = null;
-
-		if ((partitionType == IStructuredPartitions.DEFAULT_PARTITION) || (partitionType == IXMLPartitions.XML_DEFAULT)) {
-			processors = new IContentAssistProcessor[]{new XMLContentAssistProcessor()};
-		}
-		else if (partitionType == IStructuredPartitions.UNKNOWN_PARTITION) {
-			processors = new IContentAssistProcessor[]{new NoRegionContentAssistProcessor()};
-		}
-
-		return processors;
-	}
-
-	public IContentFormatter getContentFormatter(ISourceViewer sourceViewer) {
-		IContentFormatter formatter = super.getContentFormatter(sourceViewer);
-		// super was unable to create a formatter, probably because
-		// sourceViewer does not have document set yet, so just create a
-		// generic one
-		if (!(formatter instanceof MultiPassContentFormatter))
-			formatter = new MultiPassContentFormatter(getConfiguredDocumentPartitioning(sourceViewer), IXMLPartitions.XML_DEFAULT);
-		((MultiPassContentFormatter) formatter).setMasterStrategy(new XMLFormattingStrategy());		
-//		((MultiPassContentFormatter) formatter).setMasterStrategy(new StructuredFormattingStrategy(new FormatProcessorXML()));
-
-		return formatter;
-	}
-
-	public String[] getIndentPrefixes(ISourceViewer sourceViewer, String contentType) {
-		Vector vector = new Vector();
-
-		// prefix[0] is either '\t' or ' ' x tabWidth, depending on preference
-		Preferences preferences = XMLCorePlugin.getDefault().getPluginPreferences();
-		int indentationWidth = preferences.getInt(XMLCorePreferenceNames.INDENTATION_SIZE);
-		String indentCharPref = preferences.getString(XMLCorePreferenceNames.INDENTATION_CHAR);
-		boolean useSpaces = XMLCorePreferenceNames.SPACE.equals(indentCharPref);
-
-		for (int i = 0; i <= indentationWidth; i++) {
-			StringBuffer prefix = new StringBuffer();
-			boolean appendTab = false;
-
-			if (useSpaces) {
-				for (int j = 0; j + i < indentationWidth; j++) {
-					prefix.append(' ');
-				}
-
-				if (i != 0) {
-					appendTab = true;
-				}
-			}
-			else {
-				for (int j = 0; j < i; j++) {
-					prefix.append(' ');
-				}
-
-				if (i != indentationWidth) {
-					appendTab = true;
-				}
-			}
-
-			if (appendTab) {
-				prefix.append('\t');
-				vector.add(prefix.toString());
-				// remove the tab so that indentation - tab is also an indent
-				// prefix
-				prefix.deleteCharAt(prefix.length() - 1);
-			}
-			vector.add(prefix.toString());
-		}
-
-		vector.add(""); //$NON-NLS-1$
-
-		return (String[]) vector.toArray(new String[vector.size()]);
-	}
-
-	public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-		LineStyleProvider[] providers = null;
-
-		if ((partitionType == IXMLPartitions.XML_DEFAULT) || (partitionType == IXMLPartitions.XML_CDATA) || (partitionType == IXMLPartitions.XML_COMMENT) || (partitionType == IXMLPartitions.XML_DECLARATION) || (partitionType == IXMLPartitions.XML_PI)) {
-			providers = new LineStyleProvider[]{getLineStyleProviderForXML()};
-		}
-
-		return providers;
-	}
-
-	private LineStyleProvider getLineStyleProviderForXML() {
-		if (fLineStyleProviderForXML == null) {
-			fLineStyleProviderForXML = new LineStyleProviderForXML();
-		}
-		return fLineStyleProviderForXML;
-	}
-
-	public ILabelProvider getStatusLineLabelProvider(ISourceViewer sourceViewer) {
-		if (fStatusLineLabelProvider == null) {
-			fStatusLineLabelProvider = new JFaceNodeLabelProvider() {
-				public String getText(Object element) {
-					if (element == null)
-						return null;
-
-					StringBuffer s = new StringBuffer();
-					Node node = (Node) element;
-					while (node != null) {
-						if (node.getNodeType() != Node.DOCUMENT_NODE) {
-							s.insert(0, super.getText(node));
-						}
-
-						if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-							node = ((Attr) node).getOwnerElement();
-						else
-							node = node.getParentNode();
-					
-						if (node != null && node.getNodeType() != Node.DOCUMENT_NODE) {
-							s.insert(0, IPath.SEPARATOR);
-						}
-					}
-					return s.toString();
-				}
-
-			};
-		}
-		return fStatusLineLabelProvider;
-	}
-
-	protected Map getHyperlinkDetectorTargets(ISourceViewer sourceViewer) {
-		Map targets = super.getHyperlinkDetectorTargets(sourceViewer);
-		targets.put(ContentTypeIdForXML.ContentTypeID_XML, null);
-		return targets;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/DOMObserver.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/DOMObserver.java
deleted file mode 100644
index 4b90cfb..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/DOMObserver.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal;
-
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.CMDocumentLoader;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.InferredGrammarBuildingCMDocumentLoader;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * This class is used to observe changes in the DOM and perform
- * occasional'scans' to deduce information. We use a delay timer mechanism to
- * ensure scans are made every couple of seconds to avoid performance
- * problems. Currently this class is used to keep track of referenced grammar
- * uri's within the document ensure that they are loaded by the
- * CMDocumentManager. We might want to generalize this class to perform other
- * suplimental information gathering that is suitable for 'time delayed'
- * computation (error hints etc.).
- */
-// TODO: Where should this class go?
-public class DOMObserver {
-
-
-	// An abstract adapter that ensures that the children of a new Node are
-	// also adapted
-	//
-	abstract class DocumentAdapter implements INodeAdapter {
-		public DocumentAdapter() {
-		}
-
-		public void connect(Document document) {
-			((INodeNotifier) document).addAdapter(this);
-			adapt(document.getDocumentElement());
-		}
-
-		public void dicconnect(Document document) {
-			((INodeNotifier) document).removeAdapter(this);
-		}
-
-		public void adapt(Element element) {
-			if (element != null) {
-				if (((INodeNotifier) element).getExistingAdapter(this) == null) {
-					((INodeNotifier) element).addAdapter(this);
-
-					for (Node child = element.getFirstChild(); child != null; child = child.getNextSibling()) {
-						if (child.getNodeType() == Node.ELEMENT_NODE) {
-							adapt((Element) child);
-						}
-					}
-				}
-			}
-		}
-
-		public boolean isAdapterForType(Object type) {
-			return type == this;
-		}
-
-		abstract public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);
-	}
-
-	/**
-	 * This class listens to the changes in the CMDocument and triggers a
-	 * CMDocument load
-	 */
-	class MyDocumentAdapter extends DocumentAdapter {
-
-		public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index) {
-			switch (eventType) {
-				case INodeNotifier.ADD : {
-					if (newValue instanceof Element) {
-						// System.out.println("ADD (to " +
-						// ((Node)notifier).getNodeName() + ") " +
-						// ((Element)newValue).getNodeName() + " old " +
-						// oldValue);
-						adapt((Element) newValue);
-					}
-					break;
-				}
-					// case INodeNotifier.REMOVE:
-				case INodeNotifier.CHANGE :
-				case INodeNotifier.STRUCTURE_CHANGED :
-				case INodeNotifier.CONTENT_CHANGED : {
-					Node node = (Node) notifier;
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						switch (eventType) {
-							case INodeNotifier.CHANGE :
-							case INodeNotifier.STRUCTURE_CHANGED : {
-								// structure change
-								invokeDelayedCMDocumentLoad();
-								break;
-							}
-							case INodeNotifier.CONTENT_CHANGED : {
-								// some content changed
-								break;
-							}
-						}
-					}
-					else if (node.getNodeType() == Node.DOCUMENT_NODE) {
-						invokeDelayedCMDocumentLoad();
-					}
-					break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * Intentionally left visible to the user
-	 */
-	class TimerJob extends Job {
-		public TimerJob() {
-			super(SSEUIMessages.LoadingReferencedGrammars);
-		}
-
-		public IStatus run(IProgressMonitor monitor) {
-			monitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-			Thread.currentThread().setPriority(Thread.MIN_PRIORITY);
-			invokeCMDocumentLoad();
-			monitor.done();
-			return Status.OK_STATUS;
-		}
-	}
-
-	private Job timer = new TimerJob();
-	protected Document fDocument;
-	protected boolean isGrammarInferenceEnabled;
-	/**
-	 * If true, DOMObserver is currently disabled and not loading the content
-	 * model
-	 */
-	private boolean fIsDisabled = false;
-	/**
-	 * If true, DOMObserver is currently trying to load the content model
-	 */
-	private boolean fIsLoading = false;
-
-	public DOMObserver(IStructuredModel model) {
-		fDocument = (model instanceof IDOMModel) ? ((IDOMModel) model).getDocument() : null;
-
-		if (fDocument != null) {
-			// here we create and init an adapter that will listen to
-			// changes to the document and contained elements
-			MyDocumentAdapter adapter = new MyDocumentAdapter();
-			adapter.connect(fDocument);
-
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(fDocument);
-			if ((modelQuery != null) && (modelQuery.getCMDocumentManager() != null)) {
-				CMDocumentManager cmDocumentManager = modelQuery.getCMDocumentManager();
-				cmDocumentManager.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, false);
-			}
-			
-			// attach a dom observer adapter to the document so others have access to
-			// domobserver if needed
-			INodeAdapter domObserverAdapter = ((INodeNotifier)fDocument).getExistingAdapter(DOMObserverAdapter.class);
-			if (domObserverAdapter == null) {
-				domObserverAdapter = new DOMObserverAdapter();
-				((INodeNotifier)fDocument).addAdapter(domObserverAdapter);
-			}
-			((DOMObserverAdapter)domObserverAdapter).setDOMObserver(this);
-		}
-	}
-
-	public void init() {
-		// CS: we seem to expose an XSD initialization problem when we do this
-		// immediately
-		// very nasty... I need to revist this problem with Ed Merks
-		//
-		timer.schedule();
-	}
-
-	public void invokeCMDocumentLoad() {
-		if (fIsDisabled) return;
-		try {
-			fIsLoading = true;
-			
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(fDocument);
-			if ((modelQuery != null) && (modelQuery.getCMDocumentManager() != null)) {
-				CMDocumentLoader loader = isGrammarInferenceEnabled ? new InferredGrammarBuildingCMDocumentLoader(fDocument, modelQuery) : new CMDocumentLoader(fDocument, modelQuery);
-				loader.loadCMDocuments();
-			}
-		} finally {
-			fIsLoading = false;
-		}
-	}
-
-	public void invokeDelayedCMDocumentLoad() {
-		if (fIsDisabled) return;
-		timer.schedule(2000);
-	}
-
-	public void setGrammarInferenceEnabled(boolean isEnabled) {
-		isGrammarInferenceEnabled = isEnabled;
-	}
-	
-	boolean setDisabled(boolean isDisabled, boolean forced) {
-		boolean success = true;
-		
-		if (fIsDisabled != isDisabled) {
-			fIsDisabled = isDisabled;
-			if (forced) {
-				if (isDisabled)
-					success = timer.cancel();
-				else
-					invokeCMDocumentLoad();
-			}
-		}
-		return success;
-	}
-	
-	boolean isLoading() {
-		return fIsLoading;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/DOMObserverAdapter.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/DOMObserverAdapter.java
deleted file mode 100644
index fcd60c4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/DOMObserverAdapter.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-
-/**
- * This is just an adapter that sits on a document node to allow clients
- * limited access to the DOMObserver. Clients who handle their own content
- * model document loading (as opposed to letting the DOMObserver do it) may
- * use this class to stop the DOMObserver from loading and possibly
- * interfering with the client's document loading.
- */
-public class DOMObserverAdapter implements INodeAdapter {
-	private DOMObserver fObserver = null;
-
-	public boolean isAdapterForType(Object type) {
-		return type == DOMObserverAdapter.class;
-	}
-
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		// do nothing
-	}
-
-	/**
-	 * The DOMObserver is the one that adds the adapter to the document node,
-	 * so it'll set itself up here as well.
-	 * 
-	 * @param observer
-	 */
-	void setDOMObserver(DOMObserver observer) {
-		fObserver = observer;
-	}
-
-	/**
-	 * Disable the DOMObserver to prevent it from future content model loading
-	 * for this document.
-	 * 
-	 * @param disable
-	 *            true if caller wants DOMObserver disabled. false if caller
-	 *            wants DOMObserver enabled.
-	 * @param force
-	 *            if true, DOMObserver will forcibly be disabled (if the
-	 *            DOMObserver model loading job is scheduled, it will be
-	 *            cancelled)
-	 * @return true if DOMObserver was successfully disabled. false if
-	 *         DOMObserver was already in the process of loading and was
-	 *         unable to stop
-	 */
-	public boolean disableObserver(boolean disable, boolean force) {
-		return fObserver.setDisabled(disable, force);
-	}
-
-	/**
-	 * Returns whether or not DOMObserver is currently attempting to load the
-	 * content model.
-	 * 
-	 * @return true if DOMObserver is currently in the process of loading the
-	 *         content models. false otherwise.
-	 */
-	public boolean isObserverLoading() {
-		return fObserver.isLoading();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/Logger.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/Logger.java
deleted file mode 100644
index b98e7ab..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/Logger.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal;
-
-
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.xml.ui"; //$NON-NLS-1$
-
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if ((level == OK_DEBUG) || (level == INFO_DEBUG) || (level == WARNING_DEBUG) || (level == ERROR_DEBUG)) {
-			if (!isDebugging()) {
-				return;
-			}
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) {
-			Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) {
-				Platform.getLog(bundle).log(statusObj);
-			}
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging()) {
-			return false;
-		}
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLFormattingStrategy.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLFormattingStrategy.java
deleted file mode 100644
index 39432ef..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLFormattingStrategy.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal;
-
-import java.util.LinkedList;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TypedPosition;
-import org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy;
-import org.eclipse.jface.text.formatter.FormattingContextProperties;
-import org.eclipse.jface.text.formatter.IFormattingContext;
-import org.eclipse.jface.text.formatter.IFormattingStrategyExtension;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.internal.Logger;
-import org.eclipse.wst.xml.core.internal.formatter.DefaultXMLPartitionFormatter;
-
-public class XMLFormattingStrategy extends ContextBasedFormattingStrategy implements IFormattingStrategyExtension {
-
-	/** Documents to be formatted by this strategy */
-	private final LinkedList fDocuments = new LinkedList();
-	/** Partitions to be formatted by this strategy */
-	private final LinkedList fPartitions = new LinkedList();
-	private IRegion fRegion;
-	private DefaultXMLPartitionFormatter formatter = new DefaultXMLPartitionFormatter();
-
-	/**
-	 * @param formatProcessor
-	 */
-	public XMLFormattingStrategy() {
-		super();
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#format()
-	 */
-	public void format() {
-		super.format();
-
-		final IDocument document = (IDocument) fDocuments.removeFirst();
-		final TypedPosition partition = (TypedPosition) fPartitions.removeFirst();
-
-		if (document != null && partition != null && fRegion != null) {
-			try {
-				if (document instanceof IStructuredDocument) {
-					IStructuredModel model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) document);
-					if (model != null) {
-						try {
-							TextEdit edit = formatter.format(model, fRegion.getOffset(), fRegion.getLength());
-							if (edit != null) {
-								try {
-									model.aboutToChangeModel();
-									edit.apply(document);
-								}
-								finally {
-									model.changedModel();
-								}
-							}
-						}
-						finally {
-							model.releaseFromEdit();
-						}
-					}
-				}
-			}
-			catch (BadLocationException e) {
-				// log for now, unless we find reason not to
-				Logger.log(Logger.INFO, e.getMessage());
-			}
-		}
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStarts(org.eclipse.jface.text.formatter.IFormattingContext)
-	 */
-	public void formatterStarts(final IFormattingContext context) {
-		super.formatterStarts(context);
-
-		fPartitions.addLast(context.getProperty(FormattingContextProperties.CONTEXT_PARTITION));
-		fDocuments.addLast(context.getProperty(FormattingContextProperties.CONTEXT_MEDIUM));
-		fRegion = (IRegion) context.getProperty(FormattingContextProperties.CONTEXT_REGION);
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.formatter.ContextBasedFormattingStrategy#formatterStops()
-	 */
-	public void formatterStops() {
-		super.formatterStops();
-
-		fPartitions.clear();
-		fDocuments.clear();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java
deleted file mode 100644
index f87f274..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIMessages.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others. All rights reserved.   This
- * program and the accompanying materials are made available under the terms of
- * the Eclipse Public License v1.0 which accompanies this distribution, and is
- * available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: 
- * IBM - Initial API and implementation
- * Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference
- * David Carver - STAR - [205989] - [validation] validate XML after XInclude resolution
- **********************************************************************/
-package org.eclipse.wst.xml.ui.internal;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * Strings used by XML UI
- * 
- * @plannedfor 1.0
- */
-public class XMLUIMessages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.wst.xml.ui.internal.XMLUIPluginResources";//$NON-NLS-1$
-	private static ResourceBundle fResourceBundle;
-
-	public static String Sample_XML_doc;
-	public static String Comment_Delimiters_UI_;
-	public static String Comment_Content_UI_;
-	public static String Tag_Delimiters_UI_;
-	public static String Tag_Names_UI_;
-	public static String Attribute_Names_UI_;
-	public static String Attribute_Equals_UI_;
-	public static String Attribute_Values_UI_;
-	public static String Declaration_Delimiters_UI_;
-	public static String Content_UI_;
-	public static String CDATA_Delimiters_UI_;
-	public static String CDATA_Content_UI_;
-	public static String Processing_Instruction_Del_UI_;
-	public static String Processing_Instruction_Con_UI__UI_;
-	public static String DOCTYPE_Name_UI_;
-	public static String DOCTYPE_SYSTEM_PUBLIC_Keyw_UI_;
-	public static String DOCTYPE_Public_Reference_UI_;
-	public static String DOCTYPE_System_Reference_UI_;
-	public static String Entity_Reference_UI_;
-	public static String DELETE;
-	public static String ADD_PROCESSING_INSTRUCTION;
-	public static String _UI_MENU_ADD_AFTER;
-	public static String _UI_MENU_ADD_ATTRIBUTE;
-	public static String _UI_MENU_ADD_BEFORE;
-	public static String _UI_MENU_ADD_CHILD;
-	public static String _UI_MENU_REMOVE;
-	public static String _UI_MENU_REPLACE_WITH;
-	public static String _UI_MENU_EDIT_DOCTYPE;
-	public static String _UI_LABEL_UNDO_REPLACE_DESCRIPTION;
-	public static String _UI_LABEL_EDIT_DOCTYPE;
-	public static String _UI_INFO_EXPAND_ALL;
-	public static String _UI_INFO_COLLAPSE_ALL;
-	public static String _UI_MENU_ADD_DTD_INFORMATION;
-	public static String _UI_MENU_ADD_SCHEMA_INFORMATION;
-	public static String _UI_MENU_EDIT_PROCESSING_INSTRUCTION;
-	public static String _UI_MENU_EDIT_NAMESPACES;
-	public static String _UI_MENU_ADD_DTD_INFORMATION_TITLE;
-	public static String _UI_MENU_EDIT_PROCESSING_INSTRUCTION_TITLE;
-	public static String _UI_MENU_EDIT_SCHEMA_INFORMATION_TITLE;
-	public static String _UI_MENU_NEW_ATTRIBUTE;
-	public static String _UI_MENU_NEW_ATTRIBUTE_TITLE;
-	public static String _UI_MENU_EDIT_ATTRIBUTE;
-	public static String _UI_MENU_EDIT_ATTRIBUTE_TITLE;
-	public static String _UI_MENU_NEW_ELEMENT;
-	public static String _UI_MENU_NEW_ELEMENT_TITLE;
-	public static String _UI_MENU_RENAME;
-	public static String _UI_MENU_RENAME_TITLE;
-	public static String _UI_LABEL_ELEMENT_NAME;
-	public static String _UI_MENU_ADD_COMMENT;
-	public static String _UI_MENU_ADD_PROCESSING_INSTRUCTION;
-	public static String _UI_MENU_ADD_CDATA_SECTION;
-	public static String _UI_MENU_ADD_PCDATA;
-	public static String _UI_MENU_COMMENT;
-	public static String _UI_MENU_PROCESSING_INSTRUCTION;
-	public static String _UI_MENU_CDATA_SECTION;
-	public static String _UI_MENU_PCDATA;
-	public static String _UI_MENU_ADD;
-	public static String _UI_COMMENT_VALUE;
-	public static String _UI_PI_TARGET_VALUE;
-	public static String _UI_PI_DATA_VALUE;
-	public static String _UI_LABEL_ROOT_ELEMENT_VALUE;
-	public static String _UI_LABEL_TARGET_COLON;
-	public static String _UI_LABEL_DATA_COLON;
-	public static String _UI_LABEL_ROOT_ELEMENT_NAME_COLON;
-	public static String _UI_LABEL_PUBLIC_ID_COLON;
-	public static String _UI_LABEL_SYSTEM_ID_COLON;
-	public static String _UI_LABEL_BROWSE;
-	public static String _UI_LABEL_SELECT_XML_CATALOG_ENTRY;
-	public static String _UI_LABEL_SPECIFY_SYSTEM_ID;
-	public static String _UI_LABEL_SELECT_FILE;
-	public static String _UI_LABEL_KEY;
-	public static String _UI_LABEL_URI;
-	public static String _UI_LABEL_XML_CATALOG_COLON;
-	public static String _UI_LABEL_NAMESPACE_NAME;
-	public static String _UI_LABEL_LOCATION_HINT;
-	public static String _UI_LABEL_PREFIX;
-	public static String _UI_LABEL_NAMESPACE_NAME_COLON;
-	public static String _UI_LABEL_LOCATION_HINT_COLON;
-	public static String _UI_LABEL_PREFIX_COLON;
-	public static String _UI_NO_NAMESPACE_NAME;
-	public static String _UI_NO_PREFIX;
-	public static String _UI_LABEL_XML_SCHEMA_INFORMATION;
-	public static String _UI_LABEL_NAME_COLON;
-	public static String _UI_LABEL_VALUE_COLON;
-	public static String _UI_BUTTON_DELETE;
-	public static String _UI_BUTTON_NEW;
-	public static String _UI_BUTTON_EDIT;
-	public static String _UI_LABEL_NEW_NAMESPACE_INFORMATION;
-	public static String _UI_RADIO_BUTTON_SELECT_FROM_WORKSPACE;
-	public static String _UI_RADIO_BUTTON_SELECT_FROM_CATALOG;
-	public static String _UI_WARNING_MORE_THAN_ONE_NS_WITH_NAME;
-	public static String _UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_NAME;
-	public static String _UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_PREFIX;
-	public static String _UI_WARNING_MORE_THAN_ONE_NS_WITH_PREFIX;
-	public static String _UI_WARNING_SCHEMA_CAN_NOT_BE_LOCATED;
-	public static String _UI_WARNING_LOCATION_HINT_NOT_SPECIFIED;
-	public static String _UI_WARNING_NAMESPACE_NAME_NOT_SPECIFIED;
-	public static String _UI_WARNING_PREFIX_NOT_SPECIFIED;
-	public static String _UI_WARNING_ROOT_ELEMENT_MUST_BE_SPECIFIED;
-	public static String _UI_WARNING_SYSTEM_ID_MUST_BE_SPECIFIED;
-	public static String _UI_INVALID_NAME;
-	public static String _UI_ENTER_REQ_PREFIX_AND_NAMESPACE;
-	public static String _UI_SELECT_REGISTERED_NAMESPACES;
-	public static String _UI_SPECIFY_NEW_NAMESPACE;
-	public static String _UI_SELECT_NAMESPACE_TO_ADD;
-	public static String _UI_ADD_NAMESPACE_DECLARATIONS;
-	public static String _UI_NAMESPACE_DECLARATIONS;
-	public static String _UI_TARGET_NAMESPACE;
-	public static String _ERROR_XML_ATTRIBUTE_ALREADY_EXISTS;
-	public static String error_message_goes_here;
-	public static String SurroundWithNewElementQuickAssistProposal_0;
-	public static String SurroundWithNewElementQuickAssistProposal_1;
-	public static String RenameInFileQuickAssistProposal_0;
-	public static String RenameInFileQuickAssistProposal_1;
-	public static String InsertRequiredAttrsQuickAssistProposal_0;
-	public static String InsertRequiredAttrsQuickAssistProposal_1;
-	public static String EncodingSettings_0;
-	public static String EncodingSettings_1;
-	public static String DragNodeCommand_0;
-	public static String DragNodeCommand_1;
-	public static String CommonEditNamespacesDialog_0;
-	public static String JFaceNodeAdapter_1;
-	public static String QuickFixProcessorXML_0;
-	public static String QuickFixProcessorXML_1;
-	public static String QuickFixProcessorXML_2;
-	public static String QuickFixProcessorXML_3;
-	public static String QuickFixProcessorXML_4;
-	public static String QuickFixProcessorXML_5;
-	public static String QuickFixProcessorXML_6;
-	public static String QuickFixProcessorXML_7;
-	public static String QuickFixProcessorXML_8;
-	public static String QuickFixProcessorXML_9;
-	public static String QuickFixProcessorXML_10;
-	public static String QuickFixProcessorXML_11;
-	public static String QuickFixProcessorXML_12;
-	public static String QuickFixProcessorXML_13;
-	public static String QuickFixProcessorXML_14;
-	public static String QuickFixProcessorXML_15;
-	public static String XMLPropertySourceAdapter_0;
-	public static String WorkbenchDefaultEncodingSettings_0;
-	public static String refreshoutline_0;
-	public static String Creating_files_encoding;
-	public static String End_tag_has_attributes;
-	public static String Attribute__is_missing_a_value;
-	public static String Attribute__has_no_value;
-	public static String Missing_end_tag_;
-	public static String Missing_start_tag_;
-	public static String ReconcileStepForMarkup_0;
-	public static String ReconcileStepForMarkup_1;
-	public static String ReconcileStepForMarkup_2;
-	public static String ReconcileStepForMarkup_3;
-	public static String ReconcileStepForMarkup_4;
-	public static String ReconcileStepForMarkup_5;
-	public static String ReconcileStepForMarkup_6;
-	public static String End_with_;
-	public static String SEVERE_internal_error_occu_UI_;
-	public static String No_known_attribute__UI_;
-	public static String Content_Assist_not_availab_UI_;
-	public static String Element__is_unknown;
-	public static String Comment__;
-	public static String Close_with__;
-	public static String End_with__;
-	public static String Close_with___;
-	public static String Close_with____;
-	public static String _Has_no_available_child;
-	public static String No_known_child_tag;
-	public static String __Has_no_known_child;
-	public static String No_known_child_tag_names;
-	public static String The_document_element__;
-	public static String No_definition_for_in;
-	public static String No_definition_for;
-	public static String No_content_model_for;
-	public static String No_content_model_found_UI_;
-	public static String Cleanup_UI_;
-	public static String Compress_empty_element_tags_UI_;
-	public static String Insert_required_attributes_UI_;
-	public static String Insert_missing_tags_UI_;
-	public static String Quote_attribute_values_UI_;
-	public static String Format_source_UI_;
-	public static String Convert_EOL_codes_UI_;
-	public static String Insert_XML_decl;
-	public static String EOL_Windows_UI;
-	public static String EOL_Unix_UI;
-	public static String EOL_Mac_UI;
-	public static String Creating_files;
-	public static String Encoding_desc;
-	public static String Encoding;
-	public static String Creating_or_saving_files;
-	public static String End_of_line_code_desc;
-	public static String End_of_line_code;
-	public static String EOL_Windows;
-	public static String EOL_Unix;
-	public static String EOL_Mac;
-	public static String EOL_NoTranslation;
-	public static String XMLFilesPreferencePage_ExtensionLabel;
-	public static String XMLFilesPreferencePage_ExtensionError;
-	public static String Content_assist_UI_;
-	public static String Automatically_make_suggest_UI_;
-	public static String Prompt_when_these_characte_UI_;
-	public static String Formatting_UI_;
-	public static String Line_width__UI_;
-	public static String Split_multiple_attributes;
-	public static String Align_final_bracket;
-	public static String Preserve_PCDATA_Content;
-	public static String Space_before_empty_close_tag;
-	public static String Indent_using_tabs;
-	public static String Indent_using_spaces;
-	public static String Indentation_size;
-	public static String Indentation_size_tip;
-	public static String Clear_all_blank_lines_UI_;
-	public static String Grammar_Constraints;
-	public static String Use_inferred_grammar_in_absence_of;
-	public static String Suggestion_Strategy;
-	public static String Suggestion_Strategy_Lax;
-	public static String Suggestion_Strategy_Strict;
-	public static String Element____1;
-	public static String Content_Model____2;
-	public static String Attribute____3;
-	public static String Data_Type____4;
-	public static String Enumerated_Values____5;
-	public static String Default_Value____6;
-	public static String SourceMenu_label;
-	public static String Comment_label; // Resource bundle
-	public static String Comment_tooltip; // Resource bundle
-	public static String Comment_description; // Resource bundle
-	public static String Uncomment_label; // Resource bundle
-	public static String Uncomment_tooltip; // Resource bundle
-	public static String Uncomment_description; // Resource bundle
-	public static String ToggleComment_label; // Resource bundle
-	public static String ToggleComment_tooltip; // Resource bundle
-	public static String ToggleComment_description; // Resource bundle
-	public static String AddBlockComment_label; // Resource bundle
-	public static String AddBlockComment_tooltip; // Resource bundle
-	public static String AddBlockComment_description; // Resource bundle
-	public static String RemoveBlockComment_label; // Resource bundle
-	public static String RemoveBlockComment_tooltip; // Resource bundle
-	public static String RemoveBlockComment_description; // Resource bundle
-	public static String CleanupDocument_label; // Resource bundle
-	public static String CleanupDocument_tooltip; // Resource bundle
-	public static String CleanupDocument_description; // Resource bundle
-	public static String FindOccurrences_label; // Resource bundle
-	public static String OpenFileFromSource_label; // Resource bundle
-	public static String OpenFileFromSource_tooltip; // Resource bundle
-	public static String OpenFileFromSource_description; // Resource bundle
-	public static String XMLContentOutlineConfiguration_0;
-	public static String XMLTyping_Auto_Complete;
-	public static String XMLTyping_Auto_Remove;
-	public static String XMLTyping_Complete_Comments;
-	public static String XMLTyping_Close_Strings;
-	public static String XMLTyping_Close_Brackets;
-	public static String XMLTyping_Complete_End_Tags;
-	public static String XMLTyping_Complete_Elements;
-	public static String XMLTyping_Remove_End_Tags;
-	public static String XMLTyping_Start_Tag;
-	public static String XMLTyping_End_Tag;
-	public static String StructureSelectEnclosing_label;
-	public static String StructureSelectEnclosing_tooltip;
-	public static String StructureSelectEnclosing_description;
-	public static String StructureSelectNext_label;
-	public static String StructureSelectNext_tooltip;
-	public static String StructureSelectNext_description;
-	public static String StructureSelectPrevious_label;
-	public static String StructureSelectPrevious_tooltip;
-	public static String StructureSelectPrevious_description;
-	public static String MESSAGE_XML_VALIDATION_MESSAGE_UI_;
-	public static String Indicate_no_grammar_specified;
-	public static String Indicate_no_grammar_specified_severities_error;
-	public static String Indicate_no_grammar_specified_severities_warning;
-	public static String Indicate_no_grammar_specified_severities_ignore;
-	public static String Validating_files;
-	public static String SyntaxColoringPage_0;
-	public static String SyntaxColoringPage_2;
-	public static String SyntaxColoringPage_3;
-	public static String SyntaxColoringPage_4;
-	public static String SyntaxColoringPage_5;
-	public static String SyntaxColoringPage_6;
-	public static String EmptyFilePreferencePage_0;
-	public static String _UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK;
-	public static String gotoMatchingTag_label;
-	public static String gotoMatchingTag_description;
-	public static String gotoMatchingTag_start;
-	public static String gotoMatchingTag_end;
-	public static String nextSibling_label;
-	public static String nextSibling_description;
-	public static String previousSibling_label;
-	public static String previousSibling_description;
-	public static String Use_XInclude;
-    public static String Honour_all_schema_locations;   
-	public static String Open;
-	public static String _UI_BUTTON_SORT;
-
-	static {
-		// load message values from bundle file
-		NLS.initializeMessages(BUNDLE_NAME, XMLUIMessages.class);
-	}
-
-	private XMLUIMessages() {
-		// cannot create new instance
-	}
-
-	public static ResourceBundle getResourceBundle() {
-		try {
-			if (fResourceBundle == null) {
-				fResourceBundle = ResourceBundle.getBundle(BUNDLE_NAME);
-			}
-		}
-		catch (MissingResourceException x) {
-			fResourceBundle = null;
-		}
-		return fResourceBundle;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIPlugin.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIPlugin.java
deleted file mode 100644
index fe8f171..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIPlugin.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal;
-
-import java.io.IOException;
-
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.editors.text.templates.ContributionContextTypeRegistry;
-import org.eclipse.ui.editors.text.templates.ContributionTemplateStore;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistry;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryRegistryImpl;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeIdsXML;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XMLUIPlugin extends AbstractUIPlugin {
-	public final static String ID = "org.eclipse.wst.xml.ui"; //$NON-NLS-1$
-
-	protected static XMLUIPlugin instance = null;
-
-	public static XMLUIPlugin getDefault() {
-		return instance;
-	}
-
-	public synchronized static XMLUIPlugin getInstance() {
-		return instance;
-	}
-
-	/**
-	 * The template context type registry for the xml editor.
-	 */
-	private ContextTypeRegistry fContextTypeRegistry;
-
-	/**
-	 * The template store for the xml editor.
-	 * 
-	 */
-	private TemplateStore fTemplateStore;
-
-	public XMLUIPlugin() {
-		super();
-		instance = this;
-	}
-
-	public AdapterFactoryRegistry getAdapterFactoryRegistry() {
-		return AdapterFactoryRegistryImpl.getInstance();
-
-	}
-
-	/**
-	 * Returns the template store for the xml editor templates.
-	 * 
-	 * @return the template store for the xml editor templates
-	 */
-	public TemplateStore getTemplateStore() {
-		if (fTemplateStore == null) {
-			fTemplateStore = new ContributionTemplateStore(getTemplateContextRegistry(), getPreferenceStore(), XMLUIPreferenceNames.TEMPLATES_KEY);
-
-			try {
-				fTemplateStore.load();
-			}
-			catch (IOException e) {
-				Logger.logException(e);
-			}
-		}
-		return fTemplateStore;
-	}
-
-	/**
-	 * Returns the template context type registry for the xml plugin.
-	 * 
-	 * @return the template context type registry for the xml plugin
-	 */
-	public ContextTypeRegistry getTemplateContextRegistry() {
-		if (fContextTypeRegistry == null) {
-			ContributionContextTypeRegistry registry = new ContributionContextTypeRegistry();
-			registry.addContextType(TemplateContextTypeIdsXML.ALL);
-			registry.addContextType(TemplateContextTypeIdsXML.NEW);
-			registry.addContextType(TemplateContextTypeIdsXML.TAG);
-			registry.addContextType(TemplateContextTypeIdsXML.ATTRIBUTE);
-			registry.addContextType(TemplateContextTypeIdsXML.ATTRIBUTE_VALUE);
-
-			fContextTypeRegistry = registry;
-		}
-
-		return fContextTypeRegistry;
-	}
-
-	/**
-	 * Get an image from the registry.
-	 * 
-	 * *This method is used by the referencingfile dialog and should be
-	 * removed when the dialog is moved to anothercomponent.
-	 * 
-	 * @param imageName
-	 *            The name of the image.
-	 * @return The image registered for the given name.
-	 */
-	public Image getImage(String imageName) {
-		return getWorkbench().getSharedImages().getImage(imageName);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties
deleted file mode 100644
index c1747b3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/XMLUIPluginResources.properties
+++ /dev/null
@@ -1,346 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference
-#     David Carver - STAR - [205989] - [validation] validate XML after XInclude resolution
-###############################################################################
-## The following line is a sample XML document.  Please translate only the following parts:
-## begin color definitions
-## Normal text content.
-Sample_XML_doc=<?xml version=\"1.0\"?>\n<?customProcessingInstruction\n\tXML processor specific\n\tcontent ?>\n<!DOCTYPE colors\n\tPUBLIC \"//IBM/XML/COLORS/\" \"colors.dtd\">\n<colors>\n\t<!-- begin color definitions -->\n\t<color name=\"plaintext\" foreground=\"#000000\"\n\t\tbackground=\"#D4D0C8\" />\n\t<color name=\"bold\" foreground=\"#000000\"\n\t\tbackground=\"#B3ACA0\" />\n\t<![CDATA[<123456789>]]>\n\tNormal text content.\n\t===&gt;look at me!&lt;===\n\t<color name=\"inverse\" foreground=\"#F0F0F0\"\n\t\tbackground=\"#D4D0C8\" />\n\n</colors>\n
-Comment_Delimiters_UI_=Comment Delimiters
-Comment_Content_UI_=Comment Content
-Tag_Delimiters_UI_=Tag Delimiters
-Tag_Names_UI_=Tag Names
-Attribute_Names_UI_=Attribute Names
-Attribute_Equals_UI_=Attribute Equal Signs
-Attribute_Values_UI_=Attribute Values
-Declaration_Delimiters_UI_=Declaration Delimiters
-Content_UI_=Content
-Entity_Reference_UI_=Entity References
-## on the following 2 lines, do not translate CDATA
-CDATA_Delimiters_UI_=CDATA Delimiters
-CDATA_Content_UI_=CDATA Content
-Processing_Instruction_Del_UI_=Processing Instruction Delimiters
-Processing_Instruction_Con_UI__UI_=Processing Instruction Content
-## on the following line solely translate:  Name
-DOCTYPE_Name_UI_=DOCTYPE Name
-## on the following line solely translate:  Keyword
-DOCTYPE_SYSTEM_PUBLIC_Keyw_UI_=DOCTYPE SYSTEM/PUBLIC Keyword
-## on the following line solely translate:  Public Reference
-DOCTYPE_Public_Reference_UI_=DOCTYPE Public Reference
-## on the following line solely translate:  System Reference
-DOCTYPE_System_Reference_UI_=DOCTYPE System Reference
-# XML Common UI
-# Constants for strings
-
-DELETE=Remove
-ADD_PROCESSING_INSTRUCTION=Add Processing Instruction
-
-_UI_MENU_ADD_AFTER=Add &After
-_UI_MENU_ADD_ATTRIBUTE=Add A&ttribute
-_UI_MENU_ADD_BEFORE=Add &Before
-_UI_MENU_ADD_CHILD=Add &Child
-_UI_MENU_REMOVE=Re&move
-_UI_MENU_REPLACE_WITH=Re&place With
-_UI_MENU_EDIT_DOCTYPE=Edit DOCTYPE...
-_UI_LABEL_UNDO_REPLACE_DESCRIPTION=Replace
-_UI_LABEL_EDIT_DOCTYPE=Edit DOCTYPE
-_UI_INFO_EXPAND_ALL=Expand All
-_UI_INFO_COLLAPSE_ALL=Collapse All
-
-_UI_MENU_ADD_DTD_INFORMATION=Add DTD Information...
-_UI_MENU_ADD_SCHEMA_INFORMATION=Add Schema Information...
-_UI_MENU_EDIT_PROCESSING_INSTRUCTION=Edit Process&ing Instruction...
-_UI_MENU_EDIT_NAMESPACES=Edit &Namespaces...
-
-_UI_MENU_ADD_DTD_INFORMATION_TITLE=Add DTD Information
-_UI_MENU_EDIT_PROCESSING_INSTRUCTION_TITLE=Edit Processing Instruction
-_UI_MENU_EDIT_SCHEMA_INFORMATION_TITLE=Edit Schema Information
-
-_UI_MENU_NEW_ATTRIBUTE=&New Attribute...
-_UI_MENU_NEW_ATTRIBUTE_TITLE=New Attribute
-_UI_MENU_EDIT_ATTRIBUTE=Edit Attribute...
-_UI_MENU_EDIT_ATTRIBUTE_TITLE=Edit Attribute
-_UI_MENU_NEW_ELEMENT=New &Element...
-_UI_MENU_NEW_ELEMENT_TITLE=New Element
-_UI_MENU_RENAME=R&ename
-_UI_MENU_RENAME_TITLE=Rename
-_UI_LABEL_ELEMENT_NAME=Element name:
-
-_UI_MENU_ADD_COMMENT=Add Comment
-_UI_MENU_ADD_PROCESSING_INSTRUCTION=Add Processing Instruction
-_UI_MENU_ADD_CDATA_SECTION=Add CDATA Section
-_UI_MENU_ADD_PCDATA=Add #PCDATA;
-
-_UI_MENU_COMMENT=C&omment
-_UI_MENU_PROCESSING_INSTRUCTION=P&rocessing Instruction
-_UI_MENU_CDATA_SECTION=CDATA Section
-_UI_MENU_PCDATA=#PC&DATA;
-
-_UI_MENU_ADD=Add
-
-_UI_COMMENT_VALUE=comment
-_UI_PI_TARGET_VALUE=target
-_UI_PI_DATA_VALUE=data
-_UI_LABEL_ROOT_ELEMENT_VALUE=RootElement
-
-_UI_LABEL_TARGET_COLON=Target:
-_UI_LABEL_DATA_COLON=Data:
-_UI_LABEL_ROOT_ELEMENT_NAME_COLON=Root element name:
-_UI_LABEL_PUBLIC_ID_COLON=Public ID:
-_UI_LABEL_SYSTEM_ID_COLON=System ID:
-_UI_LABEL_BROWSE=Browse...
-_UI_LABEL_SELECT_XML_CATALOG_ENTRY=Select XML Catalog Entry
-_UI_LABEL_SPECIFY_SYSTEM_ID=Specify System ID
-_UI_LABEL_SELECT_FILE=Select File
-
-_UI_LABEL_KEY=Key
-_UI_LABEL_URI=URI:
-_UI_LABEL_XML_CATALOG_COLON=XML Catalog
-_UI_LABEL_NAMESPACE_NAME=Namespace Name
-_UI_LABEL_LOCATION_HINT=Location Hint
-_UI_LABEL_PREFIX=Prefix
-_UI_LABEL_NAMESPACE_NAME_COLON=Namespace Name:
-_UI_LABEL_LOCATION_HINT_COLON=Location Hint:
-_UI_LABEL_PREFIX_COLON=Prefix:
-_UI_NO_NAMESPACE_NAME=<no namespace name>
-_UI_NO_PREFIX=<no prefix>
-
-_UI_LABEL_XML_SCHEMA_INFORMATION=XML Schema Information
-
-_UI_LABEL_NAME_COLON=Name:
-_UI_LABEL_VALUE_COLON=Value:
-
-_UI_BUTTON_DELETE=Delete
-_UI_BUTTON_NEW=New...
-_UI_BUTTON_EDIT=Edit...
-
-_UI_LABEL_NEW_NAMESPACE_INFORMATION=New Namespace Information
-
-# SelectFileOrXMLCatalogIdPanel.java
-
-_UI_RADIO_BUTTON_SELECT_FROM_WORKSPACE=Select file from Workspace
-_UI_RADIO_BUTTON_SELECT_FROM_CATALOG=Select XML Catalog entry
-
-_UI_WARNING_MORE_THAN_ONE_NS_WITH_NAME=More than one namespace has been specified with the namespace name :
-_UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_NAME=More than one schema has been specified without a namespace name
-_UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_PREFIX=More than one namespace has been specificed without a prefix
-_UI_WARNING_MORE_THAN_ONE_NS_WITH_PREFIX=More than one namespace has been specified with the prefix :
-_UI_WARNING_SCHEMA_CAN_NOT_BE_LOCATED=The specified schema can not be located :
-_UI_WARNING_LOCATION_HINT_NOT_SPECIFIED=A location hint has not been specified for the namespace with name
-_UI_WARNING_NAMESPACE_NAME_NOT_SPECIFIED=A name must be specified for the namespace with prefix :
-_UI_WARNING_PREFIX_NOT_SPECIFIED=A prefix must be specified for the namespace named :
-_UI_WARNING_ROOT_ELEMENT_MUST_BE_SPECIFIED=A root element name must be specified.
-_UI_WARNING_SYSTEM_ID_MUST_BE_SPECIFIED=A system ID must be specified.
-
-_UI_INVALID_NAME=Invalid name
-
-# String used for editing namespaces (org.eclipse.wst.xml.ui.nsedit)
-_UI_ENTER_REQ_PREFIX_AND_NAMESPACE=Enter the required prefix and namespace URI for the namespace declaration.
-_UI_SELECT_REGISTERED_NAMESPACES=Select From Registered Namespaces
-_UI_SPECIFY_NEW_NAMESPACE=Specify New Namespace
-_UI_SELECT_NAMESPACE_TO_ADD=Select the namespace declarations to add.
-_UI_ADD_NAMESPACE_DECLARATIONS=Add Namespace Declarations
-_UI_NAMESPACE_DECLARATIONS=Namespace Declarations
-_UI_TARGET_NAMESPACE=Target Namespace
-
-_ERROR_XML_ATTRIBUTE_ALREADY_EXISTS=The element already has an attribute with this name.
-
-#
-error_message_goes_here=error message goes here
-SurroundWithNewElementQuickAssistProposal_0=Surround with new element
-SurroundWithNewElementQuickAssistProposal_1=Surround with new element
-RenameInFileQuickAssistProposal_0=Link all references for a rename in file (does not change references in other files)
-RenameInFileQuickAssistProposal_1=Rename in file
-InsertRequiredAttrsQuickAssistProposal_0=Insert required attributes
-InsertRequiredAttrsQuickAssistProposal_1=Insert required attributes
-EncodingSettings_0=IANA:
-EncodingSettings_1=Encoding:
-DragNodeCommand_0=Move
-DragNodeCommand_1=Copy
-CommonEditNamespacesDialog_0=Add...
-JFaceNodeAdapter_1=Refresh Property Sheet
-QuickFixProcessorXML_0=Remove empty tag
-QuickFixProcessorXML_1=Change to empty-element tag
-QuickFixProcessorXML_2=Remove this tag
-QuickFixProcessorXML_3=Insert end tag before first child element
-QuickFixProcessorXML_4=Insert end tag at end of element
-QuickFixProcessorXML_5=Remove attributes in end tag
-QuickFixProcessorXML_6=Insert default attribute value
-QuickFixProcessorXML_7=Remove this attribute
-QuickFixProcessorXML_8=Remove spaces before tag name
-QuickFixProcessorXML_9=Remove spaces before processing instruction
-QuickFixProcessorXML_10=Remove namespace in processing instruction
-QuickFixProcessorXML_11=Remove this element
-QuickFixProcessorXML_12=Remove this attribute value
-QuickFixProcessorXML_13=Insert required attribute
-QuickFixProcessorXML_14=Quote attribute value
-QuickFixProcessorXML_15=Insert closing bracket
-XMLPropertySourceAdapter_0=Attributes
-
-WorkbenchDefaultEncodingSettings_0=Use workspace encoding
-refreshoutline_0=Refreshing Outline
-Creating_files_encoding=Creating files encoding preference
-# ReconcileStepForMarkup
-End_tag_has_attributes=End tag has attributes
-Attribute__is_missing_a_value=Attribute \"{0}\" is missing a value
-Attribute__has_no_value=Attribute \"{0}\"  has no value
-Missing_start_tag_=Missing start tag \"{0}\"
-Missing_end_tag_=Missing end tag \"{0}\"
-ReconcileStepForMarkup_0=Missing closing quote
-ReconcileStepForMarkup_1=Missing quotes for attribute value
-ReconcileStepForMarkup_2=A tagname cannot start with a space
-ReconcileStepForMarkup_3=Empty tags are not allowed
-ReconcileStepForMarkup_4=Namespaces are not allowed in a Processing Instruction target
-ReconcileStepForMarkup_5=Spaces are not allowed before a Processing Instruction
-ReconcileStepForMarkup_6=Tag missing closing bracket '>'
-# Content Assist
-End_with_=End with {0}>
-SEVERE_internal_error_occu_UI_=SEVERE internal error occurred
-No_known_attribute__UI_=No known attribute
-Content_Assist_not_availab_UI_=Content Assist not available at the current location
-Element__is_unknown=Element <{0}> is unknown.
-Comment__=comment {0}
-Close_with__=Close with {0}
-End_with__=End with \"</{0}>\"
-Close_with___=Close with \"{0}\"
-Close_with____=Close with \"></{0}>\"
-_Has_no_available_child={0} has no available child tags.
-No_known_child_tag=No known child tag names of <{0}> begin with \"{1}\".
-__Has_no_known_child=<{0}> has no known child tags.
-No_known_child_tag_names=No known child tag names of <{0}> begin with \"{1}\"
-The_document_element__=The document element <{0}> is already present.
-No_definition_for_in=No definition was found for element <{0}> in {1}
-No_definition_for=No definition was found for element <{0}>
-No_content_model_for=No content model found for {0}.
-No_content_model_found_UI_=No content model found
-## The following strings are for the XML Cleanup dialog
-Cleanup_UI_=Cleanup
-Compress_empty_element_tags_UI_=&Compress empty element tags
-Insert_required_attributes_UI_=Insert &required attributes
-Insert_missing_tags_UI_=&Insert missing tags
-Quote_attribute_values_UI_=&Quote attribute values
-Format_source_UI_=&Format source
-Convert_EOL_codes_UI_=Convert line &delimiters to
-Insert_XML_decl=Fix XML declaration
-EOL_Windows_UI=&Windows
-EOL_Unix_UI=U&NIX
-EOL_Mac_UI=&Mac
-## XML Files preference page
-Creating_files=Creating files
-Encoding_desc=The following encoding will apply:
-Encoding=En&coding:
-Creating_or_saving_files=Creating or saving files
-End_of_line_code_desc=The following line delimiter will apply:
-End_of_line_code=&Line delimiter:
-EOL_Windows=Windows
-EOL_Unix=UNIX
-EOL_Mac=Mac
-EOL_NoTranslation=No translation
-Validating_files=Validating files
-Indicate_no_grammar_specified=Indicate when no &grammar is specified:
-Indicate_no_grammar_specified_severities_error=Error
-Indicate_no_grammar_specified_severities_warning=Warning
-Indicate_no_grammar_specified_severities_ignore=Ignore
-XMLFilesPreferencePage_ExtensionLabel=Add this suffix (if not specified):
-XMLFilesPreferencePage_ExtensionError=Suffix must be one of the following {0}.
-## XML Source preference page
-Content_assist_UI_=Content assist
-Automatically_make_suggest_UI_=Automatically ma&ke suggestions
-Prompt_when_these_characte_UI_=P&rompt when these characters are inserted:
-Formatting_UI_=Formatting
-Line_width__UI_=Line &width:
-Split_multiple_attributes=Split &multiple attributes each on a new line
-Align_final_bracket=&Align final bracket in multi-line element tags
-Preserve_PCDATA_Content=&Preserve whitespace in tags with PCDATA content
-Space_before_empty_close_tag=Ins&ert whitespace before closing empty end-tags
-Indent_using_tabs=&Indent using tabs
-Indent_using_spaces=I&ndent using spaces
-Indentation_size=In&dentation size:
-Indentation_size_tip=Indentation size
-Clear_all_blank_lines_UI_=Clear all &blank lines
-Grammar_Constraints=Grammar Constraints
-Use_inferred_grammar_in_absence_of=&Use inferred grammar in absence of DTD/Schema
-Suggestion_Strategy=&Suggestion strategy:
-Suggestion_Strategy_Lax=Lax
-Suggestion_Strategy_Strict=Strict
-## tag info
-Element____1=Element :
-Content_Model____2=Content Model :
-Attribute____3=Attribute :
-Data_Type____4=Data Type :
-Enumerated_Values____5=Enumerated Values :
-Default_Value____6=Default Value :
-## copied from sse.ui
-SourceMenu_label=&Source
-Comment_label=Co&mment
-Comment_tooltip=Comment
-Comment_description=Comment
-Uncomment_label=&Uncomment
-Uncomment_tooltip=Uncomment
-Uncomment_description=Uncomment
-ToggleComment_label=Toggle Comment
-ToggleComment_tooltip=Toggle Comment
-ToggleComment_description=Toggle Comment
-AddBlockComment_label=Add Block Comment
-AddBlockComment_tooltip=Add Block Comment
-AddBlockComment_description=Add Block Comment
-RemoveBlockComment_label=Remove Block Comment
-RemoveBlockComment_tooltip=Remove Block Comment
-RemoveBlockComment_description=Remove Block Comment
-CleanupDocument_label=Cleanup Document...
-CleanupDocument_tooltip=Cleanup Document
-CleanupDocument_description=Cleanup Document
-FindOccurrences_label=Occurrences in File
-OpenFileFromSource_label=Op&en Selection
-OpenFileFromSource_tooltip=Open an editor on the selected link
-OpenFileFromSource_description=Open an editor on the selected link
-XMLContentOutlineConfiguration_0=Show Attributes
-XMLTyping_Auto_Complete=Automatically close
-XMLTyping_Auto_Remove=Automatically remove
-XMLTyping_Complete_Comments=&Comments
-XMLTyping_Close_Strings=A&ttribute values
-XMLTyping_Close_Brackets=(Parentheses) and [square] brac&kets
-XMLTyping_Complete_End_Tags=&Automatically close the tag
-XMLTyping_Complete_Elements=&Insert a matching end tag
-XMLTyping_Remove_End_Tags=E&nd tags when creating empty self-closing tags
-XMLTyping_Start_Tag=When typing a start tag
-XMLTyping_End_Tag=When typing an end tag
-StructureSelectEnclosing_label=Enclosing Element
-StructureSelectEnclosing_tooltip=Expand selection to include enclosing element
-StructureSelectEnclosing_description=Expand selection to include enclosing element
-StructureSelectNext_label=Next Element
-StructureSelectNext_tooltip=Expand selection to include next sibling
-StructureSelectNext_description=Expand selection to include next sibling
-StructureSelectPrevious_label=Previous Element
-StructureSelectPrevious_tooltip=Expand selection to include previous sibling
-StructureSelectPrevious_description=Expand selection to include previous sibling
-MESSAGE_XML_VALIDATION_MESSAGE_UI_=XML Validator validating {0}
-SyntaxColoringPage_0=Syntax Element:
-SyntaxColoringPage_2=Enable
-SyntaxColoringPage_3=&Bold
-SyntaxColoringPage_4=&Italic
-SyntaxColoringPage_5=&Strike-through
-SyntaxColoringPage_6=&Underline
-EmptyFilePreferencePage_0=Expand the tree to edit preferences for a specific feature.
-_UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK=XML editing preferences.  Note that some preferences may be set on the <a>{0}</a> preference page.
-Use_XInclude=Process XML &Inclusions
-Honour_all_schema_locations=&Honour all XML schema locations
-nextSibling_label=Next Sibling
-nextSibling_description=Go to Next Sibling
-previousSibling_label=Previous Sibling
-previousSibling_description=Go to Previous Sibling
-gotoMatchingTag_label=Matching Tag
-gotoMatchingTag_description=Go To Matching Tag
-gotoMatchingTag_start=Start tag of element <{0}>
-gotoMatchingTag_end=End tag of element <{0}>
-Open=Open ''{0}''
-_UI_BUTTON_SORT=Sort
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractCommentActionXMLDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractCommentActionXMLDelegate.java
deleted file mode 100644
index e00b29d..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractCommentActionXMLDelegate.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xml.ui.internal.Logger;
-
-/**
- * Abstract comment action delegate for XML editors
- */
-abstract public class AbstractCommentActionXMLDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
-	static final String CLOSE_COMMENT = "-->"; //$NON-NLS-1$
-	static final String OPEN_COMMENT = "<!--"; //$NON-NLS-1$
-
-	IEditorPart fEditor;
-
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		fEditor = targetEditor;
-	}
-
-	public void dispose() {
-		// nulling out just in case
-		fEditor = null;
-	}
-
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	public void run(IAction action) {
-		if (fEditor instanceof ITextEditor) {
-			ITextEditor textEditor = (ITextEditor) fEditor;
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			if (document != null) {
-				// get current text selection
-				ITextSelection textSelection = getCurrentSelection();
-				if (textSelection.isEmpty()) {
-					return;
-				}
-
-				processAction(document, textSelection);
-			}
-		}
-	}
-
-	public void init(IViewPart view) {
-		// do nothing
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// do nothing
-	}
-
-	private ITextSelection getCurrentSelection() {
-		if (fEditor instanceof ITextEditor) {
-			ISelectionProvider provider = ((ITextEditor) fEditor).getSelectionProvider();
-			if (provider != null) {
-				ISelection selection = provider.getSelection();
-				if (selection instanceof ITextSelection) {
-					return (ITextSelection) selection;
-				}
-			}
-		}
-		return TextSelection.emptySelection();
-	}
-
-	abstract void processAction(IDocument document, ITextSelection textSelection);
-
-	void removeOpenCloseComments(IDocument document, int offset, int length) {
-		try {
-			int adjusted_length = length;
-
-			// remove open comments
-			String string = document.get(offset, length);
-			int index = string.lastIndexOf(OPEN_COMMENT);
-			while (index != -1) {
-				document.replace(offset + index, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-				index = string.lastIndexOf(OPEN_COMMENT, index - 1);
-				adjusted_length -= OPEN_COMMENT.length();
-			}
-
-			// remove close comments
-			string = document.get(offset, adjusted_length);
-			index = string.lastIndexOf(CLOSE_COMMENT);
-			while (index != -1) {
-				document.replace(offset + index, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-				index = string.lastIndexOf(CLOSE_COMMENT, index - 1);
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java
deleted file mode 100644
index be7e202..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AbstractNodeActionManager.java
+++ /dev/null
@@ -1,690 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMContentBuilderImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.CMImageUtil;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-
-public abstract class AbstractNodeActionManager extends BaseNodeActionManager {
-
-
-	/**
-	 * AddNodeAction
-	 */
-	public class AddNodeAction extends NodeAction {
-		protected CMNode cmnode;
-		protected String description;
-		protected int index;
-		protected int nodeType;
-		protected Node parent;
-		protected String undoDescription;
-
-
-		public AddNodeAction(CMNode cmnode, Node parent, int index) {
-			this.cmnode = cmnode;
-			this.parent = parent;
-			this.index = index;
-
-			String text = getLabel(parent, cmnode);
-			setText(text);
-			description = text;
-			undoDescription = XMLUIMessages._UI_MENU_ADD + " " + text; //$NON-NLS-1$ 
-			ImageDescriptor descriptor = CMImageUtil.getImageDescriptor(cmnode);
-			if (descriptor == null) {
-				descriptor = imageDescriptorCache.getImageDescriptor(cmnode);
-			}
-			setImageDescriptor(descriptor);
-		}
-
-
-		public AddNodeAction(int nodeType, Node parent, int index) {
-			this.nodeType = nodeType;
-			this.index = index;
-			this.parent = parent;
-
-			switch (nodeType) {
-				case Node.COMMENT_NODE : {
-					description = XMLUIMessages._UI_MENU_COMMENT;
-					undoDescription = XMLUIMessages._UI_MENU_ADD_COMMENT;
-					break;
-				}
-				case Node.PROCESSING_INSTRUCTION_NODE : {
-					description = XMLUIMessages._UI_MENU_PROCESSING_INSTRUCTION;
-					undoDescription = XMLUIMessages._UI_MENU_ADD_PROCESSING_INSTRUCTION;
-					break;
-				}
-				case Node.CDATA_SECTION_NODE : {
-					description = XMLUIMessages._UI_MENU_CDATA_SECTION;
-					undoDescription = XMLUIMessages._UI_MENU_ADD_CDATA_SECTION;
-					break;
-				}
-				case Node.TEXT_NODE : {
-					description = XMLUIMessages._UI_MENU_PCDATA;
-					undoDescription = XMLUIMessages._UI_MENU_ADD_PCDATA;
-					break;
-				}
-			}
-			setText(description);
-			setImageDescriptor(imageDescriptorCache.getImageDescriptor(new Integer(nodeType)));
-		}
-
-
-		protected void addNodeForCMNode() {
-			if (parent != null) {
-				insert(parent, cmnode, index);
-			}
-		}
-
-
-		protected void addNodeForNodeType() {
-			Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document) parent : parent.getOwnerDocument();
-			Node newChildNode = null;
-			boolean format = true;
-			switch (nodeType) {
-				case Node.COMMENT_NODE : {
-					newChildNode = document.createComment(XMLUIMessages._UI_COMMENT_VALUE);
-					break;
-				}
-				case Node.PROCESSING_INSTRUCTION_NODE : {
-					newChildNode = document.createProcessingInstruction(XMLUIMessages._UI_PI_TARGET_VALUE, XMLUIMessages._UI_PI_DATA_VALUE);
-					break;
-				}
-				case Node.CDATA_SECTION_NODE : {
-					newChildNode = document.createCDATASection(""); //$NON-NLS-1$
-					break;
-				}
-				case Node.TEXT_NODE : {
-					format = false;
-					newChildNode = document.createTextNode(parent.getNodeName());
-					break;
-				}
-			}
-
-			if (newChildNode != null) {
-				List list = new Vector(1);
-				list.add(newChildNode);
-				insertNodesAtIndex(parent, list, index, format);
-			}
-		}
-
-
-		public String getUndoDescription() {
-			return undoDescription;
-		}
-
-
-		public void run() {
-			if (validateEdit(getModel(), getWorkbenchWindowShell())) {
-				beginNodeAction(this);
-				if (cmnode != null) {
-					addNodeForCMNode();
-				}
-				else {
-					addNodeForNodeType();
-				}
-				endNodeAction(this);
-			}
-		}
-	}
-
-
-	/**
-	 * DeleteAction
-	 */
-	public class DeleteAction extends NodeAction {
-		protected List list;
-
-		public DeleteAction(List list) {
-			setText(XMLUIMessages._UI_MENU_REMOVE);
-			this.list = list;
-		}
-
-		public DeleteAction(Node node) {
-			setText(XMLUIMessages._UI_MENU_REMOVE);
-			list = new Vector();
-			list.add(node);
-		}
-
-		public String getUndoDescription() {
-			return XMLUIMessages.DELETE;
-		}
-
-		public void run() {
-			if (validateEdit(getModel(), getWorkbenchWindowShell())) {
-				beginNodeAction(this);
-	
-				for (Iterator i = list.iterator(); i.hasNext();) {
-					Node node = (Node) i.next();
-					if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-						Attr attr = (Attr) node;
-						attr.getOwnerElement().removeAttributeNode(attr);
-					}
-					else {
-						Node parent = node.getParentNode();
-						if (parent != null) {
-							Node previousSibling = node.getPreviousSibling();
-							if ((previousSibling != null) && isWhitespaceTextNode(previousSibling)) {
-								parent.removeChild(previousSibling);
-							}
-							parent.removeChild(node);
-						}
-					}
-				}
-
-				endNodeAction(this);
-			}
-		}
-	}
-
-
-	class ImageDescriptorCache {
-		protected ImageDescriptor attributeImage = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
-		protected ImageDescriptor attributeReqImage = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ATT_REQ_OBJ);
-		protected ImageDescriptor cdataSectionImage = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_CDATASECTION);
-		protected ImageDescriptor commentImage = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_COMMENT);
-		protected ImageDescriptor elementImage = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ELEMENT);
-		protected ImageDescriptor piImage = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_PROCESSINGINSTRUCTION);
-		protected ImageDescriptor textImage = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_TXTEXT);
-
-		public ImageDescriptor getImageDescriptor(Object object) {
-			ImageDescriptor result = null;
-			if (object instanceof CMNode) {
-				CMNode cmnode = (CMNode) object;
-				switch (cmnode.getNodeType()) {
-					case CMNode.ATTRIBUTE_DECLARATION : {
-						result = CMImageUtil.getImageDescriptor(cmnode);
-						if (result == null) {
-							if (((CMAttributeDeclaration) cmnode).getUsage() == CMAttributeDeclaration.REQUIRED) {
-								result = attributeReqImage;
-							}
-							else {
-								result = attributeImage;
-							}
-						}
-						break;
-					}
-					case CMNode.DATA_TYPE : {
-						result = textImage;
-						break;
-					}
-					case CMNode.ELEMENT_DECLARATION : {
-						result = CMImageUtil.getImageDescriptor(cmnode);
-						if (result == null) {
-							result = elementImage;
-						}
-						break;
-					}
-					case CMNode.GROUP : {
-						result = elementImage;
-						break;
-					}
-				}
-			}
-			else if (object instanceof Integer) {
-				Integer integer = (Integer) object;
-				switch (integer.intValue()) {
-					case Node.COMMENT_NODE : {
-						result = commentImage;
-						break;
-					}
-					case Node.PROCESSING_INSTRUCTION_NODE : {
-						result = piImage;
-						break;
-					}
-					case Node.CDATA_SECTION_NODE : {
-						result = cdataSectionImage;
-						break;
-					}
-					case Node.TEXT_NODE : {
-						result = textImage;
-						break;
-					}
-				}
-			}
-			return result;
-		}
-	}
-
-	// TODO... remove this class. I'm pretty sure it is no longer used by
-	// anyone.
-	/**
-	 * @depracated
-	 */
-	public class InsertAction extends NodeAction {
-		protected String description;
-		protected int index;
-		protected int nodeType;
-		protected Node parent;
-
-		public InsertAction(int nodeType, Node parent, int index) {
-			this.nodeType = nodeType;
-			this.index = index;
-			this.parent = parent;
-			switch (nodeType) {
-				case Node.COMMENT_NODE : {
-					description = XMLUIMessages._UI_MENU_COMMENT;
-					break;
-				}
-				case Node.PROCESSING_INSTRUCTION_NODE : {
-					description = XMLUIMessages._UI_MENU_PROCESSING_INSTRUCTION;
-					break;
-				}
-				case Node.CDATA_SECTION_NODE : {
-					description = XMLUIMessages._UI_MENU_CDATA_SECTION;
-					break;
-				}
-				case Node.TEXT_NODE : {
-					description = XMLUIMessages._UI_MENU_PCDATA;
-					break;
-				}
-			}
-			setText(description);
-			setImageDescriptor(imageDescriptorCache.getImageDescriptor(new Integer(nodeType)));
-		}
-
-		public InsertAction(int nodeType, Node parent, int index, String title) {
-			this.nodeType = nodeType;
-			this.index = index;
-			this.parent = parent;
-			description = title;
-			setText(description);
-			setImageDescriptor(imageDescriptorCache.getImageDescriptor(new Integer(nodeType)));
-		}
-
-		public String getUndoDescription() {
-			return XMLUIMessages._UI_MENU_ADD + " " + description; //$NON-NLS-1$ 
-		}
-
-		public void run() {
-			if (validateEdit(getModel(), getWorkbenchWindowShell())) {
-				beginNodeAction(this);
-	
-				Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document) parent : parent.getOwnerDocument();
-				Node newChildNode = null;
-				boolean format = true;
-				switch (nodeType) {
-					case Node.COMMENT_NODE : {
-						newChildNode = document.createComment(XMLUIMessages._UI_COMMENT_VALUE);
-						break;
-					}
-					case Node.PROCESSING_INSTRUCTION_NODE : {
-						newChildNode = document.createProcessingInstruction(XMLUIMessages._UI_PI_TARGET_VALUE, XMLUIMessages._UI_PI_DATA_VALUE);
-						break;
-					}
-					case Node.CDATA_SECTION_NODE : {
-						newChildNode = document.createCDATASection(""); //$NON-NLS-1$
-						break;
-					}
-					case Node.TEXT_NODE : {
-						format = false;
-						newChildNode = document.createTextNode(parent.getNodeName());
-						break;
-					}
-				}
-	
-				if (newChildNode != null) {
-					List list = new Vector(1);
-					list.add(newChildNode);
-					insertNodesAtIndex(parent, list, index, format);
-				}
-	
-				endNodeAction(this);
-			}
-		}
-	}
-
-
-	/**
-	 * ReplaceNodeAction
-	 */
-	public class ReplaceNodeAction extends NodeAction {
-		protected CMNode cmnode;
-		protected String description;
-		protected int endIndex;
-		protected Node parent;
-		protected int startIndex;
-
-
-		public ReplaceNodeAction(Node parent, CMNode cmnode, int startIndex, int endIndex) {
-			this.parent = parent;
-			this.cmnode = cmnode;
-			this.startIndex = startIndex;
-			this.endIndex = endIndex;
-
-			setText(getLabel(parent, cmnode));
-			setImageDescriptor(imageDescriptorCache.getImageDescriptor(cmnode));
-		}
-
-		public String getUndoDescription() {
-			String result = XMLUIMessages._UI_LABEL_UNDO_REPLACE_DESCRIPTION;
-			result += " " + getLabel(parent, cmnode); //$NON-NLS-1$
-			return result;
-		}
-
-		public void run() {
-			if (validateEdit(getModel(), getWorkbenchWindowShell())) {
-				beginNodeAction(this);
-	
-				if ((parent != null) && (cmnode != null)) {
-					remove(parent, startIndex, endIndex);
-					insert(parent, cmnode, startIndex);
-				}
-				endNodeAction(this);
-			}
-		}
-	}
-
-	protected ImageDescriptorCache imageDescriptorCache = new ImageDescriptorCache();
-	protected Viewer fViewer;
-
-	public AbstractNodeActionManager(IStructuredModel model, ModelQuery modelQuery, Viewer viewer) {
-		super(model, modelQuery);
-		this.fViewer = viewer;
-	}
-
-
-	public void beginNodeAction(NodeAction action) {
-		fModel.beginRecording(action, action.getUndoDescription());
-	}
-
-
-	protected Action createAddAttributeAction(Element parent, CMAttributeDeclaration ad) {
-		Action action = null;
-		if (ad == null) {
-			action = new EditAttributeAction(this, parent, null, XMLUIMessages._UI_MENU_NEW_ATTRIBUTE, XMLUIMessages._UI_MENU_NEW_ATTRIBUTE_TITLE);
-		}
-		else {
-			action = new AddNodeAction(ad, parent, -1);
-		}
-		return action;
-	}
-
-
-	protected Action createAddCDataSectionAction(Node parent, int index) {
-		return new AddNodeAction(Node.CDATA_SECTION_NODE, parent, index);
-	}
-
-
-	protected Action createAddCommentAction(Node parent, int index) {
-		return new AddNodeAction(Node.COMMENT_NODE, parent, index);
-	}
-
-
-	protected Action createAddDoctypeAction(Document document, int index) {
-		return new EditDoctypeAction(fModel, document, fModel.getBaseLocation(), XMLUIMessages._UI_MENU_ADD_DTD_INFORMATION);
-	}
-
-
-	protected Action createAddElementAction(Node parent, CMElementDeclaration ed, int index) {
-		Action action = null;
-		if (ed == null) {
-			action = new EditElementAction(this, parent, index, XMLUIMessages._UI_MENU_NEW_ELEMENT, XMLUIMessages._UI_MENU_NEW_ELEMENT_TITLE);
-		}
-		else {
-			action = new AddNodeAction(ed, parent, index);
-		}
-		return action;
-	}
-
-
-	protected Action createAddPCDataAction(Node parent, CMDataType dataType, int index) {
-		Action action = null;
-		if (dataType == null) {
-			action = new AddNodeAction(Node.TEXT_NODE, parent, index);
-		}
-		else {
-			action = new AddNodeAction(dataType, parent, index);
-		}
-		return action;
-	}
-
-
-	protected Action createAddProcessingInstructionAction(Node parent, int index) {
-		Node refChild = getRefChildNodeAtIndex(parent, index);
-		Action action = new EditProcessingInstructionAction(this, parent, refChild, XMLUIMessages._UI_MENU_ADD_PROCESSING_INSTRUCTION, XMLUIMessages.ADD_PROCESSING_INSTRUCTION);
-		action.setImageDescriptor(imageDescriptorCache.getImageDescriptor(new Integer(Node.PROCESSING_INSTRUCTION_NODE)));
-		return action;
-	}
-
-
-	protected Action createAddSchemaInfoAction(Element element) {
-		return new EditSchemaInfoAction(this, element.getOwnerDocument(), fModel.getBaseLocation(), XMLUIMessages._UI_MENU_ADD_SCHEMA_INFORMATION);
-	}
-
-
-	protected Action createDeleteAction(List selection) {
-		DeleteAction deleteAction = new DeleteAction(selection);
-		deleteAction.setEnabled(selection.size() > 0);
-		return deleteAction;
-	}
-
-
-	public DOMContentBuilder createDOMContentBuilder(Document document) {
-		DOMContentBuilderImpl builder = new DOMContentBuilderImpl(document);
-		return builder;
-	}
-
-
-	protected Action createEditAttributeAction(Attr attr, CMAttributeDeclaration ad) {
-		return new EditAttributeAction(this, attr.getOwnerElement(), attr, XMLUIMessages._UI_MENU_EDIT_ATTRIBUTE, XMLUIMessages._UI_MENU_EDIT_ATTRIBUTE_TITLE);
-	}
-
-
-	protected Action createEditDoctypeAction(DocumentType doctype) {
-		return new EditDoctypeAction(fModel, doctype, fModel.getBaseLocation(), XMLUIMessages._UI_MENU_EDIT_DOCTYPE);
-	}
-
-
-	protected Action createEditProcessingInstructionAction(ProcessingInstruction pi) {
-		return new EditProcessingInstructionAction(this, pi, XMLUIMessages._UI_MENU_EDIT_PROCESSING_INSTRUCTION, XMLUIMessages._UI_MENU_EDIT_PROCESSING_INSTRUCTION_TITLE);
-	}
-
-
-	protected Action createEditSchemaInfoAction(Element element) {
-		return new EditSchemaInfoAction(this, element.getOwnerDocument(), fModel.getBaseLocation(), XMLUIMessages._UI_MENU_EDIT_NAMESPACES);
-	}
-
-
-	protected Action createRenameAction(Node node) {
-		Action result = null;
-		if (node instanceof Element) {
-			result = new EditElementAction(this, (Element) node, XMLUIMessages._UI_MENU_RENAME, XMLUIMessages._UI_MENU_RENAME_TITLE);
-		}
-		return result;
-	}
-
-
-	protected Action createReplaceAction(Node parent, CMNode cmnode, int startIndex, int endIndex) {
-		return new ReplaceNodeAction(parent, cmnode, startIndex, endIndex);
-	}
-
-	public void endNodeAction(NodeAction action) {
-		fModel.endRecording(action);
-	}
-
-
-
-	public void fillContextMenu(IMenuManager menuManager, ISelection selection) {
-		try {
-			List selectionList = new ArrayList();
-			if (selection instanceof IStructuredSelection) {
-				IStructuredSelection es = (IStructuredSelection) selection;
-				selectionList.addAll(es.toList());
-			}
-
-			contributeActions(menuManager, selectionList);
-		}
-		catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * 
-	 */
-	public String getLabel(Node parent, CMNode cmnode) {
-		String result = "?" + cmnode + "?"; //$NON-NLS-1$ //$NON-NLS-2$
-		if (cmnode != null) {
-			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=155800
-			result = cmnode.getNodeName();
-			if(result == null) {
-				result = (String) cmnode.getProperty("description"); //$NON-NLS-1$
-			}
-			if (result == null || result.length() == 0) {
-				if (cmnode.getNodeType() == CMNode.GROUP) {
-					CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
-					result = descriptionBuilder.buildDescription(cmnode);
-				}
-				else {
-					result = DOMNamespaceHelper.computeName(cmnode, parent, null);
-				}
-			}
-		}
-		return result;
-	}
-
-
-	public IStructuredModel getModel() {
-		return fModel;
-	}
-
-
-	public Shell getWorkbenchWindowShell() {
-		return XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-	}
-
-
-	public void insert(Node parent, CMNode cmnode, int index) {
-		Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document) parent : parent.getOwnerDocument();
-		DOMContentBuilder builder = createDOMContentBuilder(document);
-		builder.setBuildPolicy(DOMContentBuilder.BUILD_ONLY_REQUIRED_CONTENT);
-		builder.build(parent, cmnode);
-		insertNodesAtIndex(parent, builder.getResult(), index);
-	}
-
-
-	public void insertNodesAtIndex(Node parent, List list, int index) {
-		insertNodesAtIndex(parent, list, index, true);
-	}
-
-
-	public void insertNodesAtIndex(Node parent, List list, int index, boolean format) {
-		NodeList nodeList = parent.getChildNodes();
-		if (index == -1) {
-			index = nodeList.getLength();
-		}
-		Node refChild = (index < nodeList.getLength()) ? nodeList.item(index) : null;
-
-		// here we consider the case where the previous node is a 'white
-		// space' Text node
-		// we should really do the insert before this node
-		//
-		int prevIndex = index - 1;
-		Node prevChild = (prevIndex < nodeList.getLength()) ? nodeList.item(prevIndex) : null;
-		if (isWhitespaceTextNode(prevChild)) {
-			refChild = prevChild;
-		}
-
-		for (Iterator i = list.iterator(); i.hasNext();) {
-			Node newNode = (Node) i.next();
-
-			if (newNode.getNodeType() == Node.ATTRIBUTE_NODE) {
-				Element parentElement = (Element) parent;
-				parentElement.setAttributeNode((Attr) newNode);
-			}
-			else {
-				parent.insertBefore(newNode, refChild);
-			}
-		}
-
-		boolean formatDeep = false;
-		for (Iterator i = list.iterator(); i.hasNext();) {
-			Node newNode = (Node) i.next();
-			if (newNode.getNodeType() == Node.ELEMENT_NODE) {
-				formatDeep = true;
-			}
-
-			if (format) {
-				reformat(newNode, formatDeep);
-			}
-		}
-
-		setViewerSelection(list);
-	}
-
-
-	/**
-	 * This method is abstract since currently, the sed editor is required to
-	 * perform formating and we don't want to create a dependency on the sed
-	 * editor.
-	 */
-	public abstract void reformat(Node parent, boolean deep);
-
-
-	public void remove(Node parent, int startIndex, int endIndex) {
-		NodeList nodeList = parent.getChildNodes();
-		for (int i = endIndex; i >= startIndex; i--) {
-			Node node = nodeList.item(i);
-			if (node != null) {
-				parent.removeChild(node);
-			}
-		}
-	}
-
-
-	public void setViewerSelection(List list) {
-		if (fViewer != null) {
-			fViewer.setSelection(new StructuredSelection(list), true);
-		}
-	}
-
-
-	public void setViewerSelection(Node node) {
-		if (fViewer != null) {
-			fViewer.setSelection(new StructuredSelection(node), true);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ActionContributorXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ActionContributorXML.java
deleted file mode 100644
index c4f8285..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ActionContributorXML.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
-import org.eclipse.ui.texteditor.RetargetTextEditorAction;
-import org.eclipse.wst.sse.ui.internal.actions.ActionContributor;
-import org.eclipse.wst.sse.ui.internal.actions.ActionDefinitionIds;
-import org.eclipse.wst.sse.ui.internal.actions.StructuredTextEditorActionConstants;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * XMLEditorActionContributor
- * 
- * This class should not be used inside multi page editor's
- * ActionBarContributor, since cascaded init() call from the
- * ActionBarContributor will causes exception and it leads to lose whole
- * toolbars.
- * 
- * Instead, use SourcePageActionContributor for source page contributor of
- * multi page editor.
- * 
- * Note that this class is still valid for single page editor.
- */
-public class ActionContributorXML extends ActionContributor {
-	private static final String[] EDITOR_IDS = {"org.eclipse.core.runtime.xml.source", "org.eclipse.core.runtime.xml.source2", "org.eclipse.wst.sse.ui.StructuredTextEditor"}; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-	private static final String GO_TO_MATCHING_TAG_ID = "org.eclipse.wst.xml.ui.gotoMatchingTag"; //$NON-NLS-1$
-	
-	protected RetargetTextEditorAction fCleanupDocument = null;
-	protected RetargetTextEditorAction fComment = null;
-	protected RetargetTextEditorAction fContentAssist = null;
-	protected RetargetTextEditorAction fFindOccurrences = null;
-	protected RetargetTextEditorAction fFormatActiveElements = null;
-	protected RetargetTextEditorAction fFormatDocument = null;
-	protected RetargetTextEditorAction fOpenFileAction = null; // open file
-
-	protected RetargetTextEditorAction fUncomment = null;
-	private GoToMatchingTagAction fGoToMatchingTagAction;
-
-	public ActionContributorXML() {
-		super();
-
-		ResourceBundle resourceBundle = XMLUIMessages.getResourceBundle();
-
-		fContentAssist = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fContentAssist.setActionDefinitionId(ITextEditorActionDefinitionIds.CONTENT_ASSIST_PROPOSALS);
-
-		// source commands
-		fCleanupDocument = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fCleanupDocument.setActionDefinitionId(ActionDefinitionIds.CLEANUP_DOCUMENT);
-
-		fFormatDocument = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fFormatDocument.setActionDefinitionId(ActionDefinitionIds.FORMAT_DOCUMENT);
-
-		fFormatActiveElements = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fFormatActiveElements.setActionDefinitionId(ActionDefinitionIds.FORMAT_ACTIVE_ELEMENTS);
-
-		// navigate commands
-		fOpenFileAction = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fOpenFileAction.setActionDefinitionId(ActionDefinitionIds.OPEN_FILE);
-
-		fFindOccurrences = new RetargetTextEditorAction(resourceBundle, ""); //$NON-NLS-1$
-		fFindOccurrences.setActionDefinitionId(ActionDefinitionIds.FIND_OCCURRENCES);
-
-		fGoToMatchingTagAction = new GoToMatchingTagAction(resourceBundle, "gotoMatchingTag_", null); //$NON-NLS-1$
-		fGoToMatchingTagAction.setActionDefinitionId(GO_TO_MATCHING_TAG_ID);
-		fGoToMatchingTagAction.setId(GO_TO_MATCHING_TAG_ID);
-	}
-	
-	/**
-	 * @see org.eclipse.ui.part.EditorActionBarContributor#contributeToMenu(IMenuManager)
-	 */
-	public void contributeToMenu(IMenuManager menu) {
-		// navigate commands
-		IMenuManager navigateMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_NAVIGATE);
-		if (navigateMenu != null) {
-			navigateMenu.appendToGroup(IWorkbenchActionConstants.OPEN_EXT, fCommandsSeparator);
-			navigateMenu.appendToGroup(IWorkbenchActionConstants.OPEN_EXT, fOpenFileAction);
-
-			IMenuManager gotoGroup = navigateMenu.findMenuUsingPath(IWorkbenchActionConstants.GO_TO);
-			if (gotoGroup != null) {
-				gotoGroup.appendToGroup("matchingBegin", fGoToMatchingTagAction); //$NON-NLS-1$
-			}
-		}
-		super.contributeToMenu(menu);
-	}
-
-	protected void addToMenu(IMenuManager menu) {
-/*
-		// edit commands
-		IMenuManager editMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_EDIT);
-		if (editMenu != null) {
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fToggleInsertModeAction);
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fExpandSelectionToMenu);
-			editMenu.add(fCommandsSeparator);
-			editMenu.add(fContentAssist);
-			editMenu.add(fMenuAdditionsGroupMarker);
-		}
-
-		// source commands
-		String sourceMenuLabel = XMLUIMessages.SourceMenu_label;
-		String sourceMenuId = "sourceMenuId"; //$NON-NLS-1$
-		IMenuManager sourceMenu = new MenuManager(sourceMenuLabel, sourceMenuId);
-		menu.insertAfter(IWorkbenchActionConstants.M_EDIT, sourceMenu);
-		if (sourceMenu != null) {
-			sourceMenu.add(fCommandsSeparator);
-			sourceMenu.add(fToggleComment);
-			sourceMenu.add(fAddBlockComment);
-			sourceMenu.add(fRemoveBlockComment);
-			sourceMenu.add(fShiftRight);
-			sourceMenu.add(fShiftLeft);
-			sourceMenu.add(fCleanupDocument);
-			sourceMenu.add(fFormatDocument);
-			sourceMenu.add(fFormatActiveElements);
-			sourceMenu.add(fCommandsSeparator);
-			sourceMenu.add(fFindOccurrences);
-		}
-
-		// navigate commands
-		IMenuManager navigateMenu = menu.findMenuUsingPath(IWorkbenchActionConstants.M_NAVIGATE);
-		if (navigateMenu != null) {
-			navigateMenu.appendToGroup(IWorkbenchActionConstants.OPEN_EXT, fCommandsSeparator);
-			navigateMenu.appendToGroup(IWorkbenchActionConstants.OPEN_EXT, fOpenFileAction);
-
-			IMenuManager gotoGroup = navigateMenu.findMenuUsingPath(IWorkbenchActionConstants.GO_TO);
-			if (gotoGroup != null) {
-				gotoGroup.add(fGotoMatchingBracketAction);
-				gotoGroup.add(fGoToMatchingTagAction);
-				gotoGroup.add(new Separator());
-			}
-		}
-*/
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.edit.util.ActionContributor#getExtensionIDs()
-	 */
-	protected String[] getExtensionIDs() {
-		return EDITOR_IDS;
-	}
-
-	/**
-	 * @see org.eclipse.ui.IEditorActionBarContributor#setActiveEditor(IEditorPart)
-	 */
-	public void setActiveEditor(IEditorPart activeEditor) {
-		if (getActiveEditorPart() == activeEditor) {
-			return;
-		}
-		super.setActiveEditor(activeEditor);
-
-		IActionBars actionBars = getActionBars();
-		if (actionBars != null) {
-			IStatusLineManager statusLineManager = actionBars.getStatusLineManager();
-			if (statusLineManager != null) {
-				statusLineManager.setMessage(null);
-				statusLineManager.setErrorMessage(null);
-			}
-		}
-
-		ITextEditor textEditor = getTextEditor(activeEditor);
-
-		fContentAssist.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_CONTENTASSIST_PROPOSALS));
-
-		fCleanupDocument.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_CLEANUP_DOCUMENT));
-		fFormatDocument.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_DOCUMENT));
-		fFormatActiveElements.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_FORMAT_ACTIVE_ELEMENTS));
-		fCleanupDocument.setEnabled((textEditor != null) && textEditor.isEditable());
-		fFormatDocument.setEnabled((textEditor != null) && textEditor.isEditable());
-		fFormatActiveElements.setEnabled((textEditor != null) && textEditor.isEditable());
-
-		fOpenFileAction.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_OPEN_FILE));
-
-		fFindOccurrences.setAction(getAction(textEditor, StructuredTextEditorActionConstants.ACTION_NAME_FIND_OCCURRENCES));
-
-		fGoToMatchingTagAction.setEditor(textEditor);
-		if (textEditor != null) {
-			textEditor.setAction(GO_TO_MATCHING_TAG_ID, fGoToMatchingTagAction);
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.ISourceViewerActionBarContributor#setViewerSpecificContributionsEnabled(boolean)
-	 */
-	public void setViewerSpecificContributionsEnabled(boolean enabled) {
-		super.setViewerSpecificContributionsEnabled(enabled);
-
-		fContentAssist.setEnabled(enabled);
-		// cleanup and format document actions do not rely on source viewer
-		// being enabled
-		// fCleanupDocument.setEnabled(enabled);
-		// fFormatDocument.setEnabled(enabled);
-
-		fFormatActiveElements.setEnabled(enabled);
-		fOpenFileAction.setEnabled(enabled);
-		fFindOccurrences.setEnabled(enabled);
-
-		fGoToMatchingTagAction.setEnabled(enabled);
-		fGotoMatchingBracketAction.setEnabled(enabled);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AddBlockCommentActionXMLDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AddBlockCommentActionXMLDelegate.java
deleted file mode 100644
index a038376..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/AddBlockCommentActionXMLDelegate.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.document.CommentImpl;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Add block comment action delegate for XML editor
- */
-public class AddBlockCommentActionXMLDelegate extends AbstractCommentActionXMLDelegate {
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(XMLUIMessages.AddBlockComment_label);
-			action.setToolTipText(XMLUIMessages.AddBlockComment_tooltip);
-			action.setDescription(XMLUIMessages.AddBlockComment_description);
-		}
-	}
-
-	void processAction(IDocument document, ITextSelection textSelection) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null) {
-			try {
-				IndexedRegion selectionStartIndexedRegion = model.getIndexedRegion(textSelection.getOffset());
-				IndexedRegion selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength());
-
-				if (selectionStartIndexedRegion == null) {
-					return;
-				}
-				if ((selectionEndIndexedRegion == null) && (textSelection.getLength() > 0)) {
-					selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength() - 1);
-				}
-				if (selectionEndIndexedRegion == null) {
-					return;
-				}
-
-				int openCommentOffset = selectionStartIndexedRegion.getStartOffset();
-				int closeCommentOffset = selectionEndIndexedRegion.getEndOffset() + OPEN_COMMENT.length();
-
-
-				if ((textSelection.getLength() == 0) && (selectionStartIndexedRegion instanceof CommentImpl)) {
-					return;
-				}
-
-				model.beginRecording(this, XMLUIMessages.AddBlockComment_tooltip);
-				model.aboutToChangeModel();
-
-				try {
-					document.replace(openCommentOffset, 0, OPEN_COMMENT);
-					document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
-					removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-				}
-				catch (BadLocationException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-				finally {
-					model.changedModel();
-					model.endRecording(this);
-				}
-			}
-			finally {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/BaseNodeActionManager.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/BaseNodeActionManager.java
deleted file mode 100644
index 4629a23..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/BaseNodeActionManager.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-
-public abstract class BaseNodeActionManager {
-
-
-	/**
-	 * MyMenuManager
-	 */
-	public static class MyMenuManager extends MenuManager {
-		protected String title;
-
-		public MyMenuManager(String s) {
-			super(s);
-			title = s;
-		}
-
-		public boolean isEnabled() {
-			return !isEmpty();
-		}
-
-		public String toString() {
-			return title;
-		}
-	}
-
-	public static DocumentType getDoctype(Node node) {
-		Document document = (node.getNodeType() == Node.DOCUMENT_NODE) ? (Document) node : node.getOwnerDocument();
-		return document.getDoctype();
-	}
-
-	protected MenuBuilder menuBuilder = new MenuBuilder();
-	protected IStructuredModel fModel;
-	protected ModelQuery modelQuery;
-
-	protected BaseNodeActionManager(IStructuredModel model, ModelQuery modelQuery) {
-		this.fModel = model;
-		this.modelQuery = modelQuery;
-	}
-
-
-	protected void addActionHelper(IMenuManager menu, List modelQueryActionList) {
-		List actionList = new Vector();
-		for (Iterator i = modelQueryActionList.iterator(); i.hasNext();) {
-			ModelQueryAction action = (ModelQueryAction) i.next();
-			if (action.getCMNode() != null) {
-				int cmNodeType = action.getCMNode().getNodeType();
-				if (action.getKind() == ModelQueryAction.INSERT) {
-					switch (cmNodeType) {
-						case CMNode.ATTRIBUTE_DECLARATION : {
-							actionList.add(createAddAttributeAction((Element) action.getParent(), (CMAttributeDeclaration) action.getCMNode()));
-							break;
-						}
-						case CMNode.ELEMENT_DECLARATION : {
-							actionList.add(createAddElementAction(action.getParent(), (CMElementDeclaration) action.getCMNode(), action.getStartIndex()));
-							break;
-						}
-					}
-				}
-				else if (action.getKind() == ModelQueryAction.REPLACE) {
-					if ((action.getParent() != null) && (action.getCMNode() != null)) {
-						actionList.add(createReplaceAction(action.getParent(), action.getCMNode(), action.getStartIndex(), action.getEndIndex()));
-					}
-				}
-			}
-		}
-		menuBuilder.populateMenu(menu, actionList, false);
-	}
-
-	protected void contributeAction(IMenuManager menu, Action action) {
-		if (action != null) {
-			menu.add(action);
-		}
-	}
-
-
-	public void contributeActions(IMenuManager menu, List selection) {
-		int editMode = modelQuery.getEditMode();
-		int ic = ModelQuery.INCLUDE_CHILD_NODES;
-		int vc = (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) ? ModelQuery.VALIDITY_STRICT : ModelQuery.VALIDITY_NONE;
-
-		List implicitlySelectedNodeList = null;
-
-		if (selection.size() > 0) {
-			implicitlySelectedNodeList = getSelectedNodes(selection, true);
-
-			// contribute delete actions
-			contributeDeleteActions(menu, implicitlySelectedNodeList, ic, vc);
-		}
-
-		if (selection.size() == 1) {
-			Node node = (Node) selection.get(0);
-
-			// contribute edit actions
-			contributeEditActions(menu, node);
-
-			// contribute add child actions
-			contributeAddChildActions(menu, node, ic, vc);
-
-			// contribute add before actions
-			contributeAddSiblingActions(menu, node, ic, vc);
-		}
-
-		if (selection.size() > 0) {
-			// contribute replace actions
-			contributeReplaceActions(menu, implicitlySelectedNodeList, ic, vc);
-		}
-
-		if (selection.size() == 0) {
-			Document document = ((IDOMModel) fModel).getDocument();
-			contributeAddDocumentChildActions(menu, document, ic, vc);
-			contributeEditGrammarInformationActions(menu, document);
-		}
-	}
-
-
-	protected void contributeAddChildActions(IMenuManager menu, Node node, int ic, int vc) {
-		int nodeType = node.getNodeType();
-
-		if (nodeType == Node.ELEMENT_NODE) {
-			// 'Add Child...' and 'Add Attribute...' actions
-			//
-			Element element = (Element) node;
-
-			IMenuManager addAttributeMenu = new MyMenuManager(XMLUIMessages._UI_MENU_ADD_ATTRIBUTE);
-			IMenuManager addChildMenu = new MyMenuManager(XMLUIMessages._UI_MENU_ADD_CHILD);
-			menu.add(addAttributeMenu);
-			menu.add(addChildMenu);
-
-			CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);
-			if (ed != null) {
-				// add insert attribute actions
-				//
-				List modelQueryActionList = new ArrayList();
-				modelQuery.getInsertActions(element, ed, -1, ModelQuery.INCLUDE_ATTRIBUTES, vc, modelQueryActionList);
-				addActionHelper(addAttributeMenu, modelQueryActionList);
-
-				// add insert child node actions
-				//
-				modelQueryActionList = new ArrayList();
-				modelQuery.getInsertActions(element, ed, -1, ic, vc, modelQueryActionList);
-				addActionHelper(addChildMenu, modelQueryActionList);
-			}
-
-			// add PI and COMMENT
-			contributePIAndCommentActions(addChildMenu, element, ed, -1);
-
-			// add PCDATA, CDATA_SECTION
-			contributeTextNodeActions(addChildMenu, element, ed, -1);
-
-			// add NEW ELEMENT
-			contributeUnconstrainedAddElementAction(addChildMenu, element, ed, -1);
-
-			// add ATTRIBUTE
-			contributeUnconstrainedAttributeActions(addAttributeMenu, element, ed);
-		}
-	}
-
-
-	protected void contributeAddDocumentChildActions(IMenuManager menu, Document document, int ic, int vc) {
-		IMenuManager addChildMenu = new MyMenuManager(XMLUIMessages._UI_MENU_ADD_CHILD);
-		menu.add(addChildMenu);
-
-		// add PI and COMMENT
-		contributePIAndCommentActions(addChildMenu, document, -1);
-
-		// add NEW ELEMENT
-		contributeUnconstrainedAddElementAction(addChildMenu, document, -1);
-	}
-
-
-	protected void contributeAddSiblingActions(IMenuManager menu, Node node, int ic, int vc) {
-		IMenuManager addBeforeMenu = new MyMenuManager(XMLUIMessages._UI_MENU_ADD_BEFORE);
-		IMenuManager addAfterMenu = new MyMenuManager(XMLUIMessages._UI_MENU_ADD_AFTER);
-		menu.add(addBeforeMenu);
-		menu.add(addAfterMenu);
-
-		Node parentNode = node.getParentNode();
-		if (parentNode != null) {
-			int index = getIndex(parentNode, node);
-			if (parentNode.getNodeType() == Node.ELEMENT_NODE) {
-				Element parentElement = (Element) parentNode;
-				CMElementDeclaration parentED = modelQuery.getCMElementDeclaration(parentElement);
-				if (parentED != null) {
-					// 'Add Before...' and 'Add After...' actions
-					//
-					List modelQueryActionList = new ArrayList();
-					modelQuery.getInsertActions(parentElement, parentED, index, ic, vc, modelQueryActionList);
-					addActionHelper(addBeforeMenu, modelQueryActionList);
-
-					modelQueryActionList = new ArrayList();
-					modelQuery.getInsertActions(parentElement, parentED, index + 1, ic, vc, modelQueryActionList);
-					addActionHelper(addAfterMenu, modelQueryActionList);
-				}
-
-				// add COMMENT and PI before and after
-				contributePIAndCommentActions(addBeforeMenu, parentElement, parentED, index);
-				contributePIAndCommentActions(addAfterMenu, parentElement, parentED, index + 1);
-
-				// add PCDATA, CDATA_SECTION before and after
-				contributeTextNodeActions(addBeforeMenu, parentElement, parentED, index);
-				contributeTextNodeActions(addAfterMenu, parentElement, parentED, index + 1);
-
-				// add NEW ELEMENT before and after
-				contributeUnconstrainedAddElementAction(addBeforeMenu, parentElement, parentED, index);
-				contributeUnconstrainedAddElementAction(addAfterMenu, parentElement, parentED, index + 1);
-			}
-			else if (parentNode.getNodeType() == Node.DOCUMENT_NODE) {
-				Document document = (Document) parentNode;
-				CMDocument cmDocument = modelQuery.getCorrespondingCMDocument(parentNode);
-				if (cmDocument != null) {
-					// add possible root element insertions
-					//        
-					List modelQueryActionList = new ArrayList();
-					modelQuery.getInsertActions(document, cmDocument, index, ic, vc, modelQueryActionList);
-					addActionHelper(addAfterMenu, modelQueryActionList);
-
-					modelQueryActionList = new ArrayList();
-					modelQuery.getInsertActions(document, cmDocument, index + 1, ic, vc, modelQueryActionList);
-					addActionHelper(addAfterMenu, modelQueryActionList);
-				}
-
-				// add COMMENT and PI before and after
-				contributePIAndCommentActions(addBeforeMenu, document, index);
-				contributePIAndCommentActions(addAfterMenu, document, index + 1);
-
-				// add ELEMENT before and after
-				contributeUnconstrainedAddElementAction(addBeforeMenu, document, index);
-				contributeUnconstrainedAddElementAction(addAfterMenu, document, index + 1);
-			}
-		}
-	}
-
-	protected void contributeDeleteActions(IMenuManager menu, List list, int ic, int vc) {
-		boolean canRemove = modelQuery.canRemove(list, vc);
-
-
-		// a delete action with an empty list will produce a disabled menu
-		// item
-		//
-		List resultList = canRemove ? list : Collections.EMPTY_LIST;
-		contributeAction(menu, createDeleteAction(resultList));
-	}
-
-
-	protected void contributeEditActions(IMenuManager menu, Node node) {
-		contributeEditGrammarInformationActions(menu, node);
-
-		if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) {
-			contributeAction(menu, createEditProcessingInstructionAction((ProcessingInstruction) node));
-		}
-		else if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-			contributeAction(menu, createEditAttributeAction((Attr) node, null));
-		}
-	}
-
-
-	protected void contributeEditGrammarInformationActions(IMenuManager menu, Node node) {
-		Document document = node.getNodeType() == Node.DOCUMENT_NODE ? (Document) node : node.getOwnerDocument();
-
-		DocumentType doctype = getDoctype(node);
-		if (doctype == null) {
-			contributeAction(menu, createAddDoctypeAction(document, -1));
-		}
-
-		if (node.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
-			contributeAction(menu, createEditDoctypeAction((DocumentType) node));
-		}
-
-		if ((doctype == null) && (getRootElement(document) != null)) {
-			contributeAction(menu, createEditSchemaInfoAction(getRootElement(document)));
-		}
-	}
-
-	protected void contributePIAndCommentActions(IMenuManager menu, Document document, int index) {
-		// test to make sure that the index isn't before the XML declaration
-		// 
-		contributeAction(menu, createAddCommentAction(document, index));
-		contributeAction(menu, createAddProcessingInstructionAction(document, index));
-	}
-
-
-	protected void contributePIAndCommentActions(IMenuManager menu, Element parentElement, CMElementDeclaration parentEd, int index) {
-		if ((parentEd == null) || isCommentAllowed(parentEd)) {
-			contributeAction(menu, createAddCommentAction(parentElement, index));
-			contributeAction(menu, createAddProcessingInstructionAction(parentElement, index));
-		}
-	}
-
-
-	protected void contributeReplaceActions(IMenuManager menu, List selectedNodeList, int ic, int vc) {
-		// 'Replace With...' actions
-		//                                                                                                                   
-		IMenuManager replaceWithMenu = new MyMenuManager(XMLUIMessages._UI_MENU_REPLACE_WITH);
-		menu.add(replaceWithMenu);
-
-		if ((modelQuery.getEditMode() == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) && (selectedNodeList.size() > 0)) {
-			Node node = (Node) selectedNodeList.get(0);
-			Node parentNode = node.getParentNode();
-			if ((parentNode != null) && (parentNode.getNodeType() == Node.ELEMENT_NODE)) {
-				Element parentElement = (Element) parentNode;
-				CMElementDeclaration parentED = modelQuery.getCMElementDeclaration(parentElement);
-				if (parentED != null) {
-					List replaceActionList = new Vector();
-					modelQuery.getReplaceActions(parentElement, parentED, selectedNodeList, ic, vc, replaceActionList);
-					addActionHelper(replaceWithMenu, replaceActionList);
-				}
-			}
-		}
-	}
-
-	protected void contributeTextNodeActions(IMenuManager menu, Element parentElement, CMElementDeclaration parentEd, int index) {
-		if ((parentEd == null) || isTextAllowed(parentEd)) {
-			CMDataType dataType = parentEd != null ? parentEd.getDataType() : null;
-			contributeAction(menu, createAddPCDataAction(parentElement, dataType, index));
-			contributeAction(menu, createAddCDataSectionAction(parentElement, index));
-		}
-	}
-
-
-	protected void contributeUnconstrainedAddElementAction(IMenuManager menu, Document document, int index) {
-		if (isUnconstrainedActionAllowed()) {
-			if (getRootElement(document) == null) {
-				int xmlDeclarationIndex = -1;
-				int doctypeIndex = -1;
-				NodeList nodeList = document.getChildNodes();
-				int nodeListLength = nodeList.getLength();
-				for (int i = 0; i < nodeListLength; i++) {
-					Node node = nodeList.item(i);
-					int nodeType = node.getNodeType();
-					if (nodeType == Node.DOCUMENT_TYPE_NODE) {
-						doctypeIndex = i;
-						break;
-					}
-					else if (nodeType == Node.PROCESSING_INSTRUCTION_NODE) {
-						ProcessingInstruction pi = (ProcessingInstruction) node;
-						if (pi.getTarget().equalsIgnoreCase("xml") && (xmlDeclarationIndex == -1)) { //$NON-NLS-1$
-							xmlDeclarationIndex = i;
-						}
-					}
-				}
-
-				if (((xmlDeclarationIndex == -1) || (index > xmlDeclarationIndex)) && ((doctypeIndex == -1) || (index > doctypeIndex))) {
-					contributeAction(menu, createAddElementAction(document, null, index));
-				}
-			}
-		}
-	}
-
-
-	protected void contributeUnconstrainedAddElementAction(IMenuManager menu, Element parentElement, CMElementDeclaration parentEd, int index) {
-		if (isUnconstrainedActionAllowed()) {
-			if ((parentEd == null) || (parentEd.getProperty("isInferred") == Boolean.TRUE) || ((modelQuery.getEditMode() != ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) && isElementAllowed(parentEd))) { //$NON-NLS-1$
-				contributeAction(menu, createAddElementAction(parentElement, null, index));
-			}
-		}
-	}
-
-
-	protected void contributeUnconstrainedAttributeActions(IMenuManager menu, Element parentElement, CMElementDeclaration parentEd) {
-		if (isUnconstrainedActionAllowed()) {
-			if ((parentEd == null) || (parentEd.getProperty("isInferred") == Boolean.TRUE) || (modelQuery.getEditMode() != ModelQuery.EDIT_MODE_CONSTRAINED_STRICT)) { //$NON-NLS-1$
-				contributeAction(menu, createAddAttributeAction(parentElement, null));
-			}
-		}
-	}
-
-	abstract protected Action createAddAttributeAction(Element parent, CMAttributeDeclaration ad);
-
-	abstract protected Action createAddCDataSectionAction(Node parent, int index);
-
-	abstract protected Action createAddCommentAction(Node parent, int index);
-
-	abstract protected Action createAddDoctypeAction(Document parent, int index);
-
-	abstract protected Action createAddElementAction(Node parent, CMElementDeclaration ed, int index);
-
-	abstract protected Action createAddPCDataAction(Node parent, CMDataType dataType, int index);
-
-	abstract protected Action createAddProcessingInstructionAction(Node parent, int index);
-
-	abstract protected Action createAddSchemaInfoAction(Element element);
-
-	abstract protected Action createDeleteAction(List selection);
-
-	abstract protected Action createEditAttributeAction(Attr attribute, CMAttributeDeclaration ad);
-
-	abstract protected Action createEditDoctypeAction(DocumentType doctype);
-
-	abstract protected Action createEditProcessingInstructionAction(ProcessingInstruction pi);
-
-	abstract protected Action createEditSchemaInfoAction(Element element);
-
-	abstract protected Action createRenameAction(Node node);
-
-	abstract protected Action createReplaceAction(Node parent, CMNode cmnode, int startIndex, int endIndex);
-
-
-	public int getIndex(Node parentNode, Node child) {
-		NodeList nodeList = parentNode.getChildNodes();
-		int index = -1;
-		int size = nodeList.getLength();
-		for (int i = 0; i < size; i++) {
-			if (nodeList.item(i) == child) {
-				index = i;
-				break;
-			}
-		}
-		return index;
-	}
-
-
-	public Node getRefChildNodeAtIndex(Node parent, int index) {
-		NodeList nodeList = parent.getChildNodes();
-		Node refChild = ((index >= 0) && (index < nodeList.getLength())) ? nodeList.item(index) : null;
-		return refChild;
-	}
-
-
-	protected Element getRootElement(Document document) {
-		Element result = null;
-		NodeList nodeList = document.getChildNodes();
-		int nodeListLength = nodeList.getLength();
-		for (int i = 0; i < nodeListLength; i++) {
-			Node node = nodeList.item(i);
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				result = (Element) node;
-				break;
-			}
-		}
-		return result;
-	}
-
-
-	protected List getSelectedNodes(List list, boolean includeTextNodes) {
-		List result = new ArrayList(0);
-		for (Iterator i = list.iterator(); i.hasNext();) {
-			Object object = i.next();
-			if (object instanceof Node) {
-				Node node = (Node) object;
-				if (node.getNodeType() == Node.TEXT_NODE) {
-					if (includeTextNodes) {
-						result.add(object);
-					}
-				}
-				else {
-					result.add(node);
-				}
-			}
-		}
-		return result;
-	}
-
-
-	protected boolean isCommentAllowed(CMElementDeclaration parentEd) {
-		int contentType = parentEd.getContentType();
-		return (contentType == CMElementDeclaration.ELEMENT) || (contentType == CMElementDeclaration.MIXED) || (contentType == CMElementDeclaration.PCDATA) || (contentType == CMElementDeclaration.ANY);
-	}
-
-
-	protected boolean isElementAllowed(CMElementDeclaration parentEd) {
-		int contentType = parentEd.getContentType();
-		return (contentType == CMElementDeclaration.ELEMENT) || (contentType == CMElementDeclaration.MIXED) || (contentType == CMElementDeclaration.ANY);
-	}
-
-
-	protected boolean isTextAllowed(CMElementDeclaration parentEd) {
-		int contentType = parentEd.getContentType();
-		return (contentType == CMElementDeclaration.MIXED) || (contentType == CMElementDeclaration.PCDATA) || (contentType == CMElementDeclaration.ANY);
-	}
-
-
-	protected boolean isUnconstrainedActionAllowed() {
-		return true;
-	}
-
-
-	protected boolean isWhitespaceTextNode(Node node) {
-		return (node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getNodeValue().trim().length() == 0);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/CleanupActionXMLDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/CleanupActionXMLDelegate.java
deleted file mode 100644
index d91a815..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/CleanupActionXMLDelegate.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IActionDelegate2;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IViewActionDelegate;
-import org.eclipse.ui.IViewPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Cleanup action delegate for CSS editor
- */
-public class CleanupActionXMLDelegate implements IEditorActionDelegate, IActionDelegate2, IViewActionDelegate {
-	private IEditorPart fEditor;
-	private IStructuredCleanupProcessor fCleanupProcessor;
-
-	public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		fEditor = targetEditor;
-	}
-
-	public void dispose() {
-		// nulling out just in case
-		fEditor = null;
-		fCleanupProcessor = null;
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(XMLUIMessages.CleanupDocument_label);
-			action.setToolTipText(XMLUIMessages.CleanupDocument_tooltip);
-			action.setDescription(XMLUIMessages.CleanupDocument_description);
-		}
-	}
-
-	public void runWithEvent(IAction action, Event event) {
-		run(action);
-	}
-
-	public void init(IViewPart view) {
-		// do nothing
-	}
-
-	public void run(IAction action) {
-		if (fEditor instanceof ITextEditor) {
-			final ITextEditor editor = (ITextEditor) fEditor;
-			Dialog cleanupDialog = new CleanupDialogXML(editor.getSite().getShell());
-			if (cleanupDialog.open() == Window.OK) {
-				// setup runnable
-				Runnable runnable = new Runnable() {
-					public void run() {
-						IStructuredCleanupProcessor cleanupProcessor = getCleanupProcessor();
-						if (cleanupProcessor != null) {
-							IStructuredModel model = null;
-							try {
-								model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
-								if (model != null) {
-									cleanupProcessor.cleanupModel(model);
-								}
-							}
-							finally {
-								if (model != null) {
-									model.releaseFromEdit();
-								}
-							}
-						}
-					}
-				};
-
-				// TODO: make independent of 'model'.
-				IStructuredModel model = null;
-				try {
-					model = StructuredModelManager.getModelManager().getExistingModelForEdit(editor.getDocumentProvider().getDocument(editor.getEditorInput()));
-					if (model != null) {
-						// begin recording
-						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
-						model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength());
-
-						// tell the model that we are about to make a big
-						// model change
-						model.aboutToChangeModel();
-
-						// run
-						BusyIndicator.showWhile(fEditor.getEditorSite().getWorkbenchWindow().getShell().getDisplay(), runnable);
-					}
-				}
-				finally {
-					if (model != null) {
-						// tell the model that we are done with the big
-						// model
-						// change
-						model.changedModel();
-
-						// end recording
-						ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
-						model.endRecording(this, selection.getOffset(), selection.getLength());
-						model.releaseFromEdit();
-					}
-				}
-			}
-		}
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		// do nothing
-	}
-
-	IStructuredCleanupProcessor getCleanupProcessor() {
-		if (fCleanupProcessor == null) {
-			fCleanupProcessor = new CleanupProcessorXML();
-		}
-
-		return fCleanupProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/CleanupDialogXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/CleanupDialogXML.java
deleted file mode 100644
index fa75ab9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/CleanupDialogXML.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-
-public class CleanupDialogXML extends Dialog implements SelectionListener {
-	protected Button fCheckBoxCompressEmptyElementTags;
-	protected Button fCheckBoxConvertEOLCodes;
-	protected Button fCheckBoxFormatSource;
-	protected Button fCheckBoxInsertMissingTags;
-	protected Button fCheckBoxInsertRequiredAttrs;
-	protected Button fCheckBoxQuoteAttrValues;
-	protected Button fCheckBoxInsertXMLDeclaration;
-	protected IStructuredModel fModel = null;
-	protected Preferences fPreferences = null;
-	protected Button fRadioButtonAttrNameCaseAsis;
-	protected Button fRadioButtonAttrNameCaseLower;
-	protected Button fRadioButtonAttrNameCaseUpper;
-	protected Button fRadioButtonConvertEOLMac;
-	protected Button fRadioButtonConvertEOLUnix;
-	protected Button fRadioButtonConvertEOLWindows;
-
-	protected Button fRadioButtonTagNameCaseAsis;
-	protected Button fRadioButtonTagNameCaseLower;
-	protected Button fRadioButtonTagNameCaseUpper;
-
-	public CleanupDialogXML(Shell shell) {
-
-		super(shell);
-	}
-
-	public Control createDialogArea(Composite parent) {
-
-		getShell().setText(XMLUIMessages.Cleanup_UI_);
-		Composite composite = new Composite(parent, SWT.NULL);
-		createDialogAreaInComposite(composite);
-		initializeOptions();
-		return composite;
-	}
-
-	protected void createDialogAreaInComposite(Composite composite) {
-
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.CLEANUP_XML_HELPID); // use
-		// XML
-		// specific
-		// help
-
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.makeColumnsEqualWidth = true;
-		composite.setLayout(layout);
-
-		// Compress empty element tags
-		fCheckBoxCompressEmptyElementTags = new Button(composite, SWT.CHECK);
-		fCheckBoxCompressEmptyElementTags.setText(XMLUIMessages.Compress_empty_element_tags_UI_);
-		fCheckBoxCompressEmptyElementTags.addSelectionListener(this);
-
-		// Insert missing required attrs
-		fCheckBoxInsertRequiredAttrs = new Button(composite, SWT.CHECK);
-		fCheckBoxInsertRequiredAttrs.setText(XMLUIMessages.Insert_required_attributes_UI_);
-		fCheckBoxInsertRequiredAttrs.addSelectionListener(this);
-
-		// Insert missing begin/end tags
-		fCheckBoxInsertMissingTags = new Button(composite, SWT.CHECK);
-		fCheckBoxInsertMissingTags.setText(XMLUIMessages.Insert_missing_tags_UI_);
-		fCheckBoxInsertMissingTags.addSelectionListener(this);
-
-		// Quote attribute values
-		fCheckBoxQuoteAttrValues = new Button(composite, SWT.CHECK);
-		fCheckBoxQuoteAttrValues.setText(XMLUIMessages.Quote_attribute_values_UI_);
-		fCheckBoxQuoteAttrValues.addSelectionListener(this);
-
-		// Format source
-		fCheckBoxFormatSource = new Button(composite, SWT.CHECK);
-		fCheckBoxFormatSource.setText(XMLUIMessages.Format_source_UI_);
-		fCheckBoxFormatSource.addSelectionListener(this);
-
-		fCheckBoxInsertXMLDeclaration = new Button(composite, SWT.CHECK);
-		fCheckBoxInsertXMLDeclaration.setText(XMLUIMessages.Insert_XML_decl);
-		fCheckBoxInsertXMLDeclaration.addSelectionListener(this);
-
-		// Convert EOL code
-		fCheckBoxConvertEOLCodes = new Button(composite, SWT.CHECK);
-		fCheckBoxConvertEOLCodes.setText(XMLUIMessages.Convert_EOL_codes_UI_);
-		fCheckBoxConvertEOLCodes.addSelectionListener(this);
-		Composite EOLCodes = new Composite(composite, SWT.NULL);
-		GridLayout hLayout = new GridLayout();
-		hLayout.numColumns = 3;
-		EOLCodes.setLayout(hLayout);
-		fRadioButtonConvertEOLWindows = new Button(EOLCodes, SWT.RADIO);
-		fRadioButtonConvertEOLWindows.setText(XMLUIMessages.EOL_Windows_UI);
-		fRadioButtonConvertEOLWindows.addSelectionListener(this);
-		fRadioButtonConvertEOLUnix = new Button(EOLCodes, SWT.RADIO);
-		fRadioButtonConvertEOLUnix.setText(XMLUIMessages.EOL_Unix_UI);
-		fRadioButtonConvertEOLUnix.addSelectionListener(this);
-		fRadioButtonConvertEOLMac = new Button(EOLCodes, SWT.RADIO);
-		fRadioButtonConvertEOLMac.setText(XMLUIMessages.EOL_Mac_UI);
-		fRadioButtonConvertEOLMac.addSelectionListener(this);
-	}
-
-	protected void enableEOLCodeRadios(boolean enable) {
-
-		if ((fRadioButtonConvertEOLWindows != null) && (fRadioButtonConvertEOLUnix != null) && (fRadioButtonConvertEOLMac != null)) {
-			fRadioButtonConvertEOLWindows.setEnabled(enable);
-			fRadioButtonConvertEOLUnix.setEnabled(enable);
-			fRadioButtonConvertEOLMac.setEnabled(enable);
-			if (!fRadioButtonConvertEOLWindows.getSelection() && !fRadioButtonConvertEOLUnix.getSelection() && !fRadioButtonConvertEOLMac.getSelection()) {
-				fRadioButtonConvertEOLWindows.setSelection(true);
-			}
-		}
-	}
-
-	protected Preferences getModelPreferences() {
-		return XMLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	protected void initializeOptions() {
-
-		fCheckBoxCompressEmptyElementTags.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS));
-		fCheckBoxInsertRequiredAttrs.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.INSERT_REQUIRED_ATTRS));
-		fCheckBoxInsertMissingTags.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.INSERT_MISSING_TAGS));
-		fCheckBoxQuoteAttrValues.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.QUOTE_ATTR_VALUES));
-		fCheckBoxFormatSource.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.FORMAT_SOURCE));
-		fCheckBoxConvertEOLCodes.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.CONVERT_EOL_CODES));
-		fCheckBoxInsertXMLDeclaration.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.FIX_XML_DECLARATION));
-		String EOLCode = getModelPreferences().getString(XMLCorePreferenceNames.CLEANUP_EOL_CODE);
-		if (EOLCode.compareTo(CommonEncodingPreferenceNames.LF) == 0) {
-			fRadioButtonConvertEOLUnix.setSelection(true);
-		}
-		else if (EOLCode.compareTo(CommonEncodingPreferenceNames.CR) == 0) {
-			fRadioButtonConvertEOLMac.setSelection(true);
-		}
-		else {
-			fRadioButtonConvertEOLWindows.setSelection(true);
-		}
-		enableEOLCodeRadios(fCheckBoxConvertEOLCodes.getSelection());
-	}
-
-	protected void okPressed() {
-
-		storeOptions();
-		super.okPressed();
-	}
-
-	public void setModel(IStructuredModel model) {
-
-		fModel = model;
-	}
-
-	protected void storeOptions() {
-
-		getModelPreferences().setValue(XMLCorePreferenceNames.COMPRESS_EMPTY_ELEMENT_TAGS, fCheckBoxCompressEmptyElementTags.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.INSERT_REQUIRED_ATTRS, fCheckBoxInsertRequiredAttrs.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.INSERT_MISSING_TAGS, fCheckBoxInsertMissingTags.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.QUOTE_ATTR_VALUES, fCheckBoxQuoteAttrValues.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.FORMAT_SOURCE, fCheckBoxFormatSource.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.CONVERT_EOL_CODES, fCheckBoxConvertEOLCodes.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.FIX_XML_DECLARATION, fCheckBoxInsertXMLDeclaration.getSelection());
-		if (fRadioButtonConvertEOLUnix.getSelection()) {
-			getModelPreferences().setValue(XMLCorePreferenceNames.CLEANUP_EOL_CODE, CommonEncodingPreferenceNames.LF);
-		}
-		else if (fRadioButtonConvertEOLMac.getSelection()) {
-			getModelPreferences().setValue(XMLCorePreferenceNames.CLEANUP_EOL_CODE, CommonEncodingPreferenceNames.CR);
-		}
-		else {
-			getModelPreferences().setValue(XMLCorePreferenceNames.CLEANUP_EOL_CODE, CommonEncodingPreferenceNames.CRLF);
-		}
-		// explicitly save plugin preferences so values are stored
-		XMLCorePlugin.getDefault().savePluginPreferences();
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-
-		widgetSelected(e);
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-
-		getButton(OK).setEnabled(((fRadioButtonTagNameCaseLower != null) && (fRadioButtonTagNameCaseLower.getSelection() || fRadioButtonTagNameCaseUpper.getSelection())) || ((fRadioButtonAttrNameCaseLower != null) && (fRadioButtonAttrNameCaseLower.getSelection() || fRadioButtonAttrNameCaseUpper.getSelection())) || fCheckBoxInsertMissingTags.getSelection() || fCheckBoxQuoteAttrValues.getSelection() || fCheckBoxFormatSource.getSelection() || fCheckBoxConvertEOLCodes.getSelection() || ((fRadioButtonConvertEOLUnix != null) && (fRadioButtonConvertEOLUnix.getSelection() || fRadioButtonConvertEOLMac.getSelection() || fRadioButtonConvertEOLWindows.getSelection())));
-		if (e.widget == fCheckBoxConvertEOLCodes) {
-			enableEOLCodeRadios(fCheckBoxConvertEOLCodes.getSelection());
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditAttributeAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditAttributeAction.java
deleted file mode 100644
index 0cdc771..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditAttributeAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditAttributeDialog;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class EditAttributeAction extends NodeAction {
-	protected static ImageDescriptor imageDescriptor;
-
-	public static ImageDescriptor createImageDescriptor() {
-		if (imageDescriptor == null) {
-			imageDescriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
-		}
-		return imageDescriptor;
-	}
-
-	protected Attr attr;
-	protected AbstractNodeActionManager manager;
-	protected Element ownerElement;
-	protected String title;
-
-	public EditAttributeAction(AbstractNodeActionManager manager, Element ownerElement, Attr attr, String actionLabel, String title) {
-		this.manager = manager;
-		this.ownerElement = ownerElement;
-		this.attr = attr;
-		this.title = title;
-		setText(actionLabel);
-		// assume if attr is null then this is an 'Add' that requires action
-		// an icons... otherwise this is an edit
-		if (attr == null) {
-			setImageDescriptor(createImageDescriptor());
-		}
-	}
-
-	public String getUndoDescription() {
-		return title;
-	}
-
-	public void run() {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (validateEdit(manager.getModel(), shell)) {
-			manager.beginNodeAction(this);
-			EditAttributeDialog dialog = new EditAttributeDialog(shell, ownerElement, attr);
-			dialog.create();
-			dialog.getShell().setText(title);
-			dialog.setBlockOnOpen(true);
-			dialog.open();
-	
-			if (dialog.getReturnCode() == Window.OK) {
-				if (attr != null) {
-					ownerElement.removeAttributeNode(attr);
-				}
-				Document document = ownerElement.getOwnerDocument();
-				Attr newAttribute = document.createAttribute(dialog.getAttributeName());
-				newAttribute.setValue(dialog.getAttributeValue());
-				ownerElement.setAttributeNode(newAttribute);
-				manager.setViewerSelection(newAttribute);
-			}
-			manager.endNodeAction(this);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditDoctypeAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditDoctypeAction.java
deleted file mode 100644
index 4ce515c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditDoctypeAction.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocumentType;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditDoctypeDialog;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * EditDoctypeAction
- */
-public class EditDoctypeAction extends NodeAction {
-	protected DocumentType doctype;
-	protected Document document;
-	protected IStructuredModel model;
-	protected String resourceLocation;
-	protected String title;
-
-	/**
-	 * This constructor is used to create a new doctype.
-	 */
-	public EditDoctypeAction(IStructuredModel model, Document document, String resourceLocation, String title) {
-		setText(title);
-		this.model = model;
-		this.document = document;
-		this.resourceLocation = resourceLocation;
-		this.title = title;
-	}
-
-	/**
-	 * This constructor is used to edit an exisitng doctype.
-	 */
-	public EditDoctypeAction(IStructuredModel model, DocumentType doctype, String resourceLocation, String title) {
-		setText(title);
-		this.model = model;
-		this.doctype = doctype;
-		this.resourceLocation = resourceLocation;
-		this.title = title;
-	}
-
-
-	protected DocumentType createDoctype(EditDoctypeDialog dialog, Document document) {
-		DocumentType result = null;
-		if (document instanceof DocumentImpl) {
-			IDOMDocument documentImpl = (IDOMDocument) document;
-			IDOMDocumentType doctypeImpl = (IDOMDocumentType) documentImpl.createDoctype(dialog.getName());
-			doctypeImpl.setPublicId(dialog.getPublicId());
-			doctypeImpl.setSystemId(dialog.getSystemId());
-			result = doctypeImpl;
-		}
-		return result;
-	}
-
-	private Display getDisplay() {
-
-		return PlatformUI.getWorkbench().getDisplay();
-	}
-
-
-	protected String getRootElementName(Document document) {
-		Element rootElement = null;
-		NodeList nodeList = document.getChildNodes();
-		int nodeListLength = nodeList.getLength();
-		for (int i = 0; i < nodeListLength; i++) {
-			Node childNode = nodeList.item(i);
-			if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-				rootElement = (Element) childNode;
-				break;
-			}
-		}
-		return rootElement != null ? rootElement.getNodeName() : XMLUIMessages._UI_LABEL_ROOT_ELEMENT_VALUE;
-	}
-
-	public String getUndoDescription() {
-		return title;
-	}
-
-
-	protected void insertDoctype(DocumentType doctype, Document document) {
-		Node refChild = null;
-		NodeList nodeList = document.getChildNodes();
-		int nodeListLength = nodeList.getLength();
-		for (int i = 0; i < nodeListLength; i++) {
-			Node childNode = nodeList.item(i);
-			if ((childNode.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) || (childNode.getNodeType() == Node.COMMENT_NODE)) {
-				// continue on to the nextNode
-			}
-			else {
-				refChild = childNode;
-				break;
-			}
-		}
-
-		document.insertBefore(doctype, refChild);
-		// manager.reformat(doctype, false);
-	}
-
-	public void run() {
-		Shell shell = getDisplay().getActiveShell();
-		if (validateEdit(model, shell)) {
-			model.beginRecording(this, getUndoDescription());
-			// Shell shell =
-			// XMLCommonUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-			EditDoctypeDialog dialog = showEditDoctypeDialog(shell);
-	
-			if (dialog.getReturnCode() == Window.OK) {
-				if (doctype != null) {
-					updateDoctype(dialog, doctype);
-				}
-				else if (document != null) {
-					DocumentType doctype = createDoctype(dialog, document);
-					if (doctype != null) {
-						insertDoctype(doctype, document);
-					}
-				}
-			}
-			model.endRecording(this);
-		}
-	}
-
-	protected EditDoctypeDialog showEditDoctypeDialog(Shell shell) {
-		EditDoctypeDialog dialog = null;
-
-		if (doctype != null) {
-			dialog = new EditDoctypeDialog(shell, doctype);
-			if (title == null) {
-				title = XMLUIMessages._UI_LABEL_EDIT_DOCTYPE;
-			}
-		}
-		else if (document != null) {
-			String rootElementName = getRootElementName(document);
-			dialog = new EditDoctypeDialog(shell, rootElementName, "", rootElementName + ".dtd"); //$NON-NLS-1$ //$NON-NLS-2$
-			if (title == null) {
-				title = XMLUIMessages._UI_MENU_ADD_DTD_INFORMATION_TITLE;
-			}
-		}
-
-		dialog.setComputeSystemId((doctype == null) || (doctype.getSystemId() == null) || (doctype.getSystemId().trim().length() == 0));
-
-		dialog.setErrorChecking(false);// !model.getType().equals(IStructuredModel.HTML));
-		dialog.create();
-		dialog.getShell().setText(title);
-		dialog.setBlockOnOpen(true);
-		dialog.setResourceLocation(new Path(resourceLocation));
-		dialog.open();
-
-		return dialog;
-	}
-
-
-	protected void updateDoctype(EditDoctypeDialog dialog, DocumentType doctype) {
-		if (doctype instanceof IDOMDocumentType) {
-			IDOMDocumentType doctypeImpl = (IDOMDocumentType) doctype;
-			if (doctypeImpl.getName().equals(dialog.getName())) {
-				doctypeImpl.setPublicId(dialog.getPublicId());
-				doctypeImpl.setSystemId(dialog.getSystemId());
-			}
-			else {
-				// we need to create a new one and remove the old
-				//                  
-				Document document = doctype.getOwnerDocument();
-				DocumentType newDoctype = createDoctype(dialog, document);
-				document.insertBefore(newDoctype, doctype);
-				document.removeChild(doctype);
-				// manager.reformat(newDoctype, false);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditElementAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditElementAction.java
deleted file mode 100644
index 21b55fe..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditElementAction.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditElementDialog;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class EditElementAction extends NodeAction {
-
-	protected static ImageDescriptor imageDescriptor;
-
-	public static ImageDescriptor createImageDescriptor() {
-		if (imageDescriptor == null) {
-			imageDescriptor = XMLEditorPluginImageHelper.getInstance().getImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ELEMENT);
-		}
-		return imageDescriptor;
-	}
-
-	protected Element element;
-	protected int insertionIndex = -1;
-	protected AbstractNodeActionManager manager;
-	protected Node parent;
-	protected String title;
-
-	public EditElementAction(AbstractNodeActionManager manager, Element element, String actionLabel, String dialogTitle) {
-		this(manager, element.getParentNode(), -1, element, actionLabel, dialogTitle);
-	}
-
-	protected EditElementAction(AbstractNodeActionManager manager, Node parent, int index, Element element, String actionLabel, String title) {
-		this.manager = manager;
-		this.parent = parent;
-		this.insertionIndex = index;
-		this.element = element;
-		this.title = title;
-		setText(actionLabel);
-		if (element == null) {
-			setImageDescriptor(createImageDescriptor());
-		}
-	}
-
-	public EditElementAction(AbstractNodeActionManager manager, Node parent, int index, String actionLabel, String title) {
-		this(manager, parent, index, null, actionLabel, title);
-	}
-
-	public String getUndoDescription() {
-		return title;
-	}
-
-	public void run() {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (validateEdit(manager.getModel(), shell)) {
-			manager.beginNodeAction(this);
-			EditElementDialog dialog = new EditElementDialog(shell, element);
-			dialog.create();
-			dialog.getShell().setText(title);
-			dialog.setBlockOnOpen(true);
-			dialog.open();
-	
-			if (dialog.getReturnCode() == Window.OK) {
-				Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document) parent : parent.getOwnerDocument();
-				if (element != null) {
-					// here we need to do a rename... which seems to be quite hard
-					// to do :-(
-					if (element instanceof IDOMElement) {
-						IDOMElement elementImpl = (IDOMElement) element;
-						IDOMModel model = elementImpl.getModel();
-						String oldName = elementImpl.getNodeName();
-						String newName = dialog.getElementName();
-						setStructuredDocumentRegionElementName(model, elementImpl.getStartStructuredDocumentRegion(), oldName, newName);
-						setStructuredDocumentRegionElementName(model, elementImpl.getEndStructuredDocumentRegion(), oldName, newName);
-					}
-				}
-				else {
-					Element newElement = document.createElement(dialog.getElementName());
-					NodeList nodeList = parent.getChildNodes();
-					int nodeListLength = nodeList.getLength();
-					Node refChild = (insertionIndex < nodeListLength) && (insertionIndex >= 0) ? nodeList.item(insertionIndex) : null;
-					parent.insertBefore(newElement, refChild);
-					manager.reformat(newElement, false);
-					manager.setViewerSelection(newElement);
-				}
-			}
-			manager.endNodeAction(this);
-		}
-	}
-
-	protected void setStructuredDocumentRegionElementName(IDOMModel model, IStructuredDocumentRegion flatNode, String oldName, String newName) {
-		if (flatNode != null) {
-			String string = flatNode.getText();
-			int index = string.indexOf(oldName);
-			if (index != -1) {
-				index += flatNode.getStart();
-				model.getStructuredDocument().replaceText(this, index, oldName.length(), newName);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditProcessingInstructionAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditProcessingInstructionAction.java
deleted file mode 100644
index 5578cf2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditProcessingInstructionAction.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditProcessingInstructionDialog;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-
-/**
- * EditProcessingInstructionAction
- */
-public class EditProcessingInstructionAction extends NodeAction {
-	protected Node childRef;
-	protected AbstractNodeActionManager manager;
-	protected Node parent;
-	protected ProcessingInstruction pi;
-	protected String title;
-
-	/**
-	 * This constructor is used to add a new ProcessingInstruction
-	 */
-	public EditProcessingInstructionAction(AbstractNodeActionManager manager, Node parent, Node childRef, String actionLabel, String title) {
-		setText(actionLabel);
-		this.manager = manager;
-		this.parent = parent;
-		this.childRef = childRef;
-		this.title = title;
-	}
-
-	/**
-	 * This constructor is used to edit a ProcessingInstruction
-	 */
-	public EditProcessingInstructionAction(AbstractNodeActionManager manager, ProcessingInstruction pi, String actionLabel, String title) {
-		setText(actionLabel);
-		this.manager = manager;
-		this.pi = pi;
-		this.parent = pi.getParentNode();
-		this.title = title;
-	}
-
-	public String getUndoDescription() {
-		return title;
-	}
-
-	public void run() {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (validateEdit(manager.getModel(), shell)) {
-			manager.beginNodeAction(this);
-			
-	
-			EditProcessingInstructionDialog dialog = null;
-			if (pi != null) {
-				dialog = new EditProcessingInstructionDialog(shell, pi);
-			}
-			else {
-				dialog = new EditProcessingInstructionDialog(shell, XMLUIMessages._UI_PI_TARGET_VALUE, XMLUIMessages._UI_PI_DATA_VALUE);
-			}
-	
-			dialog.create();
-			dialog.getShell().setText(title);
-			dialog.setBlockOnOpen(true);
-			dialog.open();
-	
-			if (dialog.getReturnCode() == Window.OK) {
-				if (pi != null) {
-					childRef = pi;
-				}
-	
-				Document document = parent.getNodeType() == Node.DOCUMENT_NODE ? (Document) parent : parent.getOwnerDocument();
-				Node newNode = document.createProcessingInstruction(dialog.getTarget(), dialog.getData());
-				parent.insertBefore(newNode, childRef);
-	
-				if (pi != null) {
-					parent.removeChild(pi);
-				}
-	
-				manager.reformat(newNode, false);
-				manager.setViewerSelection(newNode);
-			}
-			manager.endNodeAction(this);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditSchemaInfoAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditSchemaInfoAction.java
deleted file mode 100644
index c07557a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/EditSchemaInfoAction.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditSchemaInfoDialog;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * EditDoctypeAction
- */
-public class EditSchemaInfoAction extends NodeAction {
-	protected AbstractNodeActionManager manager;
-	protected DOMNamespaceInfoManager namespaceInfoManager = new DOMNamespaceInfoManager();
-	protected Node node;
-	protected String resourceLocation;
-	protected String title;
-
-	public EditSchemaInfoAction(AbstractNodeActionManager manager, Node node, String resourceLocation, String title) {
-		this.manager = manager;
-		this.node = node;
-		setText(title);
-		this.resourceLocation = resourceLocation;
-		this.title = title;
-	}
-
-	protected Map createPrefixMapping(List oldList, List newList) {
-		Map map = new Hashtable();
-
-		Hashtable oldURIToPrefixTable = new Hashtable();
-		for (Iterator i = oldList.iterator(); i.hasNext();) {
-			NamespaceInfo oldInfo = (NamespaceInfo) i.next();
-			oldURIToPrefixTable.put(oldInfo.uri, oldInfo);
-		}
-
-		for (Iterator i = newList.iterator(); i.hasNext();) {
-			NamespaceInfo newInfo = (NamespaceInfo) i.next();
-			NamespaceInfo oldInfo = (NamespaceInfo) oldURIToPrefixTable.get(newInfo.uri != null ? newInfo.uri : ""); //$NON-NLS-1$
-
-
-			// if oldInfo is non null ... there's a matching URI in the old
-			// set
-			// we can use its prefix to detemine out mapping
-			//
-			// if oldInfo is null ... we use the 'oldCopy' we stashed away
-			// assuming that the user changed the URI and the prefix
-			if (oldInfo == null) {
-				oldInfo = (NamespaceInfo) newInfo.getProperty("oldCopy"); //$NON-NLS-1$
-			}
-
-			if (oldInfo != null) {
-				String newPrefix = newInfo.prefix != null ? newInfo.prefix : ""; //$NON-NLS-1$
-				String oldPrefix = oldInfo.prefix != null ? oldInfo.prefix : ""; //$NON-NLS-1$
-				if (!oldPrefix.equals(newPrefix)) {
-					map.put(oldPrefix, newPrefix);
-				}
-			}
-		}
-		return map;
-	}
-
-	public Element getElement(Node node) {
-		Element result = null;
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			result = (Element) node;
-		}
-		else if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			result = getRootElement((Document) node);
-		}
-		return result;
-	}
-
-
-	public Element getRootElement(Document document) {
-		Element rootElement = null;
-		NodeList nodeList = document.getChildNodes();
-		int nodeListLength = nodeList.getLength();
-		for (int i = 0; i < nodeListLength; i++) {
-			Node childNode = nodeList.item(i);
-			if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-				rootElement = (Element) childNode;
-				break;
-			}
-		}
-		return rootElement;
-	}
-
-	public String getUndoDescription() {
-		return title;
-	}
-
-	public void run() {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (validateEdit(manager.getModel(), shell)) {
-			manager.beginNodeAction(this);
-	
-			// todo... change constructor to take an element
-			Element element = getElement(node);
-			if (element != null) {
-				EditSchemaInfoDialog dialog = new EditSchemaInfoDialog(shell, new Path(resourceLocation));
-	
-				List namespaceInfoList = namespaceInfoManager.getNamespaceInfoList(element);
-				List oldNamespaceInfoList = NamespaceInfo.cloneNamespaceInfoList(namespaceInfoList);
-	
-				// here we store a copy of the old info for each NamespaceInfo
-				// this info will be used in createPrefixMapping() to figure out
-				// how to update the document
-				// in response to these changes
-				for (Iterator i = namespaceInfoList.iterator(); i.hasNext();) {
-					NamespaceInfo info = (NamespaceInfo) i.next();
-					NamespaceInfo oldCopy = new NamespaceInfo(info);
-					info.setProperty("oldCopy", oldCopy); //$NON-NLS-1$
-				}
-	
-				dialog.setNamespaceInfoList(namespaceInfoList);
-				dialog.create();
-				// dialog.getShell().setSize(500, 300);
-				dialog.getShell().setText(XMLUIMessages._UI_MENU_EDIT_SCHEMA_INFORMATION_TITLE);
-				dialog.setBlockOnOpen(true);
-				dialog.open();
-	
-				if (dialog.getReturnCode() == Window.OK) {
-					List newInfoList = dialog.getNamespaceInfoList();
-					namespaceInfoManager.removeNamespaceInfo(element);
-					namespaceInfoManager.addNamespaceInfo(element, newInfoList, false);
-	
-					// see if we need to rename any prefixes
-					Map prefixMapping = createPrefixMapping(oldNamespaceInfoList, namespaceInfoList);
-					if (prefixMapping.size() > 0) {
-						try {
-							manager.getModel().aboutToChangeModel();
-							ReplacePrefixAction replacePrefixAction = new ReplacePrefixAction(manager, element, prefixMapping);
-							replacePrefixAction.run();
-						}
-						finally {
-							manager.getModel().changedModel();
-						}
-					}
-				}
-			}
-			manager.endNodeAction(this);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/GoToMatchingTagAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/GoToMatchingTagAction.java
deleted file mode 100644
index 5d7e7a3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/GoToMatchingTagAction.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
-import org.eclipse.jface.text.source.IAnnotationModelExtension;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.texteditor.IDocumentProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.TextEditorAction;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-/**
- * Moves the cursor to the end tag if it is in a start tag, and vice versa.
- * Also updates the matching tag annotation in the active editor.
- * 
- * @author nitin
- * 
- */
-class GoToMatchingTagAction extends TextEditorAction {
-
-	private class UpdateListener implements ISelectionChangedListener {
-		public void selectionChanged(SelectionChangedEvent event) {
-			updateFor(event.getSelection());
-		}
-	}
-
-	private static final String ANNOTATION_TYPE = "org.eclipse.wst.xml.ui.matching.tag"; //$NON-NLS-1$
-	private ISelectionChangedListener fUpdateListener = null;
-	static final boolean DEBUG = false;
-
-	/**
-	 * @param bundle
-	 * @param prefix
-	 * @param editor
-	 * @param style
-	 */
-	GoToMatchingTagAction(ResourceBundle bundle, String prefix, ITextEditor editor) {
-		super(bundle, prefix, editor);
-		fUpdateListener = new UpdateListener();
-	}
-
-	void removeAnnotation(boolean allMatching) {
-		ITextEditor textEditor = getTextEditor();
-		if (textEditor == null) {
-			if (DEBUG) {
-				System.out.println("no editor"); //$NON-NLS-1$
-			}
-			return;
-		}
-		IDocumentProvider documentProvider = textEditor.getDocumentProvider();
-		if (documentProvider == null) {
-			if (DEBUG) {
-				System.out.println("no document provider"); //$NON-NLS-1$
-			}
-			return;
-		}
-		IAnnotationModel annotationModel = documentProvider.getAnnotationModel(textEditor.getEditorInput());
-		if (annotationModel == null) {
-			if (DEBUG) {
-				System.out.println("no annotation model"); //$NON-NLS-1$
-			}
-			return;
-		}
-
-		Iterator annotationIterator = annotationModel.getAnnotationIterator();
-		List oldAnnotations = new ArrayList();
-		while (annotationIterator.hasNext()) {
-			Annotation annotation = (Annotation) annotationIterator.next();
-			if (ANNOTATION_TYPE.equals(annotation.getType())) {
-				annotation.markDeleted(true);
-				/**
-				 * Sometimes it is supported, sometime's it is not. Confusing.
-				 */
-				try {
-					annotationIterator.remove();
-				}
-				catch (UnsupportedOperationException e) {
-					oldAnnotations.add(annotation);
-				}
-				if (DEBUG) {
-					System.out.println("removed " + annotation); //$NON-NLS-1$
-				}
-				if (!allMatching)
-					break;
-			}
-		}
-		if (!oldAnnotations.isEmpty()) {
-			int size = oldAnnotations.size();
-			for (int i = 0; i < size; i++) {
-				annotationModel.removeAnnotation((Annotation) oldAnnotations.get(i));
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(Event event) {
-		super.runWithEvent(event);
-		if (getTextEditor() == null)
-			return;
-
-		ISelection selection = getTextEditor().getSelectionProvider().getSelection();
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection && selection instanceof ITextSelection) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IDOMNode) {
-				int offset = ((ITextSelection) selection).getOffset();
-				IStructuredDocumentRegion matchRegion = null;
-				if (((Node) o).getNodeType() == Node.ATTRIBUTE_NODE) {
-					o = ((Attr) o).getOwnerElement();
-				}
-
-				int targetOffset = -1;
-				if (o instanceof IDOMNode) {
-					IDOMNode node = (IDOMNode) o;
-					IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-					if (startStructuredDocumentRegion != null && startStructuredDocumentRegion.containsOffset(offset)) {
-						matchRegion = ((IDOMNode) o).getEndStructuredDocumentRegion();
-						if (matchRegion != null)
-							targetOffset = matchRegion.getStartOffset() + 2;
-					}
-					else {
-						IStructuredDocumentRegion endStructuredDocumentRegion = node.getEndStructuredDocumentRegion();
-						if (endStructuredDocumentRegion != null && endStructuredDocumentRegion.containsOffset(offset)) {
-							matchRegion = ((IDOMNode) o).getStartStructuredDocumentRegion();
-							if (matchRegion != null)
-								targetOffset = matchRegion.getStartOffset() + 1;
-						}
-					}
-				}
-
-				if (targetOffset >= 0) {
-					getTextEditor().getSelectionProvider().setSelection(new TextSelection(targetOffset, 0));
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.TextEditorAction#setEditor(org.eclipse.ui.texteditor.ITextEditor)
-	 */
-	public void setEditor(ITextEditor editor) {
-		ITextEditor textEditor = getTextEditor();
-		if (textEditor != null) {
-			removeAnnotation(true);
-
-			ISelectionProvider selectionProvider = textEditor.getSelectionProvider();
-			if (selectionProvider instanceof IPostSelectionProvider) {
-				((IPostSelectionProvider) selectionProvider).removePostSelectionChangedListener(fUpdateListener);
-			}
-		}
-		super.setEditor(editor);
-		if (editor != null) {
-			ISelectionProvider selectionProvider = editor.getSelectionProvider();
-			if (selectionProvider instanceof IPostSelectionProvider) {
-				((IPostSelectionProvider) selectionProvider).addPostSelectionChangedListener(fUpdateListener);
-			}
-
-			updateFor(selectionProvider.getSelection());
-		}
-	}
-
-	public void update() {
-		setEnabled(true);
-
-	}
-
-	void updateFor(ISelection selection) {
-		ITextEditor textEditor = getTextEditor();
-		if (textEditor == null) {
-			if (DEBUG) {
-				System.out.println("no editor"); //$NON-NLS-1$
-			}
-			return;
-		}
-		IDocumentProvider documentProvider = textEditor.getDocumentProvider();
-		if (documentProvider == null) {
-			if (DEBUG) {
-				System.out.println("no document provider"); //$NON-NLS-1$
-			}
-			return;
-		}
-		IAnnotationModel annotationModel = documentProvider.getAnnotationModel(textEditor.getEditorInput());
-		if (annotationModel == null || !(annotationModel instanceof IAnnotationModelExtension)) {
-			if (DEBUG) {
-				System.out.println("no annotation model"); //$NON-NLS-1$
-			}
-			return;
-		}
-
-		List oldAnnotations = new ArrayList(2);
-		Iterator annotationIterator = annotationModel.getAnnotationIterator();
-		while (annotationIterator.hasNext()) {
-			Annotation annotation = (Annotation) annotationIterator.next();
-			if (ANNOTATION_TYPE.equals(annotation.getType())) {
-				annotation.markDeleted(true);
-				if (DEBUG) {
-					System.out.println("removing " + annotation); //$NON-NLS-1$
-				}
-				oldAnnotations.add(annotation);
-			}
-		}
-
-		Map newAnnotations = new HashMap();
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection && selection instanceof ITextSelection) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof IDOMNode) {
-				int offset = ((ITextSelection) selection).getOffset();
-				IStructuredDocumentRegion matchRegion = null;
-				if (((Node) o).getNodeType() == Node.ATTRIBUTE_NODE) {
-					o = ((Attr) o).getOwnerElement();
-				}
-
-				Position pStart = null;
-				Position pEnd = null;
-				String tag = ""; //$NON-NLS-1$
-				if (o instanceof IDOMNode) {
-					IDOMNode node = (IDOMNode) o;
-					IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-					if (startStructuredDocumentRegion != null && startStructuredDocumentRegion.containsOffset(offset)) {
-						if (startStructuredDocumentRegion.getNumberOfRegions() > 1) {
-							ITextRegion nameRegion = startStructuredDocumentRegion.getRegions().get(1);
-							pStart = new Position(startStructuredDocumentRegion.getStartOffset(nameRegion), nameRegion.getTextLength());
-							tag = startStructuredDocumentRegion.getText(nameRegion);
-						}
-						matchRegion = ((IDOMNode) o).getEndStructuredDocumentRegion();
-						if (matchRegion != null && matchRegion.getNumberOfRegions() > 1) {
-							ITextRegion nameRegion = matchRegion.getRegions().get(1);
-							pEnd = new Position(matchRegion.getStartOffset(nameRegion), nameRegion.getTextLength());
-						}
-					}
-					else {
-						IStructuredDocumentRegion endStructuredDocumentRegion = node.getEndStructuredDocumentRegion();
-						if (endStructuredDocumentRegion != null && endStructuredDocumentRegion.containsOffset(offset)) {
-							if (endStructuredDocumentRegion.getNumberOfRegions() > 1) {
-								ITextRegion nameRegion = endStructuredDocumentRegion.getRegions().get(1);
-								pEnd = new Position(endStructuredDocumentRegion.getStartOffset(nameRegion), nameRegion.getTextLength());
-								tag = endStructuredDocumentRegion.getText(nameRegion);
-							}
-							matchRegion = ((IDOMNode) o).getStartStructuredDocumentRegion();
-							if (matchRegion != null && matchRegion.getNumberOfRegions() > 1) {
-								ITextRegion nameRegion = matchRegion.getRegions().get(1);
-								pStart = new Position(matchRegion.getStartOffset(nameRegion), nameRegion.getTextLength());
-							}
-						}
-					}
-				}
-				if (pStart != null && pEnd != null) {
-					Annotation annotation = new Annotation(ANNOTATION_TYPE, false, NLS.bind(XMLUIMessages.gotoMatchingTag_start, tag));
-					newAnnotations.put(annotation, pStart);
-					if (DEBUG) {
-						System.out.println("adding " + annotation); //$NON-NLS-1$
-					}
-					annotation = new Annotation(ANNOTATION_TYPE, false, NLS.bind(XMLUIMessages.gotoMatchingTag_end, tag));
-					newAnnotations.put(annotation, pEnd);
-					if (DEBUG) {
-						System.out.println("adding " + annotation); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		((IAnnotationModelExtension) annotationModel).replaceAnnotations((Annotation[]) oldAnnotations.toArray(new Annotation[oldAnnotations.size()]), newAnnotations);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/MenuBuilder.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/MenuBuilder.java
deleted file mode 100644
index 78f3ceb..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/MenuBuilder.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import com.ibm.icu.text.Collator;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-
-
-public class MenuBuilder {
-
-
-	protected Comparator comparator = new Comparator() {
-
-		public int compare(Object o1, Object o2) {
-			return Collator.getInstance().compare(getSortKey(o1), getSortKey(o2));
-		}
-
-		protected String getSortKey(Object o) {
-			String result = ""; //$NON-NLS-1$
-			if (o instanceof IAction) {
-				IAction action = (IAction) o;
-				result = action.getText();
-			}
-			// else if (o instanceof MenuData)
-			// {
-			// result = "z" + ((MenuData)o).name;
-			// }
-			return result;
-		}
-	};
-
-
-	protected void createAlphebeticalGrouping(IMenuManager menu, List actionList) {
-		Object[] array = actionList.toArray();
-		if (array.length > 0) {
-			Arrays.sort(array, comparator);
-		}
-
-		int groupSize = 15;
-		int minGroupSize = 5;
-		int numberOfGroups = (array.length / groupSize) + ((array.length % groupSize > minGroupSize) ? 1 : 0);
-
-		for (int i = 0; i < numberOfGroups; i++) {
-			boolean isLastGroup = (i == (numberOfGroups - 1));
-			int firstIndex = i * groupSize;
-			int lastIndex = isLastGroup ? array.length - 1 : i * groupSize + groupSize - 1;
-			Action firstAction = (Action) array[firstIndex];
-			Action lastAction = (Action) array[lastIndex];
-			MenuManager submenu = new MenuManager(firstAction.getText() + " - " + lastAction.getText()); //$NON-NLS-1$
-			menu.add(submenu);
-			for (int j = firstIndex; j <= lastIndex; j++) {
-				submenu.add((Action) array[j]);
-			}
-		}
-	}
-
-
-	public void populateMenu(IMenuManager menu, List actionList, boolean createTiered) {
-		// sort the actions
-		if (actionList.size() < 25) {
-			Object[] array = actionList.toArray();
-			if (array.length > 0) {
-				Arrays.sort(array, comparator);
-			}
-			for (int i = 0; i < array.length; i++) {
-				menu.add((Action) array[i]);
-			}
-		}
-		else {
-			createAlphebeticalGrouping(menu, actionList);
-		}
-	}
-
-	/*
-	 * protected void createPropertyGrouping(IMenuManager menu, List
-	 * actionList) { MenuDataTable menuDataTable = new MenuDataTable();
-	 * 
-	 * for (Iterator i = actionList.iterator(); i.hasNext(); ) { String
-	 * groupName = null; Action action = (Action)i.next(); if (action
-	 * instanceof NodeAction) { groupName =
-	 * ((NodeAction)action).getGroupName(); } if (groupName == null) {
-	 * groupName = ""; } MenuData menuData =
-	 * menuDataTable.lookupOrCreate(groupName, "");
-	 * menuData.childList.add(action); } populateMenu(menu,
-	 * menuDataTable.getRoot()); }
-	 * 
-	 * 
-	 * protected void populateMenu(MenuManager menuManager, MenuData menuData) {
-	 * for (Iterator i = menuData.childList.iterator(); i.hasNext(); ) {
-	 * Object o = i.next(); if (o instanceof Action) {
-	 * menuManager.add((Action)o); } else if (o instanceof MenuData) {
-	 * MenuData childMenuData = (MenuData)o; MenuManager childMenuManager =
-	 * new MenuManager(childMenuData.name); menuManager.add(childMenuManager);
-	 * populateMenu(childMenuManager, childMenuData); } } }
-	 * 
-	 * 
-	 * public MenuDataTable { protected Hashtable table = new Hashtable();
-	 * protected MenuData root;
-	 * 
-	 * public MenuDataTable() { root = lookupOrCreateMenuData(null, null); }
-	 * 
-	 * protected MenuData lookupMenuData(String name) { String key = name !=
-	 * null ? name : ""; return (MenuData)menuDataTable.get(key); }
-	 * 
-	 * protected MenuData lookupOrCreateMenuData(String name, String
-	 * parentName) { String key = name != null ? name : ""; MenuData menuData =
-	 * (MenuData)menuDataTable.get(key); if (menuData == null) { menuData =
-	 * new MenuData(name, parentName); menuDataTable.put(key, menuData); }
-	 * return menuData; }
-	 * 
-	 * public MenuData getRoot() { return root; } }
-	 * 
-	 * 
-	 * protected class MenuData { public String name; public String
-	 * parentName; public List childList = new Vector();
-	 * 
-	 * MenuData(String name, String parentName) { this.name = name;
-	 * this.parentName = parentName; }
-	 * 
-	 * protected void sort() { Object[] array = childList.toArray(); if
-	 * (array.length > 0 ) { Arrays.sort(array, comparator); } childList =
-	 * Arrays.asList(array);
-	 * 
-	 * for (Iterator i = childList.iterator(); i.hasNext(); ) { Object o =
-	 * i.next(); if (o instanceof MenuData) { ((MenuData)o).sort(); } } } }
-	 */
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/NodeAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/NodeAction.java
deleted file mode 100644
index 1ce764a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/NodeAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-
-public abstract class NodeAction extends Action {
-
-	public String getSortKey() {
-		return null;
-	}
-
-	/**
-	 * Checks that the resource backing the model is writeable utilizing <code>validateEdit</code>
-	 * on a given <tt>IWorkspace</tt>.
-	 * 
-	 * @param model the model to be checked
-	 * @param context the shell context for which <code>validateEdit</code> will be run
-	 * @return boolean result of checking <code>validateEdit</code>. If the resource is unwriteable, <code>status.isOK()</code>
-	 * will return true; otherwise, false.
-	 */
-	protected final boolean validateEdit(IStructuredModel model, Shell context) {
-		if (model != null && model.getBaseLocation() != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(model.getBaseLocation()));
-			return !file.isAccessible() || ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {file}, context).isOK();
-		}
-		return false; //$NON-NLS-1$
-	}
-
-	public abstract String getUndoDescription();
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/RemoveBlockCommentActionXMLDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/RemoveBlockCommentActionXMLDelegate.java
deleted file mode 100644
index 473e5f2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/RemoveBlockCommentActionXMLDelegate.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.document.CommentImpl;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Remove block comment action delegate for XML editor
- */
-public class RemoveBlockCommentActionXMLDelegate extends AbstractCommentActionXMLDelegate {
-
-	void processAction(IDocument document, ITextSelection textSelection) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null) {
-			try {
-				IndexedRegion selectionStartIndexedRegion = model.getIndexedRegion(textSelection.getOffset());
-				IndexedRegion selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength());
-
-				if ((selectionStartIndexedRegion == null) || (selectionEndIndexedRegion == null)) {
-					return;
-				}
-
-				int openCommentOffset = selectionStartIndexedRegion.getStartOffset();
-				int closeCommentOffset = selectionEndIndexedRegion.getEndOffset() - OPEN_COMMENT.length() - CLOSE_COMMENT.length();
-
-				model.beginRecording(this, XMLUIMessages.RemoveBlockComment_tooltip);
-				model.aboutToChangeModel();
-
-				try {
-					if (textSelection.getLength() == 0) {
-						if (selectionStartIndexedRegion instanceof CommentImpl) {
-							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-					}
-					else {
-						if (selectionStartIndexedRegion instanceof CommentImpl) {
-							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-
-						if (selectionEndIndexedRegion instanceof CommentImpl) {
-							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-					}
-					removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-				}
-				catch (BadLocationException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-				finally {
-					model.changedModel();
-					model.endRecording(this);
-				}
-			}
-			finally {
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(XMLUIMessages.RemoveBlockComment_label);
-			action.setToolTipText(XMLUIMessages.RemoveBlockComment_tooltip);
-			action.setDescription(XMLUIMessages.RemoveBlockComment_description);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ReplacePrefixAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ReplacePrefixAction.java
deleted file mode 100644
index 18599bd..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ReplacePrefixAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMVisitor;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-
-public class ReplacePrefixAction extends NodeAction {
-
-	class NodeCollectingDOMVisitor extends DOMVisitor {
-		public List list = new Vector();
-
-		protected boolean isPrefixChangedNeeded(Node node) {
-			String key = node.getPrefix() != null ? node.getPrefix() : ""; //$NON-NLS-1$
-			return prefixMapping.get(key) != null;
-		}
-
-		public void visitAttr(Attr attr) {
-			/*
-			 * if (isPrefixChangedNeeded(element)) { list.add(attr); }
-			 */
-		}
-
-		protected void visitElement(Element element) {
-			super.visitElement(element);
-			if (isPrefixChangedNeeded(element)) {
-				list.add(element);
-			}
-		}
-	}
-
-	protected static ImageDescriptor imageDescriptor;
-	protected Element element;
-	protected AbstractNodeActionManager manager;
-	protected Map prefixMapping;
-
-	public ReplacePrefixAction(AbstractNodeActionManager manager, Element element, Map prefixMapping) {
-		this.manager = manager;
-		this.element = element;
-		this.prefixMapping = prefixMapping;
-	}
-
-	public String getUndoDescription() {
-		return ""; //$NON-NLS-1$
-	}
-
-	public void run() {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		if (validateEdit(manager.getModel(), shell)) {
-			NodeCollectingDOMVisitor visitor = new NodeCollectingDOMVisitor();
-			visitor.visitNode(element);
-			for (Iterator i = visitor.list.iterator(); i.hasNext();) {
-				Node node = (Node) i.next();
-				String key = node.getPrefix() != null ? node.getPrefix() : ""; //$NON-NLS-1$
-				String newPrefix = (String) prefixMapping.get(key);
-				if (newPrefix != null) {
-					node.setPrefix(newPrefix);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/SiblingNavigationAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/SiblingNavigationAction.java
deleted file mode 100644
index a08b44f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/SiblingNavigationAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.TextEditorAction;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-/**
- * Provides navigation to next/previous DOM sibling Nodes
- * 
- * @author nitin
- * 
- */
-class SiblingNavigationAction extends TextEditorAction {
-
-	private boolean fForward;
-
-	/**
-	 * @param bundle
-	 * @param prefix
-	 * @param editor
-	 */
-	SiblingNavigationAction(ResourceBundle bundle, String prefix, ITextEditor editor, boolean forward) {
-		super(bundle, prefix, editor);
-		fForward = forward;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.action.Action#runWithEvent(org.eclipse.swt.widgets.Event)
-	 */
-	public void runWithEvent(Event event) {
-		super.runWithEvent(event);
-		if (getTextEditor() == null)
-			return;
-
-		ISelection selection = getTextEditor().getSelectionProvider().getSelection();
-		if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Object o = ((IStructuredSelection) selection).getFirstElement();
-			if (o instanceof Node) {
-				Node sibling = null;
-
-				if (((Node) o).getNodeType() == Node.ATTRIBUTE_NODE) {
-					o = ((Attr) o).getOwnerElement();
-				}
-				if (fForward) {
-					sibling = ((Node) o).getNextSibling();
-					while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-						sibling = sibling.getNextSibling();
-					}
-					if (sibling == null) {
-						sibling = ((Node) o).getParentNode().getFirstChild();
-						while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-							sibling = sibling.getNextSibling();
-						}
-					}
-				}
-				else {
-					sibling = ((Node) o).getPreviousSibling();
-					while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-						sibling = sibling.getPreviousSibling();
-					}
-					if (sibling == null) {
-						sibling = ((Node) o).getParentNode().getLastChild();
-						while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-							sibling = sibling.getPreviousSibling();
-						}
-					}
-				}
-
-				// The only child is a Text Node, go to the parent Node
-				if (((Node) o).getNodeType() == Node.TEXT_NODE && o.equals(sibling)) {
-					sibling = ((Node) o).getParentNode();
-				}
-
-
-				if (sibling != null) {
-					getTextEditor().getSelectionProvider().setSelection(new StructuredSelection(sibling));
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.TextEditorAction#update()
-	 */
-	public void update() {
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ToggleCommentActionXMLDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ToggleCommentActionXMLDelegate.java
deleted file mode 100644
index 09d81d1..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/actions/ToggleCommentActionXMLDelegate.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Toggle comment action delegate for XML editor
- */
-public class ToggleCommentActionXMLDelegate extends AbstractCommentActionXMLDelegate {
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(XMLUIMessages.ToggleComment_label);
-			action.setToolTipText(XMLUIMessages.ToggleComment_tooltip);
-			action.setDescription(XMLUIMessages.ToggleComment_description);
-		}
-	}
-
-	void processAction(IDocument document, ITextSelection textSelection) {
-		// get text selection lines info
-		int selectionStartLine = textSelection.getStartLine();
-		int selectionEndLine = textSelection.getEndLine();
-		try {
-			int selectionEndLineOffset = document.getLineOffset(selectionEndLine);
-			int selectionEndOffset = textSelection.getOffset() + textSelection.getLength();
-
-			// adjust selection end line
-			if ((selectionEndLine > selectionStartLine) && (selectionEndLineOffset == selectionEndOffset)) {
-				selectionEndLine--;
-			}
-
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-
-		// save the selection position since it will be changing
-		Position selectionPosition = null;
-		boolean updateStartOffset = false;
-		try {
-			selectionPosition = new Position(textSelection.getOffset(), textSelection.getLength());
-			document.addPosition(selectionPosition);
-
-			// extra check if commenting from beginning of line
-			int selectionStartLineOffset = document.getLineOffset(selectionStartLine);
-			if ((textSelection.getLength() > 0) && (selectionStartLineOffset == textSelection.getOffset()) && !isCommentLine(document, selectionStartLine)) {
-				updateStartOffset = true;
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-
-		processAction(document, selectionStartLine, selectionEndLine);
-
-		updateCurrentSelection(selectionPosition, document, updateStartOffset);
-	}
-
-	private void processAction(IDocument document, int selectionStartLine, int selectionEndLine) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null) {
-			try {
-				model.beginRecording(this, XMLUIMessages.ToggleComment_tooltip);
-				model.aboutToChangeModel();
-
-				for (int i = selectionStartLine; i <= selectionEndLine; i++) {
-					try {
-						if (document.getLineLength(i) > 0) {
-							if (isCommentLine(document, i)) {
-								int lineOffset = document.getLineOffset(i);
-								IRegion region = document.getLineInformation(i);
-								String string = document.get(region.getOffset(), region.getLength());
-								int openCommentOffset = lineOffset + string.indexOf(OPEN_COMMENT);
-								int closeCommentOffset = lineOffset + string.indexOf(CLOSE_COMMENT) - OPEN_COMMENT.length();
-								uncomment(document, openCommentOffset, closeCommentOffset);
-							}
-							else {
-								int openCommentOffset = document.getLineOffset(i);
-								int lineDelimiterLength = document.getLineDelimiter(i) == null ? 0 : document.getLineDelimiter(i).length();
-								int closeCommentOffset = openCommentOffset + document.getLineLength(i) - lineDelimiterLength + OPEN_COMMENT.length();
-								comment(document, openCommentOffset, closeCommentOffset);
-							}
-						}
-					}
-					catch (BadLocationException e) {
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-			}
-			finally {
-				model.changedModel();
-				model.endRecording(this);
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	private boolean isCommentLine(IDocument document, int line) {
-		boolean isComment = false;
-
-		try {
-			IRegion region = document.getLineInformation(line);
-			String string = document.get(region.getOffset(), region.getLength()).trim();
-			isComment = (string.length() >= OPEN_COMMENT.length() + CLOSE_COMMENT.length()) && string.startsWith(OPEN_COMMENT) && string.endsWith(CLOSE_COMMENT);
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-		return isComment;
-	}
-
-	private void comment(IDocument document, int openCommentOffset, int closeCommentOffset) {
-		try {
-			document.replace(openCommentOffset, 0, OPEN_COMMENT);
-			document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
-			removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-
-	private void uncomment(IDocument document, int openCommentOffset, int closeCommentOffset) {
-		try {
-			document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-			document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-
-	private void updateCurrentSelection(Position selectionPosition, IDocument document, boolean updateStartOffset) {
-		if (fEditor instanceof ITextEditor) {
-			// update the selection if text selection changed
-			if (selectionPosition != null) {
-				ITextSelection selection = null;
-				if (updateStartOffset) {
-					selection = new TextSelection(document, selectionPosition.getOffset() - OPEN_COMMENT.length(), selectionPosition.getLength() + OPEN_COMMENT.length());
-				}
-				else {
-					selection = new TextSelection(document, selectionPosition.getOffset(), selectionPosition.getLength());
-				}
-				ISelectionProvider provider = ((ITextEditor) fEditor).getSelectionProvider();
-				if (provider != null) {
-					provider.setSelection(selection);
-				}
-				document.removePosition(selectionPosition);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/autoedit/AutoEditStrategyForTabs.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/autoedit/AutoEditStrategyForTabs.java
deleted file mode 100644
index 1b416cc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/autoedit/AutoEditStrategyForTabs.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.autoedit;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ConfigurableLineTracker;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ILineTracker;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorExtension3;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.ui.internal.Logger;
-
-/**
- * AutoEditStrategy to handle characters inserted when Tab key is pressed
- */
-public class AutoEditStrategyForTabs implements IAutoEditStrategy {
-	private final String TAB_CHARACTER = "\t"; //$NON-NLS-1$
-
-	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		// if not in smart insert mode just ignore
-		if (!isSmartInsertMode()) {
-			return;
-		}
-
-		// spaces for tab character
-		if ((command.length == 0) && (command.text != null) && (command.text.length() > 0) && (command.text.indexOf(TAB_CHARACTER) != -1)) {
-			smartInsertForTab(command, document);
-		}
-	}
-
-	/**
-	 * Insert spaces for tabs
-	 * 
-	 * @param command
-	 */
-	private void smartInsertForTab(DocumentCommand command, IDocument document) {
-		// tab key was pressed. now check preferences to see if need to insert
-		// spaces instead of tab
-		int indentationWidth = getIndentationWidth();
-		if (indentationWidth > -1) {
-			String originalText = command.text;
-			StringBuffer newText = new StringBuffer(originalText);
-
-			// determine where in line this command begins
-			int lineOffset = -1;
-			try {
-				IRegion lineInfo = document.getLineInformationOfOffset(command.offset);
-				lineOffset = command.offset - lineInfo.getOffset();
-			}
-			catch (BadLocationException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-
-			ILineTracker lineTracker = getLineTracker(document, originalText);
-
-			int startIndex = 0;
-			int index = newText.indexOf(TAB_CHARACTER);
-			while (index != -1) {
-				String indent = getIndentString(indentationWidth, lineOffset, lineTracker, index);
-
-				// replace \t character with spaces
-				newText.replace(index, index + 1, indent);
-				if (lineTracker != null) {
-					try {
-						lineTracker.replace(index, 1, indent);
-					}
-					catch (BadLocationException e) {
-						// if something goes wrong with replacing text, just
-						// reset to current string
-						lineTracker.set(newText.toString());
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-
-				startIndex = index + indent.length();
-				index = newText.indexOf(TAB_CHARACTER, startIndex);
-			}
-			command.text = newText.toString();
-		}
-	}
-
-	/**
-	 * Calculate number of spaces for next tab stop
-	 */
-	private String getIndentString(int indentationWidth, int lineOffset, ILineTracker lineTracker, int index) {
-		int indentSize = indentationWidth;
-		int offsetInLine = -1;
-		if (lineTracker != null) {
-			try {
-				IRegion lineInfo = lineTracker.getLineInformationOfOffset(index);
-				if ((lineInfo.getOffset() == 0) && (lineOffset > -1)) {
-					offsetInLine = lineOffset + index;
-				}
-				else {
-					offsetInLine = index - lineInfo.getOffset();
-				}
-			}
-			catch (BadLocationException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		}
-		else {
-			if (lineOffset > -1) {
-				offsetInLine = lineOffset + index;
-			}
-		}
-		if ((offsetInLine > -1) && (indentationWidth > 0)) {
-			int remainder = offsetInLine % indentationWidth;
-			indentSize = indentationWidth - remainder;
-		}
-
-		StringBuffer indent = new StringBuffer();
-		for (int i = 0; i < indentSize; i++) {
-			indent.append(' ');
-		}
-		return indent.toString();
-	}
-
-	/**
-	 * Set up a line tracker for text within command if text is multi-line
-	 */
-	private ILineTracker getLineTracker(IDocument document, String originalText) {
-		ConfigurableLineTracker lineTracker = null;
-		int[] delims = TextUtilities.indexOf(document.getLegalLineDelimiters(), originalText, 0);
-		if ((delims[0] != -1) || (delims[1] != -1)) {
-			lineTracker = new ConfigurableLineTracker(document.getLegalLineDelimiters());
-			lineTracker.set(originalText);
-		}
-		return lineTracker;
-	}
-
-	/**
-	 * Return true if active editor is in smart insert mode, false otherwise
-	 * 
-	 * @return boolean
-	 */
-	private boolean isSmartInsertMode() {
-		boolean isSmartInsertMode = false;
-
-		ITextEditor textEditor = null;
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				IEditorPart editor = page.getActiveEditor();
-				if (editor != null) {
-					if (editor instanceof ITextEditor) {
-						textEditor = (ITextEditor) editor;
-					}
-					else {
-						textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-					}
-				}
-			}
-		}
-
-		// check if smart insert mode
-		if ((textEditor instanceof ITextEditorExtension3) && (((ITextEditorExtension3) textEditor).getInsertMode() == ITextEditorExtension3.SMART_INSERT)) {
-			isSmartInsertMode = true;
-		}
-		return isSmartInsertMode;
-	}
-
-	/**
-	 * Returns indentation width if using spaces for indentation, -1 otherwise
-	 * 
-	 * @return int
-	 */
-	private int getIndentationWidth() {
-		int width = -1;
-
-		Preferences preferences = XMLCorePlugin.getDefault().getPluginPreferences();
-		if (XMLCorePreferenceNames.SPACE.equals(preferences.getString(XMLCorePreferenceNames.INDENTATION_CHAR))) {
-			width = preferences.getInt(XMLCorePreferenceNames.INDENTATION_SIZE);
-		}
-
-		return width;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/autoedit/StructuredAutoEditStrategyXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/autoedit/StructuredAutoEditStrategyXML.java
deleted file mode 100644
index 267084e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/autoedit/StructuredAutoEditStrategyXML.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.autoedit;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentCommand;
-import org.eclipse.jface.text.IAutoEditStrategy;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorExtension3;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.w3c.dom.Node;
-
-/**
- * Automatically inserts closing comment tag or end tag when appropriate.
- */
-public class StructuredAutoEditStrategyXML implements IAutoEditStrategy {
-	/*
-	 * NOTE: copies of this class exists in
-	 * org.eclipse.wst.xml.ui.internal.autoedit
-	 * org.eclipse.wst.html.ui.internal.autoedit
-	 */
-	public void customizeDocumentCommand(IDocument document, DocumentCommand command) {
-		Object textEditor = getActiveTextEditor();
-		if (!((textEditor instanceof ITextEditorExtension3) && (((ITextEditorExtension3) textEditor).getInsertMode() == ITextEditorExtension3.SMART_INSERT))) {
-			return;
-		}
-
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (model != null) {
-				if (command.text != null) {
-					smartInsertCloseElement(command, document, model);
-					smartInsertForComment(command, document, model);
-					smartInsertForEndTag(command, document, model);
-					smartRemoveEndTag(command, document, model);
-				}
-			}
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-	}
-
-	private boolean isPreferenceEnabled(String key) {
-		return (key != null && XMLUIPlugin.getDefault().getPreferenceStore().getBoolean(key));
-	}
-
-	private boolean isCommentNode(IDOMNode node) {
-		return ((node != null) && (node instanceof IDOMElement) && ((IDOMElement) node).isCommentTag());
-	}
-
-	private boolean isDocumentNode(IDOMNode node) {
-		return ((node != null) && (node.getNodeType() == Node.DOCUMENT_NODE));
-	}
-
-	/**
-	 * Attempts to clean up an end-tag if a start-tag is converted into an empty-element
-	 * tag (e.g., <node />) and the original element was empty.
-	 * 
-	 * @param command the document command describing the change
-	 * @param document the document that will be changed
-	 * @param model the model based on the document
-	 */
-	private void smartRemoveEndTag(DocumentCommand command, IDocument document, IStructuredModel model) {
-		try {
-			// An opening tag is now a self-terminated end-tag
-			if ("/".equals(command.text) && ">".equals(document.get(command.offset, 1)) && isPreferenceEnabled(XMLUIPreferenceNames.TYPING_REMOVE_END_TAGS)) { //$NON-NLS-1$ //$NON-NLS-2$
-				IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset);
-				if (node != null && !node.hasChildNodes()) {
-					IStructuredDocumentRegion region = node.getFirstStructuredDocumentRegion();
-					if(region.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN && command.offset <= region.getEnd()) {
-						
-						/* if the region before the command offset is a an attribute value region
-						 * check to see if it has both and opening and closing quote
-						 */
-						ITextRegion prevTextRegion = region.getRegionAtCharacterOffset(command.offset-1);
-						boolean inUnclosedAttValueRegion = false;
-						if(prevTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-							//get the text of the attribute value region
-							String prevText = region.getText(prevTextRegion);
-							inUnclosedAttValueRegion = (prevText.startsWith("'") && ((prevText.length() == 1) || !prevText.endsWith("'"))) ||
-								(prevText.startsWith("\"") && ((prevText.length() == 1) || !prevText.endsWith("\"")));
-						} 
-					
-						//if command offset is in an unclosed attribute value region then done remove the end tag
-						if(!inUnclosedAttValueRegion) {
-							region = node.getEndStructuredDocumentRegion();
-							if (region != null && region.isEnded()) {
-								document.replace(region.getStartOffset(), region.getLength(), ""); //$NON-NLS-1$
-							}
-						}
-					}
-				}
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.logException(e);
-		}
-	}
-
-	private void smartInsertForComment(DocumentCommand command, IDocument document, IStructuredModel model) {
-		try {
-			if (command.text.equals("-") && (document.getLength() >= 3) && document.get(command.offset - 3, 3).equals("<!-") && isPreferenceEnabled(XMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS)) { //$NON-NLS-1$ //$NON-NLS-2$
-				command.text += "  -->"; //$NON-NLS-1$
-				command.shiftsCaret = false;
-				command.caretOffset = command.offset + 2;
-				command.doit = false;
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.logException(e);
-		}
-
-	}
-	
-	/**
-	 * Attempts to insert the end tag when completing a start-tag with the '&gt;' character.
-	 * 
-	 * @param command
-	 * @param document
-	 * @param model
-	 */
-	private void smartInsertCloseElement(DocumentCommand command, IDocument document, IStructuredModel model) {
-		try {
-			// Check terminating start tag, but ignore empty-element tags
-			if (command.text.equals(">") && document.getLength() > 0 && document.getChar(command.offset - 1) != '/' && isPreferenceEnabled(XMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS)) { //$NON-NLS-1$
-				IDOMNode node = (IDOMNode) model.getIndexedRegion(command.offset - 1);
-				boolean isClosedByParent = false;
-				// Only insert an end-tag if necessary. Because of the way the document is parsed, it is possible for a child tag with the same
-				// name as an ancestor to be paired with the end-tag of an ancestor, so the ancestors must be checked for an unclosed tag.
-				if (node != null && node.getNodeType() == Node.ELEMENT_NODE && (!node.isClosed() || (isClosedByParent = hasUnclosedAncestor(node)))) {
-					IStructuredDocumentRegion region = node.getEndStructuredDocumentRegion();
-					if (region != null && region.getRegions().size() > 0 && region.getRegions().get(0).getType() == DOMRegionContext.XML_END_TAG_OPEN && !isClosedByParent)
-						return;
-					command.text += "</" + getElementName(node, command.offset) + ">"; //$NON-NLS-1$ //$NON-NLS-2$
-					command.shiftsCaret = false;
-					command.caretOffset = command.offset + 1;
-				}
-				
-			}
-		} catch (BadLocationException e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Get the element name that will be created by closing the start tag. Defaults
-	 * to the node's nodeName.
-	 * @param node the node that is being edited
-	 * @param offset the offset in the document where the start tag is closed
-	 * @return The element name of the tag
-	 */
-	private String getElementName(IDOMNode node, int offset) {
-		String name = null;
-		
-		IStructuredDocumentRegion region = node.getFirstStructuredDocumentRegion();
-		ITextRegion textRegion = region.getRegionAtCharacterOffset(offset);
-		if (textRegion != null && textRegion.getType() == DOMRegionContext.XML_TAG_NAME) {
-			int nameStart = region.getStartOffset(textRegion);
-			String regionText = region.getText(textRegion);
-			int length = offset - nameStart;
-			if (length <= regionText.length())
-				name = regionText.substring(0, length);
-		}
-		
-		// Default to the node name
-		if (name == null)
-			name = node.getNodeName();
-		return name;
-	}
-
-	private void smartInsertForEndTag(DocumentCommand command, IDocument document, IStructuredModel model) {
-		try {
-			if (command.text.equals("/") && (document.getLength() >= 1) && document.get(command.offset - 1, 1).equals("<") && isPreferenceEnabled(XMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS)) { //$NON-NLS-1$ //$NON-NLS-2$
-				IDOMNode parentNode = (IDOMNode) ((IDOMNode) model.getIndexedRegion(command.offset - 1)).getParentNode();
-				if (isCommentNode(parentNode)) {
-					// loop and find non comment node parent
-					while ((parentNode != null) && isCommentNode(parentNode)) {
-						parentNode = (IDOMNode) parentNode.getParentNode();
-					}
-				}
-
-				if (!isDocumentNode(parentNode)) {
-					// only add end tag if one does not already exist or if
-					// add '/' does not create one already
-					IStructuredDocumentRegion endTagStructuredDocumentRegion = parentNode.getEndStructuredDocumentRegion();
-					IDOMNode ancestor = parentNode;
-					boolean smartInsertForEnd = false;
-					if(endTagStructuredDocumentRegion != null) {
-						// Look for ancestors by the same name that are missing end tags
-						while((ancestor = (IDOMNode) ancestor.getParentNode()) != null) {
-							if(ancestor.getEndStructuredDocumentRegion() == null && parentNode.getNodeName().equals(ancestor.getNodeName())) {
-								smartInsertForEnd = true;
-								break;
-							}
-						}
-					}
-					if (endTagStructuredDocumentRegion == null || smartInsertForEnd) {
-						StringBuffer toAdd = new StringBuffer(parentNode.getNodeName());
-						if (toAdd.length() > 0) {
-							toAdd.append(">"); //$NON-NLS-1$
-							String suffix = toAdd.toString();
-							if ((document.getLength() < command.offset + suffix.length()) || (!suffix.equals(document.get(command.offset, suffix.length())))) {
-								command.text += suffix;
-							}
-						}
-					}
-				}
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.logException(e);
-		}
-	}
-	
-	/**
-	 * Checks if <code>node</code> has an unclosed ancestor by the same name
-	 * 
-	 * @param node the node to check
-	 * @return true if <code>node</code> has an unclosed parent with the same node name
-	 */
-	private boolean hasUnclosedAncestor(IDOMNode node) {
-		IDOMNode parent = (IDOMNode) node.getParentNode();
-		while (parent != null && parent.getNodeType() != Node.DOCUMENT_NODE && parent.getNodeName().equals(node.getNodeName())) {
-			if (!parent.isClosed())
-				return true;
-			parent = (IDOMNode) parent.getParentNode();
-		}
-		return false;
-	}
-
-	/**
-	 * Return the active text editor if possible, otherwise the active editor
-	 * part.
-	 * 
-	 * @return Object
-	 */
-	private Object getActiveTextEditor() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null) {
-			IWorkbenchPage page = window.getActivePage();
-			if (page != null) {
-				IEditorPart editor = page.getActiveEditor();
-				if (editor != null) {
-					if (editor instanceof ITextEditor) {
-						return editor;
-					}
-					ITextEditor textEditor = (ITextEditor) editor.getAdapter(ITextEditor.class);
-					if (textEditor != null) {
-						return textEditor;
-					}
-					return editor;
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractContentAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractContentAssistProcessor.java
deleted file mode 100644
index 4e2b5cc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractContentAssistProcessor.java
+++ /dev/null
@@ -1,2504 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Vector;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.encoding.ContentTypeEncodingPreferences;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.ui.internal.IReleasable;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMEntityDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.document.AttrImpl;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.CMImageUtil;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.eclipse.wst.xml.ui.internal.taginfo.MarkupTagInfoProvider;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-abstract public class AbstractContentAssistProcessor implements IContentAssistProcessor, IReleasable {
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	private class DOMJSPRegionContextsPrivateCopy {
-		private static final String JSP_CLOSE = "JSP_CLOSE"; //$NON-NLS-1$
-		private static final String JSP_COMMENT_CLOSE = "JSP_COMMENT_CLOSE"; //$NON-NLS-1$
-
-		private static final String JSP_COMMENT_OPEN = "JSP_COMMENT_OPEN"; //$NON-NLS-1$
-		private static final String JSP_DECLARATION_OPEN = "JSP_DECLARATION_OPEN"; //$NON-NLS-1$
-		private static final String JSP_DIRECTIVE_CLOSE = "JSP_DIRECTIVE_CLOSE"; //$NON-NLS-1$
-		private static final String JSP_DIRECTIVE_NAME = "JSP_DIRECTIVE_NAME"; //$NON-NLS-1$
-
-		private static final String JSP_DIRECTIVE_OPEN = "JSP_DIRECTIVE_OPEN"; //$NON-NLS-1$
-		private static final String JSP_EXPRESSION_OPEN = "JSP_EXPRESSION_OPEN"; //$NON-NLS-1$
-
-		private static final String JSP_ROOT_TAG_NAME = "JSP_ROOT_TAG_NAME"; //$NON-NLS-1$
-
-		private static final String JSP_SCRIPTLET_OPEN = "JSP_SCRIPTLET_OPEN"; //$NON-NLS-1$
-
-	}
-
-	protected static final String INTERNALERROR = XMLUIMessages.SEVERE_internal_error_occu_UI_;
-	protected static final String UNKNOWN_ATTR = XMLUIMessages.No_known_attribute__UI_;
-	protected static final String UNKNOWN_CONTEXT = XMLUIMessages.Content_Assist_not_availab_UI_;
-	protected char completionProposalAutoActivationCharacters[] = null;
-	protected char contextInformationAutoActivationCharacters[] = null;
-	private AttributeContextInformationProvider fAttributeInfoProvider = null;
-	private AttributeContextInformationPresenter fContextInformationPresenter = null;
-
-	protected String fErrorMessage = null;
-	protected XMLContentModelGenerator fGenerator;
-	// protected IResource resource = null;
-	protected MarkupTagInfoProvider fInfoProvider = null;
-	protected ITextViewer fTextViewer = null;
-
-	private final boolean showValues = true;
-
-	public AbstractContentAssistProcessor() {
-		init();
-	}
-
-	protected void addAttributeNameProposals(ContentAssistRequest contentAssistRequest) {
-		IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
-		IStructuredDocumentRegion sdRegion = contentAssistRequest.getDocumentRegion();
-		// retrieve the list of attributes
-		CMElementDeclaration elementDecl = getCMElementDeclaration(node);
-		if (elementDecl != null) {
-			CMNamedNodeMap attributes = elementDecl.getAttributes();
-			
-			CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attributes);
-			if (node.getNodeType() == Node.ELEMENT_NODE) {
-				List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent((Element) node, elementDecl, ModelQuery.INCLUDE_ATTRIBUTES);
-				for (int k = 0; k < nodes.size(); k++) {
-					CMNode cmnode = (CMNode) nodes.get(k);
-					if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-						allAttributes.put(cmnode);
-					}
-				}
-			}
-			attributes = allAttributes;
-
-			String matchString = contentAssistRequest.getMatchString();
-
-			// check whether an attribute really exists for the replacement
-			// offsets AND if it possesses a value
-			boolean attrAtLocationHasValue = false;
-			NamedNodeMap attrs = node.getAttributes();
-			for (int i = 0; i < attrs.getLength(); i++) {
-				AttrImpl existingAttr = (AttrImpl) attrs.item(i);
-				ITextRegion name = existingAttr.getNameRegion();
-
-				if ((sdRegion.getStartOffset(name) <= contentAssistRequest.getReplacementBeginPosition()) && (sdRegion.getStartOffset(name) + name.getLength() >= contentAssistRequest.getReplacementBeginPosition() + contentAssistRequest.getReplacementLength()) && (existingAttr.getValueRegion() != null)) {
-					attrAtLocationHasValue = true;
-					break;
-				}
-			}
-
-			// only add proposals for the attributes whose names begin with
-			// the matchstring
-			if (attributes != null) {
-				for (int i = 0; i < attributes.getLength(); i++) {
-					CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) attributes.item(i);
-
-					int isRequired = 0;
-					if (attrDecl.getUsage() == CMAttributeDeclaration.REQUIRED) {
-						isRequired = XMLRelevanceConstants.R_REQUIRED;
-					}
-
-					boolean showAttribute = true;
-					showAttribute = showAttribute && beginsWith(getRequiredName(node, attrDecl), matchString.trim());
-					AttrImpl attr = (AttrImpl) node.getAttributes().getNamedItem(getRequiredName(node, attrDecl));
-					ITextRegion nameRegion = attr != null ? attr.getNameRegion() : null;
-					// nameRegion.getEndOffset() + 1 is required to allow for
-					// matches against the full name of an existing Attr
-					showAttribute = showAttribute && ((attr == null) || ((nameRegion != null) && (sdRegion.getStartOffset(nameRegion) <= contentAssistRequest.getReplacementBeginPosition()) && (sdRegion.getStartOffset(nameRegion) + nameRegion.getLength() >= contentAssistRequest.getReplacementBeginPosition() + contentAssistRequest.getReplacementLength())));
-					if (showAttribute) {
-						Image attrImage = CMImageUtil.getImage(attrDecl);
-						if (attrImage == null) {
-							if (isRequired > 0) {
-								attrImage = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATT_REQ_OBJ);
-							}
-							else {
-								attrImage = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
-							}
-						}
-
-						String proposedText = null;
-						String proposedInfo = getAdditionalInfo(elementDecl, attrDecl);
-						CustomCompletionProposal proposal = null;
-						// attribute is at this location and already exists
-						if (attrAtLocationHasValue) {
-							// only propose the name
-							proposedText = getRequiredName(node, attrDecl);
-							proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), proposedText.length(), attrImage, proposedText, null, proposedInfo, XMLRelevanceConstants.R_XML_ATTRIBUTE_NAME + isRequired, true);
-						}
-						// no attribute exists or is elsewhere, generate
-						// minimally
-						else {
-							Attr existingAttrNode = (Attr) node.getAttributes().getNamedItem(getRequiredName(node, attrDecl));
-							String value = null;
-							if (existingAttrNode != null) {
-								value = existingAttrNode.getNodeValue();
-							}
-							if ((value != null) && (value.length() > 0)) {
-								proposedText = getRequiredName(node, attrDecl);
-							}
-							else {
-								proposedText = getRequiredText(node, attrDecl);
-							}
-							proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), attrDecl.getNodeName().length() + 2, attrImage,
-							// if the value isn't empty (no empty set of
-										// quotes), show it
-							// BUG 203494, content strings may have "", but not be empty
-							// An empty string is when there's no content between double quotes
-							// and there is no single quote that may be encasing a double quote
-										(showValues && (proposedText.lastIndexOf('\"') - proposedText.indexOf('\"') ==  1 && proposedText.indexOf('\'') == -1)) ? getRequiredName(node, attrDecl) : proposedText,
-										null, proposedInfo, XMLRelevanceConstants.R_XML_ATTRIBUTE_NAME + isRequired);
-						}
-						contentAssistRequest.addProposal(proposal);
-					}
-				}
-			}
-		}
-		else {
-			setErrorMessage(NLS.bind(XMLUIMessages.Element__is_unknown, (new Object[]{node.getNodeName()})));
-		}
-	}
-
-	protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) {
-
-		IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
-
-		// Find the attribute region and name for which this position should
-		// have a value proposed
-		IStructuredDocumentRegion open = node.getFirstStructuredDocumentRegion();
-		ITextRegionList openRegions = open.getRegions();
-		int i = openRegions.indexOf(contentAssistRequest.getRegion());
-		if (i < 0) {
-			return;
-		}
-		ITextRegion nameRegion = null;
-		while (i >= 0) {
-			nameRegion = openRegions.get(i--);
-			if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				break;
-			}
-		}
-
-		// the name region is REQUIRED to do anything useful
-		if (nameRegion != null) {
-			// Retrieve the declaration
-			CMElementDeclaration elementDecl = getCMElementDeclaration(node);
-
-			// String attributeName = nameRegion.getText();
-			String attributeName = open.getText(nameRegion);
-
-			CMAttributeDeclaration attrDecl = null;
-
-			// No CMElementDeclaration means no attribute metadata, but
-			// retrieve the
-			// declaration for the attribute otherwise
-			if (elementDecl != null) {
-				CMNamedNodeMap attributes = elementDecl.getAttributes();
-
-				CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attributes) {
-					private Map caseInsensitive;
-					
-					private Map getCaseInsensitiveMap() {
-						if(caseInsensitive == null)
-							caseInsensitive = new HashMap();
-						return caseInsensitive;
-					}
-
-					public CMNode getNamedItem(String name) {
-						CMNode node = super.getNamedItem(name);
-						if (node == null) {
-							node = (CMNode) getCaseInsensitiveMap().get(name.toLowerCase(Locale.US));
-						}
-						return node;
-					}
-
-					public void put(CMNode cmNode) {
-						super.put(cmNode);
-						getCaseInsensitiveMap().put(cmNode.getNodeName().toLowerCase(Locale.US), cmNode);
-					}
-				};
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent((Element) node, elementDecl, ModelQuery.INCLUDE_ATTRIBUTES);
-					for (int k = 0; k < nodes.size(); k++) {
-						CMNode cmnode = (CMNode) nodes.get(k);
-						if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-							allAttributes.put(cmnode);
-						}
-					}
-				}
-				attributes = allAttributes;
-
-				String noprefixName = DOMNamespaceHelper.getUnprefixedName(attributeName);
-				if (attributes != null) {
-					attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(noprefixName);
-					if (attrDecl == null) {
-						attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(attributeName);
-					}
-				}
-				if (attrDecl == null) {
-					setErrorMessage(UNKNOWN_ATTR, attributeName);
-				}
-			}
-
-			String currentValue = node.getAttributes().getNamedItem(attributeName).getNodeValue();
-			String proposedInfo = null;
-			Image image = CMImageUtil.getImage(attrDecl);
-			if (image == null) {
-				if ((attrDecl != null) && (attrDecl.getUsage() == CMAttributeDeclaration.REQUIRED)) {
-					image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATT_REQ_OBJ);
-				}
-				else {
-					image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
-				}
-			}
-
-			if ((attrDecl != null) && (attrDecl.getAttrType() != null)) {
-				// attribute is known, prompt with values from the declaration
-				proposedInfo = getAdditionalInfo(elementDecl, attrDecl);
-				List possibleValues = getPossibleDataTypeValues(node, attrDecl);
-				String defaultValue = attrDecl.getAttrType().getImpliedValue();
-				if (possibleValues.size() > 0 || defaultValue != null) {
-					// ENUMERATED VALUES
-					String matchString = contentAssistRequest.getMatchString();
-					if (matchString == null) {
-						matchString = ""; //$NON-NLS-1$
-					}
-					if ((matchString.length() > 0) && (matchString.startsWith("\"") || matchString.startsWith("'"))) {
-						matchString = matchString.substring(1);
-					}
-					boolean currentValid = false;
-
-					// d210858, if the region's a container, don't suggest the
-					// enumerated values as they probably won't help
-					boolean existingComplicatedValue = (contentAssistRequest.getRegion() != null) && (contentAssistRequest.getRegion() instanceof ITextRegionContainer);
-					if (!existingComplicatedValue) {
-						int rOffset = contentAssistRequest.getReplacementBeginPosition();
-						int rLength = contentAssistRequest.getReplacementLength();
-						for (Iterator j = possibleValues.iterator(); j.hasNext();) {
-							String possibleValue = (String) j.next();
-							if(!possibleValue.equals(defaultValue)) {
-								currentValid = currentValid || possibleValue.equals(currentValue);
-								if ((matchString.length() == 0) || possibleValue.startsWith(matchString)) {
-									String rString = "\"" + possibleValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
-									CustomCompletionProposal proposal = new CustomCompletionProposal(rString, rOffset, rLength, possibleValue.length() + 1, XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ENUM), rString, null, proposedInfo, XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
-									contentAssistRequest.addProposal(proposal);
-								}
-							}
-						}
-						if(defaultValue != null && ((matchString.length() == 0) || defaultValue.startsWith(matchString))) {
-							String rString = "\"" + defaultValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
-							CustomCompletionProposal proposal = new CustomCompletionProposal(rString, rOffset, rLength, defaultValue.length() + 1, XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_DEFAULT), rString, null, proposedInfo, XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
-							contentAssistRequest.addProposal(proposal);
-						}
-					}
-				}
-				else if (((attrDecl.getUsage() == CMAttributeDeclaration.FIXED) || (attrDecl.getAttrType().getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED)) && (attrDecl.getAttrType().getImpliedValue() != null)) {
-					// FIXED values
-					String value = attrDecl.getAttrType().getImpliedValue();
-					if ((value != null) && (value.length() > 0)) {
-						String rValue = "\"" + value + "\"";//$NON-NLS-2$//$NON-NLS-1$
-						CustomCompletionProposal proposal = new CustomCompletionProposal(rValue, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), rValue.length() + 1, image, rValue, null, proposedInfo, XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
-						contentAssistRequest.addProposal(proposal);
-						if ((currentValue.length() > 0) && !value.equals(currentValue)) {
-							rValue = "\"" + currentValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
-							proposal = new CustomCompletionProposal(rValue, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), rValue.length() + 1, image, rValue, null, proposedInfo, XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
-							contentAssistRequest.addProposal(proposal);
-						}
-					}
-				}
-			}
-			else {
-				// unknown attribute, so supply nice empty values
-				proposedInfo = getAdditionalInfo(null, elementDecl);
-				CustomCompletionProposal proposal = null;
-				if ((currentValue != null) && (currentValue.length() > 0)) {
-					String rValue = "\"" + currentValue + "\""; //$NON-NLS-2$//$NON-NLS-1$
-					proposal = new CustomCompletionProposal(rValue, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), 1, image, rValue, null, proposedInfo, XMLRelevanceConstants.R_XML_ATTRIBUTE_VALUE);
-					contentAssistRequest.addProposal(proposal);
-				}
-			}
-		}
-		else {
-			setErrorMessage(UNKNOWN_CONTEXT);
-		}
-	}
-
-	protected void addCommentProposal(ContentAssistRequest contentAssistRequest) {
-		contentAssistRequest.addProposal(new CustomCompletionProposal("<!--  -->", //$NON-NLS-1$
-					contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), 5, XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_COMMENT), NLS.bind(XMLUIMessages.Comment__, (new Object[]{" <!--  -->"})), //$NON-NLS-1$
-					null, null, XMLRelevanceConstants.R_COMMENT));
-	}
-
-	/**
-	 * Add all of the element declarations int the CMContent object into one
-	 * big list.
-	 */
-	protected void addContent(List contentList, CMContent content) {
-		if (content == null) {
-			return;
-		}
-		if (content instanceof CMGroup) {
-			CMNodeList children = ((CMGroup) content).getChildNodes();
-			if (children == null) {
-				return;
-			}
-			for (int i = 0; i < children.getLength(); i++) {
-				CMNode child = children.item(i);
-				if (child.getNodeType() == CMNode.ELEMENT_DECLARATION) {
-					contentList.add(child);
-				}
-				else {
-					if (child.getNodeType() == CMNode.GROUP) {
-						addContent(contentList, (CMContent) child);
-					}
-					else {
-						throw new IllegalArgumentException("Unknown content child: " + child); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		else {
-			contentList.add(content);
-		}
-	}
-
-	protected void addDocTypeProposal(ContentAssistRequest contentAssistRequest) {
-		// if a DocumentElement exists, use that for the root Element name
-		String rootname = "unspecified"; //$NON-NLS-1$
-		if (contentAssistRequest.getNode().getOwnerDocument().getDocumentElement() != null) {
-			rootname = contentAssistRequest.getNode().getOwnerDocument().getDocumentElement().getNodeName();
-		}
-
-		String proposedText = "<!DOCTYPE " + rootname + " PUBLIC \"//UNKNOWN/\" \"unknown.dtd\">"; //$NON-NLS-1$ //$NON-NLS-2$
-		ICompletionProposal proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), 10, XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_DOCTYPE), "<!DOCTYPE ... >", //$NON-NLS-1$
-					null, null, XMLRelevanceConstants.R_DOCTYPE);
-		// TODO provide special documentation on doc type
-		contentAssistRequest.addProposal(proposal);
-	}
-
-	/**
-	 * Add the proposals for a completely empty document
-	 */
-	protected void addEmptyDocumentProposals(ContentAssistRequest contentAssistRequest) {
-		// nothing
-	}
-
-	/**
-	 * Add the proposals for the name in an end tag
-	 */
-	protected void addEndTagNameProposals(ContentAssistRequest contentAssistRequest) {
-
-		if (contentAssistRequest.getStartOffset() + contentAssistRequest.getRegion().getTextLength() < contentAssistRequest.getReplacementBeginPosition()) {
-			CustomCompletionProposal proposal = new CustomCompletionProposal(">", //$NON-NLS-1$
-						contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), 1, XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC), NLS.bind(XMLUIMessages.Close_with__, (new Object[]{" '>'"})), //$NON-NLS-1$
-						null, null, XMLRelevanceConstants.R_END_TAG_NAME);
-			contentAssistRequest.addProposal(proposal);
-		}
-		else {
-			IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-			Node aNode = contentAssistRequest.getNode();
-			String matchString = contentAssistRequest.getMatchString();
-			if (matchString.startsWith("</")) {
-				matchString = matchString.substring(2);
-			}
-			while (aNode != null) {
-				if (aNode.getNodeType() == Node.ELEMENT_NODE) {
-					if (aNode.getNodeName().startsWith(matchString)) {
-						IDOMNode aXMLNode = (IDOMNode) aNode;
-						CMElementDeclaration ed = modelQuery.getCMElementDeclaration((Element) aNode);
-						if ((aXMLNode.getEndStructuredDocumentRegion() == null) && ((ed == null) || (ed.getContentType() != CMElementDeclaration.EMPTY))) {
-							String replacementText = aNode.getNodeName();
-							String displayText = replacementText;
-							String proposedInfo = (ed != null) ? getAdditionalInfo(null, ed) : null;
-							if(!contentAssistRequest.getDocumentRegion().isEnded()) {
-								replacementText += ">"; //$NON-NLS-1$
-							}
-							CustomCompletionProposal proposal = null;
-							// double check to see if the region acted upon is
-							// a tag name; replace it if so
-							Image image = CMImageUtil.getImage(ed);
-							if (image == null) {
-								image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-							}
-							if (contentAssistRequest.getRegion().getType() == DOMRegionContext.XML_TAG_NAME) {
-								proposal = new CustomCompletionProposal(replacementText, contentAssistRequest.getStartOffset(), contentAssistRequest.getRegion().getTextLength(), replacementText.length(), image, displayText, null, proposedInfo, XMLRelevanceConstants.R_END_TAG_NAME);
-							}
-							else {
-								proposal = new CustomCompletionProposal(replacementText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), replacementText.length(), image, NLS.bind(XMLUIMessages.Close_with__, (new Object[]{"'" + displayText + "'"})), //$NON-NLS-1$ //$NON-NLS-2$
-											null, proposedInfo, XMLRelevanceConstants.R_END_TAG_NAME);
-							}
-							contentAssistRequest.addProposal(proposal);
-						}
-					}
-				}
-				aNode = aNode.getParentNode();
-			}
-		}
-	}
-
-	/**
-	 * Prompt for end tags to a non-empty Node that hasn't ended Handles these
-	 * cases: <br>
-	 * <tagOpen>| <br>
-	 * <tagOpen>< |<br>
-	 * <tagOpen></ |
-	 * 
-	 * @param contentAssistRequest
-	 */
-	protected void addEndTagProposals(ContentAssistRequest contentAssistRequest) {
-		IDOMNode node = (IDOMNode) contentAssistRequest.getParent();
-
-		if (isCommentNode(node)) {
-			// loop and find non comment node parent
-			while ((node != null) && isCommentNode(node)) {
-				node = (IDOMNode) node.getParentNode();
-			}
-		}
-
-		// node is already closed
-		if (node.isClosed()) {
-			// loop and find non comment unclose node parent
-			while ((node != null) && node.isClosed()) {
-				node = (IDOMNode) node.getParentNode();
-			}
-		}
-		// there were no unclosed tags
-		if (node == null) {
-			return;
-		}
-
-		// data to create a CustomCompletionProposal
-		String replaceText = node.getNodeName() + ">"; //$NON-NLS-1$
-		int replaceBegin = contentAssistRequest.getReplacementBeginPosition();
-		int replaceLength = contentAssistRequest.getReplacementLength();
-		int cursorOffset = node.getNodeName().length() + 1;
-		String displayString = ""; //$NON-NLS-1$
-		String proposedInfo = ""; //$NON-NLS-1$
-		Image image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-
-		setErrorMessage(null);
-		boolean addProposal = false;
-
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			// ////////////////////////////////////////////////////////////////////////////////////
-			IStructuredDocument sDoc = (IStructuredDocument) fTextViewer.getDocument();
-			IStructuredDocumentRegion xmlEndTagOpen = sDoc.getRegionAtCharacterOffset(contentAssistRequest.getReplacementBeginPosition());
-			// skip backward to "<", "</", or the (unclosed) start tag, null
-			// if not found
-			String type = ""; //$NON-NLS-1$
-			while ((xmlEndTagOpen != null) && ((type = xmlEndTagOpen.getType()) != DOMRegionContext.XML_END_TAG_OPEN) && (type != DOMRegionContext.XML_TAG_CLOSE) && !needsEndTag(xmlEndTagOpen) && (type != DOMRegionContext.XML_TAG_OPEN)) {
-				xmlEndTagOpen = xmlEndTagOpen.getPrevious();
-			}
-
-			if (xmlEndTagOpen == null) {
-				return;
-			}
-
-			node = (IDOMNode) node.getModel().getIndexedRegion(xmlEndTagOpen.getStartOffset());
-			node = (IDOMNode) node.getParentNode();
-
-			if (isStartTag(xmlEndTagOpen)) {
-				// this is the case for a start tag w/out end tag
-				// eg:
-				// <p>
-				// <% String test = "test"; %>
-				// |
-				if (needsEndTag(xmlEndTagOpen)) {
-					String tagName = getTagName(xmlEndTagOpen);
-					xmlEndTagOpen.getTextEndOffset();
-					replaceLength = 0;
-					replaceText = "</" + tagName + ">"; //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
-					// replaceText = "</" + node.getNodeName() + ">";
-					// //$NON-NLS-1$ $NON-NLS-2$
-					cursorOffset = tagName.length() + 3;
-					displayString = NLS.bind(XMLUIMessages.End_with__, (new Object[]{tagName}));
-					addProposal = true;
-				}
-			}
-			else if (type == DOMRegionContext.XML_END_TAG_OPEN) {
-				// this is the case for: <tag> </ |
-				// possibly <tag> </ |<anotherTag>
-				// should only be replacing white space...
-				replaceLength = (replaceBegin > xmlEndTagOpen.getTextEndOffset()) ? replaceBegin - xmlEndTagOpen.getTextEndOffset() : 0;
-				replaceText = node.getNodeName() + ">"; //$NON-NLS-1$
-				cursorOffset = replaceText.length();
-				replaceBegin = xmlEndTagOpen.getTextEndOffset();
-				displayString = NLS.bind(XMLUIMessages.End_with_, (new Object[]{node.getNodeName()}));
-				addProposal = true;
-			}
-			else if (type == DOMRegionContext.XML_TAG_OPEN) {
-				// this is the case for: <tag> < |
-				replaceText = "/" + node.getNodeName() + ">"; //$NON-NLS-1$ //$NON-NLS-2$ $NON-NLS-2$
-				cursorOffset = replaceText.length();
-				// replaceText = "/" + node.getNodeName() + ">"; //$NON-NLS-1$
-				// $NON-NLS-2$
-				// should only be replacing white space...
-				replaceLength = (replaceBegin > xmlEndTagOpen.getTextEndOffset()) ? replaceBegin - xmlEndTagOpen.getTextEndOffset() : 0;
-				replaceBegin = xmlEndTagOpen.getTextEndOffset();
-				displayString = NLS.bind(XMLUIMessages.End_with_, (new Object[]{"/" + node.getNodeName()})); //$NON-NLS-1$
-				addProposal = true;
-			}
-		}
-		// ////////////////////////////////////////////////////////////////////////////////////
-		// sometimes the node is not null, but
-		// getNodeValue() is null, put in a null check
-		else if ((node.getNodeValue() != null) && (node.getNodeValue().indexOf("</") != -1)) { //$NON-NLS-1$
-			// the case where "</" is started, but the nodes comes in as a
-			// text node (instead of element)
-			// like this: <tag> </|
-			Node parent = node.getParentNode();
-			if ((parent != null) && (parent.getNodeType() != Node.DOCUMENT_NODE)) {
-				replaceText = parent.getNodeName() + ">"; //$NON-NLS-1$
-				cursorOffset = replaceText.length();
-				displayString = NLS.bind(XMLUIMessages.End_with__, (new Object[]{parent.getNodeName()}));
-				setErrorMessage(null);
-				addProposal = true;
-			}
-		}
-		// ////////////////////////////////////////////////////////////////////////////////////
-		else if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			setErrorMessage(UNKNOWN_CONTEXT);
-		}
-		if (addProposal == true) {
-			CustomCompletionProposal proposal = new CustomCompletionProposal(replaceText, replaceBegin, replaceLength, cursorOffset, image, displayString, null, proposedInfo, XMLRelevanceConstants.R_END_TAG);
-			contentAssistRequest.addProposal(proposal);
-		}
-	}
-
-	protected void addEntityProposals(ContentAssistRequest contentAssistRequest, int documentPosition, ITextRegion completionRegion, IDOMNode treeNode) {
-		ICompletionProposal[] eps = computeEntityReferenceProposals(documentPosition, completionRegion, treeNode);
-		for (int i = 0; (eps != null) && (i < eps.length); i++) {
-			contentAssistRequest.addProposal(eps[i]);
-		}
-	}
-
-	protected void addEntityProposals(Vector proposals, Properties map, String key, int nodeOffset, IStructuredDocumentRegion sdRegion, ITextRegion completionRegion) {
-		if (map == null) {
-			return;
-		}
-		String entityName = ""; //$NON-NLS-1$
-		String entityValue = ""; //$NON-NLS-1$
-		Image entityIcon = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ENTITY_REFERENCE);
-		String replacementText = ""; //$NON-NLS-1$
-		String displayString = ""; //$NON-NLS-1$
-		Enumeration keys = map.keys();
-
-		while ((keys != null) && keys.hasMoreElements()) {
-			entityName = (String) keys.nextElement();
-			entityValue = map.getProperty(entityName);
-			// filter based on partial entity string...
-			if (entityName.toLowerCase().startsWith(key.toLowerCase()) || key.trim().equals("")) //$NON-NLS-1$
-			{
-				// figure out selection...if text is selected, add it to
-				// selection length
-				int selectionLength = nodeOffset;
-				if (fTextViewer != null) {
-					selectionLength += fTextViewer.getSelectedRange().y;
-				}
-				// create a new proposal for entity string...
-				replacementText = "&" + entityName + ";"; //$NON-NLS-1$ //$NON-NLS-2$ 
-				displayString = "&" + entityName + "; (" + entityValue + ")"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-				ICompletionProposal cp = new CustomCompletionProposal(replacementText, sdRegion.getStartOffset(completionRegion), selectionLength, replacementText.length(), entityIcon, displayString, null, null, XMLRelevanceConstants.R_ENTITY);
-				if (cp != null) {
-					proposals.add(cp);
-				}
-			}
-		}
-	}
-
-	protected void addPCDATAProposal(String nodeName, ContentAssistRequest contentAssistRequest) {
-		CustomCompletionProposal proposal = new CustomCompletionProposal("<![CDATA[]]>", //$NON-NLS-1$
-					contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), 9, XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_CDATASECTION), "CDATA Section", //$NON-NLS-1$
-					null, null, XMLRelevanceConstants.R_CDATA);
-		contentAssistRequest.addProposal(proposal);
-
-		proposal = new CustomCompletionProposal(nodeName, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), nodeName.length(), XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TXTEXT), "#PCDATA", //$NON-NLS-1$
-					null, null, XMLRelevanceConstants.R_CDATA);
-		contentAssistRequest.addProposal(proposal);
-	}
-
-	protected void addStartDocumentProposals(ContentAssistRequest contentAssistRequest) {
-		Node aNode = contentAssistRequest.getNode();
-		boolean xmlpiFound = false;
-		Document owningDocument = aNode.getOwnerDocument();
-		// ==> // int xmlpiNodePosition = -1;
-
-		// make sure xmlpi is root element
-		// don't want doctype proposal if XMLPI isn't first element...
-		Node first = owningDocument.getFirstChild();
-		boolean xmlpiIsFirstElement = ((first != null) && (first.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE));
-		boolean insertDoctype = xmlpiIsFirstElement;
-
-		for (Node child = owningDocument.getFirstChild(); child != null; child = child.getNextSibling()) {
-			boolean xmlpi = ((child.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) && child.getNodeName().equals("xml")); //$NON-NLS-1$
-			xmlpiFound = xmlpiFound || xmlpi;
-			if (xmlpiFound) {
-				if (child instanceof IDOMNode) {
-					// ==> // int xmlpiNodePosition =
-					// ((XMLNode)child).getEndOffset();
-				}
-				// skip white space and text
-				while (((child = child.getNextSibling()) != null) && (child.getNodeType() == Node.TEXT_NODE)) {
-					// just skipping
-				}
-				// check if theres a node inbetween XMLPI and cursor position
-				if ((child != null) && (child instanceof IDOMNode)) {
-					if ((contentAssistRequest.getReplacementBeginPosition() >= ((IDOMNode) child).getEndOffset()) || !xmlpiIsFirstElement) {
-						insertDoctype = false;
-					}
-				}
-				break;
-			}
-		}
-
-		if (xmlpiFound && (owningDocument.getDoctype() == null) && isCursorAfterXMLPI(contentAssistRequest) && insertDoctype) {
-			addDocTypeProposal(contentAssistRequest);
-		}
-	}
-
-	/**
-	 * Close an unclosed start tag
-	 */
-	protected void addTagCloseProposals(ContentAssistRequest contentAssistRequest) {
-		IDOMNode node = (IDOMNode) contentAssistRequest.getParent();
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-
-			CMElementDeclaration elementDecl = getCMElementDeclaration(node);
-			String proposedInfo = (elementDecl != null) ? getAdditionalInfo(null, elementDecl) : null;
-			int contentType = (elementDecl != null) ? elementDecl.getContentType() : CMElementDeclaration.ANY;
-			// if it's XML and content doesn't HAVE to be element, add "/>"
-			// proposal.
-			boolean endWithSlashBracket = (getXML(node) && (contentType != CMElementDeclaration.ELEMENT));
-
-			Image image = CMImageUtil.getImage(elementDecl);
-			if (image == null) {
-				image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-			}
-
-			// is the start tag ended properly?
-			if ((contentAssistRequest.getDocumentRegion() == node.getFirstStructuredDocumentRegion()) && !(node.getFirstStructuredDocumentRegion()).isEnded()) {
-				setErrorMessage(null);
-				// Is this supposed to be an empty tag? Note that if we can't
-				// tell, we assume it's not.
-				if ((elementDecl != null) && (elementDecl.getContentType() == CMElementDeclaration.EMPTY)) {
-					// prompt with a self-closing end character if needed
-					CustomCompletionProposal proposal = new CustomCompletionProposal(getContentGenerator().getStartTagClose(node, elementDecl), contentAssistRequest.getReplacementBeginPosition(),
-					// this is one of the few times to ignore the length --
-								// always insert
-								// contentAssistRequest.getReplacementLength(),
-								0, getContentGenerator().getStartTagClose(node, elementDecl).length(), image, NLS.bind(XMLUIMessages.Close_with___, (new Object[]{getContentGenerator().getStartTagClose(node, elementDecl)})), null, proposedInfo, XMLRelevanceConstants.R_CLOSE_TAG);
-					contentAssistRequest.addProposal(proposal);
-				}
-				else {
-					// prompt with a close for the start tag
-					CustomCompletionProposal proposal = new CustomCompletionProposal(">", //$NON-NLS-1$
-								contentAssistRequest.getReplacementBeginPosition(),
-								// this is one of the few times to ignore the
-								// length -- always insert
-								// contentAssistRequest.getReplacementLength(),
-								0, 1, image, NLS.bind(XMLUIMessages.Close_with__, (new Object[]{" '>'"})), //$NON-NLS-1$
-								null, proposedInfo, XMLRelevanceConstants.R_CLOSE_TAG);
-					contentAssistRequest.addProposal(proposal);
-
-					// prompt with the closer for the start tag and an end tag
-					// if one is not present
-					if (node.getEndStructuredDocumentRegion() == null) {
-						// make sure tag name is actually what it thinks it
-						// is...(eg. <%@ vs. <jsp:directive)
-						IStructuredDocumentRegion sdr = contentAssistRequest.getDocumentRegion();
-						String openingTagText = (sdr != null) ? sdr.getFullText() : ""; //$NON-NLS-1$
-						if ((openingTagText != null) && (openingTagText.indexOf(node.getNodeName()) != -1)) {
-							proposal = new CustomCompletionProposal("></" + node.getNodeName() + ">", //$NON-NLS-2$//$NON-NLS-1$
-										contentAssistRequest.getReplacementBeginPosition(),
-										// this is one of the few times to
-										// ignore the length -- always insert
-										// contentAssistRequest.getReplacementLength(),
-										0, 1, image, NLS.bind(XMLUIMessages.Close_with____, (new Object[]{node.getNodeName()})), null, proposedInfo, XMLRelevanceConstants.R_CLOSE_TAG);
-							contentAssistRequest.addProposal(proposal);
-						}
-					}
-					// prompt with slash bracket "/>" incase if it's a self
-					// ending tag
-					if (endWithSlashBracket) {
-						proposal = new CustomCompletionProposal("/>", //$NON-NLS-1$
-									contentAssistRequest.getReplacementBeginPosition(),
-									// this is one of the few times to ignore
-									// the length -- always insert
-									// contentAssistRequest.getReplacementLength(),
-									0, 2, image, NLS.bind(XMLUIMessages.Close_with__, (new Object[]{" \"/>\""})), //$NON-NLS-1$
-									null, proposedInfo, XMLRelevanceConstants.R_CLOSE_TAG + 1); // +1
-						// to
-						// bring
-						// to
-						// top
-						// of
-						// list
-						contentAssistRequest.addProposal(proposal);
-					}
-				}
-			}
-			else if ((contentAssistRequest.getDocumentRegion() == node.getLastStructuredDocumentRegion()) && !node.getLastStructuredDocumentRegion().isEnded()) {
-				setErrorMessage(null);
-				// prompt with a closing end character for the end tag
-				CustomCompletionProposal proposal = new CustomCompletionProposal(">", //$NON-NLS-1$
-							contentAssistRequest.getReplacementBeginPosition(),
-							// this is one of the few times to ignore the
-							// length -- always insert
-							// contentAssistRequest.getReplacementLength(),
-							0, 1, image, NLS.bind(XMLUIMessages.Close_with__, (new Object[]{" '>'"})), //$NON-NLS-1$
-							null, proposedInfo, XMLRelevanceConstants.R_CLOSE_TAG);
-				contentAssistRequest.addProposal(proposal);
-			}
-		}
-		else if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			setErrorMessage(UNKNOWN_CONTEXT);
-		}
-	}
-
-	protected void addTagInsertionProposals(ContentAssistRequest contentAssistRequest, int childPosition) {
-		List cmnodes = null;
-		Node parent = contentAssistRequest.getParent();
-		String error = null;
-
-		// (nsd) This is only valid at the document element level
-		// only valid if it's XML (check added 2/17/2004)
-		if ((parent != null) && (parent.getNodeType() == Node.DOCUMENT_NODE) && ((IDOMDocument) parent).isXMLType() && !isCursorAfterXMLPI(contentAssistRequest)) {
-			return;
-		}
-		// only want proposals if cursor is after doctype...
-		if (!isCursorAfterDoctype(contentAssistRequest)) {
-			return;
-		}
-
-		// fix for meta-info comment nodes.. they currently "hide" other
-		// proposals because the don't
-		// have a content model (so can't propose any children..)
-		if ((parent != null) && (parent instanceof IDOMNode) && isCommentNode((IDOMNode) parent)) {
-			// loop and find non comment node?
-			while ((parent != null) && isCommentNode((IDOMNode) parent)) {
-				parent = parent.getParentNode();
-			}
-		}
-
-		if (parent.getNodeType() == Node.ELEMENT_NODE) {
-			CMElementDeclaration parentDecl = getCMElementDeclaration(parent);
-			if (parentDecl != null) {
-				// XSD-specific ability - no filtering
-				CMDataType childType = parentDecl.getDataType();
-				if (childType != null) {
-					String[] childStrings = childType.getEnumeratedValues();
-					String defaultValue = childType.getImpliedValue();
-					if (childStrings != null || defaultValue != null) {
-						// the content string is the sole valid child...so
-						// replace the rest
-						int begin = contentAssistRequest.getReplacementBeginPosition();
-						int length = contentAssistRequest.getReplacementLength();
-						if (parent instanceof IDOMNode) {
-							if (((IDOMNode) parent).getLastStructuredDocumentRegion() != ((IDOMNode) parent).getFirstStructuredDocumentRegion()) {
-								begin = ((IDOMNode) parent).getFirstStructuredDocumentRegion().getEndOffset();
-								length = ((IDOMNode) parent).getLastStructuredDocumentRegion().getStartOffset() - begin;
-							}
-						}
-						String proposedInfo = getAdditionalInfo(parentDecl, childType);
-						for (int i = 0; i < childStrings.length; i++) {
-							if(!childStrings[i].equals(defaultValue))
-							{
-								CustomCompletionProposal textProposal = new CustomCompletionProposal(childStrings[i], begin, length, childStrings[i].length(), XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ENUM), childStrings[i], null, proposedInfo, XMLRelevanceConstants.R_TAG_INSERTION);
-								contentAssistRequest.addProposal(textProposal);
-							}
-						}
-						if(defaultValue != null) {
-							CustomCompletionProposal textProposal = new CustomCompletionProposal(defaultValue, begin, length, defaultValue.length(), XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_DEFAULT), defaultValue, null, proposedInfo, XMLRelevanceConstants.R_TAG_INSERTION);
-							contentAssistRequest.addProposal(textProposal);
-						}
-					}
-				}
-			}
-			if ((parentDecl != null) && (parentDecl.getContentType() == CMElementDeclaration.PCDATA)) {
-				addPCDATAProposal(parentDecl.getNodeName(), contentAssistRequest);
-			}
-			else {
-				// retrieve the list of all possible children within this
-				// parent context
-				cmnodes = getAvailableChildElementDeclarations((Element) parent, childPosition, ModelQueryAction.INSERT);
-
-				// retrieve the list of the possible children within this
-				// parent context and at this index
-				List strictCMNodeSuggestions = null;
-				if (XMLUIPreferenceNames.SUGGESTION_STRATEGY_VALUE_STRICT.equals(XMLUIPlugin.getInstance().getPreferenceStore().getString(XMLUIPreferenceNames.SUGGESTION_STRATEGY))) {
-					strictCMNodeSuggestions = getValidChildElementDeclarations((Element) parent, childPosition, ModelQueryAction.INSERT);
-				}
-				Iterator nodeIterator = cmnodes.iterator();
-				if (!nodeIterator.hasNext()) {
-					if (getCMElementDeclaration(parent) != null) {
-						error = NLS.bind(XMLUIMessages._Has_no_available_child, (new Object[]{parent.getNodeName()}));
-					}
-					else {
-						error = NLS.bind(XMLUIMessages.Element__is_unknown, (new Object[]{parent.getNodeName()}));
-					}
-				}
-				String matchString = contentAssistRequest.getMatchString();
-				// chop off any leading <'s and whitespace from the
-				// matchstring
-				while ((matchString.length() > 0) && (Character.isWhitespace(matchString.charAt(0)) || beginsWith(matchString, "<"))) {
-					//$NON-NLS-1$
-					matchString = matchString.substring(1);
-				}
-				while (nodeIterator.hasNext()) {
-					Object o = nodeIterator.next();
-					if (o instanceof CMElementDeclaration) {
-						CMElementDeclaration elementDecl = (CMElementDeclaration) o;
-						// only add proposals for the child element's that
-						// begin with the matchstring
-						String tagname = getRequiredName(parent, elementDecl);
-						boolean isStrictCMNodeSuggestion = strictCMNodeSuggestions != null ? strictCMNodeSuggestions.contains(elementDecl) : false;
-
-						Image image = CMImageUtil.getImage(elementDecl);
-
-						if (image == null) {
-							if (strictCMNodeSuggestions != null) {
-								image = isStrictCMNodeSuggestion ? XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC_EMPHASIZED) : XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC_DEEMPHASIZED);
-							}
-							else {
-								image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-							}
-
-						}
-
-						// int markupAdjustment =
-						// getContentGenerator().getMinimalStartTagLength(parent,
-						// elementDecl);
-						if (beginsWith(tagname, matchString)) {
-							String proposedText = getRequiredText(parent, elementDecl);
-
-							// https://bugs.eclipse.org/bugs/show_bug.cgi?id=89811
-							// place cursor in first empty quotes
-							int markupAdjustment = getCursorPositionForProposedText(proposedText);
-
-							String proposedInfo = getAdditionalInfo(parentDecl, elementDecl);
-							int relevance = isStrictCMNodeSuggestion ? XMLRelevanceConstants.R_STRICTLY_VALID_TAG_INSERTION : XMLRelevanceConstants.R_TAG_INSERTION;
-							CustomCompletionProposal proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), markupAdjustment, image, tagname, null, proposedInfo, relevance);
-							contentAssistRequest.addProposal(proposal);
-						}
-					}
-				}
-				if (contentAssistRequest.getProposals().size() == 0) {
-					if (error != null) {
-						setErrorMessage(error);
-					}
-					else if ((contentAssistRequest.getMatchString() != null) && (contentAssistRequest.getMatchString().length() > 0)) {
-						setErrorMessage(NLS.bind(XMLUIMessages.No_known_child_tag, (new Object[]{parent.getNodeName(), contentAssistRequest.getMatchString()})));
-						//$NON-NLS-1$ = "No known child tag names of <{0}> begin with \"{1}\"."
-					}
-					else {
-						setErrorMessage(NLS.bind(XMLUIMessages.__Has_no_known_child, (new Object[]{parent.getNodeName()})));
-					}
-				}
-			}
-		}
-		else if (parent.getNodeType() == Node.DOCUMENT_NODE) {
-			// Can only prompt with elements if the cursor position is past
-			// the XML processing
-			// instruction and DOCTYPE declaration
-			boolean xmlpiFound = false;
-			boolean doctypeFound = false;
-			int minimumOffset = -1;
-
-			for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-
-				boolean xmlpi = ((child.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) && child.getNodeName().equals("xml")); //$NON-NLS-1$
-				boolean doctype = child.getNodeType() == Node.DOCUMENT_TYPE_NODE;
-				if (xmlpi || (doctype && (minimumOffset < 0))) {
-					minimumOffset = ((IDOMNode) child).getFirstStructuredDocumentRegion().getStartOffset() + ((IDOMNode) child).getFirstStructuredDocumentRegion().getTextLength();
-				}
-				xmlpiFound = xmlpiFound || xmlpi;
-				doctypeFound = doctypeFound || doctype;
-			}
-
-			if (contentAssistRequest.getReplacementBeginPosition() >= minimumOffset) {
-				List childDecls = getAvailableRootChildren((Document) parent, childPosition);
-				for (int i = 0; i < childDecls.size(); i++) {
-					CMElementDeclaration ed = (CMElementDeclaration) childDecls.get(i);
-					if (ed != null) {
-						Image image = CMImageUtil.getImage(ed);
-						if (image == null) {
-							image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-						}
-						String proposedText = getRequiredText(parent, ed);
-						String tagname = getRequiredName(parent, ed);
-						// account for the &lt; and &gt;
-						int markupAdjustment = getContentGenerator().getMinimalStartTagLength(parent, ed);
-						String proposedInfo = getAdditionalInfo(null, ed);
-						CustomCompletionProposal proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), markupAdjustment, image, tagname, null, proposedInfo, XMLRelevanceConstants.R_TAG_INSERTION);
-						contentAssistRequest.addProposal(proposal);
-					}
-				}
-			}
-		}
-	}
-
-	protected void addTagNameProposals(ContentAssistRequest contentAssistRequest, int childPosition) {
-		List cmnodes = null;
-		Node parent = contentAssistRequest.getParent();
-		IDOMNode node = (IDOMNode) contentAssistRequest.getNode();
-		String error = null;
-		String matchString = contentAssistRequest.getMatchString();
-		if (parent.getNodeType() == Node.ELEMENT_NODE) {
-			// retrieve the list of children
-			// validActions = getAvailableChildrenAtIndex((Element) parent,
-			// childPosition);
-			cmnodes = getAvailableChildElementDeclarations((Element) parent, childPosition, ModelQueryAction.INSERT);
-			Iterator nodeIterator = cmnodes.iterator();
-			// chop off any leading <'s and whitespace from the matchstring
-			while ((matchString.length() > 0) && (Character.isWhitespace(matchString.charAt(0)) || beginsWith(matchString, "<"))) {
-				//$NON-NLS-1$
-				matchString = matchString.substring(1);
-			}
-			if (!nodeIterator.hasNext()) {
-				error = NLS.bind(XMLUIMessages.__Has_no_known_child, (new Object[]{parent.getNodeName()}));
-			}
-			while (nodeIterator.hasNext()) {
-				CMNode elementDecl = (CMNode) nodeIterator.next();
-				if (elementDecl != null) {
-					// only add proposals for the child element's that begin
-					// with the matchstring
-					String proposedText = null;
-					int cursorAdjustment = 0;
-
-					// do a check to see if partial attributes of partial tag
-					// names are in list
-					if (((node != null) && (node.getAttributes() != null) && (node.getAttributes().getLength() > 0) && attributeInList(node, parent, elementDecl)) || ((node.getNodeType() != Node.TEXT_NODE) && node.getFirstStructuredDocumentRegion().isEnded())) {
-
-						proposedText = getRequiredName(parent, elementDecl);
-						cursorAdjustment = proposedText.length();
-					}
-					else {
-						proposedText = getRequiredName(parent, elementDecl);
-						cursorAdjustment = proposedText.length();
-						if (elementDecl instanceof CMElementDeclaration) {
-							CMElementDeclaration ed = (CMElementDeclaration) elementDecl;
-							// https://bugs.eclipse.org/bugs/show_bug.cgi?id=89811
-							StringBuffer sb = new StringBuffer();
-							getContentGenerator().generateTag(parent, ed, sb);
-							// since it's a name proposal, assume '<' is
-							// already there
-							// only return the rest of the tag
-							proposedText = sb.toString().substring(1);
-							cursorAdjustment = getCursorPositionForProposedText(proposedText);
-
-							// cursorAdjustment = proposedText.length() +
-							// 1;
-							// proposedText += "></" +
-							// getRequiredName(parent, elementDecl) + ">";
-							// //$NON-NLS-2$//$NON-NLS-1$
-						}
-					}
-					if (beginsWith(proposedText, matchString)) {
-						Image image = CMImageUtil.getImage(elementDecl);
-						if (image == null) {
-							image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-						}
-						String proposedInfo = getAdditionalInfo(getCMElementDeclaration(parent), elementDecl);
-						CustomCompletionProposal proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), cursorAdjustment, image, getRequiredName(parent, elementDecl), null, proposedInfo, XMLRelevanceConstants.R_TAG_NAME);
-						contentAssistRequest.addProposal(proposal);
-					}
-				}
-			}
-			if (contentAssistRequest.getProposals().size() == 0) {
-				if (error != null) {
-					setErrorMessage(error);
-				}
-				else if ((contentAssistRequest.getMatchString() != null) && (contentAssistRequest.getMatchString().length() > 0)) {
-					setErrorMessage(NLS.bind(XMLUIMessages.No_known_child_tag_names, (new Object[]{parent.getNodeName(), contentAssistRequest.getMatchString()})));
-					//$NON-NLS-1$ = "No known child tag names of <{0}> begin with \"{1}\""
-				}
-				else {
-					setErrorMessage(NLS.bind(XMLUIMessages.__Has_no_known_child, (new Object[]{parent.getNodeName()})));
-				}
-			}
-		}
-		else if (parent.getNodeType() == Node.DOCUMENT_NODE) {
-			List childElements = getAvailableRootChildren((Document) parent, childPosition);
-			for (int i = 0; i < childElements.size(); i++) {
-				CMNode ed = (CMNode) childElements.get(i);
-				if (ed == null) {
-					continue;
-				}
-				String proposedText = null;
-				int cursorAdjustment = 0;
-				if (ed instanceof CMElementDeclaration) {
-					// proposedText = getRequiredName(parent, ed);
-					StringBuffer sb = new StringBuffer();
-					getContentGenerator().generateTag(parent, (CMElementDeclaration) ed, sb);
-					// tag starts w/ '<', but we want to compare to name
-					proposedText = sb.toString().substring(1);
-
-					if (!beginsWith(proposedText, matchString)) {
-						continue;
-					}
-
-					cursorAdjustment = getCursorPositionForProposedText(proposedText);
-
-					String proposedInfo = getAdditionalInfo(null, ed);
-					Image image = CMImageUtil.getImage(ed);
-					if (image == null) {
-						image = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC);
-					}
-					CustomCompletionProposal proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), cursorAdjustment, image, getRequiredName(parent, ed), null, proposedInfo, XMLRelevanceConstants.R_TAG_NAME);
-					contentAssistRequest.addProposal(proposal);
-				}
-			}
-		}
-	}
-
-	/**
-	 * this is the position the cursor should be in after the proposal is
-	 * applied
-	 * 
-	 * @param proposedText
-	 * @return the position the cursor should be in after the proposal is
-	 *         applied
-	 */
-	private int getCursorPositionForProposedText(String proposedText) {
-		int cursorAdjustment;
-		cursorAdjustment = proposedText.indexOf("\"\"") + 1; //$NON-NLS-1$
-		// otherwise, after the first tag
-		if (cursorAdjustment == 0) {
-			cursorAdjustment = proposedText.indexOf('>') + 1;
-		}
-		if (cursorAdjustment == 0) {
-			cursorAdjustment = proposedText.length() + 1;
-		}
-
-		return cursorAdjustment;
-	}
-
-	/**
-	 * @deprecated XML proposal is added via xml declaration template instead
-	 */
-	protected void addXMLProposal(ContentAssistRequest contentAssistRequest) {
-		String proposedText = "<?xml version=\"1.0\" encoding=\"" + ContentTypeEncodingPreferences.getUserPreferredCharsetName(ContentTypeIdForXML.ContentTypeID_XML) + "\"?>"; //$NON-NLS-2$//$NON-NLS-1$
-		ICompletionProposal proposal = new CustomCompletionProposal(proposedText, contentAssistRequest.getReplacementBeginPosition(), contentAssistRequest.getReplacementLength(), proposedText.length(), XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_PROCESSINGINSTRUCTION), proposedText, null, null, XMLRelevanceConstants.R_XML_DECLARATION);
-		// TODO add special XML proposal info
-		contentAssistRequest.addProposal(proposal);
-	}
-
-	/**
-	 * This method determines if any of the attributes in the proposed XMLNode
-	 * node, are possible values of attributes from possible Elements at this
-	 * point in the document according to the Content Model.
-	 * 
-	 * @param node
-	 *            the element with attributes that you would like to test if
-	 *            are possible for possible Elements at this point
-	 * @param cmnode
-	 *            possible element at this point in the document (depending on
-	 *            what 'node' is) true if any attributes of 'node' match any
-	 *            possible attributes from 'cmnodes' list.
-	 */
-	protected boolean attributeInList(IDOMNode node, Node parent, CMNode cmnode) {
-		if ((node == null) || (parent == null) || (cmnode == null)) {
-			return false;
-		}
-		String elementMatchString = node.getNodeName();
-		String cmnodeName = getRequiredName(parent, cmnode);// cmnode.getNodeName();
-		if (node instanceof Element) {
-			NamedNodeMap map = ((Element) node).getAttributes();
-			String attrMatchString = ""; //$NON-NLS-1$
-			CMNamedNodeMap cmattrMap = null;
-			// iterate attribute possibilities for partially started node
-			for (int i = 0; (map != null) && (i < map.getLength()); i++) {
-				attrMatchString = map.item(i).getNodeName();
-				// filter on whatever user typed for element name already
-				if (beginsWith(cmnodeName, elementMatchString)) {
-					if (cmnode.getNodeType() == CMNode.ELEMENT_DECLARATION) {
-						cmattrMap = ((CMElementDeclaration) cmnode).getAttributes();
-
-						CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(cmattrMap);
-						List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent((Element) node, (CMElementDeclaration) cmnode, ModelQuery.INCLUDE_ATTRIBUTES);
-						for (int k = 0; k < nodes.size(); k++) {
-							CMNode adnode = (CMNode) nodes.get(k);
-							if (adnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-								allAttributes.put(adnode);
-							}
-						}
-						cmattrMap = allAttributes;
-						
-						// iterate possible attributes from a cmnode in
-						// proposal list
-						for (int k = 0; (cmattrMap != null) && (k < cmattrMap.getLength()); k++) {
-							// check if name matches
-							if (cmattrMap.item(k).getNodeName().equals(attrMatchString)) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		}
-		return false;
-	}
-
-	protected boolean beginsWith(String aString, String prefix) {
-		if ((aString == null) || (prefix == null)) {
-			return true;
-		}
-		// (pa) matching independent of case to be consistant with Java
-		// editor CA
-		return aString.toLowerCase().startsWith(prefix.toLowerCase());
-	}
-
-	protected ContentAssistRequest computeAttributeProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-		if (documentPosition < sdRegion.getStartOffset(completionRegion)) {
-			// setup to insert new attributes
-			contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, documentPosition, 0, matchString);
-		}
-		else {
-			// Setup to replace an existing attribute name
-			contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString);
-		}
-		addAttributeNameProposals(contentAssistRequest);
-		contentAssistRequest.setReplacementBeginPosition(documentPosition);
-		contentAssistRequest.setReplacementLength(0);
-		if ((node.getFirstStructuredDocumentRegion() != null) && (!node.getFirstStructuredDocumentRegion().isEnded())) {
-			addTagCloseProposals(contentAssistRequest);
-		}
-		return contentAssistRequest;
-	}
-
-	protected ContentAssistRequest computeAttributeValueProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-		if ((documentPosition > sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength()) && (sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength() != sdRegion.getStartOffset(completionRegion) + completionRegion.getLength())) {
-			// setup to add a new attribute at the documentPosition
-			IDOMNode actualNode = (IDOMNode) node.getModel().getIndexedRegion(sdRegion.getStartOffset(completionRegion));
-			contentAssistRequest = newContentAssistRequest(actualNode, actualNode, sdRegion, completionRegion, documentPosition, 0, matchString);
-			addAttributeNameProposals(contentAssistRequest);
-			if ((actualNode.getFirstStructuredDocumentRegion() != null) && !actualNode.getFirstStructuredDocumentRegion().isEnded()) {
-				addTagCloseProposals(contentAssistRequest);
-			}
-		}
-		else {
-			// setup to replace the existing value
-			if (!nodeAtOffset.getFirstStructuredDocumentRegion().isEnded() && (documentPosition < sdRegion.getStartOffset(completionRegion))) {
-				// if the IStructuredDocumentRegion isn't closed and the
-				// cursor is in front of the value, add
-				contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, documentPosition, 0, matchString);
-				addAttributeNameProposals(contentAssistRequest);
-			}
-			else {
-				contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString);
-				addAttributeValueProposals(contentAssistRequest);
-			}
-		}
-		return contentAssistRequest;
-	}
-
-	protected ContentAssistRequest computeCompletionProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode) {
-		ContentAssistRequest contentAssistRequest = null;
-		String regionType = completionRegion.getType();
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-
-		// Handle the most common and best supported cases
-		if ((xmlnode.getNodeType() == Node.ELEMENT_NODE) || (xmlnode.getNodeType() == Node.DOCUMENT_NODE)) {
-			if (regionType == DOMRegionContext.XML_TAG_OPEN) {
-				contentAssistRequest = computeTagOpenProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_NAME) {
-				contentAssistRequest = computeTagNameProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				contentAssistRequest = computeAttributeProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-				contentAssistRequest = computeEqualsProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-			else if ((regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) && (documentPosition == sdRegion.getTextEndOffset()) && (sdRegion.getText(completionRegion).endsWith("\"") || sdRegion.getText(completionRegion).endsWith("\'"))) //$NON-NLS-1$ //$NON-NLS-2$
-			{
-				// this is for when the cursor is at the end of the closing
-				// quote for an attribute..
-				IDOMNode actualNode = (IDOMNode) xmlnode.getModel().getIndexedRegion(sdRegion.getStartOffset(completionRegion));
-				contentAssistRequest = newContentAssistRequest(actualNode, actualNode, sdRegion, completionRegion, documentPosition, 0, matchString);
-				addTagCloseProposals(contentAssistRequest);
-			}
-			else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				contentAssistRequest = computeAttributeValueProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-			else if ((regionType == DOMRegionContext.XML_TAG_CLOSE) || (regionType == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_CLOSE))) {
-				contentAssistRequest = computeTagCloseProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-			else if (regionType == DOMRegionContext.XML_END_TAG_OPEN) {
-				contentAssistRequest = computeEndTagOpenProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-			else if ((regionType == DOMRegionContext.XML_CONTENT) || (regionType == DOMRegionContext.XML_CHAR_REFERENCE) || (regionType == DOMRegionContext.XML_ENTITY_REFERENCE) || (regionType == DOMRegionContext.XML_PE_REFERENCE)) {
-				contentAssistRequest = computeContentProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-			}
-
-			// These ITextRegion types begin DOM Elements as well and although
-			// internally harder to assist,
-			// text insertions directly before them can be made
-			else if ((documentPosition == sdRegion.getStartOffset(completionRegion)) && (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DECLARATION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_EXPRESSION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_SCRIPTLET_OPEN) || (regionType == DOMRegionContext.XML_DECLARATION_OPEN) || (regionType == DOMRegionContext.XML_PI_OPEN) || (regionType == DOMRegionContext.XML_COMMENT_OPEN) || (regionType == DOMRegionContext.XML_CDATA_OPEN))) {
-				contentAssistRequest = newContentAssistRequest(treeNode, xmlnode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-				addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(treeNode));
-				addStartDocumentProposals(contentAssistRequest);
-			}
-		}
-		// Not a Document or Element? (odd cases go here for now)
-		else if (isCloseRegion(completionRegion)) {
-			contentAssistRequest = newContentAssistRequest(treeNode, xmlnode.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion) + completionRegion.getLength(), 0, matchString);
-			addStartDocumentProposals(contentAssistRequest);
-			if (documentPosition >= sdRegion.getTextEndOffset(completionRegion)) {
-				addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(treeNode) + 1);
-			}
-		}
-		else if ((documentPosition == sdRegion.getStartOffset(completionRegion)) && (regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DECLARATION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_EXPRESSION_OPEN) || regionType.equals(DOMJSPRegionContextsPrivateCopy.JSP_SCRIPTLET_OPEN) || (regionType == DOMRegionContext.XML_DECLARATION_OPEN) || (regionType == DOMRegionContext.XML_PI_OPEN) || (regionType == DOMRegionContext.XML_COMMENT_OPEN) || (regionType == DOMRegionContext.XML_CDATA_OPEN))) {
-			contentAssistRequest = newContentAssistRequest(treeNode, xmlnode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-			addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(treeNode));
-			addStartDocumentProposals(contentAssistRequest);
-		}
-		return contentAssistRequest;
-	}
-
-	/**
-	 * CONTENT ASSIST STARTS HERE
-	 * 
-	 * Return a list of proposed code completions based on the specified
-	 * location within the document that corresponds to the current cursor
-	 * position within the text-editor control.
-	 * 
-	 * @param textViewer
-	 * @param documentPosition -
-	 *            the cursor location within the document
-	 * 
-	 * an array of ICompletionProposals
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer textViewer, int documentPosition) {
-
-		setErrorMessage(null);
-
-		fTextViewer = textViewer;
-
-		IndexedRegion treeNode = ContentAssistUtils.getNodeAt(textViewer, documentPosition);
-
-		Node node = (Node) treeNode;
-		while ((node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getParentNode() != null)) {
-			node = node.getParentNode();
-		}
-		IDOMNode xmlnode = (IDOMNode) node;
-
-		ContentAssistRequest contentAssistRequest = null;
-
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-		ITextRegion completionRegion = getCompletionRegion(documentPosition, node);
-
-		String matchString = getMatchString(sdRegion, completionRegion, documentPosition);
-
-		// Handle empty Documents
-		if (completionRegion == null) {
-			if (((treeNode == null) || (((Node) treeNode).getNodeType() == Node.DOCUMENT_NODE)) && (completionRegion == null) && ((xmlnode == null) || (xmlnode.getChildNodes() == null) || (xmlnode.getChildNodes().getLength() == 0))) {
-				IStructuredModel sModel = StructuredModelManager.getModelManager().getExistingModelForRead(textViewer.getDocument());
-				try {
-					if (sModel != null) {
-						IDOMDocument docNode = ((IDOMModel) sModel).getDocument();
-						contentAssistRequest = newContentAssistRequest(docNode, docNode, sdRegion, completionRegion, documentPosition, 0, null);
-						addEmptyDocumentProposals(contentAssistRequest);
-					}
-				}
-				finally {
-					if (sModel != null) {
-						sModel.releaseFromRead();
-					}
-				}
-				if (contentAssistRequest == null) {
-					Logger.logException(new IllegalStateException("problem getting model")); //$NON-NLS-1$
-					return new ICompletionProposal[0];
-				}
-				return contentAssistRequest.getCompletionProposals();
-			}
-			// MASSIVE ERROR CONDITION
-			Logger.logException(new IllegalStateException("completion region was null")); //$NON-NLS-1$
-			setErrorMessage(INTERNALERROR);
-			contentAssistRequest = newContentAssistRequest((Node) treeNode, node.getParentNode(), sdRegion, completionRegion, documentPosition, 0, ""); //$NON-NLS-1$
-			return contentAssistRequest.getCompletionProposals();
-		}
-
-
-		// catch documents where no region can be determined
-		if ((xmlnode.getNodeType() == Node.DOCUMENT_NODE) && ((completionRegion == null) || (xmlnode.getChildNodes() == null) || (xmlnode.getChildNodes().getLength() == 0))) {
-			contentAssistRequest = computeStartDocumentProposals(documentPosition, matchString, completionRegion, (IDOMNode) treeNode, xmlnode);
-			return contentAssistRequest.getCompletionProposals();
-		}
-
-		// compute normal proposals
-		contentAssistRequest = computeCompletionProposals(documentPosition, matchString, completionRegion, (IDOMNode) treeNode, xmlnode);
-		if (contentAssistRequest == null) {
-			contentAssistRequest = newContentAssistRequest((Node) treeNode, node.getParentNode(), sdRegion, completionRegion, documentPosition, 0, ""); //$NON-NLS-1$
-			if (Debug.displayWarnings) {
-				System.out.println(UNKNOWN_CONTEXT + " " + completionRegion.getType() + "@" + documentPosition); //$NON-NLS-2$//$NON-NLS-1$
-			}
-			setErrorMessage(UNKNOWN_CONTEXT);
-		}
-
-		/* 
-		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=123892
-		 * Only set this error message if nothing else was already set 
-		 **/
-		if (contentAssistRequest.getProposals().size() == 0 && getErrorMessage() == null) {
-			setErrorMessage(UNKNOWN_CONTEXT);
-		}
-
-		return contentAssistRequest.getCompletionProposals();
-	}
-
-	protected ContentAssistRequest computeContentProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-
-		// setup to add children at the content node's position
-		contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, getStructuredDocumentRegion(documentPosition), completionRegion, documentPosition, 0, matchString);
-		if ((node != null) && (node.getNodeType() == Node.DOCUMENT_NODE) && (((Document) node).getDoctype() == null)) {
-			addStartDocumentProposals(contentAssistRequest);
-		}
-		addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(nodeAtOffset));
-		if (node.getNodeType() != Node.DOCUMENT_NODE) {
-			addEndTagProposals(contentAssistRequest);
-		}
-		// entities?
-		addEntityProposals(contentAssistRequest, documentPosition, completionRegion, node);
-		// addEntityProposals(contentAssistRequest);
-		return contentAssistRequest;
-	}
-
-	/**
-	 * Returns information about possible contexts based on the specified
-	 * location within the document that corresponds to the current cursor
-	 * position within the text viewer.
-	 * 
-	 * @param viewer
-	 *            the viewer whose document is used to compute the possible
-	 *            contexts an array of context information objects or
-	 *            <code>null</code> if no context could be found
-	 */
-	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
-		if (fAttributeInfoProvider == null) {
-			fAttributeInfoProvider = new AttributeContextInformationProvider((IStructuredDocument) viewer.getDocument(), (AttributeContextInformationPresenter) getContextInformationValidator());
-		}
-		return fAttributeInfoProvider.getAttributeInformation(documentOffset);
-	}
-
-	protected ContentAssistRequest computeEndTagOpenProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-		int completionRegionStart = sdRegion.getStartOffset(completionRegion);
-		int completionRegionLength = completionRegion.getLength();
-		IStructuredDocumentRegion sdRegionAtCompletionOffset = node.getStructuredDocument().getRegionAtCharacterOffset(completionRegionStart + completionRegionLength);
-		ITextRegion regionAtEndOfCompletion = sdRegionAtCompletionOffset.getRegionAtCharacterOffset(completionRegionStart + completionRegionLength);
-
-		if ((documentPosition != completionRegionStart) && (regionAtEndOfCompletion != null) && (regionAtEndOfCompletion.getType() == DOMRegionContext.XML_TAG_NAME)) {
-			ITextRegion nameRegion = regionAtEndOfCompletion;
-			contentAssistRequest = newContentAssistRequest(nodeAtOffset, nodeAtOffset.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(nameRegion), nameRegion.getTextLength(), matchString);
-		}
-		else {
-			if (nodeAtOffset.getFirstStructuredDocumentRegion() == sdRegion) {
-				// abnormal case, this unmatched end tag will be a sibling
-				contentAssistRequest = newContentAssistRequest(nodeAtOffset, nodeAtOffset.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-			}
-			else {
-				// normal case, this end tag is the parent
-				contentAssistRequest = newContentAssistRequest(nodeAtOffset, nodeAtOffset, sdRegion, completionRegion, documentPosition, 0, matchString);
-			}
-		}
-		// if (documentPosition >= sdRegion.getStartOffset(completionRegion) +
-		// completionRegion.getTextLength())
-		addEndTagProposals(contentAssistRequest);
-		// else
-		if (completionRegionStart == documentPosition) {
-			// positioned at start of end tag
-			addTagInsertionProposals(contentAssistRequest, node.getChildNodes().getLength());
-		}
-		return contentAssistRequest;
-	}
-
-	/**
-	 * return all possible EntityReferenceProposals (according to current
-	 * position in doc)
-	 */
-	protected ICompletionProposal[] computeEntityReferenceProposals(int documentPosition, ITextRegion completionRegion, IDOMNode treeNode) {
-		// only handle XML content for now
-		Vector proposals = new Vector(); // ICompletionProposals
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-		if ((completionRegion != null) && (completionRegion.getType() == DOMRegionContext.XML_CONTENT)) {
-			int nodeOffset = documentPosition - sdRegion.getStartOffset(completionRegion);
-			String regionText = sdRegion.getFullText(completionRegion);
-
-			// if directly to the right of a &, region will be null, need to
-			// move to
-			// the previous region...there might be a better way to do this
-			if ((regionText != null) && regionText.trim().equals("") && (documentPosition > 0)) { //$NON-NLS-1$
-				IStructuredDocumentRegion prev = treeNode.getStructuredDocument().getRegionAtCharacterOffset(documentPosition - 1);
-				if ((prev != null) && prev.getText().equals("&")) { //$NON-NLS-1$
-					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=206680
-					// examine previous region
-					sdRegion = prev;
-					completionRegion = prev.getLastRegion();
-					regionText = prev.getFullText();
-					nodeOffset = 1;
-				}
-			}
-
-			// string must start w/ &
-			if ((regionText != null) && regionText.startsWith("&")) { //$NON-NLS-1$						 		
-				String key = (nodeOffset > 0) ? regionText.substring(1, nodeOffset) : ""; //$NON-NLS-1$
-
-				// get entity proposals, passing in the appropriate start
-				// string
-				ModelQuery mq = ModelQueryUtil.getModelQuery(((Node) treeNode).getOwnerDocument());
-				if (mq != null) {
-					CMDocument xmlDoc = mq.getCorrespondingCMDocument(treeNode);
-					CMNamedNodeMap cmmap = null;
-					Properties entities = null;
-					if (xmlDoc != null) {
-						cmmap = xmlDoc.getEntities();
-					}
-					if (cmmap != null) {
-						entities = mapToProperties(cmmap);
-					}
-					else // 224787 in absence of content model, just use
-					// minimal 5 entities
-					{
-						entities = new Properties();
-						entities.put("quot", "\""); //$NON-NLS-1$ //$NON-NLS-2$
-						entities.put("apos", "'"); //$NON-NLS-1$ //$NON-NLS-2$
-						entities.put("amp", "&"); //$NON-NLS-1$ //$NON-NLS-2$
-						entities.put("lt", "<"); //$NON-NLS-1$ //$NON-NLS-2$
-						entities.put("gt", ">"); //$NON-NLS-1$ //$NON-NLS-2$	
-						entities.put("nbsp", " "); //$NON-NLS-1$ //$NON-NLS-2$									
-					}
-					addEntityProposals(proposals, entities, key, nodeOffset, sdRegion, completionRegion);
-				}
-			}
-		}
-		return (ICompletionProposal[]) ((proposals.size() > 0) ? proposals.toArray(new ICompletionProposal[proposals.size()]) : null);
-	}
-
-	protected ContentAssistRequest computeEqualsProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-		ITextRegion valueRegion = node.getStartStructuredDocumentRegion().getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) + completionRegion.getLength());
-		if ((valueRegion != null) && (valueRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) && (sdRegion.getStartOffset(valueRegion) <= documentPosition)) {
-			// replace the adjacent attribute value
-			contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, valueRegion, sdRegion.getStartOffset(valueRegion), valueRegion.getTextLength(), matchString);
-		}
-		else {
-			// append an attribute value after the '='
-			contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, documentPosition, 0, matchString);
-		}
-		addAttributeValueProposals(contentAssistRequest);
-		return contentAssistRequest;
-	}
-
-	protected ContentAssistRequest computeStartDocumentProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		// setup for a non-empty document, but one that hasn't been formally
-		// started
-		ContentAssistRequest contentAssistRequest = null;
-		contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, getStructuredDocumentRegion(documentPosition), completionRegion, documentPosition, 0, matchString);
-		addStartDocumentProposals(contentAssistRequest);
-		return contentAssistRequest;
-	}
-
-	protected ContentAssistRequest computeTagCloseProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-
-		if ((node.getNodeType() == Node.DOCUMENT_NODE) || (documentPosition >= sdRegion.getEndOffset())) {
-			// this is a content request as the documentPosition is AFTER the
-			// end of the closing region
-			if ((node == nodeAtOffset) && (node.getParentNode() != null)) {
-				node = (IDOMNode) node.getParentNode();
-			}
-			contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, documentPosition, 0, matchString);
-			addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(nodeAtOffset));
-			if ((node.getNodeType() != Node.DOCUMENT_NODE) && (node.getEndStructuredDocumentRegion() == null)) {
-				addEndTagProposals(contentAssistRequest);
-			}
-		}
-		else {
-			// at the start of the tag's close or within it
-			ITextRegion closeRegion = sdRegion.getLastRegion();
-			boolean insideTag = !sdRegion.isEnded() || (documentPosition <= sdRegion.getStartOffset(closeRegion));
-			if (insideTag) {
-				// this is a request for completions within a tag
-				contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, documentPosition, 0, matchString);
-				if ((node.getNodeType() != Node.DOCUMENT_NODE) && (node.getEndStructuredDocumentRegion() != null)) {
-					addTagCloseProposals(contentAssistRequest);
-				}
-				if (sdRegion == nodeAtOffset.getFirstStructuredDocumentRegion()) {
-					contentAssistRequest.setReplacementBeginPosition(documentPosition);
-					contentAssistRequest.setReplacementLength(0);
-					addAttributeNameProposals(contentAssistRequest);
-				}
-			}
-		}
-		return contentAssistRequest;
-	}
-
-	protected ContentAssistRequest computeTagNameProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-
-		if (sdRegion != nodeAtOffset.getFirstStructuredDocumentRegion()) {
-			// completing the *first* tag in "<tagname1 |<tagname2"
-			IDOMNode actualNode = (IDOMNode) node.getModel().getIndexedRegion(sdRegion.getStartOffset(completionRegion));
-			if (actualNode != null) {
-				if (actualNode.getFirstStructuredDocumentRegion() == sdRegion) {
-					// start tag
-					if (documentPosition > sdRegion.getStartOffset(completionRegion) + completionRegion.getLength()) {
-						// it's attributes
-						contentAssistRequest = newContentAssistRequest(actualNode, actualNode, sdRegion, completionRegion, documentPosition - matchString.length(), matchString.length(), matchString);
-						if (node.getStructuredDocument().getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getRegionAtCharacterOffset(sdRegion.getStartOffset(completionRegion) - 1).getType() == DOMRegionContext.XML_TAG_OPEN) {
-							addAttributeNameProposals(contentAssistRequest);
-						}
-						addTagCloseProposals(contentAssistRequest);
-					}
-					else {
-						// it's name
-						contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, documentPosition - matchString.length(), matchString.length(), matchString);
-						addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(actualNode));
-					}
-				}
-				else {
-					if (documentPosition >= sdRegion.getStartOffset(completionRegion) + completionRegion.getLength()) {
-						// insert name
-						contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-					}
-					else {
-						// replace name
-						contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString);
-					}
-					addEndTagNameProposals(contentAssistRequest);
-				}
-			}
-		}
-		else {
-			if (documentPosition > sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength()) {
-				// unclosed tag with only a name; should prompt for attributes
-				// and a close instead
-				contentAssistRequest = newContentAssistRequest(nodeAtOffset, node, sdRegion, completionRegion, documentPosition - matchString.length(), matchString.length(), matchString);
-				addAttributeNameProposals(contentAssistRequest);
-				addTagCloseProposals(contentAssistRequest);
-			}
-			else {
-				if (sdRegion.getRegions().get(0).getType() != DOMRegionContext.XML_END_TAG_OPEN) {
-					int replaceLength = documentPosition - sdRegion.getStartOffset(completionRegion);
-					contentAssistRequest = newContentAssistRequest(node, node.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), replaceLength, matchString);
-					addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(nodeAtOffset));
-				}
-				else {
-					IDOMNode actualNode = (IDOMNode) node.getModel().getIndexedRegion(documentPosition);
-					if (actualNode != null) {
-						if (documentPosition >= sdRegion.getStartOffset(completionRegion) + completionRegion.getTextLength()) {
-							contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-						}
-						else {
-							contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString);
-						}
-						addEndTagNameProposals(contentAssistRequest);
-					}
-				}
-			}
-		}
-		return contentAssistRequest;
-	}
-
-	protected ContentAssistRequest computeTagOpenProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode nodeAtOffset, IDOMNode node) {
-		ContentAssistRequest contentAssistRequest = null;
-		IStructuredDocumentRegion sdRegion = getStructuredDocumentRegion(documentPosition);
-		if (sdRegion != nodeAtOffset.getFirstStructuredDocumentRegion() || sdRegion.getPrevious() != null && sdRegion.getPrevious().getLastRegion().getType() == DOMRegionContext.XML_TAG_OPEN) {
-			// completing the *first* XML_TAG_OPEN in "<<tagname"
-			IDOMNode actualNode = (IDOMNode) node.getModel().getIndexedRegion(sdRegion.getStartOffset(completionRegion));
-			if (actualNode != null) {
-				if(sdRegion.getFirstRegion().getType() == DOMRegionContext.XML_END_TAG_OPEN) {
-					contentAssistRequest = newContentAssistRequest(actualNode, actualNode, sdRegion, completionRegion, documentPosition, 0, matchString);
-					if(actualNode.hasChildNodes())
-						addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(actualNode.getLastChild()));
-					else
-						addTagNameProposals(contentAssistRequest, 0);
-				}
-				else {
-					contentAssistRequest = newContentAssistRequest(actualNode, actualNode.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-					addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(actualNode));
-				}
-				addEndTagProposals(contentAssistRequest); // (pa) 220850
-			}
-		}
-		else {
-			if (documentPosition == sdRegion.getStartOffset(completionRegion)) {
-				if (node.getNodeType() == Node.ELEMENT_NODE) {
-					// at the start of an existing tag, right before the '<'
-					contentAssistRequest = newContentAssistRequest(nodeAtOffset, node.getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-					addTagInsertionProposals(contentAssistRequest, getElementPositionForModelQuery(nodeAtOffset));
-					addEndTagProposals(contentAssistRequest);
-				}
-				else if (node.getNodeType() == Node.DOCUMENT_NODE) {
-					// at the opening of the VERY first tag with a '<'
-					contentAssistRequest = newContentAssistRequest(nodeAtOffset, node.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(completionRegion), completionRegion.getTextLength(), matchString);
-					addStartDocumentProposals(contentAssistRequest);
-				}
-			}
-			else {
-				// within the white space
-				ITextRegion name = getNameRegion(node.getStartStructuredDocumentRegion());
-				// (pa) ITextRegion refactor
-				// if (name != null && name.containsOffset(documentPosition))
-				// {
-				if ((name != null) && ((sdRegion.getStartOffset(name) <= documentPosition) && (sdRegion.getEndOffset(name) >= documentPosition)) && (sdRegion.getLastRegion().getType() == DOMRegionContext.XML_TAG_CLOSE || sdRegion.getLastRegion().getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE)){ 
-					// replace the existing name
-					contentAssistRequest = newContentAssistRequest(node, node.getParentNode(), sdRegion, completionRegion, sdRegion.getStartOffset(name), name.getTextLength(), matchString);
-				}
-				else {
-					// insert a valid new name, or possibly an end tag
-					contentAssistRequest = newContentAssistRequest(nodeAtOffset, ((Node) nodeAtOffset).getParentNode(), sdRegion, completionRegion, documentPosition, 0, matchString);
-					addEndTagProposals(contentAssistRequest);
-					contentAssistRequest.setReplacementBeginPosition(documentPosition);
-					contentAssistRequest.setReplacementLength(0);
-				}
-				addTagNameProposals(contentAssistRequest, getElementPositionForModelQuery(nodeAtOffset));
-			}
-		}
-		return contentAssistRequest;
-	}
-
-	/**
-	 * Retreives cmnode's documentation to display in the completion
-	 * proposal's additional info. If no documentation exists for cmnode, try
-	 * displaying parentOrOwner's documentation
-	 * 
-	 * String any documentation information to display for cmnode.
-	 * <code>null</code> if there is nothing to display.
-	 */
-	protected String getAdditionalInfo(CMNode parentOrOwner, CMNode cmnode) {
-		String addlInfo = null;
-
-		if (cmnode == null) {
-			if (Debug.displayWarnings) {
-				new IllegalArgumentException("Null declaration!").printStackTrace(); //$NON-NLS-1$
-			}
-			return null;
-		}
-
-		addlInfo = getInfoProvider().getInfo(cmnode);
-		if ((addlInfo == null) && (parentOrOwner != null)) {
-			addlInfo = getInfoProvider().getInfo(parentOrOwner);
-		}
-		return addlInfo;
-	}
-
-	// returns a list of ModelQueryActions
-	protected List getAvailableChildrenAtIndex(Element parent, int index, int validityChecking) {
-		List list = new ArrayList();
-		CMElementDeclaration parentDecl = getCMElementDeclaration(parent);
-		if (parentDecl != null) {
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(parent.getOwnerDocument());
-			// taken from ActionManagers
-			// int editMode = modelQuery.getEditMode();
-			int editMode = ModelQuery.EDIT_MODE_UNCONSTRAINED;
-			int ic = (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) ? ModelQuery.INCLUDE_CHILD_NODES | ModelQuery.INCLUDE_SEQUENCE_GROUPS : ModelQuery.INCLUDE_CHILD_NODES;
-			modelQuery.getInsertActions(parent, parentDecl, index, ic, validityChecking, list);
-		}
-		return list;
-	}
-
-	// returns a list of CMElementDeclarations
-	protected List getAvailableRootChildren(Document document, int childIndex) {
-		List list = null;
-
-		// extract the valid 'root' node name from the DocumentType Node
-		DocumentType docType = document.getDoctype();
-		String rootName = null;
-		if (docType != null) {
-			rootName = docType.getNodeName();
-		}
-		if (rootName == null) {
-			return new ArrayList(0);
-		}
-
-		for (Node child = document.getFirstChild(); child != null; child = child.getNextSibling()) {
-			// make sure the "root" Element isn't already present
-			// is it required to be an Element?
-			if ((child.getNodeType() == Node.ELEMENT_NODE) && stringsEqual(child.getNodeName(), rootName)) {
-				// if the node is missing either the start or end tag, don't
-				// count it as present
-				if ((child instanceof IDOMNode) && ((((IDOMNode) child).getStartStructuredDocumentRegion() == null) || (((IDOMNode) child).getEndStructuredDocumentRegion() == null))) {
-					continue;
-				}
-				if (Debug.displayInfo) {
-					System.out.println(rootName + " already present!"); //$NON-NLS-1$
-				}
-				setErrorMessage(NLS.bind(XMLUIMessages.The_document_element__, (new Object[]{rootName})));
-				return new ArrayList(0);
-			}
-		}
-
-		list = new ArrayList(1);
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(document);
-		if (modelQuery != null) {
-			CMDocument cmdoc = modelQuery.getCorrespondingCMDocument(document);
-			if (cmdoc != null) {
-				if (rootName != null) {
-					CMElementDeclaration rootDecl = (CMElementDeclaration) cmdoc.getElements().getNamedItem(rootName);
-					if (rootDecl != null) {
-						list.add(rootDecl);
-					}
-					else {
-						// supply the given document name anyway, even if it
-						// is an error
-						list.add(new SimpleCMElementDeclaration(rootName));
-						if (Debug.displayInfo || Debug.displayWarnings) {
-							System.out.println("No definition found for " + rootName + " in " + docType.getPublicId() + "/" + docType.getSystemId()); //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-						}
-						String location = "" + (docType.getPublicId() != null ? docType.getPublicId() + "/" : "") + (docType.getSystemId() != null ? docType.getSystemId() : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-						//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-						//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-						if (location.length() > 0) {
-							setErrorMessage(NLS.bind(XMLUIMessages.No_definition_for_in, (new Object[]{rootName, location})));
-						}
-						else {
-							setErrorMessage(NLS.bind(XMLUIMessages.No_definition_for, (new Object[]{rootName})));
-						}
-					}
-				}
-			}
-			else {
-				if (Debug.displayInfo || Debug.displayWarnings) {
-					System.out.println("No content model found."); //$NON-NLS-1$
-				}
-				//$NON-NLS-1$
-				//$NON-NLS-1$
-				String location = "" + (docType.getPublicId() != null ? docType.getPublicId() + "/" : "") + (docType.getSystemId() != null ? docType.getSystemId() : ""); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-				//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-				//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-				if (location.length() > 0) {
-					setErrorMessage(NLS.bind(XMLUIMessages.No_content_model_for, (new Object[]{location})));
-				}
-				else {
-					setErrorMessage(XMLUIMessages.No_content_model_found_UI_);
-				}
-			}
-		}
-
-		return list;
-	}
-
-	protected CMElementDeclaration getCMElementDeclaration(Node node) {
-		CMElementDeclaration result = null;
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-			if (modelQuery != null) {
-				result = modelQuery.getCMElementDeclaration((Element) node);
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of possible completions.
-	 * 
-	 * the auto activation characters for completion proposal or
-	 * <code>null</code> if no auto activation is desired
-	 */
-	public char[] getCompletionProposalAutoActivationCharacters() {
-		return completionProposalAutoActivationCharacters;
-	}
-
-	protected ITextRegion getCompletionRegion(int offset, IStructuredDocumentRegion sdRegion) {
-		ITextRegion region = sdRegion.getRegionAtCharacterOffset(offset);
-		if (region == null) {
-			return null;
-		}
-
-		if (sdRegion.getStartOffset(region) == offset) {
-			// The offset is at the beginning of the region
-			if ((sdRegion.getStartOffset(region) == sdRegion.getStartOffset()) && (sdRegion.getPrevious() != null) && (!sdRegion.getPrevious().isEnded())) {
-				// Is the region also the start of the node? If so, the
-				// previous IStructuredDocumentRegion is
-				// where to look for a useful region.
-				region = sdRegion.getPrevious().getRegionAtCharacterOffset(offset - 1);
-			}
-			else {
-				// Is there no separating whitespace from the previous region?
-				// If not,
-				// then that region is the important one
-				ITextRegion previousRegion = sdRegion.getRegionAtCharacterOffset(offset - 1);
-				if ((previousRegion != null) && (previousRegion != region) && (previousRegion.getTextLength() == previousRegion.getLength())) {
-					region = previousRegion;
-				}
-			}
-		}
-		else {
-			// The offset is NOT at the beginning of the region
-			if (offset > sdRegion.getStartOffset(region) + region.getTextLength()) {
-				// Is the offset within the whitespace after the text in this
-				// region?
-				// If so, use the next region
-				ITextRegion nextRegion = sdRegion.getRegionAtCharacterOffset(sdRegion.getStartOffset(region) + region.getLength());
-				if (nextRegion != null) {
-					region = nextRegion;
-				}
-			}
-			else {
-				// Is the offset within the important text for this region?
-				// If so, then we've already got the right one.
-			}
-		}
-
-		// valid WHITE_SPACE region handler (#179924)
-		if ((region != null) && (region.getType() == DOMRegionContext.WHITE_SPACE)) {
-			ITextRegion previousRegion = sdRegion.getRegionAtCharacterOffset(sdRegion.getStartOffset(region) - 1);
-			if (previousRegion != null) {
-				region = previousRegion;
-			}
-		}
-
-		return region;
-	}
-
-	/**
-	 * Return the region whose content's require completion. This is something
-	 * of a misnomer as sometimes the user wants to be prompted for contents
-	 * of a non-existant ITextRegion, such as for enumerated attribute values
-	 * following an '=' sign.
-	 */
-	protected ITextRegion getCompletionRegion(int documentPosition, Node domnode) {
-		if (domnode == null) {
-			return null;
-		}
-
-		ITextRegion region = null;
-		int offset = documentPosition;
-		IStructuredDocumentRegion flatNode = null;
-		IDOMNode node = (IDOMNode) domnode;
-
-		if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			if (node.getStructuredDocument().getLength() == 0) {
-				return null;
-			}
-			ITextRegion result = node.getStructuredDocument().getRegionAtCharacterOffset(offset).getRegionAtCharacterOffset(offset);
-			while (result == null) {
-				offset--;
-				result = node.getStructuredDocument().getRegionAtCharacterOffset(offset).getRegionAtCharacterOffset(offset);
-			}
-			return result;
-		}
-
-		IStructuredDocumentRegion startTag = node.getStartStructuredDocumentRegion();
-		IStructuredDocumentRegion endTag = node.getEndStructuredDocumentRegion();
-
-		// Determine if the offset is within the start
-		// IStructuredDocumentRegion, end IStructuredDocumentRegion, or
-		// somewhere within the Node's XML content.
-		if ((startTag != null) && (startTag.getStartOffset() <= offset) && (offset < startTag.getStartOffset() + startTag.getLength())) {
-			flatNode = startTag;
-		}
-		else if ((endTag != null) && (endTag.getStartOffset() <= offset) && (offset < endTag.getStartOffset() + endTag.getLength())) {
-			flatNode = endTag;
-		}
-
-		if (flatNode != null) {
-			// the offset is definitely within the start or end tag, continue
-			// on and find the region
-			region = getCompletionRegion(offset, flatNode);
-		}
-		else {
-			// the docPosition is neither within the start nor the end, so it
-			// must be content
-			flatNode = node.getStructuredDocument().getRegionAtCharacterOffset(offset);
-			// (pa) ITextRegion refactor
-			// if (flatNode.contains(documentPosition)) {
-			if ((flatNode.getStartOffset() <= documentPosition) && (flatNode.getEndOffset() >= documentPosition)) {
-				// we're interesting in completing/extending the previous
-				// IStructuredDocumentRegion if the current
-				// IStructuredDocumentRegion isn't plain content or if it's
-				// preceded by an orphan '<'
-				if ((offset == flatNode.getStartOffset()) && (flatNode.getPrevious() != null) && (((flatNode.getRegionAtCharacterOffset(documentPosition) != null) && (flatNode.getRegionAtCharacterOffset(documentPosition).getType() != DOMRegionContext.XML_CONTENT)) || (flatNode.getPrevious().getLastRegion().getType() == DOMRegionContext.XML_TAG_OPEN) || (flatNode.getPrevious().getLastRegion().getType() == DOMRegionContext.XML_END_TAG_OPEN))) {
-					// Is the region also the start of the node? If so, the
-					// previous IStructuredDocumentRegion is
-					// where to look for a useful region.
-					region = flatNode.getPrevious().getLastRegion();
-				}
-				else if (flatNode.getEndOffset() == documentPosition) {
-					region = flatNode.getLastRegion();
-				}
-				else {
-					region = flatNode.getFirstRegion();
-				}
-			}
-			else {
-				// catch end of document positions where the docPosition isn't
-				// in a IStructuredDocumentRegion
-				region = flatNode.getLastRegion();
-			}
-		}
-
-		return region;
-	}
-
-	/**
-	 * Provided by default. Subclasses may override with their own
-	 * implementations.
-	 * 
-	 * @see AbstractContentAssistProcessor#getContentGenerator()
-	 */
-	public XMLContentModelGenerator getContentGenerator() {
-		if (fGenerator == null) {
-			fGenerator = new XMLContentModelGenerator();
-		}
-		return fGenerator;
-	}
-
-	/**
-	 * Returns the characters which when entered by the user should
-	 * automatically trigger the presentation of context information.
-	 * 
-	 * the auto activation characters for presenting context information or
-	 * <code>null</code> if no auto activation is desired
-	 */
-	public char[] getContextInformationAutoActivationCharacters() {
-		return contextInformationAutoActivationCharacters;
-	}
-
-	/**
-	 * Returns a validator used to determine when displayed context
-	 * information should be dismissed. May only return <code>null</code> if
-	 * the processor is incapable of computing context information.
-	 * 
-	 * a context information validator, or <code>null</code> if the
-	 * processor is incapable of computing context information
-	 */
-	public IContextInformationValidator getContextInformationValidator() {
-		if (fContextInformationPresenter == null) {
-			fContextInformationPresenter = new AttributeContextInformationPresenter();
-		}
-		return fContextInformationPresenter;
-	}
-
-	protected int getElementPosition(Node child) {
-		Node parent = child.getParentNode();
-		if (parent == null) {
-			return 0;
-		}
-
-		NodeList children = parent.getChildNodes();
-		if (children == null) {
-			return 0;
-		}
-		int count = 0;
-
-		for (int i = 0; i < children.getLength(); i++) {
-			if (children.item(i) == child) {
-				return count;
-			}
-			else {
-				// if (children.item(i).getNodeType() == Node.ELEMENT_NODE)
-				count++;
-			}
-		}
-		return 0;
-	}
-
-	private int getElementPositionForModelQuery(Node child) {
-		return getElementPosition(child);
-		// return -1;
-	}
-
-	/**
-	 * Return the reason why computeProposals was not able to find any
-	 * completions.
-	 * 
-	 * an error message or null if no error occurred
-	 */
-	public String getErrorMessage() {
-		return fErrorMessage;
-	}
-
-	/**
-	 * @param iResource
-	 */
-	// public void initialize(IResource iResource) {
-	// this.resource = iResource;
-	// }
-	/**
-	 * Gets the infoProvider.
-	 * 
-	 * fInfoProvider and if fInfoProvider was <code>null</code> create a new
-	 * instance
-	 */
-	public MarkupTagInfoProvider getInfoProvider() {
-		if (fInfoProvider == null) {
-			fInfoProvider = new MarkupTagInfoProvider();
-		}
-		return fInfoProvider;
-	}
-
-	protected String getMatchString(IStructuredDocumentRegion parent, ITextRegion aRegion, int offset) {
-		if ((aRegion == null) || isCloseRegion(aRegion)) {
-			return ""; //$NON-NLS-1$
-		}
-		String matchString = null;
-		String regionType = aRegion.getType();
-		if ((regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (regionType == DOMRegionContext.XML_TAG_OPEN) || (offset > parent.getStartOffset(aRegion) + aRegion.getTextLength())) {
-			matchString = ""; //$NON-NLS-1$
-		}
-		else if (regionType == DOMRegionContext.XML_CONTENT) {
-			matchString = ""; //$NON-NLS-1$
-		}
-		else {
-			if ((parent.getText(aRegion).length() > 0) && (parent.getStartOffset(aRegion) < offset)) {
-				matchString = parent.getText(aRegion).substring(0, offset - parent.getStartOffset(aRegion));
-			}
-			else {
-				matchString = ""; //$NON-NLS-1$
-			}
-		}
-		return matchString;
-	}
-
-	protected ITextRegion getNameRegion(IStructuredDocumentRegion flatNode) {
-		if (flatNode == null) {
-			return null;
-		}
-		Iterator regionList = flatNode.getRegions().iterator();
-		while (regionList.hasNext()) {
-			ITextRegion region = (ITextRegion) regionList.next();
-			if (isNameRegion(region)) {
-				return region;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Retrieves all of the possible valid values for this attribute
-	 * declaration
-	 */
-	protected List getPossibleDataTypeValues(Node node, CMAttributeDeclaration ad) {
-		List list = null;
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			Element element = (Element) node;
-			String[] dataTypeValues = null;
-			// The ModelQuery may not be available if the corresponding
-			// adapter
-			// is absent
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-			if (modelQuery != null) {
-				dataTypeValues = modelQuery.getPossibleDataTypeValues(element, ad);
-			}
-			else {
-				if (ad.getAttrType() != null) {
-					dataTypeValues = ad.getAttrType().getEnumeratedValues();
-				}
-			}
-			if (dataTypeValues != null) {
-				list = new ArrayList(dataTypeValues.length);
-				for (int i = 0; i < dataTypeValues.length; i++) {
-					list.add(dataTypeValues[i]);
-				}
-			}
-		}
-		if (list == null) {
-			list = new ArrayList(0);
-		}
-		return list;
-	}
-
-	protected String getRequiredName(Node parentOrOwner, CMNode cmnode) {
-		if ((cmnode == null) || (parentOrOwner == null)) {
-			if (Debug.displayWarnings) {
-				new IllegalArgumentException("Null declaration!").printStackTrace(); //$NON-NLS-1$
-			}
-			return ""; //$NON-NLS-1$
-		}
-		return getContentGenerator().getRequiredName(parentOrOwner, cmnode);
-	}
-
-	protected String getRequiredText(Node parentOrOwner, CMAttributeDeclaration attrDecl) {
-		if (attrDecl == null) {
-			if (Debug.displayWarnings) {
-				new IllegalArgumentException("Null attribute declaration!").printStackTrace(); //$NON-NLS-1$
-			}
-			return ""; //$NON-NLS-1$
-		}
-		StringBuffer buff = new StringBuffer();
-		getContentGenerator().generateRequiredAttribute(parentOrOwner, attrDecl, buff);
-		return buff.toString();
-	}
-
-	protected String getRequiredText(Node parentOrOwner, CMElementDeclaration elementDecl) {
-		if (elementDecl == null) {
-			if (Debug.displayWarnings) {
-				new IllegalArgumentException("Null attribute declaration!").printStackTrace(); //$NON-NLS-1$
-			}
-			return ""; //$NON-NLS-1$
-		}
-		StringBuffer buff = new StringBuffer();
-		getContentGenerator().generateTag(parentOrOwner, elementDecl, buff);
-		return buff.toString();
-	}
-
-	/**
-	 * StructuredTextViewer must be set before using this.
-	 */
-	public IStructuredDocumentRegion getStructuredDocumentRegion(int pos) {
-		// (pa) ITextRegion refactor defect 245190
-		// return
-		// (IStructuredDocumentRegion)ContentAssistUtils.getNodeAt((StructuredTextViewer)fTextViewer,
-		// pos);
-		return ContentAssistUtils.getStructuredDocumentRegion(fTextViewer, pos);
-	}
-
-	private String getTagName(IStructuredDocumentRegion sdRegion) {
-		ITextRegionList regions = sdRegion.getRegions();
-		ITextRegion region = null;
-		String name = ""; //$NON-NLS-1$
-		for (int i = 0; i < regions.size(); i++) {
-			region = regions.get(i);
-			if (region.getType() == DOMRegionContext.XML_TAG_NAME) {
-				name = sdRegion.getText(region);
-				break;
-			}
-		}
-		return name;
-	}
-
-	// returns a list of CMNodes that are available within this parent context
-	// Given the grammar shown below and a snippet of XML code (where the '|'
-	// indicated the cursor position)
-	// the list would return all of the element declarations that are
-	// potential child elements of Foo.
-	//
-	// grammar : Foo -> (A, B, C)
-	// snippet : <Foo><A>|
-	// result : {A, B, C}
-	// 
-	// TODO cs... do we need to pass in the 'kindOfAction'? Seems to me we
-	// could assume it's always an insert.
-	protected List getAvailableChildElementDeclarations(Element parent, int childPosition, int kindOfAction) {
-		List modelQueryActions = getAvailableChildrenAtIndex(parent, childPosition, ModelQuery.VALIDITY_NONE);
-		Iterator iterator = modelQueryActions.iterator();
-		List cmnodes = new Vector();
-		while (iterator.hasNext()) {
-			ModelQueryAction action = (ModelQueryAction) iterator.next();
-			if ((childPosition < 0) || (((action.getStartIndex() <= childPosition) && (childPosition <= action.getEndIndex())) && (action.getKind() == kindOfAction))) {
-				CMNode actionCMNode = action.getCMNode();
-				if ((actionCMNode != null) && !cmnodes.contains(actionCMNode)) {
-					cmnodes.add(actionCMNode);
-				}
-			}
-		}
-		return cmnodes;
-	}
-
-	// returns a list of CMNodes that can be validly inserted at this
-	// childPosition
-	// Given the grammar shown below and a snippet of XML code (where the '|'
-	// indicated the cursor position)
-	// the list would return only the element declarations can be inserted
-	// while maintaing validity of the content.
-	//
-	// grammar : Foo -> (A, B, C)
-	// snippet : <Foo><A>|
-	// result : {B}
-	//    
-	protected List getValidChildElementDeclarations(Element parent, int childPosition, int kindOfAction) {
-		List modelQueryActions = getAvailableChildrenAtIndex(parent, childPosition, ModelQuery.VALIDITY_STRICT);
-		Iterator iterator = modelQueryActions.iterator();
-		List cmnodes = new Vector();
-		while (iterator.hasNext()) {
-			ModelQueryAction action = (ModelQueryAction) iterator.next();
-			if ((childPosition < 0) || (((action.getStartIndex() <= childPosition) && (childPosition <= action.getEndIndex())) && (action.getKind() == kindOfAction))) {
-				CMNode actionCMNode = action.getCMNode();
-				if ((actionCMNode != null) && !cmnodes.contains(actionCMNode)) {
-					cmnodes.add(actionCMNode);
-				}
-			}
-		}
-		return cmnodes;
-	}
-
-	/**
-	 * Similar to the call in HTMLContentAssistProcessor. Pass in a node, it
-	 * tells you if the document is XML type.
-	 * 
-	 * @param node
-	 * 
-	 */
-	protected boolean getXML(Node node) {
-		if (node == null) {
-			return false;
-		}
-
-		Document doc = null;
-		doc = (node.getNodeType() != Node.DOCUMENT_NODE) ? node.getOwnerDocument() : ((Document) node);
-
-		return (doc instanceof IDOMDocument) && ((IDOMDocument) doc).isXMLType();
-	}
-
-	// Initialize local settings
-	protected void init() {
-		// implement in subclasses
-	}
-
-	protected boolean isCloseRegion(ITextRegion region) {
-		String type = region.getType();
-		return ((type == DOMRegionContext.XML_PI_CLOSE) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE) || (type == DOMRegionContext.XML_CDATA_CLOSE) || (type == DOMRegionContext.XML_COMMENT_CLOSE) || (type == DOMRegionContext.XML_ATTLIST_DECL_CLOSE) || (type == DOMRegionContext.XML_ELEMENT_DECL_CLOSE) || (type == DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE) || (type == DOMJSPRegionContextsPrivateCopy.JSP_CLOSE) || (type == DOMJSPRegionContextsPrivateCopy.JSP_COMMENT_CLOSE) || (type.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_CLOSE)) || (type == DOMRegionContext.XML_DECLARATION_CLOSE));
-	}
-
-	/*
-	 * This is to determine if a tag is a special meta-info comment tag that
-	 * shows up as an ELEMENT
-	 */
-	private boolean isCommentNode(IDOMNode node) {
-		return ((node != null) && (node instanceof IDOMElement) && ((IDOMElement) node).isCommentTag());
-	}
-
-	/**
-	 * Checks if cursor position is after doctype tag...
-	 * 
-	 * @param car
-	 * 
-	 */
-	protected boolean isCursorAfterDoctype(ContentAssistRequest car) {
-		Node aNode = car.getNode();
-		Document parent = aNode.getOwnerDocument();
-		int xmldoctypeNodePosition = -1;
-		boolean isAfterDoctype = true;
-
-		if (parent == null) {
-			return true; // blank document case
-		}
-
-		for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child instanceof IDOMNode) {
-				if (child.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
-					xmldoctypeNodePosition = ((IDOMNode) child).getEndOffset();
-					isAfterDoctype = (car.getReplacementBeginPosition() >= xmldoctypeNodePosition);
-					break;
-				}
-			}
-		}
-		return isAfterDoctype;
-	}
-
-	/**
-	 * This method can check if the cursor is after the XMLPI
-	 * 
-	 * @param car
-	 * 
-	 */
-	protected boolean isCursorAfterXMLPI(ContentAssistRequest car) {
-		Node aNode = car.getNode();
-		boolean xmlpiFound = false;
-		Document parent = aNode.getOwnerDocument();
-		int xmlpiNodePosition = -1;
-		boolean isAfterXMLPI = false;
-
-		if (parent == null) {
-			return true; // blank document case
-		}
-
-		for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) {
-			boolean xmlpi = ((child.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE) && child.getNodeName().equals("xml")); //$NON-NLS-1$
-			xmlpiFound = xmlpiFound || xmlpi;
-			if (xmlpiFound) {
-				if (child instanceof IDOMNode) {
-					xmlpiNodePosition = ((IDOMNode) child).getEndOffset();
-					isAfterXMLPI = (car.getReplacementBeginPosition() >= xmlpiNodePosition);
-				}
-				break;
-			}
-		}
-		return isAfterXMLPI;
-	}
-
-	protected boolean isNameRegion(ITextRegion region) {
-		String type = region.getType();
-		return ((type == DOMRegionContext.XML_TAG_NAME) || (type == DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_NAME) || (type == DOMRegionContext.XML_ELEMENT_DECL_NAME) || (type == DOMRegionContext.XML_DOCTYPE_NAME) || (type == DOMRegionContext.XML_ATTLIST_DECL_NAME) || (type == DOMJSPRegionContextsPrivateCopy.JSP_ROOT_TAG_NAME) || type.equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_NAME));
-	}
-
-	protected boolean isQuote(String string) {
-		String trimmed = string.trim();
-		if (trimmed.length() > 0) {
-			return (trimmed.charAt(0) == '\'') || (trimmed.charAt(0) == '"');
-		}
-		return false;
-	}
-
-	private boolean isSelfClosed(IStructuredDocumentRegion startTag) {
-		ITextRegionList regions = startTag.getRegions();
-		return regions.get(regions.size() - 1).getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE;
-	}
-
-	private boolean isStartTag(IStructuredDocumentRegion sdRegion) {
-		boolean result = false;
-		if (sdRegion.getRegions().size() > 0) {
-			ITextRegion r = sdRegion.getRegions().get(0);
-			result = (r.getType() == DOMRegionContext.XML_TAG_OPEN) && sdRegion.isEnded();
-		}
-		return result;
-	}
-
-	protected Properties mapToProperties(CMNamedNodeMap map) {
-		Properties p = new Properties();
-		for (int i = 0; i < map.getLength(); i++) {
-			CMEntityDeclaration decl = (CMEntityDeclaration) map.item(i);
-			p.put(decl.getName(), decl.getValue());
-		}
-		return p;
-	}
-
-	/**
-	 * Gets the corresponding XMLNode, and checks if it's closed.
-	 * 
-	 * @param startTag
-	 * 
-	 */
-	private boolean needsEndTag(IStructuredDocumentRegion startTag) {
-		boolean result = false;
-		IStructuredModel sModel = StructuredModelManager.getModelManager().getExistingModelForRead(fTextViewer.getDocument());
-		try {
-			if (sModel != null) {
-				IDOMNode xmlNode = (IDOMNode) sModel.getIndexedRegion(startTag.getStart());
-				if (!isStartTag(startTag)) {
-					result = false;
-				}
-				else if (isSelfClosed(startTag)) {
-					result = false;
-				}
-				else if (!xmlNode.isContainer()) {
-					result = false;
-				}
-				else {
-					result = xmlNode.getEndStructuredDocumentRegion() == null;
-				}
-			}
-		}
-		finally {
-			if (sModel != null) {
-				sModel.releaseFromRead();
-			}
-		}
-		return result;
-	}
-
-	protected ContentAssistRequest newContentAssistRequest(Node node, Node possibleParent, IStructuredDocumentRegion documentRegion, ITextRegion completionRegion, int begin, int length, String filter) {
-		return new ContentAssistRequest(node, possibleParent, documentRegion, completionRegion, begin, length, filter);
-	}
-
-	public void release() {
-		fGenerator = null;
-	}
-
-	/**
-	 * Set the reason why computeProposals was not able to find any
-	 * completions.
-	 */
-	public void setErrorMessage(String errorMessage) {
-		fErrorMessage = errorMessage;
-	}
-
-	/**
-	 * Set the reason why computeProposals was not able to find any
-	 * completions.
-	 */
-	protected void setErrorMessage(String errorMessage, String append) {
-		setErrorMessage(errorMessage + append);
-	}
-
-	/**
-	 * Set the reason why computeProposals was not able to find any
-	 * completions.
-	 */
-	protected void setErrorMessage(String errorMessage, String prepend, String append) {
-		setErrorMessage(prepend + errorMessage + append);
-	}
-
-	protected boolean stringsEqual(String a, String b) {
-		// (pa) 221190 matching independent of case to be consistant with Java
-		// editor CA
-		return a.equalsIgnoreCase(b);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractContentModelGenerator.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractContentModelGenerator.java
deleted file mode 100644
index 7884482..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AbstractContentModelGenerator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.w3c.dom.Node;
-
-
-public abstract class AbstractContentModelGenerator {
-
-	public static boolean generateChildren = false;
-
-	public AbstractContentModelGenerator() {
-		super();
-	}
-
-	public abstract void generateAttribute(CMAttributeDeclaration attrDecl, StringBuffer buffer);
-
-	protected void generateAttributes(CMElementDeclaration elementDecl, StringBuffer buffer) {
-		CMNamedNodeMap attributes = elementDecl.getAttributes();
-		if (attributes == null) {
-			return;
-		}
-		for (int i = 0; i < attributes.getLength(); i++) {
-			generateAttribute((CMAttributeDeclaration) attributes.item(i), buffer);
-		}
-		return;
-	}
-
-	protected abstract void generateEndTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer);
-
-	public void generateRequiredChildren(Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer) {
-		if (generateChildren) {
-		}
-		return;
-	}
-
-	protected abstract void generateStartTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer);
-
-	public void generateTag(Node parent, CMElementDeclaration elementDecl, StringBuffer buffer) {
-		if ((elementDecl == null) || (buffer == null)) {
-			return;
-		}
-
-		String tagName = getRequiredName(parent, elementDecl);
-
-		generateStartTag(tagName, parent, elementDecl, buffer);
-		generateRequiredChildren(parent, elementDecl, buffer);
-		generateEndTag(tagName, parent, elementDecl, buffer);
-		return;
-	}
-
-	public abstract int getMinimalStartTagLength(Node node, CMElementDeclaration elementDecl);
-
-	public String getRequiredName(Node ownerNode, CMNode cmnode) {
-		if (ownerNode != null) {
-			return DOMNamespaceHelper.computeName(cmnode, ownerNode, null);
-		}
-		return cmnode.getNodeName();
-	}
-
-	public abstract String getStartTagClose(Node parentNode, CMElementDeclaration elementDecl);
-
-	protected boolean requiresAttributes(CMElementDeclaration ed) {
-		CMNamedNodeMap attributes = ed.getAttributes();
-		if (attributes == null) {
-			return false;
-		}
-		for (int i = 0; i < attributes.getLength(); i++) {
-			if (((CMAttributeDeclaration) attributes.item(i)).getUsage() == CMAttributeDeclaration.REQUIRED) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformation.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformation.java
deleted file mode 100644
index 66e514a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformation.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationExtension;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.ui.internal.util.Assert;
-
-
-/**
- * Implementation of IContextInformation. Adds knowledge about the information
- * display string such as required attributes for this context.
- * 
- * @author pavery
- */
-public class AttributeContextInformation implements IContextInformation, IContextInformationExtension {
-	private HashMap fAttr2RangeMap;
-	/** The name of the context */
-	private String fContextDisplayString;
-	/** The image to be displayed */
-	private Image fImage;
-	/** The information to be displayed */
-	private String fInformationDisplayString;
-	private int fPosition = -1;
-
-	/**
-	 * Creates a new context information with an image.
-	 * 
-	 * @param image
-	 *            the image to display when presenting the context information
-	 * @param contextDisplayString
-	 *            the string to be used when presenting the context
-	 * @param informationDisplayString
-	 *            the string to be displayed when presenting the context
-	 *            information, may not be <code>null</code>
-	 */
-	public AttributeContextInformation(Image image, String contextDisplayString, String informationDisplayString, HashMap attr2RangeMap) {
-		Assert.isNotNull(informationDisplayString, "illegal argument: informationDisplayString can not be null"); //$NON-NLS-1$
-
-		fImage = image;
-		fContextDisplayString = contextDisplayString;
-		fInformationDisplayString = informationDisplayString;
-		fAttr2RangeMap = attr2RangeMap;
-	}
-
-	/**
-	 * Creates a new context information without an image.
-	 * 
-	 * @param contextDisplayString
-	 *            the string to be used when presenting the context
-	 * @param informationDisplayString
-	 *            the string to be displayed when presenting the context
-	 *            information
-	 */
-	public AttributeContextInformation(String contextDisplayString, String informationDisplayString, HashMap attr2RangeMap) {
-		this(null, contextDisplayString, informationDisplayString, attr2RangeMap);
-	}
-
-	/**
-	 * Maps (String -> Position). The attribute name to the Text position.
-	 * 
-	 * 
-	 */
-	public HashMap getAttr2RangeMap() {
-		return fAttr2RangeMap;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContextInformation#getContextDisplayString()
-	 */
-	public String getContextDisplayString() {
-		if (fContextDisplayString != null) {
-			return fContextDisplayString;
-		}
-		return fInformationDisplayString;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContextInformationExtension#getContextInformationPosition()
-	 */
-	public int getContextInformationPosition() {
-		return fPosition;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContextInformation#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContextInformation#getInformationDisplayString()
-	 */
-	public String getInformationDisplayString() {
-		return fInformationDisplayString;
-	}
-
-	public void setContextInformationPosition(int position) {
-		fPosition = position;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformationPresenter.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformationPresenter.java
deleted file mode 100644
index acd660b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformationPresenter.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextPresentation;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationPresenter;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-/**
- * Responsible for the presentation of the context info popup. This includes
- * text style, and when the window should close.
- * 
- * @author pavery
- */
-public class AttributeContextInformationPresenter implements IContextInformationPresenter, IContextInformationValidator {
-	private int fDocumentPosition = -1;
-
-	private IContextInformation fInfo = null;
-	private ContextInfoModelUtil fModelUtil = null;
-	private ITextViewer fViewer = null;
-
-	public AttributeContextInformationPresenter() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContextInformationValidator#install(org.eclipse.jface.text.contentassist.IContextInformation,
-	 *      org.eclipse.jface.text.ITextViewer, int)
-	 */
-	public void install(IContextInformation info, ITextViewer viewer, int documentPosition) {
-		fInfo = info;
-		fViewer = viewer;
-		fDocumentPosition = documentPosition;
-		fModelUtil = new ContextInfoModelUtil((IStructuredDocument) fViewer.getDocument());
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContextInformationValidator#isContextInformationValid(int)
-	 */
-	public boolean isContextInformationValid(int documentPosition) {
-		// determine whether or not this context info should still be
-		// showing...
-		// if cursor still within the element it's valid...
-		boolean result = false;
-		if (fModelUtil != null) {
-			IStructuredDocumentRegion startRegion = fModelUtil.getXMLNode(fDocumentPosition).getStartStructuredDocumentRegion();
-			int start = startRegion.getStartOffset();
-			int end = startRegion.getEndOffset();
-			result = (documentPosition < end) && (documentPosition > start + 1);
-		}
-		return result;
-	}
-
-	/**
-	 * @see org.eclipse.jface.text.contentassist.IContextInformationPresenter#updatePresentation(int,
-	 *      org.eclipse.jface.text.TextPresentation)
-	 */
-	public boolean updatePresentation(int documentPosition, TextPresentation presentation) {
-		presentation.clear();
-
-		if (!(fInfo instanceof AttributeContextInformation)) {
-			return false;
-		}
-
-		// iterate existing attributes from current node
-		IDOMNode xmlNode = fModelUtil.getXMLNode(documentPosition);
-		IStructuredDocumentRegion sdRegion = xmlNode.getFirstStructuredDocumentRegion();
-		ITextRegionList regions = sdRegion.getRegions();
-		ITextRegion r = null;
-		String attrName = ""; //$NON-NLS-1$
-		Object temp = null;
-		Position p = null;
-		HashMap map = ((AttributeContextInformation) fInfo).getAttr2RangeMap();
-
-		// so we can add ranges in order
-		StyleRange[] sorted = new StyleRange[fInfo.getInformationDisplayString().length()];
-		for (int i = 0; i < regions.size(); i++) {
-			r = regions.get(i);
-			if (r.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				attrName = sdRegion.getText(r);
-				temp = map.get(attrName);
-				if (temp != null) {
-					p = (Position) temp;
-					sorted[p.offset] = new StyleRange(p.offset, p.length, null, null, SWT.BOLD);
-				}
-			}
-		}
-		// style ranges need to be added in order
-		StyleRange sr = null;
-		for (int i = 0; i < sorted.length; i++) {
-			sr = sorted[i];
-			if (sr != null) {
-				presentation.addStyleRange(sr);
-			}
-		}
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformationProvider.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformationProvider.java
deleted file mode 100644
index f0e9052..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/AttributeContextInformationProvider.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.contentassist.ContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * Calculates attribute context information based on a StructuedDocument and
- * document position.
- * 
- * @author pavery
- */
-class AttributeContextInformationProvider {
-	private final IContextInformation[] EMPTY_CONTEXT_INFO = new IContextInformation[0];
-	private Comparator fComparator;
-
-	private IStructuredDocument fDocument = null;
-	private ContextInfoModelUtil fModelUtil = null;
-
-	public AttributeContextInformationProvider(IStructuredDocument doc, AttributeContextInformationPresenter presenter) {
-		fDocument = doc;
-		fModelUtil = new ContextInfoModelUtil(fDocument);
-	}
-
-	/**
-	 * @param sdRegion
-	 * 
-	 */
-	private boolean canProposeInfo(IStructuredDocumentRegion sdRegion) {
-		if ((sdRegion != null) && isEndTag(sdRegion)) {
-			return false;
-		}
-		else {
-			return true;
-		}
-	}
-
-	public IContextInformation[] getAttributeInformation(int offset) {
-		/*
-		 * need to take care of special cases w/ ambiguous regions <tag>|
-		 * </tag> also end tags..
-		 */
-		IContextInformation[] results = EMPTY_CONTEXT_INFO;
-
-		IStructuredDocumentRegion sdRegion = fModelUtil.getDocument().getRegionAtCharacterOffset(offset);
-		if (!canProposeInfo(sdRegion)) {
-			return EMPTY_CONTEXT_INFO;
-		}
-
-		IDOMNode node = fModelUtil.getXMLNode(offset);
-		if (node != null) {
-			switch (node.getNodeType()) {
-				case Node.ELEMENT_NODE :
-					results = getInfoForElement(node);
-					break;
-				// future...
-				// case Node.TEXT_NODE :
-				// results = getInfoForText(node);
-				// break;
-			}
-		}
-		return results;
-	}
-
-	/**
-	 * Returns a comparator that compares CMAttributeDeclaration names.
-	 * 
-	 * the comparator
-	 */
-	private Comparator getCMAttributeComparator() {
-		if (fComparator == null) {
-			fComparator = new Comparator() {
-				public int compare(Object o1, Object o2) {
-					return ((CMAttributeDeclaration) o1).getAttrName().compareTo(((CMAttributeDeclaration) o2).getAttrName());
-				}
-			};
-		}
-		return fComparator;
-	}
-
-	/**
-	 * @param node
-	 * 
-	 */
-	private IContextInformation[] getInfoForElement(IDOMNode node) {
-		IContextInformation[] results = EMPTY_CONTEXT_INFO;
-		CMElementDeclaration decl = fModelUtil.getModelQuery().getCMElementDeclaration((Element) node);
-		if (decl != null) {
-			CMNamedNodeMap attributes = decl.getAttributes();
-
-			CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attributes);
-			List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent((Element) node, decl, ModelQuery.INCLUDE_ATTRIBUTES);
-			for (int k = 0; k < nodes.size(); k++) {
-				CMNode cmnode = (CMNode) nodes.get(k);
-				if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-					allAttributes.put(cmnode);
-				}
-			}
-			attributes = allAttributes;
-			
-			String attrContextString = node.getNodeName();
-			StringBuffer attrInfo = new StringBuffer(" "); //$NON-NLS-1$
-			String name = ""; //$NON-NLS-1$
-			HashMap attrPosMap = new HashMap();
-			int pos = 0;
-			int length = 0;
-			int numPerLine = 8;
-
-			CMAttributeDeclaration[] sortedAttrs = getSortedAttributes(attributes);
-
-			for (int i = 0; i < sortedAttrs.length; i++) {
-				name = sortedAttrs[i].getAttrName();
-				length = name.length();
-				pos = attrInfo.length();
-
-				attrInfo.append(name);
-
-				if (sortedAttrs[i].getUsage() == CMAttributeDeclaration.REQUIRED) {
-					attrInfo.append("*"); //$NON-NLS-1$
-					length++;
-				}
-				if (i < attributes.getLength() - 1) {
-					attrInfo.append(" "); //$NON-NLS-1$
-					if ((i != 0) && (i % numPerLine == 0)) {
-						attrInfo.append("\n "); //$NON-NLS-1$
-					}
-				}
-				attrPosMap.put(name, new Position(pos, length));
-			}
-			if (!attrInfo.toString().trim().equals("")) {
-				return new IContextInformation[]{new AttributeContextInformation(attrContextString, attrInfo.toString(), attrPosMap)};
-			}
-		}
-		return results;
-	}
-
-	/**
-	 * @param node
-	 * 
-	 */
-	IContextInformation[] getInfoForText(IDOMNode node) {
-		Node parent = node.getParentNode();
-		String contextString = node.getNodeName();
-		StringBuffer info = new StringBuffer(" "); //$NON-NLS-1$
-		if ((parent != null) && (parent.getNodeType() == Node.ELEMENT_NODE)) {
-			CMElementDeclaration decl = fModelUtil.getModelQuery().getCMElementDeclaration((Element) parent);
-			CMContent content = decl.getContent();
-			if (content instanceof CMGroup) {
-				CMGroup cmGroup = (CMGroup) content;
-				CMNodeList children = cmGroup.getChildNodes();
-				CMNode cmNode = null;
-				for (int i = 0; i < children.getLength(); i++) {
-					cmNode = children.item(i);
-					contextString = cmNode.getNodeName();
-					if (contextString != null) {
-						info.append("<" + cmNode.getNodeName() + ">"); //$NON-NLS-1$ //$NON-NLS-2$
-						if (i < children.getLength() - 1) {
-							info.append(" "); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		}
-		if (!info.toString().trim().equals("")) {
-			return new IContextInformation[]{new ContextInformation(contextString, info.toString())};
-		}
-		else {
-			return EMPTY_CONTEXT_INFO;
-		}
-	}
-
-	/**
-	 * Returns sorted array of CMAttributeDeclarations.
-	 * 
-	 * @param attributes
-	 * 
-	 */
-	private CMAttributeDeclaration[] getSortedAttributes(CMNamedNodeMap attributes) {
-		List sorted = new ArrayList();
-		for (int i = 0; i < attributes.getLength(); i++) {
-			sorted.add(attributes.item(i));
-		}
-		Collections.sort(sorted, getCMAttributeComparator());
-		return (CMAttributeDeclaration[]) sorted.toArray(new CMAttributeDeclaration[sorted.size()]);
-	}
-
-	/**
-	 * @param sdRegion
-	 * 
-	 */
-	private boolean isEndTag(IStructuredDocumentRegion sdRegion) {
-		ITextRegionList regions = sdRegion.getRegions();
-		return regions.get(0).getType() == DOMRegionContext.XML_END_TAG_OPEN;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ContentAssistRequest.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ContentAssistRequest.java
deleted file mode 100644
index 6a1d3af..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ContentAssistRequest.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionCollection;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.w3c.dom.Node;
-
-
-public class ContentAssistRequest {
-	protected IStructuredDocumentRegion documentRegion = null;
-	protected List macros = new ArrayList();
-	protected String matchString;
-	protected Node node = null;
-	protected Node parent = null;
-	protected List proposals = new ArrayList();
-	protected ITextRegion region = null;
-	protected int replacementBeginPosition;
-	protected int replacementLength;
-
-	// private Boolean separate = null; // (pa) not used
-	// private Boolean sort = null; // (pa) not used
-	/**
-	 * XMLContentAssistRequest constructor comment.
-	 */
-	public ContentAssistRequest(Node node, Node parent, IStructuredDocumentRegion documentRegion, ITextRegion completionRegion, int begin, int length, String filter) {
-		super();
-		setNode(node);
-		setParent(parent);
-		setDocumentRegion(documentRegion);
-		setRegion(completionRegion);
-		setMatchString(filter);
-		setReplacementBeginPosition(begin);
-		setReplacementLength(length);
-	}
-
-	public void addMacro(ICompletionProposal newProposal) {
-		macros.add(newProposal);
-	}
-
-	public void addProposal(ICompletionProposal newProposal) {
-		proposals.add(newProposal);
-	}
-
-	public ICompletionProposal[] getCompletionProposals() {
-		ICompletionProposal results[] = null;
-		if ((getProposals().size() > 0) || (getMacros().size() > 0)) {
-			List allProposals = new ArrayList();
-			if (!shouldSeparate()) {
-				allProposals.addAll(getProposals());
-				// should be empty, as all macros should have gone into the
-				// proposal list
-				allProposals.addAll(getMacros());
-				allProposals = sortProposals(allProposals);
-			}
-			else {
-				allProposals.addAll(sortProposals(getProposals()));
-				allProposals.addAll(sortProposals(getMacros()));
-			}
-
-			results = new ICompletionProposal[allProposals.size()];
-			for (int i = 0; i < allProposals.size(); i++) {
-				results[i] = (ICompletionProposal) allProposals.get(i);
-			}
-		}
-		return results;
-	}
-
-
-	public IStructuredDocumentRegion getDocumentRegion() {
-		return documentRegion;
-	}
-
-	/**
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getMacros() {
-		return macros;
-	}
-
-	/**
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getMatchString() {
-		return matchString;
-	}
-
-	/**
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public org.w3c.dom.Node getNode() {
-		return node;
-	}
-
-	/**
-	 * 
-	 * @return org.w3c.dom.Node
-	 */
-	public org.w3c.dom.Node getParent() {
-		return parent;
-	}
-
-	/**
-	 * 
-	 * @return java.util.List
-	 */
-	public java.util.List getProposals() {
-		return proposals;
-	}
-
-	public ITextRegion getRegion() {
-		return region;
-	}
-
-	/**
-	 * 
-	 * @return int
-	 */
-	public int getReplacementBeginPosition() {
-		return replacementBeginPosition;
-	}
-
-	/**
-	 * @return int
-	 */
-	public int getReplacementLength() {
-		return replacementLength;
-	}
-
-	public int getStartOffset() {
-		if ((getDocumentRegion() != null) && (getRegion() != null)) {
-			return ((ITextRegionCollection) getDocumentRegion()).getStartOffset(getRegion());
-		}
-		return -1;
-	}
-
-	public String getText() {
-		if ((getDocumentRegion() != null) && (getRegion() != null)) {
-			return ((ITextRegionCollection) getDocumentRegion()).getText(getRegion());
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	public int getTextEndOffset() {
-		if ((getDocumentRegion() != null) && (getRegion() != null)) {
-			return ((ITextRegionCollection) getDocumentRegion()).getTextEndOffset(getRegion());
-		}
-		return -1;
-	}
-
-	/**
-	 * @param region
-	 */
-	public void setDocumentRegion(IStructuredDocumentRegion region) {
-		documentRegion = region;
-	}
-
-	/**
-	 * 
-	 * @param newMatchString
-	 *            java.lang.String
-	 */
-	public void setMatchString(java.lang.String newMatchString) {
-		matchString = newMatchString;
-	}
-
-	/**
-	 * 
-	 * @param newNode
-	 *            org.w3c.dom.Node
-	 */
-	public void setNode(org.w3c.dom.Node newNode) {
-		node = newNode;
-	}
-
-	/**
-	 * 
-	 * @param newParent
-	 *            org.w3c.dom.Node
-	 */
-	public void setParent(org.w3c.dom.Node newParent) {
-		parent = newParent;
-	}
-
-	/**
-	 * 
-	 * @param newRegion
-	 */
-	public void setRegion(ITextRegion newRegion) {
-		region = newRegion;
-	}
-
-	/**
-	 * 
-	 * @param newReplacementBeginPosition
-	 *            int
-	 */
-	public void setReplacementBeginPosition(int newReplacementBeginPosition) {
-		replacementBeginPosition = newReplacementBeginPosition;
-	}
-
-
-	public void setReplacementLength(int newReplacementLength) {
-		replacementLength = newReplacementLength;
-	}
-
-	public boolean shouldSeparate() {
-		/*
-		 * if (separate == null) { PreferenceManager manager =
-		 * getPreferenceManager(); if(manager == null) { separate =
-		 * Boolean.FALSE; } else { Element caSettings =
-		 * manager.getElement(PreferenceNames.CONTENT_ASSIST); separate = new
-		 * Boolean(caSettings.getAttribute(PreferenceNames.SEPARATE).equals(PreferenceNames.TRUE)); } }
-		 * return separate.booleanValue();
-		 */
-		return false;
-	}
-
-	protected List sortProposals(List proposalsIn) {
-		Collections.sort(proposalsIn, new ProposalComparator());
-		return proposalsIn;
-
-	}
-
-	/**
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String toString() {
-		return "Node: " + getNode() //$NON-NLS-1$
-					+ "\nParent: " + getParent() //$NON-NLS-1$
-					+ "\nStructuredDocumentRegion: " + StringUtils.escape(getDocumentRegion().toString()) //$NON-NLS-1$
-					+ "\nRegion: " + getRegion() //$NON-NLS-1$
-					+ "\nMatch string: '" + StringUtils.escape(getMatchString()) + "'" //$NON-NLS-2$//$NON-NLS-1$
-					+ "\nOffsets: [" + getReplacementBeginPosition() + "-" + (getReplacementBeginPosition() + getReplacementLength()) + "]\n"; //$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ContextInfoModelUtil.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ContextInfoModelUtil.java
deleted file mode 100644
index a48e753..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ContextInfoModelUtil.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-
-
-/**
- * @author pavery
- */
-public class ContextInfoModelUtil {
-	IStructuredDocument fDocument = null;
-
-	ContextInfoModelUtil(IStructuredDocument doc) {
-		fDocument = doc;
-	}
-
-	public IStructuredDocument getDocument() {
-		return fDocument;
-	}
-
-	public ModelQuery getModelQuery() {
-		ModelQuery mq = null;
-
-		IStructuredModel xmlModel = null;
-		try {
-			xmlModel = StructuredModelManager.getModelManager().getExistingModelForRead(getDocument());
-			mq = ModelQueryUtil.getModelQuery(xmlModel);
-		}
-		finally {
-			if (xmlModel != null) {
-				xmlModel.releaseFromRead();
-			}
-		}
-		return mq;
-	}
-
-	public IDOMNode getXMLNode(int offset) {
-		IStructuredModel xmlModel = null;
-		IDOMNode xmlNode = null;
-		try {
-			xmlModel = StructuredModelManager.getModelManager().getExistingModelForRead(getDocument());
-			xmlNode = (IDOMNode) xmlModel.getIndexedRegion(offset);
-		}
-		finally {
-			if (xmlModel != null)
-				xmlModel.releaseFromRead();
-		}
-		return xmlNode;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/CustomTemplateProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/CustomTemplateProposal.java
deleted file mode 100644
index f19dd90..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/CustomTemplateProposal.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateProposal;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
-
-/**
- * Purpose of this class is to make the additional proposal info into content
- * fit for an HTML viewer (by escaping characters)
- */
-class CustomTemplateProposal extends TemplateProposal implements IRelevanceCompletionProposal {
-	// copies of this class exist in:
-	// org.eclipse.jst.jsp.ui.internal.contentassist
-	// org.eclipse.wst.html.ui.internal.contentassist
-	// org.eclipse.wst.xml.ui.internal.contentassist
-
-	public CustomTemplateProposal(Template template, TemplateContext context, IRegion region, Image image, int relevance) {
-		super(template, context, region, image, relevance);
-	}
-
-	public String getAdditionalProposalInfo() {
-		String additionalInfo = super.getAdditionalProposalInfo();
-		return StringUtils.convertToHTMLContent(additionalInfo);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/NoRegionContentAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/NoRegionContentAssistProcessor.java
deleted file mode 100644
index 57744f3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/NoRegionContentAssistProcessor.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.contentassist.IContextInformationValidator;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.ui.internal.IReleasable;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-
-/**
- * ContentAssistProcessor to handle special cases in content assist where the
- * partitioner cannot determine a partition type at the current cursor
- * position (usually at EOF).
- * 
- * @author pavery
- */
-public class NoRegionContentAssistProcessor implements IContentAssistProcessor, IReleasable {
-
-	private static final boolean DEBUG = false;
-	protected char completionProposalAutoActivationCharacters[] = null;
-	protected char contextInformationAutoActivationCharacters[] = null;
-
-	private final ICompletionProposal[] EMPTY_PROPOSAL_SET = new ICompletionProposal[0];
-	protected String fErrorMessage = null;
-	private HashMap fNameToProcessorMap = null;
-	private HashMap fPartitionToProcessorMap = null;
-
-	public NoRegionContentAssistProcessor() {
-		super();
-	}
-
-	protected void addPartitionProcessor(String key, IContentAssistProcessor processor) {
-		addProcessor(getPartitionToProcessorMap(), key, processor);
-	}
-
-	protected void addNameProcessor(String key, IContentAssistProcessor processor) {
-		addProcessor(getNameToProcessorMap(), key, processor);
-	}
-
-	protected IContentAssistProcessor getPartitionProcessor(String key) {
-		return (IContentAssistProcessor) getPartitionToProcessorMap().get(key);
-	}
-
-	/**
-	 * Ensures release if it's a duplicate partition type.
-	 * 
-	 * @param map
-	 * @param key
-	 * @param processor
-	 */
-	private void addProcessor(HashMap map, String key, IContentAssistProcessor processor) {
-		Object o = map.remove(key);
-		if (o != null) {
-			if (o instanceof IReleasable) {
-				((IReleasable) o).release();
-			}
-		}
-		map.put(key, processor);
-	}
-
-	/**
-	 * Figures out what the correct ICompletionProposalProcessor is and
-	 * computesCompletionProposals on that.
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int documentOffset) {
-		IContentAssistProcessor p = null;
-		ICompletionProposal[] results = EMPTY_PROPOSAL_SET;
-
-		p = guessContentAssistProcessor(viewer, documentOffset);
-		if (p != null) {
-			results = p.computeCompletionProposals(viewer, documentOffset);
-		}
-
-		return (results != null) ? results : EMPTY_PROPOSAL_SET;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#computeContextInformation(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public IContextInformation[] computeContextInformation(ITextViewer viewer, int documentOffset) {
-		// get context info from processor that we end up using...
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getCompletionProposalAutoActivationCharacters()
-	 */
-	public char[] getCompletionProposalAutoActivationCharacters() {
-		return completionProposalAutoActivationCharacters;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationAutoActivationCharacters()
-	 */
-	public char[] getContextInformationAutoActivationCharacters() {
-		return contextInformationAutoActivationCharacters;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getContextInformationValidator()
-	 */
-	public IContextInformationValidator getContextInformationValidator() {
-		// return the validator for the content assist processor that we
-		// used...
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.IContentAssistProcessor#getErrorMessage()
-	 */
-	public String getErrorMessage() {
-		return fErrorMessage;
-	}
-	
-	private HashMap getNameToProcessorMap() {
-		if (fNameToProcessorMap == null) {
-			fNameToProcessorMap = new HashMap();
-			initNameToProcessorMap();
-		}
-		return fNameToProcessorMap;
-	}
-	
-	private HashMap getPartitionToProcessorMap() {
-		if (fPartitionToProcessorMap == null) {
-			fPartitionToProcessorMap = new HashMap();
-			initPartitionToProcessorMap();
-		}
-		return fPartitionToProcessorMap;
-	}
-
-	/**
-	 * Gives you the document partition type (String) for the given
-	 * StructuredTextViewer and documentPosition.
-	 * 
-	 * @param viewer
-	 * @param documentPosition
-	 * @return String
-	 */
-	protected String getPartitionType(StructuredTextViewer viewer, int documentPosition) {
-		IDocument document = viewer.getDocument();
-		String partitionType = null;
-		ITypedRegion partition = null;
-		try {
-			partition = document.getPartition(documentPosition);
-			partitionType = partition.getType();
-		}
-		catch (BadLocationException e) {
-			partitionType = null;
-		}
-		return partitionType;
-	}
-
-	/**
-	 * Guesses a ContentAssistProcessor based on the TextViewer and
-	 * documentOffset.
-	 * 
-	 * @param viewer
-	 * @param documentOffset
-	 */
-	protected IContentAssistProcessor guessContentAssistProcessor(ITextViewer viewer, int documentOffset) {
-		// mapping logic here...
-		// look @ previous region
-		// look @ previous doc partition type
-		// look @ page language
-		IContentAssistProcessor p = null;
-		IStructuredDocumentRegion sdRegion = ContentAssistUtils.getStructuredDocumentRegion(viewer, documentOffset);
-		if (sdRegion != null) {
-			String currentRegionType = sdRegion.getType();
-			// System.out.println("current region type is >> " +
-			// currentRegionType);
-			if (currentRegionType == DOMRegionContext.UNDEFINED) {
-				IStructuredDocumentRegion sdPrev = sdRegion.getPrevious();
-				if (sdPrev != null) {
-					if (DEBUG) {
-						String prevRegionType = sdPrev.getType();
-						System.out.println("previous region type is >> " + prevRegionType); //$NON-NLS-1$
-					}
-				}
-			}
-		}
-		// working w/ viewer & document partition
-		if ((p == null) && (viewer.getDocument().getLength() > 0)) {
-			String prevPartitionType = getPartitionType((StructuredTextViewer) viewer, documentOffset - 1);
-			// System.out.println("previous partition type is > " +
-			// prevPartitionType);
-			p = (IContentAssistProcessor) getPartitionToProcessorMap().get(prevPartitionType);
-		}
-		return p;
-	}
-
-	/**
-	 * Inits map for extra ContentAssistProcessors (useBean, get/setProperty)
-	 */
-	protected void initNameToProcessorMap() {
-		// nothing to do in this case
-	}
-
-	/**
-	 * Adds all relevent ContentAssistProcessors to the partition to processor
-	 * map (just XML here)
-	 */
-	protected void initPartitionToProcessorMap() {
-		XMLContentAssistProcessor xmlProcessor = new XMLContentAssistProcessor();
-		addProcessor(getPartitionToProcessorMap(), IXMLPartitions.XML_DEFAULT, xmlProcessor);
-	}
-
-	public void release() {
-		releasePartitionToProcessorMap();
-		releaseNameToProcessorMap();
-	}
-
-	protected void releaseMap(HashMap map) {
-		if ((map != null) && !map.isEmpty()) {
-			Iterator it = map.keySet().iterator();
-			Object key = null;
-			while (it.hasNext()) {
-				key = it.next();
-				if (map.get(key) instanceof IReleasable) {
-					((IReleasable) map.get(key)).release();
-				}
-			}
-			map.clear();
-			map = null;
-		}
-	}
-
-	protected void releaseNameToProcessorMap() {
-		releaseMap(fNameToProcessorMap);
-	}
-
-	protected void releasePartitionToProcessorMap() {
-		releaseMap(fPartitionToProcessorMap);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/NonValidatingModelQueryAction.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/NonValidatingModelQueryAction.java
deleted file mode 100644
index 24a397d..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/NonValidatingModelQueryAction.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-public class NonValidatingModelQueryAction implements org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQueryAction {
-
-	protected CMNode cmnode = null;
-	protected int endIndex = 0;
-	protected int kind = INSERT;
-	protected int startIndex = 0;
-	protected Object userData = null;
-
-	/**
-	 * NonValidatingModelQueryAction constructor comment.
-	 */
-	protected NonValidatingModelQueryAction() {
-		super();
-	}
-
-	/**
-	 * NonValidatingModelQueryAction constructor comment.
-	 */
-	public NonValidatingModelQueryAction(CMNode newChild, int newKind, int newStart, int newEnd, Object newUserData) {
-		super();
-		cmnode = newChild;
-		kind = newKind;
-		startIndex = newStart;
-		endIndex = newEnd;
-		userData = newUserData;
-	}
-
-	/**
-	 * getCMNode method comment.
-	 */
-	public org.eclipse.wst.xml.core.internal.contentmodel.CMNode getCMNode() {
-		return cmnode;
-	}
-
-	/**
-	 * 
-	 * @return int
-	 */
-	public int getEndIndex() {
-		return endIndex;
-	}
-
-	/**
-	 * 
-	 * @return int
-	 */
-	public int getKind() {
-		return kind;
-	}
-
-	/**
-	 * getParent method comment.
-	 */
-	public org.w3c.dom.Node getParent() {
-		return null;
-	}
-
-	/**
-	 * 
-	 * @return int
-	 */
-	public int getStartIndex() {
-		return startIndex;
-	}
-
-	/**
-	 * getUserData method comment.
-	 */
-	public Object getUserData() {
-		return null;
-	}
-
-	/**
-	 * performAction method comment.
-	 */
-	public void performAction() {
-	}
-
-	/**
-	 * setCMNode method comment.
-	 */
-	protected void setCMNode(org.eclipse.wst.xml.core.internal.contentmodel.CMNode newNode) {
-		cmnode = newNode;
-	}
-
-	/**
-	 * 
-	 * @param newEndIndex
-	 *            int
-	 */
-	protected void setEndIndex(int newEndIndex) {
-		endIndex = newEndIndex;
-	}
-
-	/**
-	 * 
-	 * @param newKind
-	 *            int
-	 */
-	protected void setKind(int newKind) {
-		kind = newKind;
-	}
-
-	/**
-	 * 
-	 * @param newStartIndex
-	 *            int
-	 */
-	protected void setStartIndex(int newStartIndex) {
-		startIndex = newStartIndex;
-	}
-
-	/**
-	 * setUserData method comment.
-	 */
-	public void setUserData(Object object) {
-	}
-
-	/**
-	 * 
-	 * @return java.lang.String
-	 */
-	public String toString() {
-		String actionName = null;
-		switch (kind) {
-			case INSERT :
-				actionName = "INSERT";//$NON-NLS-1$
-				break;
-			case REMOVE :
-				actionName = "REMOVE";//$NON-NLS-1$
-				break;
-			case REPLACE :
-				actionName = "REPLACE";//$NON-NLS-1$
-				break;
-			default :
-				actionName = "UNKNOWN ACTION ";//$NON-NLS-1$
-		}
-		String nodeName = (cmnode != null) ? getCMNode().getNodeName() : "(unknown)";//$NON-NLS-1$
-		return actionName + "=" + nodeName + "(" + startIndex + "..." + endIndex + ")";//$NON-NLS-4$//$NON-NLS-3$//$NON-NLS-2$//$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ProposalComparator.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ProposalComparator.java
deleted file mode 100644
index ee6e8e8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ProposalComparator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-
-
-import java.util.Comparator;
-
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceCompletionProposal;
-
-
-public class ProposalComparator implements Comparator {
-
-
-	public int compare(Object o1, Object o2) {
-		int relevance = 0;
-		if ((o1 instanceof IRelevanceCompletionProposal) && (o2 instanceof IRelevanceCompletionProposal)) {
-			// sort based on relevance
-			IRelevanceCompletionProposal cp1 = (IRelevanceCompletionProposal) o1;
-			IRelevanceCompletionProposal cp2 = (IRelevanceCompletionProposal) o2;
-
-			relevance = cp2.getRelevance() - cp1.getRelevance();
-
-			// if same relevance, secondary sort (lexigraphically)
-			if ((relevance == 0) && (o1 instanceof ICompletionProposal) && (o2 instanceof ICompletionProposal)) {
-				String displayString1 = ((ICompletionProposal) o1).getDisplayString();
-				String displayString2 = ((ICompletionProposal) o2).getDisplayString();
-				if ((displayString1 != null) && (displayString2 != null)) {
-					// relevance = displayString1.compareTo(displayString2);
-					// // this didn't mix caps w/ lowercase
-					relevance = com.ibm.icu.text.Collator.getInstance().compare(displayString1, displayString2);
-				}
-			}
-		}
-		// otherwise if it's not ISEDRelevanceCompletionProposal, don't sort
-		return relevance;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ReplaceNameTemplateContext.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ReplaceNameTemplateContext.java
deleted file mode 100644
index c371494..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/ReplaceNameTemplateContext.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.templates.DocumentTemplateContext;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateBuffer;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.TemplateException;
-
-/**
- * Just like DocumentTemplateContext except if an insert offset is passed in,
- * during evaluation, the "prefix" before the template will be checked to see
- * if it matches the template name. If so, overwrite the template name.
- * Otherwise, just insert the template at the insert offset location (by not
- * overwriting the prefix text)
- */
-public class ReplaceNameTemplateContext extends DocumentTemplateContext {
-	private int fInsertOffset = -1;
-
-	/**
-	 * Creates a document template context.
-	 * 
-	 * @param type
-	 *            the context type
-	 * @param document
-	 *            the document this context applies to
-	 * @param offset
-	 *            the offset of the document region
-	 * @param length
-	 *            the length of the document region
-	 */
-	public ReplaceNameTemplateContext(TemplateContextType type, IDocument document, int offset, int length) {
-		this(type, document, new Position(offset, length));
-	}
-
-	/**
-	 * Creates a document template context. The supplied <code>Position</code>
-	 * will be queried to compute the <code>getStart</code> and
-	 * <code>getEnd</code> methods, which will therefore answer updated
-	 * position data if it is registered with the document.
-	 * 
-	 * @param type
-	 *            the context type
-	 * @param document
-	 *            the document this context applies to
-	 * @param position
-	 *            the position describing the area of the document which forms
-	 *            the template context
-	 * @since 3.1
-	 */
-	public ReplaceNameTemplateContext(TemplateContextType type, IDocument document, Position position) {
-		super(type, document, position);
-	}
-
-	/**
-	 * Creates a document template context.
-	 * 
-	 * @param type
-	 *            the context type
-	 * @param document
-	 *            the document this context applies to
-	 * @param offset
-	 *            the offset of the document region
-	 * @param length
-	 *            the length of the document region
-	 * @param insertOffset
-	 *            the offset of the document region where insert was
-	 *            originally requested
-	 */
-	public ReplaceNameTemplateContext(TemplateContextType type, IDocument document, int offset, int length, int insertOffset) {
-		this(type, document, new Position(offset, length));
-		fInsertOffset = insertOffset;
-	}
-
-	/*
-	 * @see org.eclipse.jface.text.templates.TemplateContext#evaluate(org.eclipse.jface.text.templates.Template)
-	 */
-	public TemplateBuffer evaluate(Template template) throws BadLocationException, TemplateException {
-		TemplateBuffer buffer = super.evaluate(template);
-		if (buffer != null) {
-			if ((fInsertOffset > -1) && (fInsertOffset > getStart())) {
-				String prefix = getDocument().get(getStart(), fInsertOffset - getStart());
-				if (!template.getName().startsWith(prefix)) {
-					// generate a new buffer that actually contains the
-					// text that was going to be overwritten
-					buffer = new TemplateBuffer(prefix + buffer.getString(), buffer.getVariables());
-				}
-			}
-		}
-		return buffer;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/SimpleCMElementDeclaration.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/SimpleCMElementDeclaration.java
deleted file mode 100644
index 41a607a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/SimpleCMElementDeclaration.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-
-
-public class SimpleCMElementDeclaration implements org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration {
-
-	String fNodeName;
-
-	/**
-	 * SimpleCMELementDeclaration constructor comment.
-	 */
-	public SimpleCMElementDeclaration() {
-		super();
-	}
-
-	public SimpleCMElementDeclaration(String nodeName) {
-		super();
-		setNodeName(nodeName);
-	}
-
-	/**
-	 * getAttributes method
-	 * 
-	 * @return CMNamedNodeMap
-	 * 
-	 * Returns CMNamedNodeMap of AttributeDeclaration
-	 */
-	public org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap getAttributes() {
-		return null;
-	}
-
-	/**
-	 * getCMContent method
-	 * 
-	 * @return CMContent
-	 * 
-	 * Returns the root node of this element's content model. This can be an
-	 * CMElementDeclaration or a CMGroup
-	 */
-	public org.eclipse.wst.xml.core.internal.contentmodel.CMContent getContent() {
-		return null;
-	}
-
-	/**
-	 * getContentType method
-	 * 
-	 * @return int
-	 * 
-	 * Returns one of : ANY, EMPTY, ELEMENT, MIXED, PCDATA, CDATA.
-	 */
-	public int getContentType() {
-		return 0;
-	}
-
-	/**
-	 * getDataType method
-	 * 
-	 * @return java.lang.String
-	 */
-	public org.eclipse.wst.xml.core.internal.contentmodel.CMDataType getDataType() {
-		return null;
-	}
-
-	/**
-	 * getElementName method
-	 * 
-	 * @return java.lang.String
-	 */
-	public String getElementName() {
-		return null;
-	}
-
-	/**
-	 * getLocalElements method
-	 * 
-	 * @return CMNamedNodeMap
-	 * 
-	 * Returns a list of locally defined elements.
-	 */
-	public org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap getLocalElements() {
-		return null;
-	}
-
-	/**
-	 * getMaxOccur method
-	 * 
-	 * @return int
-	 * 
-	 * If -1, it's UNBOUNDED.
-	 */
-	public int getMaxOccur() {
-		return 0;
-	}
-
-	/**
-	 * getMinOccur method
-	 * 
-	 * @return int
-	 * 
-	 * If 0, it's OPTIONAL. If 1, it's REQUIRED.
-	 */
-	public int getMinOccur() {
-		return 0;
-	}
-
-	/**
-	 * 
-	 * @return java.lang.String
-	 */
-	public java.lang.String getNodeName() {
-		return fNodeName;
-	}
-
-	/**
-	 * getNodeType method
-	 * 
-	 * @return int
-	 * 
-	 * Returns one of :
-	 * 
-	 */
-	public int getNodeType() {
-		return 0;
-	}
-
-	/**
-	 * getProperty method
-	 * 
-	 * @return java.lang.Object
-	 * 
-	 * Returns the object property desciped by the propertyName
-	 * 
-	 */
-	public Object getProperty(String propertyName) {
-		return null;
-	}
-
-	/**
-	 * 
-	 * @param newNodeName
-	 *            java.lang.String
-	 */
-	public void setNodeName(java.lang.String newNodeName) {
-		fNodeName = newNodeName;
-	}
-
-	/**
-	 * supports method
-	 * 
-	 * @return boolean
-	 * 
-	 * Returns true if the CMNode supports a specified property
-	 * 
-	 */
-	public boolean supports(String propertyName) {
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/SourceEditorImageHelper.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/SourceEditorImageHelper.java
deleted file mode 100644
index fe16777..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/SourceEditorImageHelper.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-
-/**
- * @deprecated use internal XMLEditorPluginImageHelper or external
- *             SharedXMLEditorPluginImageHelper instead
- */
-public class SourceEditorImageHelper {
-
-	public SourceEditorImageHelper() {
-		super();
-	}
-
-	public Image createImage(String resource) {
-		ImageDescriptor desc = AbstractUIPlugin.imageDescriptorFromPlugin(XMLUIPlugin.ID, resource);
-		Image image = desc.createImage();
-		JFaceResources.getImageRegistry().put(resource, image);
-		return image;
-	}
-
-	public Image getImage(String resource) {
-		Image image = JFaceResources.getImageRegistry().get(resource);
-		if (image == null) {
-			image = createImage(resource);
-		}
-		return image;
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistProcessor.java
deleted file mode 100644
index 252c04c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistProcessor.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.eclipse.wst.xml.ui.internal.templates.TemplateContextTypeIdsXML;
-
-public class XMLContentAssistProcessor extends AbstractContentAssistProcessor implements IPropertyChangeListener {
-
-	protected IPreferenceStore fPreferenceStore = null;
-	protected IResource fResource = null;
-	private XMLTemplateCompletionProcessor fTemplateProcessor = null;
-	private List fTemplateContexts = new ArrayList();
-
-	public XMLContentAssistProcessor() {
-		super();
-	}
-
-	protected void addAttributeNameProposals(ContentAssistRequest contentAssistRequest) {
-		addTemplates(contentAssistRequest, TemplateContextTypeIdsXML.ATTRIBUTE);
-		super.addAttributeNameProposals(contentAssistRequest);
-	}
-
-	protected void addAttributeValueProposals(ContentAssistRequest contentAssistRequest) {
-		addTemplates(contentAssistRequest, TemplateContextTypeIdsXML.ATTRIBUTE_VALUE);
-		super.addAttributeValueProposals(contentAssistRequest);
-	}
-
-	protected void addEmptyDocumentProposals(ContentAssistRequest contentAssistRequest) {
-		addTemplates(contentAssistRequest, TemplateContextTypeIdsXML.NEW);
-		super.addEmptyDocumentProposals(contentAssistRequest);
-	}
-
-	protected void addTagInsertionProposals(ContentAssistRequest contentAssistRequest, int childPosition) {
-		addTemplates(contentAssistRequest, TemplateContextTypeIdsXML.TAG);
-		super.addTagInsertionProposals(contentAssistRequest, childPosition);
-	}
-
-	/**
-	 * Adds templates to the list of proposals
-	 * 
-	 * @param contentAssistRequest
-	 * @param context
-	 */
-	private void addTemplates(ContentAssistRequest contentAssistRequest, String context) {
-		addTemplates(contentAssistRequest, context, contentAssistRequest.getReplacementBeginPosition());
-	}
-
-	/**
-	 * Adds templates to the list of proposals
-	 * 
-	 * @param contentAssistRequest
-	 * @param context
-	 * @param startOffset
-	 */
-	private void addTemplates(ContentAssistRequest contentAssistRequest, String context, int startOffset) {
-		if (contentAssistRequest == null) {
-			return;
-		}
-
-		// if already adding template proposals for a certain context type, do
-		// not add again
-		if (!fTemplateContexts.contains(context)) {
-			fTemplateContexts.add(context);
-			boolean useProposalList = !contentAssistRequest.shouldSeparate();
-
-			if (getTemplateCompletionProcessor() != null) {
-				getTemplateCompletionProcessor().setContextType(context);
-				ICompletionProposal[] proposals = getTemplateCompletionProcessor().computeCompletionProposals(fTextViewer, startOffset);
-				for (int i = 0; i < proposals.length; ++i) {
-					if (useProposalList) {
-						contentAssistRequest.addProposal(proposals[i]);
-					}
-					else {
-						contentAssistRequest.addMacro(proposals[i]);
-					}
-				}
-			}
-		}
-	}
-
-	protected ContentAssistRequest computeCompletionProposals(int documentPosition, String matchString, ITextRegion completionRegion, IDOMNode treeNode, IDOMNode xmlnode) {
-		ContentAssistRequest request = super.computeCompletionProposals(documentPosition, matchString, completionRegion, treeNode, xmlnode);
-		// bug115927 use original document position for all/any region
-		// templates
-		addTemplates(request, TemplateContextTypeIdsXML.ALL, documentPosition);
-		return request;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xml.ui.contentassist.AbstractContentAssistProcessor#computeCompletionProposals(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer textViewer, int documentPosition) {
-		fTemplateContexts.clear();
-		return super.computeCompletionProposals(textViewer, documentPosition);
-	}
-
-	protected IPreferenceStore getPreferenceStore() {
-		if (fPreferenceStore == null) {
-			fPreferenceStore = XMLUIPlugin.getDefault().getPreferenceStore();
-		}
-		return fPreferenceStore;
-	}
-
-	private XMLTemplateCompletionProcessor getTemplateCompletionProcessor() {
-		if (fTemplateProcessor == null) {
-			fTemplateProcessor = new XMLTemplateCompletionProcessor();
-		}
-		return fTemplateProcessor;
-	}
-
-	protected void init() {
-		getPreferenceStore().addPropertyChangeListener(this);
-		reinit();
-	}
-
-	public void propertyChange(PropertyChangeEvent event) {
-		String property = event.getProperty();
-
-		if ((property.compareTo(XMLUIPreferenceNames.AUTO_PROPOSE) == 0) || (property.compareTo(XMLUIPreferenceNames.AUTO_PROPOSE_CODE) == 0)) {
-			reinit();
-		}
-	}
-
-	protected void reinit() {
-		String key = XMLUIPreferenceNames.AUTO_PROPOSE;
-		boolean doAuto = getPreferenceStore().getBoolean(key);
-		if (doAuto) {
-			key = XMLUIPreferenceNames.AUTO_PROPOSE_CODE;
-			completionProposalAutoActivationCharacters = getPreferenceStore().getString(key).toCharArray();
-		}
-		else {
-			completionProposalAutoActivationCharacters = null;
-		}
-	}
-
-	public void release() {
-		super.release();
-		getPreferenceStore().removePropertyChangeListener(this);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistUtilities.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistUtilities.java
deleted file mode 100644
index 4aa4b34..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentAssistUtilities.java
+++ /dev/null
@@ -1,516 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.util.ScriptLanguageKeys;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * @author pavery
- */
-public class XMLContentAssistUtilities extends ContentAssistUtils {
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	private class DOMJSPRegionContextsPrivateCopy {
-		private static final String JSP_CLOSE = "JSP_CLOSE"; //$NON-NLS-1$
-		private static final String JSP_DECLARATION_OPEN = "JSP_DECLARATION_OPEN"; //$NON-NLS-1$
-		private static final String JSP_SCRIPTLET_OPEN = "JSP_SCRIPTLET_OPEN"; //$NON-NLS-1$
-		private static final String JSP_EXPRESSION_OPEN = "JSP_EXPRESSION_OPEN"; //$NON-NLS-1$
-
-	}
-
-
-	public static final String CONTENT = "Content"; //$NON-NLS-1$
-	public static final String CONTENT_SCRIPT_TYPE = "Content-Script-Type"; //$NON-NLS-1$
-	public static final String HEAD = "HEAD"; //$NON-NLS-1$
-	public static final String HTML = "HTML"; //$NON-NLS-1$
-	public static final String HTTP_EQUIV = "HTTP-EQUIV"; //$NON-NLS-1$
-	public static final String META = "META"; //$NON-NLS-1$
-
-	/**
-	 * A convenience method for getting the closing proposal given the
-	 * contents (IndexedRegion) of a tag that is started, but possibly not
-	 * ended
-	 * 
-	 * @param viewer
-	 *            the text viewer
-	 * @param documentPosition
-	 *            the cursor position in the viewer
-	 * @param indexedNode
-	 *            the contents of the tag that is started but possibly not
-	 *            ended
-	 * @param parentTagName
-	 *            the tag on which you are checkin for an ending tag
-	 * @param imagePath
-	 *            content assist image relative path
-	 * @return ICompletionProposal
-	 */
-	public static ICompletionProposal computeJSPEndTagProposal(ITextViewer viewer, int documentPosition, IndexedRegion indexedNode, String parentTagName, String imagePath) {
-		ICompletionProposal p = null;
-
-		// check if tag is closed
-		boolean hasEndTag = true;
-		boolean isJSPTag = false;
-		IDOMNode xnode = null;
-		String tagName = ""; //$NON-NLS-1$
-		if (indexedNode instanceof IDOMNode) {
-			xnode = ((IDOMNode) indexedNode);
-			// it's ended already...
-			if (xnode.getEndStructuredDocumentRegion() != null) {
-				return null;
-			}
-			IDOMNode openNode = null;
-			if (!xnode.getNodeName().equalsIgnoreCase(parentTagName)) {
-				openNode = (IDOMNode) xnode.getParentNode();
-			}
-			if (openNode != null) {
-				if (openNode instanceof IDOMElement) {
-					isJSPTag = ((IDOMElement) openNode).isJSPTag();
-				}
-				tagName = openNode.getNodeName();
-				hasEndTag = (openNode.getEndStructuredDocumentRegion() != null);
-			}
-		}
-
-		// it's closed, don't add close tag proposal
-		if (!hasEndTag && !isJSPTag) {
-
-			// create appropriate close tag text
-			String proposedText = "</" + tagName; //$NON-NLS-1$
-			String viewerText = viewer.getTextWidget().getText();
-			if ((viewerText.length() >= documentPosition) && (viewerText.length() >= 2) && (documentPosition >= 2)) {
-				String last2chars = viewerText.substring(documentPosition - 2, documentPosition);
-				if (last2chars.endsWith("</")) {
-					proposedText = tagName;
-				}
-				else if (last2chars.endsWith("<")) {
-					proposedText = "/" + tagName; //$NON-NLS-1$
-				}
-			}
-
-			// create proposal
-			p = new CustomCompletionProposal(proposedText + ">", //$NON-NLS-1$
-						documentPosition, 0, proposedText.length() + 1, XMLEditorPluginImageHelper.getInstance().getImage(imagePath), NLS.bind(XMLUIMessages.End_with_, (new Object[]{proposedText})), null, null, XMLRelevanceConstants.R_END_TAG);
-		}
-		else if (!hasEndTag && isJSPTag) {
-
-			// create appropriate close tag text
-			String proposedText = "%"; //$NON-NLS-1$
-			String viewerText = viewer.getTextWidget().getText();
-
-			// TODO (pa) make it smarter to add "%>" or just ">" if % is
-			// already there...
-			if ((viewerText.length() >= documentPosition) && (viewerText.length() >= 2)) {
-				String last2chars = viewerText.substring(documentPosition - 2, documentPosition);
-				String lastchar = viewerText.substring(documentPosition - 1, documentPosition);
-				if (lastchar.equals("%")) //$NON-NLS-1$
-				{
-					if (last2chars.endsWith("<%")) {
-						proposedText = "%"; //$NON-NLS-1$
-					}
-					else {
-						proposedText = ""; //$NON-NLS-1$
-					}
-				}
-			}
-
-			// create proposal
-			p = new CustomCompletionProposal(proposedText + ">", //$NON-NLS-1$
-						documentPosition, 0, proposedText.length() + 1, XMLEditorPluginImageHelper.getInstance().getImage(imagePath), NLS.bind(XMLUIMessages.End_with_, (new Object[]{proposedText})), null, null, XMLRelevanceConstants.R_END_TAG);
-		}
-
-		return p;
-	}
-
-
-	/**
-	 * A convenience method for getting the closing proposal given the
-	 * contents (IndexedRegion) of a tag that is started, but possibly not
-	 * ended
-	 * 
-	 * @param viewer
-	 *            the text viewer
-	 * @param documentPosition
-	 *            the cursor position in the viewer
-	 * @param indexedNode
-	 *            the contents of the tag that is started but possibly not
-	 *            ended
-	 * @param parentTagName
-	 *            the tag on which you are checkin for an ending tag
-	 * @param imagePath
-	 *            content assist relative image path
-	 * @return ICompletionProposal
-	 */
-	public static ICompletionProposal computeXMLEndTagProposal(ITextViewer viewer, int documentPosition, IndexedRegion indexedNode, String parentTagName, String imagePath) {
-		ICompletionProposal p = null;
-
-		// check if tag is closed
-		boolean hasEndTag = true;
-		IDOMNode xnode = null;
-		String tagName = ""; //$NON-NLS-1$
-		if (indexedNode instanceof IDOMNode) {
-			xnode = ((IDOMNode) indexedNode);
-			// it's ended already...
-			if (xnode.getEndStructuredDocumentRegion() != null) {
-				return null;
-			}
-			IDOMNode styleNode = null;
-			if (!xnode.getNodeName().equalsIgnoreCase(parentTagName)) {
-				styleNode = (IDOMNode) xnode.getParentNode();
-			}
-			if (styleNode != null) {
-				tagName = styleNode.getNodeName();
-				hasEndTag = (styleNode.getEndStructuredDocumentRegion() != null);
-			}
-		}
-
-		// it's closed, don't add close tag proposal
-		if (!hasEndTag) {
-
-			// create appropriate close tag text
-			String proposedText = "</" + tagName; //$NON-NLS-1$
-			String viewerText = viewer.getTextWidget().getText();
-			if ((viewerText.length() >= documentPosition) && (viewerText.length() >= 2) && (documentPosition >= 2)) {
-				String last2chars = viewerText.substring(documentPosition - 2, documentPosition);
-				if (last2chars.endsWith("</")) {
-					proposedText = tagName;
-				}
-				else if (last2chars.endsWith("<")) {
-					proposedText = "/" + tagName; //$NON-NLS-1$
-				}
-			}
-
-			// create proposal
-			p = new CustomCompletionProposal(proposedText + ">", //$NON-NLS-1$
-						documentPosition, 0, proposedText.length() + 1, XMLEditorPluginImageHelper.getInstance().getImage(imagePath), NLS.bind(XMLUIMessages.End_with_, (new Object[]{proposedText})), null, null, XMLRelevanceConstants.R_END_TAG);
-		}
-		return p;
-	}
-
-	private static String getMetaScriptType(Document doc) {
-		// Can not just do a Document.getElementsByTagName(String) as this
-		// needs
-		// to be relatively fast.
-		List metas = new ArrayList();
-		// check for META tags under the Document
-		Node html = null;
-		Node head = null;
-		Node child = null;
-		// ----------------------------------------------------------------------
-		// (pa) 20021217
-		// cmvc defect 235554
-		// performance enhancement: using child.getNextSibling() rather than
-		// nodeList(item) for O(n) vs. O(n*n)
-		// ----------------------------------------------------------------------
-
-		for (child = doc.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child.getNodeType() != Node.ELEMENT_NODE) {
-				continue;
-			}
-			if (child.getNodeName().equalsIgnoreCase(META)) {
-				metas.add(child);
-			}
-			else if (child.getNodeName().equalsIgnoreCase(HTML)) {
-				html = child;
-			}
-		}
-		// NodeList children = doc.getChildNodes();
-		// for(int i = 0; i < children.getLength(); i++) {
-		// child = children.item(i);
-		// if(child.getNodeType() != Node.ELEMENT_NODE)
-		// continue;
-		// if(child.getNodeName().equalsIgnoreCase(META))
-		// metas.add(child);
-		// else if(child.getNodeName().equalsIgnoreCase(HTML))
-		// html = child;
-		// }
-
-		// check for META tags under HEAD
-		if (html != null) {
-			for (child = html.getFirstChild(); (child != null) && (head == null); child = child.getNextSibling()) {
-				if (child.getNodeType() != Node.ELEMENT_NODE) {
-					continue;
-				}
-				if (child.getNodeName().equalsIgnoreCase(HEAD)) {
-					head = child;
-				}
-			}
-			// children = html.getChildNodes();
-			// for(int i = 0; i < children.getLength() && head == null; i++) {
-			// child = children.item(i);
-			// if(child.getNodeType() != Node.ELEMENT_NODE)
-			// continue;
-			// if(child.getNodeName().equalsIgnoreCase(HEAD))
-			// head = child;
-			// }
-		}
-
-		if (head != null) {
-			for (head.getFirstChild(); child != null; child = child.getNextSibling()) {
-				if (child.getNodeType() != Node.ELEMENT_NODE) {
-					continue;
-				}
-				if (child.getNodeName().equalsIgnoreCase(META)) {
-					metas.add(child);
-				}
-			}
-			// children = head.getChildNodes();
-			// for(int i = 0 ; i < children.getLength(); i++) {
-			// child = children.item(i);
-			// if(child.getNodeType() != Node.ELEMENT_NODE)
-			// continue;
-			// if(child.getNodeName().equalsIgnoreCase(META))
-			// metas.add(child);
-			// }
-		}
-
-		return getMetaScriptType(metas);
-	}
-
-	private static String getMetaScriptType(List metaNodeList) {
-		Node meta = null;
-		NamedNodeMap attributes = null;
-		boolean httpEquiv = false;
-		String contentScriptType = null;
-
-		for (int i = metaNodeList.size() - 1; i >= 0; i--) {
-			meta = (Node) metaNodeList.get(i);
-			attributes = meta.getAttributes();
-			httpEquiv = false;
-			contentScriptType = null;
-			for (int j = 0; j < attributes.getLength(); j++) {
-				if (attributes.item(j).getNodeName().equalsIgnoreCase(HTTP_EQUIV)) {
-					httpEquiv = attributes.item(j).getNodeValue().equalsIgnoreCase(CONTENT_SCRIPT_TYPE);
-				}
-				else if (attributes.item(j).getNodeName().equalsIgnoreCase(CONTENT)) {
-					contentScriptType = attributes.item(j).getNodeValue();
-				}
-			}
-			if (httpEquiv && (contentScriptType != null)) {
-				return contentScriptType;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the scripting language the scriptNode is in Currently returns
-	 * javascript unless some unknown type or language is specified. Then the
-	 * unknown type/language is returned
-	 * 
-	 * @param scriptNode
-	 */
-	public static String getScriptLanguage(Node scriptNode) {
-		Node attr = null;
-
-		boolean specified = false;
-		// try to find a scripting adapter for 'type'
-		if ((scriptNode == null) || (scriptNode.getAttributes() == null)) {
-			return null;
-		}
-
-		attr = scriptNode.getAttributes().getNamedItem("type");//$NON-NLS-1$
-		if (attr != null) {
-			specified = true;
-			String type = attr.getNodeValue();
-			return lookupScriptType(type);
-		}
-		// now try to find a scripting adapter for 'language' (deprecated by
-		// HTML specifications)
-		attr = scriptNode.getAttributes().getNamedItem("language");//$NON-NLS-1$
-		if (attr != null) {
-			specified = true;
-			String language = attr.getNodeValue();
-			return lookupScriptLanguage(language);
-		}
-		// check if one is specified by a META tag at the root level or inside
-		// of HEAD
-		String type = null;
-		if (!specified) {
-			type = getMetaScriptType(scriptNode.getOwnerDocument());
-		}
-		if (type != null) {
-			specified = true;
-			return lookupScriptType(type);
-		}
-		// return default
-		if (!specified) {
-			return ScriptLanguageKeys.JAVASCRIPT;
-		}
-		return null;
-	}
-
-	/**
-	 * Tells you if the flatnode is the %> delimiter
-	 * 
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	public static boolean isJSPCloseDelimiter(IStructuredDocumentRegion fn) {
-		if (fn == null) {
-			return false;
-		}
-		return isJSPCloseDelimiter(fn.getType());
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	public static boolean isJSPCloseDelimiter(String type) {
-		if (type == null) {
-			return false;
-		}
-		return (type.equals(DOMJSPRegionContextsPrivateCopy.JSP_CLOSE) || type.equals(DOMRegionContext.XML_TAG_CLOSE));
-	}
-
-	/**
-	 * Tells you if the flatnode is the JSP region <%%>, <%=%>, <%!%>
-	 * 
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	public static boolean isJSPDelimiter(IStructuredDocumentRegion fn) {
-		boolean isDelimiter = false;
-		String type = fn.getType();
-		if (type != null) {
-			isDelimiter = isJSPDelimiter(type);
-		}
-		return isDelimiter;
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	public static boolean isJSPDelimiter(String type) {
-		if (type == null) {
-			return false;
-		}
-		return (isJSPOpenDelimiter(type) || isJSPCloseDelimiter(type));
-	}
-
-	/**
-	 * Tells you if the flatnode is <%, <%=, or <%! ISSUE: this is a bit of
-	 * hidden JSP knowledge that was implemented this way for expedency.
-	 * Should be evolved in future to depend on "nestedContext".
-	 */
-	public static boolean isJSPOpenDelimiter(IStructuredDocumentRegion fn) {
-		if (fn == null) {
-			return false;
-		}
-		return isJSPOpenDelimiter(fn.getType());
-	}
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	public static boolean isJSPOpenDelimiter(String type) {
-		if (type == null) {
-			return false;
-		}
-		return (type.equals(DOMJSPRegionContextsPrivateCopy.JSP_SCRIPTLET_OPEN) || type.equals(DOMJSPRegionContextsPrivateCopy.JSP_DECLARATION_OPEN) || type.equals(DOMJSPRegionContextsPrivateCopy.JSP_EXPRESSION_OPEN));
-	}
-
-	/**
-	 * Tells you if the flatnode is the <jsp:scriptlet>, <jsp:expression>, or
-	 * <jsp:declaration>tag
-	 * 
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	public static boolean isXMLJSPDelimiter(IStructuredDocumentRegion fn) {
-		boolean isDelimiter = false;
-		if ((fn != null) && (fn instanceof ITextRegionContainer)) {
-			Object[] regions = ((ITextRegionContainer) fn).getRegions().toArray();
-			ITextRegion temp = null;
-			String regionText = ""; //$NON-NLS-1$
-			for (int i = 0; i < regions.length; i++) {
-				temp = (ITextRegion) regions[i];
-				if (temp.getType() == DOMRegionContext.XML_TAG_NAME) {
-					regionText = fn.getText(temp);
-					if (regionText.equalsIgnoreCase("jsp:scriptlet") || regionText.equalsIgnoreCase("jsp:expression") || regionText.equalsIgnoreCase("jsp:declaration")) {
-						isDelimiter = true;
-					}
-				}
-			}
-		}
-		return isDelimiter;
-	}
-
-	/**
-	 * Returns "javascript" if language attribute is some form of javascript,
-	 * "java" if language attribute is some form of java. Otherwise, just
-	 * returns type.
-	 * 
-	 * @param language
-	 */
-	public static String lookupScriptLanguage(String language) {
-		for (int i = 0; i < ScriptLanguageKeys.JAVASCRIPT_LANGUAGE_KEYS.length; i++) {
-			if (ScriptLanguageKeys.JAVASCRIPT_LANGUAGE_KEYS[i].equalsIgnoreCase(language)) {
-				return ScriptLanguageKeys.JAVASCRIPT;
-			}
-		}
-		for (int i = 0; i < ScriptLanguageKeys.JAVA_LANGUAGE_KEYS.length; i++) {
-			if (ScriptLanguageKeys.JAVA_LANGUAGE_KEYS[i].equalsIgnoreCase(language)) {
-				return ScriptLanguageKeys.JAVA;
-			}
-		}
-		return language;
-	}
-
-	/**
-	 * Returns "javascript" if type (used in <script type="xxx"> is actually
-	 * javascript type. Otherwise, just returns type
-	 * 
-	 * @param type
-	 */
-	public static String lookupScriptType(String type) {
-		for (int i = 0; i < ScriptLanguageKeys.JAVASCRIPT_MIME_TYPE_KEYS.length; i++) {
-			if (ScriptLanguageKeys.JAVASCRIPT_MIME_TYPE_KEYS[i].equalsIgnoreCase(type)) {
-				return ScriptLanguageKeys.JAVASCRIPT;
-			}
-		}
-		return type;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentModelGenerator.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentModelGenerator.java
deleted file mode 100644
index 2896432..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLContentModelGenerator.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Node;
-
-
-public class XMLContentModelGenerator extends AbstractContentModelGenerator {
-
-	/**
-	 * ISSUE: this is a bit of hidden JSP knowledge that was implemented this
-	 * way for expedency. Should be evolved in future to depend on
-	 * "nestedContext".
-	 */
-	private class DOMJSPRegionContextsPrivateCopy {
-		private static final String JSP_DIRECTIVE_OPEN = "JSP_DIRECTIVE_OPEN"; //$NON-NLS-1$
-	}
-
-	/**
-	 * XMLContentModelGenerator constructor comment.
-	 */
-	public XMLContentModelGenerator() {
-		super();
-	}
-
-	public void generateAttribute(CMAttributeDeclaration attrDecl, StringBuffer buffer) {
-		if ((attrDecl == null) || (buffer == null)) {
-			return;
-		}
-		int usage = attrDecl.getUsage();
-		if (usage == CMAttributeDeclaration.REQUIRED) {
-			buffer.append(" "); //$NON-NLS-1$
-			generateRequiredAttribute(null, attrDecl, buffer); // todo pass
-			// ownerNode as
-			// 1st param
-		}
-		return;
-	}
-
-	protected void generateEndTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer) {
-		if (elementDecl == null) {
-			return;
-		}
-		if (elementDecl.getContentType() != CMElementDeclaration.EMPTY) {
-			buffer.append("</" + tagName + ">");//$NON-NLS-2$//$NON-NLS-1$
-		}
-		return;
-	}
-
-	public void generateRequiredAttribute(Node ownerNode, CMAttributeDeclaration attrDecl, StringBuffer buffer) {
-		if ((attrDecl == null) || (buffer == null)) {
-			return;
-		}
-
-		// attribute name
-		String attributeName = getRequiredName(ownerNode, attrDecl);
-		CMDataType attrType = attrDecl.getAttrType();
-		String defaultValue = null;
-		// = sign
-		buffer.append(attributeName + "="); //$NON-NLS-1$
-		// attribute value
-		if (attrType != null) {
-			// insert any value that is implied
-			if ((attrType.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE) && (attrType.getImpliedValue() != null)) {
-				defaultValue = attrType.getImpliedValue();
-			}
-			// otherwise, if an enumerated list of values exists, use the
-			// first value
-			else if ((attrType.getEnumeratedValues() != null) && (attrType.getEnumeratedValues().length > 0)) {
-				defaultValue = attrType.getEnumeratedValues()[0];
-			}
-		}
-		
-		char attrQuote = '\"';
-		// Found a double quote, wrap the attribute in single quotes
-		if(defaultValue != null && defaultValue.indexOf(attrQuote) >= 0) {
-			attrQuote = '\'';
-		}
-		
-		buffer.append(attrQuote);
-		buffer.append(((defaultValue != null) ? defaultValue : "")); //$NON-NLS-1$
-		buffer.append(attrQuote);
-		return;
-	}
-
-	protected void generateStartTag(String tagName, Node parentNode, CMElementDeclaration elementDecl, StringBuffer buffer) {
-		if ((elementDecl == null) || (buffer == null)) {
-			return;
-		}
-		buffer.append("<" + tagName);//$NON-NLS-1$
-		generateAttributes(elementDecl, buffer);
-		buffer.append(getStartTagClose(parentNode, elementDecl));
-		return;
-	}
-
-	public int getMinimalStartTagLength(Node node, CMElementDeclaration elementDecl) {
-		if (elementDecl == null) {
-			return 0;
-		}
-		if (requiresAttributes(elementDecl)) {
-			return getRequiredName(node, elementDecl).length() + 2; // < +
-			// name +
-			// space
-		}
-		else {
-			return 1 + getRequiredName(node, elementDecl).length() + getStartTagClose(node, elementDecl).length(); // < +
-			// name
-			// +
-			// appropriate
-			// close
-		}
-	}
-
-	protected String getOtherClose(Node notATagNode) {
-		if (notATagNode instanceof IDOMNode) {
-			IStructuredDocumentRegion node = ((IDOMNode) notATagNode).getStartStructuredDocumentRegion();
-			if ((node != null) && (node.getNumberOfRegions() > 1) && node.getRegions().get(0).getType().equals(DOMJSPRegionContextsPrivateCopy.JSP_DIRECTIVE_OPEN)) {
-				return "%>"; //$NON-NLS-1$
-			}
-		}
-		return null;
-	}
-
-	public String getStartTagClose(Node parentNode, CMElementDeclaration elementDecl) {
-		String other = getOtherClose(parentNode);
-		if (other != null) {
-			return other;
-		}
-		if (elementDecl == null) {
-			return ">";//$NON-NLS-1$
-		}
-		if (elementDecl.getContentType() == CMElementDeclaration.EMPTY) {
-			return "/>"; //$NON-NLS-1$
-		}
-		return ">"; //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLRelevanceConstants.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLRelevanceConstants.java
deleted file mode 100644
index 4a99070..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLRelevanceConstants.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import org.eclipse.wst.sse.ui.internal.contentassist.IRelevanceConstants;
-
-
-
-/**
- * some relevance constants for content assist higher relevance means it shows
- * up higher on the list
- */
-public interface XMLRelevanceConstants extends IRelevanceConstants {
-
-	int R_CDATA = 400;
-	int R_CLOSE_TAG = 1500;
-
-	int R_COMMENT = 100;
-
-	// moved this above macros
-	int R_DOCTYPE = 600;
-	int R_END_TAG = 1400;
-	int R_END_TAG_NAME = 1100;
-	int R_ENTITY = 1000;
-	int R_JSP = 500;
-
-	int R_JSP_ATTRIBUTE_VALUE = 700;
-
-	// (pa) make these the same relevance so proposals are same order for V501
-	int R_MACRO = 500;
-
-	// add this onto "required" attrs, elements, etc to bubble them up on
-	// sorting...
-	// CMVC 246618
-	int R_REQUIRED = 10;
-	int R_TAG_INSERTION = 500;
-	int R_STRICTLY_VALID_TAG_INSERTION = 600;
-	int R_TAG_NAME = 1200;
-	int R_XML_ATTRIBUTE_NAME = 900;
-	int R_XML_ATTRIBUTE_VALUE = 800;
-	int R_XML_DECLARATION = 1300;
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLTemplateCompletionProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLTemplateCompletionProcessor.java
deleted file mode 100644
index 29f9ad2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentassist/XMLTemplateCompletionProcessor.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentassist;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.text.templates.TemplateCompletionProcessor;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.jface.text.templates.TemplateContextType;
-import org.eclipse.jface.text.templates.TemplateException;
-import org.eclipse.jface.text.templates.TemplateProposal;
-import org.eclipse.jface.text.templates.persistence.TemplateStore;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-
-/**
- * Completion processor for XML Templates. Most of the work is already done by
- * the XML Content Assist processor, so by the time the
- * XMLTemplateCompletionProcessor is asked for content assist proposals, the
- * XML content assist processor has already set the context type for
- * templates.
- */
-class XMLTemplateCompletionProcessor extends TemplateCompletionProcessor {
-	private static final class ProposalComparator implements Comparator {
-		public int compare(Object o1, Object o2) {
-			return ((TemplateProposal) o2).getRelevance() - ((TemplateProposal) o1).getRelevance();
-		}
-	}
-
-	private static final Comparator fgProposalComparator = new ProposalComparator();
-	private String fContextTypeId = null;
-
-	/*
-	 * Copied from super class except instead of calling createContext(viewer,
-	 * region) call createContext(viewer, region, offset) instead
-	 */
-	public ICompletionProposal[] computeCompletionProposals(ITextViewer viewer, int offset) {
-
-		ITextSelection selection = (ITextSelection) viewer.getSelectionProvider().getSelection();
-
-		// adjust offset to end of normalized selection
-		if (selection.getOffset() == offset) {
-			offset = selection.getOffset() + selection.getLength();
-		}
-
-		String prefix = extractPrefix(viewer, offset);
-		Region region = new Region(offset - prefix.length(), prefix.length());
-		TemplateContext context = createContext(viewer, region, offset);
-		if (context == null) {
-			return new ICompletionProposal[0];
-		}
-
-		// name of the selection variables {line, word}_selection
-		context.setVariable("selection", selection.getText()); //$NON-NLS-1$
-
-		Template[] templates = getTemplates(context.getContextType().getId());
-
-		List matches = new ArrayList();
-		for (int i = 0; i < templates.length; i++) {
-			Template template = templates[i];
-			try {
-				context.getContextType().validate(template.getPattern());
-			}
-			catch (TemplateException e) {
-				continue;
-			}
-			if (template.matches(prefix, context.getContextType().getId())) {
-				matches.add(createProposal(template, context, (IRegion) region, getRelevance(template, prefix)));
-			}
-		}
-
-		Collections.sort(matches, fgProposalComparator);
-
-		return (ICompletionProposal[]) matches.toArray(new ICompletionProposal[matches.size()]);
-	}
-
-	/**
-	 * Creates a concrete template context for the given region in the
-	 * document. This involves finding out which context type is valid at the
-	 * given location, and then creating a context of this type. The default
-	 * implementation returns a <code>SmartReplaceTemplateContext</code> for
-	 * the context type at the given location. This takes the offset at which
-	 * content assist was invoked into consideration.
-	 * 
-	 * @param viewer
-	 *            the viewer for which the context is created
-	 * @param region
-	 *            the region into <code>document</code> for which the
-	 *            context is created
-	 * @param offset
-	 *            the original offset where content assist was invoked
-	 * @return a template context that can handle template insertion at the
-	 *         given location, or <code>null</code>
-	 */
-	private TemplateContext createContext(ITextViewer viewer, IRegion region, int offset) {
-		// pretty much same code as super.createContext except create
-		// SmartReplaceTemplateContext
-		TemplateContextType contextType = getContextType(viewer, region);
-		if (contextType != null) {
-			IDocument document = viewer.getDocument();
-			return new ReplaceNameTemplateContext(contextType, document, region.getOffset(), region.getLength(), offset);
-		}
-		return null;
-	}
-
-	protected ICompletionProposal createProposal(Template template, TemplateContext context, IRegion region, int relevance) {
-		return new CustomTemplateProposal(template, context, region, getImage(template), relevance);
-	}
-
-	protected TemplateContextType getContextType(ITextViewer viewer, IRegion region) {
-		TemplateContextType type = null;
-
-		ContextTypeRegistry registry = getTemplateContextRegistry();
-		if (registry != null) {
-			type = registry.getContextType(fContextTypeId);
-		}
-
-		return type;
-	}
-
-	protected Image getImage(Template template) {
-		// just return the same image for now
-		return XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TAG_MACRO);
-	}
-
-	private ContextTypeRegistry getTemplateContextRegistry() {
-		return XMLUIPlugin.getDefault().getTemplateContextRegistry();
-	}
-
-	protected Template[] getTemplates(String contextTypeId) {
-		Template templates[] = null;
-
-		TemplateStore store = getTemplateStore();
-		if (store != null) {
-			templates = store.getTemplates(contextTypeId);
-		}
-
-		return templates;
-	}
-
-	private TemplateStore getTemplateStore() {
-		return XMLUIPlugin.getDefault().getTemplateStore();
-	}
-
-	void setContextType(String contextTypeId) {
-		fContextTypeId = contextTypeId;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeAdapter.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeAdapter.java
deleted file mode 100644
index 0ea3570..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeAdapter.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentoutline;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.xml.ui.internal.editor.CMImageUtil;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.w3c.dom.Node;
-
-/**
- * Adapts a DOM node to a JFace viewer.
- */
-public class JFaceNodeAdapter implements IJFaceNodeAdapter {
-
-	final static Class ADAPTER_KEY = IJFaceNodeAdapter.class;
-
-	/**
-	 * debug .option
-	 */
-	private static final boolean DEBUG = getDebugValue();
-
-	private static boolean getDebugValue() {
-		String value = Platform.getDebugOption("org.eclipse.wst.sse.ui/debug/outline"); //$NON-NLS-1$
-		boolean result = (value != null) && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-		return result;
-	}
-
-	JFaceNodeAdapterFactory fAdapterFactory;
-	RefreshStructureJob fRefreshJob = null;
-
-	public JFaceNodeAdapter(JFaceNodeAdapterFactory adapterFactory) {
-		super();
-		this.fAdapterFactory = adapterFactory;
-	}
-
-	protected Image createImage(Object object) {
-		Image image = null;
-		Node node = (Node) object;
-		switch (node.getNodeType()) {
-			case Node.ELEMENT_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ELEMENT);
-				break;
-			}
-			case Node.ATTRIBUTE_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE);
-				break;
-			}
-			case Node.TEXT_NODE : { // actually, TEXT should never be seen in
-				// the tree
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_TXTEXT);
-				break;
-			}
-			case Node.CDATA_SECTION_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_CDATASECTION);
-				break;
-			}
-			case Node.ENTITY_REFERENCE_NODE :
-			case Node.ENTITY_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_ENTITY);
-				break;
-			}
-			case Node.PROCESSING_INSTRUCTION_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_PROCESSINGINSTRUCTION);
-				break;
-			}
-			case Node.COMMENT_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_COMMENT);
-				break;
-			}
-			case Node.DOCUMENT_TYPE_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_DOCTYPE);
-				break;
-			}
-			case Node.NOTATION_NODE : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_NOTATION);
-				break;
-			}
-			default : {
-				image = createXMLImageDescriptor(XMLEditorPluginImages.IMG_OBJ_TXTEXT);
-				break;
-			}
-		}
-		return image;
-	}
-
-	protected Image createXMLImageDescriptor(String imageResourceName) {
-		return XMLEditorPluginImageHelper.getInstance().getImage(imageResourceName);
-	}
-
-	public Object[] getChildren(Object object) {
-
-		// (pa) 20021217
-		// cmvc defect 235554
-		// performance enhancement: using child.getNextSibling() rather than
-		// nodeList(item) for O(n) vs. O(n*n)
-		//
-		ArrayList v = new ArrayList();
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
-				Node n = child;
-				if (n.getNodeType() != Node.TEXT_NODE) {
-					v.add(n);
-				}
-			}
-		}
-		return v.toArray();
-	}
-
-	/**
-	 * Returns an enumeration with the elements belonging to the passed
-	 * element. These are the top level items in a list, tree, table, etc...
-	 */
-	public Object[] getElements(Object node) {
-		return getChildren(node);
-	}
-
-	/**
-	 * Fetches the label image specific to this object instance.
-	 */
-	public Image getLabelImage(Object node) {
-		Image image = null;
-		if (node instanceof Node) {
-			// check for an image from the content model
-			image = CMImageUtil.getImage(CMImageUtil.getDeclaration((Node) node));
-			if (image == null) {
-				/*
-				 * Create/get image based on Node type. Images are cached
-				 * transparently in this class, subclasses must do this for
-				 * themselves if they're going to return their own results.
-				 */
-				image = createImage(node);
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * Fetches the label text specific to this object instance.
-	 */
-	public String getLabelText(Object node) {
-		return getNodeName(node);
-	}
-
-	private String getNodeName(Object object) {
-		StringBuffer nodeName = new StringBuffer();
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			nodeName.append(node.getNodeName());
-
-			if (node.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
-				nodeName.insert(0, "DOCTYPE:"); //$NON-NLS-1$
-			}
-
-		}
-		return nodeName.toString();
-	}
-
-
-	public Object getParent(Object object) {
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			return node.getParentNode();
-		}
-		return null;
-	}
-
-	private synchronized RefreshStructureJob getRefreshJob() {
-		if (fRefreshJob == null) {
-			fRefreshJob = new RefreshStructureJob();
-		}
-		return fRefreshJob;
-	}
-
-
-	public boolean hasChildren(Object object) {
-		// (pa) 20021217
-		// cmvc defect 235554 > use child.getNextSibling() instead of
-		// nodeList(item) for O(n) vs. O(n*n)
-		Node node = (Node) object;
-		for (Node child = node.getFirstChild(); child != null; child = child.getNextSibling()) {
-			if (child.getNodeType() != Node.TEXT_NODE) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Allowing the INodeAdapter to compare itself against the type allows it
-	 * to return true in more than one case.
-	 */
-	public boolean isAdapterForType(Object type) {
-		if (type == null) {
-			return false;
-		}
-		return type.equals(ADAPTER_KEY);
-	}
-
-	/**
-	 * Called by the object being adapter (the notifier) when something has
-	 * changed.
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-		// future_TODO: the 'uijobs' used in this method were added to solve
-		// threading problems when the dom
-		// is updated in the background while the editor is open. They may be
-		// a bit overkill and not that useful.
-		// (That is, may be be worthy of job manager management). If they are
-		// found to be important enough to leave in,
-		// there's probably some optimization that can be done.
-		if (notifier instanceof Node) {
-			Collection listeners = fAdapterFactory.getListeners();
-			Iterator iterator = listeners.iterator();
-
-			while (iterator.hasNext()) {
-				Object listener = iterator.next();
-				// https://bugs.eclipse.org/bugs/show_bug.cgi?id=90637
-				// if (notifier instanceof Node && (listener instanceof
-				// StructuredViewer) && (eventType ==
-				// INodeNotifier.STRUCTURE_CHANGED || (eventType ==
-				// INodeNotifier.CHANGE && changedFeature == null))) {
-				if ((listener instanceof StructuredViewer) && ((eventType == INodeNotifier.STRUCTURE_CHANGED) || (eventType == INodeNotifier.CONTENT_CHANGED) || (eventType == INodeNotifier.CHANGE))) {
-					if (DEBUG) {
-						System.out.println("JFaceNodeAdapter notified on event type > " + eventType); //$NON-NLS-1$
-					}
-
-					// refresh on structural and "unknown" changes
-					StructuredViewer structuredViewer = (StructuredViewer) listener;
-					// https://w3.opensource.ibm.com/bugzilla/show_bug.cgi?id=5230
-					if (structuredViewer.getControl() != null) {
-						getRefreshJob().refresh(structuredViewer, (Node) notifier);
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeAdapterFactory.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeAdapterFactory.java
deleted file mode 100644
index 3943403..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeAdapterFactory.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentoutline;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.sse.core.internal.provisional.AbstractAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.util.Assert;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapterFactory;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManagerListener;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.ssemodelquery.ModelQueryAdapter;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-
-/**
- * An adapter factory to create JFaceNodeAdapters. Use this adapter factory
- * with a JFaceAdapterContentProvider to display DOM nodes in a tree.
- */
-public class JFaceNodeAdapterFactory extends AbstractAdapterFactory implements IJFaceNodeAdapterFactory {
-	public class CMDocumentManagerListenerImpl implements CMDocumentManagerListener {
-		private static final int UPDATE_DELAY = 200;
-
-		public void cacheCleared(CMDocumentCache cache) {
-			// nothing to do
-		}
-
-		public void cacheUpdated(CMDocumentCache cache, final String uri, int oldStatus, int newStatus, CMDocument cmDocument) {
-			if ((newStatus == CMDocumentCache.STATUS_LOADED) || (newStatus == CMDocumentCache.STATUS_ERROR)) {
-				refreshViewers();
-			}
-		}
-
-		public void propertyChanged(CMDocumentManager cmDocumentManager, String propertyName) {
-			if (cmDocumentManager.getPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD)) {
-				refreshViewers();
-			}
-		}
-
-		private void refreshViewers() {
-			Object[] listeners = getListeners().toArray();
-			for (int i = 0; i < listeners.length; i++) {
-				if (listeners[i] instanceof StructuredViewer) {
-					final StructuredViewer viewer = (StructuredViewer) listeners[i];
-					Job refresh = new UIJob(XMLUIMessages.refreshoutline_0) {
-						public IStatus runInUIThread(IProgressMonitor monitor) {
-							Control refreshControl = viewer.getControl();
-							if ((refreshControl != null) && !refreshControl.isDisposed()) {
-								viewer.refresh(true);
-							}
-							return Status.OK_STATUS;
-						}
-					};
-					refresh.setSystem(true);
-					refresh.setPriority(Job.SHORT);
-					refresh.schedule(UPDATE_DELAY);
-				}
-				else if (listeners[i] instanceof Viewer) {
-					final Viewer viewer = (Viewer) listeners[i];
-					Job refresh = new UIJob(XMLUIMessages.refreshoutline_0) {
-						public IStatus runInUIThread(IProgressMonitor monitor) {
-							Control refreshControl = viewer.getControl();
-							if ((refreshControl != null) && !refreshControl.isDisposed()) {
-								viewer.refresh();
-							}
-							return Status.OK_STATUS;
-						}
-					};
-					refresh.setSystem(true);
-					refresh.setPriority(Job.SHORT);
-					refresh.schedule(UPDATE_DELAY);
-				}
-			}
-		}
-	}
-
-	private CMDocumentManager cmDocumentManager;
-	private CMDocumentManagerListenerImpl fCMDocumentManagerListener = null;
-	/**
-	 * This keeps track of all the listeners.
-	 */
-	private Set fListeners = new HashSet();
-
-	protected INodeAdapter singletonAdapter;
-
-	public JFaceNodeAdapterFactory() {
-		this(IJFaceNodeAdapter.class, true);
-	}
-
-	public JFaceNodeAdapterFactory(Object adapterKey, boolean registerAdapters) {
-		super(adapterKey, registerAdapters);
-	}
-
-	public synchronized void addListener(Object listener) {
-		fListeners.add(listener);
-	}
-
-	public INodeAdapterFactory copy() {
-		return new JFaceNodeAdapterFactory(getAdapterKey(), isShouldRegisterAdapter());
-	}
-
-	/**
-	 * Create a new JFace adapter for the DOM node passed in
-	 */
-	protected INodeAdapter createAdapter(INodeNotifier node) {
-		if (singletonAdapter == null) {
-			// create the JFaceNodeAdapter
-			singletonAdapter = new JFaceNodeAdapter(this);
-			initAdapter(singletonAdapter, node);
-		}
-		return singletonAdapter;
-	}
-
-
-	/**
-	 * returns "copy" so no one can modify our list. It is a shallow copy.
-	 */
-	public synchronized Collection getListeners() {
-		return new ArrayList(fListeners);
-	}
-
-	protected void initAdapter(INodeAdapter adapter, INodeNotifier node) {
-		Assert.isTrue(cmDocumentManager == null);
-		Assert.isTrue(fCMDocumentManagerListener == null);
-
-		// register for CMDocumentManager events
-		ModelQueryAdapter mqadapter = (ModelQueryAdapter) node.getAdapterFor(ModelQueryAdapter.class);
-		if (mqadapter != null) {
-			ModelQuery mquery = mqadapter.getModelQuery();
-			if ((mquery != null) && (mquery.getCMDocumentManager() != null)) {
-				cmDocumentManager = mquery.getCMDocumentManager();
-				fCMDocumentManagerListener = new CMDocumentManagerListenerImpl();
-				cmDocumentManager.addListener(fCMDocumentManagerListener);
-			}
-		}
-	}
-
-	public void release() {
-		// deregister from CMDocumentManager events
-		if ((cmDocumentManager != null) && (fCMDocumentManagerListener != null)) {
-			cmDocumentManager.removeListener(fCMDocumentManagerListener);
-		}
-		fListeners.clear();
-		if (singletonAdapter != null && singletonAdapter instanceof JFaceNodeAdapter) {
-			RefreshStructureJob refreshJob = ((JFaceNodeAdapter) singletonAdapter).fRefreshJob;
-			if (refreshJob != null) {
-				refreshJob.cancel();
-			}
-		}
-	}
-
-	public synchronized void removeListener(Object listener) {
-		fListeners.remove(listener);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeContentProvider.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeContentProvider.java
deleted file mode 100644
index f3c5452..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeContentProvider.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentoutline;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapterFactory;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-
-
-/**
- * An ITreeContentProvider for a TreeViewers used to display DOM nodes. This
- * content provider takes an adapter factory to create JFace adapters for the
- * nodes in the tree.
- */
-public class JFaceNodeContentProvider implements ITreeContentProvider {
-
-	public JFaceNodeContentProvider() {
-		super();
-	}
-
-	/**
-	 * The visual part that is using this content provider is about to be
-	 * disposed. Deallocate all allocated SWT resources.
-	 */
-	public void dispose() {
-	}
-
-	/**
-	 * Returns the JFace adapter for the specified object.
-	 * 
-	 * @param adaptable
-	 *            java.lang.Object The object to get the adapter for
-	 */
-	protected IJFaceNodeAdapter getAdapter(Object adaptable) {
-		if (adaptable instanceof INodeNotifier) {
-			INodeAdapter adapter = ((INodeNotifier) adaptable).getAdapterFor(IJFaceNodeAdapter.class);
-			if (adapter instanceof IJFaceNodeAdapter) {
-				return (IJFaceNodeAdapter) adapter;
-			}
-		}
-		return null;
-	}
-
-	public Object[] getChildren(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-
-		if (adapter != null) {
-			return adapter.getChildren(object);
-		}
-
-		return new Object[0];
-	}
-
-	public Object[] getElements(Object object) {
-		// The root is usually an instance of an XMLStructuredModel in
-		// which case we want to extract the document.
-		Object topNode = object;
-		if (object instanceof IDOMModel) {
-			topNode = ((IDOMModel) object).getDocument();
-		}
-
-		IJFaceNodeAdapter adapter = getAdapter(topNode);
-
-		if (adapter != null) {
-			return adapter.getElements(topNode);
-		}
-
-		return new Object[0];
-	}
-
-	public Object getParent(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-
-		if (adapter != null) {
-			return adapter.getParent(object);
-		}
-
-		return null;
-	}
-
-	public boolean hasChildren(Object object) {
-		IJFaceNodeAdapter adapter = getAdapter(object);
-
-		if (adapter != null) {
-			return adapter.hasChildren(object);
-		}
-
-		return false;
-	}
-
-	public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		if ((oldInput != null) && (oldInput instanceof IStructuredModel)) {
-			IJFaceNodeAdapterFactory factory = (IJFaceNodeAdapterFactory) ((IStructuredModel) oldInput).getFactoryRegistry().getFactoryFor(IJFaceNodeAdapter.class);
-			if (factory != null) {
-				factory.removeListener(viewer);
-			}
-		}
-		if ((newInput != null) && (newInput instanceof IStructuredModel)) {
-			IJFaceNodeAdapterFactory factory = (IJFaceNodeAdapterFactory) ((IStructuredModel) newInput).getFactoryRegistry().getFactoryFor(IJFaceNodeAdapter.class);
-			if (factory != null) {
-				factory.addListener(viewer);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeLabelProvider.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeLabelProvider.java
deleted file mode 100644
index 6168dde..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/JFaceNodeLabelProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentoutline;
-
-import org.eclipse.jface.viewers.ColumnLabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-
-/**
- * A (column) label provider backed by JFaceNodeAdapters.
- */
-public class JFaceNodeLabelProvider extends ColumnLabelProvider {
-	/**
-	 * JFaceNodeLabelProvider constructor comment.
-	 */
-	public JFaceNodeLabelProvider() {
-		super();
-	}
-
-	/**
-	 * Returns the JFace adapter for the specified object.
-	 * 
-	 * @param adaptable
-	 *            java.lang.Object The object to get the adapter for
-	 */
-	protected IJFaceNodeAdapter getAdapter(Object adaptable) {
-		if (adaptable instanceof INodeNotifier) {
-			INodeAdapter adapter = ((INodeNotifier) adaptable).getAdapterFor(IJFaceNodeAdapter.class);
-			if (adapter instanceof IJFaceNodeAdapter) {
-				return (IJFaceNodeAdapter) adapter;
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-	 */
-	public Image getImage(Object element) {
-		IJFaceNodeAdapter adapter = getAdapter(element);
-		if (adapter != null)
-			return adapter.getLabelImage(element);
-		return super.getImage(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-	 */
-	public String getText(Object element) {
-		IJFaceNodeAdapter adapter = getAdapter(element);
-		if (adapter != null)
-			return adapter.getLabelText(element);
-		return super.getText(element);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object,
-	 *      java.lang.String)
-	 */
-	public boolean isLabelProperty(Object element, String property) {
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/RefreshStructureJob.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/RefreshStructureJob.java
deleted file mode 100644
index 55c9390..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/RefreshStructureJob.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentoutline;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * This job holds a queue of updates (affected nodes) for multiple structured
- * viewers. When a new request comes in, the current run is cancelled, the new
- * request is added to the queue, then the job is re-scheduled. Support for
- * multiple structured viewers is required because refresh updates are usually
- * triggered by model changes, and the model may be visible in more than one
- * viewer.
- * 
- * @author pavery
- */
-class RefreshStructureJob extends Job {
-
-	/** debug flag */
-	static final boolean DEBUG;
-	private static final long UPDATE_DELAY = 300;
-	static {
-		String value = Platform.getDebugOption("org.eclipse.wst.sse.ui/debug/refreshStructure"); //$NON-NLS-1$
-		DEBUG = (value != null) && value.equalsIgnoreCase("true"); //$NON-NLS-1$
-	}
-	/** List of refresh requests (Nodes) */
-	private final List fRefreshes;
-	/** List of update requests (Nodes) */
-	private final List fUpdates;
-	/** List of update requests (Nodes) */
-	private final List fUpdateProperties;
-	/** the structured viewers */
-	Set fRefreshViewers = new HashSet(3);
-	Set fUpdateViewers = new HashSet(3);
-
-	public RefreshStructureJob() {
-		super(XMLUIMessages.refreshoutline_0);
-		setPriority(Job.LONG);
-		setSystem(true);
-		fRefreshes = new ArrayList(5);
-		fUpdates = new ArrayList(5);
-		fUpdateProperties = new ArrayList(5);
-	}
-
-	private synchronized void addUpdateRequest(Node newNodeRequest, String[] updateProperties) {
-		/*
-		 * If we get to here, either from existing request list being zero
-		 * length, or no exisitng requests "matched" new request, then add the
-		 * new request.
-		 */
-		fUpdates.add(newNodeRequest);
-		fUpdateProperties.add(updateProperties);
-	}
-
-	private synchronized void addUpdateViewer(StructuredViewer viewer) {
-		fUpdateViewers.add(viewer);
-	}
-
-	private synchronized void addRefreshRequest(Node newNodeRequest) {
-		/*
-		 * note: the caller must NOT pass in null node request (which, since
-		 * private method, we do not need to gaurd against here, as long as we
-		 * gaurd against it in calling method.
-		 */
-		int size = fRefreshes.size();
-		for (int i = 0; i < size; i++) {
-			Node existingNodeRequest = (Node) fRefreshes.get(i);
-			/*
-			 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=157427 If we
-			 * already have a request which equals the new request, discard
-			 * the new request
-			 */
-			if (existingNodeRequest.equals(newNodeRequest)) {
-				return;
-			}
-			/*
-			 * If we already have a request which contains the new request,
-			 * discard the new request
-			 */
-			if (contains(existingNodeRequest, newNodeRequest)) {
-				return;
-			}
-			/*
-			 * If new request contains any existing requests, replace it with
-			 * new request. ISSUE: technically, we should replace ALL
-			 * contained, existing requests (such as if many siblings already
-			 * que'd up when their common parent is then requested, but, I'm
-			 * not sure if that occurs much, in practice, or if there's an
-			 * algorithm to quickly find them all. Actually, I guess we could
-			 * just go through the _rest_ of the list (i+1 to size) and remove
-			 * any that are contained by new request ... in future :) .
-			 */
-			if (contains(newNodeRequest, existingNodeRequest)) {
-				fRefreshes.set(i, newNodeRequest);
-				return;
-			}
-		}
-		/*
-		 * If we get to here, either from existing request list being zero
-		 * length, or no exisitng requests "matched" new request, then add the
-		 * new request.
-		 */
-		fRefreshes.add(newNodeRequest);
-	}
-
-	private synchronized void addRefreshViewer(StructuredViewer viewer) {
-		fRefreshViewers.add(viewer);
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.runtime.jobs.Job#canceling()
-	 */
-	protected void canceling() {
-		fUpdates.clear();
-		fUpdateViewers.clear();
-		super.canceling();
-	}
-
-	/**
-	 * Simple hierarchical containment relationship. Note, this method returns
-	 * "false" if the two nodes are equal!
-	 * 
-	 * @param root
-	 * @param possible
-	 * @return if the root is parent of possible, return true, otherwise
-	 *         return false
-	 */
-	private boolean contains(Node root, Node possible) {
-		if (DEBUG) {
-			System.out.println("=============================================================================================================="); //$NON-NLS-1$
-			System.out.println("recursive call w/ root: " + root.getNodeName() + " and possible: " + possible); //$NON-NLS-1$ //$NON-NLS-2$
-			System.out.println("--------------------------------------------------------------------------------------------------------------"); //$NON-NLS-1$
-		}
-
-		// the following checks are important
-		// #document node will break the algorithm otherwise
-
-		// can't contain the child if it's null
-		if (root == null) {
-			if (DEBUG) {
-				System.out.println("returning false: root is null"); //$NON-NLS-1$
-			}
-			return false;
-		}
-		// nothing can be parent of Document node
-		if (possible instanceof Document) {
-			if (DEBUG) {
-				System.out.println("returning false: possible is Document node"); //$NON-NLS-1$
-			}
-			return false;
-		}
-		// document contains everything
-		if (root instanceof Document) {
-			if (DEBUG) {
-				System.out.println("returning true: root is Document node"); //$NON-NLS-1$
-			}
-			return true;
-		}
-
-		// check parentage
-		Node current = possible;
-		// loop parents
-		while ((current != null) && (current.getNodeType() != Node.DOCUMENT_NODE)) {
-			// found it
-			if (root.equals(current)) {
-				if (DEBUG) {
-					System.out.println("   !!! found: " + possible.getNodeName() + " in subelement of: " + root.getNodeName()); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-				return true;
-			}
-			current = current.getParentNode();
-		}
-		// never found it
-		return false;
-	}
-
-	/**
-	 * Refresh must be on UI thread because it's on a SWT widget.
-	 * 
-	 * @param node
-	 */
-	private void doRefresh(final Node node, final StructuredViewer[] viewers) {
-		final Display display = PlatformUI.getWorkbench().getDisplay();
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (DEBUG) {
-					System.out.println("refresh on: [" + node.getNodeName() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-
-				for (int i = 0; i < viewers.length; i++) {
-					if (!viewers[i].getControl().isDisposed()) {
-						if (node.getNodeType() == Node.DOCUMENT_NODE) {
-							viewers[i].refresh(true);
-						}
-						else {
-							viewers[i].refresh(node, true);
-						}
-					}
-					else {
-						if (DEBUG) {
-							System.out.println("   !!! skipped refreshing disposed viewer: " + viewers[i]); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * Update must be on UI thread because it's on a SWT widget.
-	 * 
-	 * @param node
-	 */
-	private void doUpdate(final StructuredViewer[] viewers, final Node node, final String[] properties) {
-		final Display display = PlatformUI.getWorkbench().getDisplay();
-		display.asyncExec(new Runnable() {
-			public void run() {
-				if (DEBUG) {
-					System.out.println("refresh on: [" + node.getNodeName() + "]"); //$NON-NLS-1$ //$NON-NLS-2$
-				}
-
-				for (int i = 0; i < viewers.length; i++) {
-					if (!viewers[i].getControl().isDisposed()) {
-						viewers[i].update(node, properties);
-					}
-					else {
-						if (DEBUG) {
-							System.out.println("   !!! skipped refreshing disposed viewer: " + viewers[i]); //$NON-NLS-1$
-						}
-					}
-				}
-			}
-		});
-	}
-
-	/**
-	 * This method also synchronized because it accesses the fRefreshes queue
-	 * and fRefreshViewers list
-	 * 
-	 * @return an array containing and array of the currently requested Nodes
-	 *         to refresh and the viewers in which to refresh them
-	 */
-	private synchronized Object[] getRefreshRequests() {
-		Node[] toRefresh = (Node[]) fRefreshes.toArray(new Node[fRefreshes.size()]);
-		fRefreshes.clear();
-
-		StructuredViewer[] viewers = (StructuredViewer[]) fRefreshViewers.toArray(new StructuredViewer[fRefreshViewers.size()]);
-		fRefreshViewers.clear();
-
-		return new Object[]{toRefresh, viewers};
-	}
-
-	/**
-	 * This method also synchronized because it accesses the fUpdates queue
-	 * and fUpdateViewers list
-	 * 
-	 * @return an array containing and array of the currently requested Nodes
-	 *         to refresh and the viewers in which to refresh them
-	 */
-	private synchronized Object[] getUpdateRequests() {
-		Node[] toUpdate = (Node[]) fUpdates.toArray(new Node[fUpdates.size()]);
-		fUpdates.clear();
-
-		StructuredViewer[] viewers = (StructuredViewer[]) fUpdateViewers.toArray(new StructuredViewer[fUpdateViewers.size()]);
-		fUpdateViewers.clear();
-
-		String[][] properties = (String[][]) fUpdateProperties.toArray(new String[fUpdateProperties.size()][]);
-		fUpdateProperties.clear();
-
-		return new Object[]{toUpdate, viewers, properties};
-	}
-
-	/**
-	 * Invoke a refresh on the viewer on the given node.
-	 * 
-	 * @param node
-	 */
-	public void refresh(StructuredViewer viewer, Node node) {
-		if (node == null) {
-			return;
-		}
-
-		addRefreshViewer(viewer);
-		addRefreshRequest(node);
-		schedule(UPDATE_DELAY);
-	}
-
-	/**
-	 * Invoke a refresh on the viewer on the given node.
-	 * 
-	 * @param node
-	 */
-	public void update(StructuredViewer viewer, Node node, String[] properties) {
-		if (node == null) {
-			return;
-		}
-
-		addUpdateViewer(viewer);
-		addUpdateRequest(node, properties);
-		schedule(UPDATE_DELAY);
-	}
-
-	protected IStatus run(IProgressMonitor monitor) {
-		IStatus status = Status.OK_STATUS;
-		try {
-			performUpdates();
-			
-			performRefreshes(monitor);
-		}
-		finally {
-			monitor.done();
-		}
-		return status;
-	}
-
-	private void performRefreshes(IProgressMonitor monitor) {
-		// Retrieve BOTH viewers and Nodes on one block
-		Object[] requests = getRefreshRequests();
-		Node[] nodes = (Node[]) requests[0];
-		StructuredViewer[] viewers = (StructuredViewer[]) requests[1];
-
-		for (int i = 0; i < nodes.length; i++) {
-			if (monitor.isCanceled()) {
-				throw new OperationCanceledException();
-			}
-			doRefresh(nodes[i], viewers);
-		}
-	}
-
-	private void performUpdates() {
-		// Retrieve BOTH viewers and Nodes on one block
-		Object[] requests = getUpdateRequests();
-		Node[] nodes = (Node[]) requests[0];
-		StructuredViewer[] viewers = (StructuredViewer[]) requests[1];
-		String[][] properties = (String[][]) requests[2];
-
-		for (int i = 0; i < nodes.length; i++) {
-			doUpdate(viewers, nodes[i], properties[i]);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/XMLNodeActionManager.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/XMLNodeActionManager.java
deleted file mode 100644
index f858071..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/contentoutline/XMLNodeActionManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.contentoutline;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.ui.internal.actions.AbstractNodeActionManager;
-import org.w3c.dom.Node;
-
-
-public class XMLNodeActionManager extends AbstractNodeActionManager {
-	public XMLNodeActionManager(IStructuredModel model, Viewer viewer) {
-		super(model, ModelQueryUtil.getModelQuery(model), viewer);
-	}
-
-	public void reformat(Node newElement, boolean deep) {
-		try {
-			// tell the model that we are about to make a big model change
-			fModel.aboutToChangeModel();
-
-			// format selected node
-			IStructuredFormatProcessor formatProcessor = new FormatProcessorXML();
-			formatProcessor.formatNode(newElement);
-		}
-		finally {
-			// tell the model that we are done with the big model change
-			fModel.changedModel();
-		}
-	}
-
-	public void setModel(IStructuredModel newModel) {
-		fModel = newModel;
-		setModelQuery(ModelQueryUtil.getModelQuery(newModel));
-	}
-
-	protected void setModelQuery(ModelQuery newModelQuery) {
-		modelQuery = newModelQuery;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/CorrectionAssistantProviderXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/CorrectionAssistantProviderXML.java
deleted file mode 100644
index 2c11048..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/CorrectionAssistantProviderXML.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistProcessor;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.sse.ui.internal.correction.CorrectionAssistantProvider;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-/**
- * Correction assistant for XML
- * 
- * @deprecated since 2.0 RC0 Use
- *             org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
- */
-public class CorrectionAssistantProviderXML extends CorrectionAssistantProvider {
-
-	public IContentAssistant getCorrectionAssistant(ISourceViewer sourceViewer) {
-		IContentAssistant ca = null;
-
-		if (sourceViewer != null) {
-			ContentAssistant assistant = new ContentAssistant();
-
-			if (sourceViewer != null) {
-				IContentAssistProcessor correctionProcessor = new CorrectionProcessorXML(sourceViewer);
-				assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_DEFAULT);
-				assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_CDATA);
-				assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_COMMENT);
-				assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_DECLARATION);
-				assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.XML_PI);
-				assistant.setContentAssistProcessor(correctionProcessor, IXMLPartitions.DTD_SUBSET);
-			}
-			ca = assistant;
-		}
-
-		return ca;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/CorrectionProcessorXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/CorrectionProcessorXML.java
deleted file mode 100644
index 97e73e7..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/CorrectionProcessorXML.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.sse.ui.internal.correction.IQuickAssistProcessor;
-import org.eclipse.wst.sse.ui.internal.correction.IQuickFixProcessor;
-import org.eclipse.wst.sse.ui.internal.correction.StructuredCorrectionProcessor;
-
-/**
- * @deprecated since 2.0 RC0 Use
- *             org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
- */
-public class CorrectionProcessorXML extends StructuredCorrectionProcessor {
-	protected IQuickAssistProcessor fQuickAssistProcessor;
-	protected IQuickFixProcessor fQuickFixProcessor;
-
-	public CorrectionProcessorXML(ISourceViewer sourceViewer) {
-		super(sourceViewer);
-	}
-
-	protected IQuickAssistProcessor getQuickAssistProcessor() {
-		if (fQuickAssistProcessor == null) {
-			fQuickAssistProcessor = new QuickAssistProcessorXML();
-		}
-
-		return fQuickAssistProcessor;
-	}
-
-	protected IQuickFixProcessor getQuickFixProcessor() {
-		if (fQuickFixProcessor == null) {
-			fQuickFixProcessor = new QuickFixProcessorXML();
-		}
-
-		return fQuickFixProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/InsertRequiredAttrsQuickAssistProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/InsertRequiredAttrsQuickAssistProposal.java
deleted file mode 100644
index 74947ed..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/InsertRequiredAttrsQuickAssistProposal.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import java.util.List;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-public class InsertRequiredAttrsQuickAssistProposal implements ICompletionProposal, ICompletionProposalExtension2 {
-	private final List fRequiredAttrs;
-
-	/**
-	 * @param requiredAttrs
-	 */
-	public InsertRequiredAttrsQuickAssistProposal(List requiredAttrs) {
-		fRequiredAttrs = requiredAttrs;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
-	 */
-	public void apply(IDocument document) {
-		// not implemented?
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer,
-	 *      char, int, int)
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, offset);
-		IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-		int index = startStructuredDocumentRegion.getEndOffset();
-		ITextRegion lastRegion = startStructuredDocumentRegion.getLastRegion();
-		if (lastRegion.getType() == DOMRegionContext.XML_TAG_CLOSE) {
-			index--;
-			lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1);
-		}
-		else if (lastRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-			index = index - 2;
-			lastRegion = startStructuredDocumentRegion.getRegionAtCharacterOffset(index - 1);
-		}
-		MultiTextEdit multiTextEdit = new MultiTextEdit();
-		try {
-			for (int i = 0; i < fRequiredAttrs.size(); i++) {
-				CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) fRequiredAttrs.get(i);
-				String requiredAttributeName = attrDecl.getAttrName();
-				String defaultValue = attrDecl.getDefaultValue();
-				if (defaultValue == null) {
-					defaultValue = ""; //$NON-NLS-1$
-				}
-				String nameAndDefaultValue = " "; //$NON-NLS-1$
-				if ((i == 0) && (lastRegion.getLength() > lastRegion.getTextLength())) {
-					nameAndDefaultValue = ""; //$NON-NLS-1$
-				}
-				nameAndDefaultValue += requiredAttributeName + "=\"" + defaultValue + "\""; //$NON-NLS-1$//$NON-NLS-2$
-				multiTextEdit.addChild(new InsertEdit(index, nameAndDefaultValue));
-				// BUG3381: MultiTextEdit applies all child TextEdit's basing
-				// on offsets
-				// in the document before the first TextEdit, not after each
-				// child TextEdit. Therefore, do not need to advance the
-				// index.
-				// index += nameAndDefaultValue.length();
-			}
-			multiTextEdit.apply(viewer.getDocument());
-		}
-		catch (BadLocationException e) {
-			// log, for now, unless we find there's reasons why we get some
-			// here.
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		return XMLUIMessages.InsertRequiredAttrsQuickAssistProposal_0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		return XMLUIMessages.InsertRequiredAttrsQuickAssistProposal_1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		// return JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_LOCAL);
-		return XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ADD_CORRECTION);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument)
-	 */
-	public Point getSelection(IDocument document) {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer,
-	 *      boolean)
-	 */
-	public void selected(ITextViewer viewer, boolean smartToggle) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer)
-	 */
-	public void unselected(ITextViewer viewer) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument,
-	 *      int, org.eclipse.jface.text.DocumentEvent)
-	 */
-	public boolean validate(IDocument document, int offset, DocumentEvent event) {
-		return false;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/ProblemIDsXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/ProblemIDsXML.java
deleted file mode 100644
index 18fae10..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/ProblemIDsXML.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-public interface ProblemIDsXML {
-	int AttrsInEndTag = 3;
-	int AttrValueNotQuoted = 13;
-	int EmptyTag = 1;
-	int InvalidAttrValue = 11;
-	int MissingAttrValue = 4;
-	int MissingClosingBracket = 14;
-	int MissingEndTag = 2;
-	int MissingRequiredAttr = 12;
-	int MissingStartTag = 15;
-	int NamespaceInPI = 8;
-	int NoAttrValue = 5;
-	int SpacesBeforePI = 7;
-	int SpacesBeforeTagName = 6;
-	int Unclassified = 0;
-	int UnknownAttr = 10;
-	int UnknownElement = 9;
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickAssistProcessorXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickAssistProcessorXML.java
deleted file mode 100644
index 486c6c9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickAssistProcessorXML.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.sse.ui.internal.correction.IQuickAssistProcessor;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * @deprecated since 2.0 RC0 Use
- *             org.eclipse.jface.text.quickassist.IQuickAssistProcessor and XMLQuickAssistProcessor
- */
-public class QuickAssistProcessorXML implements IQuickAssistProcessor {
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.correction.IQuickAssistProcessor#canAssist(org.eclipse.wst.sse.core.text.IStructuredDocument,
-	 *      int)
-	 */
-	public boolean canAssist(StructuredTextViewer viewer, int offset) {
-		return true;
-	}
-
-	/**
-	 * @param proposals
-	 * @param viewer
-	 * @param offset
-	 */
-	protected void getInsertRequiredAttrs(ArrayList proposals, StructuredTextViewer viewer, int offset) {
-		IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, offset);
-		if ((node != null) && (node.getNodeType() == Node.ELEMENT_NODE)) {
-			IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-			if ((startStructuredDocumentRegion != null) && startStructuredDocumentRegion.containsOffset(offset)) {
-				IDOMNode cursorNode = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, offset);
-				List requiredAttrs = getRequiredAttrs(cursorNode);
-				if (requiredAttrs.size() > 0) {
-					NamedNodeMap currentAttrs = node.getAttributes();
-					List insertAttrs = new ArrayList();
-					if (currentAttrs.getLength() == 0) {
-						insertAttrs.addAll(requiredAttrs);
-					}
-					else {
-						for (int i = 0; i < requiredAttrs.size(); i++) {
-							String requiredAttrName = ((CMAttributeDeclaration) requiredAttrs.get(i)).getAttrName();
-							boolean found = false;
-							for (int j = 0; j < currentAttrs.getLength(); j++) {
-								String currentAttrName = currentAttrs.item(j).getNodeName();
-								if (requiredAttrName.compareToIgnoreCase(currentAttrName) == 0) {
-									found = true;
-									break;
-								}
-							}
-							if (!found) {
-								insertAttrs.add(requiredAttrs.get(i));
-							}
-						}
-					}
-					if (insertAttrs.size() > 0) {
-						proposals.add(new InsertRequiredAttrsQuickAssistProposal(insertAttrs));
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * @param proposals
-	 * @param viewer
-	 * @param offset
-	 */
-	protected void getLocalRenameQuickAssistProposal(ArrayList proposals, StructuredTextViewer viewer, int offset) {
-		IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, offset);
-		IStructuredDocumentRegion startStructuredDocumentRegion = node == null ? null : node.getStartStructuredDocumentRegion();
-		IStructuredDocumentRegion endStructuredDocumentRegion = node == null ? null : node.getEndStructuredDocumentRegion();
-
-		ITextRegion region = null;
-		int regionTextEndOffset = 0;
-		if ((startStructuredDocumentRegion != null) && startStructuredDocumentRegion.containsOffset(offset)) {
-			region = startStructuredDocumentRegion.getRegionAtCharacterOffset(offset);
-			regionTextEndOffset = startStructuredDocumentRegion.getTextEndOffset(region);
-		}
-		else if ((endStructuredDocumentRegion != null) && endStructuredDocumentRegion.containsOffset(offset)) {
-			region = endStructuredDocumentRegion.getRegionAtCharacterOffset(offset);
-			regionTextEndOffset = endStructuredDocumentRegion.getTextEndOffset(region);
-		}
-
-		if ((region != null) && ((region.getType() == DOMRegionContext.XML_TAG_NAME) || (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) && (offset <= regionTextEndOffset)) {
-			proposals.add(new RenameInFileQuickAssistProposal());
-		}
-	}
-
-	protected ModelQuery getModelQuery(Node node) {
-		if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			return ModelQueryUtil.getModelQuery((Document) node);
-		}
-		else {
-			return ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.correction.IQuickAssistProcessor#getProposals(org.eclipse.wst.sse.core.text.IStructuredDocument,
-	 *      int)
-	 */
-	public ICompletionProposal[] getProposals(StructuredTextViewer viewer, int offset) throws CoreException {
-		ArrayList proposals = new ArrayList();
-
-		getLocalRenameQuickAssistProposal(proposals, viewer, offset);
-		getSurroundWithNewElementQuickAssistProposal(proposals, viewer, offset);
-		getInsertRequiredAttrs(proposals, viewer, offset);
-
-		return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]);
-	}
-
-	protected List getRequiredAttrs(Node node) {
-		List result = new ArrayList();
-
-		ModelQuery modelQuery = getModelQuery(node);
-		if (modelQuery != null) {
-			CMElementDeclaration elementDecl = modelQuery.getCMElementDeclaration((Element) node);
-			if (elementDecl != null) {
-				CMNamedNodeMap attrMap = elementDecl.getAttributes();
-
-				CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attrMap);
-				List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent((Element)node, elementDecl, ModelQuery.INCLUDE_ATTRIBUTES);
-				for (int k = 0; k < nodes.size(); k++) {
-					CMNode cmnode = (CMNode) nodes.get(k);
-					if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-						allAttributes.put(cmnode);
-					}
-				}
-				attrMap = allAttributes;
-				
-				Iterator it = attrMap.iterator();
-				CMAttributeDeclaration attr = null;
-				while (it.hasNext()) {
-					attr = (CMAttributeDeclaration) it.next();
-					if (attr.getUsage() == CMAttributeDeclaration.REQUIRED) {
-						result.add(attr);
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * @param proposals
-	 * @param viewer
-	 * @param offset
-	 */
-	protected void getSurroundWithNewElementQuickAssistProposal(ArrayList proposals, StructuredTextViewer viewer, int offset) {
-		IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, offset);
-		if (node != null) {
-			proposals.add(new SurroundWithNewElementQuickAssistProposal());
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickFixProcessorXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickFixProcessorXML.java
deleted file mode 100644
index 28eaea1..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/QuickFixProcessorXML.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.sse.ui.internal.correction.IQuickFixProcessor;
-import org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-/**
- * @deprecated since 2.0 RC0 Use
- *             org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
- */
-public class QuickFixProcessorXML implements IQuickFixProcessor {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.correction.IQuickFixProcessor#canFix(int)
-	 */
-	public boolean canFix(Annotation annotation) {
-		boolean result = false;
-
-		if (annotation instanceof TemporaryAnnotation) {
-			TemporaryAnnotation tempAnnotation = (TemporaryAnnotation) annotation;
-			int problemID = tempAnnotation.getProblemID();
-			switch (problemID) {
-				case ProblemIDsXML.EmptyTag :
-				case ProblemIDsXML.MissingEndTag :
-				case ProblemIDsXML.AttrsInEndTag :
-				case ProblemIDsXML.MissingAttrValue :
-				case ProblemIDsXML.NoAttrValue :
-				case ProblemIDsXML.SpacesBeforeTagName :
-				case ProblemIDsXML.SpacesBeforePI :
-				case ProblemIDsXML.NamespaceInPI :
-				case ProblemIDsXML.UnknownElement :
-				case ProblemIDsXML.UnknownAttr :
-				case ProblemIDsXML.InvalidAttrValue :
-				case ProblemIDsXML.MissingRequiredAttr :
-				case ProblemIDsXML.AttrValueNotQuoted :
-				case ProblemIDsXML.MissingClosingBracket :
-					result = true;
-			}
-		}
-
-		return result;
-	}
-
-	public Image getImage() {
-		// return
-		// JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_CHANGE);
-		return XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_CORRECTION_CHANGE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.correction.IQuickFixProcessor#getProposals(org.eclipse.wst.sse.ui.internal.reconcile.TemporaryAnnotation)
-	 */
-	public ICompletionProposal[] getProposals(Annotation annotation) throws CoreException {
-		ArrayList proposals = new ArrayList();
-
-		if (annotation instanceof TemporaryAnnotation) {
-			TemporaryAnnotation tempAnnotation = (TemporaryAnnotation) annotation;
-			int problemID = tempAnnotation.getProblemID();
-			switch (problemID) {
-				case ProblemIDsXML.EmptyTag :
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_0, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.MissingEndTag :
-					String tagName = (String) ((Object[]) tempAnnotation.getAdditionalFixInfo())[0];
-					String tagClose = (String) ((Object[]) tempAnnotation.getAdditionalFixInfo())[1];
-					int tagCloseOffset = ((Integer) ((Object[]) tempAnnotation.getAdditionalFixInfo())[2]).intValue();
-					int startTagEndOffset = ((Integer) ((Object[]) tempAnnotation.getAdditionalFixInfo())[3]).intValue();
-					int firstChildStartOffset = ((Integer) ((Object[]) tempAnnotation.getAdditionalFixInfo())[4]).intValue();
-					int endOffset = ((Integer) ((Object[]) tempAnnotation.getAdditionalFixInfo())[5]).intValue();
-					proposals.add(new CompletionProposal(tagClose, tagCloseOffset, 0, 0, getImage(), XMLUIMessages.QuickFixProcessorXML_1, null, "")); //$NON-NLS-1$ 
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), startTagEndOffset - tempAnnotation.getPosition().getOffset(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_2, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					proposals.add(new CompletionProposal("</" + tagName + ">", firstChildStartOffset, 0, 0, getImage(), XMLUIMessages.QuickFixProcessorXML_3, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-					proposals.add(new CompletionProposal("</" + tagName + ">", endOffset, 0, 0, getImage(), XMLUIMessages.QuickFixProcessorXML_4, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-					break;
-				case ProblemIDsXML.AttrsInEndTag :
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_5, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.MissingAttrValue :
-					String defaultAttrValue = (String) ((Object[]) tempAnnotation.getAdditionalFixInfo())[0];
-					int insertOffset = ((Integer) ((Object[]) tempAnnotation.getAdditionalFixInfo())[1]).intValue();
-					proposals.add(new CompletionProposal("\"" + defaultAttrValue + "\"", tempAnnotation.getPosition().getOffset() + tempAnnotation.getPosition().getLength() + insertOffset, 0, defaultAttrValue.length() + 2, getImage(), XMLUIMessages.QuickFixProcessorXML_6, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_7, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.NoAttrValue :
-					defaultAttrValue = (String) tempAnnotation.getAdditionalFixInfo();
-					proposals.add(new CompletionProposal("=\"" + defaultAttrValue + "\"", tempAnnotation.getPosition().getOffset() + tempAnnotation.getPosition().getLength(), 0, defaultAttrValue.length() + 3, getImage(), XMLUIMessages.QuickFixProcessorXML_6, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_7, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.SpacesBeforeTagName :
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_8, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.SpacesBeforePI :
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_9, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.NamespaceInPI :
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_10, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.UnknownElement :
-					proposals.add(new RemoveUnknownElementQuickFixProposal(tempAnnotation.getAdditionalFixInfo(), getImage(), XMLUIMessages.QuickFixProcessorXML_11));
-					proposals.add(new RenameInFileQuickAssistProposal());
-					break;
-				case ProblemIDsXML.UnknownAttr :
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_7, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					proposals.add(new RenameInFileQuickAssistProposal());
-					break;
-				case ProblemIDsXML.InvalidAttrValue :
-					proposals.add(new CompletionProposal("", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_12, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				case ProblemIDsXML.MissingRequiredAttr :
-					String requiredAttr = (String) ((Object[]) tempAnnotation.getAdditionalFixInfo())[0];
-					insertOffset = ((Integer) ((Object[]) tempAnnotation.getAdditionalFixInfo())[1]).intValue();
-					proposals.add(new CompletionProposal(requiredAttr, tempAnnotation.getPosition().getOffset() + insertOffset, 0, requiredAttr.length(), getImage(), XMLUIMessages.QuickFixProcessorXML_13, null, "")); //$NON-NLS-1$ 
-					break;
-				case ProblemIDsXML.AttrValueNotQuoted :
-					String attrValue = (String) tempAnnotation.getAdditionalFixInfo();
-					proposals.add(new CompletionProposal("\"" + attrValue + "\"", tempAnnotation.getPosition().getOffset(), tempAnnotation.getPosition().getLength(), attrValue.length() + 2, getImage(), XMLUIMessages.QuickFixProcessorXML_14, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-					break;
-				case ProblemIDsXML.MissingClosingBracket :
-					proposals.add(new CompletionProposal(">", tempAnnotation.getPosition().getOffset() + tempAnnotation.getPosition().getLength(), 0, 1, getImage(), XMLUIMessages.QuickFixProcessorXML_15, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-			}
-		}
-
-		return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RemoveUnknownElementQuickFixProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RemoveUnknownElementQuickFixProposal.java
deleted file mode 100644
index b87a2c9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RemoveUnknownElementQuickFixProposal.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.text.edits.DeleteEdit;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class RemoveUnknownElementQuickFixProposal implements ICompletionProposal, ICompletionProposalExtension2 {
-	private Object fAdditionalFixInfo = null;
-	private String fDisplayString;
-	private Image fImage;
-	private Point fSelection; // initialized by apply()
-
-	public RemoveUnknownElementQuickFixProposal(Object additionalFixInfo, Image image, String displayString) {
-		fAdditionalFixInfo = additionalFixInfo;
-		fImage = image;
-		fDisplayString = displayString;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
-	 */
-	public void apply(IDocument document) {
-		// not implemented?
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer,
-	 *      char, int, int)
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		int startTagOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[0]).intValue();
-		int startTagLength = ((Integer) ((Object[]) fAdditionalFixInfo)[1]).intValue();
-		int endTagOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[2]).intValue();
-		int endTagLength = ((Integer) ((Object[]) fAdditionalFixInfo)[3]).intValue();
-
-		MultiTextEdit multiTextEdit = new MultiTextEdit();
-		if (endTagOffset != -1) {
-			multiTextEdit.addChild(new DeleteEdit(endTagOffset, endTagLength));
-			fSelection = new Point(endTagOffset, 0);
-		}
-		if (startTagOffset != -1) {
-			multiTextEdit.addChild(new DeleteEdit(startTagOffset, startTagLength));
-			fSelection = new Point(startTagOffset, 0);
-		}
-
-		try {
-			multiTextEdit.apply(viewer.getDocument());
-		}
-		catch (MalformedTreeException e) {
-			// log for now, unless find reasons not to.
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		catch (BadLocationException e) {
-			// log for now, unless find reasons not to.
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		if (fDisplayString == null) {
-			fDisplayString = XMLUIMessages.QuickFixProcessorXML_11;
-		}
-
-		return fDisplayString;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		return fImage;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument)
-	 */
-	public Point getSelection(IDocument document) {
-		return fSelection;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer,
-	 *      boolean)
-	 */
-	public void selected(ITextViewer viewer, boolean smartToggle) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer)
-	 */
-	public void unselected(ITextViewer viewer) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument,
-	 *      int, org.eclipse.jface.text.DocumentEvent)
-	 */
-	public boolean validate(IDocument document, int offset, DocumentEvent event) {
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RenameInFileQuickAssistProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RenameInFileQuickAssistProposal.java
deleted file mode 100644
index ac95b31..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/RenameInFileQuickAssistProposal.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.DocumentEvent;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposalExtension2;
-import org.eclipse.jface.text.contentassist.IContextInformation;
-import org.eclipse.jface.text.link.LinkedModeModel;
-import org.eclipse.jface.text.link.LinkedModeUI;
-import org.eclipse.jface.text.link.LinkedPosition;
-import org.eclipse.jface.text.link.LinkedPositionGroup;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.texteditor.link.EditorLinkedModeUI;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-public class RenameInFileQuickAssistProposal implements ICompletionProposal, ICompletionProposalExtension2 {
-	protected IRegion fSelectedRegion; // initialized by apply()
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#apply(org.eclipse.jface.text.IDocument)
-	 */
-	public void apply(IDocument document) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer,
-	 *      char, int, int)
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		IDocument document = viewer.getDocument();
-		LinkedPositionGroup group = new LinkedPositionGroup();
-		try {
-			if (viewer instanceof StructuredTextViewer) {
-				IDOMNode node = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, offset);
-				IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-				ITextRegion region = (startStructuredDocumentRegion == null) ? null : startStructuredDocumentRegion.getRegionAtCharacterOffset(offset);
-				if (region != null) {
-					group.addPosition(new LinkedPosition(document, startStructuredDocumentRegion.getStartOffset() + region.getStart(), region.getTextLength(), 0));
-
-					if ((region.getType() == DOMRegionContext.XML_TAG_NAME) && (node.getEndStructuredDocumentRegion() != null)) {
-						region = node.getEndStructuredDocumentRegion().getRegions().get(1);
-						if (region != null) {
-							group.addPosition(new LinkedPosition(document, node.getEndStructuredDocumentRegion().getStartOffset() + region.getStart(), region.getTextLength(), 1));
-						}
-					}
-				}
-				else {
-					IStructuredDocumentRegion endStructuredDocumentRegion = node.getEndStructuredDocumentRegion();
-					region = (endStructuredDocumentRegion == null) ? null : endStructuredDocumentRegion.getRegionAtCharacterOffset(offset);
-					if (region != null) {
-						if ((region.getType() == DOMRegionContext.XML_TAG_NAME) && (node.getStartStructuredDocumentRegion() != null)) {
-							ITextRegion startTagNameRegion = node.getStartStructuredDocumentRegion().getRegions().get(1);
-							if (region != null) {
-								group.addPosition(new LinkedPosition(document, node.getStartStructuredDocumentRegion().getStartOffset() + startTagNameRegion.getStart(), startTagNameRegion.getTextLength(), 0));
-								group.addPosition(new LinkedPosition(document, endStructuredDocumentRegion.getStartOffset() + region.getStart(), region.getTextLength(), 1));
-							}
-						}
-						else {
-							group.addPosition(new LinkedPosition(document, endStructuredDocumentRegion.getStartOffset() + region.getStart(), region.getTextLength(), 0));
-						}
-					}
-				}
-
-				// TODO CompletionProposalPopup#insertProposal() calls
-				// IRewriteTarget.beginCompoundChange()
-				// which disables redraw in ITextViewer. Workaround for now.
-				((StructuredTextViewer) viewer).setRedraw(true);
-			}
-
-			LinkedModeModel linkedModeModel = new LinkedModeModel();
-			linkedModeModel.addGroup(group);
-			linkedModeModel.forceInstall();
-
-			LinkedModeUI ui = new EditorLinkedModeUI(linkedModeModel, viewer);
-			ui.setExitPosition(viewer, offset, 0, LinkedPositionGroup.NO_STOP);
-			ui.enter();
-
-			fSelectedRegion = ui.getSelectedRegion();
-		}
-		catch (BadLocationException e) {
-			// log for now, unless find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		return XMLUIMessages.RenameInFileQuickAssistProposal_0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getContextInformation()
-	 */
-	public IContextInformation getContextInformation() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		return XMLUIMessages.RenameInFileQuickAssistProposal_1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		// return JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_LOCAL);
-		return XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_LOCAL_VARIABLE);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getSelection(org.eclipse.jface.text.IDocument)
-	 */
-	public Point getSelection(IDocument document) {
-		return new Point(fSelectedRegion.getOffset(), fSelectedRegion.getLength());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#selected(org.eclipse.jface.text.ITextViewer,
-	 *      boolean)
-	 */
-	public void selected(ITextViewer viewer, boolean smartToggle) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#unselected(org.eclipse.jface.text.ITextViewer)
-	 */
-	public void unselected(ITextViewer viewer) {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#validate(org.eclipse.jface.text.IDocument,
-	 *      int, org.eclipse.jface.text.DocumentEvent)
-	 */
-	public boolean validate(IDocument document, int offset, DocumentEvent event) {
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/SurroundWithNewElementQuickAssistProposal.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/SurroundWithNewElementQuickAssistProposal.java
deleted file mode 100644
index 7baffc8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/SurroundWithNewElementQuickAssistProposal.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.text.edits.InsertEdit;
-import org.eclipse.text.edits.MalformedTreeException;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-import org.w3c.dom.Node;
-
-public class SurroundWithNewElementQuickAssistProposal extends RenameInFileQuickAssistProposal {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposalExtension2#apply(org.eclipse.jface.text.ITextViewer,
-	 *      char, int, int)
-	 */
-	public void apply(ITextViewer viewer, char trigger, int stateMask, int offset) {
-		try {
-			int startTagOffset = offset;
-			int endTagOffset = offset + viewer.getSelectedRange().y;
-
-			// surround the node if no selection
-			if (startTagOffset == endTagOffset) {
-				IDOMNode cursorNode = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, offset);
-				// use parent node if text node is empty
-				if ((cursorNode.getNodeType() == Node.TEXT_NODE) && (cursorNode.getNodeValue().trim().length() == 0)) {
-					cursorNode = (IDOMNode) cursorNode.getParentNode();
-				}
-
-				startTagOffset = cursorNode.getStartOffset();
-				endTagOffset = cursorNode.getEndOffset();
-			}
-
-			// insert new element
-			MultiTextEdit multiTextEdit = new MultiTextEdit();
-			// element tag name cannot be DBCS, do not translate "<element>"
-			// and "</element>"
-			multiTextEdit.addChild(new InsertEdit(startTagOffset, "<element>")); //$NON-NLS-1$
-			multiTextEdit.addChild(new InsertEdit(endTagOffset, "</element>")); //$NON-NLS-1$
-			multiTextEdit.apply(viewer.getDocument());
-
-			// get new element node
-			IDOMNode newElementNode = (IDOMNode) ContentAssistUtils.getNodeAt(viewer, startTagOffset);
-
-			// format new element
-			IStructuredFormatProcessor formatProcessor = new FormatProcessorXML();
-			formatProcessor.formatNode(newElementNode);
-
-			// rename new element
-			super.apply(viewer, trigger, stateMask, newElementNode.getStartOffset() + 1);
-		}
-		catch (MalformedTreeException e) {
-			// log for now, unless find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-		catch (BadLocationException e) {
-			// log for now, unless find reason not to
-			Logger.log(Logger.INFO, e.getMessage());
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getAdditionalProposalInfo()
-	 */
-	public String getAdditionalProposalInfo() {
-		return XMLUIMessages.SurroundWithNewElementQuickAssistProposal_0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getDisplayString()
-	 */
-	public String getDisplayString() {
-		return XMLUIMessages.SurroundWithNewElementQuickAssistProposal_1;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.contentassist.ICompletionProposal#getImage()
-	 */
-	public Image getImage() {
-		// return JavaPluginImages.get(JavaPluginImages.IMG_CORRECTION_LOCAL);
-		return XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_ADD_CORRECTION);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/XMLQuickAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/XMLQuickAssistProcessor.java
deleted file mode 100644
index 4649e94..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/correction/XMLQuickAssistProcessor.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.correction;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
-import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-public class XMLQuickAssistProcessor implements IQuickAssistProcessor {
-
-	public boolean canAssist(IQuickAssistInvocationContext invocationContext) {
-		return true;
-	}
-
-	public boolean canFix(Annotation annotation) {
-		return false;
-	}
-
-	public ICompletionProposal[] computeQuickAssistProposals(IQuickAssistInvocationContext invocationContext) {
-		List proposals = new ArrayList();
-
-		getLocalRenameQuickAssistProposal(proposals, invocationContext.getSourceViewer(), invocationContext.getOffset());
-		getSurroundWithNewElementQuickAssistProposal(proposals, invocationContext.getSourceViewer(), invocationContext.getOffset());
-		getInsertRequiredAttrs(proposals, invocationContext.getSourceViewer(), invocationContext.getOffset());
-
-		return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]);
-	}
-
-	public String getErrorMessage() {
-		return null;
-	}
-
-	private void getInsertRequiredAttrs(List proposals, ISourceViewer viewer, int offset) {
-		IDOMNode node = (IDOMNode) getNodeAt(viewer, offset);
-		if ((node != null) && (node.getNodeType() == Node.ELEMENT_NODE)) {
-			IStructuredDocumentRegion startStructuredDocumentRegion = node.getStartStructuredDocumentRegion();
-			if ((startStructuredDocumentRegion != null) && startStructuredDocumentRegion.containsOffset(offset)) {
-				IDOMNode cursorNode = (IDOMNode) getNodeAt(viewer, offset);
-				List requiredAttrs = getRequiredAttrs(cursorNode);
-				if (requiredAttrs.size() > 0) {
-					NamedNodeMap currentAttrs = node.getAttributes();
-					List insertAttrs = new ArrayList();
-					if (currentAttrs.getLength() == 0) {
-						insertAttrs.addAll(requiredAttrs);
-					}
-					else {
-						for (int i = 0; i < requiredAttrs.size(); i++) {
-							String requiredAttrName = ((CMAttributeDeclaration) requiredAttrs.get(i)).getAttrName();
-							boolean found = false;
-							for (int j = 0; j < currentAttrs.getLength(); j++) {
-								String currentAttrName = currentAttrs.item(j).getNodeName();
-								if (requiredAttrName.compareToIgnoreCase(currentAttrName) == 0) {
-									found = true;
-									break;
-								}
-							}
-							if (!found) {
-								insertAttrs.add(requiredAttrs.get(i));
-							}
-						}
-					}
-					if (insertAttrs.size() > 0) {
-						proposals.add(new InsertRequiredAttrsQuickAssistProposal(insertAttrs));
-					}
-				}
-			}
-		}
-	}
-
-	private void getLocalRenameQuickAssistProposal(List proposals, ISourceViewer viewer, int offset) {
-		IDOMNode node = (IDOMNode) getNodeAt(viewer, offset);
-		IStructuredDocumentRegion startStructuredDocumentRegion = node == null ? null : node.getStartStructuredDocumentRegion();
-		IStructuredDocumentRegion endStructuredDocumentRegion = node == null ? null : node.getEndStructuredDocumentRegion();
-
-		ITextRegion region = null;
-		int regionTextEndOffset = 0;
-		if ((startStructuredDocumentRegion != null) && startStructuredDocumentRegion.containsOffset(offset)) {
-			region = startStructuredDocumentRegion.getRegionAtCharacterOffset(offset);
-			regionTextEndOffset = startStructuredDocumentRegion.getTextEndOffset(region);
-		}
-		else if ((endStructuredDocumentRegion != null) && endStructuredDocumentRegion.containsOffset(offset)) {
-			region = endStructuredDocumentRegion.getRegionAtCharacterOffset(offset);
-			regionTextEndOffset = endStructuredDocumentRegion.getTextEndOffset(region);
-		}
-
-		if ((region != null) && ((region.getType() == DOMRegionContext.XML_TAG_NAME) || (region.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) && (offset <= regionTextEndOffset)) {
-			proposals.add(new RenameInFileQuickAssistProposal());
-		}
-	}
-
-	private ModelQuery getModelQuery(Node node) {
-		if (node.getNodeType() == Node.DOCUMENT_NODE) {
-			return ModelQueryUtil.getModelQuery((Document) node);
-		}
-		else {
-			return ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-		}
-	}
-
-	private List getRequiredAttrs(Node node) {
-		List result = new ArrayList();
-
-		ModelQuery modelQuery = getModelQuery(node);
-		if (modelQuery != null) {
-			CMElementDeclaration elementDecl = modelQuery.getCMElementDeclaration((Element) node);
-			if (elementDecl != null) {
-				CMNamedNodeMap attrMap = elementDecl.getAttributes();
-
-				CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attrMap);
-				List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent((Element) node, elementDecl, ModelQuery.INCLUDE_ATTRIBUTES);
-				for (int k = 0; k < nodes.size(); k++) {
-					CMNode cmnode = (CMNode) nodes.get(k);
-					if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-						allAttributes.put(cmnode);
-					}
-				}
-				attrMap = allAttributes;
-				
-				Iterator it = attrMap.iterator();
-				CMAttributeDeclaration attr = null;
-				while (it.hasNext()) {
-					attr = (CMAttributeDeclaration) it.next();
-					if (attr.getUsage() == CMAttributeDeclaration.REQUIRED) {
-						result.add(attr);
-					}
-				}
-			}
-		}
-
-		return result;
-	}
-
-	private void getSurroundWithNewElementQuickAssistProposal(List proposals, ISourceViewer viewer, int offset) {
-		IDOMNode node = (IDOMNode) getNodeAt(viewer, offset);
-		if (node != null) {
-			proposals.add(new SurroundWithNewElementQuickAssistProposal());
-		}
-	}
-
-	/**
-	 * Returns the closest IndexedRegion for the offset and viewer allowing
-	 * for differences between viewer offsets and model positions. note: this
-	 * method returns an IndexedRegion for read only
-	 * 
-	 * @param viewer
-	 *            the viewer whose document is used to compute the proposals
-	 * @param documentOffset
-	 *            an offset within the document for which completions should
-	 *            be computed
-	 * @return an IndexedRegion
-	 */
-	private IndexedRegion getNodeAt(ITextViewer viewer, int documentOffset) {
-		// copied from ContentAssistUtils.getNodeAt()
-		if (viewer == null)
-			return null;
-
-		IndexedRegion node = null;
-		IModelManager mm = StructuredModelManager.getModelManager();
-		IStructuredModel model = null;
-		if (mm != null)
-			model = mm.getExistingModelForRead(viewer.getDocument());
-		try {
-			if (model != null) {
-				int lastOffset = documentOffset;
-				node = model.getIndexedRegion(documentOffset);
-				while (node == null && lastOffset >= 0) {
-					lastOffset--;
-					node = model.getIndexedRegion(lastOffset);
-				}
-			}
-		}
-		finally {
-			if (model != null)
-				model.releaseFromRead();
-		}
-		return node;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditAttributeDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditAttributeDialog.java
deleted file mode 100644
index e95af80..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditAttributeDialog.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonUIContextIds;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-public class EditAttributeDialog extends Dialog implements ModifyListener {
-	protected Attr attribute;
-	protected String attributeName;
-	protected Text attributeNameField;
-	protected String attributeValue;
-	protected Text attributeValueField;
-	protected Label errorMessageLabel;
-	protected Button okButton;
-	protected Element ownerElement;
-
-	public EditAttributeDialog(Shell parentShell, Element ownerElement, Attr attribute) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.ownerElement = ownerElement;
-		this.attribute = attribute;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			attributeName = getModelValue(attributeNameField.getText());
-			attributeValue = attributeValueField.getText();
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createContents(Composite parent) {
-		Control control = super.createContents(parent);
-		attributeNameField.forceFocus();
-		attributeNameField.selectAll();
-		updateErrorMessage();
-		return control;
-	}
-
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogArea, XMLCommonUIContextIds.XCUI_ATTRIBUTE_DIALOG);
-
-		Composite composite = new Composite(dialogArea, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		//
-		// Style convenience constants
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label attributeNameLabel = new Label(composite, SWT.NONE);
-		attributeNameLabel.setText(XMLUIMessages._UI_LABEL_NAME_COLON);
-
-		attributeNameField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		attributeNameField.setLayoutData(gd);
-		attributeNameField.setText(getDisplayValue(attribute != null ? attribute.getName() : "")); //$NON-NLS-1$
-		attributeNameField.addModifyListener(this);
-
-		Label attributeValueLabel = new Label(composite, SWT.NONE);
-		attributeValueLabel.setText(XMLUIMessages._UI_LABEL_VALUE_COLON);
-
-		String value = attribute != null ? attribute.getValue() : ""; //$NON-NLS-1$
-		int style = SWT.SINGLE | SWT.BORDER;
-		if (value.indexOf("\n") != -1) { //$NON-NLS-1$
-			style = SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL;
-		}
-
-		attributeValueField = new Text(composite, style);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 300;
-		attributeValueField.setLayoutData(gd);
-		attributeValueField.setText(getDisplayValue(attribute != null ? attribute.getValue() : "")); //$NON-NLS-1$
-
-		// error message
-		errorMessageLabel = new Label(composite, SWT.WRAP);
-		errorMessageLabel.setText(XMLUIMessages.error_message_goes_here);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 200;
-		gd.heightHint = Math.max(30, errorMessageLabel.computeSize(0, 0, false).y * 2);
-		gd.horizontalSpan = 2;
-		errorMessageLabel.setLayoutData(gd);
-		Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-		errorMessageLabel.setForeground(color);
-
-		return dialogArea;
-	}
-
-	public String getAttributeName() {
-		return attributeName;
-	}
-
-	public String getAttributeValue() {
-		return attributeValue;
-	}
-
-	protected String getDisplayValue(String string) {
-		return string != null ? string : ""; //$NON-NLS-1$
-	}
-
-	protected String getModelValue(String string) {
-		String result = null;
-		if ((string != null) && (string.trim().length() > 0)) {
-			result = string;
-		}
-		return result;
-	}
-
-	public void modifyText(ModifyEvent e) {
-		updateErrorMessage();
-	}
-
-	protected void updateErrorMessage() {
-		String errorMessage = null;
-		String name = attributeNameField.getText().trim();
-		if (name.length() > 0) {
-			Attr matchingAttribute = ownerElement.getAttributeNode(name);
-			if ((matchingAttribute != null) && (matchingAttribute != attribute)) {
-				errorMessage = XMLUIMessages._ERROR_XML_ATTRIBUTE_ALREADY_EXISTS;
-			}
-			else {
-				// TODO get checkName from Model
-				// errorMessage = ValidateHelper.checkXMLName(name);
-			}
-		}
-		else {
-			errorMessage = ""; //$NON-NLS-1$
-		}
-
-		errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-		errorMessageLabel.getParent().layout();
-		okButton.setEnabled(errorMessage == null);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditDoctypeDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditDoctypeDialog.java
deleted file mode 100644
index 6e071ba..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditDoctypeDialog.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonUIContextIds;
-import org.w3c.dom.DocumentType;
-
-public class EditDoctypeDialog extends Dialog {
-	protected boolean computeSystemId;
-	protected String[] doctypeData;
-	protected boolean errorChecking;
-	protected Label errorMessageLabel;
-	protected Button okButton;
-	protected Button publicIdBrowseButton;
-	protected Text publicIdField;
-	protected IPath resourceLocation;
-	protected Text rootElementNameField;
-	protected Button systemIdBrowseButton;
-	protected Text systemIdField;
-
-	public EditDoctypeDialog(Shell parentShell, DocumentType doctype) {
-		this(parentShell, doctype.getName(), doctype.getPublicId(), doctype.getSystemId());
-	}
-
-	public EditDoctypeDialog(Shell parentShell, String name, String publicId, String systemId) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		doctypeData = new String[3];
-		doctypeData[0] = name;
-		doctypeData[1] = publicId;
-		doctypeData[2] = systemId;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		doctypeData[0] = getModelValue(rootElementNameField.getText());
-		doctypeData[1] = getModelValue(publicIdField.getText());
-		doctypeData[2] = getModelValue(systemIdField.getText());
-		super.buttonPressed(buttonId);
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-
-	protected Control createContents(Composite parent) {
-		Control control = super.createContents(parent);
-		updateErrorMessage();
-		return control;
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogControl = (Composite) super.createDialogArea(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogControl, XMLCommonUIContextIds.XCUI_DOCTYPE_DIALOG);
-
-		Composite composite = new Composite(dialogControl, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-
-		ModifyListener modifyListener = new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (e.widget == systemIdField) {
-					computeSystemId = false;
-				}
-				updateErrorMessage();
-			}
-		};
-
-		// row 1
-		//
-		Label rootElementNameLabel = new Label(composite, SWT.NONE);
-		rootElementNameLabel.setText(XMLUIMessages._UI_LABEL_ROOT_ELEMENT_NAME_COLON);
-
-		rootElementNameField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(rootElementNameField, XMLCommonUIContextIds.XCUI_DOCTYPE_ROOT);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 200;
-		rootElementNameField.setLayoutData(gd);
-		rootElementNameField.setText(getDisplayValue(doctypeData[0]));
-		rootElementNameField.addModifyListener(modifyListener);
-
-		Label placeHolder = new Label(composite, SWT.NONE);
-		placeHolder.setLayoutData(new GridData());
-
-		// row 2
-		//
-		Label publicIdLabel = new Label(composite, SWT.NONE);
-		publicIdLabel.setText(XMLUIMessages._UI_LABEL_PUBLIC_ID_COLON);
-
-		publicIdField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(publicIdField, XMLCommonUIContextIds.XCUI_DOCTYPE_PUBLIC);
-		publicIdField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		publicIdField.setText(getDisplayValue(doctypeData[1]));
-
-		SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				EditEntityHelper helper = new EditEntityHelper();
-				if (e.widget == publicIdBrowseButton) {
-					helper.performBrowseForPublicId(getShell(), publicIdField, computeSystemId ? systemIdField : null);
-				}
-				else if (e.widget == systemIdBrowseButton) {
-					helper.performBrowseForSystemId(getShell(), systemIdField, resourceLocation);
-				}
-			}
-		};
-
-		publicIdBrowseButton = new Button(composite, SWT.NONE);
-		publicIdBrowseButton.setText(XMLUIMessages._UI_LABEL_BROWSE);
-		publicIdBrowseButton.addSelectionListener(selectionListener);
-
-		// row 3
-		Label systemIdLabel = new Label(composite, SWT.NONE);
-		systemIdLabel.setText(XMLUIMessages._UI_LABEL_SYSTEM_ID_COLON);
-
-		systemIdField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(systemIdField, XMLCommonUIContextIds.XCUI_DOCTYPE_SYSTEM);
-		systemIdField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		systemIdField.setText(getDisplayValue(doctypeData[2]));
-		systemIdField.addModifyListener(modifyListener);
-
-
-		systemIdBrowseButton = new Button(composite, SWT.NONE);
-		systemIdBrowseButton.setText(XMLUIMessages._UI_LABEL_BROWSE);
-		systemIdBrowseButton.addSelectionListener(selectionListener);
-
-		// error message
-		errorMessageLabel = new Label(dialogControl, SWT.NONE);
-		errorMessageLabel.setText(""); //$NON-NLS-1$
-		errorMessageLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-		errorMessageLabel.setForeground(color);
-
-		Dialog.applyDialogFont(parent);
-		return dialogControl;
-	}
-
-
-	protected Label createMessageArea(Composite composite) {
-		Label label = new Label(composite, SWT.NONE);
-		// label.setText(message);
-		return label;
-	}
-
-
-	protected String getDisplayValue(String string) {
-		return string != null ? string : ""; //$NON-NLS-1$
-	}
-
-	public boolean getErrorChecking() {
-		return errorChecking;
-	}
-
-
-	protected String getModelValue(String string) {
-		String result = null;
-		if ((string != null) && (string.trim().length() > 0)) {
-			result = string;
-		}
-		return result;
-	}
-
-	public String getName() {
-		return doctypeData[0];
-	}
-
-	public String getPublicId() {
-		return doctypeData[1];
-	}
-
-	public String getSystemId() {
-		return doctypeData[2];
-	}
-
-	public void setComputeSystemId(boolean computeSystemId) {
-		this.computeSystemId = computeSystemId;
-	}
-
-	public void setErrorChecking(boolean errorChecking) {
-		this.errorChecking = errorChecking;
-	}
-
-	public void setResourceLocation(IPath path) {
-		resourceLocation = path;
-	}
-
-	public void updateErrorMessage() {
-		if (errorChecking) {
-			String errorMessage = null;
-			if (getModelValue(systemIdField.getText()) == null) {
-				errorMessage = XMLUIMessages._UI_WARNING_SYSTEM_ID_MUST_BE_SPECIFIED;
-			}
-			else if (getModelValue(rootElementNameField.getText()) == null) {
-				errorMessage = XMLUIMessages._UI_WARNING_ROOT_ELEMENT_MUST_BE_SPECIFIED;
-			}
-
-			errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-			okButton.setEnabled(errorMessage == null);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditElementDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditElementDialog.java
deleted file mode 100644
index adad381..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditElementDialog.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonUIContextIds;
-import org.w3c.dom.Element;
-
-public class EditElementDialog extends Dialog implements ModifyListener {
-	protected Element element;
-	protected String elementName;
-	protected Text elementNameField;
-	protected Label errorMessageLabel;
-	protected Button okButton;
-
-	public EditElementDialog(Shell parentShell, Element element) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.element = element;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			elementName = getModelValue(elementNameField.getText());
-		}
-		super.buttonPressed(buttonId);
-	}
-
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createContents(Composite parent) {
-		Control control = super.createContents(parent);
-		elementNameField.forceFocus();
-		elementNameField.selectAll();
-		updateErrorMessage();
-		return control;
-	}
-
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogArea, XMLCommonUIContextIds.XCUI_ELEMENT_DIALOG);
-
-		Composite composite = new Composite(dialogArea, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		Label elementNameLabel = new Label(composite, SWT.NONE);
-		elementNameLabel.setText(XMLUIMessages._UI_LABEL_ELEMENT_NAME);
-
-		elementNameField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 200;
-		elementNameField.setLayoutData(gd);
-		elementNameField.setText(getDisplayValue(element != null ? element.getNodeName() : "")); //$NON-NLS-1$
-		elementNameField.addModifyListener(this);
-
-		// error message
-		errorMessageLabel = new Label(composite, SWT.NONE);
-		errorMessageLabel.setText(XMLUIMessages.error_message_goes_here);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		errorMessageLabel.setLayoutData(gd);
-		Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-		errorMessageLabel.setForeground(color);
-
-		return dialogArea;
-	}
-
-	protected String getDisplayValue(String string) {
-		return string != null ? string : ""; //$NON-NLS-1$
-	}
-
-	public String getElementName() {
-		return elementName;
-	}
-
-	protected String getModelValue(String string) {
-		String result = null;
-		if ((string != null) && (string.trim().length() > 0)) {
-			result = string;
-		}
-		return result;
-	}
-
-	public void modifyText(ModifyEvent e) {
-		updateErrorMessage();
-	}
-
-	protected void updateErrorMessage() {
-		String errorMessage = null;
-		String name = elementNameField.getText();
-		// String name = elementNameField.getText().trim();
-		if (name.length() > 0) {
-			// TODO use checkName from model level
-			// errorMessage = ValidateHelper.checkXMLName(name);
-			if (!NameValidator.isValid(name)) {
-				errorMessage = XMLUIMessages._UI_INVALID_NAME;
-			}
-		}
-		else {
-			errorMessage = ""; //$NON-NLS-1$
-		}
-
-		errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-		okButton.setEnabled(errorMessage == null);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditEntityHelper.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditEntityHelper.java
deleted file mode 100644
index 25eb64d..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditEntityHelper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class EditEntityHelper {
-
-	public void performBrowseForPublicId(Shell parentShell, Text publicIdField) {
-		performBrowseForPublicId(parentShell, publicIdField, null);
-	}
-
-	public void performBrowseForPublicId(Shell parentShell, Text publicIdField, Text systemIdField) {
-		String[] extensions = {"dtd", "txt"}; //$NON-NLS-1$ //$NON-NLS-2$
-		SelectXMLCatalogIdDialog dialog = new SelectXMLCatalogIdDialog(parentShell, extensions);
-		dialog.create();
-		dialog.getShell().setText(XMLUIMessages._UI_LABEL_SELECT_XML_CATALOG_ENTRY);
-		dialog.setBlockOnOpen(true);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-			String id = dialog.getId();
-			if (id != null) {
-				publicIdField.setText(id);
-				if ((systemIdField != null) && (dialog.getSystemId() != null)) {
-					systemIdField.setText(dialog.getSystemId());
-				}
-			}
-		}
-	}
-
-	public void performBrowseForSystemId(Shell parentShell, Text systemIdField, IPath resourceLocation) {
-		String[] extensions = {"dtd"}; //$NON-NLS-1$
-		SelectFileOrXMLCatalogIdDialog dialog = new SelectFileOrXMLCatalogIdDialog(parentShell, extensions, ICatalogEntry.ENTRY_TYPE_SYSTEM);
-		dialog.create();
-		dialog.getShell().setText(XMLUIMessages._UI_LABEL_SPECIFY_SYSTEM_ID);
-		dialog.setBlockOnOpen(true);
-		dialog.open();
-		if (dialog.getReturnCode() == Window.OK) {
-			String id = dialog.getId();
-			IFile file = dialog.getFile();
-			if (id != null) {
-				systemIdField.setText(id);
-			}
-			else if (file != null) {
-				String uri = null;
-				if (resourceLocation != null) {
-					uri = URIHelper.getRelativeURI(file.getLocation(), resourceLocation);
-				}
-				else {
-					uri = file.getLocation().toOSString();
-				}
-				systemIdField.setText(uri);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditNamespaceInfoDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditNamespaceInfoDialog.java
deleted file mode 100644
index 844ac60..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditNamespaceInfoDialog.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.ContentModelManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonUIContextIds;
-
-public class EditNamespaceInfoDialog extends Dialog {
-
-	public static EditNamespaceInfoDialog invokeDialog(Shell shell, String title, NamespaceInfo info, IPath resourceLocation) {
-		EditNamespaceInfoDialog dialog = new EditNamespaceInfoDialog(shell, info);
-		dialog.create();
-		dialog.getShell().setText(title);
-		dialog.setBlockOnOpen(true);
-		dialog.setResourceLocation(resourceLocation);
-		dialog.open();
-		return dialog;
-	}
-
-	protected Button browseButton;
-	protected String errorMessage;
-
-	protected Label errorMessageLabel;
-	protected NamespaceInfo fInfo;
-	protected Text locationHintField;
-
-	protected Button okButton;
-	protected Text prefixField;
-	protected IPath resourceLocation;
-	protected Text uriField;
-
-	public EditNamespaceInfoDialog(Shell parentShell, NamespaceInfo info) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.fInfo = info;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			fInfo.uri = uriField.getText();
-			fInfo.prefix = prefixField.getText();
-			fInfo.locationHint = locationHintField.getText();
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	protected void computeErrorMessage() {
-		errorMessage = null;
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		okButton.setEnabled(false);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-		updateWidgets();
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogsubArea = (Composite) super.createDialogArea(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogsubArea, XMLCommonUIContextIds.XCUI_NAMESPACE_DIALOG);
-
-		Composite composite = new Composite(dialogsubArea, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 3;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 350;
-		composite.setLayoutData(gd);
-
-		ModifyListener modifyListener = new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				updateWidgets();
-			}
-		};
-
-
-		// row 1
-		//
-		Label uriLabel = new Label(composite, SWT.NONE);
-		uriLabel.setText(XMLUIMessages._UI_LABEL_NAMESPACE_NAME_COLON);
-
-		uriField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		uriField.setLayoutData(gd);
-		uriField.setText(getDisplayValue(fInfo.uri));
-		uriField.addModifyListener(modifyListener);
-		uriField.setEnabled(fInfo.getProperty("uri-readOnly") == null); //$NON-NLS-1$
-
-		// never read
-		Label placeHolder1 = new Label(composite, SWT.NONE);
-		placeHolder1.setText(""); //$NON-NLS-1$
-
-		// row 2
-		//
-		Label prefixLabel = new Label(composite, SWT.NONE);
-		prefixLabel.setText(XMLUIMessages._UI_LABEL_PREFIX_COLON);
-
-		prefixField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		prefixField.setLayoutData(gd);
-		prefixField.setText(getDisplayValue(fInfo.prefix));
-		prefixField.addModifyListener(modifyListener);
-		prefixField.setEnabled(fInfo.getProperty("prefix-readOnly") == null); //$NON-NLS-1$
-
-		// never read
-		Label placeHolder2 = new Label(composite, SWT.NONE);
-		placeHolder2.setText(""); //$NON-NLS-1$
-
-		// row 3
-		//
-		Label locationHintLabel = new Label(composite, SWT.NONE);
-		locationHintLabel.setText(XMLUIMessages._UI_LABEL_LOCATION_HINT_COLON);
-
-		locationHintField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.grabExcessHorizontalSpace = true;
-		locationHintField.setLayoutData(gd);
-		locationHintField.setText(getDisplayValue(fInfo.locationHint));
-		locationHintField.addModifyListener(modifyListener);
-		locationHintField.setEnabled(fInfo.getProperty("locationHint-readOnly") == null); //$NON-NLS-1$
-
-		SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				performBrowse();
-			}
-		};
-
-		browseButton = new Button(composite, SWT.NONE);
-		browseButton.setText(XMLUIMessages._UI_LABEL_BROWSE);
-		browseButton.addSelectionListener(selectionListener);
-		browseButton.setEnabled(locationHintField.getEnabled());
-
-		// error message
-		errorMessageLabel = new Label(dialogsubArea, SWT.NONE);
-		errorMessageLabel.setText(XMLUIMessages.error_message_goes_here);
-		errorMessageLabel.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-		errorMessageLabel.setForeground(color);
-
-		return dialogsubArea;
-	}
-
-	protected String getDisplayValue(String string) {
-		return string != null ? string : ""; //$NON-NLS-1$
-	}
-
-	protected void performBrowse() {
-		String[] extensions = {".xsd"}; //$NON-NLS-1$
-		SelectFileOrXMLCatalogIdDialog dialog = new SelectFileOrXMLCatalogIdDialog(getShell(), extensions);
-		dialog.create();
-		dialog.getShell().setText(XMLUIMessages._UI_LABEL_SELECT_FILE);
-		dialog.setBlockOnOpen(true);
-		dialog.open();
-
-		if (dialog.getReturnCode() == Window.OK) {
-			String grammarURI = null;
-			IFile file = dialog.getFile();
-			String id = dialog.getId();
-			if (file != null) {
-				String uri = null;
-				if (resourceLocation != null) {
-					IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(resourceLocation);
-					if (resource != null) {
-						IPath location = resource.getLocation();
-						if (location != null) {
-							uri = URIHelper.getRelativeURI(file.getLocation(), location);
-						}
-					}
-					else {
-					  uri = URIHelper.getRelativeURI(file.getLocation(), resourceLocation);
-					}
-					grammarURI = file.getLocation().toOSString();
-				}
-				else {
-					uri = file.getLocation().toOSString();
-					grammarURI = uri;
-				}
-				locationHintField.setText(uri);
-			}
-			else if (id != null) {
-				locationHintField.setText(id);
-				URIResolver resolver = URIResolverPlugin.createResolver();
-				grammarURI = resolver.resolve(null, id, id);
-			}
-
-
-			CMDocument document = ContentModelManager.getInstance().createCMDocument(URIHelper.getURIForFilePath(grammarURI), "xsd"); //$NON-NLS-1$
-			if(document != null) {
-				List namespaceInfoList = (List) document.getProperty("http://org.eclipse.wst/cm/properties/namespaceInfo"); //$NON-NLS-1$
-				if(namespaceInfoList != null) {
-					NamespaceInfo info = (NamespaceInfo) namespaceInfoList.get(0);
-					if(info != null) {
-						if ((uriField.getText().trim().length() == 0) && (info.uri != null)) {
-							uriField.setText(info.uri);
-						}
-						if ((prefixField.getText().trim().length() == 0) && (info.prefix != null)) {
-							prefixField.setText(info.prefix);
-						}
-					}
-				}
-			}
-		}
-	}
-
-	public void setResourceLocation(IPath path) {
-		resourceLocation = path;
-	}
-
-	protected void updateErrorMessageLabel() {
-		errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-	}
-
-	protected void updateOKButtonState() {
-		if (okButton != null) {
-			if ((uriField.getText().trim().length() == 0) && (prefixField.getText().trim().length() == 0) && (locationHintField.getText().trim().length() == 0)) {
-				okButton.setEnabled(false);
-			}
-			else {
-				okButton.setEnabled(errorMessage == null);
-			}
-		}
-	}
-
-	protected void updateWidgets() {
-		computeErrorMessage();
-		updateErrorMessageLabel();
-		updateOKButtonState();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditProcessingInstructionDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditProcessingInstructionDialog.java
deleted file mode 100644
index 6742855..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditProcessingInstructionDialog.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonUIContextIds;
-import org.w3c.dom.ProcessingInstruction;
-
-public class EditProcessingInstructionDialog extends Dialog {
-	protected String data;
-	protected Text dataField;
-	protected String target;
-	protected Text targetField;
-
-	public EditProcessingInstructionDialog(Shell parentShell, ProcessingInstruction pi) {
-		this(parentShell, pi.getTarget(), pi.getData());
-	}
-
-	public EditProcessingInstructionDialog(Shell parentShell, String target, String data) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.target = target;
-		this.data = data;
-	}
-
-	protected void buttonPressed(int buttonId) {
-		target = getModelValue(targetField.getText());
-		data = getModelValue(dataField.getText());
-		super.buttonPressed(buttonId);
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea1 = (Composite) super.createDialogArea(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogArea1, XMLCommonUIContextIds.XCUI_PROCESSING_DIALOG);
-
-		Composite composite = new Composite(dialogArea1, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint = 250;
-
-		Label targetLabel = new Label(composite, SWT.NONE);
-		targetLabel.setText(XMLUIMessages._UI_LABEL_TARGET_COLON);
-
-		targetField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		targetField.setLayoutData(gd);
-		targetField.setText(getDisplayValue(target));
-
-		Label dataLabel = new Label(composite, SWT.NONE);
-		dataLabel.setText(XMLUIMessages._UI_LABEL_DATA_COLON);
-
-		dataField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-		dataField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		dataField.setText(getDisplayValue(data));
-
-		return dialogArea1;
-	}
-
-	protected Label createMessageArea(Composite composite) {
-		Label label = new Label(composite, SWT.NONE);
-		// label.setText(message);
-		return label;
-	}
-
-	public String getData() {
-		return data;
-	}
-
-	protected String getDisplayValue(String string) {
-		return string != null ? string : ""; //$NON-NLS-1$
-	}
-
-	protected String getModelValue(String string) {
-		String result = null;
-		if ((string != null) && (string.trim().length() > 0)) {
-			result = string;
-		}
-		return result;
-	}
-
-
-	public String getTarget() {
-		return target;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditSchemaInfoDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditSchemaInfoDialog.java
deleted file mode 100644
index d445809..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/EditSchemaInfoDialog.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesDialog;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonUIContextIds;
-
-public class EditSchemaInfoDialog extends Dialog implements UpdateListener {
-	// protected NamespaceInfoTable namespaceInfoTable;
-	protected Label errorMessageLabel;
-	protected List namespaceInfoList;
-	protected IPath resourceLocation;
-
-	public EditSchemaInfoDialog(Shell parentShell, IPath resourceLocation) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.resourceLocation = resourceLocation;
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogArea, XMLCommonUIContextIds.XCUI_SCHEMA_INFO_DIALOG);
-
-		CommonEditNamespacesDialog editNamespacesControl = new CommonEditNamespacesDialog(dialogArea, resourceLocation, XMLUIMessages._UI_NAMESPACE_DECLARATIONS, false, true);
-		editNamespacesControl.setNamespaceInfoList(namespaceInfoList);
-
-		editNamespacesControl.updateErrorMessage(namespaceInfoList);
-
-		return dialogArea;
-	}
-
-	protected Control getDialogArea(Composite parent) {
-		return super.createDialogArea(parent);
-	}
-
-	public List getNamespaceInfoList() {
-		return namespaceInfoList;
-	}
-
-	public void setNamespaceInfoList(List list) {
-		namespaceInfoList = list;
-	}
-
-	public void updateErrorMessage(List namespaceInfoList) {
-		NamespaceInfoErrorHelper helper = new NamespaceInfoErrorHelper();
-		String errorMessage = helper.computeErrorMessage(namespaceInfoList, null);
-		errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-	}
-
-	public void updateOccured(Object object, Object arg) {
-		updateErrorMessage((List) arg);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoErrorHelper.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoErrorHelper.java
deleted file mode 100644
index 540df93..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoErrorHelper.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class NamespaceInfoErrorHelper {
-
-	protected List errorList;
-
-	public NamespaceInfoErrorHelper() {
-	}
-
-	public String computeErrorMessage(List namespaceInfoList, URIResolver idResolver) {
-		String result = null;
-		Hashtable prefixTable = new Hashtable();
-		Hashtable uriTable = new Hashtable();
-		for (Iterator iterator = namespaceInfoList.iterator(); iterator.hasNext();) {
-			NamespaceInfo nsInfo = (NamespaceInfo) iterator.next();
-			nsInfo.normalize();
-
-			String urikey = nsInfo.uri != null ? nsInfo.uri : ""; //$NON-NLS-1$
-			NamespaceInfo nsInfo2 = null;
-			if ((nsInfo2 = (NamespaceInfo) uriTable.get(urikey)) != null) {
-				if ((nsInfo.uri != null) && nsInfo.uri.equals(nsInfo2.uri)) {
-					result = XMLUIMessages._UI_WARNING_MORE_THAN_ONE_NS_WITH_NAME + "'" + nsInfo.uri + "'"; //$NON-NLS-1$ //$NON-NLS-2$ 
-				}
-				else {
-					result = XMLUIMessages._UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_NAME;
-				}
-				break;
-			}
-			else {
-				uriTable.put(urikey, nsInfo);
-			}
-
-			if (nsInfo.uri != null) {
-				String key = nsInfo.prefix != null ? nsInfo.prefix : ""; //$NON-NLS-1$
-				if (prefixTable.get(key) != null) {
-					if (nsInfo.prefix != null) {
-						result = XMLUIMessages._UI_WARNING_MORE_THAN_ONE_NS_WITH_PREFIX + "'" + nsInfo.prefix + "'"; //$NON-NLS-1$ //$NON-NLS-2$ 
-						break;
-					}
-					else {
-						result = XMLUIMessages._UI_WARNING_MORE_THAN_ONE_NS_WITHOUT_PREFIX;
-						break;
-					}
-				}
-				else {
-					prefixTable.put(key, nsInfo);
-				}
-
-				if ((nsInfo.locationHint != null) && (idResolver != null)) {
-					String grammarURI = idResolver.resolve(null, nsInfo.locationHint, nsInfo.locationHint);
-					if (!URIHelper.isReadableURI(grammarURI, false)) {
-						result = XMLUIMessages._UI_WARNING_SCHEMA_CAN_NOT_BE_LOCATED + " '" + nsInfo.locationHint + "'"; //$NON-NLS-1$ //$NON-NLS-2$ 
-						break;
-					}
-				}
-				if ((idResolver != null) && (nsInfo.locationHint == null) && !nsInfo.uri.equals(DOMNamespaceInfoManager.XSI_URI)) {
-					result = XMLUIMessages._UI_WARNING_LOCATION_HINT_NOT_SPECIFIED + " '" + nsInfo.uri + "'"; //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				}
-			}
-			else {
-				if (nsInfo.prefix != null) {
-					result = XMLUIMessages._UI_WARNING_NAMESPACE_NAME_NOT_SPECIFIED + " '" + nsInfo.prefix + "'"; //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				}
-			}
-		}
-		// additional tests
-		if (result == null) {
-			for (Iterator iterator = namespaceInfoList.iterator(); iterator.hasNext();) {
-				NamespaceInfo nsInfo = (NamespaceInfo) iterator.next();
-				nsInfo.normalize();
-				if ((nsInfo.uri != null) && nsInfo.isPrefixRequired && (nsInfo.prefix == null)) {
-					result = XMLUIMessages._UI_WARNING_PREFIX_NOT_SPECIFIED + " '" + nsInfo.uri + "'"; //$NON-NLS-1$ //$NON-NLS-2$ 
-					break;
-				}
-			}
-		}
-
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoTable.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoTable.java
deleted file mode 100644
index 8a438dc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/NamespaceInfoTable.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-public class NamespaceInfoTable extends Composite {
-
-	/**
-	 * NamespaceInfoTableLabelProvider
-	 */
-	protected class NamespaceInfoTableLabelProvider implements ITableLabelProvider, IStructuredContentProvider {
-
-		public void addListener(ILabelProviderListener listener) {
-		}
-
-		public void dispose() {
-		}
-
-		public Image getColumnImage(Object object, int columnIndex) {
-			return null;
-		}
-
-		public String getColumnText(Object object, int column) {
-			NamespaceInfo info = (NamespaceInfo) object;
-			String result = null;
-			switch (column) {
-				case 0 : {
-					result = info.uri;
-					break;
-				}
-				case 1 : {
-					result = info.prefix;
-					break;
-				}
-				case 2 : {
-					result = info.locationHint;
-					break;
-				}
-			}
-			result = result != null ? result : ""; //$NON-NLS-1$
-			if (result.equals("")) { //$NON-NLS-1$
-				switch (column) {
-					case 0 : {
-						result = XMLUIMessages._UI_NO_NAMESPACE_NAME;
-						break;
-					}
-					case 1 : {
-						result = XMLUIMessages._UI_NO_PREFIX;
-						break;
-					}
-				}
-			}
-			return result;
-		}
-
-		String getDefaultPrefix() {
-			String defaultPrefix = "p"; //$NON-NLS-1$
-			if (namespaceInfoList == null) {
-				return defaultPrefix;
-			}
-			Vector v = new Vector();
-			for (int i = 0; i < namespaceInfoList.size(); i++) {
-				NamespaceInfo nsinfo = (NamespaceInfo) namespaceInfoList.get(i);
-				if (nsinfo.prefix != null) {
-					v.addElement(nsinfo.prefix);
-				}
-			}
-			if (v.contains(defaultPrefix)) {
-				String s = defaultPrefix;
-				for (int j = 0; v.contains(s); j++) {
-					s = defaultPrefix + Integer.toString(j);
-				}
-				return s;
-			}
-			else {
-				return defaultPrefix;
-			}
-		}
-
-		public Object[] getElements(Object inputElement) {
-			return namespaceInfoList.toArray();
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		public boolean isDeleted(Object element) {
-			return false;
-		}
-
-		public boolean isLabelProperty(Object object, Object property) {
-			return false;
-		}
-
-		public boolean isLabelProperty(Object element, String property) {
-			return false;
-		}
-
-		public void removeListener(ILabelProviderListener listener) {
-		}
-	}
-
-	protected static final String LOCATION_HINT = XMLUIMessages._UI_LABEL_LOCATION_HINT;
-	protected static final String NAMESPACE_URI = XMLUIMessages._UI_LABEL_NAMESPACE_NAME;
-	protected static final String PREFIX = XMLUIMessages._UI_LABEL_PREFIX;
-	protected Button deleteButton;
-	protected boolean dummyRowsRemoved = false;
-	protected Button editButton;
-	protected List namespaceInfoList = new Vector();
-	protected Button newButton;
-	protected NamespaceInfoTableLabelProvider provider;
-	protected IPath resourceLocation;
-	protected TableViewer tableViewer;
-	protected UpdateListener updateListener;
-	protected int visibleRows = -1;
-
-	public NamespaceInfoTable(Composite parent) {
-		this(parent, -1, -1, -1);
-	}
-
-	public NamespaceInfoTable(Composite parent, int visibleRows) {
-		this(parent, -1, -1, visibleRows);
-	}
-
-	public NamespaceInfoTable(Composite parent, int widthHint, int heightHint) {
-		this(parent, widthHint, heightHint, -1);
-	}
-
-	public NamespaceInfoTable(Composite parent, int widthHint, int heightHint, int visibleRows) {
-		super(parent, SWT.NONE);
-		setLayout(createGridLayout());
-		setLayoutData(new GridData(GridData.FILL_BOTH));
-		Group namespaceInfoGroup = new Group(this, SWT.NONE);
-		namespaceInfoGroup.setText(XMLUIMessages._UI_LABEL_XML_SCHEMA_INFORMATION);
-		namespaceInfoGroup.setLayout(new GridLayout());
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		if (widthHint != -1) {
-			gd.widthHint = widthHint;
-		}
-		if (heightHint != -1) {
-			gd.heightHint = heightHint;
-		}
-		namespaceInfoGroup.setLayoutData(gd);
-		// WorkbenchHelp.setHelp(namespaceInfoGroup, new
-		// ControlContextComputer(namespaceInfoGroup,
-		// XMLBuilderContextIds.XMLC_NAMESPACE_GROUP));
-		String[] titleArray = {NAMESPACE_URI, PREFIX, LOCATION_HINT};
-		tableViewer = new TableViewer(namespaceInfoGroup, SWT.FULL_SELECTION);
-		provider = new NamespaceInfoTableLabelProvider();
-		tableViewer.setContentProvider(provider);
-		tableViewer.setLabelProvider(provider);
-		tableViewer.setColumnProperties(titleArray);
-		Table table = tableViewer.getTable();
-		table.setHeaderVisible(true);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-		int[] widthArray = {50, 20, 30};
-		TableLayout layout = new TableLayout();
-		for (int i = 0; i < titleArray.length; i++) {
-			TableColumn column = new TableColumn(table, i);
-			column.setText(titleArray[i]);
-			column.setAlignment(SWT.LEFT);
-			layout.addColumnData(new ColumnWeightData(widthArray[i], true));
-		}
-		this.visibleRows = visibleRows;
-		for (int i = 0; i < visibleRows; i++) {
-			TableItem item = new TableItem(table, SWT.NONE);
-			item.setText("#######"); //$NON-NLS-1$
-		}
-		table.setLayout(layout);
-		CellEditor[] cellEditors = new CellEditor[titleArray.length];
-		cellEditors[1] = new TextCellEditor(table);
-		cellEditors[2] = new TextCellEditor(table);
-		tableViewer.setCellEditors(cellEditors);
-		MouseAdapter mouseAdapter = new MouseAdapter() {
-			public void mouseDoubleClick(MouseEvent e) {
-				if (tableViewer.getTable().getItem(new Point(e.x, e.y)) != null) {
-					performEdit();
-				}
-			}
-		};
-		table.addMouseListener(mouseAdapter);
-		createButtons(namespaceInfoGroup);
-		ISelectionChangedListener selectionChangedListener = new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtonEnabledState();
-			}
-		};
-		tableViewer.addSelectionChangedListener(selectionChangedListener);
-	}
-
-	protected void createButtons(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 2;
-		gridLayout.marginHeight = 0;
-		gridLayout.marginWidth = 0;
-		composite.setLayout(gridLayout);
-		Button hiddenButton = new Button(composite, SWT.NONE);
-		hiddenButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		hiddenButton.setVisible(false);
-		hiddenButton.setEnabled(false);
-		SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.widget == newButton) {
-					performNew();
-				}
-				else if (e.widget == editButton) {
-					performEdit();
-				}
-				else if (e.widget == deleteButton) {
-					performDelete();
-				}
-			}
-		};
-		// create a composite to hold the three buttons
-		Composite buttonComposite = new Composite(composite, SWT.NONE);
-		buttonComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		GridLayout buttonGridLayout = new GridLayout();
-		buttonGridLayout.numColumns = 3;
-		buttonGridLayout.makeColumnsEqualWidth = true;
-		buttonComposite.setLayout(buttonGridLayout);
-		// add the New button
-		//
-		newButton = new Button(buttonComposite, SWT.NONE);
-		newButton.setText(XMLUIMessages._UI_BUTTON_NEW);
-		newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		newButton.addSelectionListener(selectionListener);
-		// add the Edit button
-		//
-		editButton = new Button(buttonComposite, SWT.NONE);
-		editButton.setText(XMLUIMessages._UI_BUTTON_EDIT);
-		editButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		editButton.addSelectionListener(selectionListener);
-		// add the Delete button
-		//
-		deleteButton = new Button(buttonComposite, SWT.NONE);
-		deleteButton.setText(XMLUIMessages._UI_BUTTON_DELETE);
-		deleteButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		deleteButton.addSelectionListener(selectionListener);
-	}
-
-	public GridLayout createGridLayout() {
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.marginWidth = 0;
-		gridLayout.horizontalSpacing = 0;
-		return gridLayout;
-	}
-
-	public List getNamespaceInfoList() {
-		return namespaceInfoList;
-	}
-
-	protected NamespaceInfo getTargetNamespaceInfo() {
-		return ((namespaceInfoList != null) && (namespaceInfoList.size() > 0)) ? (NamespaceInfo) namespaceInfoList.get(0) : null;
-	}
-
-	protected EditNamespaceInfoDialog invokeDialog(String title, NamespaceInfo info) {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		EditNamespaceInfoDialog dialog = new EditNamespaceInfoDialog(shell, info);
-		dialog.create();
-		dialog.getShell().setText(title);
-		dialog.setBlockOnOpen(true);
-		dialog.setResourceLocation(resourceLocation);
-		dialog.open();
-		return dialog;
-	}
-
-	protected void performDelayedUpdate() {
-		Runnable delayedUpdate = new Runnable() {
-			public void run() {
-				update();
-			}
-		};
-		getDisplay().asyncExec(delayedUpdate);
-		if (updateListener != null) {
-			updateListener.updateOccured(this, namespaceInfoList);
-		}
-	}
-
-	public void performDelete() {
-		ISelection selection = tableViewer.getSelection();
-		Object selectedObject = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-		if (selectedObject != null) {
-			namespaceInfoList.remove(selectedObject);
-			performDelayedUpdate();
-		}
-	}
-
-	public void performEdit() {
-		ISelection selection = tableViewer.getSelection();
-		Object selectedObject = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-		if (selectedObject instanceof NamespaceInfo) {
-			invokeDialog(XMLUIMessages._UI_LABEL_NEW_NAMESPACE_INFORMATION, (NamespaceInfo) selectedObject);
-			performDelayedUpdate();
-		}
-	}
-
-	public void performNew() {
-		NamespaceInfo info = new NamespaceInfo();
-		EditNamespaceInfoDialog dialog = invokeDialog(XMLUIMessages._UI_LABEL_NEW_NAMESPACE_INFORMATION, info);
-		if (dialog.getReturnCode() == Window.OK) {
-			namespaceInfoList.add(info);
-			performDelayedUpdate();
-		}
-	}
-
-	public void setNamespaceInfoList(List namespaceInfoList) {
-		this.namespaceInfoList = namespaceInfoList;
-		update();
-	}
-
-	public void setResourceLocation(IPath resourceLocation) {
-		this.resourceLocation = resourceLocation;
-	}
-
-	public void setUpdateListener(UpdateListener updateListener) {
-		this.updateListener = updateListener;
-	}
-
-	public void update() {
-		updateHelper(namespaceInfoList);
-	}
-
-	public void updateButtonEnabledState() {
-		ISelection selection = tableViewer.getSelection();
-		Object selectedObject = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-		NamespaceInfo info = (NamespaceInfo) selectedObject;
-		editButton.setEnabled(info != null);
-		deleteButton.setEnabled((info != null) && (info.getProperty("unremovable") == null)); //$NON-NLS-1$
-	}
-
-	public void updateHelper(List namespaceInfoList) {
-		if ((visibleRows != -1) && !dummyRowsRemoved) {
-			dummyRowsRemoved = true;
-			tableViewer.getTable().removeAll();
-		}
-		ISelection selection = tableViewer.getSelection();
-		tableViewer.setInput(namespaceInfoList);
-		if (selection.isEmpty()) {
-			if (namespaceInfoList.size() > 0) {
-				tableViewer.setSelection(new StructuredSelection(namespaceInfoList.get(0)));
-			}
-		}
-		else {
-			tableViewer.setSelection(selection);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectFileOrXMLCatalogIdDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectFileOrXMLCatalogIdDialog.java
deleted file mode 100644
index d36cf7b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectFileOrXMLCatalogIdDialog.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-
-public class SelectFileOrXMLCatalogIdDialog extends Dialog {
-	protected int catalogEntryType;
-	protected String[] extensions;
-	protected IFile file;
-	protected String id;
-	protected Button okButton;
-	protected SelectFileOrXMLCatalogIdPanel panel;
-
-	public SelectFileOrXMLCatalogIdDialog(Shell parentShell, String[] extensions) {
-		this(parentShell, extensions, 0);
-	}
-
-	public SelectFileOrXMLCatalogIdDialog(Shell parentShell, String[] extensions, int catalogEntryType) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.extensions = extensions;
-		this.catalogEntryType = catalogEntryType;
-	}
-
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			file = panel.getFile();
-			id = panel.getXMLCatalogId();
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		okButton.setEnabled(false);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-
-		panel = new SelectFileOrXMLCatalogIdPanel(dialogArea);
-		panel.setCatalogEntryType(catalogEntryType);
-		panel.setFilterExtensions(extensions);
-		panel.setVisibleHelper(true);
-		SelectFileOrXMLCatalogIdPanel.Listener listener = new SelectFileOrXMLCatalogIdPanel.Listener() {
-			public void completionStateChanged() {
-				updateButtonState();
-			}
-		};
-		panel.setListener(listener);
-
-		return dialogArea;
-	}
-
-	public IFile getFile() {
-		return file;
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	protected void updateButtonState() {
-		okButton.setEnabled((panel.getFile() != null) || (panel.getXMLCatalogId() != null));
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectFileOrXMLCatalogIdPanel.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectFileOrXMLCatalogIdPanel.java
deleted file mode 100644
index 2987b04..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectFileOrXMLCatalogIdPanel.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.common.ui.internal.viewers.SelectSingleFileView;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-
-public class SelectFileOrXMLCatalogIdPanel extends Composite implements SelectionListener {
-
-	/**
-	 * TODO: Change the name of this interface; "Listener" is used by SWT.
-	 */
-	public interface Listener {
-		void completionStateChanged();
-	}
-
-	protected class MySelectSingleFileView extends SelectSingleFileView implements SelectSingleFileView.Listener {
-		protected Control control;
-
-		public MySelectSingleFileView(Composite parent) {
-			super(null, true);
-			// String[] ext = {".dtd"};
-			// addFilterExtensions(ext);
-			control = createControl(parent);
-			control.setLayoutData(new GridData(GridData.FILL_BOTH));
-			MySelectSingleFileView.this.setListener(this);
-		}
-
-		public Control getControl() {
-			return control;
-		}
-
-		public void setControlComplete(boolean isComplete) {
-			updateCompletionStateChange();
-		}
-
-		public void setVisibleHelper(boolean isVisible) {
-			super.setVisibleHelper(isVisible);
-		}
-	}
-
-	protected Listener listener;
-	protected PageBook pageBook;
-
-	protected Button[] radioButton;
-	protected MySelectSingleFileView selectSingleFileView;
-	protected SelectXMLCatalogIdPanel selectXMLCatalogIdPanel;
-
-	public SelectFileOrXMLCatalogIdPanel(Composite parent) {
-		super(parent, SWT.NONE);
-
-		// container group
-		setLayout(new GridLayout());
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		gd.heightHint = 400;
-		gd.widthHint = 400;
-		setLayoutData(gd);
-
-		radioButton = new Button[2];
-		radioButton[0] = new Button(this, SWT.RADIO);
-		radioButton[0].setText(XMLUIMessages._UI_RADIO_BUTTON_SELECT_FROM_WORKSPACE);
-		radioButton[0].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		radioButton[0].setSelection(true);
-		radioButton[0].addSelectionListener(this);
-
-		radioButton[1] = new Button(this, SWT.RADIO);
-		radioButton[1].setText(XMLUIMessages._UI_RADIO_BUTTON_SELECT_FROM_CATALOG);
-		radioButton[1].setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		radioButton[1].addSelectionListener(this);
-
-		pageBook = new PageBook(this, SWT.NONE);
-		pageBook.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		selectSingleFileView = new MySelectSingleFileView(pageBook);
-
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		selectXMLCatalogIdPanel = new SelectXMLCatalogIdPanel(pageBook, xmlCatalog);
-		selectXMLCatalogIdPanel.getTableViewer().addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateCompletionStateChange();
-			}
-		});
-		Dialog.applyDialogFont(parent);
-		pageBook.showPage(selectSingleFileView.getControl());
-
-	}
-
-	public IFile getFile() {
-		IFile result = null;
-		if (radioButton[0].getSelection()) {
-			result = selectSingleFileView.getFile();
-		}
-		return result;
-	}
-
-	public ICatalogEntry getXMLCatalogEntry() {
-		ICatalogEntry result = null;
-		if (radioButton[1].getSelection()) {
-			result = selectXMLCatalogIdPanel.getXMLCatalogEntry();
-		}
-		return result;
-	}
-
-	public String getXMLCatalogId() {
-		String result = null;
-		if (radioButton[1].getSelection()) {
-			result = selectXMLCatalogIdPanel.getId();
-		}
-		return result;
-	}
-
-	public String getXMLCatalogURI() {
-		String result = null;
-		if (radioButton[1].getSelection()) {
-			result = selectXMLCatalogIdPanel.getURI();
-		}
-		return result;
-	}
-
-	public void setCatalogEntryType(int catalogEntryType) {
-		selectXMLCatalogIdPanel.setCatalogEntryType(catalogEntryType);
-	}
-
-	public void setFilterExtensions(String[] filterExtensions) {
-		selectSingleFileView.resetFilters();
-		selectSingleFileView.addFilterExtensions(filterExtensions);
-
-		selectXMLCatalogIdPanel.getTableViewer().setFilterExtensions(filterExtensions);
-	}
-
-	public void setListener(Listener listener) {
-		this.listener = listener;
-	}
-
-	public void setVisibleHelper(boolean isVisible) {
-		selectSingleFileView.setVisibleHelper(isVisible);
-	}
-
-	public void updateCompletionStateChange() {
-		if (listener != null) {
-			listener.completionStateChanged();
-		}
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == radioButton[0]) {
-			pageBook.showPage(selectSingleFileView.getControl());
-		}
-		else {
-			pageBook.showPage(selectXMLCatalogIdPanel);
-		}
-		updateCompletionStateChange();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdDialog.java
deleted file mode 100644
index 624c96a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdDialog.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonUIContextIds;
-
-
-
-public class SelectXMLCatalogIdDialog extends Dialog {
-	protected String[] extensions;
-	protected Button okButton;
-	protected SelectXMLCatalogIdPanel panel;
-	protected String publicId;
-	protected String systemId;
-
-	public SelectXMLCatalogIdDialog(Shell parentShell, String[] extensions) {
-		super(parentShell);
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.extensions = extensions;
-	}
-
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			ISelection selection = panel.getTableViewer().getSelection();
-			Object selectedObject = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-
-			if (selectedObject instanceof ICatalogEntry) {
-				ICatalogEntry mappingInfo = (ICatalogEntry) selectedObject;
-				publicId = mappingInfo.getKey();
-				systemId = computeDefaultSystemId(mappingInfo);
-			}
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	protected String computeDefaultSystemId(ICatalogEntry mappingInfo) {
-		String result = mappingInfo.getAttributeValue(ICatalogEntry.ATTR_WEB_URL);
-		if ((result == null) && (mappingInfo.getURI() != null)) {
-			int index = mappingInfo.getURI().lastIndexOf("/"); //$NON-NLS-1$
-			String lastSegment = index != -1 ? mappingInfo.getURI().substring(index + 1) : mappingInfo.getURI();
-			result = lastSegment;
-		}
-		return result;
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		okButton.setEnabled(false);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(dialogArea, XMLCommonUIContextIds.XCUI_CATALOG_DIALOG);
-
-		ICatalog xmlCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		panel = new SelectXMLCatalogIdPanel(dialogArea, xmlCatalog);
-
-		ISelectionChangedListener listener = new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtonState();
-			}
-		};
-		panel.getTableViewer().setFilterExtensions(extensions);
-		panel.getTableViewer().addSelectionChangedListener(listener);
-		return dialogArea;
-	}
-
-
-
-	public String getId() {
-		return publicId;
-	}
-
-	public String getSystemId() {
-		return systemId;
-	}
-
-	protected void updateButtonState() {
-		ISelection selection = panel.getTableViewer().getSelection();
-		okButton.setEnabled(!selection.isEmpty());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdPanel.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdPanel.java
deleted file mode 100644
index 01a9e8b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/SelectXMLCatalogIdPanel.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-
-public class SelectXMLCatalogIdPanel extends Composite {
-	protected int catalogEntryType;
-	protected boolean doTableSizeHack = false;
-
-	protected XMLCatalogTableViewer tableViewer;
-	protected ICatalog fXmlCatalog;
-
-	public SelectXMLCatalogIdPanel(Composite parent, ICatalog xmlCatalog) {
-		super(parent, SWT.NONE);
-		this.fXmlCatalog = xmlCatalog;
-
-		GridLayout gridLayout = new GridLayout();
-		this.setLayout(gridLayout);
-		GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-		gd.heightHint = 200;
-		gd.widthHint = 700;
-		this.setLayoutData(gd);
-
-		Label label = new Label(this, SWT.NONE);
-		label.setText(XMLUIMessages._UI_LABEL_XML_CATALOG_COLON);
-
-		tableViewer = createTableViewer(this);
-		tableViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-		tableViewer.setInput("dummy"); //$NON-NLS-1$
-	}
-
-	protected XMLCatalogTableViewer createTableViewer(Composite parent) {
-		String headings[] = new String[2];
-		headings[0] = XMLUIMessages._UI_LABEL_KEY;
-		headings[1] = XMLUIMessages._UI_LABEL_URI;
-
-		XMLCatalogTableViewer theTableViewer = new XMLCatalogTableViewer(parent, headings) {
-
-			protected void addXMLCatalogEntries(List list, ICatalogEntry[] entries) {
-				for (int i = 0; i < entries.length; i++) {
-					ICatalogEntry entry = entries[i];
-					if (catalogEntryType == 0) {
-						list.add(entry);
-					}
-					else if (catalogEntryType == entry.getEntryType()) {
-						list.add(entry);
-					}
-				}
-			}
-
-			public Collection getXMLCatalogEntries() {
-				List result = null;
-
-				if ((fXmlCatalog == null) || doTableSizeHack) {
-					// this lets us create a table with an initial height of
-					// 10 rows
-					// otherwise we get stuck with 0 row heigh table... that's
-					// too small
-					doTableSizeHack = false;
-					result = new Vector();
-					for (int i = 0; i < 6; i++) {
-						result.add(""); //$NON-NLS-1$
-					}
-				}
-				else {
-					result = new Vector();
-					INextCatalog[] nextCatalogs = fXmlCatalog.getNextCatalogs();
-					for (int i = 0; i < nextCatalogs.length; i++) {
-						INextCatalog catalog = nextCatalogs[i];
-						ICatalog referencedCatalog = catalog.getReferencedCatalog();
-						if (referencedCatalog != null) {
-							if (XMLCorePlugin.SYSTEM_CATALOG_ID.equals(referencedCatalog.getId())) {
-								ICatalog systemCatalog = referencedCatalog;
-								addXMLCatalogEntries(result, systemCatalog.getCatalogEntries());
-
-							}
-							else if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId())) {
-								ICatalog userCatalog = referencedCatalog;
-								addXMLCatalogEntries(result, userCatalog.getCatalogEntries());
-
-							}
-						}
-					}
-				}
-				return result;
-			}
-		};
-		return theTableViewer;
-	}
-
-
-	public String getId() {
-		ICatalogEntry entry = getXMLCatalogEntry();
-		return entry != null ? entry.getKey() : null;
-	}
-
-	public XMLCatalogTableViewer getTableViewer() {
-		return tableViewer;
-	}
-
-	public String getURI() {
-		ICatalogEntry entry = getXMLCatalogEntry();
-		return entry != null ? entry.getURI() : null;
-	}
-
-	public ICatalogEntry getXMLCatalogEntry() {
-		ICatalogEntry result = null;
-		ISelection selection = tableViewer.getSelection();
-		Object selectedObject = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-		if (selectedObject instanceof ICatalogEntry) {
-			result = (ICatalogEntry) selectedObject;
-		}
-		return result;
-	}
-
-	public void setCatalogEntryType(int catalogEntryType) {
-		this.catalogEntryType = catalogEntryType;
-		tableViewer.refresh();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/UpdateListener.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/UpdateListener.java
deleted file mode 100644
index 607270a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/UpdateListener.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-public interface UpdateListener {
-
-	public void updateOccured(Object object, Object arg);
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/XMLCatalogTableViewer.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/XMLCatalogTableViewer.java
deleted file mode 100644
index ada8759..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dialogs/XMLCatalogTableViewer.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.dialogs;
-
-import com.ibm.icu.text.Collator;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-
-public class XMLCatalogTableViewer extends TableViewer {
-
-
-	public class CatalogEntryContentProvider implements IStructuredContentProvider {
-
-		public void dispose() {
-		}
-
-		public Object[] getElements(Object element) {
-			Object[] array = getXMLCatalogEntries().toArray();
-			Comparator comparator = new Comparator() {
-				public int compare(Object o1, Object o2) {
-					int result = 0;
-					if ((o1 instanceof ICatalogEntry) && (o2 instanceof ICatalogEntry)) {
-						ICatalogEntry mappingInfo1 = (ICatalogEntry) o1;
-						ICatalogEntry mappingInfo2 = (ICatalogEntry) o2;
-						result = Collator.getInstance().compare(mappingInfo1.getKey(), mappingInfo2.getKey());
-					}
-					return result;
-				}
-			};
-			Arrays.sort(array, comparator);
-			return array;
-		}
-
-		public void inputChanged(Viewer viewer, Object old, Object newobj) {
-		}
-
-		public boolean isDeleted(Object object) {
-			return false;
-		}
-	}
-
-	public class CatalogEntryLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		public Image getColumnImage(Object object, int columnIndex) {
-			Image result = null;
-			if (columnIndex == 0) {
-				Image base = null;
-				if (object instanceof ICatalogEntry) {
-					ICatalogEntry catalogEntry = (ICatalogEntry) object;
-					String uri = catalogEntry.getURI();
-					if (uri.endsWith("dtd")) { //$NON-NLS-1$
-						base = dtdFileImage;
-					}
-					else if (uri.endsWith("xsd")) { //$NON-NLS-1$
-						base = xsdFileImage;
-					}
-					else {
-						base = unknownFileImage;
-					}
-
-					if (base != null) {
-						if (URIHelper.isReadableURI(uri, false)) {
-							result = base;
-						}
-						else {
-							// TODO... SSE port
-							result = base;// imageFactory.createCompositeImage(base,
-							// errorImage,
-							// ImageFactory.BOTTOM_LEFT);
-						}
-					}
-				}
-			}
-			return result;
-		}
-
-		public String getColumnText(Object object, int columnIndex) {
-			String result = null;
-			if (object instanceof ICatalogEntry) {
-				ICatalogEntry catalogEntry = (ICatalogEntry) object;
-				result = columnIndex == 0 ? catalogEntry.getKey() : catalogEntry.getURI();
-				result = URIHelper.removePlatformResourceProtocol(result);
-			}
-			return result != null ? result : ""; //$NON-NLS-1$
-		}
-	}
-
-
-	class XMLCatalogTableViewerFilter extends ViewerFilter {
-		protected String[] extensions;
-
-		public XMLCatalogTableViewerFilter(String[] extensions) {
-			this.extensions = extensions;
-		}
-
-		public boolean isFilterProperty(Object element, Object property) {
-			return false;
-		}
-
-		public boolean select(Viewer viewer, Object parent, Object element) {
-			boolean result = false;
-			if (element instanceof ICatalogEntry) {
-				ICatalogEntry catalogEntry = (ICatalogEntry) element;
-				for (int i = 0; i < extensions.length; i++) {
-					if (catalogEntry.getURI().endsWith(extensions[i])) {
-						result = true;
-						break;
-					}
-				}
-			}
-			return result;
-		}
-	}
-
-	protected static Image dtdFileImage = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_DTDFILE);
-
-	protected static String ERROR_STATE_KEY = "errorstatekey"; //$NON-NLS-1$
-	protected static Image errorImage = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OVR_ERROR);
-
-	protected static Image unknownFileImage = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TXTEXT);
-	protected static Image xsdFileImage = XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_XSDFILE);
-
-	// protected ImageFactory imageFactory = new ImageFactory();
-
-	public XMLCatalogTableViewer(Composite parent, String[] columnProperties) {
-		super(parent, SWT.FULL_SELECTION);
-
-		Table table = getTable();
-		table.setLinesVisible(true);
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-
-		TableLayout layout = new TableLayout();
-		for (int i = 0; i < columnProperties.length; i++) {
-			TableColumn column = new TableColumn(table, i);
-			column.setText(columnProperties[i]);
-			column.setAlignment(SWT.LEFT);
-			layout.addColumnData(new ColumnWeightData(50, true));
-		}
-		table.setLayout(layout);
-		table.setLinesVisible(false);
-
-		setColumnProperties(columnProperties);
-
-		setContentProvider(new CatalogEntryContentProvider());
-		setLabelProvider(new CatalogEntryLabelProvider());
-	}
-
-	public Collection getXMLCatalogEntries() {
-		return null;
-	}
-
-
-	public void menuAboutToShow(IMenuManager menuManager) {
-		Action action = new Action("hello") { //$NON-NLS-1$
-			public void run() {
-				System.out.println("run!"); //$NON-NLS-1$
-			}
-		};
-		menuManager.add(action);
-	}
-
-	public void setFilterExtensions(String[] extensions) {
-		resetFilters();
-		addFilter(new XMLCatalogTableViewerFilter(extensions));
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dnd/DragNodeCommand.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dnd/DragNodeCommand.java
deleted file mode 100644
index ffc9a29..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dnd/DragNodeCommand.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.dnd;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.ui.internal.dnd.DefaultDragAndDropCommand;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class DragNodeCommand extends DefaultDragAndDropCommand {
-	private List fSelections;
-	private TreeViewer fTreeViewer;
-
-	public DragNodeCommand(Object target, float location, int operations, int operation, Collection sources, TreeViewer treeViewer) {
-		super(target, location, operations, operation, sources);
-		fTreeViewer = treeViewer;
-		fSelections = new ArrayList();
-	}
-
-	private void beginModelChange(Node node, boolean batchUpdate) {
-		IStructuredModel structuredModel = getStructuredModel(node);
-		if (structuredModel != null) {
-			String undoDesc = new String();
-			if (getOperation() == DND.DROP_MOVE) {
-				undoDesc = XMLUIMessages.DragNodeCommand_0;
-			}
-			else if (getOperation() == DND.DROP_COPY) {
-				undoDesc = XMLUIMessages.DragNodeCommand_1;
-			}
-
-			structuredModel.beginRecording(this, undoDesc);
-			if (batchUpdate) {
-				// structuredModel.aboutToChangeModel();
-			}
-		}
-	}
-
-	public boolean canExecute() {
-		return executeHelper(true);
-	}
-
-	private boolean doModify(Node source, Node parentNode, Node refChild, boolean testOnly) {
-		boolean result = false;
-		if (source.getNodeType() == Node.ATTRIBUTE_NODE) {
-			Attr sourceAttribute = (Attr) source;
-			Element sourceAttributeOwnerElement = sourceAttribute.getOwnerElement();
-			if ((parentNode.getNodeType() == Node.ELEMENT_NODE) && (sourceAttributeOwnerElement != parentNode)) {
-				result = true;
-				if (!testOnly) {
-					try {
-						if (getOperation() == DND.DROP_MOVE) {
-							Element targetElement = (Element) parentNode;
-							sourceAttributeOwnerElement.removeAttributeNode(sourceAttribute);
-							targetElement.getAttributes().setNamedItem(sourceAttribute);
-							fSelections.add(sourceAttribute);
-							}
-						else if (getOperation() == DND.DROP_COPY) {
-							Attr cloneAttribute = (Attr) sourceAttribute.cloneNode(false);
-							Element targetElement = (Element) parentNode;
-							targetElement.getAttributes().setNamedItem(cloneAttribute);
-							fSelections.add(cloneAttribute);
-						}
-					}
-					catch (Exception e) {
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-			}
-		}
-		else {
-			if (((parentNode.getNodeType() == Node.ELEMENT_NODE) || (parentNode.getNodeType() == Node.DOCUMENT_NODE)) && !(refChild instanceof Attr)) {
-				result = true;
-
-				if (!testOnly) {
-					try {
-						if (isAncestor(source, parentNode)) {
-							// System.out.println("can not perform this drag drop
-							// operation.... todo... pop up dialog");
-						}
-						else {
-							// defect 221055 this test is required or else the
-							// node will
-							// be removed from the tree and the insert will fail
-							if (source != refChild) {
-								if (getOperation() == DND.DROP_MOVE) {
-									Node oldParent = source.getParentNode();
-									Node oldSibling = source.getNextSibling();
-									oldParent.removeChild(source);
-									try {
-										parentNode.insertBefore(source, refChild);
-									} catch (DOMException e) {
-										// bug151692 - if unable to move node to new location, reinsert back to old location
-										oldParent.insertBefore(source, oldSibling);
-									}
-									fSelections.add(source);
-								}
-								else if (getOperation() == DND.DROP_COPY) {
-									Node nodeClone = source.cloneNode(true);
-									parentNode.insertBefore(nodeClone, refChild);
-									fSelections.add(nodeClone);
-								}
-							}
-						}
-					}
-					catch (Exception e) {
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-			}
-		}
-		return result;
-	}
-
-	private void endModelChange(Node node, boolean batchUpdate) {
-		IStructuredModel structuredModel = getStructuredModel(node);
-		if (structuredModel != null) {
-			structuredModel.endRecording(this);
-			if (batchUpdate) {
-				// structuredModel.changedModel();
-			}
-		}
-	}
-
-	public void execute() {
-		executeHelper(false);
-
-		// Make our selection if the treeViewer != null
-		if (fTreeViewer != null) {
-			StructuredSelection structuredSelection = new StructuredSelection(fSelections);
-			fTreeViewer.setSelection(structuredSelection);
-		}
-	}
-
-	private boolean executeHelper(boolean testOnly) {
-		boolean result = true;
-		if (target instanceof Node) {
-			Node targetNode = (Node) target;
-			if (!testOnly && fTreeViewer != null && !validateEdit(getStructuredModel(targetNode), fTreeViewer.getControl().getShell()))
-				return false;
-
-			Node parentNode = getParentForDropPosition(targetNode);
-			Node refChild = getRefChild(targetNode);
-
-			Vector sourcesList = new Vector();
-			sourcesList.addAll(sources);
-
-			removeMemberDescendants(sourcesList);
-			boolean performBatchUpdate = sourcesList.size() > 5;
-
-			if (!testOnly) {
-				beginModelChange(targetNode, performBatchUpdate);
-			}
-			for (Iterator i = sourcesList.iterator(); i.hasNext();) {
-				Object source = i.next();
-				if (source instanceof Node) {
-					if (!((refChild == null) && (targetNode instanceof Attr))) {
-						result = doModify((Node) source, parentNode, refChild, testOnly);
-					}
-					else {
-						result = false;
-					}
-					if (!result) {
-						break;
-					}
-				}
-			}
-			if (!testOnly) {
-				endModelChange(targetNode, performBatchUpdate);
-			}
-		}
-		else {
-			result = false;
-		}
-		return result;
-	}
-
-	/**
-	 * Checks that the resource backing the model is writeable utilizing <code>validateEdit</code>
-	 * on a given <tt>IWorkspace</tt>.
-	 * 
-	 * @param model the model to be checked
-	 * @param context the shell context for which <code>validateEdit</code> will be run
-	 * @return boolean result of checking <code>validateEdit</code>. If the resource is unwriteable, <code>status.isOK()</code>
-	 * will return true; otherwise, false.
-	 */
-	private boolean validateEdit(IStructuredModel model, Shell context) {
-		if (model != null && model.getBaseLocation() != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(model.getBaseLocation()));
-			return !file.isAccessible() || ResourcesPlugin.getWorkspace().validateEdit(new IFile[] {file}, context).isOK();
-		}
-		return false; //$NON-NLS-1$
-	}
-
-	public int getFeedback() {
-		int result = DND.FEEDBACK_SELECT;
-		if (location > 0.75) {
-			result = DND.FEEDBACK_INSERT_AFTER;
-		}
-		else if (location < 0.25) {
-			result = DND.FEEDBACK_INSERT_BEFORE;
-		}
-		return result;
-	}
-
-	private Node getParentForDropPosition(Node node) {
-		Node result = null;
-
-		int feedback = getFeedback();
-		if (feedback == DND.FEEDBACK_SELECT) {
-			result = node;
-		}
-		else {
-			result = getParentOrOwner(node);
-		}
-		return result;
-	}
-
-
-	private Node getParentOrOwner(Node node) {
-		return (node.getNodeType() == Node.ATTRIBUTE_NODE) ? ((Attr) node).getOwnerElement() : node.getParentNode();
-	}
-
-
-	private Node getRefChild(Node node) {
-		Node result = null;
-
-		int feedback = getFeedback();
-
-		if (feedback == DND.FEEDBACK_INSERT_BEFORE) {
-			result = node;
-		}
-		else if (feedback == DND.FEEDBACK_INSERT_AFTER) {
-			result = node.getNextSibling();
-		}
-		return result;
-	}
-
-	private IStructuredModel getStructuredModel(Node node) {
-		IStructuredModel result = null;
-		if (node instanceof IDOMNode) {
-			result = ((IDOMNode) node).getModel();
-		}
-		return result;
-	}
-
-	// returns true if a is an ancestore of b
-	//
-	private boolean isAncestor(Node a, Node b) {
-		boolean result = false;
-		for (Node parent = b; parent != null; parent = parent.getParentNode()) {
-			if (parent == a) {
-				result = true;
-				break;
-			}
-		}
-		return result;
-	}
-
-
-	/**
-	 * This method removes members of the list that have ancestors that are
-	 * also members of the list.
-	 */
-	private void removeMemberDescendants(List list) {
-		Hashtable table = new Hashtable();
-		for (Iterator i = list.iterator(); i.hasNext();) {
-			Object node = i.next();
-			table.put(node, node);
-		}
-
-		for (int i = list.size() - 1; i >= 0; i--) {
-			Object node =  list.get(i); 
-			if (node instanceof Node){
-				for (Node parent = getParentOrOwner((Node)node); parent != null; parent = getParentOrOwner(parent)) {
-					if (table.get(parent) != null) {
-						list.remove(i);
-						break;
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dnd/XMLDragAndDropManager.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dnd/XMLDragAndDropManager.java
deleted file mode 100644
index 48097a8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/dnd/XMLDragAndDropManager.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.dnd;
-
-import java.util.Collection;
-
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.wst.common.ui.internal.dnd.DragAndDropCommand;
-import org.eclipse.wst.common.ui.internal.dnd.DragAndDropManager;
-import org.eclipse.wst.common.ui.internal.dnd.ObjectTransfer;
-import org.eclipse.wst.common.ui.internal.dnd.ViewerDragAdapter;
-import org.eclipse.wst.common.ui.internal.dnd.ViewerDropAdapter;
-import org.w3c.dom.Node;
-
-public class XMLDragAndDropManager implements DragAndDropManager {
-	private TreeViewer fViewer;
-
-	public static void addDragAndDropSupport(TreeViewer viewer) {
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[]{ObjectTransfer.getInstance()};
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new ViewerDropAdapter(viewer, new XMLDragAndDropManager(viewer)));
-	}
-
-	public XMLDragAndDropManager() {
-		super();
-	}
-
-	public XMLDragAndDropManager(TreeViewer viewer) {
-		fViewer = viewer;
-	}
-
-	public DragAndDropCommand createCommand(Object target, float location, int operations, int operation, Collection source) {
-		DragAndDropCommand result = null;
-		if (target instanceof Node) {
-			result = new DragNodeCommand(target, location, operations, operation, source, fViewer);
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/doubleclick/XMLDoubleClickStrategy.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/doubleclick/XMLDoubleClickStrategy.java
deleted file mode 100644
index b23097e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/doubleclick/XMLDoubleClickStrategy.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.doubleclick;
-
-import org.eclipse.jface.text.DefaultTextDoubleClickStrategy;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.w3c.dom.Node;
-
-
-public class XMLDoubleClickStrategy extends DefaultTextDoubleClickStrategy {
-	protected static final char DOUBLE_QUOTE = '\"';
-	protected static final char SINGLE_QUOTE = '\'';
-	protected static final char SPACE = ' ';
-	protected int fCaretPosition = -1;
-	protected int fDoubleClickCount = 0;
-	protected Node fNode = null;
-	protected IStructuredDocumentRegion fStructuredDocumentRegion = null;
-	protected String fStructuredDocumentRegionText = ""; //$NON-NLS-1$
-	protected IStructuredModel fStructuredModel = null;
-	protected StructuredTextViewer fStructuredTextViewer;
-	protected ITextRegion fTextRegion = null;
-
-	public void doubleClicked(ITextViewer textViewer) {
-		if (textViewer instanceof StructuredTextViewer) {
-			fStructuredTextViewer = (StructuredTextViewer) textViewer;
-			try {
-				fStructuredModel = StructuredModelManager.getModelManager().getExistingModelForRead(fStructuredTextViewer.getDocument());
-
-				if (fStructuredModel != null) {
-					int caretPosition = textViewer.getSelectedRange().x;
-					if (caretPosition < 0) {
-						return;
-					}
-
-					fNode = (Node) fStructuredModel.getIndexedRegion(caretPosition);
-					if (fNode == null) {
-						return;
-					}
-
-					updateDoubleClickCount(caretPosition);
-					updateStructuredDocumentRegion();
-					updateTextRegion();
-
-					if (fNode.getNodeType() == Node.TEXT_NODE) {
-						processTextDoubleClicked();
-					}
-					else {
-						processElementDoubleClicked();
-					}
-				}
-			}
-			finally {
-				if (fStructuredModel != null) {
-					fStructuredModel.releaseFromRead();
-				}
-			}
-		}
-	}
-
-	protected Point getWord(String string, int cursor) {
-		if (string == null) {
-			return null;
-		}
-
-		int wordStart = 0;
-		int wordEnd = string.length();
-
-		wordStart = string.lastIndexOf(SPACE, cursor - 1);
-		int temp = string.lastIndexOf(SINGLE_QUOTE, cursor - 1);
-		wordStart = Math.max(wordStart, temp);
-		temp = string.lastIndexOf(DOUBLE_QUOTE, cursor - 1);
-		wordStart = Math.max(wordStart, temp);
-		if (wordStart == -1) {
-			wordStart = cursor;
-		}
-		else {
-			wordStart++;
-		}
-
-		wordEnd = string.indexOf(SPACE, cursor);
-		if (wordEnd == -1) {
-			wordEnd = string.length();
-		}
-		temp = string.indexOf(SINGLE_QUOTE, cursor);
-		if (temp == -1) {
-			temp = string.length();
-		}
-		wordEnd = Math.min(wordEnd, temp);
-		temp = string.indexOf(DOUBLE_QUOTE, cursor);
-		if (temp == -1) {
-			temp = string.length();
-		}
-		wordEnd = Math.min(wordEnd, temp);
-		if (wordEnd == string.length()) {
-			wordEnd = cursor;
-		}
-
-		if ((wordStart == wordEnd) && !isQuoted(string)) {
-			wordStart = 0;
-			wordEnd = string.length();
-		}
-
-		return new Point(wordStart, wordEnd);
-	}
-
-	protected boolean isQuoted(String string) {
-		if ((string == null) || (string.length() < 2)) {
-			return false;
-		}
-
-		int lastIndex = string.length() - 1;
-		char firstChar = string.charAt(0);
-		char lastChar = string.charAt(lastIndex);
-
-		return (((firstChar == SINGLE_QUOTE) && (lastChar == SINGLE_QUOTE)) || ((firstChar == DOUBLE_QUOTE) && (lastChar == DOUBLE_QUOTE)));
-	}
-
-	protected void processElementAttrEqualsDoubleClicked2Times() {
-		int prevRegionOffset = fStructuredDocumentRegion.getStartOffset(fTextRegion) - 1;
-		ITextRegion prevRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(prevRegionOffset);
-		int nextRegionOffset = fStructuredDocumentRegion.getEndOffset(fTextRegion);
-		ITextRegion nextRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(nextRegionOffset);
-
-		if ((prevRegion != null) && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) && (nextRegion != null) && (nextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) {
-			fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(prevRegion), nextRegion.getTextEnd() - prevRegion.getStart());
-		}
-	}
-
-	protected void processElementAttrNameDoubleClicked2Times() {
-		int nextRegionOffset = fStructuredDocumentRegion.getEndOffset(fTextRegion);
-		ITextRegion nextRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(nextRegionOffset);
-
-		if (nextRegion != null) {
-			nextRegionOffset = fStructuredDocumentRegion.getEndOffset(nextRegion);
-			nextRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(nextRegionOffset);
-			if ((nextRegion != null) && (nextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) {
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion), nextRegion.getTextEnd() - fTextRegion.getStart());
-			}
-			else {
-				// attribute has no value
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength());
-				fDoubleClickCount = 0;
-			}
-		}
-	}
-
-	protected void processElementAttrValueDoubleClicked() {
-		String regionText = fStructuredDocumentRegion.getText(fTextRegion);
-
-		if (fDoubleClickCount == 1) {
-			Point word = getWord(regionText, fCaretPosition - fStructuredDocumentRegion.getStartOffset(fTextRegion));
-			if (word.x == word.y) { // no word found; select whole region
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion), regionText.length());
-				fDoubleClickCount++;
-			}
-			else {
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion) + word.x, word.y - word.x);
-			}
-		}
-		else if (fDoubleClickCount == 2) {
-			if (isQuoted(regionText)) {
-				// ==> // Point word = getWord(regionText, fCaretPosition -
-				// fStructuredDocumentRegion.getStartOffset(fTextRegion));
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion), regionText.length());
-			}
-			else {
-				processElementAttrValueDoubleClicked2Times();
-			}
-		}
-		else if (fDoubleClickCount == 3) {
-			if (isQuoted(regionText)) {
-				processElementAttrValueDoubleClicked2Times();
-			}
-			else {
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength());
-				fDoubleClickCount = 0;
-			}
-		}
-		else { // fDoubleClickCount == 4
-			fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength());
-			fDoubleClickCount = 0;
-		}
-	}
-
-	protected void processElementAttrValueDoubleClicked2Times() {
-		int prevRegionOffset = fStructuredDocumentRegion.getStartOffset(fTextRegion) - 1;
-		ITextRegion prevRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(prevRegionOffset);
-
-		if (prevRegion != null) {
-			prevRegionOffset = fStructuredDocumentRegion.getStartOffset(prevRegion) - 1;
-			prevRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(prevRegionOffset);
-			if ((prevRegion != null) && (prevRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME)) {
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(prevRegion), fTextRegion.getTextEnd() - prevRegion.getStart());
-			}
-		}
-	}
-
-	protected void processElementDoubleClicked() {
-		if (fTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-			processElementAttrValueDoubleClicked(); // special handling for
-		}
-		else {
-			if (fDoubleClickCount == 1) {
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart() + fTextRegion.getStart(), fTextRegion.getTextLength());
-			}
-			else if (fDoubleClickCount == 2) {
-				if (fTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-					processElementAttrNameDoubleClicked2Times();
-				}
-				else if (fTextRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-					processElementAttrEqualsDoubleClicked2Times();
-				}
-				else {
-					fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength());
-					fDoubleClickCount = 0;
-				}
-			}
-			else { // fDoubleClickCount == 3
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength());
-				fDoubleClickCount = 0;
-			}
-		}
-	}
-
-	protected void processTextDoubleClicked() {
-		if (fDoubleClickCount == 1) {
-			super.doubleClicked(fStructuredTextViewer);
-
-			Point selectedRange = fStructuredTextViewer.getSelectedRange();
-			if ((selectedRange.x == fStructuredDocumentRegion.getStartOffset(fTextRegion)) && (selectedRange.y == fTextRegion.getTextLength())) {
-				// only one word in region, skip one level of double click
-				// selection
-				fDoubleClickCount++;
-			}
-		}
-		else if (fDoubleClickCount == 2) {
-			if (fTextRegion.getType() == DOMRegionContext.UNDEFINED) {
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength());
-				fDoubleClickCount = 0;
-			}
-			else {
-				if (isQuoted(fStructuredDocumentRegion.getFullText(fTextRegion))) {
-					fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion) + 1, fTextRegion.getTextLength() - 2);
-				}
-				else {
-					fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion), fTextRegion.getTextLength());
-				}
-			}
-		}
-		else {
-			if ((fDoubleClickCount == 3) && isQuoted(fStructuredDocumentRegion.getFullText(fTextRegion))) {
-				fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStartOffset(fTextRegion), fTextRegion.getTextLength());
-			}
-			else {
-				if ((fDoubleClickCount == 3) && isQuoted(fStructuredDocumentRegionText)) {
-					fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart() + 1, fStructuredDocumentRegion.getLength() - 2);
-				}
-				else {
-					fStructuredTextViewer.setSelectedRange(fStructuredDocumentRegion.getStart(), fStructuredDocumentRegion.getLength());
-					fDoubleClickCount = 0;
-				}
-			}
-		}
-	}
-
-	public void setModel(IStructuredModel structuredModel) {
-		fStructuredModel = structuredModel;
-	}
-
-	protected void updateDoubleClickCount(int caretPosition) {
-		if (fCaretPosition == caretPosition) {
-			if (fStructuredDocumentRegion != null) {
-				fDoubleClickCount++;
-			}
-			else {
-				fDoubleClickCount = 1;
-			}
-		}
-		else {
-			fCaretPosition = caretPosition;
-			fDoubleClickCount = 1;
-		}
-	}
-
-	protected void updateStructuredDocumentRegion() {
-		fStructuredDocumentRegion = fStructuredModel.getStructuredDocument().getRegionAtCharacterOffset(fCaretPosition);
-		if (fStructuredDocumentRegion != null) {
-			fStructuredDocumentRegionText = fStructuredDocumentRegion.getText();
-		}
-		else {
-			fStructuredDocumentRegionText = ""; //$NON-NLS-1$
-		}
-	}
-
-	protected void updateTextRegion() {
-		if (fStructuredDocumentRegion != null) {
-			fTextRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(fCaretPosition);
-			// if fTextRegion is null, it means we are at just past the last
-			// fStructuredDocumentRegion,
-			// at the very end of the document, so we'll use the last text
-			// region in the document
-			if (fTextRegion == null) {
-				fTextRegion = fStructuredDocumentRegion.getRegionAtCharacterOffset(fCaretPosition - 1);
-			}
-		}
-		else {
-			fTextRegion = null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/CMImageUtil.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/CMImageUtil.java
deleted file mode 100644
index 112fe2c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/CMImageUtil.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.editor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWTException;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.wst.sse.core.internal.util.JarUtilities;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * @author nsd
- */
-public class CMImageUtil {
-
-	public static String SMALL_ICON_URL = "small-icon"; //$NON-NLS-1$
-
-	public static CMNode getDeclaration(Node node) {
-		CMNode decl = null;
-		ModelQuery mq = null;
-		switch (node.getNodeType()) {
-			case Node.ATTRIBUTE_NODE : {
-				mq = ModelQueryUtil.getModelQuery(((Attr) node).getOwnerDocument());
-				decl = mq.getCMAttributeDeclaration((Attr) node);
-			}
-				break;
-			case Node.ELEMENT_NODE : {
-				mq = ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-				decl = mq.getCMElementDeclaration((Element) node);
-			}
-				break;
-		}
-		return decl;
-	}
-
-	public static Image getImage(CMNode cmnode) {
-		if (cmnode == null) {
-			return null;
-		}
-		Image image = null;
-		ImageDescriptor descriptor = getImageDescriptor(cmnode);
-		if (descriptor != null) {
-			image = descriptor.createImage(false);
-		}
-		return image;
-	}
-
-	public static ImageDescriptor getImageDescriptor(CMNode cmnode) {
-		if (cmnode == null) {
-			return null;
-		}
-		// cache CM-specified images with the XML UI plugin
-		String imageURLString = (String) cmnode.getProperty(SMALL_ICON_URL);
-		ImageDescriptor descriptor = null;
-		if ((imageURLString != null) && (imageURLString.length() > 0)) {
-			descriptor = XMLUIPlugin.getInstance().getImageRegistry().getDescriptor(imageURLString);
-			if (descriptor == null) {
-				try {
-					URL imageURL = new URL(imageURLString);
-					InputStream inputStream = JarUtilities.getInputStream(imageURL);
-					try {
-						ImageData data = new ImageData(inputStream);
-						descriptor = ImageDescriptor.createFromImageData(data);
-						XMLUIPlugin.getInstance().getImageRegistry().put(imageURLString, descriptor);
-					}
-					catch (SWTException e) {
-						/*
-						 * There was a problem loading image from stream
-						 * (corrupt, missing, etc.)
-						 */
-						if (inputStream != null)
-							inputStream.close();
-					}
-				}
-				catch (MalformedURLException e) {
-					descriptor = null;
-				}
-				catch (IOException e) {
-					descriptor = null;
-				}
-			}
-		}
-		return descriptor;
-	}
-
-	/**
-	 * 
-	 */
-	private CMImageUtil() {
-		super();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/DOMSelectionConvertorFactory.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/DOMSelectionConvertorFactory.java
deleted file mode 100644
index 0f0988b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/DOMSelectionConvertorFactory.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2008 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-

-package org.eclipse.wst.xml.ui.internal.editor;

-

-import org.eclipse.core.runtime.IAdapterFactory;

-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;

-import org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor;

-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;

-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;

-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;

-import org.w3c.dom.NamedNodeMap;

-

-/**

- * @author nitin

- * 

- */

-public class DOMSelectionConvertorFactory implements IAdapterFactory {

-

-	private static final Class[] ADAPTER_LIST = new Class[]{SelectionConvertor.class};

-

-	private static class XMLSelectionConvertor extends SelectionConvertor {

-		/* (non-Javadoc)

-		 * @see org.eclipse.wst.sse.ui.internal.editor.SelectionConvertor#getElements(org.eclipse.wst.sse.core.internal.provisional.IStructuredModel, int, int)

-		 */

-		public Object[] getElements(IStructuredModel model, int start, int end) {

-			Object[] objects = super.getElements(model, start, end);

-			// narrow single selected Elements into Attrs if possible

-			if (objects.length == 1) {

-				if (objects[0] instanceof IDOMNode) {

-					IDOMNode node = (IDOMNode) objects[0];

-					NamedNodeMap attributes = node.getAttributes();

-					if (attributes != null) {

-						for (int i = 0; i < attributes.getLength(); i++) {

-							IDOMAttr attribute = (IDOMAttr) attributes.item(i);

-							if (attribute.contains(start) && attribute.contains(end)) {

-								objects[0] = attribute;

-								break;

-							}

-						}

-					}

-				}

-			}

-			return objects;

-		}

-	}

-

-	private static final Object selectionConvertor = new XMLSelectionConvertor();

-

-	/**

-	 * 

-	 */

-	public DOMSelectionConvertorFactory() {

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see

-	 * org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,

-	 * java.lang.Class)

-	 */

-	public Object getAdapter(Object adaptableObject, Class adapterType) {

-		if (adaptableObject instanceof IDOMModel && SelectionConvertor.class.equals(adapterType))

-			return selectionConvertor;

-		return null;

-	}

-

-	/*

-	 * (non-Javadoc)

-	 * 

-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()

-	 */

-	public Class[] getAdapterList() {

-		return ADAPTER_LIST;

-	}

-

-}

diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/IHelpContextIds.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/IHelpContextIds.java
deleted file mode 100644
index f7542e3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/IHelpContextIds.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.editor;
-
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-/**
- * Help context ids for the XML Source Editor.
- * <p>
- * This interface contains constants only; it is not intended to be
- * implemented.
- * </p>
- * 
- */
-public interface IHelpContextIds {
-	// org.eclipse.wst.xml.ui.
-	public static final String PREFIX = XMLUIPlugin.ID + "."; //$NON-NLS-1$
-
-	// figured out on the fly
-	// // XML Source page editor
-	// public static final String XML_SOURCEVIEW_HELPID =
-	// ContentTypeIdForXML.ContentTypeID_XML +"_source_HelpId"; //$NON-NLS-1$
-
-	// XML Files Preference page
-	public static final String XML_PREFWEBX_FILES_HELPID = PREFIX + "webx0060"; //$NON-NLS-1$
-	// XML Source Preference page
-	public static final String XML_PREFWEBX_SOURCE_HELPID = PREFIX + "webx0061"; //$NON-NLS-1$
-	// XML Styles Preference page
-	public static final String XML_PREFWEBX_STYLES_HELPID = PREFIX + "webx0062"; //$NON-NLS-1$
-	// XML Templates Preference page
-	public static final String XML_PREFWEBX_TEMPLATES_HELPID = PREFIX + "webx0063"; //$NON-NLS-1$
-    // XML Validator Preference page
-    public static final String XML_PREFWEBX_VALIDATOR_HELPID = PREFIX + "webx0064"; //$NON-NLS-1$
-
-	// XML Cleanup dialog
-	public static final String CLEANUP_XML_HELPID = PREFIX + "xmlm1200"; //$NON-NLS-1$
-
-	// XML New File Wizard - Template Page
-	public static final String XML_NEWWIZARD_TEMPLATE_HELPID = PREFIX + "xmlw0010"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/XMLEditorPluginImageHelper.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/XMLEditorPluginImageHelper.java
deleted file mode 100644
index 73b6736..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/XMLEditorPluginImageHelper.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.editor;
-
-import java.util.HashMap;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-
-/**
- * Helper class to handle images provided by this plug-in.
- * 
- * NOTE: For internal use only. For images used externally, please use the
- * Shared***ImageHelper class instead.
- * 
- * @author amywu
- */
-public class XMLEditorPluginImageHelper {
-	private static XMLEditorPluginImageHelper instance = null;
-
-	/**
-	 * Gets the instance.
-	 * 
-	 * @return Returns a XMLEditorPluginImageHelper
-	 */
-	public synchronized static XMLEditorPluginImageHelper getInstance() {
-		if (instance == null) {
-			instance = new XMLEditorPluginImageHelper();
-		}
-		return instance;
-	}
-
-	// save a descriptor for each image
-	private HashMap fImageDescRegistry = null;
-	private final String PLUGINID = XMLUIPlugin.ID;
-
-	/**
-	 * Creates an image from the given resource and adds the image to the
-	 * image registry.
-	 * 
-	 * @param resource
-	 * @return Image
-	 */
-	private Image createImage(String resource) {
-		ImageDescriptor desc = getImageDescriptor(resource);
-		Image image = null;
-
-		if (desc != null) {
-			image = desc.createImage();
-			// dont add the missing image descriptor image to the image
-			// registry
-			if (!desc.equals(ImageDescriptor.getMissingImageDescriptor())) {
-				getImageRegistry().put(resource, image);
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * Creates an image descriptor from the given imageFilePath and adds the
-	 * image descriptor to the image descriptor registry. If an image
-	 * descriptor could not be created, the default "missing" image descriptor
-	 * is returned but not added to the image descriptor registry.
-	 * 
-	 * @param imageFilePath
-	 * @return ImageDescriptor image descriptor for imageFilePath or default
-	 *         "missing" image descriptor if resource could not be found
-	 */
-	private ImageDescriptor createImageDescriptor(String imageFilePath) {
-		ImageDescriptor imageDescriptor = AbstractUIPlugin.imageDescriptorFromPlugin(PLUGINID, imageFilePath);
-		if (imageDescriptor != null) {
-			getImageDescriptorRegistry().put(imageFilePath, imageDescriptor);
-		}
-		else {
-			imageDescriptor = ImageDescriptor.getMissingImageDescriptor();
-		}
-
-		return imageDescriptor;
-	}
-
-	/**
-	 * Retrieves the image associated with resource from the image registry.
-	 * If the image cannot be retrieved, attempt to find and load the image at
-	 * the location specified in resource.
-	 * 
-	 * @param resource
-	 *            the image to retrieve
-	 * @return Image the image associated with resource or null if one could
-	 *         not be found
-	 */
-	public Image getImage(String resource) {
-		Image image = getImageRegistry().get(resource);
-		if (image == null) {
-			// create an image
-			image = createImage(resource);
-		}
-		return image;
-	}
-
-	/**
-	 * Retrieves the image descriptor associated with resource from the image
-	 * descriptor registry. If the image descriptor cannot be retrieved,
-	 * attempt to find and load the image descriptor at the location specified
-	 * in resource.
-	 * 
-	 * @param resource
-	 *            the image descriptor to retrieve
-	 * @return ImageDescriptor the image descriptor assocated with resource or
-	 *         the default "missing" image descriptor if one could not be
-	 *         found
-	 */
-	public ImageDescriptor getImageDescriptor(String resource) {
-		ImageDescriptor imageDescriptor = null;
-		Object o = getImageDescriptorRegistry().get(resource);
-		if (o == null) {
-			// create a descriptor
-			imageDescriptor = createImageDescriptor(resource);
-		}
-		else {
-			imageDescriptor = (ImageDescriptor) o;
-		}
-		return imageDescriptor;
-	}
-
-	/**
-	 * Returns the image descriptor registry for this plugin.
-	 * 
-	 * @return HashMap - image descriptor registry for this plugin
-	 */
-	private HashMap getImageDescriptorRegistry() {
-		if (fImageDescRegistry == null) {
-			fImageDescRegistry = new HashMap();
-		}
-		return fImageDescRegistry;
-	}
-
-	/**
-	 * Returns the image registry for this plugin.
-	 * 
-	 * @return ImageRegistry - image registry for this plugin
-	 */
-	private ImageRegistry getImageRegistry() {
-		return XMLUIPlugin.getDefault().getImageRegistry();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/XMLEditorPluginImages.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/XMLEditorPluginImages.java
deleted file mode 100644
index 52c379a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/editor/XMLEditorPluginImages.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.editor;
-
-/**
- * Bundle of most images used by the XML Source Editor plug-in.
- */
-public class XMLEditorPluginImages {
-
-	public static final String IMG_DTOOL_CONSTRAINOFF = "icons/full/dtool16/constrainoff.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_CONSTRAINON = "icons/full/dtool16/constrainon.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_RLDGRMR = "icons/full/dtool16/rldgrmr.gif"; //$NON-NLS-1$
-	public static final String IMG_DTOOL_VALIDATE = "icons/full/dtool16/validate.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_CONSTRAINOFF = "icons/full/etool16/constrainoff.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_CONSTRAINON = "icons/full/etool16/constrainon.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_RLDGRMR = "icons/full/etool16/rldgrmr.gif"; //$NON-NLS-1$
-	public static final String IMG_ETOOL_VALIDATE = "icons/full/etool16/validate.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ADD_CORRECTION = "icons/full/obj16/add_correction.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ATT_REQ_OBJ = "icons/full/obj16/att_req_obj.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OBJ_ATTRIBUTE = "icons/full/obj16/attribute_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CDATASECTION = "icons/full/obj16/cdatasection.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_COMMENT = "icons/full/obj16/comment_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_CORRECTION_CHANGE = "icons/full/obj16/correction_change.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_DOCTYPE = "icons/full/obj16/doctype.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_DTDFILE = "icons/full/obj16/dtdfile.gif"; //$NON-NLS-1$	
-	public static final String IMG_OBJ_ELEMENT = "icons/full/obj16/element_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ENTITY = "icons/full/obj16/entity.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ENTITY_REFERENCE = "icons/full/obj16/entity_reference.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_ENUM = "icons/full/obj16/enum.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_LOCAL_VARIABLE = "icons/full/obj16/localvariable_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_NOTATION = "icons/full/obj16/notation.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_PROCESSINGINSTRUCTION = "icons/full/obj16/proinst_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_SORT = "icons/full/obj16/sort.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_TAG_GENERIC = "icons/full/obj16/tag-generic.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_TAG_GENERIC_DEEMPHASIZED = "icons/full/obj16/tag_generic_deemphasized_obj.gif"; //$NON-NLS-1$    
-	public static final String IMG_OBJ_TAG_GENERIC_EMPHASIZED = "icons/full/obj16/tag_generic_emphasized_obj.gif"; //$NON-NLS-1$        
-	public static final String IMG_OBJ_TAG_MACRO = "icons/full/obj16/tag-macro.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_TXTEXT = "icons/full/obj16/text.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_WARNING_OBJ = "icons/full/obj16/warning_obj.gif"; //$NON-NLS-1$
-	public static final String IMG_OBJ_XSDFILE = "icons/full/obj16/XSDFile.gif"; //$NON-NLS-1$
-
-	public static final String IMG_OVR_ERROR = "icons/full/ovr16/error_ovr.gif"; //$NON-NLS-1$
-	public static final String IMG_OVR_STALE_ERROR = "icons/full/ovr16/stale_error_ovr.gif"; //$NON-NLS-1$
-	public static final String IMG_OVR_WARN = "icons/full/ovr16/warn_ovr.gif"; //$NON-NLS-1$
-
-	public static final String IMG_WIZBAN_GENERATEXML = "icons/full/wizban/generatexml_wiz.png"; //$NON-NLS-1$
-	
-	public static final String IMG_OBJ_DEFAULT = "icons/full/obj16/default.gif"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/AbstractSiblingNavigationHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/AbstractSiblingNavigationHandler.java
deleted file mode 100644
index 4e0565b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/AbstractSiblingNavigationHandler.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-/**
- * Provides navigation to next/previous DOM sibling Nodes
- */
-abstract public class AbstractSiblingNavigationHandler extends AbstractHandler {
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null) {
-
-			ISelection selection = textEditor.getSelectionProvider().getSelection();
-			if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
-				Object o = ((IStructuredSelection) selection).getFirstElement();
-				if (o instanceof Node) {
-					Node sibling = null;
-
-					if (((Node) o).getNodeType() == Node.ATTRIBUTE_NODE) {
-						o = ((Attr) o).getOwnerElement();
-					}
-					if (moveForward()) {
-						sibling = ((Node) o).getNextSibling();
-						while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-							sibling = sibling.getNextSibling();
-						}
-						if (sibling == null) {
-							sibling = ((Node) o).getParentNode().getFirstChild();
-							while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-								sibling = sibling.getNextSibling();
-							}
-						}
-					}
-					else {
-						sibling = ((Node) o).getPreviousSibling();
-						while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-							sibling = sibling.getPreviousSibling();
-						}
-						if (sibling == null) {
-							sibling = ((Node) o).getParentNode().getLastChild();
-							while (sibling != null && sibling.getNodeType() == Node.TEXT_NODE && sibling.getNodeValue().trim().length() == 0) {
-								sibling = sibling.getPreviousSibling();
-							}
-						}
-					}
-
-					// The only child is a Text Node, go to the parent Node
-					if (((Node) o).getNodeType() == Node.TEXT_NODE && o.equals(sibling)) {
-						sibling = ((Node) o).getParentNode();
-					}
-
-
-					if (sibling != null) {
-						textEditor.getSelectionProvider().setSelection(new StructuredSelection(sibling));
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	abstract protected boolean moveForward();
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/AddBlockCommentHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/AddBlockCommentHandler.java
deleted file mode 100644
index 475f37a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/AddBlockCommentHandler.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.document.CommentImpl;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class AddBlockCommentHandler extends CommentHandler implements IHandler {
-
-	public AddBlockCommentHandler() {
-		super();
-	}
-
-	void processAction(ITextEditor textEditor, IDocument document, ITextSelection textSelection) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null) {
-			try {
-				IndexedRegion selectionStartIndexedRegion = model.getIndexedRegion(textSelection.getOffset());
-				IndexedRegion selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength());
-
-				if (selectionStartIndexedRegion == null) {
-					return;
-				}
-				if ((selectionEndIndexedRegion == null) && (textSelection.getLength() > 0)) {
-					selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength() - 1);
-				}
-				if (selectionEndIndexedRegion == null) {
-					return;
-				}
-
-				int openCommentOffset = selectionStartIndexedRegion.getStartOffset();
-				int closeCommentOffset = selectionEndIndexedRegion.getEndOffset() + OPEN_COMMENT.length();
-
-				if ((textSelection.getLength() == 0) && (selectionStartIndexedRegion instanceof CommentImpl)) {
-					return;
-				}
-
-				model.beginRecording(this, XMLUIMessages.AddBlockComment_tooltip);
-				model.aboutToChangeModel();
-
-				try {
-					document.replace(openCommentOffset, 0, OPEN_COMMENT);
-					document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
-					super.removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-				}
-				catch (BadLocationException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-				finally {
-					model.changedModel();
-					model.endRecording(this);
-				}
-			}
-			finally {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CleanupdocumentHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CleanupdocumentHandler.java
deleted file mode 100644
index 0d46a0e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CleanupdocumentHandler.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation - bug 212330 -
- *                    Based off CleanupActionXMLDelegate
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.custom.BusyIndicator;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.cleanup.IStructuredCleanupProcessor;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.xml.core.internal.cleanup.CleanupProcessorXML;
-import org.eclipse.wst.xml.ui.internal.actions.CleanupDialogXML;
-
-public class CleanupdocumentHandler extends AbstractHandler implements IHandler {
-	private IStructuredCleanupProcessor fCleanupProcessor;
-
-	public void dispose() {
-		// nulling out just in case
-		fCleanupProcessor = null;
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null) {
-			final ITextEditor finalTextEditor = textEditor;
-			Dialog cleanupDialog = new CleanupDialogXML(editor.getSite().getShell());
-			if (cleanupDialog.open() == Window.OK) {
-				// setup runnable
-				Runnable runnable = new Runnable() {
-					public void run() {
-						IStructuredCleanupProcessor cleanupProcessor = getCleanupProcessor();
-						if (cleanupProcessor != null) {
-							IStructuredModel model = null;
-							try {
-								model = StructuredModelManager.getModelManager().getExistingModelForEdit(finalTextEditor.getDocumentProvider().getDocument(finalTextEditor.getEditorInput()));
-								if (model != null) {
-									cleanupProcessor.cleanupModel(model);
-								}
-							}
-							finally {
-								if (model != null) {
-									model.releaseFromEdit();
-								}
-							}
-						}
-					}
-				};
-
-				// TODO: make independent of 'model'.
-				IStructuredModel model = null;
-				try {
-					model = StructuredModelManager.getModelManager().getExistingModelForEdit(textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput()));
-					if (model != null) {
-						// begin recording
-						ITextSelection selection = (ITextSelection) textEditor.getSelectionProvider().getSelection();
-						model.beginRecording(this, SSEUIMessages.Cleanup_Document_UI_, SSEUIMessages.Cleanup_Document_UI_, selection.getOffset(), selection.getLength());
-
-						// tell the model that we are about to make a big
-						// model change
-						model.aboutToChangeModel();
-
-						// run
-						BusyIndicator.showWhile(textEditor.getEditorSite().getWorkbenchWindow().getShell().getDisplay(), runnable);
-					}
-				}
-				finally {
-					if (model != null) {
-						// tell the model that we are done with the big
-						// model
-						// change
-						model.changedModel();
-
-						// end recording
-						ITextSelection selection = (ITextSelection) textEditor.getSelectionProvider().getSelection();
-						model.endRecording(this, selection.getOffset(), selection.getLength());
-						model.releaseFromEdit();
-					}
-				}
-			}
-		}
-
-		return null;
-	}
-
-	IStructuredCleanupProcessor getCleanupProcessor() {
-		if (fCleanupProcessor == null) {
-			fCleanupProcessor = new CleanupProcessorXML();
-		}
-
-		return fCleanupProcessor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CollapseAllHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CollapseAllHandler.java
deleted file mode 100644
index 60c644b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CollapseAllHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-public class CollapseAllHandler extends ExpandCollapseAllHandler implements IHandler {
-
-	/**
-	 * 
-	 */
-	public CollapseAllHandler() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
-		
-		viewer = getTableTreeViewerForEditorPart(editorPart);
-		
-		if (viewer != null) {
-			// temporarily set the visibility to false
-			// this has a HUGE performance benefit
-			boolean isVisible = viewer.getControl().getVisible();
-			viewer.getControl().setVisible(false);
-			viewer.collapseAll();
-
-			// restore the previous visibility state
-			// 
-			viewer.getControl().setVisible(isVisible);
-		}		
-		
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CommentHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CommentHandler.java
deleted file mode 100644
index 6188db2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/CommentHandler.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xml.ui.internal.Logger;
-
-public class CommentHandler extends AbstractHandler implements IHandler {
-	static final String CLOSE_COMMENT = "-->"; //$NON-NLS-1$
-	static final String OPEN_COMMENT = "<!--"; //$NON-NLS-1$
-
-	public CommentHandler() {
-		super();
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null) {
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			if (document != null) {
-				// get current text selection
-				ITextSelection textSelection = getCurrentSelection(textEditor);
-				if (textSelection.isEmpty()) {
-					return null;
-				}
-
-				processAction(textEditor, document, textSelection);
-			}
-		}
-
-		return null;
-	}
-
-	protected ITextSelection getCurrentSelection(ITextEditor textEditor) {
-		ISelectionProvider provider = textEditor.getSelectionProvider();
-		if (provider != null) {
-			ISelection selection = provider.getSelection();
-			if (selection instanceof ITextSelection) {
-				return (ITextSelection) selection;
-			}
-		}
-		return TextSelection.emptySelection();
-	}
-
-	void processAction(ITextEditor textEditor, IDocument document, ITextSelection textSelection) {
-		// Implementations to over ride.
-	}
-
-	protected void removeOpenCloseComments(IDocument document, int offset, int length) {
-		try {
-			int adjusted_length = length;
-
-			// remove open comments
-			String string = document.get(offset, length);
-			int index = string.lastIndexOf(OPEN_COMMENT);
-			while (index != -1) {
-				document.replace(offset + index, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-				index = string.lastIndexOf(OPEN_COMMENT, index - 1);
-				adjusted_length -= OPEN_COMMENT.length();
-			}
-
-			// remove close comments
-			string = document.get(offset, adjusted_length);
-			index = string.lastIndexOf(CLOSE_COMMENT);
-			while (index != -1) {
-				document.replace(offset + index, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-				index = string.lastIndexOf(CLOSE_COMMENT, index - 1);
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ExpandAllHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ExpandAllHandler.java
deleted file mode 100644
index 9091399..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ExpandAllHandler.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLTableTreeViewer;
-
-public class ExpandAllHandler extends ExpandCollapseAllHandler {
-
-	protected XMLTableTreeViewer viewer = null;
-
-	/**
-	 * 
-	 */
-	public ExpandAllHandler() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		
-		IEditorPart editorPart = HandlerUtil.getActiveEditor(event);
-		
-		viewer = getTableTreeViewerForEditorPart(editorPart);
-		
-		if (viewer != null) {
-			// temporarily set the visibility to false
-			// this has a HUGE performance benefit
-			boolean isVisible = viewer.getControl().getVisible();
-			viewer.getControl().setVisible(false);
-			viewer.expandAll();
-
-			// restore the previous visibility state
-			// 
-			viewer.getControl().setVisible(isVisible);
-		}		
-		
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ExpandCollapseAllHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ExpandCollapseAllHandler.java
deleted file mode 100644
index 52d40f4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ExpandCollapseAllHandler.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import java.util.Map;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.commands.IElementUpdater;
-import org.eclipse.ui.menus.UIElement;
-import org.eclipse.wst.xml.ui.internal.tabletree.IDesignViewer;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLTableTreeViewer;
-
-public class ExpandCollapseAllHandler extends AbstractHandler implements IElementUpdater {
-
-	protected XMLTableTreeViewer viewer = null;
-
-	/**
-	 * Command handler for handling Expand and Collapse for Tree Viewer 
-	 */
-	public ExpandCollapseAllHandler() {
-		super();
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		// Implementors to put their code here.
-		
-		return null;
-	}
-	
-	protected XMLTableTreeViewer getTableTreeViewerForEditorPart(IEditorPart targetEditor) {
-		XMLTableTreeViewer result = null;
-		Object object = targetEditor.getAdapter(IDesignViewer.class);
-		if (object instanceof XMLTableTreeViewer) {
-			result = (XMLTableTreeViewer) object;
-		}
-		return result;
-	}
-	
-	public void updateElement(UIElement element, Map parameters) {
-		// TODO Auto-generated method stub
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/NextSiblingNavigationHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/NextSiblingNavigationHandler.java
deleted file mode 100644
index c25951c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/NextSiblingNavigationHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-public class NextSiblingNavigationHandler extends AbstractSiblingNavigationHandler {
-
-	protected boolean moveForward() {
-		return true;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/PreviousSiblingNavigationHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/PreviousSiblingNavigationHandler.java
deleted file mode 100644
index 3442a8b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/PreviousSiblingNavigationHandler.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-public class PreviousSiblingNavigationHandler extends AbstractSiblingNavigationHandler {
-
-	protected boolean moveForward() {
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ReloadDependenciesHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ReloadDependenciesHandler.java
deleted file mode 100644
index c371a18..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ReloadDependenciesHandler.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.CMDocumentLoader;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.InferredGrammarBuildingCMDocumentLoader;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Document;
-
-public class ReloadDependenciesHandler extends AbstractHandler implements IHandler {
-	protected IStructuredModel model;
-
-	/**
-	 * 
-	 */
-	public ReloadDependenciesHandler() {
-		// TODO Auto-generated constructor stub
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
-	 */
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null) {
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (model != null) {
-				ModelQuery modelQuery = null;
-				try {
-					modelQuery = ModelQueryUtil.getModelQuery(model);
-				}
-				finally {
-					model.releaseFromRead();
-				}
-				Document domDocument = ((IDOMModel) model).getDocument();
-				if ((modelQuery != null) && (modelQuery.getCMDocumentManager() != null)) {
-					modelQuery.getCMDocumentManager().getCMDocumentCache().clear();
-					// TODO... need to figure out how to access the
-					// DOMObserver via ModelQuery
-					// ...why?
-					CMDocumentLoader loader = new InferredGrammarBuildingCMDocumentLoader(domDocument, modelQuery);
-					loader.loadCMDocuments();
-				}
-			}
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/RemoveBlockCommentHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/RemoveBlockCommentHandler.java
deleted file mode 100644
index b4080bf..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/RemoveBlockCommentHandler.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.xml.core.internal.document.CommentImpl;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * @author dcarver
- * 
- */
-public class RemoveBlockCommentHandler extends CommentHandler implements IHandler {
-
-	public RemoveBlockCommentHandler() {
-		super();
-	}
-
-	void processAction(ITextEditor textEditor, IDocument document, ITextSelection textSelection) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null) {
-			try {
-				IndexedRegion selectionStartIndexedRegion = model.getIndexedRegion(textSelection.getOffset());
-				IndexedRegion selectionEndIndexedRegion = model.getIndexedRegion(textSelection.getOffset() + textSelection.getLength());
-
-				if ((selectionStartIndexedRegion == null) || (selectionEndIndexedRegion == null)) {
-					return;
-				}
-
-				int openCommentOffset = selectionStartIndexedRegion.getStartOffset();
-				int closeCommentOffset = selectionEndIndexedRegion.getEndOffset() - OPEN_COMMENT.length() - CLOSE_COMMENT.length();
-
-				model.beginRecording(this, XMLUIMessages.RemoveBlockComment_tooltip);
-				model.aboutToChangeModel();
-
-				try {
-					if (textSelection.getLength() == 0) {
-						if (selectionStartIndexedRegion instanceof CommentImpl) {
-							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-					}
-					else {
-						if (selectionStartIndexedRegion instanceof CommentImpl) {
-							document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-
-						if (selectionEndIndexedRegion instanceof CommentImpl) {
-							document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-						}
-					}
-					removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-				}
-				catch (BadLocationException e) {
-					Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				}
-				finally {
-					model.changedModel();
-					model.endRecording(this);
-				}
-			}
-			finally {
-				model.releaseFromEdit();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectEnclosingXMLHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectEnclosingXMLHandler.java
deleted file mode 100644
index f043b6e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectEnclosingXMLHandler.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.handlers.AbstractStructuredSelectHandler;
-import org.w3c.dom.Node;
-
-public class StructuredSelectEnclosingXMLHandler extends AbstractStructuredSelectHandler {
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node cursorNode = (Node) indexedRegion;
-
-			// use parent node for empty text node
-			if ((cursorNode.getNodeType() == Node.TEXT_NODE) && (cursorNode.getNodeValue().trim().length() == 0)) {
-				cursorNode = cursorNode.getParentNode();
-
-				if (cursorNode instanceof IndexedRegion) {
-					indexedRegion = (IndexedRegion) cursorNode;
-				}
-			}
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-
-			if ((cursorNodeRegion.getOffset() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() <= textSelection.getOffset() + textSelection.getLength()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= textSelection.getOffset() + textSelection.getLength())) {
-				Node newNode = cursorNode.getParentNode();
-
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-				}
-			}
-			else {
-				newRegion = cursorNodeRegion;
-			}
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectNextXMLHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectNextXMLHandler.java
deleted file mode 100644
index 366789f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectNextXMLHandler.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.handlers.AbstractStructuredSelectHandler;
-import org.w3c.dom.Node;
-
-public class StructuredSelectNextXMLHandler extends AbstractStructuredSelectHandler {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		int offset = textSelection.getOffset() + textSelection.getLength() - 1;
-		if (offset < 0) {
-			offset = 0;
-		}
-
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, offset);
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node cursorNode = (Node) indexedRegion;
-
-			// use parent node for empty text node
-			if ((cursorNode.getNodeType() == Node.TEXT_NODE) && (cursorNode.getNodeValue().trim().length() == 0)) {
-				cursorNode = cursorNode.getParentNode();
-
-				if (cursorNode instanceof IndexedRegion) {
-					indexedRegion = (IndexedRegion) cursorNode;
-				}
-			}
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if ((cursorNodeRegion.getOffset() >= currentOffset) && (cursorNodeRegion.getOffset() <= currentEndOffset) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset)) {
-				newRegion = getNewSelectionRegion2(indexedRegion, textSelection);
-			}
-			else {
-				newRegion = cursorNodeRegion;
-			}
-		}
-		return newRegion;
-	}
-
-	/**
-	 * This method was separated out from getNewSelectionRegion2 because the
-	 * code in here is allowed to be called recursively.
-	 * 
-	 * @param indexedRegion
-	 * @param textSelection
-	 * @return new region to select or null if none
-	 */
-	private Region getNewSelectionRegion2(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node node = (Node) indexedRegion;
-			Node newNode = node.getNextSibling();
-			if (newNode == null) {
-				newNode = node.getParentNode();
-
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-				}
-			}
-			else {
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(textSelection.getOffset(), newIndexedRegion.getEndOffset() - textSelection.getOffset());
-
-					if (newNode.getNodeType() == Node.TEXT_NODE) {
-						newRegion = getNewSelectionRegion2(newIndexedRegion, new TextSelection(newRegion.getOffset(), newRegion.getLength()));
-					}
-				}
-			}
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectPreviousXMLHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectPreviousXMLHandler.java
deleted file mode 100644
index ab57447..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/StructuredSelectPreviousXMLHandler.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.handlers.AbstractStructuredSelectHandler;
-import org.w3c.dom.Node;
-
-public class StructuredSelectPreviousXMLHandler extends AbstractStructuredSelectHandler {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node cursorNode = (Node) indexedRegion;
-
-			// use parent node for empty text node
-			if ((cursorNode.getNodeType() == Node.TEXT_NODE) && (cursorNode.getNodeValue().trim().length() == 0)) {
-				cursorNode = cursorNode.getParentNode();
-
-				if (cursorNode instanceof IndexedRegion) {
-					indexedRegion = (IndexedRegion) cursorNode;
-				}
-			}
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-
-			if ((cursorNodeRegion.getOffset() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() <= textSelection.getOffset() + textSelection.getLength()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= textSelection.getOffset() + textSelection.getLength())) {
-				Node newNode = cursorNode.getPreviousSibling();
-				if (newNode == null) {
-					newNode = cursorNode.getParentNode();
-
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-					}
-				}
-				else {
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), textSelection.getOffset() + textSelection.getLength() - newIndexedRegion.getStartOffset());
-
-						if (newNode.getNodeType() == Node.TEXT_NODE) {
-							newRegion = getNewSelectionRegion(newIndexedRegion, new TextSelection(newRegion.getOffset(), newRegion.getLength()));
-						}
-					}
-				}
-
-			}
-			else {
-				newRegion = cursorNodeRegion;
-			}
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ToggleCommentHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ToggleCommentHandler.java
deleted file mode 100644
index 174f680..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ToggleCommentHandler.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class ToggleCommentHandler extends CommentHandler implements IHandler {
-	public ToggleCommentHandler() {
-		super();
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null) {
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			if (document != null) {
-				// get current text selection
-				ITextSelection textSelection = getCurrentSelection(textEditor);
-				if (textSelection.isEmpty()) {
-					return null;
-				}
-
-				processAction(textEditor, document, textSelection);
-			}
-		}
-		return null;
-	}
-
-	void processAction(ITextEditor textEditor, IDocument document, ITextSelection textSelection) {
-		// get text selection lines info
-		int selectionStartLine = textSelection.getStartLine();
-		int selectionEndLine = textSelection.getEndLine();
-		try {
-			int selectionEndLineOffset = document.getLineOffset(selectionEndLine);
-			int selectionEndOffset = textSelection.getOffset() + textSelection.getLength();
-
-			// adjust selection end line
-			if ((selectionEndLine > selectionStartLine) && (selectionEndLineOffset == selectionEndOffset)) {
-				selectionEndLine--;
-			}
-
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-
-		// save the selection position since it will be changing
-		Position selectionPosition = null;
-		boolean updateStartOffset = false;
-		try {
-			selectionPosition = new Position(textSelection.getOffset(), textSelection.getLength());
-			document.addPosition(selectionPosition);
-
-			// extra check if commenting from beginning of line
-			int selectionStartLineOffset = document.getLineOffset(selectionStartLine);
-			if ((textSelection.getLength() > 0) && (selectionStartLineOffset == textSelection.getOffset()) && !isCommentLine(document, selectionStartLine)) {
-				updateStartOffset = true;
-			}
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-
-		processAction(document, selectionStartLine, selectionEndLine);
-
-		updateCurrentSelection(textEditor, selectionPosition, document, updateStartOffset);
-	}
-
-	private void processAction(IDocument document, int selectionStartLine, int selectionEndLine) {
-		IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForEdit(document);
-		if (model != null) {
-			try {
-				model.beginRecording(this, XMLUIMessages.ToggleComment_tooltip);
-				model.aboutToChangeModel();
-
-				for (int i = selectionStartLine; i <= selectionEndLine; i++) {
-					try {
-						if (document.getLineLength(i) > 0) {
-							if (isCommentLine(document, i)) {
-								int lineOffset = document.getLineOffset(i);
-								IRegion region = document.getLineInformation(i);
-								String string = document.get(region.getOffset(), region.getLength());
-								int openCommentOffset = lineOffset + string.indexOf(OPEN_COMMENT);
-								int closeCommentOffset = lineOffset + string.indexOf(CLOSE_COMMENT) - OPEN_COMMENT.length();
-								uncomment(document, openCommentOffset, closeCommentOffset);
-							}
-							else {
-								int openCommentOffset = document.getLineOffset(i);
-								int lineDelimiterLength = document.getLineDelimiter(i) == null ? 0 : document.getLineDelimiter(i).length();
-								int closeCommentOffset = openCommentOffset + document.getLineLength(i) - lineDelimiterLength + OPEN_COMMENT.length();
-								comment(document, openCommentOffset, closeCommentOffset);
-							}
-						}
-					}
-					catch (BadLocationException e) {
-						Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-					}
-				}
-			}
-			finally {
-				model.changedModel();
-				model.endRecording(this);
-				model.releaseFromEdit();
-			}
-		}
-	}
-
-	private boolean isCommentLine(IDocument document, int line) {
-		boolean isComment = false;
-
-		try {
-			IRegion region = document.getLineInformation(line);
-			String string = document.get(region.getOffset(), region.getLength()).trim();
-			isComment = (string.length() >= OPEN_COMMENT.length() + CLOSE_COMMENT.length()) && string.startsWith(OPEN_COMMENT) && string.endsWith(CLOSE_COMMENT);
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-		return isComment;
-	}
-
-	private void comment(IDocument document, int openCommentOffset, int closeCommentOffset) {
-		try {
-			document.replace(openCommentOffset, 0, OPEN_COMMENT);
-			document.replace(closeCommentOffset, 0, CLOSE_COMMENT);
-			removeOpenCloseComments(document, openCommentOffset + OPEN_COMMENT.length(), closeCommentOffset - openCommentOffset - CLOSE_COMMENT.length());
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-
-	private void uncomment(IDocument document, int openCommentOffset, int closeCommentOffset) {
-		try {
-			document.replace(openCommentOffset, OPEN_COMMENT.length(), ""); //$NON-NLS-1$
-			document.replace(closeCommentOffset, CLOSE_COMMENT.length(), ""); //$NON-NLS-1$
-		}
-		catch (BadLocationException e) {
-			Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-		}
-	}
-
-	private void updateCurrentSelection(ITextEditor textEditor, Position selectionPosition, IDocument document, boolean updateStartOffset) {
-		// update the selection if text selection changed
-		if (selectionPosition != null) {
-			ITextSelection selection = null;
-			if (updateStartOffset) {
-				selection = new TextSelection(document, selectionPosition.getOffset() - OPEN_COMMENT.length(), selectionPosition.getLength() + OPEN_COMMENT.length());
-			}
-			else {
-				selection = new TextSelection(document, selectionPosition.getOffset(), selectionPosition.getLength());
-			}
-			ISelectionProvider provider = textEditor.getSelectionProvider();
-			if (provider != null) {
-				provider.setSelection(selection);
-			}
-			document.removePosition(selectionPosition);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ToggleEditModeHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ToggleEditModeHandler.java
deleted file mode 100644
index c36673f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/ToggleEditModeHandler.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation, bug 212330
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.commands.IElementUpdater;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.menus.UIElement;
-import org.eclipse.ui.services.IServiceScopes;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLEditorMessages;
-import org.eclipse.wst.xml.ui.internal.util.SharedXMLEditorPluginImageHelper;
-
-public class ToggleEditModeHandler extends AbstractHandler implements IElementUpdater {
-	protected ImageDescriptor onImage = SharedXMLEditorPluginImageHelper.getImageDescriptor(SharedXMLEditorPluginImageHelper.IMG_ETOOL_CONSTRAINON);
-	protected ImageDescriptor offImage = SharedXMLEditorPluginImageHelper.getImageDescriptor(SharedXMLEditorPluginImageHelper.IMG_ETOOL_CONSTRAINOFF);
-
-	public ToggleEditModeHandler() {
-		super();
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null) {
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (model != null) {
-				ModelQuery modelQuery;
-				try {
-					modelQuery = ModelQueryUtil.getModelQuery(model);
-				}
-				finally {
-					model.releaseFromRead();
-				}
-				if (modelQuery != null) {
-					int newState = getNextState(modelQuery.getEditMode());
-					modelQuery.setEditMode(newState);
-
-					// Force a Refresh on this command so that the image can
-					// be
-					// updated.
-					ICommandService commandService = (ICommandService) HandlerUtil.getActiveWorkbenchWindow(event).getService(ICommandService.class);
-					Map filter = new HashMap();
-					filter.put(IServiceScopes.WINDOW_SCOPE, HandlerUtil.getActiveWorkbenchWindow(event));
-					commandService.refreshElements(event.getCommand().getId(), filter);
-				}
-			}
-		}
-
-		return null;
-	}
-
-	public int getNextState(int editMode) {
-		int result = -1;
-		if (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) {
-			result = ModelQuery.EDIT_MODE_UNCONSTRAINED;
-		}
-		else {
-			result = ModelQuery.EDIT_MODE_CONSTRAINED_STRICT;
-		}
-		return result;
-	}
-
-
-	// Handlers that need to interact with the ui that the command came from
-	// need to use implement this method.
-	public void updateElement(UIElement element, Map parameters) {
-		IEditorPart editor = XMLUIPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-		ITextEditor textEditor = null;
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else if (editor != null) {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-		if (textEditor != null) {
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (model != null) {
-			    ModelQuery modelQuery;
-				try {
-					modelQuery = ModelQueryUtil.getModelQuery(model);
-				}
-				finally {
-					model.releaseFromRead();
-				}
-				if (modelQuery != null) {
-					setAppearanceForEditMode(modelQuery.getEditMode(), element);
-				}
-			}
-		}
-	}
-
-	public void setAppearanceForEditMode(int editMode, UIElement element) {
-		if (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) {
-			element.setTooltip(XMLEditorMessages.XMLTableTreeActionBarContributor_3);
-			element.setText(XMLEditorMessages.XMLTableTreeActionBarContributor_3);
-			element.setIcon(onImage);
-		}
-		else {
-			element.setTooltip(XMLEditorMessages.XMLTableTreeActionBarContributor_5);
-			element.setText(XMLEditorMessages.XMLTableTreeActionBarContributor_5);
-			element.setIcon(offImage);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/XMLFindOccurencesHandler.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/XMLFindOccurencesHandler.java
deleted file mode 100644
index 00c9ea9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/handlers/XMLFindOccurencesHandler.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Standards for Technology in Automotive Retail 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:
- *     David Carver - initial API and implementation - bug 212330 -
- *                    Based off CleanupActionXMLDelegate
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.handlers;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.ITypedRegion;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.handlers.HandlerUtil;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.sse.ui.internal.ExtendedConfigurationBuilder;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor;
-import org.eclipse.wst.sse.ui.internal.util.PlatformStatusLineUtil;
-import org.eclipse.wst.xml.ui.internal.search.XMLFindOccurrencesProcessor;
-
-public class XMLFindOccurencesHandler extends AbstractHandler implements IHandler {
-	private List fProcessors;
-
-	public void dispose() {
-	}
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		IEditorPart editor = HandlerUtil.getActiveEditor(event);
-		ITextEditor textEditor = null;
-		boolean okay = false;
-
-		if (editor instanceof ITextEditor)
-			textEditor = (ITextEditor) editor;
-		else {
-			Object o = editor.getAdapter(ITextEditor.class);
-			if (o != null)
-				textEditor = (ITextEditor) o;
-		}
-
-		if (textEditor != null) {
-			IDocument document = textEditor.getDocumentProvider().getDocument(textEditor.getEditorInput());
-			if (document != null) {
-				ITextSelection textSelection = getTextSelection(textEditor);
-				FindOccurrencesProcessor findOccurrenceProcessor = getProcessorForCurrentSelection(document, textSelection);
-				if (findOccurrenceProcessor != null) {
-					if (textEditor.getEditorInput() instanceof IFileEditorInput) {
-						IFile file = ((IFileEditorInput) textEditor.getEditorInput()).getFile();
-						okay = findOccurrenceProcessor.findOccurrences(document, textSelection, file);
-					}
-				}
-			}
-		}
-		if (okay) {
-			// clear status message
-			PlatformStatusLineUtil.clearStatusLine();
-		}
-		else {
-			String errorMessage = SSEUIMessages.FindOccurrencesActionProvider_0; //$NON-NLS-1$
-			PlatformStatusLineUtil.displayErrorMessage(errorMessage);
-			PlatformStatusLineUtil.addOneTimeClearListener();
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get the appropriate find occurrences processor
-	 * 
-	 * @param document -
-	 *            assumes not null
-	 * @param textSelection
-	 * @return FindOccurrencesProcessor
-	 */
-	private FindOccurrencesProcessor getProcessorForCurrentSelection(IDocument document, ITextSelection textSelection) {
-		// check if we have an action that's enabled on the current partition
-		ITypedRegion tr = getPartition(document, textSelection);
-		String partition = tr != null ? tr.getType() : ""; //$NON-NLS-1$
-
-		Iterator it = getProcessors().iterator();
-		FindOccurrencesProcessor processor = null;
-		while (it.hasNext()) {
-			processor = (FindOccurrencesProcessor) it.next();
-			// we just choose the first action that can handle the partition
-			if (processor.enabledForParitition(partition))
-				return processor;
-		}
-
-		List extendedFindOccurrencesProcessors = ExtendedConfigurationBuilder.getInstance().getConfigurations(FindOccurrencesProcessor.class.getName(), partition);
-		for (int i = 0; i < extendedFindOccurrencesProcessors.size(); i++) {
-			Object o = extendedFindOccurrencesProcessors.get(i);
-			if (o instanceof FindOccurrencesProcessor) {
-				/*
-				 * We just choose the first registered processor that
-				 * explicitly says it can handle the partition
-				 */
-				processor = (FindOccurrencesProcessor) it.next();
-				if (processor.enabledForParitition(partition))
-					return processor;
-			}
-		}
-		return null;
-	}
-
-	private ITypedRegion getPartition(IDocument document, ITextSelection textSelection) {
-		ITypedRegion region = null;
-		if (textSelection != null) {
-			try {
-				region = document.getPartition(textSelection.getOffset());
-			}
-			catch (BadLocationException e) {
-				region = null;
-			}
-		}
-		return region;
-	}
-
-	private ITextSelection getTextSelection(ITextEditor textEditor) {
-		ITextSelection textSelection = null;
-		ISelection selection = textEditor.getSelectionProvider().getSelection();
-		if (selection instanceof ITextSelection && !selection.isEmpty()) {
-			textSelection = (ITextSelection) selection;
-		}
-		return textSelection;
-	}
-
-	protected List getProcessors() {
-		if (fProcessors == null) {
-			fProcessors = new ArrayList();
-			XMLFindOccurrencesProcessor htmlProcessor = new XMLFindOccurrencesProcessor();
-			fProcessors.add(htmlProcessor);
-		}
-		return fProcessors;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/CatalogEntryHyperlink.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/CatalogEntryHyperlink.java
deleted file mode 100644
index 7ef2986..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/CatalogEntryHyperlink.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.hyperlink;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-class CatalogEntryHyperlink implements IHyperlink {
-
-	private IRegion fHyperlinkRegion = null;
-	private ICatalogEntry fEntry = null;
-
-	/**
-	 * @param hyperlinkRegion
-	 * @param entry
-	 */
-	CatalogEntryHyperlink(IRegion hyperlinkRegion, ICatalogEntry entry) {
-		super();
-		fHyperlinkRegion = hyperlinkRegion;
-		fEntry = entry;
-	}
-
-	/**
-	 * @return
-	 */
-	private IHyperlink getHyperlink() {
-		if (fEntry.getURI().startsWith("file:")) { //$NON-NLS-1$
-			return new ExternalFileHyperlink(fHyperlinkRegion, new File(fEntry.getURI().substring(5)));
-		}
-		else if (fEntry.getURI().startsWith("platform:/resource/")) { //$NON-NLS-1$
-			IPath path = new Path(fEntry.getURI().substring(20));
-			if (path.segmentCount() > 1)
-				return new WorkspaceFileHyperlink(fHyperlinkRegion, ResourcesPlugin.getWorkspace().getRoot().getFile(path));
-		}
-		else {
-			/*
-			 * the URL detector will already work on the literal text, so
-			 * offer to open the contents in an editor
-			 */
-			try {
-				if (fEntry.getURI().startsWith("jar:file:"))
-					return new URLStorageHyperlink(fHyperlinkRegion, new URL(fEntry.getURI())) {
-						public String getHyperlinkText() {
-							return NLS.bind(XMLUIMessages.Open, fEntry.getKey());
-						}
-					};
-			}
-			catch (MalformedURLException e) {
-				// not valid?
-			}
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkRegion()
-	 */
-	public IRegion getHyperlinkRegion() {
-		return fHyperlinkRegion;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		IHyperlink link = getHyperlink();
-		if (link != null)
-			return link.getHyperlinkText();
-		return NLS.bind(XMLUIMessages.Open, fEntry.getKey());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		IHyperlink link = getHyperlink();
-		if (link != null)
-			return link.getTypeLabel();
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
-	 */
-	public void open() {
-		IHyperlink link = getHyperlink();
-		if (link != null)
-			link.open();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileEditorInput.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileEditorInput.java
deleted file mode 100644
index 86e85d0..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileEditorInput.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.hyperlink;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPathEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.editors.text.ILocationProvider;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-
-/**
- * EditorInput for external files. Copied from
- * org.eclipse.ui.internal.editors.text.JavaFileEditorInput
- */
-class ExternalFileEditorInput implements IEditorInput, ILocationProvider {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.jst.jsp.ui.internal.hyperlink
-
-	/**
-	 * The workbench adapter which simply provides the label.
-	 */
-	private class WorkbenchAdapter implements IWorkbenchAdapter {
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getChildren(java.lang.Object)
-		 */
-		public Object[] getChildren(Object o) {
-			return null;
-		}
-
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getImageDescriptor(java.lang.Object)
-		 */
-		public ImageDescriptor getImageDescriptor(Object object) {
-			return null;
-		}
-
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getLabel(java.lang.Object)
-		 */
-		public String getLabel(Object o) {
-			return ((ExternalFileEditorInput) o).getName();
-		}
-
-		/*
-		 * @see org.eclipse.ui.model.IWorkbenchAdapter#getParent(java.lang.Object)
-		 */
-		public Object getParent(Object o) {
-			return null;
-		}
-	}
-
-	private File fFile;
-	private WorkbenchAdapter fWorkbenchAdapter = new WorkbenchAdapter();
-
-	public ExternalFileEditorInput(File file) {
-		super();
-		fFile = file;
-		fWorkbenchAdapter = new WorkbenchAdapter();
-	}
-
-	/*
-	 * @see org.eclipse.ui.IEditorInput#exists()
-	 */
-	public boolean exists() {
-		return fFile.exists();
-	}
-
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()
-	 */
-	public ImageDescriptor getImageDescriptor() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getName()
-	 */
-	public String getName() {
-		return fFile.getName();
-	}
-
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getPersistable()
-	 */
-	public IPersistableElement getPersistable() {
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
-	 */
-	public String getToolTipText() {
-		return fFile.getAbsolutePath();
-	}
-
-	/*
-	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)
-	 */
-	public Object getAdapter(Class adapter) {
-		if (ILocationProvider.class.equals(adapter)) {
-			return this;
-		}
-		if (IWorkbenchAdapter.class.equals(adapter)) {
-			return fWorkbenchAdapter;
-		}
-		return Platform.getAdapterManager().getAdapter(this, adapter);
-	}
-
-	/*
-	 * @see org.eclipse.ui.editors.text.ILocationProvider#getPath(java.lang.Object)
-	 */
-	public IPath getPath(Object element) {
-		if (element instanceof ExternalFileEditorInput) {
-			ExternalFileEditorInput input = (ExternalFileEditorInput) element;
-			return Path.fromOSString(input.fFile.getAbsolutePath());
-		}
-		return null;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IPathEditorInput#getPath()
-	 * @since 3.1
-	 */
-	public IPath getPath() {
-		return Path.fromOSString(fFile.getAbsolutePath());
-	}
-
-	/*
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
-	public boolean equals(Object o) {
-		if (o == this) {
-			return true;
-		}
-
-		if (o instanceof ExternalFileEditorInput) {
-			ExternalFileEditorInput input = (ExternalFileEditorInput) o;
-			return fFile.equals(input.fFile);
-		}
-
-		if (o instanceof IPathEditorInput) {
-			IPathEditorInput input = (IPathEditorInput) o;
-			return getPath().equals(input.getPath());
-		}
-
-		return false;
-	}
-
-	/*
-	 * @see java.lang.Object#hashCode()
-	 */
-	public int hashCode() {
-		return fFile.hashCode();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileHyperlink.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileHyperlink.java
deleted file mode 100644
index 6761969..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/ExternalFileHyperlink.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.hyperlink;
-
-import java.io.File;
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Hyperlink for external files.
- */
-class ExternalFileHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.jst.jsp.ui.internal.hyperlink
-
-	private IRegion fHyperlinkRegion;
-	private File fHyperlinkFile;
-
-	public ExternalFileHyperlink(IRegion region, File file) {
-		fHyperlinkFile = file;
-		fHyperlinkRegion = region;
-	}
-
-	public IRegion getHyperlinkRegion() {
-		return fHyperlinkRegion;
-	}
-
-	public String getTypeLabel() {
-		return null;
-	}
-
-	public String getHyperlinkText() {
-		String path = fHyperlinkFile.getPath();
-		if (path.length() > 60) {
-			path = path.substring(0, 25) + "..." + path.substring(path.length() - 25, path.length());
-		}
-		return NLS.bind(XMLUIMessages.Open, path);
-	}
-
-	public void open() {
-		if (fHyperlinkFile != null) {
-			IEditorInput input = new ExternalFileEditorInput(fHyperlinkFile);
-			IEditorDescriptor descriptor;
-			try {
-				descriptor = IDE.getEditorDescriptor(input.getName(), true);
-				if (descriptor != null) {
-					IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-					IDE.openEditor(page, input, descriptor.getId(), true);
-				}
-			}
-			catch (PartInitException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/URLStorageHyperlink.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/URLStorageHyperlink.java
deleted file mode 100644
index bc4b03f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/URLStorageHyperlink.java
+++ /dev/null
@@ -1,180 +0,0 @@
-package org.eclipse.wst.xml.ui.internal.hyperlink;
-
-import java.io.InputStream;
-import java.net.URL;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.jface.text.hyperlink.URLHyperlink;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.sse.core.internal.util.JarUtilities;
-import org.eclipse.wst.xml.core.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-/**
- * Hyperlink for URLs (opens in read-only mode)
- */
-class URLStorageHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.jst.jsp.ui.internal.hyperlink
-
-	static class StorageEditorInput implements IStorageEditorInput {
-		IStorage fStorage = null;
-
-		StorageEditorInput(IStorage storage) {
-			fStorage = storage;
-		}
-
-		public IStorage getStorage() throws CoreException {
-			return fStorage;
-		}
-
-		public boolean exists() {
-			return fStorage != null;
-		}
-
-		public boolean equals(Object obj) {
-			if (obj instanceof StorageEditorInput) {
-				return fStorage.equals(((StorageEditorInput) obj).fStorage);
-			}
-			return super.equals(obj);
-		}
-
-		public ImageDescriptor getImageDescriptor() {
-			return null;
-		}
-
-		public String getName() {
-			return fStorage.getName();
-		}
-
-		public IPersistableElement getPersistable() {
-			return null;
-		}
-
-		public String getToolTipText() {
-			return fStorage.getFullPath() != null ? fStorage.getFullPath().toString() : fStorage.getName();
-		}
-
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-	}
-
-	static class URLStorage implements IStorage {
-		URL fURL = null;
-
-		URLStorage(URL url) {
-			fURL = url;
-		}
-
-		public boolean equals(Object obj) {
-			if (obj instanceof URLStorage) {
-				return fURL.equals(((URLStorage) obj).fURL);
-			}
-			return super.equals(obj);
-		}
-
-		public InputStream getContents() throws CoreException {
-			InputStream stream = null;
-			try {
-				if (fURL.toString().startsWith("jar:file"))
-					stream = JarUtilities.getInputStream(fURL);
-				else
-					stream = fURL.openStream();
-			}
-			catch (Exception e) {
-				throw new CoreException(new Status(IStatus.ERROR, XMLUIPlugin.getDefault().getBundle().getSymbolicName(), IStatus.ERROR, fURL.toString(), e));
-			}
-			return stream;
-		}
-
-		public IPath getFullPath() {
-			return new Path(fURL.toString());
-		}
-
-		public String getName() {
-			return new Path(fURL.getFile()).lastSegment();
-		}
-
-		public boolean isReadOnly() {
-			return true;
-		}
-
-		public Object getAdapter(Class adapter) {
-			return null;
-		}
-
-	}
-
-	private IRegion fRegion;
-	private URL fURL;
-
-	public URLStorageHyperlink(IRegion region, URL url) {
-		fRegion = region;
-		fURL = url;
-	}
-
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		return NLS.bind(XMLUIMessages.Open, fURL.toString());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#open()
-	 */
-	public void open() {
-		if (fURL != null) {
-			IEditorInput input = new StorageEditorInput(new URLStorage(fURL));
-			IEditorDescriptor descriptor;
-			try {
-				descriptor = IDE.getEditorDescriptor(input.getName());
-				if (descriptor != null) {
-					IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-					IDE.openEditor(page, input, descriptor.getId(), true);
-				}
-			}
-			catch (PartInitException e) {
-				Logger.log(Logger.WARNING_DEBUG, e.getMessage(), e);
-				new URLHyperlink(fRegion, fURL.toString()).open();
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java
deleted file mode 100644
index 0319952..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/WorkspaceFileHyperlink.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.hyperlink;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Hyperlink for files within the workspace. (As long as there is an IFile,
- * this can be used) Opens the default editor for the file.
- */
-class WorkspaceFileHyperlink implements IHyperlink {
-	// copies of this class exist in:
-	// org.eclipse.wst.xml.ui.internal.hyperlink
-	// org.eclipse.wst.html.ui.internal.hyperlink
-	// org.eclipse.jst.jsp.ui.internal.hyperlink
-
-	private IRegion fRegion;
-	private IFile fFile;
-	private IRegion fHighlightRange;
-
-	public WorkspaceFileHyperlink(IRegion region, IFile file) {
-		fRegion = region;
-		fFile = file;
-	}
-
-	public WorkspaceFileHyperlink(IRegion region, IFile file, IRegion range) {
-		fRegion = region;
-		fFile = file;
-		fHighlightRange = range;
-	}
-
-	public IRegion getHyperlinkRegion() {
-		return fRegion;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getTypeLabel()
-	 */
-	public String getTypeLabel() {
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.hyperlink.IHyperlink#getHyperlinkText()
-	 */
-	public String getHyperlinkText() {
-		String path = fFile.getFullPath().toString();
-		if (path.length() > 60) {
-			path = path.substring(0, 25) + "..." + path.substring(path.length() - 25, path.length());
-		}
-		return NLS.bind(XMLUIMessages.Open, path);
-	}
-
-	public void open() {
-		if ((fFile != null) && fFile.exists()) {
-			try {
-				IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				IEditorPart editor = IDE.openEditor(page, fFile, true);
-				// highlight range in editor if possible
-				if ((fHighlightRange != null) && (editor instanceof ITextEditor)) {
-					((ITextEditor) editor).setHighlightRange(fHighlightRange.getOffset(), fHighlightRange.getLength(), true);
-				}
-			}
-			catch (PartInitException pie) {
-				Logger.log(Logger.WARNING_DEBUG, pie.getMessage(), pie);
-			}
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/XMLHyperlinkDetector.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/XMLHyperlinkDetector.java
deleted file mode 100644
index 09abdc3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/hyperlink/XMLHyperlinkDetector.java
+++ /dev/null
@@ -1,569 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.hyperlink;
-
-import java.io.File;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * Detects hyperlinks in XML tags. Includes detection in DOCTYPE and attribute
- * values. Resolves references to schemas, dtds, etc using the Common URI
- * Resolver.
- * 
- */
-public class XMLHyperlinkDetector extends AbstractHyperlinkDetector {
-	private final String NO_NAMESPACE_SCHEMA_LOCATION = "noNamespaceSchemaLocation"; //$NON-NLS-1$
-	private final String SCHEMA_LOCATION = "schemaLocation"; //$NON-NLS-1$
-	private final String XMLNS = "xmlns"; //$NON-NLS-1$
-	private final String XSI_NAMESPACE_URI = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-
-	/**
-	 * Create the appropriate hyperlink
-	 * 
-	 * @param uriString
-	 * @param hyperlinkRegion
-	 * @return IHyperlink
-	 */
-	private IHyperlink createHyperlink(String uriString, IRegion hyperlinkRegion, IDocument document, Node node) {
-		IHyperlink link = null;
-
-		ICatalogEntry entry = getCatalogEntry(uriString);
-		if (entry != null) {
-			link = new CatalogEntryHyperlink(hyperlinkRegion, entry);
-		}
-		else {
-			// try to locate the file in the workspace
-			File systemFile = getFileFromUriString(uriString);
-			if (systemFile != null) {
-				String systemPath = systemFile.getPath();
-				IFile file = getFile(systemPath);
-				if (file != null) {
-					// this is a WorkspaceFileHyperlink since file exists in
-					// workspace
-					link = new WorkspaceFileHyperlink(hyperlinkRegion, file);
-				}
-				else {
-					// this is an ExternalFileHyperlink since file does not
-					// exist in workspace
-					link = new ExternalFileHyperlink(hyperlinkRegion, systemFile);
-				}
-			}
-		}
-		return link;
-	}
-
-	public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks) {
-		// for now, only capable of creating 1 hyperlink
-		List hyperlinks = new ArrayList(0);
-
-		if ((region != null) && (textViewer != null)) {
-			IDocument document = textViewer.getDocument();
-			Node currentNode = getCurrentNode(document, region.getOffset());
-			if (currentNode != null) {
-				String uriString = null;
-				if (currentNode.getNodeType() == Node.DOCUMENT_TYPE_NODE) {
-					// doctype nodes
-					uriString = getURIString(currentNode, document);
-				}
-				else if (currentNode.getNodeType() == Node.ELEMENT_NODE) {
-					// element nodes
-					Attr currentAttr = getCurrentAttrNode(currentNode, region.getOffset());
-					if (currentAttr != null) {
-						// try to find link for current attribute
-						// resolve attribute value
-						uriString = getURIString(currentAttr, document);
-						// verify validity of uri string
-						if ((uriString == null) || !isValidURI(uriString)) {
-							// reset current attribute
-							currentAttr = null;
-						}
-					}
-					if (currentAttr == null) {
-						// try to find a linkable attribute within element
-						currentAttr = getLinkableAttr((Element) currentNode);
-						if (currentAttr != null) {
-							uriString = getURIString(currentAttr, document);
-						}
-					}
-					currentNode = currentAttr;
-				}
-				// try to create hyperlink from information gathered
-				if ((uriString != null) && (currentNode != null) && isValidURI(uriString)) {
-					IRegion hyperlinkRegion = getHyperlinkRegion(currentNode);
-					IHyperlink hyperlink = createHyperlink(uriString, hyperlinkRegion, document, currentNode);
-					if (hyperlink != null) {
-						hyperlinks.add(hyperlink);
-					}
-				}
-			}
-		}
-		if (hyperlinks.size() == 0) {
-			return null;
-		}
-		return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-	}
-
-	/**
-	 * Get the base location from the current model (local file system)
-	 */
-	private String getBaseLocation(IDocument document) {
-		String result = null;
-
-		// get the base location from the current model
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (sModel != null) {
-				result = sModel.getBaseLocation();
-				
-				IPath path = new Path(result);
-				if (path.segmentCount() > 1) {
-					IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-					if (file.exists()) {
-						String baseLocation = null;
-						if (file.getLocation() != null) {
-							baseLocation = file.getLocation().toString();
-						}
-						if (baseLocation == null && file.getLocationURI() != null) {
-							baseLocation = file.getLocationURI().toString();
-						}
-						if (baseLocation == null) {
-							baseLocation = file.getFullPath().toString();
-						}
-						result = baseLocation;
-					}
-				}
-			}
-		}
-		finally {
-			if (sModel != null) {
-				sModel.releaseFromRead();
-			}
-		}
-		return result;
-	}
-
-	/**
-	 * Get the CMElementDeclaration for an element
-	 * 
-	 * @param element
-	 * @return CMElementDeclaration
-	 */
-	private CMElementDeclaration getCMElementDeclaration(Element element) {
-		CMElementDeclaration ed = null;
-
-		ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-		if (mq != null) {
-			ed = mq.getCMElementDeclaration(element);
-		}
-		return ed;
-	}
-
-	/**
-	 * Returns the attribute node within node at offset
-	 * 
-	 * @param node
-	 * @param offset
-	 * @return Attr
-	 */
-	private Attr getCurrentAttrNode(Node node, int offset) {
-		if ((node instanceof IndexedRegion) && ((IndexedRegion) node).contains(offset) && (node.hasAttributes())) {
-			NamedNodeMap attrs = node.getAttributes();
-			// go through each attribute in node and if attribute contains
-			// offset, return that attribute
-			for (int i = 0; i < attrs.getLength(); ++i) {
-				// assumption that if parent node is of type IndexedRegion,
-				// then its attributes will also be of type IndexedRegion
-				IndexedRegion attRegion = (IndexedRegion) attrs.item(i);
-				if (attRegion.contains(offset)) {
-					return (Attr) attrs.item(i);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the node the cursor is currently on in the document. null if no
-	 * node is selected
-	 * 
-	 * @param offset
-	 * @return Node either element, doctype, text, or null
-	 */
-	private Node getCurrentNode(IDocument document, int offset) {
-		// get the current node at the offset (returns either: element,
-		// doctype, text)
-		IndexedRegion inode = null;
-		IStructuredModel sModel = null;
-		try {
-			sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-			if (sModel != null) {
-				inode = sModel.getIndexedRegion(offset);
-				if (inode == null) {
-					inode = sModel.getIndexedRegion(offset - 1);
-				}
-			}
-		}
-		finally {
-			if (sModel != null) {
-				sModel.releaseFromRead();
-			}
-		}
-
-		if (inode instanceof Node) {
-			return (Node) inode;
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an IFile from the given uri if possible, null if cannot find
-	 * file from uri.
-	 * 
-	 * @param fileString
-	 *            file system path
-	 * @return returns IFile if fileString exists in the workspace
-	 */
-	private IFile getFile(String fileString) {
-		IFile file = null;
-
-		if (fileString != null) {
-			Path filePath = new Path(fileString);
-			if (filePath.segmentCount() > 1 && ResourcesPlugin.getWorkspace().getRoot().getFile(filePath).exists()) {
-				return ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
-			}
-			IFile[] files = ResourcesPlugin.getWorkspace().getRoot().findFilesForLocation(filePath);
-			for (int i = 0; (i < files.length) && (file == null); i++) {
-				if (files[i].exists()) {
-					file = files[i];
-				}
-			}
-		}
-
-		return file;
-	}
-
-	/**
-	 * Create a file from the given uri string
-	 * 
-	 * @param uriString -
-	 *            assumes uriString is not http://
-	 * @return File created from uriString if possible, null otherwise
-	 */
-	private File getFileFromUriString(String uriString) {
-		File file = null;
-		try {
-			// first just try to create a file directly from uriString as
-			// default in case create file from uri does not work
-			file = new File(uriString);
-
-			// try to create file from uri
-			URI uri = new URI(uriString);
-			file = new File(uri);
-		}
-		catch (Exception e) {
-			// if exception is thrown while trying to create File just ignore
-			// and file will be null
-		}
-		return file;
-	}
-
-	private IRegion getHyperlinkRegion(Node node) {
-		IRegion hyperRegion = null;
-
-		if (node != null) {
-			short nodeType = node.getNodeType();
-			if (nodeType == Node.DOCUMENT_TYPE_NODE) {
-				// handle doc type node
-				IDOMNode docNode = (IDOMNode) node;
-				hyperRegion = new Region(docNode.getStartOffset(), docNode.getEndOffset() - docNode.getStartOffset());
-			}
-			else if (nodeType == Node.ATTRIBUTE_NODE) {
-				// handle attribute nodes
-				IDOMAttr att = (IDOMAttr) node;
-				// do not include quotes in attribute value region
-				int regOffset = att.getValueRegionStartOffset();
-				ITextRegion valueRegion = att.getValueRegion();
-				if (valueRegion != null) {
-					int regLength = valueRegion.getTextLength();
-					String attValue = att.getValueRegionText();
-					if (StringUtils.isQuoted(attValue)) {
-						++regOffset;
-						regLength = regLength - 2;
-					}
-					hyperRegion = new Region(regOffset, regLength);
-				}
-			}
-		}
-		return hyperRegion;
-	}
-
-	/**
-	 * Attempts to find an attribute within element that is openable.
-	 * 
-	 * @param element -
-	 *            cannot be null
-	 * @return Attr attribute that can be used for open on, null if no
-	 *         attribute could be found
-	 */
-	private Attr getLinkableAttr(Element element) {
-		CMElementDeclaration ed = getCMElementDeclaration(element);
-		// get the list of attributes for this node
-		NamedNodeMap attrs = element.getAttributes();
-		for (int i = 0; i < attrs.getLength(); ++i) {
-			// check if this attribute is "openOn-able"
-			Attr att = (Attr) attrs.item(i);
-			if (isLinkableAttr(att, ed)) {
-				return att;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Find the location hint for the given namespaceURI if it exists
-	 * 
-	 * @param elementNode -
-	 *            cannot be null
-	 * @param namespaceURI -
-	 *            cannot be null
-	 * @return location hint (systemId) if it was found, null otherwise
-	 */
-	private String getLocationHint(Element elementNode, String namespaceURI) {
-		Attr schemaLocNode = elementNode.getAttributeNodeNS(XSI_NAMESPACE_URI, SCHEMA_LOCATION);
-		if (schemaLocNode != null) {
-			StringTokenizer st = new StringTokenizer(schemaLocNode.getValue());
-			while (st.hasMoreTokens()) {
-				String publicId = st.hasMoreTokens() ? st.nextToken() : null;
-				String systemId = st.hasMoreTokens() ? st.nextToken() : null;
-				// found location hint
-				if (namespaceURI.equalsIgnoreCase(publicId)) {
-					return systemId;
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the URI string
-	 * 
-	 * @param node -
-	 *            assumes not null
-	 */
-	private String getURIString(Node node, IDocument document) {
-		String resolvedURI = null;
-		// need the base location, publicId, and systemId for URIResolver
-		String baseLoc = null;
-		String publicId = null;
-		String systemId = null;
-
-		short nodeType = node.getNodeType();
-		// handle doc type node
-		if (nodeType == Node.DOCUMENT_TYPE_NODE) {
-			baseLoc = getBaseLocation(document);
-			publicId = ((DocumentType) node).getPublicId();
-			systemId = ((DocumentType) node).getSystemId();
-		}
-		else if (nodeType == Node.ATTRIBUTE_NODE) {
-			// handle attribute node
-			Attr attrNode = (Attr) node;
-			String attrName = attrNode.getName();
-			String attrValue = attrNode.getValue();
-			attrValue = StringUtils.strip(attrValue);
-			if ((attrValue != null) && (attrValue.length() > 0)) {
-				baseLoc = getBaseLocation(document);
-
-				// handle schemaLocation attribute
-				String prefix = DOMNamespaceHelper.getPrefix(attrName);
-				String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attrName);
-				if ((XMLNS.equals(prefix)) || (XMLNS.equals(unprefixedName))) {
-					publicId = attrValue;
-					systemId = getLocationHint(attrNode.getOwnerElement(), publicId);
-					if (systemId == null) {
-						systemId = attrValue;
-					}
-				}
-				else if ((XSI_NAMESPACE_URI.equals(DOMNamespaceHelper.getNamespaceURI(attrNode))) && (SCHEMA_LOCATION.equals(unprefixedName))) {
-					// for now just use the first pair
-					// need to look into being more precise
-					StringTokenizer st = new StringTokenizer(attrValue);
-					publicId = st.hasMoreTokens() ? st.nextToken() : null;
-					systemId = st.hasMoreTokens() ? st.nextToken() : null;
-					// else check if xmlns publicId = value
-				}
-				else {
-					systemId = attrValue;
-				}
-			}
-		}
-
-		resolvedURI = resolveURI(baseLoc, publicId, systemId);
-		return resolvedURI;
-	}
-
-	/**
-	 * Checks to see if the given attribute is openable. Attribute is openable
-	 * if it is a namespace declaration attribute or if the attribute value is
-	 * of type URI.
-	 * 
-	 * @param attr
-	 *            cannot be null
-	 * @param cmElement
-	 *            CMElementDeclaration associated with the attribute (can be
-	 *            null)
-	 * @return true if this attribute is "openOn-able" false otherwise
-	 */
-	private boolean isLinkableAttr(Attr attr, CMElementDeclaration cmElement) {
-		String attrName = attr.getName();
-		String prefix = DOMNamespaceHelper.getPrefix(attrName);
-		String unprefixedName = DOMNamespaceHelper.getUnprefixedName(attrName);
-		// determine if attribute is namespace declaration
-		if ((XMLNS.equals(prefix)) || (XMLNS.equals(unprefixedName))) {
-			return true;
-		}
-
-		// determine if attribute contains schema location
-		if ((XSI_NAMESPACE_URI.equals(DOMNamespaceHelper.getNamespaceURI(attr))) && ((SCHEMA_LOCATION.equals(unprefixedName)) || (NO_NAMESPACE_SCHEMA_LOCATION.equals(unprefixedName)))) {
-			return true;
-		}
-
-		// determine if attribute value is of type URI
-		if (cmElement != null) {
-			CMNamedNodeMap attrDecls = cmElement.getAttributes();
-			CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attrDecls);
-			List nodes = ModelQueryUtil.getModelQuery(attr.getOwnerDocument()).getAvailableContent(attr.getOwnerElement(), cmElement, ModelQuery.INCLUDE_ATTRIBUTES);
-			for (int k = 0; k < nodes.size(); k++) {
-				CMNode cmnode = (CMNode) nodes.get(k);
-				if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-					allAttributes.put(cmnode);
-				}
-			}
-			attrDecls = allAttributes;
-
-			CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) attrDecls.getNamedItem(attrName);
-			if ((attrDecl != null) && (attrDecl.getAttrType() != null) && (CMDataType.URI.equals(attrDecl.getAttrType().getDataTypeName()))) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Checks whether the given uriString is really pointing to a file
-	 * 
-	 * @param uriString
-	 * @return boolean
-	 */
-	private boolean isValidURI(String uriString) {
-		boolean isValid = false;
-
-		if (getCatalogEntry(uriString) != null) {
-			isValid = true;
-		}
-		else {
-			File file = getFileFromUriString(uriString);
-			if (file != null) {
-				isValid = file.isFile();
-			}
-			if(!isValid) {
-			}
-			
-		}
-		return isValid;
-	}
-
-	/**
-	 * @param uriString
-	 * @return
-	 */
-	private ICatalogEntry getCatalogEntry(String uriString) {
-		ICatalog defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		if (defaultCatalog != null) {
-			// Process default catalog
-			ICatalogEntry[] entries = defaultCatalog.getCatalogEntries();
-			for (int entry = 0; entry < entries.length; entry++) {
-				if (uriString.equals(entries[entry].getKey())||uriString.equals(entries[entry].getURI())) {
-					return entries[entry];
-				}
-			}
-
-			// Process declared OASIS nextCatalogs catalog
-			INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-			for (int nextCatalog = 0; nextCatalog < nextCatalogs.length; nextCatalog++) {
-				ICatalog catalog = nextCatalogs[nextCatalog].getReferencedCatalog();
-				ICatalogEntry[] entries2 = catalog.getCatalogEntries();
-				for (int entry = 0; entry < entries2.length; entry++) {
-					if (uriString.equals(entries2[entry].getKey())||uriString.equals(entries2[entry].getURI()))
-						return entries2[entry];
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Resolves the given URI information
-	 * 
-	 * @param baseLocation
-	 * @param publicId
-	 * @param systemId
-	 * @return String resolved uri.
-	 */
-	private String resolveURI(String baseLocation, String publicId, String systemId) {
-		// dont resolve if there's nothing to resolve
-		if ((baseLocation == null) && (publicId == null) && (systemId == null)) {
-			return null;
-		}
-		return URIResolverPlugin.createResolver().resolve(baseLocation, publicId, systemId);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesControl.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesControl.java
deleted file mode 100644
index 2782c47..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesControl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.nsedit;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.part.PageBook;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.dialogs.SelectFileOrXMLCatalogIdDialog;
-
-public class CommonAddNamespacesControl extends Composite implements SelectionListener {
-
-	class EditNamespaceControl extends Composite {
-		protected Button browseButton;
-		Text locationHintField;
-		Text prefixField;
-		Text uriField;
-
-		// protected NamespaceInfo info;
-
-		public EditNamespaceControl(Composite parent) {
-			super(parent, SWT.NONE); // BORDER);
-			setLayout(new GridLayout());
-			setLayoutData(new GridData(GridData.FILL_BOTH));
-
-			Label label = new Label(this, SWT.NONE);
-			label.setText(XMLUIMessages._UI_ENTER_REQ_PREFIX_AND_NAMESPACE);
-
-			Composite composite = new Composite(this, SWT.NONE);
-			GridLayout layout = new GridLayout();
-			layout.numColumns = 3;
-			layout.marginWidth = 0;
-			layout.verticalSpacing = 1;
-			composite.setLayout(layout);
-
-			GridData gd = new GridData(GridData.FILL_HORIZONTAL);
-			gd.widthHint = 350;
-			composite.setLayoutData(gd);
-
-			// row 1
-			//
-			Label prefixLabel = new Label(composite, SWT.NONE);
-			prefixLabel.setText(XMLUIMessages._UI_LABEL_PREFIX_COLON);
-
-			prefixField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-			prefixField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			// prefixField.setText(getDisplayValue(info.prefix));
-			// prefixField.addModifyListener(modifyListener);
-			// prefixField.setEnabled(info.getProperty("prefix-readOnly") ==
-			// null);
-			new Label(composite, SWT.NONE);
-
-			// row 2
-			//
-			Label uriLabel = new Label(composite, SWT.NONE);
-			uriLabel.setText(XMLUIMessages._UI_LABEL_NAMESPACE_NAME_COLON);
-
-			uriField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-			uriField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			// uriField.setText(getDisplayValue(info.uri));
-			// uriField.addModifyListener(modifyListener);
-			// uriField.setEnabled(info.getProperty("uri-readOnly") == null);
-
-			new Label(composite, SWT.NONE);
-
-			// row 3
-			//
-			Label locationHintLabel = new Label(composite, SWT.NONE);
-			locationHintLabel.setText(XMLUIMessages._UI_LABEL_LOCATION_HINT_COLON);
-
-			locationHintField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-			locationHintField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-			// locationHintField.setText(getDisplayValue(info.locationHint));
-			// locationHintField.addModifyListener(modifyListener);
-			// locationHintField.setEnabled(info.getProperty("locationHint-readOnly")
-			// == null);
-
-			SelectionListener selectionListener = new SelectionAdapter() {
-				public void widgetSelected(SelectionEvent e) {
-					performBrowse();
-				}
-			};
-
-			browseButton = new Button(composite, SWT.NONE);
-			browseButton.setText(XMLUIMessages._UI_LABEL_BROWSE);
-			browseButton.addSelectionListener(selectionListener);
-			browseButton.setEnabled(locationHintField.getEnabled());
-		}
-
-		protected void performBrowse() {
-			String[] extensions = {".xsd"}; //$NON-NLS-1$
-			SelectFileOrXMLCatalogIdDialog dialog = new SelectFileOrXMLCatalogIdDialog(getShell(), extensions);
-			dialog.create();
-			dialog.getShell().setText(XMLUIMessages._UI_LABEL_SELECT_FILE);
-			dialog.setBlockOnOpen(true);
-			dialog.open();
-
-			if (dialog.getReturnCode() == Window.OK) {
-				// String grammarURI = null;
-				IFile file = dialog.getFile();
-				String id = dialog.getId();
-				if (file != null) {
-					String uri = null;
-					if (resourceLocation != null) {
-						IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(resourceLocation);
-						if (resource != null) {
-							IPath location = resource.getLocation();
-							if (location != null) {
-								uri = URIHelper.getRelativeURI(file.getLocation(), location);
-							}
-						}
-	                    else {
-	                      uri = URIHelper.getRelativeURI(file.getLocation(), resourceLocation);
-	                    }
-						// grammarURI = file.getLocation().toOSString();
-					}
-					else {
-						uri = file.getLocation().toOSString();
-						// grammarURI = uri;
-					}
-					locationHintField.setText(uri);
-				}
-				else if (id != null) {
-					locationHintField.setText(id);
-					// URIResolver resolver =
-					URIResolverPlugin.createResolver();
-					// grammarURI = resolver.resolve(null, id, id);
-				}
-
-				try {
-					// TODO CMDocument document =
-					// CMDocumentBuilderRegistry.getInstance().buildCMDocument(grammarURI);
-					// List namespaceInfoList =
-					// (List)document.getProperty("http://org.eclipse.wst/cm/properties/namespaceInfo");
-					// NamespaceInfo info =
-					// (NamespaceInfo)namespaceInfoList.get(0);
-					// if (uriField.getText().trim().length() == 0 && info.uri
-					// != null)
-					// {
-					// uriField.setText(info.uri);
-					// }
-					// if (prefixField.getText().trim().length() == 0 &&
-					// info.prefix != null)
-					// {
-					// prefixField.setText(info.prefix);
-					// }
-				}
-				catch (Exception e) {
-				}
-			}
-		}
-	}
-
-	protected Button deleteButton;
-	protected Button editButton;
-	protected EditNamespaceControl editNamespaceControl;
-	protected int heightHint = 250;
-	protected List namespaceInfoList = new ArrayList();
-	protected Button newButton;
-	protected PageBook pageBook;
-	protected Button radio1;
-	protected Button radio2;
-	protected IPath resourceLocation;
-	protected Composite tableSection;
-	protected CommonNamespaceInfoTable tableViewer;
-	protected int widthHint = 500;
-
-
-	public CommonAddNamespacesControl(Composite parent, int style, IPath resourceLocation) {
-		super(parent, style);
-		this.resourceLocation = resourceLocation;
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		if (widthHint != -1) {
-			gd.widthHint = widthHint;
-		}
-		if (heightHint != -1) {
-			gd.heightHint = heightHint;
-		}
-		setLayoutData(gd);
-		setLayout(new GridLayout());
-
-		radio1 = new Button(this, SWT.RADIO);
-		radio1.setText(XMLUIMessages._UI_SELECT_REGISTERED_NAMESPACES);
-		radio1.addSelectionListener(this);
-
-		radio2 = new Button(this, SWT.RADIO);
-		radio2.setText(XMLUIMessages._UI_SPECIFY_NEW_NAMESPACE);
-		radio2.addSelectionListener(this);
-
-		Label separator = new Label(this, SWT.SEPARATOR | SWT.HORIZONTAL);
-		separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		// Group namespaceInfoGroup = new Group(this, SWT.NONE);
-		// namespaceInfoGroup.setText("Namespace Declarations");
-		// //XMLCommonUIPlugin.getInstance().getString("_UI_LABEL_XML_SCHEMA_INFORMATION"));
-		// namespaceInfoGroup.setLayout(new GridLayout(2, false));
-		// namespaceInfoGroup.setLayoutData(new GridData(GridData.FILL_BOTH));
-		pageBook = new PageBook(this, SWT.NONE);
-		pageBook.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		tableSection = new Composite(pageBook, SWT.NONE);
-		tableSection.setLayout(new GridLayout());
-		Label label = new Label(tableSection, SWT.NONE);
-		label.setText(XMLUIMessages._UI_SELECT_NAMESPACE_TO_ADD);
-
-		tableViewer = new CommonNamespaceInfoTable(tableSection, SWT.CHECK, 6);
-		editNamespaceControl = new EditNamespaceControl(pageBook);
-		pageBook.showPage(tableSection);
-
-		tableViewer.setInput(namespaceInfoList);
-	}
-
-
-
-	public List getNamespaceInfoList() {
-		List list = new ArrayList();
-		if (radio1.getSelection()) {
-			TableItem[] items = tableViewer.getTable().getItems();
-			for (int i = 0; i < items.length; i++) {
-				TableItem item = items[i];
-				if (item.getChecked()) {
-					list.add(item.getData());
-				}
-			}
-		}
-		else {
-			NamespaceInfo info = new NamespaceInfo();
-			info.prefix = editNamespaceControl.prefixField.getText();
-			info.uri = editNamespaceControl.uriField.getText();
-			info.locationHint = editNamespaceControl.locationHintField.getText();
-			list.add(info);
-		}
-		return list;
-	}
-
-	public void setNamespaceInfoList(List list) {
-		namespaceInfoList = list;
-		tableViewer.setInput(namespaceInfoList);
-	}
-
-	public void widgetDefaultSelected(SelectionEvent e) {
-	}
-
-	public void widgetSelected(SelectionEvent e) {
-		if (e.widget == radio1) {
-			pageBook.showPage(tableSection);
-		}
-		else if (e.widget == radio2) {
-			pageBook.showPage(editNamespaceControl);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesDialog.java
deleted file mode 100644
index 269113f..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonAddNamespacesDialog.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.nsedit;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-
-
-
-public class CommonAddNamespacesDialog extends Dialog {
-	protected CommonAddNamespacesControl addNamespacesControl;
-	protected List existingNamespaces;
-	protected List namespaceInfoList;
-	protected Button okButton;
-	protected HashMap preferredPrefixTable = new HashMap();
-	protected IPath resourceLocation;
-	protected String title;
-
-	public CommonAddNamespacesDialog(Shell parentShell, String title, IPath resourceLocation, List existingNamespaces) {
-		super(parentShell);
-		this.resourceLocation = resourceLocation;
-		setShellStyle(getShellStyle() | SWT.RESIZE);
-		this.title = title;
-		this.existingNamespaces = existingNamespaces;
-		preferredPrefixTable.put("http://schemas.xmlsoap.org/wsdl/", "wsdl"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferredPrefixTable.put("http://schemas.xmlsoap.org/wsdl/soap/", "soap"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferredPrefixTable.put("http://schemas.xmlsoap.org/wsdl/http/", "http"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferredPrefixTable.put("http://schemas.xmlsoap.org/wsdl/mime/", "mime"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferredPrefixTable.put("http://schemas.xmlsoap.org/soap/encoding/", "soapenc"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferredPrefixTable.put("http://schemas.xmlsoap.org/soap/envelope/", "soapenv"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferredPrefixTable.put("http://www.w3.org/2001/XMLSchema-instance", "xsi"); //$NON-NLS-1$ //$NON-NLS-2$
-		preferredPrefixTable.put("http://www.w3.org/2001/XMLSchema", "xsd"); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected void addBuiltInNamespaces(List list) {
-		String xsiNamespace = "http://www.w3.org/2001/XMLSchema-instance"; //$NON-NLS-1$
-		String xsdNamespace = "http://www.w3.org/2001/XMLSchema"; //$NON-NLS-1$
-		if (!isAlreadyDeclared(xsiNamespace)) {
-			list.add(new NamespaceInfo("http://www.w3.org/2001/XMLSchema-instance", "xsi", null)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		if (!isAlreadyDeclared(xsdNamespace)) {
-			list.add(new NamespaceInfo("http://www.w3.org/2001/XMLSchema", "xsd", null)); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-	}
-
-	protected void addCatalogMapToList(ICatalog catalog, List list) {
-		ICatalogEntry[] entries = catalog.getCatalogEntries();
-		for (int i = 0; i < entries.length; i++) {
-			ICatalogEntry entry = entries[i];
-			if ((entry.getEntryType() == ICatalogEntry.ENTRY_TYPE_PUBLIC) && entry.getURI().endsWith(".xsd")) { //$NON-NLS-1$
-				if (!isAlreadyDeclared(entry.getKey())) {
-					NamespaceInfo namespaceInfo = new NamespaceInfo(entry.getKey(), "xx", null); //$NON-NLS-1$
-					list.add(namespaceInfo);
-				}
-			}
-		}
-	}
-
-	protected void buttonPressed(int buttonId) {
-		if (buttonId == IDialogConstants.OK_ID) {
-			namespaceInfoList = addNamespacesControl.getNamespaceInfoList();
-		}
-		super.buttonPressed(buttonId);
-	}
-
-	public void computeAddablePrefixes(List addableList, List exisitingList) {
-		HashMap map = new HashMap();
-		for (Iterator i = exisitingList.iterator(); i.hasNext();) {
-			NamespaceInfo info = (NamespaceInfo) i.next();
-			if (info.prefix != null) {
-				map.put(info.prefix, info);
-			}
-		}
-		for (Iterator i = addableList.iterator(); i.hasNext();) {
-			NamespaceInfo info = (NamespaceInfo) i.next();
-			if (info.uri != null) {
-				String prefix = (String) preferredPrefixTable.get(info.uri);
-				info.prefix = getUniquePrefix(map, prefix, info.uri);
-				map.put(info.prefix, info);
-			}
-		}
-	}
-
-	public int createAndOpen() {
-		create();
-		getShell().setText(title);
-		Rectangle r = getShell().getBounds();
-		getShell().setBounds(r.x + 80, r.y + 80, r.width, r.height);
-		setBlockOnOpen(true);
-		return open();
-	}
-
-	protected void createButtonsForButtonBar(Composite parent) {
-		okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-	}
-
-	protected Control createContents(Composite parent) {
-		Control control = super.createContents(parent);
-		return control;
-	}
-
-
-
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) super.createDialogArea(parent);
-		addNamespacesControl = new CommonAddNamespacesControl(dialogArea, SWT.NONE, resourceLocation);
-		List list = new ArrayList();
-
-		addBuiltInNamespaces(list);
-		ICatalog defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-		INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-		for (int i = 0; i < nextCatalogs.length; i++) {
-			INextCatalog catalog = nextCatalogs[i];
-			ICatalog referencedCatalog = catalog.getReferencedCatalog();
-			if (referencedCatalog != null) {
-				if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId())) {
-					ICatalog userCatalog = referencedCatalog;
-					addCatalogMapToList(userCatalog, list);
-
-				}
-				else if (XMLCorePlugin.SYSTEM_CATALOG_ID.equals(referencedCatalog.getId())) {
-					ICatalog systemCatalog = referencedCatalog;
-					addCatalogMapToList(systemCatalog, list);
-				}
-			}
-		}
-
-		computeAddablePrefixes(list, existingNamespaces);
-
-		addNamespacesControl.setNamespaceInfoList(list);
-		return dialogArea;
-	}
-
-	public List getNamespaceInfoList() {
-		return namespaceInfoList;
-	}
-
-	protected String getPreferredPrefix(String namespaceURI) {
-		return (String) preferredPrefixTable.get(namespaceURI);
-	}
-
-	private String getUniquePrefix(HashMap prefixMap, String prefix, String uri) {
-		if (prefix == null) {
-			int lastIndex = uri.lastIndexOf('/');
-			if (lastIndex == uri.length() - 1) {
-				uri = uri.substring(0, lastIndex);
-				lastIndex = uri.lastIndexOf('/');
-			}
-			prefix = uri.substring(lastIndex + 1);
-			if ((prefix.length() > 20) || (prefix.indexOf(':') != -1)) {
-				prefix = null;
-			}
-		}
-		if (prefix == null) {
-			prefix = "p"; //$NON-NLS-1$
-		}
-		if (prefixMap.get(prefix) != null) {
-			String base = prefix;
-			for (int count = 0; prefixMap.get(prefix) != null; count++) {
-				prefix = base + count;
-			}
-		}
-		return prefix;
-	}
-
-	protected boolean isAlreadyDeclared(String namespaceURI) {
-		boolean result = false;
-		for (Iterator i = existingNamespaces.iterator(); i.hasNext();) {
-			NamespaceInfo namespaceInfo = (NamespaceInfo) i.next();
-			if (namespaceURI.equals(namespaceInfo.uri)) {
-				result = true;
-				break;
-			}
-		}
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonEditNamespacesDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonEditNamespacesDialog.java
deleted file mode 100644
index 3a358cd..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonEditNamespacesDialog.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.nsedit;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditNamespaceInfoDialog;
-import org.eclipse.wst.xml.ui.internal.dialogs.NamespaceInfoErrorHelper;
-
-public class CommonEditNamespacesDialog {
-	protected Composite commonComposite;
-	protected Button deleteButton;
-	protected Button editButton;
-
-	protected Label errorMessageLabel;
-	protected int heightHint = 250;
-	protected List namespaceInfoList = new ArrayList();
-
-	protected Button newButton;
-	protected IPath resourceLocation;
-
-	private boolean showLocationText = false;
-	protected String tableLabel = ""; //$NON-NLS-1$
-	protected CommonNamespaceInfoTable tableViewer;
-
-	protected Composite topComposite;
-	protected boolean useGroup;
-	protected int widthHint = 500;
-
-	public CommonEditNamespacesDialog(Composite parent, IPath resourceLocation, String stringTableLabel) {
-		this(parent, resourceLocation, stringTableLabel, false, false);
-	}
-
-	public CommonEditNamespacesDialog(Composite parent, IPath resourceLocation, String stringTableLabel, boolean useGroup, boolean showLocText) {
-		this.resourceLocation = resourceLocation;
-		tableLabel = stringTableLabel;
-		this.useGroup = useGroup;
-		showLocationText = showLocText;
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		if (widthHint != -1) {
-			gd.widthHint = widthHint;
-		}
-		if (heightHint != -1) {
-			gd.heightHint = heightHint;
-		}
-
-		// Set GridData and GridLayout for the parent Composite
-		parent.setLayoutData(gd);
-		parent.setLayout(new GridLayout());
-
-		// Create the top Composite
-		topComposite = new Composite(parent, SWT.NONE);
-		GridData topData = new GridData(GridData.FILL_HORIZONTAL);
-		topData.heightHint = 0;
-		topComposite.setLayoutData(topData);
-		topComposite.setLayout(new GridLayout());
-
-		// Create the 'common'/middle Composite
-		if (useGroup) {
-			commonComposite = new Group(parent, SWT.NONE);
-		}
-		else {
-			commonComposite = new Composite(parent, SWT.NONE);
-		}
-		commonComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-		commonComposite.setLayout(new GridLayout(3, false));
-
-		// Add the error Message Label
-		errorMessageLabel = new Label(parent, SWT.NONE);
-		errorMessageLabel.setLayoutData(createHorizontalFill());
-		Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-		errorMessageLabel.setForeground(color);
-
-		createControlArea();
-	}
-
-
-	protected void createButtons(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		GridLayout gridLayout = new GridLayout();
-		gridLayout.numColumns = 1;
-		gridLayout.marginHeight = 0;
-		gridLayout.marginWidth = 0;
-		composite.setLayout(gridLayout);
-
-		SelectionListener selectionListener = new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (e.widget == newButton) {
-					performNew();
-				}
-				else if (e.widget == editButton) {
-					performEdit();
-				}
-				else if (e.widget == deleteButton) {
-					performDelete();
-				}
-			}
-		};
-
-		// create a composite to hold the three buttons
-		Composite buttonComposite = new Composite(composite, SWT.NONE);
-		buttonComposite.setLayoutData(createHorizontalFill());
-		GridLayout buttonGridLayout = new GridLayout();
-		// buttonGridLayout.numColumns = 3;
-		// buttonGridLayout.makeColumnsEqualWidth = true;
-		buttonComposite.setLayout(buttonGridLayout);
-
-		// add the New button
-		//
-		newButton = new Button(buttonComposite, SWT.NONE);
-		// newButton.setText(" " +
-		// XMLCommonUIPlugin.getInstance().getString("_UI_BUTTON_NEW") + " ");
-		newButton.setText("   " + XMLUIMessages.CommonEditNamespacesDialog_0 + "   "); //$NON-NLS-1$ //$NON-NLS-2$ 
-		newButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // ViewUtility.createHorizontalFill());
-		newButton.addSelectionListener(selectionListener);
-
-		// add the Edit button
-		//
-		// gd = new GridData();
-		// gd.horizontalAlignment = gd.FILL;
-		// gd.grabExcessHorizontalSpace = true;
-
-		editButton = new Button(buttonComposite, SWT.NONE);
-		editButton.setText(XMLUIMessages._UI_BUTTON_EDIT);
-		editButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // ViewUtility.createHorizontalFill());
-		editButton.addSelectionListener(selectionListener);
-
-		// add the Delete button
-		//
-		// gd = new GridData();
-		// gd.horizontalAlignment = gd.FILL;
-		// gd.grabExcessHorizontalSpace = true;
-
-		deleteButton = new Button(buttonComposite, SWT.NONE);
-		deleteButton.setText(XMLUIMessages._UI_BUTTON_DELETE);
-		deleteButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); // ViewUtility.createHorizontalFill());
-		deleteButton.addSelectionListener(selectionListener);
-	}
-
-	private void createControlArea() {
-		if (useGroup) {
-			((Group) commonComposite).setText(tableLabel);
-		}
-		else {
-			Label label = new Label(commonComposite, SWT.NONE);
-			label.setText(tableLabel);
-			label.setLayoutData(createGridData(false, 3));
-		}
-
-		tableViewer = new CommonNamespaceInfoTable(commonComposite, 6, showLocationText);
-		tableViewer.getControl().setLayoutData(createGridData(true, 2));
-		createButtons(commonComposite);
-
-		tableViewer.setInput(namespaceInfoList);
-		updateButtonEnabledState();
-		ISelectionChangedListener selectionChangedListener = new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				updateButtonEnabledState();
-			}
-		};
-		tableViewer.addSelectionChangedListener(selectionChangedListener);
-	}
-
-	protected GridData createGridData(boolean both, int span) {
-		GridData gd = new GridData(both ? GridData.FILL_BOTH : GridData.FILL_HORIZONTAL);
-		gd.horizontalSpan = 2;
-		return gd;
-	}
-
-	private GridData createHorizontalFill() {
-		GridData gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		return gd;
-	}
-
-
-
-	public NamespaceInfo getNamespaceInfo(String namespace) {
-		NamespaceInfo result = null;
-		for (Iterator i = namespaceInfoList.iterator(); i.hasNext();) {
-			NamespaceInfo info = (NamespaceInfo) i.next();
-			if ((info.uri != null) && info.uri.equals(namespace)) {
-				result = info;
-				break;
-			}
-		}
-		return result;
-	}
-
-	protected Object getSelection(ISelection selection) {
-		if (selection == null) {
-			return null;
-		} // end of if ()
-
-		Object result = null;
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection es = (IStructuredSelection) selection;
-			Iterator i = es.iterator();
-			if (i.hasNext()) {
-				result = i.next();
-			}
-		}
-		return result;
-	}
-
-	/*
-	 * Use the returned Composite to add content above the 'common contents'.
-	 * Note: The GridData for the returned Composite has a heightHint = 0.
-	 * This means when using the returned Composite, the GridData must be
-	 * reset, else the Composite and it's contents will not appear.
-	 */
-	protected Composite getTopComposite() {
-		return topComposite;
-	}
-
-	protected EditNamespaceInfoDialog invokeDialog(String title, NamespaceInfo info) {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		EditNamespaceInfoDialog dialog = new EditNamespaceInfoDialog(shell, info);
-		dialog.create();
-		dialog.getShell().setText(title);
-		dialog.setBlockOnOpen(true);
-		dialog.setResourceLocation(resourceLocation);
-		dialog.open();
-		return dialog;
-	}
-
-	protected void performDelayedUpdate() {
-		tableViewer.refresh();
-		/*
-		 * Runnable delayedUpdate = new Runnable() { public void run() {
-		 * tableViewer.refresh(); } };
-		 * Display.getCurrent().asyncExec(delayedUpdate);
-		 */
-		// if (updateListener != null)
-		// {
-		// updateListener.updateOccured(this, namespaceInfoList);
-		// }
-	}
-
-	public void performDelete() {
-		ISelection selection = tableViewer.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-			namespaceInfoList.removeAll(structuredSelection.toList());
-			updateErrorMessage(namespaceInfoList);
-			performDelayedUpdate();
-		}
-	}
-
-	public void performEdit() {
-		Object selection = getSelection(tableViewer.getSelection());
-		if (selection != null) {
-			invokeDialog(XMLUIMessages._UI_LABEL_NEW_NAMESPACE_INFORMATION, (NamespaceInfo) selection);
-			updateErrorMessage(namespaceInfoList);
-			performDelayedUpdate();
-		}
-	}
-
-	public void performNew() {
-		Shell shell = XMLUIPlugin.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-		CommonAddNamespacesDialog dialog = new CommonAddNamespacesDialog(shell, XMLUIMessages._UI_ADD_NAMESPACE_DECLARATIONS, resourceLocation, namespaceInfoList);
-		dialog.createAndOpen();
-		if (dialog.getReturnCode() == Window.OK) {
-			namespaceInfoList.addAll(dialog.getNamespaceInfoList());
-			updateErrorMessage(namespaceInfoList);
-			performDelayedUpdate();
-		}
-	}
-
-	public void setNamespaceInfoList(List list) {
-		namespaceInfoList = list;
-		tableViewer.setInput(namespaceInfoList);
-	}
-
-	public void updateButtonEnabledState() {
-		Object selection = getSelection(tableViewer.getSelection());
-		NamespaceInfo info = (NamespaceInfo) selection;
-		editButton.setEnabled(info != null);
-		deleteButton.setEnabled((info != null) && (info.getProperty("unremovable") == null)); //$NON-NLS-1$
-	}
-
-	public void updateErrorMessage(List namespaceInfoList) {
-		NamespaceInfoErrorHelper helper = new NamespaceInfoErrorHelper();
-		String errorMessage = helper.computeErrorMessage(namespaceInfoList, null);
-		errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-	}
-	
-	public void setResourcePath(IPath path) {
-	  resourceLocation = path;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonEditNamespacesTargetFieldDialog.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonEditNamespacesTargetFieldDialog.java
deleted file mode 100644
index 1f6d85a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonEditNamespacesTargetFieldDialog.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.nsedit;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/*
- * This class is an extension of CommonEditNamespacesDialog. This class adds
- * the target namespaces dialog field.
- */
-public class CommonEditNamespacesTargetFieldDialog extends CommonEditNamespacesDialog {
-
-	class TargetNamespaceModifyListener implements ModifyListener {
-		public void modifyText(ModifyEvent e) {
-			String oldTargetNamespace = targetNamespace;
-			targetNamespace = targetNamespaceField.getText();
-			updateTargetNamespaceAndNamespaceInfo(oldTargetNamespace, targetNamespace);
-		}
-	}
-
-	protected String targetNamespace;
-	protected Text targetNamespaceField;
-
-	public CommonEditNamespacesTargetFieldDialog(Composite parent, IPath resourceLocation1) {
-		super(parent, resourceLocation1, XMLUIMessages._UI_NAMESPACE_DECLARATIONS);
-
-		Composite targetComp = getTopComposite();
-		targetComp.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-		GridData gd = new GridData(GridData.FILL_BOTH);
-		Label targetNamespaceLabel = new Label(targetComp, SWT.NONE);
-		targetNamespaceLabel.setLayoutData(gd);
-		targetNamespaceLabel.setText(XMLUIMessages._UI_TARGET_NAMESPACE);
-
-		targetNamespaceField = new Text(targetComp, SWT.BORDER);
-		targetNamespaceField.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		targetNamespaceField.addModifyListener(new TargetNamespaceModifyListener());
-
-		// createControlArea();
-	}
-
-	public String getTargetNamespace() {
-		return targetNamespace;
-	}
-
-	public void performEdit() {
-		Object selection = getSelection(tableViewer.getSelection());
-		if (selection != null) {
-			boolean editTargetNamespace = false;
-			NamespaceInfo nsInfo = (NamespaceInfo) selection;
-			if (getTargetNamespace().equals(nsInfo.uri)) {
-				editTargetNamespace = true;
-			}
-
-			invokeDialog(XMLUIMessages._UI_LABEL_NEW_NAMESPACE_INFORMATION, nsInfo);
-			updateErrorMessage(namespaceInfoList);
-			performDelayedUpdate();
-
-			if (editTargetNamespace) {
-				targetNamespaceField.setText(nsInfo.uri);
-			}
-		}
-	}
-
-	public void setTargetNamespace(String theTargetNamespace) {
-		targetNamespace = theTargetNamespace != null ? theTargetNamespace : ""; //$NON-NLS-1$
-		targetNamespaceField.setText(targetNamespace);
-		// updateTargetNamespaceAndNamespaceInfo(targetNamespace);
-	}
-
-	void updateTargetNamespaceAndNamespaceInfo(String oldTargetNamespace, String newTargetNamespace) {
-		NamespaceInfo info = getNamespaceInfo(newTargetNamespace);
-		if (info == null) {
-			info = getNamespaceInfo(oldTargetNamespace);
-			if (info == null) {
-				info = new NamespaceInfo(newTargetNamespace, "tns", null); //$NON-NLS-1$
-				namespaceInfoList.add(info);
-			}
-			else {
-				info.uri = targetNamespace;
-			}
-		}
-		tableViewer.refresh();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonNamespaceInfoTable.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonNamespaceInfoTable.java
deleted file mode 100644
index 44162e4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/nsedit/CommonNamespaceInfoTable.java
+++ /dev/null
@@ -1,346 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.nsedit;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class CommonNamespaceInfoTable extends TableViewer {
-
-	/**
-	 * NamespaceInfoTableLabelProvider
-	 */
-	protected class Provider extends LabelProvider implements ITableLabelProvider, IStructuredContentProvider {
-		Viewer viewer;
-
-		public Image getColumnImage(Object object, int columnIndex) {
-			Image result = null;
-			int columnCode = getColumnCode(columnIndex);
-			if (columnCode == COLUMN_LOCATION_HINT) {
-				NamespaceInfo info = (NamespaceInfo) object;
-				if ((info.locationHint == null) || info.locationHint.trim().equals("")) { //$NON-NLS-1$
-					// Comment this out until we solve the alignment/(space
-					// for image being allocated
-					// to prefix column) ......
-					// result =
-					// XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_WARNING_OBJ);
-				}
-			}
-
-			return result;
-		}
-
-		public String getColumnText(Object object, int column) {
-			NamespaceInfo info = (NamespaceInfo) object;
-			String result = null;
-			int columnCode = getColumnCode(column);
-			switch (columnCode) {
-				case COLUMN_PREFIX : {
-					result = info.prefix;
-					break;
-				}
-				case COLUMN_NAMESPACE_URI : {
-					result = info.uri;
-					break;
-				}
-				case COLUMN_CHECKBOX : {
-					result = ""; // info.locationHint; //$NON-NLS-1$
-					break;
-				}
-				case COLUMN_LOCATION_HINT : {
-					result = info.locationHint;
-					break;
-				}
-			}
-			result = result != null ? result : ""; //$NON-NLS-1$
-			if (result.equals("")) { //$NON-NLS-1$
-				switch (columnCode) {
-					case COLUMN_PREFIX : {
-						result = XMLUIMessages._UI_NO_PREFIX;
-						break;
-					}
-					case COLUMN_NAMESPACE_URI : {
-						result = XMLUIMessages._UI_NO_NAMESPACE_NAME;
-						break;
-					}
-				}
-			}
-			return result;
-		}
-
-		public Object[] getElements(Object inputElement) {
-			List list = (List) viewer.getInput();
-			return list != null ? list.toArray() : null;
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			this.viewer = viewer;
-		}
-	}
-
-	class TableItemChecker extends MouseAdapter {
-		public void mouseDown(MouseEvent e) {
-			TableItem item = getTable().getItem(new Point(e.x, e.y));
-			if (item != null) {
-				Object obj = item.getData();
-				if (obj != null) {
-					NamespaceInfo info = (NamespaceInfo) obj;
-					TableColumn col = getTable().getColumn(0);
-					if (e.x < col.getWidth()) // if the point falls within
-												// the
-					// Select column then perform
-					// check/uncheck
-					{
-						String currentState = (String) info.getProperty("checked"); //$NON-NLS-1$
-						System.out.println("currentState" + currentState); //$NON-NLS-1$
-						if ((currentState == null) || currentState.equals("false")) //$NON-NLS-1$
-						{
-							info.setProperty("checked", "true"); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-						else {
-							info.setProperty("checked", "false"); //$NON-NLS-1$ //$NON-NLS-2$
-						}
-						refresh();
-					}
-				}
-			}
-		}
-	}
-
-	protected static final int COLUMN_CHECKBOX = 1;
-	protected static final int COLUMN_LOCATION_HINT = 4;
-	protected static final int COLUMN_NAMESPACE_URI = 2;
-	protected static final int COLUMN_PREFIX = 3;
-
-	protected static final String LABEL_CHECKBOX = ""; //$NON-NLS-1$
-	protected static final String LABEL_LOCATION_HINT = XMLUIMessages._UI_LABEL_LOCATION_HINT;
-	protected static final String LABEL_NAMESPACE_URI = XMLUIMessages._UI_LABEL_NAMESPACE_NAME;
-	protected static final String LABEL_PREFIX = XMLUIMessages._UI_LABEL_PREFIX;
-	protected List checkedList = new ArrayList();
-
-	// protected List namespaceInfoList = new ArrayList();
-	protected int[] columnIndexMap;
-	protected boolean showCheckBoxes = true;
-	private boolean showLocationText = false;
-
-	private Table table;
-	protected int visibleRows = -1;
-
-	public CommonNamespaceInfoTable(Composite parent, int visibleRows) {
-		this(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER, visibleRows, false);
-	}
-
-	// protected CellEditor getCellEditor(int column)
-	// {
-	// return (column == COLUMN_CHECKBOX) ? checkBoxCellEditor :
-	// textCellEditor;
-	// }
-
-	public CommonNamespaceInfoTable(Composite parent, int visibleRows, boolean showLocationText) {
-		this(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER, visibleRows, showLocationText);
-	}
-
-	public CommonNamespaceInfoTable(Composite parent, int style, int visibleRows) {
-		this(parent, SWT.FULL_SELECTION | SWT.MULTI | SWT.BORDER | style, visibleRows, false);
-	}
-
-	public CommonNamespaceInfoTable(Composite parent, int style, int visibleRows, boolean showLocationText) {
-		super(new Table(parent, style));
-		getTable().setLinesVisible(true);
-		this.showCheckBoxes = (style & SWT.CHECK) != 0;
-		columnIndexMap = createColumnIndexMap();
-		this.showLocationText = showLocationText;
-
-		Provider provider = new Provider();
-		setContentProvider(provider);
-		setLabelProvider(provider);
-
-		String[] columnPropertiesArray = createColumnPropertiesArray();
-		setColumnProperties(columnPropertiesArray);
-
-		table = getTable();
-		table.setHeaderVisible(true);
-		table.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-		TableLayout layout = new TableLayout();
-
-		for (int i = 0; i < columnPropertiesArray.length; i++) {
-			TableColumn column = new TableColumn(table, i);
-			if ((columnPropertiesArray[i]).equals(LABEL_LOCATION_HINT)) {
-				if (showLocationText) {
-					column.setText(columnPropertiesArray[i]);
-				}
-				else {
-					// Comment this out until we solve the alignment/(space
-					// for image being allocated
-					// to prefix column) ......
-					// column.setImage(XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_TXTEXT));
-				}
-			}
-			else {
-				column.setText(columnPropertiesArray[i]);
-			}
-			column.setAlignment(SWT.LEFT);
-			layout.addColumnData(new ColumnWeightData(getColumnWidth(i), true));
-		}
-		table.setLayout(layout);
-
-		this.visibleRows = visibleRows;
-		// for (int i = 0; i < visibleRows; i++)
-		// {
-		// TableItem item = new TableItem(table, SWT.NONE);
-		// item.setText("#######");
-		// }
-		// checkBoxCellEditor = new NamespaceInfoCheckboxCellEditor(table);
-		// textCellEditor = new TextCellEditor(table);
-
-		/*
-		 * CellEditor[] cellEditors = new
-		 * CellEditor[columnPropertiesArray.length]; for (int i = 0; i <
-		 * columnPropertiesArray.length; i++) { cellEditors[i] =
-		 * getCellEditor(i); } setCellEditors(cellEditors);
-		 */
-		// if (showCheckBoxes)
-		// {
-		// getTable().addMouseListener(new TableItemChecker());
-		// }
-	}
-
-	// protected CellEditor checkBoxCellEditor;
-	// protected CellEditor textCellEditor;
-
-	protected int[] createColumnIndexMap() {
-		int[] result = new int[showCheckBoxes ? 4 : 3];
-		int i = 0;
-		if (showCheckBoxes) {
-			result[i++] = COLUMN_CHECKBOX;
-		}
-		result[i++] = COLUMN_PREFIX;
-		result[i++] = COLUMN_NAMESPACE_URI;
-		if (!showCheckBoxes) {
-			result[i++] = COLUMN_LOCATION_HINT;
-		}
-		return result;
-	}
-
-	protected String[] createColumnPropertiesArray() {
-		String[] result = new String[3];
-		int i = 0;
-		if (showCheckBoxes) {
-			result[i++] = LABEL_CHECKBOX;
-		}
-		result[i++] = LABEL_PREFIX;
-		result[i++] = LABEL_NAMESPACE_URI;
-		if (!showCheckBoxes) {
-			result[i++] = LABEL_LOCATION_HINT;
-		}
-		return result;
-	}
-
-	protected int getColumnCode(int column) {
-		int result = 0;
-		if (column < columnIndexMap.length) {
-			result = columnIndexMap[column];
-		}
-		return result;
-	}
-
-	protected int getColumnWidth(int column) {
-		int result = 0;
-		switch (getColumnCode(column)) {
-			case COLUMN_PREFIX : {
-				result = 5;
-				break;
-			}
-			case COLUMN_NAMESPACE_URI : {
-				// Size columns differently when location hint text label is
-				// displayed
-				if (showLocationText) {
-					result = 10;
-				}
-				else {
-					result = 20;
-				}
-				break;
-			}
-			case COLUMN_CHECKBOX : {
-				result = 1; // info.locationHint;
-				break;
-			}
-			case COLUMN_LOCATION_HINT : {
-				// Size columns differently when location hint text label is
-				// displayed
-				if (showLocationText) {
-					result = 10;
-				}
-				else {
-					result = 2;
-				}
-				break;
-			}
-		}
-		return result;
-	}
-	/*
-	 * protected class NamespaceInfoCellModifier implements ICellModifier {
-	 * public NamespaceInfoCellModifier() { }
-	 * 
-	 * public boolean canModify(Object element, String property) { if
-	 * (property.equals(LABEL_CHECKBOX)) { return true; } else if
-	 * (property.equals(LABEL_PREFIX)) { return true; } return false; }
-	 * 
-	 * public Object getValue(Object element, String property) { int column =
-	 * 0; if (property.equals(LABEL_CHECKBOX)) { column = 0; } else if
-	 * (property.equals(LABEL_PREFIX)) { column = 1; } else if
-	 * (property.equals(LABEL_NAMESPACE_URI)) { column = 2; }
-	 * 
-	 * //if (element instanceof TableElement) //{ // return
-	 * provider.getColumnText(element, column); //} //else //{ // return null; // }
-	 * return "hello"; }
-	 * 
-	 * public void modify(Object element, String property, Object value) { } }
-	 * 
-	 * protected class NamespaceInfoCheckboxCellEditor extends
-	 * CheckboxCellEditor implements MouseListener { public
-	 * NamespaceInfoCheckboxCellEditor(Composite parent) { super(parent); }
-	 * 
-	 * protected void doSetValue(Object value) { }
-	 * 
-	 * public void activate() { super.activate(); deactivate();
-	 * Display.getCurrent().getFocusControl().redraw(); }
-	 * 
-	 * public void mouseDown(MouseEvent e) { if (getTable().getItem(new
-	 * Point(e.x, e.y)) != null) { } } public void mouseDoubleClick(MouseEvent
-	 * e) { } public void mouseUp(MouseEvent e) { } }
-	 */
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/perspective/XMLPerspectiveFactory.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/perspective/XMLPerspectiveFactory.java
deleted file mode 100644
index 840a0c8..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/perspective/XMLPerspectiveFactory.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 Standards for Technology in Automotive Retail
- * 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:
- *     David Carver - bug 213883 - initial api 
- *     IBM Corporation - bug 271619 - Move and rename XML perspective definition
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.perspective;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-
-/**
- * @author dcarver
- * 
- */
-public class XMLPerspectiveFactory implements IPerspectiveFactory {
-
-//	private static final String SEARCH_VIEW_ID = "org.eclipse.search.ui.views.SearchView"; //$NON-NLS-1$
-//	private static final String XPATH_VIEW_ID = "org.eclipse.wst.xml.views.XPathView"; //$NON-NLS-1$
-//	private static final String SNIPPETS_VIEW_ID = "org.eclipse.wst.common.snippets.internal.ui.SnippetsView"; //$NON-NLS-1$
-//	private static final String TEXTEDITOR_TEMPLATES_VIEW_ID = "org.eclipse.ui.texteditor.TemplatesView"; //$NON-NLS-1$
-//	private static final String ID_CONSOLE_VIEW = "org.eclipse.ui.console.ConsoleView"; //$NON-NLS-1$
-
-	/**
-	 * Creates the initial layout. This is what the layout is reset to when
-	 * the Reset Perspective is selected. It takes as input a IPageLayout
-	 * object.
-	 * 
-	 * @param layout
-	 */
-	public void createInitialLayout(IPageLayout layout) {
-		// Get the Editor Area
-//		String editorArea = layout.getEditorArea();
-
-		// Turn on the Editor Area
-		layout.setEditorAreaVisible(true);
-		layout.setFixed(false);
-
-		// Create the areas of the layout with their initial views
-//		IFolderLayout left = layout.createFolder("left", IPageLayout.LEFT, (float) 0.23, editorArea); //$NON-NLS-1$
-//		left.addView(IPageLayout.ID_PROJECT_EXPLORER);
-//
-//		IFolderLayout bottomLeft = layout.createFolder("bottom-left", IPageLayout.BOTTOM, (float) 0.50, "left"); //$NON-NLS-1$ //$NON-NLS-2$
-//		bottomLeft.addView(XPATH_VIEW_ID); //$NON-NLS-1$
-//
-//		IFolderLayout right = layout.createFolder("right", IPageLayout.RIGHT, (float) 0.70, editorArea); //$NON-NLS-1$
-//		right.addView(IPageLayout.ID_OUTLINE);
-//		
-//		IFolderLayout bottomRight = layout.createFolder("bottom-right", IPageLayout.BOTTOM, (float) 0.60, "right"); //$NON-NLS-1$//$NON-NLS-2$
-//		bottomRight.addView(TEXTEDITOR_TEMPLATES_VIEW_ID);
-//
-//		IFolderLayout bottom = layout.createFolder("bottom", IPageLayout.BOTTOM, (float) 0.75, editorArea); //$NON-NLS-1$
-//		bottom.addView(IPageLayout.ID_PROBLEM_VIEW);
-//		bottom.addView(IPageLayout.ID_PROP_SHEET);
-//		bottom.addView(ID_CONSOLE_VIEW);
-//		bottom.addView(SNIPPETS_VIEW_ID);
-//
-//		bottom.addPlaceholder(SEARCH_VIEW_ID);
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/EmptyFilePreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/EmptyFilePreferencePage.java
deleted file mode 100644
index 9870632..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/EmptyFilePreferencePage.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-public class EmptyFilePreferencePage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	private Composite createComposite(Composite parent, int numColumns) {
-		noDefaultAndApplyButton();
-
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData(GridData.FILL);
-		data.horizontalIndent = 0;
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		composite.setLayoutData(data);
-
-		return composite;
-	}
-
-	protected Control createContents(Composite parent) {
-		Composite composite = createScrolledComposite(parent);
-
-		String description = XMLUIMessages.EmptyFilePreferencePage_0; 
-		Text text = new Text(composite, SWT.READ_ONLY);
-		// some themes on GTK have different background colors for Text and Labels
-		text.setBackground(composite.getBackground());
-		text.setText(description);
-
-		setSize(composite);
-		return composite;
-	}
-
-	private Composite createScrolledComposite(Composite parent) {
-		// create scrollbars for this parent when needed
-		final ScrolledComposite sc1 = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
-		sc1.setLayoutData(new GridData(GridData.FILL_BOTH));
-		Composite composite = createComposite(sc1, 1);
-		sc1.setContent(composite);
-
-		// not calling setSize for composite will result in a blank composite,
-		// so calling it here initially
-		// setSize actually needs to be called after all controls are created,
-		// so scrolledComposite
-		// has correct minSize
-		setSize(composite);
-		return composite;
-	}
-
-	public void init(IWorkbench workbench) {
-	}
-
-	private void setSize(Composite composite) {
-		if (composite != null) {
-			// Note: The font is set here in anticipation that the class inheriting
-			//       this base class may add widgets to the dialog.   setSize
-			//       is assumed to be called just before we go live.
-			applyDialogFont(composite);
-			Point minSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-			composite.setSize(minSize);
-			// set scrollbar composite's min size so page is expandable but
-			// has scrollbars when needed
-			if (composite.getParent() instanceof ScrolledComposite) {
-				ScrolledComposite sc1 = (ScrolledComposite) composite.getParent();
-				sc1.setMinSize(minSize);
-				sc1.setExpandHorizontal(true);
-				sc1.setExpandVertical(true);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/EncodingSettings.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/EncodingSettings.java
deleted file mode 100644
index 16fa130..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/EncodingSettings.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * EncodingSettings is a composite that can be used to display the set of
- * encoding values that are available to the user. The list of encoding values
- * is based off the SupportedJavaEncoding class. As the user selects an
- * encoding from the combo box, the readonly field below it changes to show
- * the IANA tag for that particular encoding description. The labels for the
- * widgets are configurable and the initial value to display to the user can
- * be set using the setIANATag(). The currently selected entry's IANA tag can
- * be retrieved with getIANATag(). Entries displayed to the user can be added
- * and removed.
- */
-public class EncodingSettings extends Composite {
-
-	private class ComboListener implements ModifyListener {
-		public void modifyText(ModifyEvent e) {
-			int i = encodingCombo.getSelectionIndex();
-			if ((i >= 0) && (i < ianaVector.size())) {
-				ianaText.setText((String) (ianaVector.elementAt(encodingCombo.getSelectionIndex())));
-			}
-		}
-	}
-
-	private static String ENCODING_LABEL = XMLUIMessages.EncodingSettings_1;
-
-	private static String IANA_LABEL = XMLUIMessages.EncodingSettings_0;
-
-	private ModifyListener comboListener = new ComboListener();
-	protected Combo encodingCombo;
-	protected Label encodingLabel, ianaLabel;
-	protected Text ianaText;
-	protected Vector ianaVector;
-
-	/**
-	 * Method EncodingSettings.
-	 * 
-	 * @param parent
-	 */
-	public EncodingSettings(Composite parent) {
-		super(parent, SWT.NONE);
-		init(IANA_LABEL, ENCODING_LABEL);
-	}
-
-	/**
-	 * Method EncodingSettings.
-	 * 
-	 * @param parent
-	 * @param encodingLabel -
-	 *            text label to use beside the locale sensitive description of
-	 *            the currently selected encoding
-	 */
-	public EncodingSettings(Composite parent, String encodingLabel) {
-		super(parent, SWT.NONE);
-		init(IANA_LABEL, encodingLabel);
-	}
-
-	/**
-	 * Method EncodingSettings.
-	 * 
-	 * @param parent
-	 * @param ianaLabel =
-	 *            text label to use beside the display only IANA field
-	 * @param encodingLabel -
-	 *            text label to use beside the locale sensitive description of
-	 *            the currently selected encoding
-	 */
-	public EncodingSettings(Composite parent, String ianaLabel, String encodingLabel) {
-		super(parent, SWT.NONE);
-		init(ianaLabel, encodingLabel);
-	}
-
-	/**
-	 * Method addEntry. Add an entry to the end of the Encoding Combobox
-	 * 
-	 * @param description -
-	 *            encoding description to display
-	 * @param ianaTag -
-	 *            IANA tag for the description
-	 */
-	public void addEntry(String description, String ianaTag) {
-		encodingCombo.add(description);
-		ianaVector.add(ianaTag);
-	}
-
-	/**
-	 * Method addEntry. Add an entry to the Encoding Combobox at index index
-	 * 
-	 * @param description -
-	 *            encoding description to display
-	 * @param ianaTag -
-	 *            IANA tag for the description
-	 * @param index -
-	 *            index into the combo to add to
-	 */
-	public void addEntry(String description, String ianaTag, int index) {
-		if (index == ianaVector.size()) {
-			// just add to the end
-			addEntry(description, ianaTag);
-			return;
-		}
-
-		if ((0 <= index) && (index < ianaVector.size())) {
-			encodingCombo.add(description, index);
-			ianaVector.add(index, ianaTag);
-		}
-	}
-
-	protected Combo createComboBox(Composite parent, boolean isReadOnly) {
-		int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
-		Combo combo = new Combo(parent, style);
-
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		combo.setLayoutData(data);
-		return combo;
-	}
-
-	/**
-	 * Helper method for creating labels.
-	 */
-	protected Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.LEFT);
-		label.setText(text);
-
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		label.setLayoutData(data);
-		return label;
-	}
-
-	protected Text createTextField(Composite parent, int width) {
-		Text text = new Text(parent, SWT.SINGLE | SWT.READ_ONLY);
-
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.widthHint = width;
-		text.setLayoutData(data);
-
-		text.setBackground(text.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-		return text;
-	}
-
-	/**
-	 * @see org.eclipse.swt.widgets.Widget#dispose()
-	 */
-	public void dispose() {
-		encodingCombo.removeModifyListener(comboListener);
-		super.dispose();
-	}
-
-	private void fillCombo() {
-		try {
-			String[] ianaTags = CommonCharsetNames.getCommonCharsetNames();
-			int totalNum = ianaTags.length;
-			for (int i = 0; i < totalNum; i++) {
-				String iana = ianaTags[i];
-				String enc = CommonCharsetNames.getDisplayString(iana);
-
-				if (enc != null) {
-					encodingCombo.add(enc);
-				}
-				else {
-					Logger.log(Logger.WARNING, "CommonCharsetNames.getDisplayString(" + iana + ") returned null"); //$NON-NLS-1$ //$NON-NLS-2$
-					encodingCombo.add(iana);
-				}
-				ianaVector.add(iana);
-			}
-		}
-		catch (Exception e) {
-			// e.printStackTrace();
-			// MessageDialog.openError(getShell(), "Resource exception",
-			// "Unable to obtain encoding strings. Check resource file");
-			// XMLEncodingPlugin.getPlugin().getMsgLogger().write(e.toString());
-			// XMLEncodingPlugin.getPlugin().getMsgLogger().writeCurrentThread();
-			Logger.log(Logger.ERROR, "Exception", e); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * <code>getEncoding</code> Get the descriptive encoding name that was
-	 * selected.
-	 * 
-	 * @return a <code>String</code> value
-	 */
-	public String getEncoding() {
-		return encodingCombo.getText();
-	}
-
-	/**
-	 * Method getEncodingCombo. Returns the combo used to display the encoding
-	 * descriptions.
-	 * 
-	 * @return Combo
-	 */
-	public Combo getEncodingCombo() {
-		return encodingCombo;
-	}
-
-	/**
-	 * <code>getIANATag</code> Get the IANA tag equivalent of the selected
-	 * descriptive encoding name
-	 * 
-	 * @return a <code>String</code> value
-	 */
-	public String getIANATag() {
-		int i = encodingCombo.getSelectionIndex();
-		if (i >= 0) {
-			return (String) (ianaVector.elementAt(i));
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	protected void init(String ianaLabelStr, String encodingLabelStr) {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 2;
-		setLayout(layout);
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		setLayoutData(data);
-
-		encodingLabel = createLabel(this, encodingLabelStr);
-		encodingCombo = createComboBox(this, true);
-		ianaLabel = createLabel(this, ianaLabelStr);
-		ianaText = createTextField(this, 20);
-		ianaVector = new Vector();
-
-		fillCombo();
-		resetToDefaultEncoding();
-		encodingCombo.addModifyListener(comboListener);
-	}
-
-	/**
-	 * <code>isEncodingInList</code> Checks whether the encoding name is in
-	 * the combo
-	 * 
-	 * @param enc
-	 *            a <code>string</code> value. The encoding name.
-	 * @return a <code>boolean</code> value. TRUE if encoding is in list.
-	 *         FALSE if encoding is not in list.
-	 */
-	public boolean isEncodingInList(String enc) {
-		int i = encodingCombo.indexOf(enc);
-		if (i >= 0) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * <code>isIANATagInList</code> Checks whether the IANA tag is in the
-	 * combo
-	 * 
-	 * @param ianaTag
-	 *            a <code>string</code> value. The IANA tag.
-	 * @return a <code>boolean</code> value. TRUE if tag is in list. FALSE
-	 *         if tag is not in list.
-	 */
-	public boolean isIANATagInList(String ianaTag) {
-		int i = ianaVector.indexOf(ianaTag);
-		if (i >= 0) {
-			return true;
-		}
-		return false;
-	}
-
-	/**
-	 * Method removeEntry. Removes both the description and the IANA tag at
-	 * the specified index
-	 * 
-	 * @param index
-	 */
-	public void removeEntry(int index) {
-		if ((0 <= index) && (index < ianaVector.size())) {
-			encodingCombo.remove(index);
-			ianaVector.remove(index);
-		}
-	}
-
-	/**
-	 * Method resetToDefaultEncoding. Reset the control to the default
-	 * encoding. Currently UTF-8
-	 */
-	public void resetToDefaultEncoding() {
-		String defaultIANATag = "UTF-8"; //$NON-NLS-1$
-		ianaText.setText(defaultIANATag);
-		setIANATag(defaultIANATag);
-	}
-
-	/**
-	 * Method setEnabled. Enable/disable the EncodingSettings composite.
-	 * 
-	 * @param enabled
-	 */
-	public void setEnabled(boolean enabled) {
-		encodingCombo.setEnabled(enabled);
-		encodingLabel.setEnabled(enabled);
-		ianaLabel.setEnabled(enabled);
-		ianaText.setEnabled(enabled);
-	}
-
-	/**
-	 * <code>setEncoding</code> Set the selection in the combo to the
-	 * descriptive encoding name.
-	 * 
-	 * @param enc
-	 *            a <code>string</code> value. Note this is not the IANA
-	 *            tag.
-	 */
-	public void setEncoding(String enc) {
-		encodingCombo.setText(enc);
-		encodingCombo.select(encodingCombo.indexOf(enc));
-	}
-
-	/**
-	 * <code>setIANATag</code> Set the IANA tag for the combo
-	 * 
-	 * @param ianaTag
-	 *            a <code>string</code> value. The IANA tag.
-	 */
-	public void setIANATag(String ianaTag) {
-		int i = ianaVector.indexOf(ianaTag);
-		if (i >= 0) {
-			encodingCombo.select(i);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/WorkbenchDefaultEncodingSettings.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/WorkbenchDefaultEncodingSettings.java
deleted file mode 100644
index e7930ed..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/WorkbenchDefaultEncodingSettings.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.sse.core.internal.encoding.CommonCharsetNames;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * WorkbenchDefaultEncodingSettings is an extension of EncodingSettings. This
- * composite contains EncodingSettings for users to select the encoding they
- * desire as well as a checkbox for users to select to use the default
- * workbench encoding instead.
- * 
- * @see org.eclipse.wst.xml.ui.internal.preferences.EncodingSettings
- */
-public class WorkbenchDefaultEncodingSettings extends Composite {
-
-	private final static int INDENT = 15;
-	private static final String WORKBENCH_DEFAULT = ""; //$NON-NLS-1$
-	private EncodingSettings fEncodingSettings;
-	private String fNonDefaultIANA = null;
-	private Button fUseDefaultButton;
-
-	public WorkbenchDefaultEncodingSettings(Composite parent) {
-		super(parent, SWT.NONE);
-		createControls();
-	}
-
-	private void createControls() {
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.marginWidth = 0;
-		setLayout(layout);
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		setLayoutData(data);
-
-		Composite defaultEncodingComposite = new Composite(this, SWT.NONE);
-		layout = new GridLayout();
-		layout.marginWidth = 0;
-		layout.marginHeight = 0;
-		data = new GridData(GridData.FILL_BOTH);
-		defaultEncodingComposite.setLayout(layout);
-		defaultEncodingComposite.setLayoutData(data);
-
-		fUseDefaultButton = new Button(defaultEncodingComposite, SWT.CHECK);
-		fUseDefaultButton.setText(XMLUIMessages.WorkbenchDefaultEncodingSettings_0);
-
-		fUseDefaultButton.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				handleUseDefaultButtonSelected();
-			}
-		});
-
-		fEncodingSettings = new EncodingSettings(this);
-		((GridLayout) fEncodingSettings.getLayout()).marginWidth = 0;
-		((GridData) fEncodingSettings.getLayoutData()).horizontalIndent = INDENT;
-
-	}
-
-	private Combo getEncodingCombo() {
-		return fEncodingSettings.getEncodingCombo();
-	}
-
-	/**
-	 * <code>getIANATag</code> Get the IANA tag equivalent of the selected
-	 * descriptive encoding name. Returns empty string if using workbench
-	 * encoding.
-	 * 
-	 * @return a <code>String</code> value
-	 */
-	public String getIANATag() {
-		if (!isDefault()) {
-			return fEncodingSettings.getIANATag();
-		}
-		return WORKBENCH_DEFAULT;
-	}
-
-	private String getWorkbenchEncoding() {
-		return ResourcesPlugin.getEncoding();
-	}
-
-	void handleUseDefaultButtonSelected() {
-		if (fUseDefaultButton.getSelection()) {
-			fNonDefaultIANA = fEncodingSettings.getIANATag();
-			String workbenchValue = getWorkbenchEncoding();
-			workbenchValue = CommonCharsetNames.getIanaPreferredCharsetName(workbenchValue);
-			fEncodingSettings.setIANATag(workbenchValue);
-		}
-		else if (fNonDefaultIANA != null) {
-			fEncodingSettings.setIANATag(fNonDefaultIANA);
-		}
-		getEncodingCombo().setEnabled(!fUseDefaultButton.getSelection());
-		fEncodingSettings.setEnabled(!fUseDefaultButton.getSelection());
-	}
-
-	private boolean isDefault() {
-		return fUseDefaultButton.getSelection();
-	}
-
-	/**
-	 * <code>setEncoding</code> Set the selection in the combo to the
-	 * descriptive encoding name. Selects use workbench encoding if ianaTag is
-	 * null or empty string.
-	 * 
-	 */
-	public void setIANATag(String ianaTag) {
-		if ((ianaTag == null) || ianaTag.equals(WORKBENCH_DEFAULT)) {
-			fUseDefaultButton.setSelection(true);
-			handleUseDefaultButtonSelected();
-		}
-		else {
-			fUseDefaultButton.setSelection(false);
-			handleUseDefaultButtonSelected();
-			if (!isDefault()) {
-				fEncodingSettings.setIANATag(ianaTag);
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLColorPage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLColorPage.java
deleted file mode 100644
index 4f29d75..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLColorPage.java
+++ /dev/null
@@ -1,288 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference 
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractColorPage;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.StyledTextColorPicker;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-/**
- * @deprecated
- */
-public class XMLColorPage extends AbstractColorPage {
-
-	protected Control createContents(Composite parent) {
-		Composite pageComponent = createComposite(parent, 1);
-		((GridData) pageComponent.getLayoutData()).horizontalAlignment = GridData.HORIZONTAL_ALIGN_FILL;
-
-		super.createContents(pageComponent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.XML_PREFWEBX_STYLES_HELPID);
-		return pageComponent;
-	}
-
-	/**
-	 * Set up all the style preference keys in the overlay store
-	 */
-	protected OverlayKey[] createOverlayStoreKeys() {
-		ArrayList overlayKeys = new ArrayList();
-
-		ArrayList styleList = new ArrayList();
-		initStyleList(styleList);
-		Iterator i = styleList.iterator();
-		while (i.hasNext()) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String) i.next()));
-		}
-
-		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return keys;
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	public String getSampleText() {
-		return XMLUIMessages.Sample_XML_doc; // = "<?xml
-		// version=\"1.0\"?>\n<?customProcessingInstruction\n\tXML
-		// processor
-		// specific\n\tcontent
-		// ?>\n<!DOCTYPE
-		// colors\n\tPUBLIC
-		// \"//IBM/XML/COLORS/\"
-		// \"colors.dtd\">\n<colors>\n\t<!--
-		// begin color definitions
-		// -->\n\t<color
-		// name=\"plaintext\"
-		// foreground=\"#000000\"\n\t\tbackground=\"#D4D0C8\"/>\n\t<color
-		// name=\"bold\"
-		// foreground=\"#000000\"\n\t\tbackground=\"#B3ACA0\">\n\t<![CDATA[<123456789>]]>\n\tNormal
-		// text content.\n\t<color
-		// name=\"inverse\"
-		// foreground=\"#F0F0F0\"\n\t\tbackground=\"#D4D0C8\"/>\n\n</colors>\n";
-	}
-
-	protected void initCommonContextStyleMap(Dictionary contextStyleMap) {
-
-		contextStyleMap.put(DOMRegionContext.XML_COMMENT_OPEN, IStyleConstantsXML.COMMENT_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_COMMENT_TEXT, IStyleConstantsXML.COMMENT_TEXT);
-		contextStyleMap.put(DOMRegionContext.XML_COMMENT_CLOSE, IStyleConstantsXML.COMMENT_BORDER);
-
-		contextStyleMap.put(DOMRegionContext.XML_TAG_OPEN, IStyleConstantsXML.TAG_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_END_TAG_OPEN, IStyleConstantsXML.TAG_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_TAG_NAME, IStyleConstantsXML.TAG_NAME);
-		contextStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		contextStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		contextStyleMap.put(DOMRegionContext.XML_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_EMPTY_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER);
-
-		contextStyleMap.put(DOMRegionContext.XML_DECLARATION_OPEN, IStyleConstantsXML.DECL_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_ELEMENT_DECLARATION, IStyleConstantsXML.DECL_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_CLOSE, IStyleConstantsXML.DECL_BORDER);
-
-		contextStyleMap.put(DOMRegionContext.XML_CHAR_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-		contextStyleMap.put(DOMRegionContext.XML_ENTITY_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-		contextStyleMap.put(DOMRegionContext.XML_PE_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-
-		contextStyleMap.put(DOMRegionContext.XML_CONTENT, IStyleConstantsXML.XML_CONTENT);
-	}
-
-	protected void initCommonDescriptions(Dictionary descriptions) {
-
-		// create descriptions for hilighting types
-		descriptions.put(IStyleConstantsXML.COMMENT_BORDER, XMLUIMessages.Comment_Delimiters_UI_); // =
-		// "Comment
-		// Delimiters"
-		descriptions.put(IStyleConstantsXML.COMMENT_TEXT, XMLUIMessages.Comment_Content_UI_); // =
-		// "Comment
-		// Content"
-		descriptions.put(IStyleConstantsXML.TAG_BORDER, XMLUIMessages.Tag_Delimiters_UI_); // =
-		// "Tag
-		// Delimiters"
-		descriptions.put(IStyleConstantsXML.TAG_NAME, XMLUIMessages.Tag_Names_UI_); // =
-		// "Tag
-		// Names"
-		descriptions.put(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, XMLUIMessages.Attribute_Names_UI_); // =
-		// "Attribute
-		// Names"
-		descriptions.put(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, XMLUIMessages.Attribute_Values_UI_); // =
-		// "Attribute
-		// Values"
-		descriptions.put(IStyleConstantsXML.DECL_BORDER, XMLUIMessages.Declaration_Delimiters_UI_); // =
-		// "Declaration
-		// Delimiters"
-		descriptions.put(IStyleConstantsXML.XML_CONTENT, XMLUIMessages.Content_UI_); // =
-		// "Content"
-		descriptions.put(IStyleConstantsXML.ENTITY_REFERENCE, XMLUIMessages.Entity_Reference_UI_); //$NON-NLS-1$ = "Entity References"
-	}
-
-	protected void initCommonStyleList(ArrayList list) {
-
-		// list.add(IStyleConstantsXML.CDATA_BORDER);
-		// list.add(IStyleConstantsXML.CDATA_TEXT);
-		// list.add(IStyleConstantsXML.PI_BORDER);
-		// list.add(IStyleConstantsXML.PI_CONTENT);
-
-		list.add(IStyleConstantsXML.TAG_BORDER);
-		list.add(IStyleConstantsXML.TAG_NAME);
-		list.add(IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		list.add(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		list.add(IStyleConstantsXML.COMMENT_BORDER);
-		list.add(IStyleConstantsXML.COMMENT_TEXT);
-		list.add(IStyleConstantsXML.DECL_BORDER);
-		list.add(IStyleConstantsXML.XML_CONTENT);
-		list.add(IStyleConstantsXML.ENTITY_REFERENCE);
-	}
-
-	protected void initContextStyleMap(Dictionary contextStyleMap) {
-
-		initCommonContextStyleMap(contextStyleMap);
-		initDocTypeContextStyleMap(contextStyleMap);
-		contextStyleMap.put(DOMRegionContext.XML_CDATA_OPEN, IStyleConstantsXML.CDATA_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_CDATA_TEXT, IStyleConstantsXML.CDATA_TEXT);
-		contextStyleMap.put(DOMRegionContext.XML_CDATA_CLOSE, IStyleConstantsXML.CDATA_BORDER);
-
-		contextStyleMap.put(DOMRegionContext.XML_PI_OPEN, IStyleConstantsXML.PI_BORDER);
-		contextStyleMap.put(DOMRegionContext.XML_PI_CONTENT, IStyleConstantsXML.PI_CONTENT);
-		contextStyleMap.put(DOMRegionContext.XML_PI_CLOSE, IStyleConstantsXML.PI_BORDER);
-
-	}
-
-	protected void initDescriptions(Dictionary descriptions) {
-
-		initCommonDescriptions(descriptions);
-		initDocTypeDescriptions(descriptions);
-		descriptions.put(IStyleConstantsXML.CDATA_BORDER, XMLUIMessages.CDATA_Delimiters_UI_); // =
-		// "CDATA
-		// Delimiters"
-		descriptions.put(IStyleConstantsXML.CDATA_TEXT, XMLUIMessages.CDATA_Content_UI_); // =
-		// "CDATA
-		// Content"
-		descriptions.put(IStyleConstantsXML.PI_BORDER, XMLUIMessages.Processing_Instruction_Del_UI_); // =
-		// "Processing
-		// Instruction
-		// Delimiters"
-		descriptions.put(IStyleConstantsXML.PI_CONTENT, XMLUIMessages.Processing_Instruction_Con_UI__UI_); // =
-		// "Processing
-		// Instruction
-		// Content"
-	}
-
-	protected void initDocTypeContextStyleMap(Dictionary contextStyleMap) {
-
-		contextStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_NAME, IStyleConstantsXML.DOCTYPE_NAME);
-		contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION, IStyleConstantsXML.TAG_NAME);
-		contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER);
-
-		contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_NAME, IStyleConstantsXML.DOCTYPE_NAME);
-		contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-		contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		contextStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-	}
-
-	protected void initDocTypeDescriptions(Dictionary descriptions) {
-
-		// create descriptions for hilighting types for DOCTYPE related items
-		descriptions.put(IStyleConstantsXML.DOCTYPE_NAME, XMLUIMessages.DOCTYPE_Name_UI_); // =
-		// "DOCTYPE
-		// Name"
-		descriptions.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, XMLUIMessages.DOCTYPE_SYSTEM_PUBLIC_Keyw_UI_); // =
-		// "DOCTYPE
-		// SYSTEM/PUBLIC
-		// Keyword"
-		descriptions.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, XMLUIMessages.DOCTYPE_Public_Reference_UI_); // =
-		// "DOCTYPE
-		// Public
-		// Reference"
-		descriptions.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, XMLUIMessages.DOCTYPE_System_Reference_UI_); // =
-		// "DOCTYPE
-		// System
-		// Reference"
-	}
-
-	protected void initDocTypeStyleList(ArrayList list) {
-
-		list.add(IStyleConstantsXML.DOCTYPE_NAME);
-		list.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		list.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-		list.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-	}
-
-	protected void initStyleList(ArrayList list) {
-		initCommonStyleList(list);
-		initDocTypeStyleList(list);
-		list.add(IStyleConstantsXML.CDATA_BORDER);
-		list.add(IStyleConstantsXML.CDATA_TEXT);
-		list.add(IStyleConstantsXML.PI_BORDER);
-		list.add(IStyleConstantsXML.PI_CONTENT);
-	}
-
-	public boolean performOk() {
-		// required since the superclass *removes* existing preferences before
-		// saving its own
-		super.performOk();
-
-		SSEUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	protected void setupPicker(StyledTextColorPicker picker) {
-		IModelManager mmanager = StructuredModelManager.getModelManager();
-		picker.setParser(mmanager.createStructuredDocumentFor(ContentTypeIdForXML.ContentTypeID_XML).getParser());
-
-		Dictionary descriptions = new Hashtable();
-		initDescriptions(descriptions);
-
-		Dictionary contextStyleMap = new Hashtable();
-		initContextStyleMap(contextStyleMap);
-
-		ArrayList styleList = new ArrayList();
-		initStyleList(styleList);
-
-		picker.setContextStyleMap(contextStyleMap);
-		picker.setDescriptions(descriptions);
-		picker.setStyleList(styleList);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.preferences.ui.AbstractColorPage#savePreferences()
-	 */
-	protected void savePreferences() {
-		XMLUIPlugin.getDefault().savePluginPreferences();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLFilesPreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLFilesPreferencePage.java
deleted file mode 100644
index 8a19fca..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLFilesPreferencePage.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-
-public class XMLFilesPreferencePage extends AbstractPreferencePage {
-	protected EncodingSettings fEncodingSettings = null;
-
-	private Combo fDefaultSuffix;
-	private List fValidExtensions;
-
-	protected Control createContents(Composite parent) {
-		Composite composite = (Composite) super.createContents(parent);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.XML_PREFWEBX_FILES_HELPID);
-		createContentsForCreatingGroup(composite);
-
-		setSize(composite);
-		loadPreferences();
-
-		return composite;
-	}
-
-	protected void createContentsForCreatingGroup(Composite parent) {
-		Group creatingGroup = createGroup(parent, 2);
-		creatingGroup.setText(XMLUIMessages.Creating_files);
-
-		// Default extension for New file Wizard
-		createLabel(creatingGroup, XMLUIMessages.XMLFilesPreferencePage_ExtensionLabel);
-		fDefaultSuffix = createDropDownBox(creatingGroup);
-		String[] validExtensions = (String[]) getValidExtensions().toArray(new String[0]);
-		Arrays.sort(validExtensions);
-		fDefaultSuffix.setItems(validExtensions);
-		fDefaultSuffix.addSelectionListener(this);
-
-		Label label = createLabel(creatingGroup, XMLUIMessages.Encoding_desc);
-		((GridData) label.getLayoutData()).horizontalSpan = 2;
-		fEncodingSettings = new EncodingSettings(creatingGroup, XMLUIMessages.Encoding);
-		((GridData) fEncodingSettings.getLayoutData()).horizontalSpan = 2;
-	}
-
-	public void dispose() {
-		fDefaultSuffix.removeModifyListener(this);
-		super.dispose();
-	}
-
-	protected void doSavePreferenceStore() {
-		XMLCorePlugin.getDefault().savePluginPreferences(); // model
-	}
-
-	/**
-	 * Get content type associated with this new file wizard
-	 * 
-	 * @return IContentType
-	 */
-	protected IContentType getContentType() {
-		return Platform.getContentTypeManager().getContentType(ContentTypeIdForXML.ContentTypeID_XML);
-	}
-
-	/**
-	 * Get list of valid extensions
-	 * 
-	 * @return List
-	 */
-	private List getValidExtensions() {
-		if (fValidExtensions == null) {
-			IContentType type = getContentType();
-			fValidExtensions = new ArrayList(Arrays.asList(type.getFileSpecs(IContentType.FILE_EXTENSION_SPEC)));
-		}
-		return fValidExtensions;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.preferences.ui.AbstractPreferencePage#getModelPreferences()
-	 */
-	protected Preferences getModelPreferences() {
-		return XMLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	protected void initializeValues() {
-		initializeValuesForCreatingGroup();
-	}
-
-	protected void initializeValuesForCreatingGroup() {
-		String suffix = getModelPreferences().getString(XMLCorePreferenceNames.DEFAULT_EXTENSION);
-		fDefaultSuffix.setText(suffix);
-
-		String encoding = getModelPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-
-		fEncodingSettings.setIANATag(encoding);
-	}
-
-	protected void performDefaults() {
-		performDefaultsForCreatingGroup();
-
-		super.performDefaults();
-	}
-
-	protected void performDefaultsForCreatingGroup() {
-		String suffix = getModelPreferences().getDefaultString(XMLCorePreferenceNames.DEFAULT_EXTENSION);
-		fDefaultSuffix.setText(suffix);
-
-		String encoding = getModelPreferences().getDefaultString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-
-		fEncodingSettings.setIANATag(encoding);
-		// fEncodingSettings.resetToDefaultEncoding();
-	}
-
-	public boolean performOk() {
-		boolean result = super.performOk();
-
-		doSavePreferenceStore();
-
-		return result;
-	}
-
-	protected void storeValues() {
-		storeValuesForCreatingGroup();
-	}
-
-	protected void storeValuesForCreatingGroup() {
-		String suffix = fDefaultSuffix.getText();
-		getModelPreferences().setValue(XMLCorePreferenceNames.DEFAULT_EXTENSION, suffix);
-
-		getModelPreferences().setValue(CommonEncodingPreferenceNames.OUTPUT_CODESET, fEncodingSettings.getIANATag());
-	}
-
-	protected void validateValues() {
-		boolean isValid = false;
-		Iterator i = getValidExtensions().iterator();
-		while (i.hasNext() && !isValid) {
-			String extension = (String) i.next();
-			isValid = extension.equalsIgnoreCase(fDefaultSuffix.getText());
-		}
-
-		if (!isValid) {
-			setErrorMessage(NLS.bind(XMLUIMessages.XMLFilesPreferencePage_ExtensionError, getValidExtensions().toString()));
-			setValid(false);
-		}
-		else {
-			setErrorMessage(null);
-			setValid(true);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLSourcePreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLSourcePreferencePage.java
deleted file mode 100644
index 8ced8d7..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLSourcePreferencePage.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-
-public class XMLSourcePreferencePage extends AbstractPreferencePage implements ModifyListener, SelectionListener, IWorkbenchPreferencePage {
-	private final int MIN_INDENTATION_SIZE = 0;
-	private final int MAX_INDENTATION_SIZE = 16;
-
-	// Content Assist
-	protected Button fAutoPropose;
-	protected Label fAutoProposeLabel;
-	protected Text fAutoProposeText;
-	private Combo fSuggestionStrategyCombo;
-	private Vector fSuggestionStrategies = null;
-	protected Button fClearAllBlankLines;
-
-	// Formatting
-	protected Label fLineWidthLabel;
-	protected Text fLineWidthText;
-	protected Button fSplitMultiAttrs;
-	private Button fIndentUsingTabs;
-	private Button fIndentUsingSpaces;
-	private Spinner fIndentationSize;
-	private Button fPreservePCDATAContent;
-	private Button fAlignEndBracket;
-	// BUG195264 - Support for removing/adding a space before empty close tags
-	private Button fSpaceBeforeEmptyCloseTag;
-
-	// grammar constraints
-	protected Button fUseInferredGrammar;
-
-	protected Control createContents(Composite parent) {
-		final Composite composite = super.createComposite(parent, 1);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.XML_PREFWEBX_SOURCE_HELPID);
-
-		new PreferenceLinkArea(composite, SWT.WRAP | SWT.MULTI, "org.eclipse.wst.sse.ui.preferences.editor", XMLUIMessages._UI_STRUCTURED_TEXT_EDITOR_PREFS_LINK,//$NON-NLS-1$
-					(IWorkbenchPreferenceContainer) getContainer(), null).getControl().setLayoutData(GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).create());
-		new Label(composite, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().create());
-
-		createContentsForFormattingGroup(composite);
-		createContentsForContentAssistGroup(composite);
-		createContentsForGrammarConstraintsGroup(composite);
-		setSize(composite);
-		loadPreferences();
-
-		return composite;
-	}
-
-	protected void createContentsForContentAssistGroup(Composite parent) {
-		Group contentAssistGroup = createGroup(parent, 2);
-		contentAssistGroup.setText(XMLUIMessages.Content_assist_UI_);
-
-		fAutoPropose = createCheckBox(contentAssistGroup, XMLUIMessages.Automatically_make_suggest_UI_);
-		((GridData) fAutoPropose.getLayoutData()).horizontalSpan = 2;
-		fAutoPropose.addSelectionListener(this);
-
-		fAutoProposeLabel = createLabel(contentAssistGroup, XMLUIMessages.Prompt_when_these_characte_UI_);
-		fAutoProposeText = createTextField(contentAssistGroup);
-
-		createLabel(contentAssistGroup, XMLUIMessages.Suggestion_Strategy);
-		fSuggestionStrategyCombo = new Combo(contentAssistGroup, SWT.READ_ONLY);
-		fSuggestionStrategies = new Vector();
-		fSuggestionStrategyCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-		fSuggestionStrategyCombo.add(XMLUIMessages.Suggestion_Strategy_Lax);
-		fSuggestionStrategies.add(XMLUIPreferenceNames.SUGGESTION_STRATEGY_VALUE_LAX);
-		fSuggestionStrategyCombo.add(XMLUIMessages.Suggestion_Strategy_Strict);
-		fSuggestionStrategies.add(XMLUIPreferenceNames.SUGGESTION_STRATEGY_VALUE_STRICT);
-	}
-
-	protected void createContentsForFormattingGroup(Composite parent) {
-		Group formattingGroup = createGroup(parent, 2);
-		formattingGroup.setText(XMLUIMessages.Formatting_UI_);
-
-		fLineWidthLabel = createLabel(formattingGroup, XMLUIMessages.Line_width__UI_);
-		fLineWidthText = new Text(formattingGroup, SWT.SINGLE | SWT.BORDER);
-		GridData gData = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.BEGINNING);
-		gData.widthHint = 25;
-		fLineWidthText.setLayoutData(gData);
-		fLineWidthText.addModifyListener(this);
-
-		fSplitMultiAttrs = createCheckBox(formattingGroup, XMLUIMessages.Split_multiple_attributes);
-		((GridData) fSplitMultiAttrs.getLayoutData()).horizontalSpan = 2;
-		fAlignEndBracket = createCheckBox(formattingGroup, XMLUIMessages.Align_final_bracket);
-		((GridData) fAlignEndBracket.getLayoutData()).horizontalSpan = 2;
-		fPreservePCDATAContent = createCheckBox(formattingGroup, XMLUIMessages.Preserve_PCDATA_Content);
-		((GridData) fPreservePCDATAContent.getLayoutData()).horizontalSpan = 2;
-		fClearAllBlankLines = createCheckBox(formattingGroup, XMLUIMessages.Clear_all_blank_lines_UI_);
-		((GridData) fClearAllBlankLines.getLayoutData()).horizontalSpan = 2;
-		fSpaceBeforeEmptyCloseTag = createCheckBox(formattingGroup, XMLUIMessages.Space_before_empty_close_tag);
-		((GridData) fSpaceBeforeEmptyCloseTag.getLayoutData()).horizontalSpan = 2;
-
-		// [269224] - Place the indent controls in their own composite for proper tab ordering
-		Composite indentComposite = createComposite(formattingGroup, 1);
-		((GridData) indentComposite.getLayoutData()).horizontalSpan = 2;
-		((GridLayout) indentComposite.getLayout()).marginWidth = 0;
-		((GridLayout) indentComposite.getLayout()).marginHeight = 0;
-
-		fIndentUsingTabs = createRadioButton(indentComposite, XMLUIMessages.Indent_using_tabs);
-		((GridData) fIndentUsingTabs.getLayoutData()).horizontalSpan = 1;
-
-		fIndentUsingSpaces = createRadioButton(indentComposite, XMLUIMessages.Indent_using_spaces);
-		((GridData) fIndentUsingSpaces.getLayoutData()).horizontalSpan = 1;
-
-		createLabel(formattingGroup, XMLUIMessages.Indentation_size);
-		fIndentationSize = new Spinner(formattingGroup, SWT.READ_ONLY | SWT.BORDER);
-		GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING);
-		fIndentationSize.setLayoutData(gd);
-		fIndentationSize.setToolTipText(XMLUIMessages.Indentation_size_tip);
-		fIndentationSize.setMinimum(MIN_INDENTATION_SIZE);
-		fIndentationSize.setMaximum(MAX_INDENTATION_SIZE);
-		fIndentationSize.setIncrement(1);
-		fIndentationSize.setPageIncrement(4);
-		fIndentationSize.addModifyListener(this);
-	}
-
-	protected void createContentsForGrammarConstraintsGroup(Composite parent) {
-		Group grammarConstraintsGroup = createGroup(parent, 1);
-		grammarConstraintsGroup.setText(XMLUIMessages.Grammar_Constraints);
-		grammarConstraintsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-
-		fUseInferredGrammar = createCheckBox(grammarConstraintsGroup, XMLUIMessages.Use_inferred_grammar_in_absence_of);
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	protected void doSavePreferenceStore() {
-		XMLUIPlugin.getDefault().savePluginPreferences(); // editor
-		XMLCorePlugin.getDefault().savePluginPreferences(); // model
-	}
-
-	protected void enableValues() {
-		if (fAutoPropose != null) {
-			if (fAutoPropose.getSelection()) {
-				fAutoProposeLabel.setEnabled(true);
-				fAutoProposeText.setEnabled(true);
-			}
-			else {
-				fAutoProposeLabel.setEnabled(false);
-				fAutoProposeText.setEnabled(false);
-			}
-		}
-	}
-
-	protected Preferences getModelPreferences() {
-		return XMLCorePlugin.getDefault().getPluginPreferences();
-	}
-
-	/**
-	 * Return the currently selected suggestion strategy preference
-	 * 
-	 * @return a suggestion strategy constant from XMLUIPreferenceNames
-	 */
-	private String getCurrentSuggestionStrategy() {
-		int i = fSuggestionStrategyCombo.getSelectionIndex();
-		if (i >= 0) {
-			return (String) (fSuggestionStrategies.elementAt(i));
-		}
-		return ""; //$NON-NLS-1$
-	}
-
-	protected void initializeValues() {
-		initializeValuesForFormattingGroup();
-		initializeValuesForContentAssistGroup();
-		initializeValuesForGrammarConstraintsGroup();
-	}
-
-	protected void initializeValuesForContentAssistGroup() {
-		// Content Assist
-		fAutoPropose.setSelection(getPreferenceStore().getBoolean(XMLUIPreferenceNames.AUTO_PROPOSE));
-		fAutoProposeText.setText(getPreferenceStore().getString(XMLUIPreferenceNames.AUTO_PROPOSE_CODE));
-		String suggestionStrategy = getPreferenceStore().getString(XMLUIPreferenceNames.SUGGESTION_STRATEGY);
-		if (suggestionStrategy.length() > 0) {
-			setCurrentSuggestionStrategy(suggestionStrategy);
-		}
-		else {
-			setCurrentSuggestionStrategy(XMLUIPreferenceNames.SUGGESTION_STRATEGY_VALUE_LAX);
-		}
-	}
-
-	protected void initializeValuesForFormattingGroup() {
-		// Formatting
-		fLineWidthText.setText(getModelPreferences().getString(XMLCorePreferenceNames.LINE_WIDTH));
-		fSplitMultiAttrs.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.SPLIT_MULTI_ATTRS));
-		fAlignEndBracket.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.ALIGN_END_BRACKET));
-		fClearAllBlankLines.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES));
-		fPreservePCDATAContent.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.PRESERVE_CDATACONTENT));
-		fSpaceBeforeEmptyCloseTag.setSelection(getModelPreferences().getBoolean(XMLCorePreferenceNames.SPACE_BEFORE_EMPTY_CLOSE_TAG));
-		
-		if (XMLCorePreferenceNames.TAB.equals(getModelPreferences().getString(XMLCorePreferenceNames.INDENTATION_CHAR))) {
-			fIndentUsingTabs.setSelection(true);
-			fIndentUsingSpaces.setSelection(false);
-		}
-		else {
-			fIndentUsingSpaces.setSelection(true);
-			fIndentUsingTabs.setSelection(false);
-		}
-
-		fIndentationSize.setSelection(getModelPreferences().getInt(XMLCorePreferenceNames.INDENTATION_SIZE));
-	}
-
-	protected void initializeValuesForGrammarConstraintsGroup() {
-		fUseInferredGrammar.setSelection(getPreferenceStore().getBoolean(XMLUIPreferenceNames.USE_INFERRED_GRAMMAR));
-	}
-
-	protected void performDefaults() {
-		performDefaultsForFormattingGroup();
-		performDefaultsForContentAssistGroup();
-		performDefaultsForGrammarConstraintsGroup();
-
-		validateValues();
-		enableValues();
-
-		super.performDefaults();
-	}
-
-	protected void performDefaultsForContentAssistGroup() {
-		// Content Assist
-		fAutoPropose.setSelection(getPreferenceStore().getDefaultBoolean(XMLUIPreferenceNames.AUTO_PROPOSE));
-		fAutoProposeText.setText(getPreferenceStore().getDefaultString(XMLUIPreferenceNames.AUTO_PROPOSE_CODE));
-		String suggestionStrategy = getPreferenceStore().getDefaultString(XMLUIPreferenceNames.SUGGESTION_STRATEGY);
-		if (suggestionStrategy.length() > 0) {
-			setCurrentSuggestionStrategy(suggestionStrategy);
-		}
-		else {
-			setCurrentSuggestionStrategy(XMLUIPreferenceNames.SUGGESTION_STRATEGY_VALUE_LAX);
-		}
-	}
-
-	protected void performDefaultsForFormattingGroup() {
-		// Formatting
-		fLineWidthText.setText(getModelPreferences().getDefaultString(XMLCorePreferenceNames.LINE_WIDTH));
-		fSplitMultiAttrs.setSelection(getModelPreferences().getDefaultBoolean(XMLCorePreferenceNames.SPLIT_MULTI_ATTRS));
-		fAlignEndBracket.setSelection(getModelPreferences().getDefaultBoolean(XMLCorePreferenceNames.ALIGN_END_BRACKET));
-		fClearAllBlankLines.setSelection(getModelPreferences().getDefaultBoolean(XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES));
-		fPreservePCDATAContent.setSelection(getModelPreferences().getDefaultBoolean(XMLCorePreferenceNames.PRESERVE_CDATACONTENT));
-		// BUG195264 - Support for removing/adding a space before empty close tags
-		fSpaceBeforeEmptyCloseTag.setSelection(getModelPreferences().getDefaultBoolean(XMLCorePreferenceNames.SPACE_BEFORE_EMPTY_CLOSE_TAG));
-		
-		if (XMLCorePreferenceNames.TAB.equals(getModelPreferences().getDefaultString(XMLCorePreferenceNames.INDENTATION_CHAR))) {
-			fIndentUsingTabs.setSelection(true);
-			fIndentUsingSpaces.setSelection(false);
-		}
-		else {
-			fIndentUsingSpaces.setSelection(true);
-			fIndentUsingTabs.setSelection(false);
-		}
-		fIndentationSize.setSelection(getModelPreferences().getDefaultInt(XMLCorePreferenceNames.INDENTATION_SIZE));
-	}
-
-	protected void performDefaultsForGrammarConstraintsGroup() {
-		fUseInferredGrammar.setSelection(getPreferenceStore().getDefaultBoolean(XMLUIPreferenceNames.USE_INFERRED_GRAMMAR));
-	}
-
-	public boolean performOk() {
-		boolean result = super.performOk();
-
-		doSavePreferenceStore();
-
-		return result;
-	}
-
-	/**
-	 * Set a suggestion strategy in suggestion strategy combo box
-	 * 
-	 * @param strategy
-	 */
-	private void setCurrentSuggestionStrategy(String strategy) {
-		// Clear the current selection.
-		fSuggestionStrategyCombo.clearSelection();
-		fSuggestionStrategyCombo.deselectAll();
-
-		int i = fSuggestionStrategies.indexOf(strategy);
-		if (i >= 0) {
-			fSuggestionStrategyCombo.select(i);
-		}
-	}
-
-	protected void storeValues() {
-		storeValuesForFormattingGroup();
-		storeValuesForContentAssistGroup();
-		storeValuesForGrammarConstraintsGroup();
-	}
-
-	protected void storeValuesForContentAssistGroup() {
-		// Content Assist
-		getPreferenceStore().setValue(XMLUIPreferenceNames.AUTO_PROPOSE, fAutoPropose.getSelection());
-		getPreferenceStore().setValue(XMLUIPreferenceNames.AUTO_PROPOSE_CODE, fAutoProposeText.getText());
-		getPreferenceStore().setValue(XMLUIPreferenceNames.SUGGESTION_STRATEGY, getCurrentSuggestionStrategy());
-	}
-
-	protected void storeValuesForFormattingGroup() {
-		// Formatting
-		getModelPreferences().setValue(XMLCorePreferenceNames.LINE_WIDTH, fLineWidthText.getText());
-		getModelPreferences().setValue(XMLCorePreferenceNames.SPLIT_MULTI_ATTRS, fSplitMultiAttrs.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.ALIGN_END_BRACKET, fAlignEndBracket.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.CLEAR_ALL_BLANK_LINES, fClearAllBlankLines.getSelection());
-		getModelPreferences().setValue(XMLCorePreferenceNames.PRESERVE_CDATACONTENT, fPreservePCDATAContent.getSelection());
-		// BUG195264 - Support for removing/adding a space before empty close tags
-		getModelPreferences().setValue(XMLCorePreferenceNames.SPACE_BEFORE_EMPTY_CLOSE_TAG, fSpaceBeforeEmptyCloseTag.getSelection());
-		
-		if (fIndentUsingTabs.getSelection()) {
-			getModelPreferences().setValue(XMLCorePreferenceNames.INDENTATION_CHAR, XMLCorePreferenceNames.TAB);
-		}
-		else {
-			getModelPreferences().setValue(XMLCorePreferenceNames.INDENTATION_CHAR, XMLCorePreferenceNames.SPACE);
-		}
-		getModelPreferences().setValue(XMLCorePreferenceNames.INDENTATION_SIZE, fIndentationSize.getSelection());
-	}
-
-	protected void storeValuesForGrammarConstraintsGroup() {
-		getPreferenceStore().setValue(XMLUIPreferenceNames.USE_INFERRED_GRAMMAR, fUseInferredGrammar.getSelection());
-	}
-
-	protected void validateValues() {
-		boolean isError = false;
-		String widthText = null;
-
-		if (fLineWidthText != null) {
-			try {
-				widthText = fLineWidthText.getText();
-				int formattingLineWidth = Integer.parseInt(widthText);
-				if ((formattingLineWidth < WIDTH_VALIDATION_LOWER_LIMIT) || (formattingLineWidth > WIDTH_VALIDATION_UPPER_LIMIT)) {
-					throw new NumberFormatException();
-				}
-			}
-			catch (NumberFormatException nfexc) {
-				setInvalidInputMessage(widthText);
-				setValid(false);
-				isError = true;
-			}
-		}
-
-		int indentSize = 0;
-		if (fIndentationSize != null) {
-			try {
-				indentSize = fIndentationSize.getSelection();
-				if ((indentSize < MIN_INDENTATION_SIZE) || (indentSize > MAX_INDENTATION_SIZE)) {
-					throw new NumberFormatException();
-				}
-			}
-			catch (NumberFormatException nfexc) {
-				setInvalidInputMessage(Integer.toString(indentSize));
-				setValid(false);
-				isError = true;
-			}
-		}
-
-		if (!isError) {
-			setErrorMessage(null);
-			setValid(true);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLSyntaxColoringPage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLSyntaxColoringPage.java
deleted file mode 100644
index 245f0ab..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLSyntaxColoringPage.java
+++ /dev/null
@@ -1,873 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.jface.preference.ColorSelector;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.ListViewer;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerComparator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.RGB;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Link;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferencesUtil;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.ui.internal.SSEUIMessages;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore;
-import org.eclipse.wst.sse.ui.internal.preferences.OverlayPreferenceStore.OverlayKey;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.sse.ui.internal.util.EditorUtility;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-import com.ibm.icu.text.Collator;
-
-/**
- * A preference page to configure our XML syntax color. It resembles the JDT
- * and CDT pages far more than our original color page while retaining the
- * extra "click-to-find" functionality.
- */
-public final class XMLSyntaxColoringPage extends PreferencePage implements IWorkbenchPreferencePage {
-
-	private Button fBold;
-	private Label fForegroundLabel;
-	private Label fBackgroundLabel;
-	private Button fClearStyle;
-	private Map fContextToStyleMap;
-	private Color fDefaultForeground = null;
-	private Color fDefaultBackground = null;
-	private IStructuredDocument fDocument;
-	private ColorSelector fForegroundColorEditor;
-	private ColorSelector fBackgroundColorEditor;
-	private Button fItalic;
-	private OverlayPreferenceStore fOverlayStore;
-	private Button fStrike;
-	private Collection fStylePreferenceKeys;
-	private StructuredViewer fStylesViewer = null;
-	private Map fStyleToDescriptionMap;
-	private StyledText fText;
-	private Button fUnderline;
-
-	// activate controls based on the given local color type
-	private void activate(String namedStyle) {
-		Color foreground = fDefaultForeground;
-		Color background = fDefaultBackground;
-		if (namedStyle == null) {
-			fClearStyle.setEnabled(false);
-			fBold.setEnabled(false);
-			fItalic.setEnabled(false);
-			fStrike.setEnabled(false);
-			fUnderline.setEnabled(false);
-			fForegroundLabel.setEnabled(false);
-			fBackgroundLabel.setEnabled(false);
-			fForegroundColorEditor.setEnabled(false);
-			fBackgroundColorEditor.setEnabled(false);
-			fBold.setSelection(false);
-			fItalic.setSelection(false);
-			fStrike.setSelection(false);
-			fUnderline.setSelection(false);
-		}
-		else {
-			TextAttribute attribute = getAttributeFor(namedStyle);
-			fClearStyle.setEnabled(true);
-			fBold.setEnabled(true);
-			fItalic.setEnabled(true);
-			fStrike.setEnabled(true);
-			fUnderline.setEnabled(true);
-			fForegroundLabel.setEnabled(true);
-			fBackgroundLabel.setEnabled(true);
-			fForegroundColorEditor.setEnabled(true);
-			fBackgroundColorEditor.setEnabled(true);
-			fBold.setSelection((attribute.getStyle() & SWT.BOLD) != 0);
-			fItalic.setSelection((attribute.getStyle() & SWT.ITALIC) != 0);
-			fStrike.setSelection((attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0);
-			fUnderline.setSelection((attribute.getStyle() & TextAttribute.UNDERLINE) != 0);
-			if (attribute.getForeground() != null) {
-				foreground = attribute.getForeground();
-			}
-			if (attribute.getBackground() != null) {
-				background = attribute.getBackground();
-			}
-		}
-
-		fForegroundColorEditor.setColorValue(foreground.getRGB());
-		fBackgroundColorEditor.setColorValue(background.getRGB());
-	}
-
-	/**
-	 * Color the text in the sample area according to the current preferences
-	 */
-	void applyStyles() {
-		if (fText == null || fText.isDisposed())
-			return;
-		IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion();
-		while (documentRegion != null) {
-			ITextRegionList regions = documentRegion.getRegions();
-			for (int i = 0; i < regions.size(); i++) {
-				ITextRegion currentRegion = regions.get(i);
-				// lookup the local coloring type and apply it
-				String namedStyle = (String) fContextToStyleMap.get(currentRegion.getType());
-				if (namedStyle == null)
-					continue;
-				TextAttribute attribute = getAttributeFor(namedStyle);
-				if (attribute == null)
-					continue;
-				StyleRange style = new StyleRange(documentRegion.getStartOffset(currentRegion), currentRegion.getTextLength(), attribute.getForeground(), attribute.getBackground(), attribute.getStyle());
-				style.strikeout = (attribute.getStyle() & TextAttribute.STRIKETHROUGH) != 0;
-				style.underline = (attribute.getStyle() & TextAttribute.UNDERLINE) != 0;
-				fText.setStyleRange(style);
-			}
-			documentRegion = documentRegion.getNext();
-		}
-	}
-
-	Button createCheckbox(Composite parent, String label) {
-		Button button = new Button(parent, SWT.CHECK);
-		button.setText(label);
-		button.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-		return button;
-	}
-
-	/**
-	 * Creates composite control and sets the default layout data.
-	 */
-	private Composite createComposite(Composite parent, int numColumns) {
-		Composite composite = new Composite(parent, SWT.NULL);
-
-		// GridLayout
-		GridLayout layout = new GridLayout();
-		layout.numColumns = numColumns;
-		layout.makeColumnsEqualWidth = false;
-		layout.marginHeight = 0;
-		layout.marginWidth = 0;
-		composite.setLayout(layout);
-
-		// GridData
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, false);
-		composite.setLayoutData(data);
-		return composite;
-	}
-
-	protected Control createContents(final Composite parent) {
-		initializeDialogUnits(parent);
-
-		fDefaultForeground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_FOREGROUND);
-		fDefaultBackground = parent.getDisplay().getSystemColor(SWT.COLOR_LIST_BACKGROUND);
-		Composite pageComponent = createComposite(parent, 2);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.XML_PREFWEBX_STYLES_HELPID);
-
-		Link link = new Link(pageComponent, SWT.WRAP);
-		link.setText(SSEUIMessages.SyntaxColoring_Link);
-		link.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				PreferencesUtil.createPreferenceDialogOn(parent.getShell(), e.text, null, null);
-			}
-		});
-
-		GridData linkData= new GridData(SWT.FILL, SWT.BEGINNING, true, false, 2, 1);
-		linkData.widthHint= 150; // only expand further if anyone else requires it
-		link.setLayoutData(linkData);
-
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-		new Label(pageComponent, SWT.NONE).setLayoutData(new GridData());
-
-		SashForm editor = new SashForm(pageComponent, SWT.VERTICAL);
-		GridData gridData2 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData2.horizontalSpan = 2;
-		editor.setLayoutData(gridData2);
-		SashForm top = new SashForm(editor, SWT.HORIZONTAL);
-		Composite styleEditor = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginRight = 5;
-		((GridLayout) styleEditor.getLayout()).marginLeft = 0;
-		createLabel(styleEditor, XMLUIMessages.SyntaxColoringPage_0);
-		fStylesViewer = createStylesViewer(styleEditor);
-		GridData gridData = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData.horizontalIndent = 0;
-		Iterator iterator = fStyleToDescriptionMap.values().iterator();
-		while (iterator.hasNext()) {
-			gridData.widthHint = Math.max(gridData.widthHint, convertWidthInCharsToPixels(iterator.next().toString().length()));
-		}
-		gridData.heightHint = convertHeightInCharsToPixels(5);
-		fStylesViewer.getControl().setLayoutData(gridData);
-
-		Composite editingComposite = createComposite(top, 1);
-		((GridLayout) styleEditor.getLayout()).marginLeft = 5;
-		createLabel(editingComposite, ""); //$NON-NLS-1$
-		Button enabler = createCheckbox(editingComposite, XMLUIMessages.SyntaxColoringPage_2);
-		enabler.setEnabled(false);
-		enabler.setSelection(true);
-		Composite editControls = createComposite(editingComposite, 2);
-		((GridLayout) editControls.getLayout()).marginLeft = 20;
-
-		fForegroundLabel = createLabel(editControls, SSEUIMessages.Foreground_UI_);
-		((GridData) fForegroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		fForegroundLabel.setEnabled(false);
-
-		fForegroundColorEditor = new ColorSelector(editControls);
-		Button fForegroundColor = fForegroundColorEditor.getButton();
-		GridData gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fForegroundColor.setLayoutData(gd);
-		fForegroundColorEditor.setEnabled(false);
-
-		fBackgroundLabel = createLabel(editControls, SSEUIMessages.Background_UI_);
-		((GridData) fBackgroundLabel.getLayoutData()).verticalAlignment = SWT.CENTER;
-		fBackgroundLabel.setEnabled(false);
-
-		fBackgroundColorEditor = new ColorSelector(editControls);
-		Button fBackgroundColor = fBackgroundColorEditor.getButton();
-		gd = new GridData(SWT.BEGINNING, SWT.FILL, false, false);
-		fBackgroundColor.setLayoutData(gd);
-		fBackgroundColorEditor.setEnabled(false);
-
-		fBold = createCheckbox(editControls, XMLUIMessages.SyntaxColoringPage_3);
-		fBold.setEnabled(false);
-		((GridData) fBold.getLayoutData()).horizontalSpan = 2;
-		fItalic = createCheckbox(editControls, XMLUIMessages.SyntaxColoringPage_4);
-		fItalic.setEnabled(false);
-		((GridData) fItalic.getLayoutData()).horizontalSpan = 2;
-		fStrike = createCheckbox(editControls, XMLUIMessages.SyntaxColoringPage_5);
-		fStrike.setEnabled(false);
-		((GridData) fStrike.getLayoutData()).horizontalSpan = 2;
-		fUnderline = createCheckbox(editControls, XMLUIMessages.SyntaxColoringPage_6);
-		fUnderline.setEnabled(false);
-		((GridData) fUnderline.getLayoutData()).horizontalSpan = 2;
-		fClearStyle = new Button(editingComposite, SWT.PUSH);
-		fClearStyle.setText(SSEUIMessages.Restore_Default_UI_); //$NON-NLS-1$ = "Restore Default"
-		fClearStyle.setLayoutData(new GridData(SWT.BEGINNING));
-		((GridData) fClearStyle.getLayoutData()).horizontalIndent = 20;
-		fClearStyle.setEnabled(false);
-
-		Composite sampleArea = createComposite(editor, 1);
-
-		((GridLayout) sampleArea.getLayout()).marginLeft = 5;
-		((GridLayout) sampleArea.getLayout()).marginTop = 5;
-		createLabel(sampleArea, SSEUIMessages.Sample_text__UI_); //$NON-NLS-1$ = "&Sample text:"
-		SourceViewer viewer = new SourceViewer(sampleArea, null, SWT.BORDER | SWT.LEFT_TO_RIGHT | SWT.MULTI | SWT.V_SCROLL | SWT.H_SCROLL | SWT.READ_ONLY);
-		fText = viewer.getTextWidget();
-		GridData gridData3 = new GridData(SWT.FILL, SWT.FILL, true, true);
-		gridData3.widthHint = convertWidthInCharsToPixels(20);
-		gridData3.heightHint = convertHeightInCharsToPixels(5);
-		gridData3.horizontalSpan = 2;
-		fText.setLayoutData(gridData3);
-		fText.setEditable(false);
-		fText.setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		fText.addKeyListener(getTextKeyListener());
-		fText.addSelectionListener(getTextSelectionListener());
-		fText.addMouseListener(getTextMouseListener());
-		fText.addTraverseListener(getTraverseListener());
-		setAccessible(fText, SSEUIMessages.Sample_text__UI_);
-		fDocument = StructuredModelManager.getModelManager().createStructuredDocumentFor(ContentTypeIdForXML.ContentTypeID_XML);
-		fDocument.set(getExampleText());
-		viewer.setDocument(fDocument);
-
-		top.setWeights(new int[]{1, 1});
-		editor.setWeights(new int[]{1, 1});
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(pageComponent, IHelpContextIds.XML_PREFWEBX_STYLES_HELPID);
-
-		fStylesViewer.setInput(getStylePreferenceKeys());
-
-		applyStyles();
-
-		fStylesViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-			public void selectionChanged(SelectionChangedEvent event) {
-				if (!event.getSelection().isEmpty()) {
-					Object o = ((IStructuredSelection) event.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					activate(namedStyle);
-					if (namedStyle == null)
-						return;
-				}
-			}
-		});
-
-		fForegroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[0];
-						// open color dialog to get new color
-						String newValue = ColorHelper.toRGBString(fForegroundColorEditor.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[0] = newValue;
-							String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle, newPrefString);
-							applyStyles();
-							fText.redraw();
-						}
-					}
-				}
-			}
-		});
-
-		fBackgroundColorEditor.addListener(new IPropertyChangeListener() {
-			public void propertyChange(PropertyChangeEvent event) {
-				if (event.getProperty().equals(ColorSelector.PROP_COLORCHANGE)) {
-					Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-					String namedStyle = o.toString();
-					String prefString = getOverlayStore().getString(namedStyle);
-					String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-					if (stylePrefs != null) {
-						String oldValue = stylePrefs[1];
-						// open color dialog to get new color
-						String newValue = ColorHelper.toRGBString(fBackgroundColorEditor.getColorValue());
-
-						if (!newValue.equals(oldValue)) {
-							stylePrefs[1] = newValue;
-							String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-							getOverlayStore().setValue(namedStyle, newPrefString);
-							applyStyles();
-							fText.redraw();
-							activate(namedStyle);
-						}
-					}
-				}
-			}
-		});
-
-		fBold.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[2];
-					String newValue = String.valueOf(fBold.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[2] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fItalic.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[3];
-					String newValue = String.valueOf(fItalic.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[3] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fStrike.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[4];
-					String newValue = String.valueOf(fStrike.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[4] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fUnderline.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				super.widgetSelected(e);
-				// get current (newly old) style
-				Object o = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement();
-				String namedStyle = o.toString();
-				String prefString = getOverlayStore().getString(namedStyle);
-				String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-				if (stylePrefs != null) {
-					String oldValue = stylePrefs[5];
-					String newValue = String.valueOf(fUnderline.getSelection());
-					if (!newValue.equals(oldValue)) {
-						stylePrefs[5] = newValue;
-						String newPrefString = ColorHelper.packStylePreferences(stylePrefs);
-						getOverlayStore().setValue(namedStyle, newPrefString);
-						applyStyles();
-						fText.redraw();
-					}
-				}
-			}
-		});
-
-		fClearStyle.addSelectionListener(new SelectionAdapter() {
-			public void widgetSelected(SelectionEvent e) {
-				if (fStylesViewer.getSelection().isEmpty())
-					return;
-				String namedStyle = ((IStructuredSelection) fStylesViewer.getSelection()).getFirstElement().toString();
-				getOverlayStore().setToDefault(namedStyle);
-				applyStyles();
-				fText.redraw();
-				activate(namedStyle);
-			}
-		});
-
-		return pageComponent;
-	}
-
-	private Label createLabel(Composite parent, String text) {
-		Label label = new Label(parent, SWT.WRAP);
-		label.setText(text);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, false, false);
-		label.setLayoutData(data);
-		label.setBackground(parent.getBackground());
-		return label;
-	}
-
-	// protected Label createDescriptionLabel(Composite parent) {
-	// return null;
-	// }
-
-	/**
-	 * Set up all the style preference keys in the overlay store
-	 */
-	private OverlayKey[] createOverlayStoreKeys() {
-		List overlayKeys = new ArrayList();
-
-		Iterator i = getStylePreferenceKeys().iterator();
-		while (i.hasNext()) {
-			overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.STRING, (String) i.next()));
-		}
-
-		OverlayPreferenceStore.OverlayKey[] keys = new OverlayPreferenceStore.OverlayKey[overlayKeys.size()];
-		overlayKeys.toArray(keys);
-		return keys;
-	}
-
-	/**
-	 * Creates the List viewer where we see the various syntax element display
-	 * names--would it ever be a Tree like JDT's?
-	 * 
-	 * @param parent
-	 * @return
-	 */
-	private StructuredViewer createStylesViewer(Composite parent) {
-		StructuredViewer stylesViewer = new ListViewer(parent, SWT.SINGLE | SWT.V_SCROLL | SWT.H_SCROLL | SWT.BORDER);
-		stylesViewer.setComparator(new ViewerComparator(Collator.getInstance()));
-		stylesViewer.setLabelProvider(new LabelProvider() {
-			public String getText(Object element) {
-				Object description = fStyleToDescriptionMap.get(element);
-				if (description != null)
-					return description.toString();
-				return super.getText(element);
-			}
-		});
-		stylesViewer.setContentProvider(new ITreeContentProvider() {
-			public void dispose() {
-			}
-
-			public Object[] getChildren(Object parentElement) {
-				return getStylePreferenceKeys().toArray();
-			}
-
-			public Object[] getElements(Object inputElement) {
-				return getChildren(inputElement);
-			}
-
-			public Object getParent(Object element) {
-				return getStylePreferenceKeys();
-			}
-
-			public boolean hasChildren(Object element) {
-				return false;
-			}
-
-			public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-			}
-		});
-		return stylesViewer;
-	}
-
-	public void dispose() {
-		if (fOverlayStore != null) {
-			fOverlayStore.stop();
-		}
-		super.dispose();
-	}
-
-	protected IPreferenceStore doGetPreferenceStore() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	private TextAttribute getAttributeFor(String namedStyle) {
-		TextAttribute ta = new TextAttribute(fDefaultForeground, fDefaultBackground, SWT.NORMAL);
-
-		if (namedStyle != null && fOverlayStore != null) {
-			// note: "namedStyle" *is* the preference key
-			String prefString = getOverlayStore().getString(namedStyle);
-			String[] stylePrefs = ColorHelper.unpackStylePreferences(prefString);
-			if (stylePrefs != null) {
-				RGB foreground = ColorHelper.toRGB(stylePrefs[0]);
-				RGB background = ColorHelper.toRGB(stylePrefs[1]);
-
-				int fontModifier = SWT.NORMAL;
-
-				if (stylePrefs.length > 2) {
-					boolean on = Boolean.valueOf(stylePrefs[2]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.BOLD;
-				}
-				if (stylePrefs.length > 3) {
-					boolean on = Boolean.valueOf(stylePrefs[3]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | SWT.ITALIC;
-				}
-				if (stylePrefs.length > 4) {
-					boolean on = Boolean.valueOf(stylePrefs[4]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | TextAttribute.STRIKETHROUGH;
-				}
-				if (stylePrefs.length > 5) {
-					boolean on = Boolean.valueOf(stylePrefs[5]).booleanValue();
-					if (on)
-						fontModifier = fontModifier | TextAttribute.UNDERLINE;
-				}
-
-				ta = new TextAttribute((foreground != null) ? EditorUtility.getColor(foreground) : null, (background != null) ? EditorUtility.getColor(background) : null, fontModifier);
-			}
-		}
-		return ta;
-	}
-
-	private String getExampleText() {
-		return XMLUIMessages.Sample_XML_doc;
-	}
-
-	private String getNamedStyleAtOffset(int offset) {
-		// ensure the offset is clean
-		if (offset >= fDocument.getLength())
-			return getNamedStyleAtOffset(fDocument.getLength() - 1);
-		else if (offset < 0)
-			return getNamedStyleAtOffset(0);
-		IStructuredDocumentRegion documentRegion = fDocument.getFirstStructuredDocumentRegion();
-		while (documentRegion != null && !documentRegion.containsOffset(offset)) {
-			documentRegion = documentRegion.getNext();
-		}
-		if (documentRegion != null) {
-			// find the ITextRegion's Context at this offset
-			ITextRegion interest = documentRegion.getRegionAtCharacterOffset(offset);
-			if (interest == null)
-				return null;
-			if (offset > documentRegion.getTextEndOffset(interest))
-				return null;
-			String regionContext = interest.getType();
-			if (regionContext == null)
-				return null;
-			// find the named style (internal/selectable name) for that
-			// context
-			String namedStyle = (String) fContextToStyleMap.get(regionContext);
-			if (namedStyle != null) {
-				return namedStyle;
-			}
-		}
-		return null;
-	}
-
-	private OverlayPreferenceStore getOverlayStore() {
-		return fOverlayStore;
-	}
-
-	private Collection getStylePreferenceKeys() {
-		if (fStylePreferenceKeys == null) {
-			List styles = new ArrayList();
-			styles.add(IStyleConstantsXML.DOCTYPE_NAME);
-			styles.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-			styles.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-			styles.add(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-			styles.add(IStyleConstantsXML.CDATA_BORDER);
-			styles.add(IStyleConstantsXML.CDATA_TEXT);
-			styles.add(IStyleConstantsXML.PI_BORDER);
-			styles.add(IStyleConstantsXML.PI_CONTENT);
-			styles.add(IStyleConstantsXML.TAG_BORDER);
-			styles.add(IStyleConstantsXML.TAG_NAME);
-			styles.add(IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-			styles.add(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS);
-			styles.add(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-			styles.add(IStyleConstantsXML.COMMENT_BORDER);
-			styles.add(IStyleConstantsXML.COMMENT_TEXT);
-			styles.add(IStyleConstantsXML.DECL_BORDER);
-			styles.add(IStyleConstantsXML.XML_CONTENT);
-			styles.add(IStyleConstantsXML.ENTITY_REFERENCE);
-			fStylePreferenceKeys = styles;
-		}
-		return fStylePreferenceKeys;
-	}
-
-	private KeyListener getTextKeyListener() {
-		return new KeyListener() {
-			public void keyPressed(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-
-			public void keyReleased(KeyEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private MouseListener getTextMouseListener() {
-		return new MouseListener() {
-			public void mouseDoubleClick(MouseEvent e) {
-			}
-
-			public void mouseDown(MouseEvent e) {
-			}
-
-			public void mouseUp(MouseEvent e) {
-				if (e.widget instanceof StyledText) {
-					int x = ((StyledText) e.widget).getCaretOffset();
-					selectColorAtOffset(x);
-				}
-			}
-		};
-	}
-
-	private SelectionListener getTextSelectionListener() {
-		return new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				selectColorAtOffset(e.x);
-				if (e.widget instanceof StyledText) {
-					((StyledText) e.widget).setSelection(e.x);
-				}
-			}
-		};
-	}
-
-	private TraverseListener getTraverseListener() {
-		return new TraverseListener() {
-			/**
-			 * @see org.eclipse.swt.events.TraverseListener#keyTraversed(TraverseEvent)
-			 */
-			public void keyTraversed(TraverseEvent e) {
-				if (e.widget instanceof StyledText) {
-					if ((e.detail == SWT.TRAVERSE_TAB_NEXT) || (e.detail == SWT.TRAVERSE_TAB_PREVIOUS))
-						e.doit = true;
-				}
-			}
-		};
-	}
-
-	public void init(IWorkbench workbench) {
-		setDescription(SSEUIMessages.SyntaxColoring_Description);
-
-		fStyleToDescriptionMap = new HashMap();
-		fContextToStyleMap = new HashMap();
-
-		initStyleToDescriptionMap();
-		initRegionContextToStyleMap();
-
-		fOverlayStore = new OverlayPreferenceStore(getPreferenceStore(), createOverlayStoreKeys());
-		fOverlayStore.load();
-		fOverlayStore.start();
-	}
-
-	private void initRegionContextToStyleMap() {
-		fContextToStyleMap.put(DOMRegionContext.XML_COMMENT_OPEN, IStyleConstantsXML.COMMENT_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_COMMENT_TEXT, IStyleConstantsXML.COMMENT_TEXT);
-		fContextToStyleMap.put(DOMRegionContext.XML_COMMENT_CLOSE, IStyleConstantsXML.COMMENT_BORDER);
-
-		fContextToStyleMap.put(DOMRegionContext.XML_TAG_OPEN, IStyleConstantsXML.TAG_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_END_TAG_OPEN, IStyleConstantsXML.TAG_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_TAG_NAME, IStyleConstantsXML.TAG_NAME);
-		fContextToStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		fContextToStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS, IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS);
-		fContextToStyleMap.put(DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		fContextToStyleMap.put(DOMRegionContext.XML_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_EMPTY_TAG_CLOSE, IStyleConstantsXML.TAG_BORDER);
-
-		fContextToStyleMap.put(DOMRegionContext.XML_DECLARATION_OPEN, IStyleConstantsXML.DECL_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_ELEMENT_DECLARATION, IStyleConstantsXML.DECL_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_CLOSE, IStyleConstantsXML.DECL_BORDER);
-
-		fContextToStyleMap.put(DOMRegionContext.XML_CONTENT, IStyleConstantsXML.XML_CONTENT);
-		fContextToStyleMap.put(DOMRegionContext.XML_CDATA_OPEN, IStyleConstantsXML.CDATA_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_CDATA_TEXT, IStyleConstantsXML.CDATA_TEXT);
-		fContextToStyleMap.put(DOMRegionContext.XML_CDATA_CLOSE, IStyleConstantsXML.CDATA_BORDER);
-
-		fContextToStyleMap.put(DOMRegionContext.XML_PI_OPEN, IStyleConstantsXML.PI_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_PI_CONTENT, IStyleConstantsXML.PI_CONTENT);
-		fContextToStyleMap.put(DOMRegionContext.XML_PI_CLOSE, IStyleConstantsXML.PI_BORDER);
-		fContextToStyleMap.put(DOMRegionContext.XML_ELEMENT_DECL_NAME, IStyleConstantsXML.DOCTYPE_NAME);
-		fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION, IStyleConstantsXML.TAG_NAME);
-		fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_DECLARATION_CLOSE, IStyleConstantsXML.DECL_BORDER);
-
-		fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_NAME, IStyleConstantsXML.DOCTYPE_NAME);
-		fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-		fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		fContextToStyleMap.put(DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-
-		fContextToStyleMap.put(DOMRegionContext.XML_CHAR_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-		fContextToStyleMap.put(DOMRegionContext.XML_ENTITY_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-		fContextToStyleMap.put(DOMRegionContext.XML_PE_REFERENCE, IStyleConstantsXML.ENTITY_REFERENCE);
-	}
-
-	private void initStyleToDescriptionMap() {
-		fStyleToDescriptionMap.put(IStyleConstantsXML.CDATA_BORDER, XMLUIMessages.CDATA_Delimiters_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.CDATA_TEXT, XMLUIMessages.CDATA_Content_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.PI_BORDER, XMLUIMessages.Processing_Instruction_Del_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.PI_CONTENT, XMLUIMessages.Processing_Instruction_Con_UI__UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.COMMENT_BORDER, XMLUIMessages.Comment_Delimiters_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.COMMENT_TEXT, XMLUIMessages.Comment_Content_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_BORDER, XMLUIMessages.Tag_Delimiters_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_NAME, XMLUIMessages.Tag_Names_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, XMLUIMessages.Attribute_Names_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS, XMLUIMessages.Attribute_Equals_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, XMLUIMessages.Attribute_Values_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.DECL_BORDER, XMLUIMessages.Declaration_Delimiters_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.XML_CONTENT, XMLUIMessages.Content_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_NAME, XMLUIMessages.DOCTYPE_Name_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, XMLUIMessages.DOCTYPE_SYSTEM_PUBLIC_Keyw_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, XMLUIMessages.DOCTYPE_Public_Reference_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, XMLUIMessages.DOCTYPE_System_Reference_UI_);
-		fStyleToDescriptionMap.put(IStyleConstantsXML.ENTITY_REFERENCE, XMLUIMessages.Entity_Reference_UI_);
-	}
-
-	protected void performDefaults() {
-		super.performDefaults();
-		getOverlayStore().loadDefaults();
-		applyStyles();
-		fStylesViewer.setSelection(StructuredSelection.EMPTY);
-		activate(null);
-		fText.redraw();
-	}
-
-	public boolean performOk() {
-		getOverlayStore().propagate();
-
-		XMLUIPlugin.getDefault().savePluginPreferences();
-		SSEUIPlugin.getDefault().savePluginPreferences();
-		return true;
-	}
-
-	private void selectColorAtOffset(int offset) {
-		String namedStyle = getNamedStyleAtOffset(offset);
-		if (namedStyle != null) {
-			fStylesViewer.setSelection(new StructuredSelection(namedStyle));
-			fStylesViewer.reveal(namedStyle);
-		}
-		else {
-			fStylesViewer.setSelection(StructuredSelection.EMPTY);
-		}
-		activate(namedStyle);
-	}
-
-	/**
-	 * Specifically set the reporting name of a control for accessibility
-	 */
-	private void setAccessible(Control control, String name) {
-		if (control == null)
-			return;
-		final String n = name;
-		control.getAccessible().addAccessibleListener(new AccessibleAdapter() {
-			public void getName(AccessibleEvent e) {
-				if (e.childID == ACC.CHILDID_SELF)
-					e.result = n;
-			}
-		});
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLTemplatePreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLTemplatePreferencePage.java
deleted file mode 100644
index 810b599..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLTemplatePreferencePage.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.contentassist.ContentAssistant;
-import org.eclipse.jface.text.contentassist.IContentAssistant;
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.jface.text.source.SourceViewer;
-import org.eclipse.jface.text.source.SourceViewerConfiguration;
-import org.eclipse.jface.text.templates.ContextTypeRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.texteditor.templates.TemplatePreferencePage;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.StructuredTextViewerConfiguration;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-
-
-/**
- * Preference page for XML templates
- */
-public class XMLTemplatePreferencePage extends TemplatePreferencePage {
-
-	class XMLEditTemplateDialog extends EditTemplateDialog {
-		public XMLEditTemplateDialog(Shell parent, Template template, boolean edit, boolean isNameModifiable, ContextTypeRegistry registry) {
-			super(parent, template, edit, isNameModifiable, registry);
-		}
-
-		protected SourceViewer createViewer(Composite parent) {
-			SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-				StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationXML();
-
-				public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-					return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-				}
-
-				public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-					return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-				}
-
-				public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
-					ContentAssistant assistant = new ContentAssistant();
-					assistant.enableAutoActivation(true);
-					assistant.enableAutoInsert(true);
-					assistant.setContentAssistProcessor(getTemplateProcessor(), IDocument.DEFAULT_CONTENT_TYPE);
-					return assistant;
-				}
-			};
-			return doCreateViewer(parent, sourceViewerConfiguration);
-		}
-	}
-
-	public XMLTemplatePreferencePage() {
-		XMLUIPlugin xmlEditorPlugin = XMLUIPlugin.getDefault();
-
-		setPreferenceStore(xmlEditorPlugin.getPreferenceStore());
-		setTemplateStore(xmlEditorPlugin.getTemplateStore());
-		setContextTypeRegistry(xmlEditorPlugin.getTemplateContextRegistry());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
-	 */
-	protected Control createContents(Composite ancestor) {
-		Control c = super.createContents(ancestor);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(c, IHelpContextIds.XML_PREFWEBX_TEMPLATES_HELPID);
-		return c;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#createViewer(org.eclipse.swt.widgets.Composite)
-	 */
-	protected SourceViewer createViewer(Composite parent) {
-		SourceViewerConfiguration sourceViewerConfiguration = new StructuredTextViewerConfiguration() {
-			StructuredTextViewerConfiguration baseConfiguration = new StructuredTextViewerConfigurationXML();
-
-			public String[] getConfiguredContentTypes(ISourceViewer sourceViewer) {
-				return baseConfiguration.getConfiguredContentTypes(sourceViewer);
-			}
-
-			public LineStyleProvider[] getLineStyleProviders(ISourceViewer sourceViewer, String partitionType) {
-				return baseConfiguration.getLineStyleProviders(sourceViewer, partitionType);
-			}
-		};
-		return doCreateViewer(parent, sourceViewerConfiguration);
-	}
-
-	SourceViewer doCreateViewer(Composite parent, SourceViewerConfiguration viewerConfiguration) {
-		SourceViewer viewer = null;
-		String contentTypeID = ContentTypeIdForXML.ContentTypeID_XML;
-		viewer = new StructuredTextViewer(parent, null, null, false, SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
-		((StructuredTextViewer) viewer).getTextWidget().setFont(JFaceResources.getFont("org.eclipse.wst.sse.ui.textfont")); //$NON-NLS-1$
-		IStructuredModel scratchModel = StructuredModelManager.getModelManager().createUnManagedStructuredModelFor(contentTypeID);
-		IDocument document = scratchModel.getStructuredDocument();
-		viewer.configure(viewerConfiguration);
-		viewer.setDocument(document);
-		return viewer;
-	}
-
-	/**
-	 * Creates the edit dialog. Subclasses may override this method to provide
-	 * a custom dialog.
-	 * 
-	 * @param template
-	 *            the template being edited
-	 * @param edit
-	 *            whether the dialog should be editable
-	 * @param isNameModifiable
-	 *            whether the template name may be modified
-	 * @return the created or modified template, or <code>null</code> if the
-	 *         edition failed
-	 * @since 3.1
-	 */
-	protected Template editTemplate(Template template, boolean edit, boolean isNameModifiable) {
-		EditTemplateDialog dialog = new XMLEditTemplateDialog(getShell(), template, edit, isNameModifiable, getContextTypeRegistry());
-		if (dialog.open() == Window.OK) {
-			return dialog.getTemplate();
-		}
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.texteditor.templates.TemplatePreferencePage#isShowFormatterSetting()
-	 */
-	protected boolean isShowFormatterSetting() {
-		// template formatting has not been implemented
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.preference.IPreferencePage#performOk()
-	 */
-	public boolean performOk() {
-		boolean ok = super.performOk();
-		XMLUIPlugin.getDefault().savePluginPreferences();
-		return ok;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLTypingPreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLTypingPreferencePage.java
deleted file mode 100644
index 8487ab2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLTypingPreferencePage.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
- 
-public class XMLTypingPreferencePage extends AbstractPreferencePage {
-
-	private Button fCloseComment;
-	private Button fCloseEndTag;
-	private Button fRemoveEndTag;
-	private Button fCloseElement;
-	private Button fCloseStrings;
-	private Button fCloseBrackets;
-
-	protected Control createContents(Composite parent) {
-		Composite composite = super.createComposite(parent, 1);
-		PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.XML_PREFWEBX_FILES_HELPID);
-
-		createStartTagGroup(composite);
-		createEndTagGroup(composite);
-		createAutoComplete(composite);
-		createAutoRemove(composite);
-		
-		setSize(composite);
-		loadPreferences();
-		
-		return composite;
-	}
-	
-	private void createStartTagGroup(Composite parent) {
-		Group group = createGroup(parent, 2);
-
-		group.setText(XMLUIMessages.XMLTyping_Start_Tag);
-
-		fCloseElement = createCheckBox(group, XMLUIMessages.XMLTyping_Complete_Elements);
-		((GridData) fCloseElement.getLayoutData()).horizontalSpan = 2;
-	}
-	
-	private void createEndTagGroup(Composite parent) {
-		Group group = createGroup(parent, 2);
-
-		group.setText(XMLUIMessages.XMLTyping_End_Tag);
-
-		fCloseEndTag = createCheckBox(group, XMLUIMessages.XMLTyping_Complete_End_Tags);
-		((GridData) fCloseEndTag.getLayoutData()).horizontalSpan = 2;
-	}
-	
-	private void createAutoComplete(Composite parent) {
-		Group group = createGroup(parent, 2);
-		
-		group.setText(XMLUIMessages.XMLTyping_Auto_Complete);
-		
-		fCloseComment = createCheckBox(group, XMLUIMessages.XMLTyping_Complete_Comments);
-		((GridData) fCloseComment.getLayoutData()).horizontalSpan = 2;
-
-		fCloseStrings = createCheckBox(group, XMLUIMessages.XMLTyping_Close_Strings);
-		((GridData) fCloseStrings.getLayoutData()).horizontalSpan = 2;
-
-		fCloseBrackets = createCheckBox(group, XMLUIMessages.XMLTyping_Close_Brackets);
-		((GridData) fCloseBrackets.getLayoutData()).horizontalSpan = 2;
-	}
-	
-	private void createAutoRemove(Composite parent) {
-		Group group = createGroup(parent, 2);
-		
-		group.setText(XMLUIMessages.XMLTyping_Auto_Remove);
-		
-		fRemoveEndTag = createCheckBox(group, XMLUIMessages.XMLTyping_Remove_End_Tags);
-		((GridData) fRemoveEndTag.getLayoutData()).horizontalSpan = 2;
-	}
-	
-	public boolean performOk() {
-		boolean result = super.performOk();
-		
-		XMLUIPlugin.getDefault().savePluginPreferences();
-		
-		return result;
-	}
-	
-	protected void initializeValues() {
-		initCheckbox(fCloseComment, XMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS);
-		initCheckbox(fCloseEndTag, XMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS);
-		initCheckbox(fCloseElement, XMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS);
-		initCheckbox(fRemoveEndTag, XMLUIPreferenceNames.TYPING_REMOVE_END_TAGS);
-		initCheckbox(fCloseStrings, XMLUIPreferenceNames.TYPING_CLOSE_STRINGS);
-		initCheckbox(fCloseBrackets, XMLUIPreferenceNames.TYPING_CLOSE_BRACKETS);
-	}
-	
-	protected void performDefaults() {
-		defaultCheckbox(fCloseComment, XMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS);
-		defaultCheckbox(fCloseEndTag, XMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS);
-		defaultCheckbox(fCloseElement, XMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS);
-		defaultCheckbox(fRemoveEndTag, XMLUIPreferenceNames.TYPING_REMOVE_END_TAGS);
-		defaultCheckbox(fCloseStrings, XMLUIPreferenceNames.TYPING_CLOSE_STRINGS);
-		defaultCheckbox(fCloseBrackets, XMLUIPreferenceNames.TYPING_CLOSE_BRACKETS);
-	}
-	
-	protected void storeValues() {
-		getPreferenceStore().setValue(XMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS, (fCloseComment != null) ? fCloseComment.getSelection() : false);
-		getPreferenceStore().setValue(XMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS, (fCloseEndTag != null) ? fCloseEndTag.getSelection() : false);
-		getPreferenceStore().setValue(XMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS, (fCloseElement != null) ? fCloseElement.getSelection() : false);
-		getPreferenceStore().setValue(XMLUIPreferenceNames.TYPING_REMOVE_END_TAGS, (fRemoveEndTag != null) ? fRemoveEndTag.getSelection() : false);
-		getPreferenceStore().setValue(XMLUIPreferenceNames.TYPING_CLOSE_STRINGS, (fCloseStrings != null) ? fCloseStrings.getSelection() : false);
-		getPreferenceStore().setValue(XMLUIPreferenceNames.TYPING_CLOSE_BRACKETS, (fCloseBrackets != null) ? fCloseBrackets.getSelection() : false);
-	}
-	
-	protected IPreferenceStore doGetPreferenceStore() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceInitializer.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceInitializer.java
deleted file mode 100644
index dd66699..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceInitializer.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference 
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ColorRegistry;
-import org.eclipse.jface.text.templates.Template;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.ColorHelper;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.style.IStyleConstantsXML;
-
-/**
- * Sets default values for XML UI preferences
- */
-public class XMLUIPreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IPreferenceStore store = XMLUIPlugin.getDefault().getPreferenceStore();
-		ColorRegistry registry = PlatformUI.getWorkbench().getThemeManager().getCurrentTheme().getColorRegistry();
-
-		store.setDefault(XMLUIPreferenceNames.AUTO_PROPOSE, true);
-		store.setDefault(XMLUIPreferenceNames.AUTO_PROPOSE_CODE, "<=:"); //$NON-NLS-1$
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=140946
-		store.setDefault(XMLUIPreferenceNames.SUGGESTION_STRATEGY, XMLUIPreferenceNames.SUGGESTION_STRATEGY_VALUE_STRICT);
-		store.setDefault(XMLUIPreferenceNames.USE_INFERRED_GRAMMAR, true);
-
-		// XML Style Preferences
-		String NOBACKGROUNDBOLD = " | null | false"; //$NON-NLS-1$
-		String JUSTITALIC = " | null | false | true"; //$NON-NLS-1$
-		String styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_NAME, 127, 0, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_NAME, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, 42, 0, 255) + JUSTITALIC;
-		store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE, styleValue);
-
-		styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
-		store.setDefault(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS, styleValue); // specified
-		// value
-		// is
-		// black;
-		// leaving
-		// as
-		// widget
-		// default
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_BORDER, 63, 95, 191) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.COMMENT_BORDER, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.COMMENT_TEXT, 63, 95, 191) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.COMMENT_TEXT, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DECL_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.DECL_BORDER, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_NAME, 0, 0, 128) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.DOCTYPE_NAME, styleValue);
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, 0, 0, 128) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, 128, 128, 128) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, 63, 127, 95) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF, styleValue);
-
-		styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
-		store.setDefault(IStyleConstantsXML.XML_CONTENT, styleValue); // specified
-		// value
-		// is
-		// black;
-		// leaving
-		// as
-		// widget
-		// default
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.TAG_BORDER, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.TAG_NAME, 63, 127, 127) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.TAG_NAME, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.PI_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.PI_BORDER, styleValue);
-
-		styleValue = "null" + NOBACKGROUNDBOLD; //$NON-NLS-1$
-		store.setDefault(IStyleConstantsXML.PI_CONTENT, styleValue); // specified
-		// value
-		// is
-		// black;
-		// leaving
-		// as
-		// widget
-		// default
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_BORDER, 0, 128, 128) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.CDATA_BORDER, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.CDATA_TEXT, 0, 0, 0) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.CDATA_TEXT, styleValue);
-
-		styleValue = ColorHelper.findRGBString(registry, IStyleConstantsXML.ENTITY_REFERENCE, 42, 0, 255) + NOBACKGROUNDBOLD;
-		store.setDefault(IStyleConstantsXML.ENTITY_REFERENCE, styleValue);
-		
-		// set default new xml file template to use in new file wizard
-		/*
-		 * Need to find template name that goes with default template id (name
-		 * may change for differnt language)
-		 */
-		String templateName = ""; //$NON-NLS-1$
-		Template template = XMLUIPlugin.getDefault().getTemplateStore().findTemplateById("org.eclipse.wst.xml.ui.internal.templates.xmldeclaration"); //$NON-NLS-1$
-		if (template != null)
-			templateName = template.getName();
-		store.setDefault(XMLUIPreferenceNames.NEW_FILE_TEMPLATE_NAME, templateName);
-		
-		// Defaults for the Typing preference page
-		store.setDefault(XMLUIPreferenceNames.TYPING_COMPLETE_COMMENTS, true);
-		store.setDefault(XMLUIPreferenceNames.TYPING_COMPLETE_END_TAGS, true);
-		store.setDefault(XMLUIPreferenceNames.TYPING_COMPLETE_ELEMENTS, true);
-		store.setDefault(XMLUIPreferenceNames.TYPING_REMOVE_END_TAGS, true);
-		store.setDefault(XMLUIPreferenceNames.TYPING_CLOSE_STRINGS, true);
-		store.setDefault(XMLUIPreferenceNames.TYPING_CLOSE_BRACKETS, true);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceNames.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceNames.java
deleted file mode 100644
index 08a90fc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLUIPreferenceNames.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-/**
- * Preference keys for XML UI
- */
-public class XMLUIPreferenceNames {
-
-	public final static String SUGGESTION_STRATEGY_VALUE_LAX = "Lax"; //$NON-NLS-1$
-	public final static String SUGGESTION_STRATEGY_VALUE_STRICT = "Strict"; //$NON-NLS-1$
-	/**
-	 * A named preference that controls if code assist gets auto activated.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String AUTO_PROPOSE = getAutoProposeKey();
-
-	private static String getAutoProposeKey() {
-		return "autoPropose";//$NON-NLS-1$
-	}
-
-	/**
-	 * A named preference that holds the characters that auto activate code
-	 * assist.
-	 * <p>
-	 * Value is of type <code>String</code>. All characters that trigger
-	 * auto code assist.
-	 * </p>
-	 */
-	public static final String AUTO_PROPOSE_CODE = getAutoProposeCodeKey();
-
-	private static String getAutoProposeCodeKey() {
-		return "autoProposeCode";//$NON-NLS-1$
-	}
-
-	/**
-	 * The key to store customized templates.
-	 * <p>
-	 * Value is of type <code>String</code>.
-	 * </p>
-	 */
-	public static final String TEMPLATES_KEY = getTemplatesKey();
-
-	private static String getTemplatesKey() {
-		return "org.eclipse.wst.sse.ui.custom_templates"; //$NON-NLS-1$
-	}
-
-	/**
-	 * A named preference that controls whether or grammar should be inferred
-	 * or not.
-	 * <p>
-	 * Value is of type <code>Boolean</code>.
-	 * </p>
-	 */
-	public static final String USE_INFERRED_GRAMMAR = getUseInferredGrammarKey();
-
-	public static class OUTLINE_BEHAVIOR {
-		public static final String ELEMENT_NODE = "outline-behavior.element-node"; //$NON-NLS-1$
-		public static final String ATTRIBUTE_NODE = "outline-behavior.attribute-node"; //$NON-NLS-1$
-		public static final String TEXT_NODE = "outline-behavior.text-node"; //$NON-NLS-1$
-		public static final String CDATA_SECTION_NODE = "outline-behavior.cdata-section-node"; //$NON-NLS-1$
-		public static final String ENTITY_REFERENCE_NODE = "outline-behavior.entity-reference-node"; //$NON-NLS-1$
-		public static final String ENTITY_NODE = "outline-behavior.entity-node"; //$NON-NLS-1$
-		public static final String PROCESSING_INSTRUCTION_NODE = "outline-behavior.instruction-node"; //$NON-NLS-1$
-		public static final String COMMENT_NODE = "outline-behavior.comment-node"; //$NON-NLS-1$
-		public static final String DOCUMENT_NODE = "outline-behavior.document-node"; //$NON-NLS-1$
-		public static final String DOCUMENT_TYPE_NODE = "outline-behavior.document-type-node"; //$NON-NLS-1$
-		public static final String DOCUMENT_FRAGMENT_NODE = "outline-behavior.document-fragment-node"; //$NON-NLS-1$
-		public static final String NOTATION_NODE = "outline-behavior.notation-node"; //$NON-NLS-1$
-	}
-	
-	private static String getUseInferredGrammarKey() {
-		return "useInferredGrammar"; //$NON-NLS-1$
-	}
-
-	/**
-	 * A named preference that holds the characters that auto activate code
-	 * assist.
-	 * <p>
-	 * Value is of type <code>String</code>. All characters that trigger
-	 * auto code assist.
-	 * </p>
-	 */
-	public static final String SUGGESTION_STRATEGY = getSuggestionStrategeyKey();
-
-	private static String getSuggestionStrategeyKey() {
-		return "suggestionStrategy";//$NON-NLS-1$
-	}
-
-	/**
-	 * The key to store the last template name used in new DTD file wizard.
-	 * Template name is stored instead of template id because user-created
-	 * templates do not have template ids.
-	 * <p>
-	 * Value is of type <code>String</code>.
-	 * </p>
-	 */
-	public static final String NEW_FILE_TEMPLATE_NAME = "newFileTemplateName"; //$NON-NLS-1$
-	
-	/**
-	 * The key to store the option for auto-completing comments while
-	 * typing.
-	 * <p>
-	 * Value is of type <code>boolean</code>.
-	 * </p>
-	 */
-	public static final String TYPING_COMPLETE_COMMENTS = "completeComments"; //$NON-NLS-1$
-	
-	/**
-	 * The key to store the option for auto-completing end-tags after entering
-	 * <code>&lt;/</code>
-	 * <p>
-	 * Value is of type <code>boolean</code>.
-	 * </p>
-	 */
-	public static final String TYPING_COMPLETE_END_TAGS = "completeEndTags"; //$NON-NLS-1$
-	
-	/**
-	 * The key to store the option for auto-completing the element after entering
-	 * <code>&gt;</code>
-	 * <p>
-	 * Value is of type <code>boolean</code>.
-	 * </p>
-	 */
-	public static final String TYPING_COMPLETE_ELEMENTS = "completeElements"; //$NON-NLS-1$
-	
-	/**
-	 * The key to store the option for removing an end-tag if the start tag is
-	 * converted to an empty-tag.
-	 * <p>
-	 * Value is of type <code>boolean</code>.
-	 * </p>
-	 */
-	public static final String TYPING_REMOVE_END_TAGS = "removeEndTags"; //$NON-NLS-1$
-
-	/**
-	 * The key to store the option for auto-completing strings (" and ') while
-	 * typing.
-	 * <p>
-	 * Value is of type <code>boolean</code>.
-	 * </p>
-	 */
-	public static final String TYPING_CLOSE_STRINGS = "closeStrings"; //$NON-NLS-1$
-
-	/**
-	 * The key to store the option for auto-completing brackets ([ and () while
-	 * typing.
-	 * <p>
-	 * Value is of type <code>boolean</code>.
-	 * </p>
-	 */
-	public static final String TYPING_CLOSE_BRACKETS = "closeBrackets"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLValidatorPreferencePage.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLValidatorPreferencePage.java
deleted file mode 100644
index 6749375..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/preferences/XMLValidatorPreferencePage.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     David Carver - STAR - [205989] - [validation] validate XML after XInclude resolution
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.preferences;
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.editor.IHelpContextIds;
-
-
-public class XMLValidatorPreferencePage extends AbstractPreferencePage {
-  private Combo fIndicateNoGrammar;
-
-  private Button fHonourAllSchemaLocations;
-
-  private Button fUseXinclude;
- 
-  private static final String[] SEVERITIES = {XMLUIMessages.Indicate_no_grammar_specified_severities_error, XMLUIMessages.Indicate_no_grammar_specified_severities_warning, XMLUIMessages.Indicate_no_grammar_specified_severities_ignore};
-
-  protected Control createContents(Composite parent) {
-    Composite composite = (Composite)super.createContents(parent);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, IHelpContextIds.XML_PREFWEBX_VALIDATOR_HELPID);
-    createContentsForValidatingGroup(composite);
-
-    setSize(composite);
-    loadPreferences();
-
-    return composite;
-  }
-
-  protected void createContentsForValidatingGroup(Composite parent) {
-    Group validatingGroup = createGroup(parent, 2);
-    ((GridLayout)validatingGroup.getLayout()).makeColumnsEqualWidth = false;
-    validatingGroup.setText(XMLUIMessages.Validating_files);
-
-    if (fIndicateNoGrammar == null) {
-      createLabel(validatingGroup, XMLUIMessages.Indicate_no_grammar_specified);
-      fIndicateNoGrammar = createCombo(validatingGroup, SEVERITIES);
-    }
-    if (fUseXinclude == null) {
-      fUseXinclude = createCheckBox(validatingGroup, XMLUIMessages.Use_XInclude);
-      ((GridData)fUseXinclude.getLayoutData()).horizontalSpan = 2;
-    }
-    if (fHonourAllSchemaLocations == null) {
-      fHonourAllSchemaLocations = createCheckBox(validatingGroup, XMLUIMessages.Honour_all_schema_locations);
-      ((GridData)fHonourAllSchemaLocations.getLayoutData()).horizontalSpan = 2;
-    }
-  }
-
-  /**
-   * @param parent 
-   * @return
-   */
-  private Combo createCombo(Composite parent, String[] items) {
-    Combo combo = new Combo(parent, SWT.DROP_DOWN | SWT.READ_ONLY);
-    combo.setItems(items);
-
-    //GridData
-    GridData data = new GridData(SWT.FILL, SWT.CENTER, true, true);
-    combo.setLayoutData(data);
-
-    return combo;
-  }
-
-  protected void initializeValues() {
-    initializeValuesForValidatingGroup();
-  }
-
-  protected void initializeValuesForValidatingGroup() {
-    Preferences modelPreferences = getModelPreferences();
-    int indicateNoGrammarButtonSelected = modelPreferences.getInt(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR);
-    boolean useXIncludeButtonSelected = modelPreferences.getBoolean(XMLCorePreferenceNames.USE_XINCLUDE);
-
-    if (fIndicateNoGrammar != null) {
-      fIndicateNoGrammar.select(2 - indicateNoGrammarButtonSelected);
-      fIndicateNoGrammar.setText(SEVERITIES[2 - indicateNoGrammarButtonSelected]);
-    }
-    if (fUseXinclude != null) {
-      fUseXinclude.setSelection(useXIncludeButtonSelected);
-    }
-
-    boolean honourAllSelected = modelPreferences.getBoolean(XMLCorePreferenceNames.HONOUR_ALL_SCHEMA_LOCATIONS);
-    if (fHonourAllSchemaLocations != null) {
-      fHonourAllSchemaLocations.setSelection(honourAllSelected);
-    }
-  }
-
-  protected void performDefaultsForValidatingGroup() {
-    Preferences modelPreferences = getModelPreferences();
-    int indicateNoGrammarButtonSelected = modelPreferences.getDefaultInt(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR);
-    boolean useXIncludeButtonSelected = modelPreferences.getDefaultBoolean(XMLCorePreferenceNames.USE_XINCLUDE);
-
-    if (fIndicateNoGrammar != null) {
-      fIndicateNoGrammar.setSelection(new Point(indicateNoGrammarButtonSelected, 2 - indicateNoGrammarButtonSelected));
-      fIndicateNoGrammar.setText(SEVERITIES[indicateNoGrammarButtonSelected]);
-    }
-    if (fUseXinclude != null) {
-      fUseXinclude.setSelection(useXIncludeButtonSelected);
-    }
-
-    boolean honourAllButtonSelected = modelPreferences.getDefaultBoolean(XMLCorePreferenceNames.HONOUR_ALL_SCHEMA_LOCATIONS);
-    if (fHonourAllSchemaLocations != null) {
-      fHonourAllSchemaLocations.setSelection(honourAllButtonSelected);
-    }
-  }
-
-  protected void storeValuesForValidatingGroup()
-  {
-    Preferences modelPreferences = getModelPreferences();
-    if (fIndicateNoGrammar != null) {
-      int warnNoGrammarButtonSelected = 2 - fIndicateNoGrammar.getSelectionIndex();
-      modelPreferences.setValue(XMLCorePreferenceNames.INDICATE_NO_GRAMMAR, warnNoGrammarButtonSelected);
-    }
-    if (fUseXinclude != null) {
-      boolean useXIncludeButtonSelected = fUseXinclude.getSelection();
-      modelPreferences.setValue(XMLCorePreferenceNames.USE_XINCLUDE, useXIncludeButtonSelected);
-    }
-    if (fHonourAllSchemaLocations != null) {
-      boolean honourAllButtonSelected = fHonourAllSchemaLocations.getSelection();
-      modelPreferences.setValue(XMLCorePreferenceNames.HONOUR_ALL_SCHEMA_LOCATIONS, honourAllButtonSelected);
-    }
-  }
-  
-  protected void storeValues() {
-    storeValuesForValidatingGroup();
-  }
-
-  protected void performDefaults() {
-    performDefaultsForValidatingGroup();
-    super.performDefaults();
-  }
-  
-  protected Preferences getModelPreferences() {
-    return XMLCorePlugin.getDefault().getPluginPreferences();
-  }  
-  
-  protected void doSavePreferenceStore() {
-      XMLCorePlugin.getDefault().savePluginPreferences(); // model
-  }
-
-  public boolean performOk() {
-    boolean result = super.performOk();
-
-    doSavePreferenceStore();
-
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLCommentFoldingPosition.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLCommentFoldingPosition.java
deleted file mode 100644
index d9740e9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLCommentFoldingPosition.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.projection;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredCommentFoldingPosition;
-
-/**
- *
- */
-public class XMLCommentFoldingPosition extends AbstractStructuredCommentFoldingPosition {
-
-	/**
-	 * The region covering an XML comment
-	 */
-	private IStructuredDocumentRegion fRegion;
-	
-	/**
-	 * Create a folding position to cover a XML comment region
-	 * 
-	 * @param region
-	 */
-	public XMLCommentFoldingPosition(IStructuredDocumentRegion region) {
-		//can't use region.getLength here because doesn't work in DTD docs for some reason
-		super(region.getStartOffset(), region.getEndOffset() - region.getStartOffset());
-		this.fRegion = region;
-	}
-	
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredCommentFoldingPosition#getEndOffset()
-	 */
-	protected int getEndOffset() {
-		return fRegion.getEndOffset();
-	}
-
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredCommentFoldingPosition#getStartOffset()
-	 */
-	protected int getStartOffset() {
-		return fRegion.getStartOffset();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLElementFoldingPosition.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLElementFoldingPosition.java
deleted file mode 100644
index 233e301..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLElementFoldingPosition.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.projection;
-
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingPosition;
-
-/**
- * Folds an XML element
- */
-public class XMLElementFoldingPosition extends AbstractStructuredFoldingPosition {
-
-	/**
-	 * The region representing the start of the folding region
-	 */
-	private IStructuredDocumentRegion fStartRegion;
-	
-	/**
-	 * The region representing the end of the folding region, or <code>null</code>
-	 * if the entire folding region is represented by <code>fStartRegion</code>
-	 */
-	private IStructuredDocumentRegion fEndRegion;
-	
-	/**
-	 * <p>Used to represent a folding position that covers a single
-	 * {@link IStructuredDocumentRegion}.</p>
-	 * 
-	 * @param region the region that covers the entire position of the folding region
-	 */
-	public XMLElementFoldingPosition(IStructuredDocumentRegion region) {
-		super(region.getStartOffset(), region.getEndOffset()-region.getStartOffset());
-		this.fStartRegion = region;
-		this.fEndRegion = null;
-	}
-	
-	/**
-	 * <p>Used to represent a folding position that covers more then one
-	 * {@link IStructuredDocumentRegion}.</p>
-	 * 
-	 * @param startRegion the first region covered by this position
-	 * @param endRegion the last region covered by this position
-	 */
-	public XMLElementFoldingPosition(IStructuredDocumentRegion startRegion, IStructuredDocumentRegion endRegion) {
-		super(startRegion.getStartOffset(), endRegion.getEndOffset()-startRegion.getStartOffset());
-		this.fStartRegion = startRegion;
-		this.fEndRegion = endRegion;
-	}
-
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingPosition#getStartOffset()
-	 */
-	protected int getStartOffset() {
-		return fStartRegion.getStartOffset();
-	}
-	
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingPosition#getEndOffset()
-	 */
-	protected int getEndOffset() {
-		int endOffset;
-		if(fEndRegion != null) {
-			endOffset = fEndRegion.getEndOffset();
-		} else {
-			endOffset = fStartRegion.getEndOffset();
-		}
-		return endOffset;
-	}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLFoldingStrategy.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLFoldingStrategy.java
deleted file mode 100644
index 8665182..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/projection/XMLFoldingStrategy.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.projection;
-
-import org.eclipse.jface.text.Position;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.ui.internal.projection.AbstractStructuredFoldingStrategy;
-import org.eclipse.wst.xml.core.internal.document.CommentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-
-
-/**
- * A folding strategy for XML type structured documents.
- * See AbstractStructuredFoldingStrategy for more details.
- */
-public class XMLFoldingStrategy extends AbstractStructuredFoldingStrategy {
-
-	/**
-	 * Create an instance of the folding strategy.
-	 * Be sure to set the viewer and document after creation.
-	 */
-	public XMLFoldingStrategy() {
-		super();
-	}
-
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractFoldingStrategy#calcNewFoldPosition(org.eclipse.wst.sse.core.internal.provisional.IndexedRegion)
-	 */
-	protected Position calcNewFoldPosition(IndexedRegion indexedRegion) {
-		Position retPos = null;
-		
-		//only want to fold regions of the valid type and with a valid range
-		if(indexedRegionValidType(indexedRegion) && indexedRegion.getStartOffset() >= 0 && indexedRegion.getLength() >= 0) {
-			IDOMNode node = (IDOMNode)indexedRegion;
-			IStructuredDocumentRegion startRegion = node.getStartStructuredDocumentRegion();
-			IStructuredDocumentRegion endRegion = node.getEndStructuredDocumentRegion();
-			
-			//if the node has an endRegion (end tag) then folding region is
-			//	between the start and end tag
-			//else if the region is a comment
-			//else if the region is only an open tag or an open/close tag then don't fold it
-			if(startRegion != null && endRegion != null) {
-				retPos = new XMLElementFoldingPosition(startRegion, endRegion);
-			} else if(startRegion != null && indexedRegion instanceof CommentImpl) {
-				retPos = new XMLCommentFoldingPosition(startRegion);
-			}
-		}
-		
-		return retPos;
-	}
-
-	/**
-	 * @see org.eclipse.wst.sse.ui.internal.projection.AbstractFoldingStrategy#indexedRegionValidType(org.eclipse.wst.sse.core.internal.provisional.IndexedRegion)
-	 */
-	protected boolean indexedRegionValidType(IndexedRegion indexedRegion) {
-		return (indexedRegion instanceof IDOMNode) && !(indexedRegion instanceof IDOMText);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/EnumeratedStringPropertyDescriptor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/EnumeratedStringPropertyDescriptor.java
deleted file mode 100644
index a4bd9f6..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/EnumeratedStringPropertyDescriptor.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.properties;
-
-
-
-import java.util.Arrays;
-
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.views.properties.PropertyDescriptor;
-
-/**
- * This class should be used for properties which require a combo box cell
- * editor and whose values consist of a list of enumerated strings.
- */
-public class EnumeratedStringPropertyDescriptor extends PropertyDescriptor {
-	protected StringComboBoxCellEditor fEditor;
-	protected Composite fParent;
-
-	/**
-	 * The enumerated possible values for the described property
-	 */
-	protected String fValues[] = null;
-
-	public EnumeratedStringPropertyDescriptor(Object id, String newDisplayName, String[] valuesArray) {
-		super(id, newDisplayName);
-		setDescription((String) id);
-		fValues = valuesArray;
-	}
-
-	/**
-	 * Creates and returns a new cell editor for editing this property.
-	 * Returns <code>null</code> if the property is not editable.
-	 * 
-	 * @param parent
-	 *            the parent widget for the cell editor
-	 * @return the cell editor for this property, or <code>null</code> if
-	 *         this property cannot be edited
-	 */
-	public CellEditor createPropertyEditor(Composite parent) {
-		// Check to see if we already have a Cell Editor with a valid Control
-		// under the given parent.
-		// If any of that's not true, create and return a new Cell Editor
-		if ((fEditor == null) || (fEditor.getControl() == null) || fEditor.getControl().isDisposed() || (parent != fParent)) {
-			fEditor = new StringComboBoxCellEditor(parent, fValues);
-		}
-		fParent = parent;
-		return fEditor;
-	}
-
-	public void updateValues(String newValues[]) {
-		if (Arrays.equals(fValues, newValues)) {
-			return;
-		}
-		fValues = newValues;
-		if (fEditor != null) {
-			fEditor.setItems(newValues);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/StringComboBoxCellEditor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/StringComboBoxCellEditor.java
deleted file mode 100644
index a6536be..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/StringComboBoxCellEditor.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.properties;
-
-
-
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.sse.ui.internal.Logger;
-
-
-/**
- * An extended ComboBoxCellEditor that selects and returns Strings
- */
-
-public class StringComboBoxCellEditor extends ComboBoxCellEditor {
-	private boolean fSettingValue = false;
-
-	/**
-	 * 
-	 */
-	public StringComboBoxCellEditor() {
-		super();
-	}
-
-	/**
-	 * @param parent
-	 * @param items
-	 */
-	public StringComboBoxCellEditor(Composite parent, String[] items) {
-		super(parent, items);
-	}
-
-	/**
-	 * @param parent
-	 * @param items
-	 * @param style
-	 */
-	public StringComboBoxCellEditor(Composite parent, String[] items, int style) {
-		super(parent, items, style);
-	}
-
-	protected Object doGetValue() {
-		// otherwise limits to set of valid values
-		Object index = super.doGetValue();
-		int selection = -1;
-		if (index instanceof Integer) {
-			selection = ((Integer) index).intValue();
-		}
-		if (selection >= 0) {
-			return getItems()[selection];
-		}
-		else if (getControl() instanceof CCombo) {
-			// retrieve the actual text as the list of valid items doesn't
-			// contain the value
-			return ((CCombo) getControl()).getText();
-		}
-		return null;
-	}
-
-	protected void doSetValue(Object value) {
-		if (fSettingValue) {
-			return;
-		}
-		fSettingValue = true;
-		if (value instanceof Integer) {
-			super.doSetValue(value);
-		}
-		else {
-			String stringValue = value.toString();
-			int selection = -1;
-			for (int i = 0; i < getItems().length; i++) {
-				if (getItems()[i].equals(stringValue)) {
-					selection = i;
-				}
-			}
-			if (selection >= 0) {
-				super.doSetValue(new Integer(selection));
-			}
-			else {
-				super.doSetValue(new Integer(-1));
-				if ((getControl() instanceof CCombo) && !stringValue.equals(((CCombo) getControl()).getText())) {
-					// update the Text widget
-					((CCombo) getControl()).setText(stringValue);
-				}
-			}
-		}
-		fSettingValue = false;
-	}
-
-	public void setItems(String[] newItems) {
-		if ((getControl() == null) || getControl().isDisposed()) {
-			Logger.log(Logger.ERROR, "Attempted to update item list for disposed cell editor"); //$NON-NLS-1$
-			return;
-		}
-
-		// keep selection if possible
-		Object previousSelectedValue = getValue();
-		super.setItems(newItems);
-		if ((previousSelectedValue != null) && (getControl() instanceof CCombo)) {
-			for (int i = 0; i < newItems.length; i++) {
-				if (newItems[i].equals(previousSelectedValue)) {
-					setValue(previousSelectedValue);
-				}
-			}
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/XMLPropertySource.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/XMLPropertySource.java
deleted file mode 100644
index d9c2ed4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/properties/XMLPropertySource.java
+++ /dev/null
@@ -1,833 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.properties;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.IPropertyDescriptor;
-import org.eclipse.ui.views.properties.IPropertySheetEntry;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySource2;
-import org.eclipse.ui.views.properties.TextPropertyDescriptor;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.views.properties.IPropertySourceExtension;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.document.DocumentTypeAdapter;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * An IPropertySource implementation for a JFace viewer used to display
- * properties of DOM nodes.
- */
-public class XMLPropertySource implements IPropertySource, IPropertySourceExtension, IPropertySource2 {
-	protected final static String CATEGORY_ATTRIBUTES = XMLUIMessages.XMLPropertySourceAdapter_0;
-
-	/**
-	 * Controls whether optional attributes are marked as for "experts"
-	 */
-	private static final boolean fSetExpertFilter = false;
-
-	/**
-	 * Controls whether to derive categories from CMDataTypes; disabled by
-	 * default until display strings can be planned
-	 */
-	private boolean fShouldDeriveCategories = false;
-
-	private final static boolean fSortEnumeratedValues = true;
-
-	/**
-	 * Note: we want the default fCaseSensitive to be true, but, to avoid
-	 * meaningless double initialization, we leave default here, and set in
-	 * constructor only.
-	 */
-	private boolean fCaseSensitive;
-	private IPropertyDescriptor[] fDescriptors = null;
-	private Node fNode = null;
-
-	private Stack fValuesBeingSet = new Stack();
-
-	public XMLPropertySource(INodeNotifier target) {
-		super();
-		fNode = initNode(target);
-		fCaseSensitive = initCaseSensitive(fNode);
-	}
-
-	public XMLPropertySource(Node target, boolean useCategories) {
-		super();
-		initNode(target);
-		fNode = target;
-		fCaseSensitive = initCaseSensitive(fNode);
-		fShouldDeriveCategories = useCategories;
-	}
-
-	/** Separate method just to isolate error processing */
-	private static INodeNotifier initNode(Node target) {
-		if (target instanceof INodeNotifier) {
-			return (INodeNotifier) target;
-		}
-		throw new IllegalArgumentException("XMLPropertySource is only for INodeNotifiers"); //$NON-NLS-1$
-	}
-
-	/** Separate method just to isolate error processing */
-	private static Node initNode(INodeNotifier target) {
-		if (target instanceof Node) {
-			return (Node) target;
-		}
-		throw new IllegalArgumentException("XMLPropertySource is only for W3C DOM Nodes"); //$NON-NLS-1$
-	}
-
-	private boolean initCaseSensitive(Node node) {
-		// almost all tags are case sensitive, except that old HTML
-		boolean caseSensitive = true;
-		if (node instanceof IDOMNode) {
-			DocumentTypeAdapter adapter = getDocTypeFromDOMNode(node);
-			if (adapter != null) {
-				caseSensitive = (adapter.getTagNameCase() == DocumentTypeAdapter.STRICT_CASE);
-			}
-		}
-		return caseSensitive;
-	}
-
-	/**
-	 * by "internal spec" the DOCTYPE adapter is only available from Document
-	 * Node
-	 * 
-	 * @return {@link DocumentTypeAdapter}
-	 */
-	private DocumentTypeAdapter getDocTypeFromDOMNode(Node node) {
-		DocumentTypeAdapter adapter = null;
-		Document ownerDocument = node.getOwnerDocument();
-		if (ownerDocument == null) {
-			// if ownerDocument is null, then fNode must be the Document Node
-			// [old, old comment]
-			// hmmmm, guess not. See
-			// https://bugs.eclipse.org/bugs/show_bug.cgi?id=130233
-			// guess this is used for many INodeNotifiers, not just XML.
-			// (and DTD's use IDOMNode? ... that doesn't sound quite right
-			// ... but, maybe a separate issue).
-			if (node instanceof Document) {
-				ownerDocument = (Document) node;
-			}
-		}
-		if (ownerDocument != null) {
-			adapter = (DocumentTypeAdapter) ((INodeNotifier) ownerDocument).getAdapterFor(DocumentTypeAdapter.class);
-		}
-
-		return adapter;
-	}
-
-	private String[] _getValidFixedStrings(CMAttributeDeclaration attrDecl, CMDataType helper) {
-		String attributeName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-		List values = new ArrayList(1);
-		String impliedValue = helper.getImpliedValue();
-		if (impliedValue != null) {
-			values.add(impliedValue);
-		}
-		boolean checkIfCurrentValueIsIncluded = ((fNode.getAttributes() != null) && (fNode.getAttributes().getNamedItem(attributeName) != null) && (fNode.getAttributes().getNamedItem(attributeName).getNodeValue() != null));
-		if (checkIfCurrentValueIsIncluded) {
-			String currentValue = null;
-			currentValue = fNode.getAttributes().getNamedItem(attributeName).getNodeValue();
-			if (!currentValue.equals(impliedValue)) {
-				values.add(currentValue);
-			}
-		}
-		String[] validStrings = new String[values.size()];
-		validStrings = (String[]) values.toArray(validStrings);
-		return validStrings;
-	}
-
-	private String[] _getValidStrings(CMAttributeDeclaration attrDecl, CMDataType valuesHelper) {
-		String attributeName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-		List values = new ArrayList(1);
-		boolean currentValueKnown = false;
-		boolean checkIfCurrentValueIsKnown = ((fNode.getAttributes() != null) && (fNode.getAttributes().getNamedItem(attributeName) != null) && (fNode.getAttributes().getNamedItem(attributeName).getNodeValue() != null));
-		String currentValue = null;
-		if (checkIfCurrentValueIsKnown) {
-			currentValue = fNode.getAttributes().getNamedItem(attributeName).getNodeValue();
-		}
-
-		if ((valuesHelper.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED) && (valuesHelper.getImpliedValue() != null)) {
-			// FIXED value
-			currentValueKnown = (currentValue != null) && valuesHelper.getImpliedValue().equals(currentValue);
-			values.add(valuesHelper.getImpliedValue());
-		}
-		else {
-			// ENUMERATED values
-			String[] valueStrings = null;
-			// valueStrings = valuesHelper.getEnumeratedValues();
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(fNode.getOwnerDocument());
-			if ((modelQuery != null) && (fNode.getNodeType() == Node.ELEMENT_NODE)) {
-				valueStrings = modelQuery.getPossibleDataTypeValues((Element) fNode, attrDecl);
-			}
-			else {
-				valueStrings = attrDecl.getAttrType().getEnumeratedValues();
-			}
-			if (valueStrings != null) {
-				for (int i = 0; i < valueStrings.length; i++) {
-					if (checkIfCurrentValueIsKnown && valueStrings[i].equals(currentValue)) {
-						currentValueKnown = true;
-					}
-					values.add(valueStrings[i]);
-				}
-			}
-		}
-		if ((valuesHelper.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE) && (valuesHelper.getImpliedValue() != null)) {
-			if (!values.contains(valuesHelper.getImpliedValue())) {
-				values.add(valuesHelper.getImpliedValue());
-			}
-		}
-
-		if (checkIfCurrentValueIsKnown && !currentValueKnown && (currentValue != null) && (currentValue.length() > 0)) {
-			values.add(currentValue);
-		}
-		String[] validStrings = new String[values.size()];
-		validStrings = (String[]) values.toArray(validStrings);
-		return validStrings;
-	}
-
-	private IPropertyDescriptor createDefaultPropertyDescriptor(String attributeName) {
-		return createDefaultPropertyDescriptor(attributeName, false);
-	}
-
-	private IPropertyDescriptor createDefaultPropertyDescriptor(String attributeName, boolean hideOnFilter) {
-		// The descriptor class used here is also used in
-		// updatePropertyDescriptors()
-		TextPropertyDescriptor descriptor = new TextPropertyDescriptor(attributeName, attributeName);
-		descriptor.setCategory(getCategory(null, null));
-		descriptor.setDescription(attributeName);
-		if (hideOnFilter && fSetExpertFilter) {
-			descriptor.setFilterFlags(new String[]{IPropertySheetEntry.FILTER_ID_EXPERT});
-		}
-		return descriptor;
-	}
-
-	/**
-	 * Creates a property descriptor for an attribute with ENUMERATED values -
-	 * if the value does not exist, an editable combo box is returned - if the
-	 * value exists but is not one in the enumerated list of value, a combo
-	 * box featuring the current and correct values is returned - if the value
-	 * exists and it is a valid value, a combo box featuring the correct
-	 * values with the current one visible is returned
-	 */
-	private IPropertyDescriptor createEnumeratedPropertyDescriptor(CMAttributeDeclaration attrDecl, CMDataType valuesHelper, Attr attr) {
-		// the displayName MUST be set
-		String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-		EnumeratedStringPropertyDescriptor descriptor = new EnumeratedStringPropertyDescriptor(attrName, attrName, _getValidStrings(attrDecl, valuesHelper));
-		descriptor.setCategory(getCategory(attrDecl, attr));
-		descriptor.setDescription(attrName);
-		if ((attrDecl.getUsage() != CMAttributeDeclaration.REQUIRED) && fSetExpertFilter) {
-			descriptor.setFilterFlags(new String[]{IPropertySheetEntry.FILTER_ID_EXPERT});
-		}
-		return descriptor;
-	}
-
-	/**
-	 * Creates a property descriptor for an attribute with a FIXED value - if
-	 * the value does not exist, an editable combo box is returned - if the
-	 * value exists but is not the fixed/default value, a combo box featuring
-	 * the current and correct value is returned - if the value exists and it
-	 * is the fixed/default value, no cell editor is provided "locking" the
-	 * value in
-	 */
-	private IPropertyDescriptor createFixedPropertyDescriptor(CMAttributeDeclaration attrDecl, CMDataType helper, Attr attr) {
-		// the displayName MUST be set
-		String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-		EnumeratedStringPropertyDescriptor descriptor = new EnumeratedStringPropertyDescriptor(attrName, attrName, _getValidFixedStrings(attrDecl, helper));
-		descriptor.setCategory(getCategory(attrDecl, attr));
-		descriptor.setDescription(DOMNamespaceHelper.computeName(attrDecl, fNode, null));
-		return descriptor;
-	}
-
-	protected IPropertyDescriptor createPropertyDescriptor(CMAttributeDeclaration attrDecl, Attr attr) {
-		IPropertyDescriptor descriptor = null;
-		CMDataType attrType = attrDecl.getAttrType();
-
-		if (attrType != null) {
-			// handle declarations that provide FIXED/ENUMERATED values
-			if ((attrType.getEnumeratedValues() != null) && (attrType.getEnumeratedValues().length > 0)) {
-				descriptor = createEnumeratedPropertyDescriptor(attrDecl, attrType, attr);
-			}
-			else if (((attrDecl.getUsage() == CMAttributeDeclaration.FIXED) || (attrType.getImpliedValueKind() == CMDataType.IMPLIED_VALUE_FIXED)) && (attrType.getImpliedValue() != null)) {
-				descriptor = createFixedPropertyDescriptor(attrDecl, attrType, attr);
-			}
-			else {
-				// plain text
-				descriptor = createTextPropertyDescriptor(attrDecl, attr);
-			}
-		}
-		else {
-			// no extra information given
-			descriptor = createTextPropertyDescriptor(attrDecl, attr);
-		}
-		return descriptor;
-	}
-
-	/**
-	 * Returns the current collection of property descriptors.
-	 * 
-	 * @return all valid descriptors.
-	 */
-	private IPropertyDescriptor[] createPropertyDescriptors() {
-		CMNamedNodeMap attrMap = null;
-		CMElementDeclaration ed = getDeclaration();
-		if (ed != null) {
-			attrMap = ed.getAttributes();
-			CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attrMap);
-			List nodes = ModelQueryUtil.getModelQuery(fNode.getOwnerDocument()).getAvailableContent((Element) fNode, ed, ModelQuery.INCLUDE_ATTRIBUTES);
-			for (int k = 0; k < nodes.size(); k++) {
-				CMNode cmnode = (CMNode) nodes.get(k);
-				if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-					allAttributes.put(cmnode);
-				}
-			}
-			attrMap = allAttributes;
-		}
-
-		List descriptorList = new ArrayList();
-		List names = new ArrayList();
-		IPropertyDescriptor descriptor;
-
-		CMAttributeDeclaration attrDecl = null;
-
-		// add descriptors for existing attributes
-		NamedNodeMap attributes = fNode.getAttributes();
-		if (attributes != null) {
-			for (int i = 0; i < attributes.getLength(); i++) {
-				Attr attr = (Attr) attributes.item(i);
-				// if metainfo is present for this attribute, use the
-				// CMAttributeDeclaration to derive a descriptor
-				if (attrMap != null) {
-					String attrName = attr.getName();
-					if (fCaseSensitive) {
-						attrDecl = (CMAttributeDeclaration) attrMap.getNamedItem(attrName);
-					}
-					else {
-						attrDecl = null;
-						for (int j = 0; j < attrMap.getLength(); j++) {
-							if (!fCaseSensitive && attrMap.item(j).getNodeName().equalsIgnoreCase(attrName)) {
-								attrDecl = (CMAttributeDeclaration) attrMap.item(j);
-								break;
-							}
-						}
-					}
-				}
-				// be consistent: if there's metainfo, use *that* as the
-				// descriptor ID
-				descriptor = null;
-				if (attrDecl != null) {
-					String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-					if (!names.contains(attrName)) {
-						descriptor = createPropertyDescriptor(attrDecl, attr);
-						if (descriptor != null)
-							names.add(attrName);
-					}
-				}
-				else {
-					if (!names.contains(attr.getName())) {
-						descriptor = createDefaultPropertyDescriptor(attr.getName());
-						if (descriptor != null)
-							names.add(attr.getName());
-					}
-				}
-				if (descriptor != null) {
-					descriptorList.add(descriptor);
-				}
-			}
-		}
-
-		// add descriptors from the metainfo that are not yet listed
-		if (attrMap != null) {
-			for (int i = 0; i < attrMap.getLength(); i++) {
-				attrDecl = (CMAttributeDeclaration) attrMap.item(i);
-				String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-				if (!names.contains(attrName)) {
-					IPropertyDescriptor holdDescriptor = createPropertyDescriptor(attrDecl, null);
-					if (holdDescriptor != null) {
-						names.add(attrName);
-						descriptorList.add(holdDescriptor);
-					}
-				}
-			}
-		}
-
-		// add MQE-based descriptors
-		if (ed != null && fNode.getNodeType() == Node.ELEMENT_NODE) {
-			List nodes = ModelQueryUtil.getModelQuery(fNode.getOwnerDocument()).getAvailableContent((Element) fNode, ed, ModelQuery.INCLUDE_ATTRIBUTES);
-			for (int i = 0; i < nodes.size(); i++) {
-				CMNode node = (CMNode) nodes.get(i);
-				if (node.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-					attrDecl = (CMAttributeDeclaration) node;
-					String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-					if (!names.contains(attrName)) {
-						IPropertyDescriptor holdDescriptor = createPropertyDescriptor(attrDecl, null);
-						if (holdDescriptor != null) {
-							names.add(attrName);
-							descriptorList.add(holdDescriptor);
-						}
-					}
-				}
-			}
-		}
-
-
-		IPropertyDescriptor[] descriptors = new IPropertyDescriptor[descriptorList.size()];
-		for (int i = 0; i < descriptors.length; i++) {
-			descriptors[i] = (IPropertyDescriptor) descriptorList.get(i);
-		}
-		return descriptors;
-	}
-
-	private IPropertyDescriptor createTextPropertyDescriptor(CMAttributeDeclaration attrDecl, Attr attr) {
-		String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-		TextPropertyDescriptor descriptor = new TextPropertyDescriptor(attrName, attrName);
-		descriptor.setCategory(getCategory(attrDecl, attr));
-		descriptor.setDescription(attrName);
-		if ((attrDecl.getUsage() != CMAttributeDeclaration.REQUIRED) && fSetExpertFilter) {
-			descriptor.setFilterFlags(new String[]{IPropertySheetEntry.FILTER_ID_EXPERT});
-		}
-		return descriptor;
-	}
-
-	private String getCategory(CMAttributeDeclaration attrDecl, Attr attr) {
-		if (attr != null) {
-			String namespaceURI = attr.getNamespaceURI();
-			if (namespaceURI == null)
-				namespaceURI = attr.getOwnerElement().getNamespaceURI();
-			if (namespaceURI != null)
-				return namespaceURI;
-		}
-		if (attrDecl != null) {
-			if (attrDecl.supports("category")) { //$NON-NLS-1$
-				return (String) attrDecl.getProperty("category"); //$NON-NLS-1$
-			}
-			if (fShouldDeriveCategories && (attrDecl.getAttrType() != null) && (attrDecl.getAttrType().getDataTypeName() != null) && (attrDecl.getAttrType().getDataTypeName().length() > 0)) {
-				return attrDecl.getAttrType().getDataTypeName();
-			}
-		}
-		return CATEGORY_ATTRIBUTES;
-	}
-
-	private CMElementDeclaration getDeclaration() {
-		if ((fNode == null) || (fNode.getNodeType() != Node.ELEMENT_NODE)) {
-			return null;
-		}
-		ModelQuery modelQuery = ModelQueryUtil.getModelQuery(fNode.getOwnerDocument());
-		if (modelQuery != null) {
-			return modelQuery.getCMElementDeclaration((Element) fNode);
-		}
-		return null;
-	}
-
-	private Display getDisplay() {
-
-		return PlatformUI.getWorkbench().getDisplay();
-	}
-
-	/**
-	 * Returns a value for this Node that can be editted in a property sheet.
-	 * 
-	 * @return a value that can be editted
-	 */
-	public Object getEditableValue() {
-		return null;
-	}
-
-	/**
-	 * Returns the current collection of property descriptors.
-	 * 
-	 * @return all valid descriptors.
-	 */
-	public final IPropertyDescriptor[] getPropertyDescriptors() {
-		if ((fDescriptors == null) || (fDescriptors.length == 0)) {
-			fDescriptors = createPropertyDescriptors();
-		}
-		else {
-			updatePropertyDescriptors();
-		}
-		return fDescriptors;
-	}
-
-	/**
-	 * Returns the current value for the named property.
-	 * 
-	 */
-	public Object getPropertyValue(Object nameObject) {
-		String name = nameObject.toString();
-		String returnedValue = null;
-		NamedNodeMap attrMap = fNode.getAttributes();
-		if (attrMap != null) {
-			Node attribute = attrMap.getNamedItem(name);
-			if (attribute != null) {
-				if (attribute instanceof IDOMNode) {
-					returnedValue = ((IDOMNode) attribute).getValueSource();
-				}
-				else {
-					returnedValue = attribute.getNodeValue();
-				}
-			}
-		}
-		if (returnedValue == null) {
-			returnedValue = ""; //$NON-NLS-1$
-		}
-		return returnedValue;
-	}
-
-	private String[] getValidValues(CMAttributeDeclaration attrDecl) {
-		if (attrDecl == null) {
-			return new String[0];
-		}
-
-		String[] validValues = null;
-		CMDataType attrType = attrDecl.getAttrType();
-		if (attrType != null) {
-			validValues = _getValidStrings(attrDecl, attrType);
-			if (fSortEnumeratedValues) {
-				Arrays.sort(validValues);
-			}
-		}
-		if (validValues == null) {
-			validValues = new String[0];
-		}
-		return validValues;
-	}
-
-	public boolean isPropertyRemovable(Object id) {
-		return true;
-	}
-
-	public boolean isPropertyResettable(Object id) {
-		return fNode != null && fNode.getNodeType() == Node.ELEMENT_NODE;
-	}
-
-	/**
-	 * Returns whether the property value has changed from the default.
-	 * 
-	 * @return <code>true</code> if the value of the specified property has
-	 *         changed from its original default value; <code>false</code>
-	 *         otherwise.
-	 */
-	public boolean isPropertySet(Object propertyObject) {
-		String property = propertyObject.toString();
-
-		NamedNodeMap attrMap = fNode.getAttributes();
-		if (attrMap != null) {
-			return attrMap.getNamedItem(property) != null;
-		}
-		return false;
-	}
-
-	/**
-	 * Remove the given attribute from the Node
-	 * 
-	 * @param propertyObject
-	 */
-	public void removeProperty(Object propertyObject) {
-		NamedNodeMap attrMap = fNode.getAttributes();
-		if (attrMap != null) {
-			Node attribute = attrMap.getNamedItem(propertyObject.toString());
-			if (attribute != null) {
-				try {
-					attrMap.removeNamedItem(propertyObject.toString());
-				}
-				catch (DOMException e) {
-					if (e.code != DOMException.INVALID_MODIFICATION_ERR) {
-						Logger.logException(e);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Resets the specified property's value to its default value.
-	 */
-	public void resetPropertyValue(Object propertyObject) {
-		String property = propertyObject.toString();
-		CMNamedNodeMap attrDecls = null;
-
-		CMElementDeclaration ed = getDeclaration();
-		if (ed != null) {
-			attrDecls = ed.getAttributes();
-			CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attrDecls);
-			List nodes = ModelQueryUtil.getModelQuery(fNode.getOwnerDocument()).getAvailableContent((Element) fNode, ed, ModelQuery.INCLUDE_ATTRIBUTES);
-			for (int k = 0; k < nodes.size(); k++) {
-				CMNode cmnode = (CMNode) nodes.get(k);
-				if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-					allAttributes.put(cmnode);
-				}
-			}
-			attrDecls = allAttributes;
-		}
-
-		NamedNodeMap attrMap = fNode.getAttributes();
-		if (attrDecls != null) {
-			CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) attrDecls.getNamedItem(property);
-			String defValue = null;
-			if (attrDecl != null) {
-				if (attrDecl.getAttrType() != null) {
-					CMDataType helper = attrDecl.getAttrType();
-					if ((helper.getImpliedValueKind() != CMDataType.IMPLIED_VALUE_NONE) && (helper.getImpliedValue() != null)) {
-						defValue = helper.getImpliedValue();
-					}
-				}
-			}
-			if ((defValue != null) && (defValue.length() > 0)) {
-				((Attr) attrMap.getNamedItem(property)).setValue(defValue);
-			}
-			else {
-				// remember, this method is for reset, not remove
-				((Attr) attrMap.getNamedItem(property)).setValue(""); //$NON-NLS-1$
-			}
-		}
-		else {
-			// remember, this method is for reset, not remove
-			((Attr) attrMap.getNamedItem(property)).setValue(""); //$NON-NLS-1$
-		}
-	}
-
-	/**
-	 * Sets the named property to the given value.
-	 * 
-	 */
-	public void setPropertyValue(Object nameObject, Object value) {
-		// Avoid cycling - can happen if a closing cell editor causes a
-		// refresh
-		// on the PropertySheet page and the setInput again asks the editor to
-		// close; besides, why apply the same value twice?
-		if (!fValuesBeingSet.isEmpty() && (fValuesBeingSet.peek() == nameObject)) {
-			return;
-		}
-		fValuesBeingSet.push(nameObject);
-		String name = nameObject.toString();
-		String valueString = ""; //$NON-NLS-1$
-		if (value != null) {
-			valueString = value.toString();
-		}
-		NamedNodeMap attrMap = fNode.getAttributes();
-		try {
-			if (attrMap != null) {
-				Attr attr = (Attr) attrMap.getNamedItem(name);
-				if (attr != null) {
-					// EXISTING VALUE
-					// potential out of control loop if updating the value
-					// triggers a viewer update, forcing the
-					// active cell editor to save its value and causing the
-					// loop to continue
-					if ((attr.getValue() == null) || !attr.getValue().equals(valueString)) {
-						if (attr instanceof IDOMNode) {
-							((IDOMNode) attr).setValueSource(valueString);
-						}
-						else {
-							attr.setValue(valueString);
-						}
-					}
-				}
-				else {
-					// NEW(?) value
-					Attr newAttr = fNode.getOwnerDocument().createAttribute(name);
-					if (newAttr instanceof IDOMNode) {
-						((IDOMNode) newAttr).setValueSource(valueString);
-					}
-					else {
-						newAttr.setValue(valueString);
-					}
-					attrMap.setNamedItem(newAttr);
-				}
-			}
-			else {
-				if (fNode instanceof Element) {
-					((Element) fNode).setAttribute(name, valueString);
-				}
-			}
-		}
-		catch (DOMException e) {
-			Display d = getDisplay();
-			if (d != null) {
-				d.beep();
-			}
-		}
-		fValuesBeingSet.pop();
-	}
-
-	protected void updatePropertyDescriptors() {
-		if ((fDescriptors == null) || (fDescriptors.length == 0)) {
-			// Nothing to update
-			return;
-		}
-
-		// List of all names encountered in the tag and defined by the element
-		List declaredNames = new ArrayList();
-		// New descriptor list that will become fDescriptors after all
-		// processing is done
-		List descriptors = new ArrayList();
-		// Names of the descriptors in the above List
-		List descriptorNames = new ArrayList();
-
-		// Update any descriptors derived from the metainfo
-		CMElementDeclaration ed = getDeclaration();
-		CMNamedNodeMap attrMap = null;
-		if (ed != null) {
-			attrMap = ed.getAttributes();
-			CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attrMap);
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(fNode.getOwnerDocument());
-			if(modelQuery != null) {
-			List nodes = modelQuery.getAvailableContent((Element) fNode, ed, ModelQuery.INCLUDE_ATTRIBUTES);
-				for (int k = 0; k < nodes.size(); k++) {
-					CMNode cmnode = (CMNode) nodes.get(k);
-					if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-						allAttributes.put(cmnode);
-					}
-				}
-			}
-			attrMap = allAttributes;
-		}
-		// Update exiting descriptors; not added to the final list here
-		if (attrMap != null) {
-			// Update existing descriptor types based on metainfo
-			CMAttributeDeclaration attrDecl = null;
-			for (int i = 0; i < attrMap.getLength(); i++) {
-				attrDecl = (CMAttributeDeclaration) attrMap.item(i);
-				String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-				if (!declaredNames.contains(attrName)) {
-					declaredNames.add(attrName);
-				}
-				for (int j = 0; j < fDescriptors.length; j++) {
-					boolean sameName = (fCaseSensitive && fDescriptors[j].getId().equals(attrDecl.getNodeName())) || (!fCaseSensitive && attrDecl.getNodeName().equals(fDescriptors[j].getId().toString()));
-					if (sameName) {
-						String[] validValues = getValidValues(attrDecl);
-						// Update the descriptor for this
-						// CMAttributeDeclaration (only enumerated values get
-						// updated for now)
-						if (fDescriptors[j] instanceof EnumeratedStringPropertyDescriptor) {
-							((EnumeratedStringPropertyDescriptor) fDescriptors[j]).updateValues(validValues);
-						}
-						// Replace with better descriptor
-						else if ((validValues != null) && (validValues.length > 0)) {
-							fDescriptors[j] = createPropertyDescriptor(attrDecl, null);
-						}
-					}
-				}
-			}
-		}
-		else {
-			// Update existing descriptors based on not having any metainfo
-			for (int j = 0; j < fDescriptors.length; j++) {
-				// Replace with basic descriptor
-				if (!(fDescriptors[j] instanceof TextPropertyDescriptor)) {
-					fDescriptors[j] = createDefaultPropertyDescriptor((String) fDescriptors[j].getId());
-				}
-			}
-		}
-
-		NamedNodeMap attributes = fNode.getAttributes();
-
-		// Remove descriptors for attributes that aren't present AND aren't
-		// known through metainfo,
-		// do this by only reusing existing descriptors for attributes that
-		// are present or declared
-		for (int i = 0; i < fDescriptors.length; i++) {
-			if (fDescriptors[i] != null) {
-				String descriptorName = fDescriptors[i].getId().toString();
-				if ((declaredNames.contains(descriptorName) || (attributes.getNamedItem(descriptorName) != null)) && !descriptorNames.contains(descriptorName)) {
-					descriptorNames.add(descriptorName);
-					descriptors.add(fDescriptors[i]);
-				}
-			}
-		}
-
-		// Add descriptors for declared attributes that don't already have one
-		if (attrMap != null) {
-			// Update existing descriptor types based on metainfo
-			CMAttributeDeclaration attrDecl = null;
-			for (int i = 0; i < attrMap.getLength(); i++) {
-				attrDecl = (CMAttributeDeclaration) attrMap.item(i);
-				String attrName = DOMNamespaceHelper.computeName(attrDecl, fNode, null);
-				if (fCaseSensitive) {
-					if (!descriptorNames.contains(attrName)) {
-						IPropertyDescriptor descriptor = createPropertyDescriptor(attrDecl, null);
-						if (descriptor != null) {
-							descriptorNames.add(attrName);
-							descriptors.add(descriptor);
-						}
-					}
-				}
-				else {
-					boolean exists = false;
-					for (int j = 0; j < descriptorNames.size(); j++) {
-						exists = (descriptorNames.get(j).toString().equalsIgnoreCase(attrName)) || exists;
-					}
-					if (!exists) {
-						descriptorNames.add(attrName);
-						IPropertyDescriptor descriptor = createPropertyDescriptor(attrDecl, null);
-						if (descriptor != null) {
-							descriptorNames.add(attrName);
-							descriptors.add(descriptor);
-						}
-					}
-				}
-			}
-		}
-
-		// Add descriptors for existing attributes that don't already have one
-		if (attributes != null) {
-			for (int i = 0; i < attributes.getLength(); i++) {
-				Attr attr = (Attr) attributes.item(i);
-				String attrName = attr.getName();
-				if (fCaseSensitive) {
-					if (!descriptorNames.contains(attrName)) {
-						descriptorNames.add(attrName);
-						descriptors.add(createDefaultPropertyDescriptor(attrName));
-					}
-				}
-				else {
-					boolean exists = false;
-					for (int j = 0; j < descriptorNames.size(); j++) {
-						exists = (descriptorNames.get(j).toString().equalsIgnoreCase(attrName)) || exists;
-					}
-					if (!exists) {
-						descriptorNames.add(attrName);
-						descriptors.add(createDefaultPropertyDescriptor(attrName));
-					}
-				}
-			}
-		}
-
-		// Update fDescriptors
-		IPropertyDescriptor[] newDescriptors = new IPropertyDescriptor[descriptors.size()];
-		for (int i = 0; i < newDescriptors.length; i++) {
-			newDescriptors[i] = (IPropertyDescriptor) descriptors.get(i);
-		}
-		fDescriptors = newDescriptors;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/provisional/IDOMSourceEditingTextTools.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/provisional/IDOMSourceEditingTextTools.java
deleted file mode 100644
index a018b08..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/provisional/IDOMSourceEditingTextTools.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.provisional;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.NodeLocation;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public interface IDOMSourceEditingTextTools extends ISourceEditingTextTools {
-	/**
-	 * Returns a W3C DOM document
-	 * 
-	 * @return Document object or <code>null</code> if corresponding
-	 *         document does not exist
-	 */
-	Document getDOMDocument();
-
-	/**
-	 * Returns the W3C DOM Node at the given offset
-	 * 
-	 * @param offset
-	 *            the offset within the IDocument
-	 * @return a Node at that location, if one is present
-	 * 
-	 * @throws BadLocationException
-	 *             for invalid offsets
-	 */
-	Node getNode(int offset) throws BadLocationException;
-
-	/**
-	 * Returns a NodeLocation object describing the position information of
-	 * the Node's start and end tags.
-	 * 
-	 * @param node
-	 * @return The NodeLocation for this Node, null for unsupported Node
-	 *         instances.
-	 */
-	NodeLocation getNodeLocation(Node node);
-
-	/**
-	 * Returns the current server-side page language for the Document of the
-	 * given Node.
-	 * 
-	 * @return The server-side page language for this nodem null for Nodes
-	 *         within unsupported Documents.
-	 */
-	String getPageLanguage(Node node);
-
-	/**
-	 * Returns start offset of given Node.
-	 * 
-	 * @param node
-	 *            w3c <code>Node</code> object to check
-	 * @return the start offset or -1 for unsupported Nodes
-	 */
-	int getStartOffset(Node node);
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/provisional/XMLSourceEditingTextTools.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/provisional/XMLSourceEditingTextTools.java
deleted file mode 100644
index 63a337e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/provisional/XMLSourceEditingTextTools.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.provisional;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.sse.ui.internal.StructuredTextViewer;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.ISourceEditingTextTools;
-import org.eclipse.wst.sse.ui.internal.provisional.extensions.breakpoint.NodeLocation;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-/**
- * Implements ISourceEditingTextTools interface
- */
-public class XMLSourceEditingTextTools implements IDOMSourceEditingTextTools, INodeAdapter {
-
-	protected class NodeLocationImpl implements NodeLocation {
-		private IDOMNode node;
-
-		public NodeLocationImpl(IDOMNode xmlnode) {
-			super();
-			node = xmlnode;
-		}
-
-		public int getEndTagEndOffset() {
-			if (node.getEndStructuredDocumentRegion() != null) {
-				return node.getEndStructuredDocumentRegion().getEndOffset();
-			}
-			return -1;
-		}
-
-		public int getEndTagStartOffset() {
-			if (node.getEndStructuredDocumentRegion() != null) {
-				return node.getEndStructuredDocumentRegion().getStartOffset();
-			}
-			return -1;
-		}
-
-		public int getStartTagEndOffset() {
-			if (node.getStartStructuredDocumentRegion() != null) {
-				return node.getStartStructuredDocumentRegion().getEndOffset();
-			}
-			return -1;
-		}
-
-		public int getStartTagStartOffset() {
-			if (node.getStartStructuredDocumentRegion() != null) {
-				return node.getStartStructuredDocumentRegion().getStartOffset();
-			}
-			return -1;
-		}
-	}
-
-	StructuredTextEditor fTextEditor = null;
-
-	public int getCaretOffset() {
-		StructuredTextViewer stv = fTextEditor.getTextViewer();
-		if ((stv != null) && (stv.getTextWidget() != null) && !stv.getTextWidget().isDisposed()) {
-			return stv.widgetOffset2ModelOffset(stv.getTextWidget().getCaretOffset());
-		}
-		return 0;
-	}
-
-	public IDocument getDocument() {
-		return fTextEditor.getDocumentProvider().getDocument(fTextEditor.getEditorInput());
-	}
-
-	public Document getDOMDocument() {
-		return (Document) fTextEditor.getModel().getAdapter(Document.class);
-	}
-
-	/*
-	 * If similar function is needed, composite it around the text editor's
-	 * instance. Removed also because it returns an alread-released model
-	 * 
-	 * public Document getDOMDocument(IMarker marker) { if (marker == null)
-	 * return null;
-	 * 
-	 * IResource res = marker.getResource(); if (res == null || !(res
-	 * instanceof IFile)) return null;
-	 * 
-	 * IModelManager mm = StructuredModelManager.getModelManager();
-	 * IStructuredModel model = null; try { model =
-	 * mm.getExistingModelForRead((IFile) res); if (model == null || !(model
-	 * instanceof IDOMModel)) return null;
-	 * 
-	 * return ((IDOMModel) model).getDocument(); } finally { if (model !=
-	 * null) model.releaseFromRead(); } }
-	 */
-
-	public IEditorPart getEditorPart() {
-		return fTextEditor.getEditorPart();
-	}
-
-	public Node getNode(int offset) throws BadLocationException {
-		Node node = null;
-		if ((0 <= offset) && (offset <= getDocument().getLength())) {
-			node = (Node) fTextEditor.getModel().getIndexedRegion(offset);
-		}
-		else {
-			throw new BadLocationException();
-		}
-		return node;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.extensions.SourceEditingTextTools#getNodeLocation(org.w3c.dom.Node)
-	 */
-	public NodeLocation getNodeLocation(Node node) {
-		if ((node.getNodeType() == Node.ELEMENT_NODE) && (node instanceof IDOMNode)) {
-			return new NodeLocationImpl((IDOMNode) node);
-		}
-		return null;
-	}
-
-	public String getPageLanguage(Node node) {
-		return ""; //$NON-NLS-1$
-	}
-
-	public ITextSelection getSelection() {
-		return (ITextSelection) fTextEditor.getSelectionProvider().getSelection();
-	}
-
-	/**
-	 * IExtendedMarkupEditor method
-	 */
-	// public List getSelectedNodes() {
-	// ViewerSelectionManager vsm = getViewerSelectionManager();
-	// return (vsm != null) ? vsm.getSelectedNodes() : null;
-	// }
-	public int getStartOffset(Node node) {
-		if ((node == null) || !(node instanceof IDOMText)) {
-			return -1;
-		}
-
-		IStructuredDocumentRegion fnode = ((IDOMText) node).getFirstStructuredDocumentRegion();
-		return fnode.getStartOffset();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.core.INodeAdapter#isAdapterForType(java.lang.Object)
-	 */
-	public boolean isAdapterForType(Object type) {
-		return ISourceEditingTextTools.class.equals(type);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.core.core.INodeAdapter#notifyChanged(org.eclipse.wst.sse.core.core.INodeNotifier,
-	 *      int, java.lang.Object, java.lang.Object, java.lang.Object, int)
-	 */
-	public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-	}
-
-	public void setTextEditor(StructuredTextEditor editor) {
-		fTextEditor = editor;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/registry/AdapterFactoryProviderForXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/registry/AdapterFactoryProviderForXML.java
deleted file mode 100644
index 3794a17..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/registry/AdapterFactoryProviderForXML.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.registry;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler;
-import org.eclipse.wst.sse.core.internal.model.FactoryRegistry;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.util.Assert;
-import org.eclipse.wst.sse.ui.internal.contentoutline.IJFaceNodeAdapter;
-import org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelhandler.ModelHandlerForXML;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.DOMObserver;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeAdapterFactory;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-
-/**
- * 
- */
-public class AdapterFactoryProviderForXML implements AdapterFactoryProvider {
-
-	/*
-	 * @see AdapterFactoryProvider#addAdapterFactories(IStructuredModel)
-	 */
-	public void addAdapterFactories(IStructuredModel structuredModel) {
-
-		// add the normal content based factories to model's registry
-		addContentBasedFactories(structuredModel);
-	}
-
-	protected void addContentBasedFactories(IStructuredModel structuredModel) {
-		FactoryRegistry factoryRegistry = structuredModel.getFactoryRegistry();
-		Assert.isNotNull(factoryRegistry, "Program Error: client caller must ensure model has factory registry"); //$NON-NLS-1$
-		INodeAdapterFactory factory = null;
-
-		factory = factoryRegistry.getFactoryFor(IJFaceNodeAdapter.class);
-		if (factory == null) {
-			factory = new JFaceNodeAdapterFactory();
-			factoryRegistry.addFactory(factory);
-		}
-
-		// cs... added for inferred grammar support
-		//
-		if (structuredModel != null) {
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(structuredModel);
-			if (modelQuery != null) {
-				CMDocumentManager documentManager = modelQuery.getCMDocumentManager();
-				if (documentManager != null) {
-					IPreferenceStore store = XMLUIPlugin.getDefault().getPreferenceStore();
-					boolean useInferredGrammar = (store != null) ? store.getBoolean(XMLUIPreferenceNames.USE_INFERRED_GRAMMAR) : true;
-
-					documentManager.setPropertyEnabled(CMDocumentManager.PROPERTY_ASYNC_LOAD, true);
-					documentManager.setPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD, false);
-					documentManager.setPropertyEnabled(CMDocumentManager.PROPERTY_USE_CACHED_RESOLVED_URI, true);
-					DOMObserver domObserver = new DOMObserver(structuredModel);
-					domObserver.setGrammarInferenceEnabled(useInferredGrammar);
-					domObserver.init();
-				}
-			}
-		}
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.internal.provisional.registry.AdapterFactoryProvider#isFor(org.eclipse.wst.sse.core.internal.ltk.modelhandler.IDocumentTypeHandler)
-	 */
-	public boolean isFor(IDocumentTypeHandler contentTypeDescription) {
-		return (contentTypeDescription instanceof ModelHandlerForXML);
-	}
-
-	public void reinitializeFactories(IStructuredModel structuredModel) {
-		// nothing to do, since no embedded type
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesActionDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesActionDelegate.java
deleted file mode 100644
index 84f2ec9..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesActionDelegate.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.search;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesActionDelegate;
-
-/**
- * Sets up FindOccurrencesActionDelegate for xml find occurrences processors
- */
-public class XMLFindOccurrencesActionDelegate extends FindOccurrencesActionDelegate {
-	private List fProcessors;
-
-	protected List getProcessors() {
-		if (fProcessors == null) {
-			fProcessors = new ArrayList();
-			XMLFindOccurrencesProcessor htmlProcessor = new XMLFindOccurrencesProcessor();
-			fProcessors.add(htmlProcessor);
-		}
-		return fProcessors;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesProcessor.java
deleted file mode 100644
index 6b12fec..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/search/XMLFindOccurrencesProcessor.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.search;
-
-import org.eclipse.wst.sse.ui.internal.search.FindOccurrencesProcessor;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.core.text.IXMLPartitions;
-
-/**
- * Configures a FindOccurrencesProcessor with XML partitions and regions
- */
-public class XMLFindOccurrencesProcessor extends FindOccurrencesProcessor {
-
-	protected String[] getPartitionTypes() {
-		return new String[]{IXMLPartitions.XML_DEFAULT};
-	}
-
-	protected String[] getRegionTypes() {
-		return new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_NAME, DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE};
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectEnclosingXMLActionDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectEnclosingXMLActionDelegate.java
deleted file mode 100644
index 258be52..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectEnclosingXMLActionDelegate.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.selection;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Node;
-
-public class StructuredSelectEnclosingXMLActionDelegate extends StructuredSelectActionDelegate {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node cursorNode = (Node) indexedRegion;
-
-			// use parent node for empty text node
-			if ((cursorNode.getNodeType() == Node.TEXT_NODE) && (cursorNode.getNodeValue().trim().length() == 0)) {
-				cursorNode = cursorNode.getParentNode();
-
-				if (cursorNode instanceof IndexedRegion) {
-					indexedRegion = (IndexedRegion) cursorNode;
-				}
-			}
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-
-			if ((cursorNodeRegion.getOffset() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() <= textSelection.getOffset() + textSelection.getLength()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= textSelection.getOffset() + textSelection.getLength())) {
-				Node newNode = cursorNode.getParentNode();
-
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-				}
-			}
-			else {
-				newRegion = cursorNodeRegion;
-			}
-		}
-		return newRegion;
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(XMLUIMessages.StructureSelectEnclosing_label);
-			action.setToolTipText(XMLUIMessages.StructureSelectEnclosing_tooltip);
-			action.setDescription(XMLUIMessages.StructureSelectEnclosing_description);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectNextXMLActionDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectNextXMLActionDelegate.java
deleted file mode 100644
index f5088c3..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectNextXMLActionDelegate.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.selection;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Node;
-
-public class StructuredSelectNextXMLActionDelegate extends StructuredSelectActionDelegate {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		int offset = textSelection.getOffset() + textSelection.getLength() - 1;
-		if (offset < 0) {
-			offset = 0;
-		}
-
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, offset);
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node cursorNode = (Node) indexedRegion;
-
-			// use parent node for empty text node
-			if ((cursorNode.getNodeType() == Node.TEXT_NODE) && (cursorNode.getNodeValue().trim().length() == 0)) {
-				cursorNode = cursorNode.getParentNode();
-
-				if (cursorNode instanceof IndexedRegion) {
-					indexedRegion = (IndexedRegion) cursorNode;
-				}
-			}
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-			int currentOffset = textSelection.getOffset();
-			int currentEndOffset = currentOffset + textSelection.getLength();
-			if ((cursorNodeRegion.getOffset() >= currentOffset) && (cursorNodeRegion.getOffset() <= currentEndOffset) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= currentOffset) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= currentEndOffset)) {
-				newRegion = getNewSelectionRegion2(indexedRegion, textSelection);
-			}
-			else {
-				newRegion = cursorNodeRegion;
-			}
-		}
-		return newRegion;
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(XMLUIMessages.StructureSelectNext_label);
-			action.setToolTipText(XMLUIMessages.StructureSelectNext_tooltip);
-			action.setDescription(XMLUIMessages.StructureSelectNext_description);
-		}
-	}
-
-	/**
-	 * This method was separated out from getNewSelectionRegion2 because the
-	 * code in here is allowed to be called recursively.
-	 * 
-	 * @param indexedRegion
-	 * @param textSelection
-	 * @return new region to select or null if none
-	 */
-	private Region getNewSelectionRegion2(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node node = (Node) indexedRegion;
-			Node newNode = node.getNextSibling();
-			if (newNode == null) {
-				newNode = node.getParentNode();
-
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-				}
-			}
-			else {
-				if (newNode instanceof IndexedRegion) {
-					IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-					newRegion = new Region(textSelection.getOffset(), newIndexedRegion.getEndOffset() - textSelection.getOffset());
-
-					if (newNode.getNodeType() == Node.TEXT_NODE) {
-						newRegion = getNewSelectionRegion2(newIndexedRegion, new TextSelection(newRegion.getOffset(), newRegion.getLength()));
-					}
-				}
-			}
-		}
-		return newRegion;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectPreviousXMLActionDelegate.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectPreviousXMLActionDelegate.java
deleted file mode 100644
index 8939c32..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/selection/StructuredSelectPreviousXMLActionDelegate.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.selection;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.TextSelection;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.selection.StructuredSelectActionDelegate;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.w3c.dom.Node;
-
-public class StructuredSelectPreviousXMLActionDelegate extends StructuredSelectActionDelegate {
-
-	protected IndexedRegion getCursorIndexedRegion(IDocument document, ITextSelection textSelection) {
-		IndexedRegion indexedRegion = null;
-
-		indexedRegion = getIndexedRegion(document, textSelection.getOffset());
-
-		return indexedRegion;
-	}
-
-	protected Region getNewSelectionRegion(IndexedRegion indexedRegion, ITextSelection textSelection) {
-		Region newRegion = null;
-		if (indexedRegion instanceof Node) {
-			Node cursorNode = (Node) indexedRegion;
-
-			// use parent node for empty text node
-			if ((cursorNode.getNodeType() == Node.TEXT_NODE) && (cursorNode.getNodeValue().trim().length() == 0)) {
-				cursorNode = cursorNode.getParentNode();
-
-				if (cursorNode instanceof IndexedRegion) {
-					indexedRegion = (IndexedRegion) cursorNode;
-				}
-			}
-
-			Region cursorNodeRegion = new Region(indexedRegion.getStartOffset(), indexedRegion.getEndOffset() - indexedRegion.getStartOffset());
-
-			if ((cursorNodeRegion.getOffset() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() <= textSelection.getOffset() + textSelection.getLength()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() >= textSelection.getOffset()) && (cursorNodeRegion.getOffset() + cursorNodeRegion.getLength() <= textSelection.getOffset() + textSelection.getLength())) {
-				Node newNode = cursorNode.getPreviousSibling();
-				if (newNode == null) {
-					newNode = cursorNode.getParentNode();
-
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), newIndexedRegion.getEndOffset() - newIndexedRegion.getStartOffset());
-					}
-				}
-				else {
-					if (newNode instanceof IndexedRegion) {
-						IndexedRegion newIndexedRegion = (IndexedRegion) newNode;
-						newRegion = new Region(newIndexedRegion.getStartOffset(), textSelection.getOffset() + textSelection.getLength() - newIndexedRegion.getStartOffset());
-
-						if (newNode.getNodeType() == Node.TEXT_NODE) {
-							newRegion = getNewSelectionRegion(newIndexedRegion, new TextSelection(newRegion.getOffset(), newRegion.getLength()));
-						}
-					}
-				}
-
-			}
-			else {
-				newRegion = cursorNodeRegion;
-			}
-		}
-		return newRegion;
-	}
-
-	public void init(IAction action) {
-		if (action != null) {
-			action.setText(XMLUIMessages.StructureSelectPrevious_label);
-			action.setToolTipText(XMLUIMessages.StructureSelectPrevious_tooltip);
-			action.setDescription(XMLUIMessages.StructureSelectPrevious_description);
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/spelling/SpellcheckDelegateAdapterFactory.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/spelling/SpellcheckDelegateAdapterFactory.java
deleted file mode 100644
index a6fae54..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/spelling/SpellcheckDelegateAdapterFactory.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.spelling;
-
-import org.eclipse.core.runtime.IAdapterFactory;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.internal.spelling.ISpellcheckDelegate;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.w3c.dom.Comment;
-
-/**
- * An <code>IAdapterFactory</code> to adapt an <code>IDOMModel</code> to a
- * <code>ISpellcheckDelegate</code>.
- */
-public class SpellcheckDelegateAdapterFactory implements IAdapterFactory {
-	/**
-	 * This list of classes this factory adapts to.
-	 */
-	private static final Class[] ADAPTER_LIST = new Class[]{ISpellcheckDelegate.class};
-	
-	/**
-	 * The <code>ISpellcheckDelegate</code> this factory adapts to
-	 */
-	private static final ISpellcheckDelegate DELEGATE = new XMLSpellcheckDelegate();
-	
-	/**
-	 * Implementation of <code>ISpellcheckDelegate</code> for XML type documents.
-	 */
-	private static class XMLSpellcheckDelegate implements ISpellcheckDelegate {
-		
-		/**
-		 * If the region in the given <code>model</code> at the given <code>offset</code> is a
-		 * <code>Comment</code> region then it should be spell checked, otherwise it should not.
-		 * 
-		 * @see org.eclipse.wst.sse.ui.internal.spelling.ISpellcheckDelegate#shouldSpellcheck(org.eclipse.wst.sse.core.internal.provisional.IndexedRegion)
-		 */
-		public boolean shouldSpellcheck(int offset, IStructuredModel model) {
-			boolean shouldSpellcheck = true;
-			
-			IndexedRegion region = model.getIndexedRegion(offset);
-			if(region != null) {
-				shouldSpellcheck = (region instanceof Comment);
-			}
-			
-			return shouldSpellcheck;
-		}
-		
-	}
-	
-	/** 
-	 * Adapts <code>IDOMModel</code> to <code>ISpellcheckDelegate</code>.
-	 * 
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
-	 */
-	public Object getAdapter(Object adaptableObject, Class adapterType) {
-		ISpellcheckDelegate decision = null;
-		
-		if (adaptableObject instanceof IDOMModel && ISpellcheckDelegate.class.equals(adapterType)) {
-			decision = DELEGATE;
-		}
-		
-		return decision;
-	}
-
-	/**
-	 *  This adapter only adapts to <code>ISpellcheckDelegate</code>
-	 *  
-	 * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
-	 */
-	public Class[] getAdapterList() {
-		return ADAPTER_LIST;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/style/IStyleConstantsXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/style/IStyleConstantsXML.java
deleted file mode 100644
index 79055b6..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/style/IStyleConstantsXML.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference      
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.style;
-
-/**
- * Contains the symbolic name of styles used by LineStyleProvider,
- * ColorManager, and any others who may be interested
- */
-public interface IStyleConstantsXML {
-	public static final String BACKGROUND = "background"; //$NON-NLS-1$
-	public static final String CDATA_BORDER = "cdataBorder";//$NON-NLS-1$
-	public static final String CDATA_TEXT = "cdataText";//$NON-NLS-1$
-	public static final String COMMENT_BORDER = "commentBorder";//$NON-NLS-1$
-	public static final String COMMENT_TEXT = "commentText";//$NON-NLS-1$
-	public static final String DECL_BORDER = "declBoder";//$NON-NLS-1$
-	public static final String DOCTYPE_EXTERNAL_ID = "doctypeExternalId";//$NON-NLS-1$
-	public static final String DOCTYPE_EXTERNAL_ID_PUBREF = "doctypeExternalPubref";//$NON-NLS-1$
-	public static final String DOCTYPE_EXTERNAL_ID_SYSREF = "doctypeExtrenalSysref";//$NON-NLS-1$
-	public static final String DOCTYPE_NAME = "doctypeName";//$NON-NLS-1$
-
-	public static final String FOREGROUND = "foreground"; //$NON-NLS-1$
-	public static final String PI_BORDER = "piBorder";//$NON-NLS-1$
-	public static final String PI_CONTENT = "piContent";//$NON-NLS-1$
-
-	public static final String TAG_ATTRIBUTE_EQUALS = "tagAttributeEquals"; //$NON-NLS-1$
-	public static final String TAG_ATTRIBUTE_NAME = "tagAttributeName";//$NON-NLS-1$
-	public static final String TAG_ATTRIBUTE_VALUE = "tagAttributeValue";//$NON-NLS-1$
-	public static final String TAG_BORDER = "tagBorder";//$NON-NLS-1$
-	public static final String TAG_NAME = "tagName";//$NON-NLS-1$
-	public static final String XML_CONTENT = "xmlContent";//$NON-NLS-1$
-	public static final String ENTITY_REFERENCE = "entityReference";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/style/LineStyleProviderForXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/style/LineStyleProviderForXML.java
deleted file mode 100644
index 938c793..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/style/LineStyleProviderForXML.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     Benjamin Muskalla, b.muskalla@gmx.net - [158660] character entities should have their own syntax highlighting preference     
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.style;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.TextAttribute;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.ui.internal.provisional.style.AbstractLineStyleProvider;
-import org.eclipse.wst.sse.ui.internal.provisional.style.LineStyleProvider;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-public class LineStyleProviderForXML extends AbstractLineStyleProvider implements LineStyleProvider {
-	public LineStyleProviderForXML() {
-		super();
-	}
-
-	protected TextAttribute getAttributeFor(ITextRegion region) {
-		/**
-		 * a method to centralize all the "format rules" for regions
-		 * specifically associated for how to "open" the region.
-		 */
-		// not sure why this is coming through null, but just to catch it
-		if (region == null) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_TEXT);
-		}
-		
-		String type = region.getType();
-		if ((type == DOMRegionContext.XML_CONTENT) || (type == DOMRegionContext.XML_DOCTYPE_INTERNAL_SUBSET)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.XML_CONTENT);
-		}
-		if ((type == DOMRegionContext.XML_TAG_OPEN) || (type == DOMRegionContext.XML_END_TAG_OPEN) || (type == DOMRegionContext.XML_TAG_CLOSE) || (type == DOMRegionContext.XML_EMPTY_TAG_CLOSE)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_BORDER);
-		}
-		if ((type == DOMRegionContext.XML_CDATA_OPEN) || (type == DOMRegionContext.XML_CDATA_CLOSE)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_BORDER);
-		}
-		if (type == DOMRegionContext.XML_CDATA_TEXT) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_TEXT);
-		}
-		if (type == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		}
-		if (type == DOMRegionContext.XML_DOCTYPE_DECLARATION) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_NAME);
-		}
-		if (type == DOMRegionContext.XML_TAG_NAME) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_NAME);
-		}
-		if ((type == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		}
-		if (type == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS);
-		}
-		if ((type == DOMRegionContext.XML_COMMENT_OPEN) || (type == DOMRegionContext.XML_COMMENT_CLOSE)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.COMMENT_BORDER);
-		}
-		if (type == DOMRegionContext.XML_COMMENT_TEXT) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.COMMENT_TEXT);
-		}
-		if (type == DOMRegionContext.XML_DOCTYPE_NAME) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_NAME);
-		}
-		if ((type == DOMRegionContext.XML_CHAR_REFERENCE) || (type == DOMRegionContext.XML_ENTITY_REFERENCE) || (type == DOMRegionContext.XML_PE_REFERENCE)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.ENTITY_REFERENCE);
-		}
-		if (type == DOMRegionContext.XML_PI_CONTENT) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.PI_CONTENT);
-		}
-		if ((type == DOMRegionContext.XML_PI_OPEN) || (type == DOMRegionContext.XML_PI_CLOSE)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.PI_BORDER);
-		}
-		if ((type == DOMRegionContext.XML_DECLARATION_OPEN) || (type == DOMRegionContext.XML_DECLARATION_CLOSE)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DECL_BORDER);
-		}
-		if (type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSREF) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-		}
-		if (type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBREF) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-		}
-		if ((type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_PUBLIC) || (type == DOMRegionContext.XML_DOCTYPE_EXTERNAL_ID_SYSTEM)) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		}
-		if (type == DOMRegionContext.UNDEFINED) {
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.CDATA_TEXT);
-		}
-		if (type == DOMRegionContext.WHITE_SPACE) {
-			/*
-			 * White space is normally not on its own ... but when it is,
-			 * we'll treat as content
-			 */
-			return (TextAttribute) getTextAttributes().get(IStyleConstantsXML.XML_CONTENT);
-		}
-		/*
-		 * default, return null to signal "not handled" in which case, other
-		 * providers should be tried
-		 */
-		return null;
-	}
-
-	protected IPreferenceStore getColorPreferences() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	protected void handlePropertyChange(PropertyChangeEvent event) {
-		String styleKey = null;
-
-		if (event != null) {
-			String prefKey = event.getProperty();
-			// check if preference changed is a style preference
-			if (IStyleConstantsXML.TAG_NAME.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_NAME;
-			}
-			else if (IStyleConstantsXML.TAG_BORDER.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_BORDER;
-			}
-			else if (IStyleConstantsXML.TAG_ATTRIBUTE_NAME.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_ATTRIBUTE_NAME;
-			}
-			else if (IStyleConstantsXML.TAG_ATTRIBUTE_VALUE.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_ATTRIBUTE_VALUE;
-			}
-			else if (IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS;
-			}
-			else if (IStyleConstantsXML.COMMENT_BORDER.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.COMMENT_BORDER;
-			}
-			else if (IStyleConstantsXML.COMMENT_TEXT.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.COMMENT_TEXT;
-			}
-			else if (IStyleConstantsXML.ENTITY_REFERENCE.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.ENTITY_REFERENCE;
-			}
-			else if (IStyleConstantsXML.CDATA_BORDER.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.CDATA_BORDER;
-			}
-			else if (IStyleConstantsXML.CDATA_TEXT.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.CDATA_TEXT;
-			}
-			else if (IStyleConstantsXML.DECL_BORDER.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.DECL_BORDER;
-			}
-			else if (IStyleConstantsXML.DOCTYPE_EXTERNAL_ID.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.DOCTYPE_EXTERNAL_ID;
-			}
-			else if (IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF;
-			}
-			else if (IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF;
-			}
-			else if (IStyleConstantsXML.DOCTYPE_NAME.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.DOCTYPE_NAME;
-			}
-			else if (IStyleConstantsXML.PI_CONTENT.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.PI_CONTENT;
-			}
-			else if (IStyleConstantsXML.PI_BORDER.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.PI_BORDER;
-			}
-			else if (IStyleConstantsXML.XML_CONTENT.equals(prefKey)) {
-				styleKey = IStyleConstantsXML.XML_CONTENT;
-			}
-		}
-
-		if (styleKey != null) {
-			// overwrite style preference with new value
-			addTextAttribute(styleKey);
-			super.handlePropertyChange(event);
-		}
-	}
-
-	/**
-	 * Loads text attributes into map. Make sure map is cleared before calling
-	 * this.
-	 */
-	protected void loadColors() {
-		addTextAttribute(IStyleConstantsXML.TAG_NAME);
-		addTextAttribute(IStyleConstantsXML.TAG_BORDER);
-		addTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_NAME);
-		addTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_VALUE);
-		addTextAttribute(IStyleConstantsXML.TAG_ATTRIBUTE_EQUALS);
-		addTextAttribute(IStyleConstantsXML.COMMENT_BORDER);
-		addTextAttribute(IStyleConstantsXML.COMMENT_TEXT);
-		addTextAttribute(IStyleConstantsXML.CDATA_BORDER);
-		addTextAttribute(IStyleConstantsXML.CDATA_TEXT);
-		addTextAttribute(IStyleConstantsXML.DECL_BORDER);
-		addTextAttribute(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID);
-		addTextAttribute(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_PUBREF);
-		addTextAttribute(IStyleConstantsXML.DOCTYPE_EXTERNAL_ID_SYSREF);
-		addTextAttribute(IStyleConstantsXML.DOCTYPE_NAME);
-		addTextAttribute(IStyleConstantsXML.PI_CONTENT);
-		addTextAttribute(IStyleConstantsXML.PI_BORDER);
-		addTextAttribute(IStyleConstantsXML.XML_CONTENT);
-		addTextAttribute(IStyleConstantsXML.ENTITY_REFERENCE);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/MarkupTagInfoProvider.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/MarkupTagInfoProvider.java
deleted file mode 100644
index 9615ad4..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/MarkupTagInfoProvider.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.taginfo;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocumentation;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-/**
- * Provides basic tag information such as element/attribute name, data type,
- * and tag info/documentation for CMNodes. Uses HTML to enhance presentation.
- */
-public class MarkupTagInfoProvider {
-	protected final static String BOLD_END = "</b>"; //$NON-NLS-1$
-	protected final static String BOLD_START = "<b>"; //$NON-NLS-1$
-	protected final static String HEADING_END = "</h5>"; //$NON-NLS-1$
-	protected final static String HEADING_START = "<h5>"; //$NON-NLS-1$
-	protected final static String LIST_BEGIN = "<ul>"; //$NON-NLS-1$
-	protected final static String LIST_ELEMENT = "<li>"; //$NON-NLS-1$
-	protected final static String NEW_LINE = "<dl>"; //$NON-NLS-1$
-	protected final static String PARAGRAPH_END = "</p>"; //$NON-NLS-1$
-	protected final static String PARAGRAPH_START = "<p>"; //$NON-NLS-1$
-	protected final static String SPACE = " "; //$NON-NLS-1$
-
-	/**
-	 * Returns basic tag information for display given a CMNode
-	 * 
-	 * @return String
-	 */
-	public String getInfo(CMNode node) {
-		if (node == null) {
-			return null;
-		}
-		StringBuffer sb = new StringBuffer();
-		// we assume that if there is tagInfo present, only display tagInfo
-		printTagInfo(sb, node);
-
-		// no tagInfo present, so try to display tag description
-		if (sb.length() == 0) {
-			printDescription(sb, node);
-		}
-
-		// no tag description present either, so display default info
-		if (sb.length() == 0) {
-			printDefaultInfo(node, sb);
-		}
-
-		return sb.toString();
-	}
-
-	/**
-	 * Adds dataType's data type information, including enumerated type values
-	 * to string buffer, sb
-	 * 
-	 */
-	protected void printDataTypeInfo(StringBuffer sb, CMDataType dataType) {
-		String dataTypeName = dataType.getNodeName();
-		if ((dataTypeName != null) && (dataTypeName.length() > 0)) {
-			sb.append(PARAGRAPH_START + BOLD_START + XMLUIMessages.Data_Type____4 + SPACE + BOLD_END);
-			sb.append(dataTypeName);
-			sb.append(PARAGRAPH_END);
-		}
-		String defaultValue = dataType.getImpliedValue();
-		if(defaultValue != null) {
-			sb.append(PARAGRAPH_START + BOLD_START + XMLUIMessages.Default_Value____6 + SPACE + BOLD_END);
-			sb.append(defaultValue);
-			sb.append(PARAGRAPH_END);
-		}
-		String[] enumeratedValue = dataType.getEnumeratedValues();
-		if ((enumeratedValue != null) && (enumeratedValue.length > 0)) {
-			sb.append(PARAGRAPH_START + BOLD_START + XMLUIMessages.Enumerated_Values____5 + SPACE + BOLD_END);
-			sb.append(LIST_BEGIN);
-			for (int i = 0; i < enumeratedValue.length; i++) {
-				sb.append(LIST_ELEMENT + enumeratedValue[i]);
-			}
-			sb.append(PARAGRAPH_END);
-		}
-	}
-
-	/**
-	 * Adds the default info (element name, content model, data type) of
-	 * CMNode to the string buffer, sb
-	 * 
-	 */
-	protected void printDefaultInfo(CMNode node, StringBuffer sb) {
-		{
-
-			if (node.getNodeType() == CMNode.ELEMENT_DECLARATION) {
-				CMElementDeclaration ed = (CMElementDeclaration) node;
-				sb.append(PARAGRAPH_START + BOLD_START + XMLUIMessages.Element____1 + SPACE + BOLD_END);
-				sb.append(node.getNodeName());
-				sb.append(PARAGRAPH_END);
-				printDocumentation(sb, node);
-				if (ed.getContentType() == CMElementDeclaration.PCDATA) {
-					CMDataType dataType = ed.getDataType();
-					if (dataType != null) {
-						printDataTypeInfo(sb, dataType);
-					}
-				}
-				else {
-					CMDescriptionBuilder builder = new CMDescriptionBuilder();
-					String description = builder.buildDescription(node);
-					if ((description != null) && (description.length() > 0)) {
-						sb.append(PARAGRAPH_START + BOLD_START + XMLUIMessages.Content_Model____2 + SPACE + BOLD_END);
-						sb.append(description + PARAGRAPH_END);
-					}
-				}
-			}
-			else if (node.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-				CMAttributeDeclaration ad = (CMAttributeDeclaration) node;
-				sb.append(PARAGRAPH_START + BOLD_START + XMLUIMessages.Attribute____3 + SPACE + BOLD_END);
-				sb.append(node.getNodeName());
-				sb.append(PARAGRAPH_END);
-				printDocumentation(sb, node);
-				CMDataType dataType = ad.getAttrType();
-				if (dataType != null) {
-					printDataTypeInfo(sb, dataType);
-				}
-			}
-			else if (node.getNodeType() == CMNode.DATA_TYPE) {
-				sb.append(PARAGRAPH_START + BOLD_START + XMLUIMessages.Data_Type____4 + SPACE + BOLD_END);
-				sb.append(node.getNodeName());
-				sb.append(PARAGRAPH_END);
-				printDocumentation(sb, node);
-			}
-		}
-	}
-
-	/**
-	 * Adds the description property of the CMNode to the string buffer, sb
-	 * 
-	 */
-	protected void printDescription(StringBuffer sb, CMNode node) {
-		String tagInfo = (String) node.getProperty("description"); //$NON-NLS-1$
-		if (tagInfo != null) {
-			sb.append(PARAGRAPH_START + tagInfo.trim() + PARAGRAPH_END);
-		}
-	}
-
-	/**
-	 * Adds the tag documentation property of the CMNode to the string buffer,
-	 * sb
-	 * 
-	 */
-	protected void printDocumentation(StringBuffer sb, CMNode node) {
-		CMNodeList nodeList = (CMNodeList) node.getProperty("documentation"); //$NON-NLS-1$
-		if ((nodeList != null) && (nodeList.getLength() > 0)) {
-			for (int i = 0; i < nodeList.getLength(); i++) {
-				CMDocumentation documentation = (CMDocumentation) nodeList.item(i);
-				String doc = documentation.getValue();
-				if (doc != null) {
-					sb.append(PARAGRAPH_START + doc.trim() + PARAGRAPH_END);
-				}
-			}
-			sb.append(NEW_LINE);
-		}
-	}
-
-	/**
-	 * Adds the tag info property of the CMNode to the string buffer, sb
-	 * 
-	 */
-	protected void printTagInfo(StringBuffer sb, CMNode node) {
-		String tagInfo = (String) node.getProperty("tagInfo"); //$NON-NLS-1$
-		if (tagInfo != null) {
-			sb.append(PARAGRAPH_START + tagInfo.trim() + PARAGRAPH_END);
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/XMLInformationProvider.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/XMLInformationProvider.java
deleted file mode 100644
index fe76a69..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/XMLInformationProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.taginfo;
-
-
-
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextHover;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.information.IInformationProvider;
-import org.eclipse.jface.text.information.IInformationProviderExtension;
-import org.eclipse.wst.sse.ui.internal.SSEUIPlugin;
-
-/**
- * Provides context information for XML tags (Shows tooltip description)
- * 
- * @deprecated StructuredTextViewerConfiguration creates the appropriate
- *             information provider
- */
-public class XMLInformationProvider implements IInformationProvider, IInformationProviderExtension {
-
-	private ITextHover fTextHover = null;
-
-	public XMLInformationProvider() {
-		fTextHover = SSEUIPlugin.getDefault().getTextHoverManager().createBestMatchHover(new XMLTagInfoHoverProcessor());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.information.IInformationProvider#getInformation(org.eclipse.jface.text.ITextViewer,
-	 *      org.eclipse.jface.text.IRegion)
-	 */
-	public String getInformation(ITextViewer textViewer, IRegion subject) {
-		return (String) getInformation2(textViewer, subject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.information.IInformationProviderExtension#getInformation2(org.eclipse.jface.text.ITextViewer,
-	 *      org.eclipse.jface.text.IRegion)
-	 */
-	public Object getInformation2(ITextViewer textViewer, IRegion subject) {
-		return fTextHover.getHoverInfo(textViewer, subject);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.information.IInformationProvider#getSubject(org.eclipse.jface.text.ITextViewer,
-	 *      int)
-	 */
-	public IRegion getSubject(ITextViewer textViewer, int offset) {
-		return fTextHover.getHoverRegion(textViewer, offset);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/XMLTagInfoHoverProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/XMLTagInfoHoverProcessor.java
deleted file mode 100644
index 47276fc..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/taginfo/XMLTagInfoHoverProcessor.java
+++ /dev/null
@@ -1,362 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.taginfo;
-
-
-
-import java.util.List;
-
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.core.internal.util.Debug;
-import org.eclipse.wst.sse.ui.internal.contentassist.ContentAssistUtils;
-import org.eclipse.wst.sse.ui.internal.taginfo.AbstractHoverProcessor;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceHelper;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-/**
- * Provides hover help documentation for xml tags
- * 
- * @see org.eclipse.jface.text.ITextHover
- */
-public class XMLTagInfoHoverProcessor extends AbstractHoverProcessor {
-	protected MarkupTagInfoProvider fInfoProvider = null;
-
-	/**
-	 * Constructor for XMLTextHoverProcessor.
-	 */
-	public XMLTagInfoHoverProcessor() {
-		// nothing
-	}
-
-	/**
-	 * Retreives documentation to display in the hover help popup.
-	 * 
-	 * @return String any documentation information to display
-	 *         <code>null</code> if there is nothing to display.
-	 * 
-	 */
-	protected String computeHoverHelp(ITextViewer textViewer, int documentPosition) {
-		String result = null;
-
-		IndexedRegion treeNode = ContentAssistUtils.getNodeAt(textViewer, documentPosition);
-		if (treeNode == null) {
-			return null;
-		}
-		Node node = (Node) treeNode;
-
-		while ((node != null) && (node.getNodeType() == Node.TEXT_NODE) && (node.getParentNode() != null)) {
-			node = node.getParentNode();
-		}
-		IDOMNode parentNode = (IDOMNode) node;
-
-		IStructuredDocumentRegion flatNode = ((IStructuredDocument) textViewer.getDocument()).getRegionAtCharacterOffset(documentPosition);
-		if (flatNode != null) {
-			ITextRegion region = flatNode.getRegionAtCharacterOffset(documentPosition);
-			if (region != null) {
-				result = computeRegionHelp(treeNode, parentNode, flatNode, region);
-			}
-		}
-
-		return result;
-	}
-
-	/**
-	 * Computes the hoverhelp based on region
-	 * 
-	 * @return String hoverhelp
-	 */
-	protected String computeRegionHelp(IndexedRegion treeNode, IDOMNode parentNode, IStructuredDocumentRegion flatNode, ITextRegion region) {
-		String result = null;
-		if (region == null) {
-			return null;
-		}
-		String regionType = region.getType();
-		if (regionType == DOMRegionContext.XML_TAG_NAME) {
-			result = computeTagNameHelp((IDOMNode) treeNode, parentNode, flatNode, region);
-		}
-		else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-			result = computeTagAttNameHelp((IDOMNode) treeNode, parentNode, flatNode, region);
-		}
-		else if (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-			result = computeTagAttValueHelp((IDOMNode) treeNode, parentNode, flatNode, region);
-		}
-		return result;
-	}
-
-	/**
-	 * Computes the hover help for the attribute name
-	 */
-	protected String computeTagAttNameHelp(IDOMNode xmlnode, IDOMNode parentNode, IStructuredDocumentRegion flatNode, ITextRegion region) {
-		CMElementDeclaration elementDecl = getCMElementDeclaration(xmlnode);
-		String attName = flatNode.getText(region);
-		CMAttributeDeclaration attDecl = getCMAttributeDeclaration(xmlnode, elementDecl, attName);
-		return getAdditionalInfo(elementDecl, attDecl);
-	}
-
-	/**
-	 * Computes the hover help for the attribute value (this is the same as
-	 * the attribute name's help)
-	 */
-	protected String computeTagAttValueHelp(IDOMNode xmlnode, IDOMNode parentNode, IStructuredDocumentRegion flatNode, ITextRegion region) {
-		CMElementDeclaration elementDecl = getCMElementDeclaration(xmlnode);
-		ITextRegion attrNameRegion = getAttrNameRegion(xmlnode, region);
-
-		String attName = flatNode.getText(attrNameRegion);
-		CMAttributeDeclaration attDecl = getCMAttributeDeclaration(xmlnode, elementDecl, attName);
-		return getAdditionalInfo(elementDecl, attDecl);
-	}
-
-	/**
-	 * Computes the hover help for the tag name
-	 */
-	protected String computeTagNameHelp(IDOMNode xmlnode, IDOMNode parentNode, IStructuredDocumentRegion flatNode, ITextRegion region) {
-		CMElementDeclaration elementDecl = getCMElementDeclaration(xmlnode);
-		CMElementDeclaration pelementDecl = getCMElementDeclaration(parentNode);
-		return getAdditionalInfo(pelementDecl, elementDecl);
-	}
-
-	/**
-	 * Retreives cmnode's documentation to display in the hover help popup. If
-	 * no documentation exists for cmnode, try displaying parentOrOwner's
-	 * documentation
-	 * 
-	 * @return String any documentation information to display for cmnode.
-	 *         <code>null</code> if there is nothing to display.
-	 */
-	protected String getAdditionalInfo(CMNode parentOrOwner, CMNode cmnode) {
-		String addlInfo = null;
-
-		if (cmnode == null) {
-			if (Debug.displayWarnings) {
-				new IllegalArgumentException("Null declaration!").printStackTrace(); //$NON-NLS-1$
-			}
-			return null;
-		}
-
-		addlInfo = getInfoProvider().getInfo(cmnode);
-		if ((addlInfo == null) && (parentOrOwner != null)) {
-			addlInfo = getInfoProvider().getInfo(parentOrOwner);
-		}
-		return addlInfo;
-	}
-
-	/**
-	 * Find the region of the attribute name for the given attribute value
-	 * region
-	 * 
-	 */
-	protected ITextRegion getAttrNameRegion(IDOMNode node, ITextRegion region) {
-		// Find the attribute name for which this position should have a value
-		IStructuredDocumentRegion open = node.getFirstStructuredDocumentRegion();
-		ITextRegionList openRegions = open.getRegions();
-		int i = openRegions.indexOf(region);
-		if (i < 0) {
-			return null;
-		}
-		ITextRegion nameRegion = null;
-		while (i >= 0) {
-			nameRegion = openRegions.get(i--);
-			if (nameRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) {
-				break;
-			}
-		}
-		return nameRegion;
-	}
-
-	/**
-	 * Retreives CMAttributeDeclaration indicated by attribute name within
-	 * elementDecl
-	 */
-	protected CMAttributeDeclaration getCMAttributeDeclaration(IDOMNode node, CMElementDeclaration elementDecl, String attName) {
-		CMAttributeDeclaration attrDecl = null;
-
-		if (elementDecl != null) {
-			CMNamedNodeMap attributes = elementDecl.getAttributes();
-			
-			CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attributes);
-			List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent((Element) node, elementDecl, ModelQuery.INCLUDE_ATTRIBUTES);
-			for (int k = 0; k < nodes.size(); k++) {
-				CMNode cmnode = (CMNode) nodes.get(k);
-				if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-					allAttributes.put(cmnode);
-				}
-			}
-			attributes = allAttributes;
-
-			String noprefixName = DOMNamespaceHelper.getUnprefixedName(attName);
-			if (attributes != null) {
-				attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(noprefixName);
-				if (attrDecl == null) {
-					attrDecl = (CMAttributeDeclaration) attributes.getNamedItem(attName);
-				}
-			}
-		}
-		return attrDecl;
-	}
-
-	/**
-	 * Retreives CMElementDeclaration for given node
-	 * 
-	 * @return CMElementDeclaration - CMElementDeclaration of node or
-	 *         <code>null</code> if not possible
-	 */
-	protected CMElementDeclaration getCMElementDeclaration(Node node) {
-		CMElementDeclaration result = null;
-		if (node.getNodeType() == Node.ELEMENT_NODE) {
-			ModelQuery modelQuery = ModelQueryUtil.getModelQuery(node.getOwnerDocument());
-			if (modelQuery != null) {
-				result = modelQuery.getCMElementDeclaration((Element) node);
-			}
-		}
-		return result;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.text.ITextHover#getHoverInfo(org.eclipse.jface.text.ITextViewer,
-	 *      org.eclipse.jface.text.IRegion)
-	 */
-	public String getHoverInfo(ITextViewer viewer, IRegion hoverRegion) {
-		if ((hoverRegion == null) || (viewer == null) || (viewer.getDocument() == null)) {
-			return null;
-		}
-
-		String displayText = null;
-		int documentOffset = hoverRegion.getOffset();
-		displayText = computeHoverHelp(viewer, documentOffset);
-
-		return displayText;
-	}
-
-	/**
-	 * Returns the region to hover the text over based on the offset.
-	 * 
-	 * @param textViewer
-	 * @param offset
-	 * 
-	 * @return IRegion region to hover over if offset is within tag name,
-	 *         attribute name, or attribute value and if offset is not over
-	 *         invalid whitespace. otherwise, returns <code>null</code>
-	 * 
-	 * @see org.eclipse.jface.text.ITextHover#getHoverRegion(ITextViewer, int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-		if ((textViewer == null) || (textViewer.getDocument() == null)) {
-			return null;
-		}
-
-		IStructuredDocumentRegion flatNode = ((IStructuredDocument) textViewer.getDocument()).getRegionAtCharacterOffset(offset);
-		ITextRegion region = null;
-
-		if (flatNode != null) {
-			region = flatNode.getRegionAtCharacterOffset(offset);
-		}
-
-		if (region != null) {
-			// only supply hoverhelp for tag name, attribute name, or
-			// attribute value
-			String regionType = region.getType();
-			if ((regionType == DOMRegionContext.XML_TAG_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) {
-				try {
-					// check if we are at whitespace before or after line
-					IRegion line = textViewer.getDocument().getLineInformationOfOffset(offset);
-					if ((offset > (line.getOffset())) && (offset < (line.getOffset() + line.getLength()))) {
-						// check if we are in region's trailing whitespace
-						// (whitespace after relevant info)
-						if (offset < flatNode.getTextEndOffset(region)) {
-							return new Region(flatNode.getStartOffset(region), region.getTextLength());
-						}
-					}
-				}
-				catch (BadLocationException e) {
-					Logger.logException(e);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * @deprecated if enabled flag is false, dont call getHoverRegion in the
-	 *             first place if true, use getHoverRegion(ITextViewer, int)
-	 */
-	public IRegion getHoverRegion(ITextViewer textViewer, int offset, boolean enabled) {
-		if ((!enabled) || (textViewer == null) || (textViewer.getDocument() == null)) {
-			return null;
-		}
-
-		IStructuredDocumentRegion flatNode = ((IStructuredDocument) textViewer.getDocument()).getRegionAtCharacterOffset(offset);
-		ITextRegion region = null;
-
-		if (flatNode != null) {
-			region = flatNode.getRegionAtCharacterOffset(offset);
-		}
-
-		if (region != null) {
-			// only supply hoverhelp for tag name, attribute name, or
-			// attribute value
-			String regionType = region.getType();
-			if ((regionType == DOMRegionContext.XML_TAG_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (regionType == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) {
-				try {
-					// check if we are at whitespace before or after line
-					IRegion line = textViewer.getDocument().getLineInformationOfOffset(offset);
-					if ((offset > (line.getOffset())) && (offset < (line.getOffset() + line.getLength()))) {
-						// check if we are in region's trailing whitespace
-						// (whitespace after relevant info)
-						if (offset < flatNode.getTextEndOffset(region)) {
-							return new Region(flatNode.getStartOffset(region), region.getTextLength());
-						}
-					}
-				}
-				catch (BadLocationException e) {
-					Logger.logException(e);
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Gets the infoProvider.
-	 * 
-	 * @return Returns fInfoProvider and if fInfoProvider was
-	 *         <code>null</code> set fInfoProvider to DefaultInfoProvider
-	 */
-	public MarkupTagInfoProvider getInfoProvider() {
-		if (fInfoProvider == null) {
-			fInfoProvider = new MarkupTagInfoProvider();
-		}
-		return fInfoProvider;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/EncodingTemplateVariableResolverXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/EncodingTemplateVariableResolverXML.java
deleted file mode 100644
index 079b042..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/EncodingTemplateVariableResolverXML.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.SimpleTemplateVariableResolver;
-import org.eclipse.jface.text.templates.TemplateContext;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-
-
-public class EncodingTemplateVariableResolverXML extends SimpleTemplateVariableResolver {
-	private static final String ENCODING_TYPE = getEncodingType();
-
-	private static String getEncodingType() {
-		return "encoding"; //$NON-NLS-1$
-	}
-
-	/**
-	 * Creates a new encoding variable
-	 */
-	public EncodingTemplateVariableResolverXML() {
-		super(ENCODING_TYPE, XMLUIMessages.Creating_files_encoding);
-	}
-
-	protected String resolve(TemplateContext context) {
-		return XMLCorePlugin.getDefault().getPluginPreferences().getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/TemplateContextTypeIdsXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/TemplateContextTypeIdsXML.java
deleted file mode 100644
index f7993e2..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/TemplateContextTypeIdsXML.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.templates;
-
-public class TemplateContextTypeIdsXML {
-
-	public static final String ALL = getAll();
-
-	public static final String ATTRIBUTE = getAttribute();
-
-	public static final String ATTRIBUTE_VALUE = getAttributeValue();
-
-	public static final String NEW = getNew();
-
-	public static final String TAG = getTag();
-
-	private static String getAll() {
-		return getPrefix() + "_all"; //$NON-NLS-1$
-	}
-
-	private static String getAttribute() {
-		return getPrefix() + "_attribute"; //$NON-NLS-1$
-	}
-
-	private static String getAttributeValue() {
-		return getPrefix() + "_attribute_value"; //$NON-NLS-1$
-	}
-
-	private static String getNew() {
-		return getPrefix() + "_new"; //$NON-NLS-1$
-	}
-
-	private static String getPrefix() {
-		return "xml"; //$NON-NLS-1$
-	}
-
-	private static String getTag() {
-		return getPrefix() + "_tag"; //$NON-NLS-1$
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/TemplateContextTypeXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/TemplateContextTypeXML.java
deleted file mode 100644
index 43ccf20..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/templates/TemplateContextTypeXML.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.templates;
-
-import org.eclipse.jface.text.templates.GlobalTemplateVariables;
-import org.eclipse.jface.text.templates.TemplateContextType;
-
-/**
- * Base class for XML template context types. Templates of this context type
- * apply to any place within XML content type.
- */
-public class TemplateContextTypeXML extends TemplateContextType {
-
-	public TemplateContextTypeXML() {
-		super();
-		addResolver(new GlobalTemplateVariables.Cursor());
-		addResolver(new GlobalTemplateVariables.Date());
-		addResolver(new GlobalTemplateVariables.Dollar());
-		addResolver(new GlobalTemplateVariables.LineSelection());
-		addResolver(new GlobalTemplateVariables.Time());
-		addResolver(new GlobalTemplateVariables.User());
-		addResolver(new GlobalTemplateVariables.WordSelection());
-		addResolver(new GlobalTemplateVariables.Year());
-		addResolver(new EncodingTemplateVariableResolverXML());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/text/CharacterPairInserter.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/text/CharacterPairInserter.java
deleted file mode 100644
index c51d567..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/text/CharacterPairInserter.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2009 IBM Corporation and others.

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- *

- * Contributors:

- *     IBM Corporation - initial API and implementation

- *******************************************************************************/

-package org.eclipse.wst.xml.ui.internal.text;

-

-import org.eclipse.jface.preference.IPreferenceStore;

-import org.eclipse.jface.text.IDocument;

-import org.eclipse.jface.text.source.ISourceViewer;

-import org.eclipse.jface.util.IPropertyChangeListener;

-import org.eclipse.jface.util.PropertyChangeEvent;

-import org.eclipse.swt.graphics.Point;

-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;

-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;

-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;

-import org.eclipse.wst.sse.ui.internal.provisional.typing.AbstractCharacterPairInserter;

-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;

-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;

-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;

-

-public class CharacterPairInserter extends AbstractCharacterPairInserter implements IPropertyChangeListener {

-

-	// preferences

-	private boolean fCloseStrings = true;

-	private boolean fCloseBrackets = true;

-

-	protected boolean shouldPair(ISourceViewer viewer, char c) {

-		switch (c) {

-			case '\'':

-			case '"':

-				return fCloseStrings ? checkRegion(viewer) : false;

-			default:

-				return fCloseBrackets;

-		}

-	}

-

-	/**

-	 * Checks if the region should support paired quotes

-	 * @param viewer the viewer

-	 * @return true if the region is not in an XML attribute value

-	 */

-	private boolean checkRegion(ISourceViewer viewer) {

-		IDocument doc = viewer.getDocument();

-		final Point selection= viewer.getSelectedRange();

-		final int offset= selection.x;

-

-		if (doc instanceof IStructuredDocument) {

-			IStructuredDocumentRegion[] regions = ((IStructuredDocument) doc).getStructuredDocumentRegions(offset, 0);

-			if (regions != null && regions.length > 0) {

-				ITextRegion region = regions[0].getRegionAtCharacterOffset(offset);

-				return region.getType() != DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE;

-			}

-		}

-		return true;

-	}

-

-	public boolean hasPair(char c) {

-		switch (c) {

-			case '"':

-			case '\'':

-			case '[':

-			case '(':

-				return true;

-			default:

-				return false;

-		}

-	}

-

-	protected char getPair(char c) {

-		switch (c) {

-			case '\'':

-			case '"':

-				return c;

-			case '(':

-				return ')';

-			case '[':

-				return ']';

-			default:

-				throw new IllegalArgumentException();

-		}

-	}

-

-	public void initialize() {

-		IPreferenceStore store = XMLUIPlugin.getInstance().getPreferenceStore();

-		fCloseStrings = store.getBoolean(XMLUIPreferenceNames.TYPING_CLOSE_STRINGS);

-		fCloseBrackets = store.getBoolean(XMLUIPreferenceNames.TYPING_CLOSE_BRACKETS);

-		store.addPropertyChangeListener(this);

-	}

-

-	public void dispose() {

-		XMLUIPlugin.getInstance().getPreferenceStore().removePropertyChangeListener(this);

-	}

-

-	public void propertyChange(PropertyChangeEvent event) {

-		if (XMLUIPreferenceNames.TYPING_CLOSE_BRACKETS.equals(event.getProperty()))

-			fCloseBrackets = ((Boolean) event.getNewValue()).booleanValue();

-		else if (XMLUIPreferenceNames.TYPING_CLOSE_STRINGS.equals(event.getProperty()))

-			fCloseStrings = ((Boolean) event.getNewValue()).booleanValue();

-	}

-}

diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/text/XMLDocumentRegionEdgeMatcher.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/text/XMLDocumentRegionEdgeMatcher.java
deleted file mode 100644
index b29fd9b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/text/XMLDocumentRegionEdgeMatcher.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.text;
-
-import org.eclipse.jface.text.source.DefaultCharacterPairMatcher;
-import org.eclipse.wst.sse.ui.internal.text.DocumentRegionEdgeMatcher;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-
-
-public class XMLDocumentRegionEdgeMatcher extends DocumentRegionEdgeMatcher {
-
-	private static final char[] PAIRS = {'{', '}', '(', ')', '[', ']','"','"','\'','\''};
-
-	public XMLDocumentRegionEdgeMatcher() {
-		super(new String[]{DOMRegionContext.XML_TAG_NAME, DOMRegionContext.XML_COMMENT_TEXT, DOMRegionContext.XML_CDATA_TEXT, DOMRegionContext.XML_PI_OPEN, DOMRegionContext.XML_PI_CONTENT}, new DefaultCharacterPairMatcher(PAIRS));
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/SharedXMLEditorPluginImageHelper.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/SharedXMLEditorPluginImageHelper.java
deleted file mode 100644
index 9981244..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/SharedXMLEditorPluginImageHelper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.util;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-
-public class SharedXMLEditorPluginImageHelper {
-	public static final String IMG_DTOOL_CONSTRAINOFF = XMLEditorPluginImages.IMG_DTOOL_CONSTRAINOFF;
-	public static final String IMG_DTOOL_CONSTRAINON = XMLEditorPluginImages.IMG_DTOOL_CONSTRAINON;
-	public static final String IMG_DTOOL_RLDGRMR = XMLEditorPluginImages.IMG_DTOOL_RLDGRMR;
-	public static final String IMG_DTOOL_VALIDATE = XMLEditorPluginImages.IMG_DTOOL_VALIDATE;
-	public static final String IMG_ETOOL_CONSTRAINOFF = XMLEditorPluginImages.IMG_ETOOL_CONSTRAINOFF;
-	public static final String IMG_ETOOL_CONSTRAINON = XMLEditorPluginImages.IMG_ETOOL_CONSTRAINON;
-	public static final String IMG_ETOOL_RLDGRMR = XMLEditorPluginImages.IMG_ETOOL_RLDGRMR;
-	public static final String IMG_ETOOL_VALIDATE = XMLEditorPluginImages.IMG_ETOOL_VALIDATE;
-	public static final String IMG_OBJ_ATTRIBUTE = XMLEditorPluginImages.IMG_OBJ_ATTRIBUTE;
-	public static final String IMG_OBJ_CDATASECTION = XMLEditorPluginImages.IMG_OBJ_CDATASECTION;
-	public static final String IMG_OBJ_COMMENT = XMLEditorPluginImages.IMG_OBJ_COMMENT;
-	public static final String IMG_OBJ_DOCTYPE = XMLEditorPluginImages.IMG_OBJ_DOCTYPE;
-	public static final String IMG_OBJ_ELEMENT = XMLEditorPluginImages.IMG_OBJ_ELEMENT;
-	public static final String IMG_OBJ_ENTITY = XMLEditorPluginImages.IMG_OBJ_ENTITY;
-	public static final String IMG_OBJ_ENTITY_REFERENCE = XMLEditorPluginImages.IMG_OBJ_ENTITY_REFERENCE;
-	public static final String IMG_OBJ_NOTATION = XMLEditorPluginImages.IMG_OBJ_NOTATION;
-	public static final String IMG_OBJ_PROCESSINGINSTRUCTION = XMLEditorPluginImages.IMG_OBJ_PROCESSINGINSTRUCTION;
-	public static final String IMG_OBJ_TAG_GENERIC = XMLEditorPluginImages.IMG_OBJ_TAG_GENERIC;
-	public static final String IMG_OBJ_TAG_MACRO = XMLEditorPluginImages.IMG_OBJ_TAG_MACRO;
-	public static final String IMG_OBJ_TXTEXT = XMLEditorPluginImages.IMG_OBJ_TXTEXT;
-
-	/**
-	 * Retrieves the specified image from the xml source editor plugin's image
-	 * registry. Note: The returned <code>Image</code> is managed by the
-	 * workbench; clients must <b>not </b> dispose of the returned image.
-	 * 
-	 * @param symbolicName
-	 *            the symbolic name of the image; there are constants declared
-	 *            in this class for build-in images that come with the xml
-	 *            source editor
-	 * @return the image, or <code>null</code> if not found
-	 */
-	public static Image getImage(String symbolicName) {
-		return XMLEditorPluginImageHelper.getInstance().getImage(symbolicName);
-	}
-
-	/**
-	 * Retrieves the image descriptor for specified image from the xml source
-	 * editor plugin's image registry. Unlike <code>Image</code>s, image
-	 * descriptors themselves do not need to be disposed.
-	 * 
-	 * @param symbolicName
-	 *            the symbolic name of the image; there are constants declared
-	 *            in this interface for build-in images that come with the xml
-	 *            source editor
-	 * @return the image descriptor, or <code>null</code> if not found
-	 */
-	public static ImageDescriptor getImageDescriptor(String symbolicName) {
-		return XMLEditorPluginImageHelper.getInstance().getImageDescriptor(symbolicName);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/XMLCommonResources.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/XMLCommonResources.java
deleted file mode 100644
index a3ba0bb..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/XMLCommonResources.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.util;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-
-/**
- * @deprecated use XMLUIPlugin.getResourceString() instead
- */
-/**
- * This class exists temporarily until the properties files can be
- * re-organized and the various resource references can be updated
- */
-public class XMLCommonResources {
-	protected static XMLCommonResources instance;
-
-	public synchronized static XMLCommonResources getInstance() {
-		if (instance == null) {
-			instance = new XMLCommonResources(XMLUIPlugin.getDefault());
-		}
-		return instance;
-	}
-
-	private XMLUIPlugin editorPlugin;
-
-	private ResourceBundle resourceBundle;
-
-	public XMLCommonResources(XMLUIPlugin editorPlugin) {
-		instance = this;
-		this.editorPlugin = editorPlugin;
-		try {
-			resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.xml.ui.internal.XMLUIPluginResources"); //$NON-NLS-1$
-		}
-		catch (MissingResourceException exception) {
-			// TODO... log an error message
-			// B2BUtilPlugin.getPlugin().getMsgLogger().write(B2BUtilPlugin.getGUIString("_WARN_PLUGIN_PROPERTIES_MISSING")
-			// + descriptor.getLabel());
-			resourceBundle = null;
-		}
-	}
-
-	ImageDescriptor _getImageDescriptor(String iconName) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(XMLUIPlugin.ID, iconName);
-	}
-
-
-	public ResourceBundle getResourceBundle() {
-		return resourceBundle;
-	}
-
-	/**
-	 * This gets the string resource.
-	 */
-	public String getString(String key) {
-		return getResourceBundle().getString(key);
-	}
-
-	/**
-	 * This gets the string resource and does one substitution.
-	 */
-	public String getString(String key, Object s1) {
-		return MessageFormat.format(getString(key), new Object[]{s1});
-	}
-
-	/**
-	 * This gets the string resource and does two substitutions.
-	 */
-	public String getString(String key, Object s1, Object s2) {
-		return MessageFormat.format(getString(key), new Object[]{s1, s2});
-	}
-
-	public IWorkbench getWorkbench() {
-		return editorPlugin.getWorkbench();
-	}
-	/*
-	 * public ImageFactory getImageFactory() { return imageFactory; }
-	 */
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/XMLCommonUIContextIds.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/XMLCommonUIContextIds.java
deleted file mode 100644
index 763d502..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/util/XMLCommonUIContextIds.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-
-
-package org.eclipse.wst.xml.ui.internal.util;
-
-/**
- * Context help id constants.
- */
-public interface XMLCommonUIContextIds {
-	public static final String PLUGIN_NAME = "org.eclipse.wst.xml.ui"; //$NON-NLS-1$
-
-	/* CONTEXT_ID xcui0500 for Edit Attribute Instruction Dialog */
-	public static final String XCUI_ATTRIBUTE_DIALOG = PLUGIN_NAME + ".xcui0500"; //$NON-NLS-1$
-
-	/* CONTEXT_ID xcui0400 for Select XML Catalog ID Dialog */
-	public static final String XCUI_CATALOG_DIALOG = PLUGIN_NAME + ".xcui0400"; //$NON-NLS-1$
-
-	/* CONTEXT_IDs for XML Common UI use xcuixxx context IDs */
-
-	/* CONTEXT_ID xcui0010 for Edit Doctype Dialog */
-	public static final String XCUI_DOCTYPE_DIALOG = PLUGIN_NAME + ".xcui0010"; //$NON-NLS-1$
-	/* CONTEXT_ID xcui0030 for Public ID Text Edit */
-	public static final String XCUI_DOCTYPE_PUBLIC = PLUGIN_NAME + ".xcui0030"; //$NON-NLS-1$
-	/* CONTEXT_ID xcui0020 for Root Element Name Text Edit */
-	public static final String XCUI_DOCTYPE_ROOT = PLUGIN_NAME + ".xcui0020"; //$NON-NLS-1$
-	/* CONTEXT_ID xcui0040 for System ID Text Edit */
-	public static final String XCUI_DOCTYPE_SYSTEM = PLUGIN_NAME + ".xcui0050"; //$NON-NLS-1$
-
-	/* CONTEXT_ID xcui0300 for Edit Element Instruction Dialog */
-	public static final String XCUI_ELEMENT_DIALOG = PLUGIN_NAME + ".xcui0600"; //$NON-NLS-1$
-
-	/* CONTEXT_ID xcui0200 for Edit Namespace Dialog */
-	public static final String XCUI_NAMESPACE_DIALOG = PLUGIN_NAME + ".xcui0200"; //$NON-NLS-1$
-
-	/* CONTEXT_ID xcui0300 for Edit Processing Instruction Dialog */
-	public static final String XCUI_PROCESSING_DIALOG = PLUGIN_NAME + ".xcui0300"; //$NON-NLS-1$
-
-	/* CONTEXT_ID xcui0100 for Edit Schema Information Dialog */
-	public static final String XCUI_SCHEMA_INFO_DIALOG = PLUGIN_NAME + ".xcui0100"; //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidator.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidator.java
deleted file mode 100644
index 450bcdf..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidator.java
+++ /dev/null
@@ -1,604 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.validation.internal.core.IMessageAccess;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IProjectValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidatorJob;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMText;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * A DelegatingReconcileValidator calls its delegate validator to get a list
- * of validation error IMessages. Using information in this IMessage the
- * DelegatingReconcileValidator updates the IMessage with an offset and length
- * to give a good range to be "squiggled" and adds the messages to the
- * IReporter
- * 
- * @author Mark Hutchinson
- * 
- */
-public abstract class DelegatingSourceValidator implements IValidator {
-	// the selection strategies:
-	protected static final String ALL_ATTRIBUTES = "ALL_ATTRIBUTES"; //$NON-NLS-1$
-	protected static final String ATTRIBUTE_NAME = "ATTRIBUTE_NAME"; //$NON-NLS-1$
-	protected static final String ATTRIBUTE_VALUE = "ATTRIBUTE_VALUE"; //$NON-NLS-1$
-	protected static final String START_TAG = "START_TAG"; //$NON-NLS-1$
-	protected static final String TEXT = "TEXT"; //$NON-NLS-1$
-	protected static final String FIRST_NON_WHITESPACE_TEXT = "FIRST_NON_WHITESPACE_TEXT"; //$NON-NLS-1$
-	protected static final String TEXT_ENTITY_REFERENCE = "TEXT_ENTITY_REFERENCE"; //$NON-NLS-1$
-	protected static final String VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE = "VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE"; //$NON-NLS-1$
-	protected static final String END_TAG = "END_TAG"; //$NON-NLS-1$
-
-	/**
-	 * This constant specifies the attribute name that specifies the side of
-	 * the 'start tag' that the validator has used to report an error. A
-	 * validator may choose to report a message at the left (the start of the
-	 * start tag)or at the right (the end of the start tag). When this
-	 * attribute is not specified error ERROR_SIDE_LEFT is the default.
-	 */
-	protected static final String ERROR_SIDE = "ERROR_SIDE"; //$NON-NLS-1$
-
-	/**
-	 * When the ERROR_SIDE attribute specifies the ERROR_SIDE_LEFT value it is
-	 * assumed that the message specifies a location to the left of the start
-	 * tag
-	 */
-	protected static final String ERROR_SIDE_LEFT = "ERROR_SIDE_LEFT"; //$NON-NLS-1$	
-
-	/**
-	 * When the ERROR_SIDE attribute specifies the ERROR_SIDE_RIGHT value it
-	 * is assumed that the message specifies a location to the right of the
-	 * start tag
-	 */
-	protected static final String ERROR_SIDE_RIGHT = "ERROR_SIDE_RIGHT"; //$NON-NLS-1$	
-
-	protected static final String COLUMN_NUMBER_ATTRIBUTE = "columnNumber"; //$NON-NLS-1$
-	protected static final String SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE = "squiggleSelectionStrategy"; //$NON-NLS-1$
-	protected static final String SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE = "squiggleNameOrValue"; //$NON-NLS-1$
-
-	public DelegatingSourceValidator() {
-		super(); // constructor
-	}
-
-	public void cleanup(IReporter arg0) { // don't need to implement
-	}
-
-	// My Implementation of IHelper
-	class MyHelper implements IProjectValidationContext {
-		InputStream inputStream;
-
-		IFile file;
-
-		public MyHelper(InputStream inputStream, IFile file) {
-			this.inputStream = inputStream;
-			this.file = file;
-		}
-
-		public int getBuildKind() {
-			return 0;
-		}
-
-		public Object loadModel(String symbolicName, Object[] parms) {
-			if (symbolicName.equals("getFile")) { //$NON-NLS-1$
-				return file;
-			}
-			return null;
-		}
-
-		public Object loadModel(String symbolicName) {
-			if (symbolicName.equals("inputStream")) { //$NON-NLS-1$
-				return inputStream;
-			}
-			return null;
-		}
-
-		public String[] getURIs() {
-			if (file != null) {
-				return new String[]{file.getFullPath().toString()};
-			}
-			return new String[0];
-		}
-
-		public IProject getProject() {
-			if (file != null) {
-				return file.getProject();
-			}
-			return null;
-		}
-	}
-
-	// My Implementation of IReporter
-	class MyReporter implements IReporter {
-		List list = new ArrayList();
-
-		public MyReporter() {
-			super();
-		}
-
-		public void addMessage(IValidator origin, IMessage message) {
-			list.add(message);
-		}
-
-		public void displaySubtask(IValidator validator, IMessage message) {
-			/* do not need to implement */
-		}
-
-		public IMessageAccess getMessageAccess() {
-			return null;
-		}
-
-		public boolean isCancelled() {
-			return false;
-		}
-
-		public void removeAllMessages(IValidator origin, Object object) { // do
-			/* do not need to implement */
-		}
-
-		public void removeAllMessages(IValidator origin) {
-			/* do not need to implement */
-		}
-
-		public void removeMessageSubset(IValidator validator, Object obj, String groupName) {// do
-			/* do not need to implement */
-		}
-
-		public List getMessages() {
-			return list;
-		}
-	}
-
-	protected abstract IValidator getDelegateValidator();
-
-	/**
-	 * Calls a delegate validator getting and updates it's list of
-	 * ValidationMessages with a good squiggle offset and length.
-	 * 
-	 * @param helper
-	 *            loads an object.
-	 * @param reporter
-	 *            Is an instance of an IReporter interface, which is used for
-	 *            interaction with the user.
-	 */
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		String[] delta = helper.getURIs();
-		if (delta.length > 0) {
-			// get the file, model and document:
-			IFile file = getFile(delta[0]);
-			IDOMModel xmlModel = getModelForResource(file);
-			try {
-				IDOMDocument document = xmlModel.getDocument();
-
-				// store the text in a byte array; make a full copy to ease
-				// any threading problems
-				byte[] byteArray;
-				try {
-					byteArray = xmlModel.getStructuredDocument().get().getBytes("UTF-8");
-				}
-				catch (UnsupportedEncodingException e) {
-					// Not likely to happen
-					byteArray = xmlModel.getStructuredDocument().get().getBytes();
-				}
-
-				if (isDelegateValidatorEnabled(file)) {
-					IValidator validator = getDelegateValidator();
-					if (validator != null) {
-						// Validate the file:
-						IValidationContext vHelper = new MyHelper(new ByteArrayInputStream(byteArray), file);
-						MyReporter vReporter = new MyReporter();
-						if (validator instanceof IValidatorJob) {
-							((IValidatorJob) validator).validateInJob(vHelper, vReporter);
-						}
-						else {
-							validator.validate(vHelper, vReporter);
-						}
-						List messages = vReporter.list;
-
-						// set the offset and length
-						updateValidationMessages(messages, document, reporter);
-					}
-				}
-			}
-
-
-			finally {
-				if (xmlModel != null) {
-					xmlModel.releaseFromRead();
-				}
-			}
-		}
-	}
-
-	/**
-	 * iterates through the messages and calculates a "better" offset and
-	 * length
-	 * 
-	 * @param messages -
-	 *            a List of IMessages
-	 * @param document -
-	 *            the document
-	 * @param reporter -
-	 *            the reporter the messages are to be added to
-	 */
-	protected void updateValidationMessages(List messages, IDOMDocument document, IReporter reporter) {
-		for (int i = 0; i < messages.size(); i++) {
-			IMessage message = (IMessage) messages.get(i);
-			try {
-				if (message.getAttribute(COLUMN_NUMBER_ATTRIBUTE) != null) {
-					int column = ((Integer) message.getAttribute(COLUMN_NUMBER_ATTRIBUTE)).intValue();
-					String selectionStrategy = (String) message.getAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE);
-					String nameOrValue = (String) message.getAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE);
-
-					// convert the line and Column numbers to an offset:
-					int start = document.getStructuredDocument().getLineOffset(message.getLineNumber() - 1) + column - 1;
-
-					// calculate the "better" start and end offset:
-					int[] result = computeStartAndEndLocation(start, selectionStrategy, getErrorSide(message), nameOrValue, document);
-					if (result != null) {
-						message.setOffset(result[0]);
-						message.setLength(result[1] - result[0]);
-						reporter.addMessage(this, message);
-					}
-				}
-			}
-			catch (BadLocationException e) { // this exception should not
-				// occur - it is thrown if
-				// trying to convert an
-				// invalid line number to and
-				// offset
-			}
-
-		}
-	}
-
-	/**
-	 * @param delta
-	 *            the IFileDelta containing the file name to get
-	 * @return the IFile
-	 */
-	public IFile getFile(String delta) {
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(delta));
-		if (file != null && file.exists())
-		  return file;
-		return null;
-	}
-
-	/**
-	 * 
-	 * @param file
-	 *            the file to get the model for
-	 * @return the file's XMLModel
-	 */
-	protected IDOMModel getModelForResource(IFile file) {
-		IStructuredModel model = null;
-		IModelManager manager = StructuredModelManager.getModelManager();
-
-		try {
-			model = manager.getModelForRead(file);
-			// TODO.. HTML validator tries again to get a model a 2nd way
-		}
-		catch (Exception e) {
-			// e.printStackTrace();
-		}
-
-		return model instanceof IDOMModel ? (IDOMModel) model : null;
-	}
-
-	/**
-	 * @deprecated use computeStartEndLocation(int startOffset, String
-	 *             errorMessage, String selectionStrategy, boolean leftError,
-	 *             String nameOrValue, IDOMDocument document) {
-	 * 
-	 */
-	protected int[] computeStartEndLocation(int startOffset, String errorMessage, String selectionStrategy, String nameOrValue, IDOMDocument document) {
-		return computeStartAndEndLocation(startOffset, selectionStrategy, ERROR_SIDE_RIGHT, nameOrValue, document);
-	}
-
-	/**
-	 * Calculates the "better" offsets.
-	 * 
-	 * @param startOffset -
-	 *            the offset given by Xerces
-	 * @param errorMessage -
-	 *            the Xerces error Message
-	 * @param selectionStrategy -
-	 *            the selectionStrategy
-	 * @param document -
-	 *            the document
-	 * @return int[] - position 0 has the start offset of the squiggle range,
-	 *         position 1 has the endOffset
-	 */
-	/*
-	 * The way the offsets is calculated is: - find the indexed region
-	 * (element) closest to the given offset - if we are between two elements,
-	 * choosing left or right element will depend on parameter 'errorSide' -
-	 * based on the selectionStrategy choose the underlining strategy (eg
-	 * START_TAG means underline the start tag of that element) - use
-	 * information from nameOrValue and the DOM to get better offsets
-	 * 
-	 */
-	protected int[] computeStartAndEndLocation(int startOffset, String selectionStrategy, String errorSide, String nameOrValue, IDOMDocument document) {
-		try {
-			int startEndPositions[] = new int[2];
-
-			IndexedRegion region = document.getModel().getIndexedRegion(startOffset);
-			IndexedRegion prevRegion = document.getModel().getIndexedRegion(startOffset - 1);
-
-			if (prevRegion != region) {
-				// if between two regions we use the 'errorSide' to understand
-				// which
-				// element is applicable. if we know the error has been
-				// reported to the
-				// right of the tag, then we can assume we need to step back
-				// to the previous
-				// region to land at the 'correct location. Otherwise assume
-				// we're
-				// exactly where we need to be.
-				if (ERROR_SIDE_LEFT.equals(errorSide)) {
-					region = prevRegion;
-				}
-			}
-
-			// initialize start and end positions to be the start positions
-			// this means if the
-			// special case is not taken care of below the start and end
-			// offset are set to be
-			// the start of the region where the error was
-			if (region != null) {
-				startEndPositions[0] = region.getStartOffset();
-				startEndPositions[1] = startEndPositions[0];
-			}
-			else { // this will message will not get added to the IReporter
-				// since the length is 0
-				startEndPositions[0] = 0;
-				startEndPositions[1] = 0;
-			}
-			if (region instanceof Node) {
-				Node node = (Node) region;
-
-				if (START_TAG.equals(selectionStrategy)) {// then we want to
-					// underline the opening tag
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						IDOMElement element = (IDOMElement) node;
-						startEndPositions[0] = element.getStartOffset() + 1;
-						startEndPositions[1] = startEndPositions[0] + element.getTagName().length();
-					}
-				}
-				else if (END_TAG.equals(selectionStrategy)) {// then we want to
-					// underline the end tag
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						IDOMElement element = (IDOMElement) node;
-						startEndPositions[0] = element.getEndStartOffset();
-						startEndPositions[1] = element.getEndOffset();
-					}
-				}
-				else if (ATTRIBUTE_NAME.equals(selectionStrategy)) { // in
-					// underline the attribute's name
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						IDOMElement element = (IDOMElement) node;
-						IDOMNode attributeNode = (IDOMNode) (element.getAttributeNode(nameOrValue));
-						if (attributeNode != null) {
-							startEndPositions[0] = attributeNode.getStartOffset();
-							startEndPositions[1] = attributeNode.getStartOffset() + nameOrValue.length();
-						}
-					}
-				}
-				else if (ATTRIBUTE_VALUE.equals(selectionStrategy)) {
-					// underline the attribute's value
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						IDOMElement element = (IDOMElement) node;
-						IDOMAttr attributeNode = (IDOMAttr) (element.getAttributeNode(nameOrValue));
-						if (attributeNode != null) {
-							startEndPositions[0] = attributeNode.getValueRegionStartOffset();
-							String valueRegionText = attributeNode.getValueRegionText();
-							int valueRegionLength = valueRegionText == null ? 0 : valueRegionText.length(); 
-							startEndPositions[1] = startEndPositions[0] + valueRegionLength;
-						}
-					}
-				}
-				else if (ALL_ATTRIBUTES.equals(selectionStrategy)) {
-					// underline all attributes
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						IDOMElement element = (IDOMElement) node;
-						NamedNodeMap attributes = element.getAttributes();
-						if (attributes != null) {
-							IDOMNode first = (IDOMNode) attributes.item(0);
-							IDOMNode last = (IDOMNode) attributes.item(attributes.getLength() - 1);
-							if ((first != null) && (last != null)) {
-								startEndPositions[0] = first.getStartOffset();
-								startEndPositions[1] = last.getEndOffset();
-							}
-						}
-					}
-				}
-				else if (TEXT.equals(selectionStrategy)) {
-					// underline the text between the tags
-					if (node.getNodeType() == Node.TEXT_NODE) {
-						IDOMText textNode = (IDOMText) node;
-						int start = textNode.getStartOffset();
-						String value = textNode.getNodeValue();
-						int index = 0;
-						char curChar = value.charAt(index);
-						// here we are finding start offset by skipping over
-						// whitespace:
-						while ((curChar == '\n') || (curChar == '\t') || (curChar == '\r') || (curChar == ' ')) {
-							curChar = value.charAt(index);
-							index++;
-						}
-						if (index > 0) {
-							index--;
-
-						}
-						start = start + index;
-						startEndPositions[0] = start;
-						startEndPositions[1] = start + value.trim().length();
-					}
-					else if (node.getNodeType() == Node.ELEMENT_NODE) {
-						IDOMElement element = (IDOMElement) node;
-						Node child = element.getFirstChild();
-						if (child instanceof IDOMNode) {
-							IDOMNode xmlChild = ((IDOMNode) child);
-							startEndPositions[0] = xmlChild.getStartOffset();
-							startEndPositions[1] = xmlChild.getEndOffset();
-						}
-					}
-				}
-				else if (FIRST_NON_WHITESPACE_TEXT.equals(selectionStrategy)) {
-					// search through all child nodes and return range of
-					// first non-whitespace
-					// text node
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						NodeList nodes = node.getChildNodes();
-						for (int i = 0; i < nodes.getLength(); i++) {
-							Node currentNode = nodes.item(i);
-							if (currentNode.getNodeType() == Node.TEXT_NODE) {
-								// TODO (Trung) I don't think we should call
-								// getNodeValue(), trim(), length()
-								// repeatedly.
-								// This is inefficient, to improve use local
-								// variables to store values.
-								IDOMText textNode = (IDOMText) currentNode;
-								if (textNode.getNodeValue().trim().length() > 0) {
-									String value = textNode.getNodeValue();
-									int index = 0;
-									int start = textNode.getStartOffset();
-									char curChar = value.charAt(index);
-									// here we are finding start offset by
-									// skipping over whitespace:
-									while ((curChar == '\n') || (curChar == '\t') || (curChar == '\r') || (curChar == ' ')) {
-										curChar = value.charAt(index);
-										index++;
-									}
-									if (index > 0) {
-										index--;
-
-									}
-									start = start + index;
-									startEndPositions[0] = start;
-									startEndPositions[1] = start + value.trim().length();
-									break;
-								}
-							}
-
-						}
-					}
-				}
-
-				else if (TEXT_ENTITY_REFERENCE.equals(selectionStrategy)) {
-					if (node.getNodeType() == Node.ENTITY_REFERENCE_NODE) {
-						startEndPositions[0] = region.getStartOffset();
-						startEndPositions[1] = region.getEndOffset();
-					}
-					else if (node.getNodeType() == Node.ELEMENT_NODE) {
-						/*
-						 * In this case the undeclared entity might be in one
-						 * of the attribute values. Search through the
-						 * attributes to find the range of the undeclared
-						 * entity.
-						 */
-						String entity = "&" + nameOrValue + ";"; //$NON-NLS-1$ //$NON-NLS-2$
-						NamedNodeMap attributes = node.getAttributes();
-						for (int i = 0; i < attributes.getLength(); i++) {
-							IDOMAttr attr = (IDOMAttr) attributes.item(i);
-							String nodeValue = attr.getNodeValue();
-							int index = nodeValue.indexOf(entity);
-							if (index != -1) {
-								startEndPositions[0] = attr.getValueRegionStartOffset() + index + 1;
-								startEndPositions[1] = startEndPositions[0] + entity.length();
-							}
-						}
-					}
-
-				}
-				else if (VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE.equals(selectionStrategy)) {
-					// TODO (Trung) do we really need this strategy ?
-					// If we know the name of the name of the attribute, we
-					// can retrieve its value.
-					// Hence, we can incoperate this strategy with
-					// ATTRIBUTE_VALUE ?
-					if (node.getNodeType() == Node.ELEMENT_NODE) {
-						// here we will search through all attributes for the
-						// one with the
-						// with the value we want:
-						// TODO (Trung) I see a potential problem here.
-						// What happens when there is another attribute having
-						// the same value
-						// with this attribute's buggy value ?
-						// Need to solve when time permits.
-						NamedNodeMap attributes = node.getAttributes();
-						for (int i = 0; i < attributes.getLength(); i++) {
-							IDOMAttr attr = (IDOMAttr) attributes.item(i);
-							String nodeValue = attr.getNodeValue().trim();
-							if (nodeValue.equals(nameOrValue)) {
-								startEndPositions[0] = attr.getValueRegionStartOffset() + 1;
-								startEndPositions[1] = startEndPositions[0] + nodeValue.length();
-								break;
-							}
-						}
-					}
-				}
-			}
-			return startEndPositions;
-		}
-		// catch (Exception e) { // e.printStackTrace();
-		// }
-		finally {
-		}
-		// return null;
-	}
-
-	/**
-	 * Returns true if delegate validator is enabled based on Validation
-	 * preferences
-	 * 
-	 * @param file
-	 * @return false if delegate validator is not enabled based on Validatoin
-	 *         preferences, true otherwise
-	 */
-	protected boolean isDelegateValidatorEnabled(IFile file) {
-		return true;
-	}
-
-	protected String getErrorSide(IMessage message) {
-		// note that if the ERROR_SIDE is unspecified we return the default
-		// value ERROR_SIDE_LEFT
-		Object value = message.getAttribute(ERROR_SIDE);
-		return ERROR_SIDE_RIGHT.equals(value) ? ERROR_SIDE_RIGHT : ERROR_SIDE_LEFT;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidatorForXML.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidatorForXML.java
deleted file mode 100644
index 414a85b..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/DelegatingSourceValidatorForXML.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xml.ui.internal.validation;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-
-/**
- * This performs as you type validation for XML files
- */
-public class DelegatingSourceValidatorForXML extends DelegatingSourceValidator
-{
-  private final static String Id = "org.eclipse.wst.xml.core.xml"; //$NON-NLS-1$
-
-  private Validator _validator;
-
-  public DelegatingSourceValidatorForXML()
-  {
-  }
-
-  private Validator getValidator()
-  {
-    if (_validator == null)
-      _validator = ValidationFramework.getDefault().getValidator(Id);
-    return _validator;
-  }
-
-  protected IValidator getDelegateValidator()
-  {
-    Validator v = getValidator();
-    if (v == null)
-      return null;
-    return v.asIValidator();
-  }
-
-  protected boolean isDelegateValidatorEnabled(IFile file)
-  {
-    Validator v = getValidator();
-    if (v == null)
-      return false;
-    if (!v.shouldValidate(file, false, false))
-      return false;
-    return v.isBuildValidation() || v.isManualValidation();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/MarkupQuickAssistProcessor.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/MarkupQuickAssistProcessor.java
deleted file mode 100644
index c8c876c..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/MarkupQuickAssistProcessor.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.text.contentassist.CompletionProposal;
-import org.eclipse.jface.text.contentassist.ICompletionProposal;
-import org.eclipse.jface.text.quickassist.IQuickAssistInvocationContext;
-import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.correction.ProblemIDsXML;
-import org.eclipse.wst.xml.ui.internal.correction.RemoveUnknownElementQuickFixProposal;
-import org.eclipse.wst.xml.ui.internal.correction.RenameInFileQuickAssistProposal;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImageHelper;
-import org.eclipse.wst.xml.ui.internal.editor.XMLEditorPluginImages;
-
-/**
- * Quick assist processor for problems found by the markup validator
- */
-class MarkupQuickAssistProcessor implements IQuickAssistProcessor {
-	private int fProblemId;
-	private Object fAdditionalFixInfo = null;
-
-	public boolean canAssist(IQuickAssistInvocationContext invocationContext) {
-		return false;
-	}
-
-	public boolean canFix(Annotation annotation) {
-		boolean result = false;
-
-		switch (fProblemId) {
-			case ProblemIDsXML.EmptyTag :
-			case ProblemIDsXML.MissingEndTag :
-			case ProblemIDsXML.AttrsInEndTag :
-			case ProblemIDsXML.MissingAttrValue :
-			case ProblemIDsXML.NoAttrValue :
-			case ProblemIDsXML.SpacesBeforeTagName :
-			case ProblemIDsXML.SpacesBeforePI :
-			case ProblemIDsXML.NamespaceInPI :
-			case ProblemIDsXML.UnknownElement :
-			case ProblemIDsXML.UnknownAttr :
-			case ProblemIDsXML.InvalidAttrValue :
-			case ProblemIDsXML.MissingRequiredAttr :
-			case ProblemIDsXML.AttrValueNotQuoted :
-			case ProblemIDsXML.MissingClosingBracket :
-				result = true;
-		}
-
-		return result;
-	}
-
-	public ICompletionProposal[] computeQuickAssistProposals(IQuickAssistInvocationContext invocationContext) {
-		ArrayList proposals = new ArrayList();
-
-		switch (fProblemId) {
-			case ProblemIDsXML.EmptyTag :
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_0, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.MissingEndTag :
-				String tagName = (String) ((Object[]) fAdditionalFixInfo)[0];
-				String tagClose = (String) ((Object[]) fAdditionalFixInfo)[1];
-				int tagCloseOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[2]).intValue();
-				int startTagEndOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[3]).intValue();
-				int firstChildStartOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[4]).intValue();
-				int endOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[5]).intValue();
-				proposals.add(new CompletionProposal(tagClose, tagCloseOffset, 0, 0, getImage(), XMLUIMessages.QuickFixProcessorXML_1, null, "")); //$NON-NLS-1$ 
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), startTagEndOffset - invocationContext.getOffset(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_2, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				proposals.add(new CompletionProposal("</" + tagName + ">", firstChildStartOffset, 0, 0, getImage(), XMLUIMessages.QuickFixProcessorXML_3, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-				proposals.add(new CompletionProposal("</" + tagName + ">", endOffset, 0, 0, getImage(), XMLUIMessages.QuickFixProcessorXML_4, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-				break;
-			case ProblemIDsXML.AttrsInEndTag :
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_5, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.MissingAttrValue :
-				String defaultAttrValue = (String) ((Object[]) fAdditionalFixInfo)[0];
-				int insertOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[1]).intValue();
-				proposals.add(new CompletionProposal("\"" + defaultAttrValue + "\"", invocationContext.getOffset() + invocationContext.getLength() + insertOffset, 0, defaultAttrValue.length() + 2, getImage(), XMLUIMessages.QuickFixProcessorXML_6, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_7, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.NoAttrValue :
-				defaultAttrValue = (String) fAdditionalFixInfo;
-				proposals.add(new CompletionProposal("=\"" + defaultAttrValue + "\"", invocationContext.getOffset() + invocationContext.getLength(), 0, defaultAttrValue.length() + 3, getImage(), XMLUIMessages.QuickFixProcessorXML_6, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_7, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.SpacesBeforeTagName :
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_8, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.SpacesBeforePI :
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_9, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.NamespaceInPI :
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_10, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.UnknownElement :
-				proposals.add(new RemoveUnknownElementQuickFixProposal(fAdditionalFixInfo, getImage(), XMLUIMessages.QuickFixProcessorXML_11));
-				proposals.add(new RenameInFileQuickAssistProposal());
-				break;
-			case ProblemIDsXML.UnknownAttr :
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_7, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				proposals.add(new RenameInFileQuickAssistProposal());
-				break;
-			case ProblemIDsXML.InvalidAttrValue :
-				proposals.add(new CompletionProposal("", invocationContext.getOffset(), invocationContext.getLength(), 0, getImage(), XMLUIMessages.QuickFixProcessorXML_12, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-			case ProblemIDsXML.MissingRequiredAttr :
-				String requiredAttr = (String) ((Object[]) fAdditionalFixInfo)[0];
-				insertOffset = ((Integer) ((Object[]) fAdditionalFixInfo)[1]).intValue();
-				proposals.add(new CompletionProposal(requiredAttr, invocationContext.getOffset() + insertOffset, 0, requiredAttr.length(), getImage(), XMLUIMessages.QuickFixProcessorXML_13, null, "")); //$NON-NLS-1$ 
-				break;
-			case ProblemIDsXML.AttrValueNotQuoted :
-				String attrValue = (String) fAdditionalFixInfo;
-				proposals.add(new CompletionProposal("\"" + attrValue + "\"", invocationContext.getOffset(), invocationContext.getLength(), attrValue.length() + 2, getImage(), XMLUIMessages.QuickFixProcessorXML_14, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ 
-				break;
-			case ProblemIDsXML.MissingClosingBracket :
-				proposals.add(new CompletionProposal(">", invocationContext.getOffset() + invocationContext.getLength(), 0, 1, getImage(), XMLUIMessages.QuickFixProcessorXML_15, null, "")); //$NON-NLS-1$ //$NON-NLS-2$ 
-				break;
-		}
-		return (ICompletionProposal[]) proposals.toArray(new ICompletionProposal[proposals.size()]);
-	}
-
-	public String getErrorMessage() {
-		return null;
-	}
-
-	private Image getImage() {
-		return XMLEditorPluginImageHelper.getInstance().getImage(XMLEditorPluginImages.IMG_OBJ_CORRECTION_CHANGE);
-	}
-
-	public void setProblemId(int problemId) {
-		fProblemId = problemId;
-	}
-
-	public void setAdditionalFixInfo(Object fixInfo) {
-		fAdditionalFixInfo = fixInfo;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/MarkupValidator.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/MarkupValidator.java
deleted file mode 100644
index 17e2ba1..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/internal/validation/MarkupValidator.java
+++ /dev/null
@@ -1,1036 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.internal.validation;
-
-import java.util.Locale;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceProxy;
-import org.eclipse.core.resources.IResourceProxyVisitor;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.jface.text.BadLocationException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.quickassist.IQuickAssistProcessor;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocumentRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionContainer;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegionList;
-import org.eclipse.wst.sse.ui.internal.reconcile.AbstractStructuredTextReconcilingStrategy;
-import org.eclipse.wst.sse.ui.internal.reconcile.ReconcileAnnotationKey;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.AnnotationInfo;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator;
-import org.eclipse.wst.sse.ui.internal.reconcile.validator.IncrementalReporter;
-import org.eclipse.wst.validation.AbstractValidator;
-import org.eclipse.wst.validation.ValidationResult;
-import org.eclipse.wst.validation.ValidationState;
-import org.eclipse.wst.validation.internal.core.Message;
-import org.eclipse.wst.validation.internal.core.ValidationException;
-import org.eclipse.wst.validation.internal.operations.IWorkbenchContext;
-import org.eclipse.wst.validation.internal.operations.LocalizedMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.validation.internal.provisional.core.IReporter;
-import org.eclipse.wst.validation.internal.provisional.core.IValidationContext;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.regions.DOMRegionContext;
-import org.eclipse.wst.xml.ui.internal.Logger;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.correction.ProblemIDsXML;
-import org.w3c.dom.Node;
-
-/**
- * Basic XML syntax checking step.
- */
-public class MarkupValidator extends AbstractValidator implements IValidator, ISourceValidator {
-	private String DQUOTE = "\""; //$NON-NLS-1$
-	private String SQUOTE = "'"; //$NON-NLS-1$
-	private final String QUICKASSISTPROCESSOR = IQuickAssistProcessor.class.getName();
-
-	private IDocument fDocument;
-
-	private IContentType fRootContentType = null;
-
-    private int SEVERITY_ATTRIBUTE_HAS_NO_VALUE = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_END_TAG_WITH_ATTRIBUTES = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_INVALID_WHITESPACE_BEFORE_TAGNAME = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_MISSING_CLOSING_BRACKET = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_MISSING_CLOSING_QUOTE = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_MISSING_END_TAG = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_MISSING_START_TAG = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_MISSING_QUOTES = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_NAMESPACE_IN_PI_TARGET = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_TAG_NAME_MISSING = IMessage.HIGH_SEVERITY;
-	private int SEVERITY_WHITESPACE_AT_START = IMessage.HIGH_SEVERITY;
-        
-	private void addAttributeError(String messageText, String attributeValueText, int start, int length, int problemId, IStructuredDocumentRegion sdRegion, IReporter reporter, int messageSeverity) {
-
-		if (sdRegion.isDeleted()) {
-			return;
-		}
-
-		int lineNo = getLineNumber(start);
-		LocalizedMessage message = new LocalizedMessage(messageSeverity, messageText);
-		message.setOffset(start);
-		message.setLength(length);
-		message.setLineNo(lineNo);
-
-
-		if (reporter instanceof IncrementalReporter) {
-			MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-			processor.setProblemId(problemId);
-			processor.setAdditionalFixInfo(attributeValueText);
-			message.setAttribute(QUICKASSISTPROCESSOR, processor);
-			AnnotationInfo info = new AnnotationInfo(message);
-			((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-		}
-		else {
-			reporter.addMessage(this, message);
-		}
-	}
-
-	private void checkAttributesInEndTag(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-
-		if (structuredDocumentRegion.isDeleted()) {
-			return;
-		}
-
-		ITextRegionList textRegions = structuredDocumentRegion.getRegions();
-		int errorCount = 0;
-		int start = structuredDocumentRegion.getEndOffset();
-		int end = structuredDocumentRegion.getEndOffset();
-		for (int i = 0; (i < textRegions.size()) && (errorCount < AbstractStructuredTextReconcilingStrategy.ELEMENT_ERROR_LIMIT) && !structuredDocumentRegion.isDeleted(); i++) {
-			ITextRegion textRegion = textRegions.get(i);
-			if ((textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) || (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE)) {
-				if (start > structuredDocumentRegion.getStartOffset(textRegion)) {
-					start = structuredDocumentRegion.getStartOffset(textRegion);
-				}
-				end = structuredDocumentRegion.getEndOffset(textRegion);
-				errorCount++;
-			}
-		}
-		// create one error for all attributes in the end tag
-		if (errorCount > 0) {
-			// Position p = new Position(start, end - start);
-			String messageText = XMLUIMessages.End_tag_has_attributes;
-			LocalizedMessage message = new LocalizedMessage(SEVERITY_END_TAG_WITH_ATTRIBUTES, messageText);
-			message.setOffset(start);
-			message.setLength(end - start);
-			message.setLineNo(getLineNumber(start));
-
-			if (reporter instanceof IncrementalReporter) {
-				MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-				processor.setProblemId(ProblemIDsXML.AttrsInEndTag);
-				message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-				AnnotationInfo info = new AnnotationInfo(message);
-				((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-			}
-			else {
-				reporter.addMessage(this, message);
-			}
-		}
-	}
-
-
-	private void checkClosingBracket(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-
-		if (structuredDocumentRegion.isDeleted()) {
-			return;
-		}
-
-		ITextRegionList regions = structuredDocumentRegion.getRegions();
-		ITextRegion r = null;
-		boolean closed = false;
-		for (int i = 0; (i < regions.size()) && !structuredDocumentRegion.isDeleted(); i++) {
-			r = regions.get(i);
-			if ((r.getType() == DOMRegionContext.XML_TAG_CLOSE) || (r.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE)) {
-				closed = true;
-			}
-		}
-		if (!closed) {
-
-			String messageText = XMLUIMessages.ReconcileStepForMarkup_6;
-
-			int start = structuredDocumentRegion.getStartOffset();
-			int length = structuredDocumentRegion.getText().trim().length();
-			int lineNo = getLineNumber(start);
-
-			LocalizedMessage message = new LocalizedMessage(SEVERITY_MISSING_CLOSING_BRACKET , messageText);
-			message.setOffset(start);
-			message.setLength(length);
-			message.setLineNo(lineNo);
-
-			if (reporter instanceof IncrementalReporter) {
-				MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-				processor.setProblemId(ProblemIDsXML.MissingClosingBracket);
-				message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-				AnnotationInfo info = new AnnotationInfo(message);
-				((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-			}
-			else {
-				reporter.addMessage(this, message);
-			}
-		}
-	}
-
-	private void checkEmptyTag(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-
-		if (structuredDocumentRegion.isDeleted()) {
-			return;
-		}
-
-		// navigate to name
-		ITextRegionList regions = structuredDocumentRegion.getRegions();
-		if (regions.size() == 2) {
-			// missing name region
-			if ((regions.get(0).getType() == DOMRegionContext.XML_TAG_OPEN) && (regions.get(1).getType() == DOMRegionContext.XML_TAG_CLOSE)) {
-				String messageText = XMLUIMessages.ReconcileStepForMarkup_3;
-				int start = structuredDocumentRegion.getStartOffset();
-				int length = structuredDocumentRegion.getLength();
-				int lineNo = getLineNumber(start);
-
-				LocalizedMessage message = new LocalizedMessage(SEVERITY_TAG_NAME_MISSING , messageText);
-				message.setOffset(start);
-				message.setLength(length);
-				message.setLineNo(lineNo);
-
-				if (reporter instanceof IncrementalReporter) {
-					MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-					processor.setProblemId(ProblemIDsXML.EmptyTag);
-					message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-					AnnotationInfo info = new AnnotationInfo(message);
-					((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-				}
-				else {
-					reporter.addMessage(this, message);
-				}
-			}
-		}
-	}
-
-	private int getLineNumber(int start) {
-		int lineNo = -1;
-		try {
-			lineNo = getDocument().getLineOfOffset(start) + 1;
-		}
-		catch (BadLocationException e) {
-			Logger.logException(e);
-		}
-		return lineNo;
-	}
-
-	private void checkForAttributeValue(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-		if (structuredDocumentRegion.isDeleted()) {
-			return;
-		}
-
-		// check for attributes without a value
-		// track the attribute/equals/value sequence using a state of 0, 1 ,2
-		// representing the name, =, and value, respectively
-		int attrState = 0;
-		ITextRegionList textRegions = structuredDocumentRegion.getRegions();
-		// ReconcileAnnotationKey key = createKey(structuredDocumentRegion,
-		// getScope());
-
-		int errorCount = 0;
-		for (int i = 0; (i < textRegions.size()) && (errorCount < AbstractStructuredTextReconcilingStrategy.ELEMENT_ERROR_LIMIT); i++) {
-			ITextRegion textRegion = textRegions.get(i);
-			if ((textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_NAME) || isTagCloseTextRegion(textRegion)) {
-				// dangling name and '='
-				if ((attrState == 2) && (i >= 2)) {
-					// create annotation
-					ITextRegion nameRegion = textRegions.get(i - 2);
-					if (!(nameRegion instanceof ITextRegionContainer)) {
-						Object[] args = {structuredDocumentRegion.getText(nameRegion)};
-						String messageText = NLS.bind(XMLUIMessages.Attribute__is_missing_a_value, args);
-
-						int start = structuredDocumentRegion.getStartOffset(nameRegion);
-						int end = structuredDocumentRegion.getEndOffset();
-						int lineNo = getLineNumber(start);
-						int textLength = structuredDocumentRegion.getText(nameRegion).trim().length();
-
-						LocalizedMessage message = new LocalizedMessage(SEVERITY_ATTRIBUTE_HAS_NO_VALUE , messageText);
-						message.setOffset(start);
-						message.setLength(textLength);
-						message.setLineNo(lineNo);
-
-						// quick fix info
-						ITextRegion equalsRegion = textRegions.get(i - 2 + 1);
-						int insertOffset = structuredDocumentRegion.getTextEndOffset(equalsRegion) - end;
-						Object[] additionalFixInfo = {structuredDocumentRegion.getText(nameRegion), new Integer(insertOffset)};
-
-						if (reporter instanceof IncrementalReporter) {
-							MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-							processor.setProblemId(ProblemIDsXML.MissingAttrValue);
-							processor.setAdditionalFixInfo(additionalFixInfo);
-							message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-							AnnotationInfo info = new AnnotationInfo(message);
-							((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-						}
-						else {
-							reporter.addMessage(this, message);
-						}
-						errorCount++;
-					}
-				}
-				// name but no '=' (XML only)
-				else if ((attrState == 1) && (i >= 1)) {
-					// create annotation
-					ITextRegion previousRegion = textRegions.get(i - 1);
-					if (!(previousRegion instanceof ITextRegionContainer)) {
-						Object[] args = {structuredDocumentRegion.getText(previousRegion)};
-						String messageText = NLS.bind(XMLUIMessages.Attribute__has_no_value, args);
-						int start = structuredDocumentRegion.getStartOffset(previousRegion);
-						int textLength = structuredDocumentRegion.getText(previousRegion).trim().length();
-						int lineNo = getLineNumber(start);
-
-						LocalizedMessage message = new LocalizedMessage(SEVERITY_ATTRIBUTE_HAS_NO_VALUE, messageText);
-						message.setOffset(start);
-						message.setLength(textLength);
-						message.setLineNo(lineNo);
-
-						if (reporter instanceof IncrementalReporter) {
-							MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-							processor.setProblemId(ProblemIDsXML.NoAttrValue);
-							processor.setAdditionalFixInfo(structuredDocumentRegion.getText(previousRegion));
-							message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-							AnnotationInfo info = new AnnotationInfo(message);
-							((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-						}
-						else {
-							reporter.addMessage(this, message);
-						}
-
-						errorCount++;
-					}
-				}
-				attrState = 1;
-			}
-			else if (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_EQUALS) {
-				attrState = 2;
-			}
-			else if (textRegion.getType() == DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				attrState = 0;
-			}
-		}
-
-	}
-
-	private void checkForSpaceBeforeName(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-
-		if (structuredDocumentRegion.isDeleted()) {
-			return;
-		}
-
-		String sdRegionText = structuredDocumentRegion.getFullText();
-		if (sdRegionText.startsWith(" ")) { //$NON-NLS-1$
-			IStructuredDocumentRegion prev = structuredDocumentRegion.getPrevious();
-			if (prev != null) {
-				// this is possibly the case of "< tag"
-				if ((prev.getRegions().size() == 1) && isStartTag(prev)) {
-					// add the error for preceding space in tag name
-					String messageText = XMLUIMessages.ReconcileStepForMarkup_2;
-					int start = structuredDocumentRegion.getStartOffset();
-					// find length of whitespace
-					int length = sdRegionText.trim().equals("") ? sdRegionText.length() : sdRegionText.indexOf(sdRegionText.trim()); //$NON-NLS-1$
-
-					LocalizedMessage message = new LocalizedMessage(SEVERITY_INVALID_WHITESPACE_BEFORE_TAGNAME , messageText);
-					message.setOffset(start);
-					message.setLength(length);
-					message.setLineNo(getLineNumber(start));
-
-					if (reporter instanceof IncrementalReporter) {
-						MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-						processor.setProblemId(ProblemIDsXML.SpacesBeforeTagName);
-						message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-						AnnotationInfo info = new AnnotationInfo(message);
-						((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-					}
-					else {
-						reporter.addMessage(this, message);
-					}
-				}
-			}
-		}
-	}
-
-	private void checkNoNamespaceInPI(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-
-		if (structuredDocumentRegion.isDeleted()) {
-			return;
-		}
-
-		// navigate to name
-		ITextRegionList regions = structuredDocumentRegion.getRegions();
-		ITextRegion r = null;
-		int errorCount = 0;
-		for (int i = 0; (i < regions.size()) && (errorCount < AbstractStructuredTextReconcilingStrategy.ELEMENT_ERROR_LIMIT) && !structuredDocumentRegion.isDeleted(); i++) {
-			r = regions.get(i);
-			if (r.getType() == DOMRegionContext.XML_TAG_NAME) {
-				String piText = structuredDocumentRegion.getText(r);
-				int index = piText.indexOf(":"); //$NON-NLS-1$
-				if (index != -1) {
-					String messageText = XMLUIMessages.ReconcileStepForMarkup_4;
-					int start = structuredDocumentRegion.getStartOffset(r) + index;
-					int length = piText.trim().length() - index;
-
-					LocalizedMessage message = new LocalizedMessage(SEVERITY_NAMESPACE_IN_PI_TARGET , messageText);
-					message.setOffset(start);
-					message.setLength(length);
-					message.setLineNo(getLineNumber(start));
-
-					if (reporter instanceof IncrementalReporter) {
-						MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-						processor.setProblemId(ProblemIDsXML.NamespaceInPI);
-						message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-						AnnotationInfo info = new AnnotationInfo(message);
-						((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-					}
-					else {
-						reporter.addMessage(this, message);
-					}
-
-					errorCount++;
-				}
-			}
-		}
-	}
-
-	private void checkQuotesForAttributeValues(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-		ITextRegionList regions = structuredDocumentRegion.getRegions();
-		ITextRegion r = null;
-		String attrValueText = ""; //$NON-NLS-1$
-		int errorCount = 0;
-		for (int i = 0; (i < regions.size()) && (errorCount < AbstractStructuredTextReconcilingStrategy.ELEMENT_ERROR_LIMIT); i++) {
-			r = regions.get(i);
-			if (r.getType() != DOMRegionContext.XML_TAG_ATTRIBUTE_VALUE) {
-				continue;
-			}
-
-			attrValueText = structuredDocumentRegion.getText(r);
-			// attribute value includes quotes in the string
-			// split up attribute value on quotes
-			/*
-			 * WORKAROUND till
-			 * http://dev.icu-project.org/cgi-bin/icu-bugs/incoming?findid=5207
-			 * is fixed. (Also see BUG143628)
-			 */
-
-			java.util.StringTokenizer st = new java.util.StringTokenizer(attrValueText, "\"'", true); //$NON-NLS-1$
-			int size = st.countTokens();
-			// get the pieces of the attribute value
-			String one = "", two = ""; //$NON-NLS-1$ //$NON-NLS-2$
-			if (size > 0) {
-				one = st.nextToken();
-			}
-			if (size > 1) {
-				two = st.nextToken();
-			}
-			if (size > 2) {
-				// should be handled by parsing...
-				// as in we can't have an attribute value like: <element
-				// attr="a"b"c"/>
-				// and <element attr='a"b"c' /> is legal
-				continue;
-			}
-
-
-			if (size == 1) {
-				if (one.equals(DQUOTE) || one.equals(SQUOTE)) {
-					// missing closing quote
-					String message = XMLUIMessages.ReconcileStepForMarkup_0;
-					addAttributeError(message, attrValueText, structuredDocumentRegion.getStartOffset(r), attrValueText.trim().length(), ProblemIDsXML.Unclassified, structuredDocumentRegion, reporter, SEVERITY_MISSING_CLOSING_QUOTE);
-					errorCount++;
-				}
-				else {
-					// missing both
-					String message = XMLUIMessages.ReconcileStepForMarkup_1;
-					addAttributeError(message, attrValueText, structuredDocumentRegion.getStartOffset(r), attrValueText.trim().length(), ProblemIDsXML.AttrValueNotQuoted, structuredDocumentRegion, reporter, SEVERITY_MISSING_QUOTES);
-					errorCount++;
-				}
-			}
-			else if (size == 2) {
-				if ((one.equals(SQUOTE) && !two.equals(SQUOTE)) || (one.equals(DQUOTE) && !two.equals(DQUOTE))) {
-					// missing closing quote
-					String message = XMLUIMessages.ReconcileStepForMarkup_0;
-					addAttributeError(message, attrValueText, structuredDocumentRegion.getStartOffset(r), attrValueText.trim().length(), ProblemIDsXML.Unclassified, structuredDocumentRegion, reporter, SEVERITY_MISSING_CLOSING_QUOTE);
-					errorCount++;
-				}
-			}
-		}
-		// end of region for loop
-	}
-
-	private void checkStartEndTagPairs(IStructuredDocumentRegion sdRegion, IReporter reporter) {
-
-		if (sdRegion.isDeleted()) {
-			return;
-		}
-
-		// check start/end tag pairs
-		IDOMNode xmlNode = getXMLNode(sdRegion);
-
-		if (xmlNode == null) {
-			return;
-		}
-
-		boolean selfClosed = false;
-		String tagName = null;
-
-		/**
-		 * For tags that aren't meant to be EMPTY, make sure it's empty or has an end tag
-		 */
-		if (xmlNode.isContainer()) {
-			IStructuredDocumentRegion endRegion = xmlNode.getEndStructuredDocumentRegion();
-			if (endRegion == null) {
-				IStructuredDocumentRegion startRegion = xmlNode.getStartStructuredDocumentRegion();
-				if (startRegion != null && !startRegion.isDeleted() && DOMRegionContext.XML_TAG_OPEN.equals(startRegion.getFirstRegion().getType())) {
-					// analyze the tag (check self closing)
-					ITextRegionList regions = startRegion.getRegions();
-					ITextRegion r = null;
-					int start = sdRegion.getStart();
-					int length = sdRegion.getTextLength();
-					for (int i = 0; i < regions.size(); i++) {
-						r = regions.get(i);
-						if (r.getType() == DOMRegionContext.XML_TAG_NAME) {
-							tagName = sdRegion.getText(r);
-							start = sdRegion.getStartOffset(r);
-							length = r.getTextLength();
-						}
-						else if (r.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE) {
-							selfClosed = true;
-						}
-					}
-
-
-					if (!selfClosed && (tagName != null)) {
-						Object[] args = {tagName};
-						String messageText = NLS.bind(XMLUIMessages.Missing_end_tag_, args);
-
-						int lineNumber = getLineNumber(start);
-
-						IMessage message = new LocalizedMessage(SEVERITY_MISSING_END_TAG , messageText);
-						message.setOffset(start);
-						message.setLength(length);
-						message.setLineNo(lineNumber);
-
-						if (reporter instanceof IncrementalReporter) {
-							Object[] additionalFixInfo = getStartEndFixInfo(xmlNode, tagName, r);
-
-							MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-							processor.setProblemId(ProblemIDsXML.MissingEndTag);
-							processor.setAdditionalFixInfo(additionalFixInfo);
-							message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-							AnnotationInfo info = new AnnotationInfo(message);
-
-							((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-						}
-						else {
-							reporter.addMessage(this, message);
-						}
-					}
-				}
-			}
-			else {
-				IStructuredDocumentRegion startRegion = xmlNode.getStartStructuredDocumentRegion();
-				if (startRegion == null || startRegion.isDeleted()) {
-					// analyze the tag (check self closing)
-					ITextRegionList regions = endRegion.getRegions();
-					ITextRegion r = null;
-					int start = sdRegion.getStart();
-					int length = sdRegion.getTextLength();
-					for (int i = 0; i < regions.size(); i++) {
-						r = regions.get(i);
-						if (r.getType() == DOMRegionContext.XML_TAG_NAME) {
-							tagName = sdRegion.getText(r);
-							start = sdRegion.getStartOffset(r);
-							length = r.getTextLength();
-						}
-					}
-
-					if (tagName != null) {
-						Object[] args = {tagName};
-						String messageText = NLS.bind(XMLUIMessages.Missing_start_tag_, args);
-
-						int lineNumber = getLineNumber(start);
-
-						IMessage message = new LocalizedMessage(SEVERITY_MISSING_START_TAG, messageText);
-						message.setOffset(start);
-						message.setLength(length);
-						message.setLineNo(lineNumber);
-
-						if (reporter instanceof IncrementalReporter) {
-							Object[] additionalFixInfo = getStartEndFixInfo(xmlNode, tagName, r);
-
-							MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-							processor.setProblemId(ProblemIDsXML.MissingStartTag);
-							processor.setAdditionalFixInfo(additionalFixInfo);
-							message.setAttribute(QUICKASSISTPROCESSOR, processor);
-
-							AnnotationInfo info = new AnnotationInfo(message);
-
-							((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-						}
-						else {
-							reporter.addMessage(this, message);
-						}
-					}
-				}
-			}
-
-		}
-		/*
-		 * Check for an end tag that has no start tag
-		 */
-		else {
-			IStructuredDocumentRegion startRegion = xmlNode.getStartStructuredDocumentRegion();
-			if (startRegion == null) {
-				IStructuredDocumentRegion endRegion = xmlNode.getEndStructuredDocumentRegion();
-				if (!endRegion.isDeleted()) {
-					// get name
-					ITextRegionList regions = endRegion.getRegions();
-					ITextRegion r = null;
-					for (int i = 0; i < regions.size(); i++) {
-						r = regions.get(i);
-						if (r.getType() == DOMRegionContext.XML_TAG_NAME) {
-							tagName = sdRegion.getText(r);
-						}
-					}
-
-					if (!selfClosed && (tagName != null)) {
-						String messageText = XMLUIMessages.Indicate_no_grammar_specified_severities_error;
-
-						int start = sdRegion.getStart();
-						int lineNumber = getLineNumber(start);
-
-						// SEVERITY_STRUCTURE == IMessage.HIGH_SEVERITY
-						IMessage message = new LocalizedMessage(IMessage.HIGH_SEVERITY, messageText);
-						message.setOffset(start);
-						message.setLength(sdRegion.getTextLength());
-						message.setLineNo(lineNumber);
-
-						reporter.addMessage(this, message);
-					}
-				}
-			}
-		}
-	}
-
-	private Object[] getStartEndFixInfo(IDOMNode xmlNode, String tagName, ITextRegion r) {
-		// quick fix info
-		String tagClose = "/>"; //$NON-NLS-1$
-		int tagCloseOffset = xmlNode.getFirstStructuredDocumentRegion().getEndOffset();
-		if ((r != null) && (r.getType() == DOMRegionContext.XML_TAG_CLOSE)) {
-			tagClose = "/"; //$NON-NLS-1$
-			tagCloseOffset--;
-		}
-		IDOMNode firstChild = (IDOMNode) xmlNode.getFirstChild();
-		while ((firstChild != null) && (firstChild.getNodeType() == Node.TEXT_NODE)) {
-			firstChild = (IDOMNode) firstChild.getNextSibling();
-		}
-		int endOffset = xmlNode.getEndOffset();
-		int firstChildStartOffset = firstChild == null ? endOffset : firstChild.getStartOffset();
-		Object[] additionalFixInfo = {tagName, tagClose, new Integer(tagCloseOffset), new Integer(xmlNode.getFirstStructuredDocumentRegion().getEndOffset()), // startTagEndOffset
-					new Integer(firstChildStartOffset), // firstChildStartOffset
-					new Integer(endOffset)}; // endOffset
-		return additionalFixInfo;
-	}
-
-	private void checkStartingSpaceForPI(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-
-		if (structuredDocumentRegion.isDeleted()) {
-			return;
-		}
-
-		IStructuredDocumentRegion prev = structuredDocumentRegion.getPrevious();
-		if ((prev != null) && prev.getStartOffset() == 0) {
-			if (prev.getType() == DOMRegionContext.XML_CONTENT) {
-				String messageText = XMLUIMessages.ReconcileStepForMarkup_5;
-				int start = prev.getStartOffset();
-				int length = prev.getLength();
-
-				LocalizedMessage message = new LocalizedMessage(SEVERITY_WHITESPACE_AT_START , messageText);
-				message.setOffset(start);
-				message.setLength(length);
-				message.setLineNo(getLineNumber(start));
-
-				if (reporter instanceof IncrementalReporter) {
-					MarkupQuickAssistProcessor processor = new MarkupQuickAssistProcessor();
-					processor.setProblemId(ProblemIDsXML.SpacesBeforePI);
-					message.setAttribute(QUICKASSISTPROCESSOR, processor);
-	
-					AnnotationInfo info = new AnnotationInfo(message);
-					((IncrementalReporter) reporter).addAnnotationInfo(this, info);
-				}
-				else {
-					reporter.addMessage(this, message);
-				}
-				// Position p = new Position(start, length);
-				//				
-				// ReconcileAnnotationKey key =
-				// createKey(structuredDocumentRegion, getScope());
-				// TemporaryAnnotation annotation = new TemporaryAnnotation(p,
-				// SEVERITY_SYNTAX_ERROR, message, key,
-				// ProblemIDsXML.SpacesBeforePI);
-				// results.add(annotation);
-			}
-		}
-	}
-
-	public int getScope() {
-		return ReconcileAnnotationKey.PARTIAL;
-	}
-
-	private IDOMNode getXMLNode(IStructuredDocumentRegion sdRegion) {
-
-		if (sdRegion == null) {
-			return null;
-		}
-
-		IStructuredModel xModel = null;
-		IDOMNode xmlNode = null;
-		// get/release models should always be in a try/finally block
-		try {
-			xModel = StructuredModelManager.getModelManager().getExistingModelForRead(getDocument());
-			// xModel is sometime null, when closing editor, for example
-			if (xModel != null) {
-				xmlNode = (IDOMNode) xModel.getIndexedRegion(sdRegion.getStart());
-			}
-		}
-		finally {
-			if (xModel != null) {
-				xModel.releaseFromRead();
-			}
-		}
-		return xmlNode;
-	}
-
-	/**
-	 * Determines whether the IStructuredDocumentRegion is a XML "end tag"
-	 * since they're not allowed to have attribute ITextRegions
-	 * 
-	 * @param structuredDocumentRegion
-	 */
-	private boolean isEndTag(IStructuredDocumentRegion structuredDocumentRegion) {
-		if ((structuredDocumentRegion == null) || structuredDocumentRegion.isDeleted()) {
-			return false;
-		}
-		return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_END_TAG_OPEN;
-	}
-
-	/**
-	 * Determines if the IStructuredDocumentRegion is an XML Processing
-	 * Instruction
-	 * 
-	 * @param structuredDocumentRegion
-	 * 
-	 */
-	private boolean isPI(IStructuredDocumentRegion structuredDocumentRegion) {
-		if ((structuredDocumentRegion == null) || structuredDocumentRegion.isDeleted()) {
-			return false;
-		}
-		return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_PI_OPEN;
-	}
-
-	/**
-	 * Determines whether the IStructuredDocumentRegion is a XML "start tag"
-	 * since they need to be checked for proper XML attribute region sequences
-	 * 
-	 * @param structuredDocumentRegion
-	 * 
-	 */
-	private boolean isStartTag(IStructuredDocumentRegion structuredDocumentRegion) {
-		if ((structuredDocumentRegion == null) || structuredDocumentRegion.isDeleted()) {
-			return false;
-		}
-		return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_TAG_OPEN;
-	}
-
-	// Because we check the "proper" closing separately from attribute
-	// sequencing, we need to know what's
-	// an appropriate close.
-	private boolean isTagCloseTextRegion(ITextRegion textRegion) {
-		return (textRegion.getType() == DOMRegionContext.XML_TAG_CLOSE) || (textRegion.getType() == DOMRegionContext.XML_EMPTY_TAG_CLOSE);
-	}
-
-	/**
-	 * Determines if the IStructuredDocumentRegion is XML Content
-	 * 
-	 * @param structuredDocumentRegion
-	 * 
-	 */
-	private boolean isXMLContent(IStructuredDocumentRegion structuredDocumentRegion) {
-		if ((structuredDocumentRegion == null) || structuredDocumentRegion.isDeleted()) {
-			return false;
-		}
-		return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_CONTENT;
-	}
-
-	private void setDocument(IDocument doc) {
-		fDocument = doc;
-	}
-
-	private IDocument getDocument() {
-		return fDocument;
-	}
-
-	public void connect(IDocument document) {
-		setDocument(document);
-	}
-
-	public void disconnect(IDocument document) {
-		setDocument(null);
-	}
-
-	public void validate(IRegion dirtyRegion, IValidationContext helper, IReporter reporter) {
-		if (getDocument() == null) {
-			return;
-		}
-		if (!(reporter instanceof IncrementalReporter)) {
-			return;
-		}
-		if (!(getDocument() instanceof IStructuredDocument)) {
-			return;
-		}
-
-		// remove old messages
-		reporter.removeAllMessages(this);
-
-		IStructuredDocumentRegion[] regions = ((IStructuredDocument) fDocument).getStructuredDocumentRegions(dirtyRegion.getOffset(), dirtyRegion.getLength());
-		for (int i = 0; i < regions.length; i++) {
-			validate(regions[i], reporter);
-		}
-	}
-
-	public void validate(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-
-		if (structuredDocumentRegion == null) {
-			return;
-		}
-
-		if (isStartTag(structuredDocumentRegion)) {
-			// check for attributes without a value
-			checkForAttributeValue(structuredDocumentRegion, reporter);
-			// check if started tag is ended
-			checkStartEndTagPairs(structuredDocumentRegion, reporter);
-			// check empty tag <>
-			checkEmptyTag(structuredDocumentRegion, reporter);
-			// check that each attribute has quotes
-			checkQuotesForAttributeValues(structuredDocumentRegion, reporter);
-			// check that the closing '>' is there
-			checkClosingBracket(structuredDocumentRegion, reporter);
-		}
-		else if (isEndTag(structuredDocumentRegion)) {
-			// check if ending tag was started
-			checkStartEndTagPairs(structuredDocumentRegion, reporter);
-			// check for attributes in an end tag
-			checkAttributesInEndTag(structuredDocumentRegion, reporter);
-			// check that the closing '>' is there
-			checkClosingBracket(structuredDocumentRegion, reporter);
-		}
-		else if (isPI(structuredDocumentRegion)) {
-			// check validity of processing instruction
-			checkStartingSpaceForPI(structuredDocumentRegion, reporter);
-			checkNoNamespaceInPI(structuredDocumentRegion, reporter);
-		}
-		else if (isXMLContent(structuredDocumentRegion)) {
-			checkForSpaceBeforeName(structuredDocumentRegion, reporter);
-		}
-		else if (isXMLDoctypeDeclaration(structuredDocumentRegion)) {
-			checkDocumentTypeReferences(structuredDocumentRegion, reporter);
-		}
-	}
-
-	/**
-	 * @param structuredDocumentRegion
-	 * @param reporter
-	 */
-	private void checkDocumentTypeReferences(IStructuredDocumentRegion structuredDocumentRegion, IReporter reporter) {
-	}
-
-	/**
-	 * @param structuredDocumentRegion
-	 * @return
-	 */
-	private boolean isXMLDoctypeDeclaration(IStructuredDocumentRegion structuredDocumentRegion) {
-		if ((structuredDocumentRegion == null) || structuredDocumentRegion.isDeleted()) {
-			return false;
-		}
-		return structuredDocumentRegion.getFirstRegion().getType() == DOMRegionContext.XML_DECLARATION_OPEN && structuredDocumentRegion.getType().equals(DOMRegionContext.XML_DOCTYPE_DECLARATION);
-	}
-
-	public void cleanup(IReporter reporter) {
-		fDocument = null;
-	}
-
-	public void validate(IValidationContext helper, IReporter reporter) throws ValidationException {
-		String[] uris = helper.getURIs();
-		IWorkspaceRoot wsRoot = ResourcesPlugin.getWorkspace().getRoot();
-		if (uris.length > 0) {
-			IFile currentFile = null;
-
-			for (int i = 0; i < uris.length && !reporter.isCancelled(); i++) {
-				// might be called with just project path?
-				IPath path = new Path(uris[i]);
-				if (path.segmentCount() > 1) {
-					currentFile = wsRoot.getFile(path);
-					if (shouldValidate(currentFile, true)) {
-						validateV1File(currentFile, reporter);
-					}
-				}
-				else if (uris.length == 1) {
-					validateV1Project(helper, reporter);
-				}
-			}
-		}
-		else
-			validateV1Project(helper, reporter);
-	}
-	
-	private boolean shouldValidate(IResourceProxy proxy) {
-		if(proxy.getType() == IResource.FILE) {
-			String name = proxy.getName();
-			if(name.toLowerCase(Locale.US).endsWith(".xml")) {
-				return true;
-			}
-		}
-		return shouldValidate(proxy.requestResource(), false);
-	}
-	
-	private boolean shouldValidate(IResource file, boolean checkExtension) {
-		if (file == null || !file.exists() || file.getType() != IResource.FILE)
-			return false;
-		if (checkExtension) {
-			String extension = file.getFileExtension();
-			if (extension != null && "xml".endsWith(extension.toLowerCase(Locale.US)))
-				return true;
-		}
-
-		IContentDescription contentDescription = null;
-		try {
-			contentDescription = ((IFile) file).getContentDescription();
-			if (contentDescription != null) {
-				IContentType contentType = contentDescription.getContentType();
-				return contentDescription != null && contentType.isKindOf(getXMLContentType());
-			}
-		}
-		catch (CoreException e) {
-			Logger.logException(e);
-		}
-		return false;
-	}
-
-	/**
-	 * @param helper
-	 * @param reporter
-	 */
-	private void validateV1Project(IValidationContext helper, final IReporter reporter) {
-		// if uris[] length 0 -> validate() gets called for each project
-		if (helper instanceof IWorkbenchContext) {
-			IProject project = ((IWorkbenchContext) helper).getProject();
-			IResourceProxyVisitor visitor = new IResourceProxyVisitor() {
-				public boolean visit(IResourceProxy proxy) throws CoreException {
-					if (shouldValidate(proxy)) {
-						validateV1File((IFile) proxy.requestResource(), reporter);
-					}
-					return true;
-				}
-			};
-			try {
-				// collect all jsp files for the project
-				project.accept(visitor, IResource.DEPTH_INFINITE);
-			}
-			catch (CoreException e) {
-				Logger.logException(e);
-			}
-		}
-	}
-	
-
-	/**
-	 * @param currentFile
-	 * @param reporter
-	 */
-	private void validateV1File(IFile currentFile, IReporter reporter) {
-		Message message = new LocalizedMessage(IMessage.LOW_SEVERITY, currentFile.getFullPath().toString().substring(1));
-		reporter.displaySubtask(MarkupValidator.this, message);
-
-		IStructuredModel model = null;
-		try {
-			model = StructuredModelManager.getModelManager().getModelForRead(currentFile);
-			IStructuredDocument document = null;
-			if (model != null) {
-				document = model.getStructuredDocument();
-				connect(document);
-				IStructuredDocumentRegion validationRegion = document.getFirstStructuredDocumentRegion();
-				while (validationRegion != null) {
-					validate(validationRegion, reporter);
-					validationRegion = validationRegion.getNext();
-				}
-				disconnect(document);
-			}
-		}
-		catch (Exception e) {
-			Logger.logException(e);
-		}
-		finally {
-			if (model != null) {
-				model.releaseFromRead();
-			}
-		}
-	}
-
-	/**
-	 * @return
-	 */
-	private IContentType getXMLContentType() {
-		if (fRootContentType == null) {
-			fRootContentType = Platform.getContentTypeManager().getContentType("org.eclipse.core.runtime.xml");
-		}
-		return fRootContentType;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.wst.validation.AbstractValidator#validate(org.eclipse.core.resources.IResource, int, org.eclipse.wst.validation.ValidationState, org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public ValidationResult validate(IResource resource, int kind, ValidationState state, IProgressMonitor monitor) {
-		if (resource.getType() != IResource.FILE)
-			return null;
-		ValidationResult result = new ValidationResult();
-		IReporter reporter = result.getReporter(monitor);
-		validateV1File((IFile) resource, reporter);
-		return result;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/AbstractXMLContentOutlineConfiguration.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/AbstractXMLContentOutlineConfiguration.java
deleted file mode 100644
index 00b2cf5..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/AbstractXMLContentOutlineConfiguration.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.views.contentoutline;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.util.TransferDragSourceListener;
-import org.eclipse.jface.util.TransferDropTargetListener;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.ui.internal.IReleasable;
-import org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration;
-import org.eclipse.wst.xml.ui.internal.XMLUIPlugin;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeContentProvider;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager;
-import org.eclipse.wst.xml.ui.internal.dnd.DragNodeCommand;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-/**
- * Basic Outline Configuration for generic XML support.  Expects that the viewer's
- * input will be the DOM Model, and provides basic label and content providers.
- * 
- * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration
- * @since 3.1
- */
-public abstract class AbstractXMLContentOutlineConfiguration extends ContentOutlineConfiguration {
-	private class ActionManagerMenuListener implements IMenuListener, IReleasable {
-		private XMLNodeActionManager fActionManager;
-		private TreeViewer fTreeViewer;
-
-		public ActionManagerMenuListener(TreeViewer viewer) {
-			fTreeViewer = viewer;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.action.IMenuListener#menuAboutToShow(org.eclipse.jface.action.IMenuManager)
-		 */
-		public void menuAboutToShow(IMenuManager manager) {
-			if (fActionManager == null) {
-				fActionManager = createNodeActionManager(fTreeViewer);
-			}
-			if (fActionManager != null) {
-				fActionManager.fillContextMenu(manager, fTreeViewer.getSelection());
-			}
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.wst.sse.ui.internal.IReleasable#release()
-		 */
-		public void release() {
-			fTreeViewer = null;
-			if (fActionManager != null) {
-				fActionManager.setModel(null);
-			}
-		}
-	}
-	
-	private static class StatusLineLabelProvider extends JFaceNodeLabelProvider {
-		public StatusLineLabelProvider() {
-			super();
-		}
-
-		public String getText(Object element) {
-			if (element == null)
-				return null;
-
-			if (!(element instanceof Node)) {
-				return super.getText(element);
-			}
-
-			StringBuffer s = new StringBuffer();
-			Node node = (Node) element;
-			while (node != null) {
-				if (node.getNodeType() != Node.DOCUMENT_NODE) {
-					s.insert(0, super.getText(node));
-				}
-				
-				if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-					node = ((Attr) node).getOwnerElement();
-				else
-					node = node.getParentNode();
-			
-				if (node != null && node.getNodeType() != Node.DOCUMENT_NODE) {
-					s.insert(0, IPath.SEPARATOR);
-				}
-			}
-			return s.toString();
-		}
-	}
-
-	private IContentProvider fContentProvider = null;
-
-	private ActionManagerMenuListener fContextMenuFiller = null;
-
-	private ILabelProvider fLabelProvider = null;
-
-	boolean fShowAttributes = false;
-
-	private ILabelProvider fSimpleLabelProvider;
-	private TransferDragSourceListener[] fTransferDragSourceListeners;
-
-	private TransferDropTargetListener[] fTransferDropTargetListeners;
-
-	/**
-	 * Create new instance of XMLContentOutlineConfiguration
-	 */
-	public AbstractXMLContentOutlineConfiguration() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-
-	/**
-	 * Returns the NodeActionManager to use for the given treeViewer.
-	 * <p>
-	 * Not API. May be removed in the future.
-	 * </p>
-	 * 
-	 * @param treeViewer
-	 *            the TreeViewer associated with this configuration
-	 * @return a node action manager for use with this tree viewer
-	 */
-	protected XMLNodeActionManager createNodeActionManager(TreeViewer treeViewer) {
-		return new XMLNodeActionManager((IStructuredModel) treeViewer.getInput(), treeViewer);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getContentProvider(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public IContentProvider getContentProvider(TreeViewer viewer) {
-		if (fContentProvider == null) {
-			fContentProvider = new JFaceNodeContentProvider();
-		}
-		return fContentProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getLabelProvider(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		if (fLabelProvider == null) {
-			fLabelProvider = new JFaceNodeLabelProvider();
-		}
-		return fLabelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getMenuListener(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public IMenuListener getMenuListener(TreeViewer viewer) {
-		if (fContextMenuFiller == null) {
-			fContextMenuFiller = new ActionManagerMenuListener(viewer);
-		}
-		return fContextMenuFiller;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getPreferenceStore()
-	 */
-	protected IPreferenceStore getPreferenceStore() {
-		return XMLUIPlugin.getDefault().getPreferenceStore();
-	}
-
-	public ILabelProvider getStatusLineLabelProvider(TreeViewer treeViewer) {
-		if (fSimpleLabelProvider == null) {
-			fSimpleLabelProvider = new StatusLineLabelProvider();
-		}
-		return fSimpleLabelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getTransferDragSourceListeners(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public TransferDragSourceListener[] getTransferDragSourceListeners(final TreeViewer treeViewer) {
-		if (fTransferDragSourceListeners == null) {
-			fTransferDragSourceListeners = new TransferDragSourceListener[]{new TransferDragSourceListener() {
-
-				public void dragFinished(DragSourceEvent event) {
-					LocalSelectionTransfer.getTransfer().setSelection(null);
-				}
-
-				public void dragSetData(DragSourceEvent event) {
-				}
-
-				public void dragStart(DragSourceEvent event) {
-					LocalSelectionTransfer.getTransfer().setSelection(treeViewer.getSelection());
-				}
-
-				public Transfer getTransfer() {
-					return LocalSelectionTransfer.getTransfer();
-				}
-			}};
-		}
-
-		return fTransferDragSourceListeners;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getTransferDropTargetListeners(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public TransferDropTargetListener[] getTransferDropTargetListeners(final TreeViewer treeViewer) {
-		if (fTransferDropTargetListeners == null) {
-			fTransferDropTargetListeners = new TransferDropTargetListener[]{new TransferDropTargetListener() {
-				public void dragEnter(DropTargetEvent event) {
-				}
-
-				public void dragLeave(DropTargetEvent event) {
-				}
-
-				public void dragOperationChanged(DropTargetEvent event) {
-				}
-
-				public void dragOver(DropTargetEvent event) {
-					event.feedback = DND.FEEDBACK_SELECT;
-					float feedbackFloat = getHeightInItem(event);
-					if (feedbackFloat > 0.75) {
-						event.feedback = DND.FEEDBACK_INSERT_AFTER;
-					}
-					else if (feedbackFloat < 0.25) {
-						event.feedback = DND.FEEDBACK_INSERT_BEFORE;
-					}
-					event.feedback |= DND.FEEDBACK_EXPAND | DND.FEEDBACK_SCROLL;
-				}
-
-				public void drop(DropTargetEvent event) {
-					if (event.operations != DND.DROP_NONE && LocalSelectionTransfer.getTransfer().getSelection() != null && !LocalSelectionTransfer.getTransfer().getSelection().isEmpty()) {
-						IStructuredSelection selection = (IStructuredSelection) LocalSelectionTransfer.getTransfer().getSelection();
-						if (selection != null && !selection.isEmpty() && event.item != null && event.item.getData() != null) {
-							/*
-							 * the command uses these numbers instead of the
-							 * feedback constants (even though it converts in
-							 * the other direction as well)
-							 */
-							float feedbackFloat = getHeightInItem(event);
-
-							final DragNodeCommand command = new DragNodeCommand(event.item.getData(), feedbackFloat, event.operations, event.detail, selection.toList(), treeViewer);
-							if (command != null && command.canExecute()) {
-								SafeRunnable.run(new SafeRunnable() {
-									public void run() throws Exception {
-										command.execute();
-									}
-								});
-							}
-						}
-					}
-				}
-
-				public void dropAccept(DropTargetEvent event) {
-				}
-
-				private float getHeightInItem(DropTargetEvent event) {
-					if (event.item == null)
-						return .5f;
-					if (event.item instanceof TreeItem) {
-						TreeItem treeItem = (TreeItem) event.item;
-						Control control = treeItem.getParent();
-						Point point = control.toControl(new Point(event.x, event.y));
-						Rectangle bounds = treeItem.getBounds();
-						return (float) (point.y - bounds.y) / (float) bounds.height;
-					}
-					else if (event.item instanceof TableItem) {
-						TableItem tableItem = (TableItem) event.item;
-						Control control = tableItem.getParent();
-						Point point = control.toControl(new Point(event.x, event.y));
-						Rectangle bounds = tableItem.getBounds(0);
-						return (float) (point.y - bounds.y) / (float) bounds.height;
-					}
-					else {
-						return 0.0F;
-					}
-				}
-
-				public Transfer getTransfer() {
-					return LocalSelectionTransfer.getTransfer();
-				}
-
-				public boolean isEnabled(DropTargetEvent event) {
-					return getTransfer().isSupportedType(event.currentDataType);
-				}
-			}};
-		}
-		return fTransferDropTargetListeners;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#unconfigure(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public void unconfigure(TreeViewer viewer) {
-		super.unconfigure(viewer);
-		fTransferDragSourceListeners = null;
-		fTransferDropTargetListeners = null;
-		if (fContextMenuFiller != null) {
-			fContextMenuFiller.release();
-			fContextMenuFiller = null;
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/XMLContentOutlineConfiguration.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/XMLContentOutlineConfiguration.java
deleted file mode 100644
index ec3f156..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/contentoutline/XMLContentOutlineConfiguration.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.views.contentoutline;
-
-import java.util.List;
-
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateAction;
-import org.eclipse.wst.sse.ui.internal.contentoutline.PropertyChangeUpdateActionContributionItem;
-import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImageHelper;
-import org.eclipse.wst.sse.ui.internal.editor.EditorPluginImages;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeContentProvider;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.eclipse.wst.xml.ui.internal.preferences.XMLUIPreferenceNames;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * More advanced Outline Configuration for XML support.  Expects that the viewer's
- * input will be the DOM Model.
- * 
- * @see AbstractXMLContentOutlineConfiguration
- * @since 1.0
- */
-public class XMLContentOutlineConfiguration extends AbstractXMLContentOutlineConfiguration {
-	static final String ATTR_NAME = "name";
-	static final String ATTR_ID = "id";
-
-	private class AttributeShowingLabelProvider extends JFaceNodeLabelProvider {
-		public boolean isLabelProperty(Object element, String property) {
-			return true;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-		 */
-		public String getText(Object o) {
-			StringBuffer text = null;
-			if (o instanceof Node) {
-				Node node = (Node) o;
-				if ((node.getNodeType() == Node.ELEMENT_NODE) && fShowAttributes) {
-					text = new StringBuffer(super.getText(o));
-					// https://bugs.eclipse.org/bugs/show_bug.cgi?id=88444
-					if (node.hasAttributes()) {
-						Element element = (Element) node;
-						NamedNodeMap attributes = element.getAttributes();
-						Node idTypedAttribute = null;
-						Node requiredAttribute = null;
-						boolean hasId = false;
-						boolean hasName = false;
-						Node shownAttribute = null;
-
-						// try to get content model element
-						// declaration
-						CMElementDeclaration elementDecl = null;
-						ModelQuery mq = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-						if (mq != null) {
-							elementDecl = mq.getCMElementDeclaration(element);
-						}
-						// find an attribute of type (or just named)
-						// ID
-						if (elementDecl != null) {
-							int i = 0;
-							while ((i < attributes.getLength()) && (idTypedAttribute == null)) {
-								Node attr = attributes.item(i);
-								String attrName = attr.getNodeName();
-								CMNamedNodeMap attributeDeclarationMap = elementDecl.getAttributes();
-								
-								CMNamedNodeMapImpl allAttributes = new CMNamedNodeMapImpl(attributeDeclarationMap);
-								List nodes = ModelQueryUtil.getModelQuery(node.getOwnerDocument()).getAvailableContent(element, elementDecl, ModelQuery.INCLUDE_ATTRIBUTES);
-								for (int k = 0; k < nodes.size(); k++) {
-									CMNode cmnode = (CMNode) nodes.get(k);
-									if (cmnode.getNodeType() == CMNode.ATTRIBUTE_DECLARATION) {
-										allAttributes.put(cmnode);
-									}
-								}
-								attributeDeclarationMap = allAttributes;
-
-								CMAttributeDeclaration attrDecl = (CMAttributeDeclaration) attributeDeclarationMap.getNamedItem(attrName);
-								if (attrDecl != null) {
-									if ((attrDecl.getAttrType() != null) && (CMDataType.ID.equals(attrDecl.getAttrType().getDataTypeName()))) {
-										idTypedAttribute = attr;
-									}
-									else if ((attrDecl.getUsage() == CMAttributeDeclaration.REQUIRED) && (requiredAttribute == null)) {
-										// as a backup, keep tabs on
-										// any required
-										// attributes
-										requiredAttribute = attr;
-									}
-									else {
-										hasId = hasId || attrName.equals(ATTR_ID);
-										hasName = hasName || attrName.equals(ATTR_NAME);
-									}
-								}
-								++i;
-							}
-						}
-
-						/*
-						 * If no suitable attribute was found, try using a
-						 * required attribute, if none, then prefer "id" or
-						 * "name", otherwise just use first attribute
-						 */
-						if (idTypedAttribute != null) {
-							shownAttribute = idTypedAttribute;
-						}
-						else if (requiredAttribute != null) {
-							shownAttribute = requiredAttribute;
-						}
-						else if (hasId) {
-							shownAttribute = attributes.getNamedItem(ATTR_ID);
-						}
-						else if (hasName) {
-							shownAttribute = attributes.getNamedItem(ATTR_NAME);
-						}
-						if (shownAttribute == null) {
-							shownAttribute = attributes.item(0);
-						}
-
-						// display the attribute and value (without quotes)
-						String attributeName = shownAttribute.getNodeName();
-						if ((attributeName != null) && (attributeName.length() > 0)) {
-							text.append(" "); //$NON-NLS-1$
-							text.append(attributeName);
-							String attributeValue = shownAttribute.getNodeValue();
-							if ((attributeValue != null) && (attributeValue.length() > 0)) {
-								text.append("="); //$NON-NLS-1$
-								text.append(StringUtils.strip(attributeValue));
-							}
-						}
-					}
-				}
-				else {
-					text = new StringBuffer(super.getText(o));
-				}
-			}
-			else {
-				return super.toString();
-			}
-			return text.toString();
-		}
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.jface.viewers.CellLabelProvider#getToolTipText(java.lang.Object)
-		 */
-		public String getToolTipText(Object element) {
-			if (element instanceof Node) {
-				switch (((Node) element).getNodeType()) {
-					case Node.COMMENT_NODE :
-					case Node.CDATA_SECTION_NODE :
-					case Node.PROCESSING_INSTRUCTION_NODE :
-					case Node.TEXT_NODE : {
-						String nodeValue = ((Node) element).getNodeValue().trim();
-						return prepareText(nodeValue);
-					}
-					case Node.ELEMENT_NODE : {
-						// show the preceding comment's tooltip information
-						Node previous = ((Node) element).getPreviousSibling();
-						if (previous != null && previous.getNodeType() == Node.TEXT_NODE)
-							previous = previous.getPreviousSibling();
-						if (previous != null && previous.getNodeType() == Node.COMMENT_NODE)
-							return getToolTipText(previous);
-					}
-				}
-			}
-			return super.getToolTipText(element);
-		}
-
-		/**
-		 * Remove leading indentation from each line in the give string.
-		 * @param text
-		 * @return
-		 */
-		private String prepareText(String text) {
-			StringBuffer nodeText = new StringBuffer();
-			for (int i = 0; i < text.length(); i++) {
-				char c = text.charAt(i);
-				if (c != '\r' && c != '\n') {
-					nodeText.append(c);
-				}
-				else if (c == '\r' || c == '\n') {
-					nodeText.append('\n');
-					while (Character.isWhitespace(c) && i < text.length()) {
-						i++;
-						c = text.charAt(i);
-					}
-					nodeText.append(c);
-				}
-			}
-			return nodeText.toString();
-		}
-	}
-
-	/**
-	 * Toggle action for whether or not to display element's first attribute
-	 */
-	private class ToggleShowAttributeAction extends PropertyChangeUpdateAction {
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=88444
-		private TreeViewer fTreeViewer;
-
-		public ToggleShowAttributeAction(IPreferenceStore store, String preference, TreeViewer treeViewer) {
-			super(XMLUIMessages.XMLContentOutlineConfiguration_0, store, preference, true);
-			setToolTipText(getText());
-			// images needed
-			// setDisabledImageDescriptor(SYNCED_D);
-			// (nsd) temporarily re-use Properties view image
-			setImageDescriptor(EditorPluginImageHelper.getInstance().getImageDescriptor(EditorPluginImages.IMG_OBJ_PROP_PS));
-			fTreeViewer = treeViewer;
-			update();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * 
-		 * @see org.eclipse.ui.texteditor.IUpdate#update()
-		 */
-		public void update() {
-			super.update();
-			fShowAttributes = isChecked();
-
-			// notify the configuration of the change
-			enableShowAttributes(fShowAttributes, fTreeViewer);
-
-			// refresh the outline view
-			fTreeViewer.refresh(true);
-		}
-	}
-	
-	private ILabelProvider fAttributeShowingLabelProvider;
-	private IContentProvider fContentProvider = null;
-
-	boolean fShowAttributes = false;
-
-	/*
-	 * Preference key for Show Attributes
-	 */
-	private final String OUTLINE_SHOW_ATTRIBUTE_PREF = "outline-show-attribute"; //$NON-NLS-1$
-
-	/**
-	 * Create new instance of XMLContentOutlineConfiguration
-	 */
-	public XMLContentOutlineConfiguration() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-
-		/**
-		 * Set up our preference store here. This is done so that subclasses
-		 * aren't required to set their own values, although if they have,
-		 * those will be used instead.
-		 */
-		IPreferenceStore store = getPreferenceStore();
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.DOCUMENT_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.DOCUMENT_NODE, "1, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.PROCESSING_INSTRUCTION_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.PROCESSING_INSTRUCTION_NODE, "2, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.DOCUMENT_TYPE_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.DOCUMENT_TYPE_NODE, "3, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.DOCUMENT_FRAGMENT_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.DOCUMENT_FRAGMENT_NODE, "4, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.COMMENT_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.COMMENT_NODE, "5, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ATTRIBUTE_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ATTRIBUTE_NODE, "6, false");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ELEMENT_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ELEMENT_NODE, "7, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ENTITY_REFERENCE_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ENTITY_REFERENCE_NODE, "8, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.CDATA_SECTION_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.CDATA_SECTION_NODE, "9, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ENTITY_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.ENTITY_NODE, "10, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.NOTATION_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.NOTATION_NODE, "11, true");
-		if (store.getDefaultString(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.TEXT_NODE).length() == 0)
-			store.setDefault(XMLUIPreferenceNames.OUTLINE_BEHAVIOR.TEXT_NODE, "12, false");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#createMenuContributions(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	protected IContributionItem[] createMenuContributions(TreeViewer viewer) {
-		IContributionItem[] items;
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=88444
-		IContributionItem showAttributeItem = new PropertyChangeUpdateActionContributionItem(new ToggleShowAttributeAction(getPreferenceStore(), OUTLINE_SHOW_ATTRIBUTE_PREF, viewer));
-
-		items = super.createMenuContributions(viewer);
-		if (items == null) {
-			items = new IContributionItem[]{showAttributeItem};
-		}
-		else {
-			IContributionItem[] combinedItems = new IContributionItem[items.length + 1];
-			System.arraycopy(items, 0, combinedItems, 0, items.length);
-			combinedItems[items.length] = showAttributeItem;
-			items = combinedItems;
-		}
-		return items;
-	}
-
-	/**
-	 * Notifies this configuration that the flag that indicates whether or not
-	 * to show attribute values in the tree viewer has changed. The tree
-	 * viewer is automatically refreshed afterwards to update the labels.
-	 * 
-	 * Clients should not call this method, but rather should react to it.
-	 * 
-	 * @param showAttributes
-	 *            flag indicating whether or not to show attribute values in
-	 *            the tree viewer
-	 * @param treeViewer
-	 *            the TreeViewer associated with this configuration
-	 */
-	protected void enableShowAttributes(boolean showAttributes, TreeViewer treeViewer) {
-		// nothing by default
-	}
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getContentProvider(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public IContentProvider getContentProvider(TreeViewer viewer) {
-		if (fContentProvider == null) {
-			fContentProvider = new JFaceNodeContentProvider();
-		}
-		return fContentProvider;
-	}
-
-	private Object getFilteredNode(Object object) {
-		if (object instanceof Node) {
-			Node node = (Node) object;
-			short nodeType = node.getNodeType();
-			// replace attribute node in selection with its parent
-			if (nodeType == Node.ATTRIBUTE_NODE) {
-				node = ((Attr) node).getOwnerElement();
-			}
-			// anything else not visible, replace with parent node
-			else if (nodeType == Node.TEXT_NODE) {
-				node = node.getParentNode();
-			}
-			return node;
-		}
-		return object;
-	}
-
-	private Object[] getFilteredNodes(Object[] filteredNodes) {
-		for (int i = 0; i < filteredNodes.length; i++) {
-			filteredNodes[i] = getFilteredNode(filteredNodes[i]);
-		}
-		return filteredNodes;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getLabelProvider(org.eclipse.jface.viewers.TreeViewer)
-	 */
-	public ILabelProvider getLabelProvider(TreeViewer viewer) {
-		if (fAttributeShowingLabelProvider == null) {
-			fAttributeShowingLabelProvider = new AttributeShowingLabelProvider();
-		}
-		return fAttributeShowingLabelProvider;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.sse.ui.views.contentoutline.ContentOutlineConfiguration#getSelection(org.eclipse.jface.viewers.TreeViewer,
-	 *      org.eclipse.jface.viewers.ISelection)
-	 */
-	public ISelection getSelection(TreeViewer viewer, ISelection selection) {
-		ISelection filteredSelection = selection;
-		if (selection instanceof IStructuredSelection) {
-			Object[] filteredNodes = getFilteredNodes(((IStructuredSelection) selection).toArray());
-			filteredSelection = new StructuredSelection(filteredNodes);
-		}
-		return filteredSelection;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/properties/XMLPropertySheetConfiguration.java b/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/properties/XMLPropertySheetConfiguration.java
deleted file mode 100644
index a4f3a4e..0000000
--- a/bundles/org.eclipse.wst.xml.ui/src/org/eclipse/wst/xml/ui/views/properties/XMLPropertySheetConfiguration.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xml.ui.views.properties;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.IPropertySource;
-import org.eclipse.ui.views.properties.IPropertySourceProvider;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.ui.views.properties.PropertySheetConfiguration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.CMDocumentManagerListener;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDocumentCache;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.properties.XMLPropertySource;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/**
- * Configuration for property sheet page which shows XML content.
- * 
- * @see org.eclipse.wst.sse.ui.views.properties.PropertySheetConfiguration
- * @since 1.0
- */
-public class XMLPropertySheetConfiguration extends PropertySheetConfiguration {
-	private class CMDocumentManagerListenerImpl implements CMDocumentManagerListener {
-		public void cacheCleared(CMDocumentCache cache) {
-			// nothing to do
-		}
-
-		public void cacheUpdated(CMDocumentCache cache, final String uri, int oldStatus, int newStatus, CMDocument cmDocument) {
-			if ((newStatus == CMDocumentCache.STATUS_LOADED) || (newStatus == CMDocumentCache.STATUS_ERROR)) {
-				refreshPages();
-			}
-		}
-
-		public void propertyChanged(CMDocumentManager cmDocumentManager, String propertyName) {
-			if (cmDocumentManager.getPropertyEnabled(CMDocumentManager.PROPERTY_AUTO_LOAD)) {
-				refreshPages();
-			}
-		}
-
-		private void refreshPages() {
-			getPropertiesRefreshJob().addPropertySheetPage(fPropertySheetPage);
-			getPropertiesRefreshJob().schedule(PropertiesRefreshJob.UPDATE_DELAY);
-		}
-	}
-
-	private class PropertiesRefreshJob extends UIJob {
-		public static final int UPDATE_DELAY = 200;
-
-		Set propertySheetPages = null;
-
-		public PropertiesRefreshJob() {
-			super(XMLUIMessages.JFaceNodeAdapter_1);
-			setSystem(true);
-			setPriority(Job.SHORT);
-			propertySheetPages = new HashSet(1);
-		}
-
-		void addPropertySheetPage(IPropertySheetPage page) {
-			if (page != null && propertySheetPages != null) {
-				propertySheetPages.add(page);
-				schedule(UPDATE_DELAY);
-			}
-		}
-		
-		/* (non-Javadoc)
-		 * @see org.eclipse.core.runtime.jobs.Job#canceling()
-		 */
-		protected void canceling() {
-			propertySheetPages.clear();
-			super.canceling();
-		}
-
-		public IStatus runInUIThread(IProgressMonitor monitor) {
-			Object[] pages = propertySheetPages.toArray();
-			propertySheetPages.clear();
-
-			for (int i = 0; i < pages.length; i++) {
-				PropertySheetPage page = (PropertySheetPage) pages[i];
-				if ((page != null) && (page.getControl() != null) && !page.getControl().isDisposed()) {
-					page.refresh();
-				}
-			}
-
-			return Status.OK_STATUS;
-		}
-	}
-
-	private class XMLPropertySheetRefreshAdapter implements INodeAdapter {
-		public boolean isAdapterForType(Object type) {
-			return false;
-		}
-
-		public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos) {
-			if (fPropertySheetPage != null) {
-				getPropertiesRefreshJob().addPropertySheetPage(fPropertySheetPage);
-			}
-		}
-	}
-
-	private class XMLPropertySourceProvider implements IPropertySourceProvider {
-		private IPropertySource fPropertySource = null;
-		private INodeNotifier fSource = null;
-
-		public IPropertySource getPropertySource(Object object) {
-			if ((fSource != null) && object.equals(fSource)) {
-				return fPropertySource;
-			}
-
-			if (object instanceof IDOMNode) {
-				fSource = (INodeNotifier) object;
-				fPropertySource = (IPropertySource) fSource.getAdapterFor(IPropertySource.class);
-				if (fPropertySource == null) {
-					fPropertySource = new XMLPropertySource((INodeNotifier) object) {
-						public void setPropertyValue(Object nameObject, Object value) {
-							// https://bugs.eclipse.org/bugs/show_bug.cgi?id=218979
-							for (int i = 0; i < fSelectedNotifiers.length; i++) {
-								fSelectedNotifiers[i].removeAdapter(fRefreshAdapter);
-							}
-							super.setPropertyValue(nameObject, value);
-							for (int i = 0; i < fSelectedNotifiers.length; i++) {
-								fSelectedNotifiers[i].addAdapter(fRefreshAdapter);
-							}
-						}
-					};
-				}
-			}
-			else {
-				fSource = null;
-				fPropertySource = null;
-			}
-			return fPropertySource;
-		}
-	}
-
-	private CMDocumentManagerListenerImpl fCMDocumentManagerListener = new CMDocumentManagerListenerImpl();
-	private PropertiesRefreshJob fPropertiesRefreshJob = null;
-	IPropertySheetPage fPropertySheetPage = null;
-	private IPropertySourceProvider fPropertySourceProvider = null;
-	private INodeAdapter fRefreshAdapter = new XMLPropertySheetRefreshAdapter();
-	private CMDocumentManager[] fSelectedCMDocumentManagers = new CMDocumentManager[0];
-	private INodeNotifier[] fSelectedNotifiers = new INodeNotifier[0];
-
-
-	/**
-	 * Create new instance of XMLPropertySheetConfiguration
-	 */
-	public XMLPropertySheetConfiguration() {
-		// Must have empty constructor to createExecutableExtension
-		super();
-	}
-
-	public ISelection getInputSelection(IWorkbenchPart selectingPart, ISelection selection) {
-		if (fSelectedNotifiers != null) {
-			for (int i = 0; i < fSelectedNotifiers.length; i++) {
-				fSelectedNotifiers[i].removeAdapter(fRefreshAdapter);
-			}
-			fSelectedNotifiers = null;
-		}
-		for (int i = 0; i < fSelectedCMDocumentManagers.length; i++) {
-			fSelectedCMDocumentManagers[i].removeListener(fCMDocumentManagerListener);
-		}
-
-		ISelection preferredSelection = selection;
-		if (selection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSel = (IStructuredSelection) selection;
-
-			/*
-			 * On Attr nodes, select the owner Element. On Text nodes, select
-			 * the parent Element.
-			 */
-			Object[] selectedObjects = new Object[structuredSel.size()];
-			System.arraycopy(structuredSel.toArray(), 0, selectedObjects, 0, selectedObjects.length);
-			for (int i = 0; i < selectedObjects.length; i++) {
-				Object inode = selectedObjects[i];
-				if (inode instanceof Node) {
-					Node node = (Node) inode;
-					// replace Attribute Node with its owner
-					Node parentNode = node.getParentNode();
-					if (node.getNodeType() == Node.ATTRIBUTE_NODE) {
-						Element ownerElement = ((Attr) node).getOwnerElement();
-						selectedObjects[i] = ownerElement;
-					}
-					// replace Text Node with its parent
-					else if (((node.getNodeType() == Node.TEXT_NODE) || (node.getNodeType() == Node.CDATA_SECTION_NODE)) && (parentNode != null)) {
-						selectedObjects[i] = parentNode;
-					}
-				}
-			}
-
-			if (selectedObjects.length > 0) {
-				Set managers = new HashSet(1);
-				Set selectedNotifiers = new HashSet(1);
-
-				for (int i = 0; i < selectedObjects.length; i++) {
-					if (selectedObjects[i] instanceof Node) {
-						ModelQuery query = ModelQueryUtil.getModelQuery(((Node) selectedObjects[i]).getOwnerDocument());
-						if (query != null) {
-							CMDocumentManager mgr = query.getCMDocumentManager();
-							if (mgr != null) {
-								managers.add(mgr);
-								mgr.addListener(fCMDocumentManagerListener);
-							}
-						}
-					}
-					/*
-					 * Add UI refresh adapters and remember notifiers for
-					 * later removal
-					 */
-					if (selectedObjects[i] instanceof INodeNotifier) {
-						selectedNotifiers.add(selectedObjects[i]);
-						((INodeNotifier) selectedObjects[i]).addAdapter(fRefreshAdapter);
-					}
-				}
-				fSelectedCMDocumentManagers = (CMDocumentManager[]) managers.toArray(new CMDocumentManager[managers.size()]);
-				fSelectedNotifiers = (INodeNotifier[]) selectedNotifiers.toArray(new INodeNotifier[selectedNotifiers.size()]);
-			}
-
-
-			preferredSelection = new StructuredSelection(selectedObjects);
-		}
-		return preferredSelection;
-	}
-
-	PropertiesRefreshJob getPropertiesRefreshJob() {
-		if (fPropertiesRefreshJob == null) {
-			fPropertiesRefreshJob = new PropertiesRefreshJob();
-		}
-		return fPropertiesRefreshJob;
-	}
-
-	public IPropertySourceProvider getPropertySourceProvider(IPropertySheetPage page) {
-		if (fPropertySourceProvider == null) {
-			fPropertySheetPage = page;
-			fPropertySourceProvider = new XMLPropertySourceProvider();
-		}
-		return fPropertySourceProvider;
-	}
-
-
-	public void unconfigure() {
-		super.unconfigure();
-		for (int i = 0; i < fSelectedCMDocumentManagers.length; i++) {
-			fSelectedCMDocumentManagers[i].removeListener(fCMDocumentManagerListener);
-		}
-		if(fPropertiesRefreshJob != null) {
-			fPropertiesRefreshJob.cancel();
-			fPropertiesRefreshJob.propertySheetPages = null;
-		}
-		fPropertySheetPage = null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xml.ui/templates/xmldefault-templates.properties b/bundles/org.eclipse.wst.xml.ui/templates/xmldefault-templates.properties
deleted file mode 100644
index 8b5177a..0000000
--- a/bundles/org.eclipse.wst.xml.ui/templates/xmldefault-templates.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 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
-#     Jens Lukowski/Innoopract - initial renaming/restructuring
-#     
-###############################################################################
-Templates.comment.name=comment
-Templates.comment.desc=xml comment
-Templates.xmldeclaration.name=xml declaration
-Templates.xmldeclaration.desc=xml declaration
-Templates.xslpi.name=XSL processing instruction
-Templates.xslpi.desc=XSL processing instruction
-Templates.xsinsp.name=xsinsp
-Templates.xsinsp.desc=XML Schema name space
-Templates.schemaLoc.name=schemaLoc
-Templates.schemaLoc.desc=XML Schema location attribute
-Templates.noschemaLoc.name=noschemaLoc
-Templates.noschemaLoc.desc=No Namespace Schema Location
-Templates.defaultnsp.name=default namespace
-Templates.defaultnsp.desc=Default Namespace Attribute
diff --git a/bundles/org.eclipse.wst.xml.ui/templates/xmldefault-templates.xml b/bundles/org.eclipse.wst.xml.ui/templates/xmldefault-templates.xml
deleted file mode 100644
index b4ad498..0000000
--- a/bundles/org.eclipse.wst.xml.ui/templates/xmldefault-templates.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver - added templates for xsi namespace, schemaLocation, and
-                      default namespace
- *******************************************************************************/
- -->
-<templates>
-  <template name="%Templates.xmldeclaration.name" description="%Templates.xmldeclaration.desc" id="org.eclipse.wst.xml.ui.internal.templates.xmldeclaration" context="xml_new" enabled="true">&lt;?xml version="1.0" encoding="${encoding}"?&gt;</template>
-  <template name="%Templates.comment.name" description="%Templates.comment.desc" id="org.eclipse.wst.xml.ui.internal.templates.comment" context="xml_tag" enabled="true">&lt;!-- ${cursor} --&gt;</template>
-  <template name="%Templates.xslpi.name" description="%Templates.xslpi.desc" id="org.eclipse.wst.xml.ui.internal.templates.xslpi" context="xml_tag" enabled="true">&lt;?xml-stylesheet type="text/xsl" href="${cursor}"?&gt;</template>
-  <template name="%Templates.xsinsp.name" description="%Templates.xsinsp.desc" id="org.eclipse.wst.xml.ui.internal.templates.xsinsp" context="xml_attribute" enabled="true">xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"</template>
-  <template name="%Templates.schemaLoc.name" description="%Templates.schemaLoc.desc" id="org.eclipse.wst.xml.ui.internal.templates.schemaLoc" context="xml_attribute" enabled="true">xsi:schemaLocation="{namespace} {location}"</template>
-  <template name="%Templates.noschemaLoc.name" description="%Templates.noschemaLoc.desc" id="org.eclipse.wst.xml.ui.internal.templates.noschemaLoc" context="xml_attribute" enabled="true">xsi:noNamespaceSchemaLocation="{location}"</template>
-  <template name="%Templates.defaultnsp.name" description="%Templates.defaultnsp.desc" id="org.eclipse.wst.xml.ui.internal.templates.defaultnsp" context="xml_attribute" enabled="true">xmlns="default namespace"</template>
-</templates>
diff --git a/bundles/org.eclipse.wst.xsd.core/.classpath b/bundles/org.eclipse.wst.xsd.core/.classpath
deleted file mode 100644
index 4710c45..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.classpath
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-contentmodel" />
-	<classpathentry kind="src" path="src-validation" />
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4">
-		<accessrules>
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/impl/Constants" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/parsers/XMLGrammarPreparser" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/util/XMLGrammarPoolImpl" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/xni/XMLResourceIdentifier" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/xni/XNIException" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/xni/grammars/XMLGrammarDescription" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/xni/parser/XMLEntityResolver" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/xni/parser/XMLErrorHandler" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/xni/parser/XMLInputSource" />
-			<accessrule kind="accessible"
-				pattern="org/apache/xerces/xni/parser/XMLParseException" />
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/provisional/core/IMessage" />
-			<accessrule kind="accessible"
-				pattern="org/eclipse/wst/validation/internal/delegates/DelegatingValidator" />
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin" />
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsd.core/.cvsignore b/bundles/org.eclipse.wst.xsd.core/.cvsignore
deleted file mode 100644
index 33dd7de..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-bin
-temp.folder
-build.xml
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.xsd.core/.project b/bundles/org.eclipse.wst.xsd.core/.project
deleted file mode 100644
index a95f8ef..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsd.core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ab5558f..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Sat Mar 24 02:19:12 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 301c7ad..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index e70985d..0000000
--- a/bundles/org.eclipse.wst.xsd.core/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Wed Nov 15 02:13:10 EST 2006
-compilers.incompatible-environment=0
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0711d8c..0000000
--- a/bundles/org.eclipse.wst.xsd.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_UI_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.xsd.core; singleton:=true
-Bundle-Version: 1.1.501.qualifier
-Bundle-Activator: org.eclipse.wst.xsd.core.internal.XSDCorePlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xsd.contentmodel.internal;x-friends:="org.eclipse.wst.xsd.ui",
- org.eclipse.wst.xsd.contentmodel.internal.util;x-internal:=true,
- org.eclipse.wst.xsd.core.internal;x-friends:="org.eclipse.wst.xsd.ui",
- org.eclipse.wst.xsd.core.internal.preferences;x-friends:="org.eclipse.wst.xsd.ui",
- org.eclipse.wst.xsd.core.internal.validation;x-internal:=true,
- org.eclipse.wst.xsd.core.internal.validation.eclipse;x-internal:=true 
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.xsd;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-
diff --git a/bundles/org.eclipse.wst.xsd.core/about.html b/bundles/org.eclipse.wst.xsd.core/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xsd.core/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.xsd.core/build.properties b/bundles/org.eclipse.wst.xsd.core/build.properties
deleted file mode 100644
index 984631d..0000000
--- a/bundles/org.eclipse.wst.xsd.core/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     
-###############################################################################
-bin.includes = META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               .,\
-               about.html
-jars.compile.order = .
-output.. = bin/
-source.. = src-contentmodel/,\
-           src-validation/,\
-           src/
diff --git a/bundles/org.eclipse.wst.xsd.core/plugin.properties b/bundles/org.eclipse.wst.xsd.core/plugin.properties
deleted file mode 100644
index 10f5914..0000000
--- a/bundles/org.eclipse.wst.xsd.core/plugin.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-! Properties file for component: XML Schema Validator
-
-!
-! Plugin
-!
-_UI_PLUGIN_NAME                           = XSD Core Plugin
-XSD_Content_Type=XSD
-
-_UI_XML_SCHEMA_VALIDATOR                  = XML Schema Validator
-_UI_XERCES_VALIDATOR_DELEGATE       	  = Xerces-based XML Schema Validator
-
-Bundle-Vendor.0 = Eclipse.org
diff --git a/bundles/org.eclipse.wst.xsd.core/plugin.xml b/bundles/org.eclipse.wst.xsd.core/plugin.xml
deleted file mode 100644
index 878e651..0000000
--- a/bundles/org.eclipse.wst.xsd.core/plugin.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.core.contenttype.contentTypes">
-		<content-type
-			priority="high"
-			name="%XSD_Content_Type"
-			id="xsdsource"
-			base-type="org.eclipse.core.runtime.xml"
-			default-charset="UTF-8"
-			file-extensions="xsd" />
-	</extension>
-
-	<extension point="org.eclipse.wst.xml.core.documentFactories">
-		<factory
-			type="xsd"
-			class="org.eclipse.wst.xsd.contentmodel.internal.CMDocumentFactoryXSD">
-		</factory>
-	</extension>
-	
-	<!-- ====================================================== -->
-	<!-- Register the XSD validator with the validation 		-->
-	<!-- framework. 										    -->
-	<!-- ====================================================== -->
-	<!--
-	<extension
-		id="xsdValidator"
-		name="%_UI_XML_SCHEMA_VALIDATOR"
-		point="org.eclipse.wst.validation.validator">
-		<validator>
-			<filter
-				objectClass="org.eclipse.core.resources.IFile"
-				caseSensitive="false"
-				nameFilter="*.xsd">
-			</filter>
-			
-			<helper
-				class="org.eclipse.wst.xml.core.internal.validation.core.Helper">
-			</helper>
-			
-			<run
-         async="true"
-         class="org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator"
-         enabled="true"
-         fullBuild="true"
-         incremental="true">
-			</run>
-		</validator>
-	</extension>
-	-->
-	
-   <extension id="xsd" name="%_UI_XML_SCHEMA_VALIDATOR" point="org.eclipse.wst.validation.validatorV2">
-      <validator
-            build="true"
-            class="org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator"
-            manual="true"
-            sourceid="org.eclipse.wst.xsd.ui.internal.validation.DelegatingSourceValidatorForXSD"
-            version="2"
-            markerId="org.eclipse.xsd.diagnostic">
-         <include>
-            <rules>
-               <fileext caseSensitive="false" ext="xsd"></fileext>
-            </rules>
-         </include>
-      </validator>
-   </extension>
-
-	<extension
-       point="org.eclipse.wst.validation.validatorDelegates">
-    	<delegate
-        	class="org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator"
-			name="%_UI_XERCES_VALIDATOR_DELEGATE"
-        	target="org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator"/>
-	 </extension>
- 	 
-	 <!-- initialize xml core preferences -->
-	<extension point="org.eclipse.core.runtime.preferences">
-		<initializer
-			class="org.eclipse.wst.xsd.core.internal.preferences.XSDCorePreferenceInitializer" />
-	</extension>
-
-	<!-- ====================================================== -->
-	<!-- Add schemas to XML Catalog                             -->
-	<!-- ====================================================== -->
-	<extension
-		point="org.eclipse.wst.xml.core.catalogContributions">
-		<catalogContribution id="default">
-			<uri
-				name="http://www.w3.org/2001/XMLSchema"
-				uri="platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/XMLSchema.xsd" />
-			<system
-				systemId="http://www.w3.org/2001/xml.xsd"
-				uri="platform:/plugin/org.eclipse.xsd/cache/www.w3.org/2001/xml.xsd"/>				
-		</catalogContribution>
-	</extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMDocumentFactoryXSD.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMDocumentFactoryXSD.java
deleted file mode 100644
index 3326082..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMDocumentFactoryXSD.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.factory.CMDocumentFactory;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.impl.XSDPackageImpl;
-
-/**
- *  This builder handles building .dtd / .xsd grammar files
- */
-public class CMDocumentFactoryXSD implements CMDocumentFactory
-{
-  public static final String XSD_FILE_TYPE = "XSD";
-
-  public CMDocumentFactoryXSD() 
-  {  
-    // here we call init on the XSD and DTD packages to avoid strange initialization bugs
-    //
-    XSDPackageImpl.init();
-    XSDPackage.eINSTANCE.getXSDFactory();  
-  }
-
- 
-  public CMDocument createCMDocument(String uri)
-  {                  	
-    CMDocument result = null;
-    try
-    {                                
-        result = XSDImpl.buildCMDocument(uri);     
-    }
-    catch (Exception e)
-    {
-    	e.printStackTrace();
-    }
-    return result;  
-  } 
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMNodeImpl.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMNodeImpl.java
deleted file mode 100644
index 9fca578..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/CMNodeImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-
-public abstract class CMNodeImpl extends AdapterImpl implements CMNode
-{
-  protected static final String PROPERTY_DOCUMENTATION = "documentation";
-  protected static final String PROPERTY_DOCUMENTATION_SOURCE = "documentationSource";
-  protected static final String PROPERTY_DOCUMENTATION_LANGUAGE = "documentationLanguage";
-  protected static final String PROPERTY_MOF_NOTIFIER = "key";
-  protected static final String PROPERTY_DEFINITION_INFO = "http://org.eclipse.wst/cm/properties/definitionInfo";
-  protected static final String PROPERTY_DEFINITION = "http://org.eclipse.wst/cm/properties/definition";
-
-  public abstract Object getKey();
-
-  public boolean supports(String propertyName)
-  {
-    return propertyName.equals(PROPERTY_MOF_NOTIFIER);
-  }
-
-  public Object getProperty(String propertyName)
-  {
-    return null;
-  }
-
-  public void setProperty(String propertyName, Object object)
-  {
-	  //no propertyes supported? 
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDCMManager.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDCMManager.java
deleted file mode 100644
index 3461a54..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDCMManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.Plugin;
-
-public class XSDCMManager extends Plugin 
-{
-  private static XSDCMManager instance;
-  
-  public XSDCMManager() 
-  {
-    super();
-  }
-  
-  public static XSDCMManager getInstance() {
-    if (instance == null) {
-      instance = new XSDCMManager();
-    }
-    return instance;
-  }
-
-
-  public void startup() throws CoreException 
-  {
-    XSDTypeUtil.initialize();
-    //ContentModelManager.getInstance().setInferredGrammarFactory(new InferredGrammarFactoryImpl());
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
deleted file mode 100644
index 9abdc21..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDImpl.java
+++ /dev/null
@@ -1,3141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver - STAR - bug 157254 - referenced Attributes and Elements
- *        were not being checked to see if they had the annotations if
- *        none were defined locally. (Initial fix modified - see bug)
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAnyElement;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMContent;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocument;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDocumentation;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMGroup;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamedNodeMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNamespace;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNodeList;
-import org.eclipse.wst.xml.core.internal.contentmodel.annotation.AnnotationMap;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMAttributeDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMDataTypeImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMDocumentImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMEntityDeclarationImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMGroupImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNamedNodeMapImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.basic.CMNodeListImpl;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.CMDescriptionBuilder;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xsd.contentmodel.internal.util.XSDSchemaLocatorAdapterFactory;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDAttributeUseCategory;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDConstraint;
-import org.eclipse.xsd.XSDContentTypeCategory;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDForm;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.eclipse.xsd.util.XSDSwitch;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-/**
- * Utility class to build cmnodes from XML Schema nodes. The XML Schema model is
- * found in the org.eclipse.xsd plugin.
- * 
- * TODO: getNamespaceURI()currently always returns '##any'.
- */
-public class XSDImpl
-{
-  /*
-   * properties common to all cmnodes the following properties defined in
-   * CMNodeImpl class: PROPERTY_DOCUMENTATION PROPERTY_DOCUMENTATION_SOURCE
-   * PROPERTY_DOCUMENTATION_LANGUAGE PROPERTY_MOF_NOTIFIER
-   * PROPERTY_DEFINITION_INFO PROPERTY_DEFINITION
-   * 
-   * the following properties defined in this class, XSDImpl:
-   * PROPERTY_CMDOCUMENT PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS
-   * PROPERTY_IS_NAME_SPACE_AWARE PROPERTY_NS_PREFIX_QUALIFICATION
-   * PROPERTY_NILLABLE PROPERTY_SPEC
-   */
-  public static final String PROPERTY_CMDOCUMENT = "CMDocument";
-  public static final String PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS = "http://org.eclipse.wst/cm/properties/usesLocalElementDeclarations";
-  public static final String PROPERTY_IS_NAME_SPACE_AWARE = "http://org.eclipse.wst/cm/properties/isNameSpaceAware";
-  public static final String PROPERTY_NS_PREFIX_QUALIFICATION = "http://org.eclipse.wst/cm/properties/nsPrefixQualification";
-  public static final String PROPERTY_NILLABLE = "http://org.eclipse.wst/cm/properties/nillable";
-  public static final String PROPERTY_SPEC = "spec";
-  /*
-   * properties common to all CMDocument nodes: PROPERTY_TARGET_NAMESPACE_URI
-   * PROPERTY_IMPORTED_NAMESPACE_INFO PROPERTY_NAMESPACE_INFO
-   * PROPERTY_ELEMENT_FORM_DEFAULT PROPERTY_ANNOTATION_MAP
-   */
-  public static final String PROPERTY_TARGET_NAMESPACE_URI = "http://org.eclipse.wst/cm/properties/targetNamespaceURI";
-  public static final String PROPERTY_IMPORTED_NAMESPACE_INFO = "http://org.eclipse.wst/cm/properties/importedNamespaceInfo";
-  public static final String PROPERTY_NAMESPACE_INFO = "http://org.eclipse.wst/cm/properties/namespaceInfo";
-  public static final String PROPERTY_ELEMENT_FORM_DEFAULT = "http://org.eclipse.wst/cm/properties/elementFormDefault";
-  public static final String PROPERTY_ANNOTATION_MAP = "annotationMap";
-  public static final String PROPERTY_COMPLETE_NAMESPACE_INFO = "http://org.eclipse.wst/cm/properties/completeNamespaceInfo";
-  /*
-   * properties common to all CMElementDeclaration nodes: PROPERTY_XSITYPES
-   * PROPERTY_DERIVED_ELEMENT_DECLARATION PROPERTY_SUBSTITUTION_GROUP
-   * PROPERTY_ABSTRACT
-   */
-  public static final String PROPERTY_XSITYPES = "XSITypes";
-  public static final String PROPERTY_DERIVED_ELEMENT_DECLARATION = "DerivedElementDeclaration";
-  public static final String PROPERTY_SUBSTITUTION_GROUP = "SubstitutionGroup";
-  public static final String PROPERTY_SUBSTITUTION_GROUP_VALUE = "SubstitutionGroupValue";
-  public static final String PROPERTY_ABSTRACT = "Abstract";
-  public static final String PROPERTY_WHITESPACE_FACET = "org.eclipse.wst.xsd.cm.properties/whitespace"; //$NON-NLS-1$
-  /**
-   * Definition info for element declarations.
-   */
-  public static final String DEFINITION_INFO_GLOBAL = "global";
-  public static final String DEFINITION_INFO_LOCAL = "local";
-  public static final String XML_LANG_ATTRIBUTE = "xml:lang";
-  public static final String PLATFORM_PROTOCOL = "platform:";
-  protected static XSDAdapterFactoryImpl xsdAdapterFactoryImpl = new XSDAdapterFactoryImpl();
-  protected static XSIDocument xsiDocument = new XSIDocument();
-
-  /**
-   * Given uri for an XML Schema document, parse the document and build
-   * corresponding CMDocument node.
-   * 
-   * @param uri -
-   *          the uri for an XML Schema document
-   * @param grammarErrorChecking -
-   *          grammar error checking flag
-   * @param errorList -
-   *          the resulting error list
-   * @return the corresponding CMDocument node.
-   * @deprecated -- use buildCMDocument(String uri)
-   */
-  public static CMDocument buildCMDocument(String uri, int grammarErrorChecking, List errorList)
-  {
-    return buildCMDocument(uri);
-  }
-
-  /**
-   * Given uri for an XML Schema document, parse the document and build
-   * corresponding CMDocument node.
-   * 
-   * @param uri -
-   *          the uri for an XML Schema document
-   * @return the corresponding CMDocument node.
-   */
-  public static CMDocument buildCMDocument(String uri)
-  {
-    CMDocument cmDocument = null;
-    XSDSchema xsdSchema = buildXSDModel(uri);
-    if (xsdSchema != null)
-    {
-      cmDocument = (CMDocument) getAdapter(xsdSchema);
-    }
-    return cmDocument;
-  }
-
-  /**
-   * Given uri for an XML Schema document, parse the document and build
-   * corresponding CMDocument node.
-   * 
-   * @param uri -
-   *          the uri for an XML Schema document
-   * @return the corresponding CMDocument node.
-   */
-  public static XSDSchema buildXSDModel(String uriString)
-  {
-    XSDSchema xsdSchema = null;
- 
-    try
-    {
-      // if XML Schema for Schema is requested, get it through schema model 
-      if (uriString.endsWith("2001/XMLSchema.xsd"))
-      {
-      	xsdSchema = XSDSchemaImpl.getSchemaForSchema(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);			
-      }
-      else
-      { 	
-        ResourceSet resourceSet = new ResourceSetImpl();
-        //resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory());
-        resourceSet.getAdapterFactories().add(new XSDSchemaLocatorAdapterFactory());
-          
-        URI uri = createURI(uriString);   
-        
-        // CS : bug 113537 ensure we perform physical resolution before opening a stream for the resource
-        //
-        String physicalLocation = URIResolverPlugin.createResolver().resolvePhysicalLocation("", "", uriString);       
-        InputStream inputStream = resourceSet.getURIConverter().createInputStream(URI.createURI(physicalLocation));
-        XSDResourceImpl resource = (XSDResourceImpl)resourceSet.createResource(URI.createURI("*.xsd"));
-        resource.setURI(uri);
-        resource.load(inputStream, null);         
-        xsdSchema = resource.getSchema();      
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    return xsdSchema;
-  }
-  
-  // TODO ... looks like we can remove this class?
-  //
-  static class InternalURIConverter extends URIConverterImpl
-  {
-    protected InputStream createURLInputStream(URI uri) throws IOException
-    {
-      if ("http".equals(uri.scheme()))
-      {
-        String theURI = uri.toString();
-        String mapped = URIResolverPlugin.createResolver().resolve(theURI, theURI, theURI);
-        if (mapped != null)
-        {
-          uri = createURI(mapped);
-        }
-      }
-      return super.createURLInputStream(uri);
-    }
-  }
-
-  /**
-   * Returns an appropriate URI based on a uri string.
-   * 
-   * @param uriString -
-   *          a uri string.
-   * @return an appropriate URI based on a uri string.
-   */
-  public static URI createURI(String uriString)
-  {
-    if (hasProtocol(uriString))
-      return URI.createURI(uriString);
-    else
-      return URI.createFileURI(uriString);
-  }
-
-  private static boolean hasProtocol(String uri)
-  {
-    boolean result = false;
-    if (uri != null)
-    {
-      int index = uri.indexOf(":");
-      if (index != -1 && index > 2) // assume protocol with be length 3 so that
-                                    // the'C' in 'C:/' is not interpreted as a
-                                    // protocol
-      {
-        result = true;
-      }
-    }
-    return result;
-  }
-
-  /**
-   * Returns true if string begins with platform protocol.
-   * 
-   * @param uriString -
-   *          a uri string.
-   * @return true if string begins with platform protocol.
-   */
-  public static boolean withPlatformProtocol(String uriString)
-  {
-    return uriString.startsWith(PLATFORM_PROTOCOL);
-  }
-
-  /**
-   * Returns the value of the 'Min Occurs' attribute. The default value is "1".
-   * 
-   * @param component -
-   *          a concrete component.
-   * @return the value of the 'Min Occurs' attribute.
-   */
-  public static int getMinOccurs(XSDConcreteComponent component)
-  {
-    int minOccur = 1;
-    if (component != null)
-    {
-      Object o = component.getContainer();
-      if (o instanceof XSDParticle)
-      {
-        if (((XSDParticle) o).isSetMinOccurs())
-        {
-          try
-          {
-            minOccur = ((XSDParticle) o).getMinOccurs();
-          }
-          catch (Exception e)
-          {
-            minOccur = 1;
-          }
-        }
-      }
-    }
-    return minOccur;
-  }
-
-  /**
-   * Returns the value of the 'Max Occurs' attribute. The default value is "1".
-   * 
-   * @param component -
-   *          a concrete component.
-   * @return the value of the 'Max Occurs' attribute.
-   */
-  public static int getMaxOccurs(XSDConcreteComponent component)
-  {
-    int maxOccur = 1;
-    if (component != null)
-    {
-      Object o = component.getContainer();
-      if (o instanceof XSDParticle)
-      {
-        if (((XSDParticle) o).isSetMaxOccurs())
-        {
-          try
-          {
-            maxOccur = ((XSDParticle) o).getMaxOccurs();
-          }
-          catch (Exception e)
-          {
-            maxOccur = 1;
-          }
-        }
-      }
-    }
-    return maxOccur;
-  }
-
-  /**
-   * Returns the enumerated values for the given type.
-   * 
-   * @param type -
-   *          a type definition.
-   * @return the enumerated values for the given type.
-   */
-  private final static String TYPE_NAME_BOOLEAN = "boolean"; //$NON-NLS-1$
-  private final static String TYPE_VALUE_TRUE = "true"; //$NON-NLS-1$
-  private final static String TYPE_VALUE_FALSE= "false"; //$NON-NLS-1$  
-  
-  public static String[] getEnumeratedValuesForType(XSDTypeDefinition type)
-  {
-    List result = new ArrayList();
-    // See bug 214804 - Content assist not showing valid values when it's a complex
-    // type with simple content
-    if (type instanceof XSDComplexTypeDefinition)
-    {
-      type = ((XSDComplexTypeDefinition)type).getSimpleType();
-    }
-    if (type instanceof XSDSimpleTypeDefinition)
-    {         
-      if (TYPE_NAME_BOOLEAN.equals(type.getName()) && type.getSchema().getSchemaForSchema() == type.getSchema())
-      {
-        result.add(TYPE_VALUE_TRUE);
-        result.add(TYPE_VALUE_FALSE);
-      } 
-      else
-      {
-        // Simple types can be one of: atomic, list or union.
-        int varietyType = ((XSDSimpleTypeDefinition) type).getVariety().getValue();
-
-        switch (varietyType)
-        {
-          case XSDVariety.ATOMIC:
-            {
-              XSDTypeDefinition baseType = type.getBaseType();
-              if (baseType != null && !(type.getSchema().getSchemaForSchema() == baseType.getSchema()))
-              {
-                getEnumeratedValuesForSimpleType(baseType, result);
-              }
-              else
-              {
-                getEnumeratedValuesForSimpleType(type, result);
-              }
-            }
-            break;
-          case XSDVariety.LIST:
-            {
-              XSDSimpleTypeDefinition itemTypeDefinition = ((XSDSimpleTypeDefinition) type).getItemTypeDefinition();
-              String[] values = getEnumeratedValuesForType(itemTypeDefinition);
-              for (int j = 0; j < values.length; j++) {
-            	  if(result.indexOf(values[j]) == -1) {
-            		  result.add(values[j]);
-            	  }
-              }
-            }
-            break;
-          case XSDVariety.UNION:
-            {
-              List memberTypes = ((XSDSimpleTypeDefinition) type).getMemberTypeDefinitions();
-              if (memberTypes != null && memberTypes.size() > 0)
-              {
-                Iterator i = memberTypes.iterator();
-                while (i.hasNext())
-                {
-                  XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition) i.next();
-                  String[] values = getEnumeratedValuesForType(simpleType);
-                  for (int j = 0; j < values.length; j++) {
-                	  if(result.indexOf(values[j]) == -1) {
-                		  result.add(values[j]);
-                	  }
-                  }
-                }
-              }
-            }
-            break;
-        }
-      }
-    }  
-    String[] array = new String[result.size()];
-    result.toArray(array);
-    return array;
-  }
-
-  private static void getEnumeratedValuesForSimpleType(XSDTypeDefinition type, List result)
-  {
-    List enumerationFacets = ((XSDSimpleTypeDefinition) type).getEnumerationFacets();
-    for (Iterator i = enumerationFacets.iterator(); i.hasNext();)
-    {
-      XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) i.next();
-      List values = enumFacet.getValue();
-      for (Iterator j = values.iterator(); j.hasNext();)
-      {
-        Object o = j.next();
-        if (o != null)
-        {
-          if (!result.contains(o))
-          {
-            result.add(o.toString());
-          }
-        }
-      }
-    }
-  }
-
-  /**
-   * Return a list of documentation elements from the given annotation. Working
-   * with documentation elements requires dropping down into the DOM model.
-   * 
-   * @param annotation -
-   *          an XSDAnnotation node.
-   * @return a list of documentation elements.
-   */
-  public static CMNodeList getDocumentations(XSDAnnotation annotation)
-  {
-    CMNodeListImpl documentations = new CMNodeListImpl();
-    if (annotation != null)
-    {
-      List documentationsElements = annotation.getUserInformation();
-      for (Iterator i = documentationsElements.iterator(); i.hasNext();)
-      {
-        documentations.getList().add(new DocumentationImpl((Element) i.next()));
-      }
-    }
-    return documentations;
-  }
-
-  /**
-   * Adapted from public static List findTypesDerivedFrom(XSDSchema schema,
-   * String namespace, String localName) in class XSDSchemaQueryTools found in
-   * org.eclipse.xsd plugin.
-   * 
-   * Find typeDefinitions that derive from a given type.
-   * 
-   * @param type
-   *          the type derived from
-   * @return List of any XSDTypeDefinitions found
-   */
-  public static List findTypesDerivedFrom(XSDTypeDefinition type)
-  {
-    ArrayList typesDerivedFrom = new ArrayList();
-    if (type != null)
-    {
-      XSDSchema schema = type.getSchema();
-      String localName = type.getName();
-      if ((null != schema) && (null != localName))
-      {
-        String namespace = schema.getTargetNamespace();
-        // A handy convenience method quickly gets all
-        // typeDefinitions within our schema; note that
-        // whether or not this returns types in included,
-        // imported, or redefined schemas is subject to change
-        List typedefs = schema.getTypeDefinitions();
-        for (Iterator iter = typedefs.iterator(); iter.hasNext();)
-        {
-          XSDTypeDefinition typedef = (XSDTypeDefinition) iter.next();
-          if (typedef instanceof XSDComplexTypeDefinition)
-          {
-            // Walk the baseTypes from this typedef seeing if any
-            // of them match the requested one
-            if (isTypeDerivedFrom(typedef, namespace, localName))
-            {
-              // We found it, return the original one and continue
-              typesDerivedFrom.add(typedef);
-              continue;
-            }
-          }
-        }
-      }
-    }
-    return typesDerivedFrom;
-  }
-
-  /**
-   * Adapted from protected static boolean isTypeDerivedFrom(XSDTypeDefinition
-   * typedef, String namespace, String localName) in class XSDSchemaQueryTools
-   * found in org.eclipse.xsd plugin.
-   * 
-   * Recursive worker method to find typeDefinitions that derive from a named
-   * type.
-   * 
-   * @see #findTypesDerivedFrom(XSDSchema, String, String)
-   * @param typeDef
-   *          to see if it's derived from
-   * @param namespace
-   *          for the type derived from
-   * @param localName
-   *          for the type derived from
-   * @return true if it is; false otherwise
-   */
-  protected static boolean isTypeDerivedFrom(XSDTypeDefinition typedef, String namespace, String localName)
-  {
-    // Walk the baseTypes from this typedef seeing if any
-    // of them match the requested one
-    XSDTypeDefinition baseType = typedef.getBaseType();
-    if (baseType == null)
-   	{
-      // typedef is a root type like xsd:anyType, so it has no base
-      return false;
-    }
-    
-    // As this convenience method if our parameters match
-    if (baseType.hasNameAndTargetNamespace(localName, namespace))
-    {
-      return true;
-    }
-    XSDTypeDefinition rootType = typedef.getRootType();
-
-    if (rootType == baseType)
-    {
-      // If we've hit the root, we aren't derived from it
-      return false;
-    }
-    else
-    {
-      // Need to check if the base type is redefined/circular
-      // otherwise this will be an endless recursive call.
-      // Moved.  See https://bugs.eclipse.org/bugs/show_bug.cgi?id=213543
-      // This method should be replaced with     XSDConstants.isOrIsDerivedFrom(baseType, localName, namespace);
-      if (rootType.isCircular())
-      {
-        return true;
-      }
-      // Otherwise continue to traverse upwards
-      return isTypeDerivedFrom(baseType, namespace, localName);
-    }
-  }
-
-  /**
-   * Returns the corresponding cmnode of the specified XML Schema node.
-   * 
-   * @param target -
-   *          an XML Schema node
-   * @return the corresponding cmnode.
-   */
-  public static CMNode getAdapter(Notifier o)
-  {
-    return (CMNode) xsdAdapterFactoryImpl.adapt(o);
-  }
-
-  /**
-   * Adapted from public String getPrefix(String ns, boolean withColon) in class
-   * TypesHelper found in org.eclipse.wst.xsd.editor plugin.
-   * 
-   * @param schema -
-   *          the relevant schema
-   * @param ns -
-   *          the relevant namespace
-   */
-  public static String getPrefix(XSDSchema schema, String ns)
-  {
-    String key = "";
-    if ((schema != null) && (ns != null))
-    {
-      Map map = schema.getQNamePrefixToNamespaceMap();
-      Iterator iter = map.keySet().iterator();
-      while (iter.hasNext())
-      {
-        Object keyObj = iter.next();
-        Object value = map.get(keyObj);
-        if (value != null && value.toString().equals(ns))
-        {
-          if (keyObj != null)
-          {
-            key = keyObj.toString();
-          }
-          else
-          {
-            key = "";
-          }
-          break;
-        }
-      }
-    }
-    return key;
-  }
-  /**
-   * The Factory for the XSD adapter model. It provides a create method for each
-   * non-abstract class of the model.
-   */
-  public static class XSDAdapterFactoryImpl extends AdapterFactoryImpl
-  {
-    public Adapter createAdapter(Notifier target)
-    {
-      XSDSwitch xsdSwitch = new XSDSwitch()
-      {
-        public Object caseXSDWildcard(XSDWildcard object)
-        {
-          return new XSDWildcardAdapter(object);
-        }
-
-        public Object caseXSDModelGroupDefinition(XSDModelGroupDefinition object)
-        {
-          return new XSDModelGroupDefinitionAdapter(object);
-        }
-
-        public Object caseXSDAttributeUse(XSDAttributeUse object)
-        {
-          return new XSDAttributeUseAdapter(object);
-        }
-
-        public Object caseXSDElementDeclaration(XSDElementDeclaration object)
-        {
-          return new XSDElementDeclarationAdapter(object);
-        }
-
-        public Object caseXSDModelGroup(XSDModelGroup object)
-        {
-          return new XSDModelGroupAdapter(object);
-        }
-
-        public Object caseXSDSchema(XSDSchema object)
-        {
-          return new XSDSchemaAdapter(object);
-        }
-      };
-      Object o = xsdSwitch.doSwitch((EObject) target);
-      Adapter result = null;
-      if (o instanceof Adapter)
-      {
-        result = (Adapter) o;
-      }
-      else
-      {
-        Thread.dumpStack();
-      }
-      return result;
-    }
-
-    public Adapter adapt(Notifier target)
-    {
-      return adapt(target, this);
-    }
-  }
-  /**
-   * XSDBaseAdapter -- an abstract base node in the model. All other model nodes
-   * are derived from it.
-   */
-  public static abstract class XSDBaseAdapter extends CMNodeImpl
-  {
-    protected CMNodeListImpl documentation = new CMNodeListImpl();
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return "";
-    }
-
-    /**
-     * Returns true of the given factory is the factory for this XSD adapter
-     * model.
-     * 
-     * @param type -
-     *          a factory
-     * @return true if the type is the adapter factory for this model.
-     */
-    public boolean isAdapterForType(Object type)
-    {
-      return type == xsdAdapterFactoryImpl;
-    }
-
-    /**
-     * Returns true if the property is supported for this class.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return true if the property is supported.
-     */
-    public boolean supports(String propertyName)
-    {
-      return propertyName.equals(PROPERTY_NS_PREFIX_QUALIFICATION) || propertyName.equals(PROPERTY_NILLABLE) || propertyName.equals(PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS)
-          || propertyName.equals(PROPERTY_DOCUMENTATION) || propertyName.equals(PROPERTY_DOCUMENTATION_SOURCE) || propertyName.equals(PROPERTY_DOCUMENTATION_LANGUAGE)
-          || propertyName.equals(PROPERTY_MOF_NOTIFIER) || propertyName.equals(PROPERTY_DEFINITION_INFO) || propertyName.equals(PROPERTY_DEFINITION) || propertyName.equals(PROPERTY_CMDOCUMENT)
-          || propertyName.equals(PROPERTY_IS_NAME_SPACE_AWARE) || propertyName.equals(PROPERTY_SPEC) || super.supports(propertyName);
-    }
-
-    /**
-     * Returns the value of the 'Nillable' attribute. This represents the
-     * nillable infoset property. The default value is false. All derived
-     * classes must override this method if they do not want the default value.
-     * 
-     * @return the value of the 'Nillable' attribute.
-     */
-    public boolean isNillable()
-    {
-      return false;
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode. The default
-     * value is null; All derived classes must override this method if they do
-     * not want the default value.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return null;
-    }
-
-    /**
-     * Return a list of documentation elements. The default value is an empty
-     * CMNodeList; All derived classes must override this method if they do not
-     * want the default value.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      return documentation;
-    }
-
-    /**
-     * Returns the property value for the property name. Returns null if the
-     * property is not supported.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return the property value for the property name.
-     */
-    public Object getProperty(String propertyName)
-    {
-      Object result = null;
-      if (propertyName.equals(PROPERTY_CMDOCUMENT))
-      {
-        result = getCMDocument();
-      }
-      else if (propertyName.equals(PROPERTY_DOCUMENTATION))
-      {
-        result = getDocumentation();
-      }
-      else if (propertyName.equals(PROPERTY_USES_LOCAL_ELEMENT_DECLARATIONS))
-      {
-        result = Boolean.TRUE;
-      }
-      else if (propertyName.equals(PROPERTY_IS_NAME_SPACE_AWARE))
-      {
-        result = Boolean.TRUE;
-      }
-      else if (propertyName.equals(PROPERTY_NS_PREFIX_QUALIFICATION))
-      {
-        result = getNSPrefixQualification();
-      }
-      else if (propertyName.equals(PROPERTY_NILLABLE))
-      {
-        result = isNillable() ? xsiDocument.nilAttribute : null;
-      }
-      else if (propertyName.equals(PROPERTY_MOF_NOTIFIER))
-      {
-        result = getKey();
-      }
-      else if (propertyName.equals(PROPERTY_SPEC))
-      {
-        result = getSpec();
-      }
-      else
-      {
-        result = super.getProperty(propertyName);
-        {
-          CMDocument cmDocument = getCMDocument();
-          if (cmDocument instanceof XSDSchemaAdapter)
-          {
-            AnnotationMap map = ((XSDSchemaAdapter) cmDocument).annotationMap;
-            if (map != null)
-            {
-              String spec = getSpec();
-              if (spec != null)
-              {
-                result = map.getProperty(getSpec(), propertyName);
-              }
-            }
-          }
-        }
-      }
-      return result;
-    }
-       
-
-
-    /*
-     * Returns the value of the form [attribute] which affects the target
-     * namespace of locally scoped features. The default value is null. All
-     * derived classes must override this method if they do not want the default
-     * value. @return the value of the form [attribute].
-     */
-    public Object getNSPrefixQualification()
-    {
-      return null;
-    }
-
-    /**
-     * Returns a general XPath expression for the node.
-     * 
-     * @return a general XPath expression for the node.
-     */
-    public String getSpec()
-    {
-      return "//" + getNodeName();
-    }
-  }
-  /**
-   * XSDSchemaAdapter implements CMDocument. A representation of the model
-   * object 'Schema'.
-   */
-  public static class XSDSchemaAdapter extends XSDBaseAdapter implements CMDocument
-  {
-    protected XSDSchema xsdSchema;
-    protected CMNamedNodeMapImpl namedNodeMap;
-    protected CMNamedNodeMapImpl entityNodeMap;
-    protected AnnotationMap annotationMap = new AnnotationMap();
-    protected Hashtable substitutionGroupTable;
-
-    /**
-     * Constructor.
-     * 
-     * @param xsdSchema -
-     *          the schema node.
-     */
-    public XSDSchemaAdapter(XSDSchema xsdSchema)
-    {
-      this.xsdSchema = xsdSchema;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdSchema;
-    }
-
-    /**
-     * Returns the filename.
-     * 
-     * @return the filename.
-     */
-    public String getNodeName()
-    {
-      // See buildCMDocument() above.
-      return xsdSchema.getSchemaLocation();
-    }
-
-    /**
-     * Returns true if the property is supported for this class.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return true if the property is supported.
-     */
-    public boolean supports(String propertyName)
-    {
-      return propertyName.equals(PROPERTY_TARGET_NAMESPACE_URI) || propertyName.equals(PROPERTY_IMPORTED_NAMESPACE_INFO) || propertyName.equals(PROPERTY_NAMESPACE_INFO)
-          || propertyName.equals(PROPERTY_ELEMENT_FORM_DEFAULT) || propertyName.equals(PROPERTY_ANNOTATION_MAP) || super.supports(propertyName);
-    }
-
-    /**
-     * Returns true if a prefix is globally required for elements.
-     * 
-     * @param xsdSchema -
-     *          the corresponding schema node.
-     * @return true if a prefix is globally required for elements.
-     */
-    protected boolean isPrefixRequired(XSDSchema xsdSchema)
-    {
-      boolean result = true;
-      if (xsdSchema.isSetElementFormDefault())
-        result = !(xsdSchema.getElementFormDefault().getValue() == XSDForm.QUALIFIED);
-      return result;
-    }
-
-    /**
-     * Returns the property value for the property name. Returns null if the
-     * property is not supported.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return the property value for the property name.
-     */
-    public Object getProperty(String propertyName)
-    {
-      Object result = null;
-      if (propertyName.equals(PROPERTY_TARGET_NAMESPACE_URI))
-      {
-        result = xsdSchema.getTargetNamespace();
-      }
-      else if (propertyName.equals(PROPERTY_IMPORTED_NAMESPACE_INFO))
-      {
-        List list = new Vector();
-        getImportedNamespaceInfo(xsdSchema, list);
-        result = list;
-      }
-      else if (propertyName.equals(PROPERTY_NAMESPACE_INFO))
-      {
-        List list = new Vector();
-        NamespaceInfo info = new NamespaceInfo();
-        info.uri = xsdSchema.getTargetNamespace();
-        info.prefix = getPrefix(xsdSchema, info.uri);
-        info.locationHint = null; // note that this locationHint info is null
-                                  // for the root xsd file
-        info.isPrefixRequired = isPrefixRequired(xsdSchema);
-        list.add(info);
-        getImportedNamespaceInfo(xsdSchema, list);
-        result = list;
-      }
-      else if (propertyName.equals(PROPERTY_COMPLETE_NAMESPACE_INFO))
-      {
-    	  result = getAllNamespaceInfo();
-      }
-      else if (propertyName.equals(PROPERTY_ELEMENT_FORM_DEFAULT))
-      {
-        result = xsdSchema.getElementFormDefault().getName();
-      }
-      else if (propertyName.equals(PROPERTY_ANNOTATION_MAP))
-      {
-        result = annotationMap;
-      }
-      else if (propertyName.equals("allElements"))
-      {
-        result = getAllElements();
-      }  
-      else if (propertyName.startsWith("getElementForType#"))
-      {
-        int index = propertyName.indexOf("#");
-        String typeName = propertyName.substring(index + 1, propertyName.length());
-        //
-        //
-        XSDTypeDefinition td = xsdSchema.resolveTypeDefinition(typeName);
-        if (td != null)
-        {
-          LocalElementVisitor localElementVisitor = new LocalElementVisitor();
-          localElementVisitor.visitTypeDefinition(td);
-          result = localElementVisitor.getCMNamedNodeMap();
-        }
-      }
-      else
-      {
-        result = super.getProperty(propertyName);
-      }
-      return result;
-    }
-
-    /**
-     * Gather information on namespaces used in external references.
-     * 
-     * @param theXSDSchema -
-     *          the corresponding schema node
-     * @param list -
-     *          the list of imported namespaces.
-     */
-    public void getImportedNamespaceInfo(XSDSchema theXSDSchema, List list)
-    {
-      for (Iterator iterator = theXSDSchema.getContents().iterator(); iterator.hasNext();)
-      {
-        XSDSchemaContent content = (XSDSchemaContent) iterator.next();
-        if (content instanceof XSDImport)
-        {
-          XSDImport xImport = (XSDImport) content;
-          XSDSchema importedXSDSchema = xImport.getResolvedSchema();
-          NamespaceInfo info = new NamespaceInfo();
-          info.uri = xImport.getNamespace();
-          info.prefix = getPrefix(importedXSDSchema, info.uri);
-          info.locationHint = xImport.getSchemaLocation();
-          if (importedXSDSchema != null)
-          {
-            info.isPrefixRequired = isPrefixRequired(importedXSDSchema);
-          }
-          list.add(info);
-        }
-      }
-    }
-
-    /**
-     * Returns set of named (top-level) element declarations for this schema
-     * node.
-     * 
-     * @return a set of named (top-level) element declarations.
-     */
-    public CMNamedNodeMap getElements()
-    {
-      if (namedNodeMap == null)
-      {
-        namedNodeMap = new CMNamedNodeMapImpl();
-        
-        // Note that if we call xsdSchema.getElementDeclarations()
-        // we get 'more' elements than we really want since we also
-        // get 'imported' elements.  Below we test to ensure the elements
-        // actually have the same target namespace as the schema.
-        String targetNamespace = xsdSchema.getTargetNamespace();
-        for (Iterator i = xsdSchema.getElementDeclarations().iterator(); i.hasNext();)
-        {
-          XSDElementDeclaration ed = (XSDElementDeclaration) i.next();
-          if (targetNamespace != null ? targetNamespace.equals(ed.getTargetNamespace()) : ed.getTargetNamespace() == null)
-          {
-            XSDElementDeclarationAdapter adapter = (XSDElementDeclarationAdapter) getAdapter(ed);
-            namedNodeMap.getHashtable().put(adapter.getNodeName(), adapter);
-          }
-        }
-      }
-      return namedNodeMap;
-    }
-
-    /**
-     * Returns the built-in entity declarations.
-     * 
-     * @return the built-in entity declarations.
-     */
-    public CMNamedNodeMap getEntities()
-    {
-      if (entityNodeMap == null)
-      {
-        entityNodeMap = new CMNamedNodeMapImpl();
-        // add the built in entity declarations
-        entityNodeMap.getHashtable().put("amp", new CMEntityDeclarationImpl("amp", "&"));
-        entityNodeMap.getHashtable().put("lt", new CMEntityDeclarationImpl("lt", "<"));
-        entityNodeMap.getHashtable().put("gt", new CMEntityDeclarationImpl("gt", ">"));
-        entityNodeMap.getHashtable().put("quot", new CMEntityDeclarationImpl("quot", "\""));
-        entityNodeMap.getHashtable().put("apos", new CMEntityDeclarationImpl("apos", "'"));
-      }
-      return entityNodeMap;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return DOCUMENT;
-    }
-
-    /*
-     * Returns null. !!! Why are we not implementing this???? @return null.
-     */
-    public CMNamespace getNamespace()
-    {
-      return null;
-    }
-
-    /**
-     * Returns this.
-     * 
-     * @return this.
-     */
-    public CMDocument getCMDocument()
-    {
-      return this;
-    }
-    
-    public CMNamedNodeMap getAllElements()
-    {
-      CMNamedNodeMapImpl map = new CMNamedNodeMapImpl();
-      for (Iterator i = getElements().iterator(); i.hasNext(); )
-      {
-        CMElementDeclaration ed = (CMElementDeclaration)i.next();
-        map.put(ed);           
-        addLocalElementDefinitions(map, ed);              
-      }     
-      return map;
-    }
-    
-    protected void addLocalElementDefinitions(CMNamedNodeMapImpl map, CMElementDeclaration parentElementDeclaration)
-    {
-      CMNamedNodeMap localElementMap = parentElementDeclaration.getLocalElements();
-      for (Iterator i = localElementMap.iterator(); i.hasNext(); )
-      {
-        CMElementDeclaration ed = (CMElementDeclaration)i.next();
-        if (map.getNamedItem(ed.getNodeName()) == null)
-        {  
-          map.put(ed);        
-          addLocalElementDefinitions(map, ed);
-        }  
-      }               
-    } 
-    
-    
-    /**
-     * Generates a List of NamespaceInfo objects corresponding to the target namespace of the given schema 
-     * and the target namespaces of all its recursively imported/included referenced schemas. All namespace
-     * prefixes in the list are guaranteed to be unique. Prefix collitions are resolved by concatenating
-     * integer numbers to each repeated prefix found i.e. tns, tns1, tns2...
-     * All schema locations in the list are formated as encoded URIs relative to the given schema.
-     * Schemas that are imported/included but not referenced will not appear in the list.
-     * @return List of NamespaceInfo objects
-     * 
-     */
-	public List getAllNamespaceInfo() {
-		List namespaceList = new ArrayList();
-		List resources  = xsdSchema.eResource().getResourceSet().getResources();
-		Iterator i = resources.iterator();
-		while(i.hasNext()) {
-			XSDResourceImpl resource = (XSDResourceImpl) i.next();
-			if(resource.isLoaded()) {
-				XSDSchema schema = resource.getSchema();
-				if(!isDataInNamespaceList(namespaceList, 0, schema.getTargetNamespace())) {
-					NamespaceInfo info = new NamespaceInfo();
-					info.uri = schema.getTargetNamespace();
-					info.isPrefixRequired = isPrefixRequired(schema);
-					info.prefix = getPrefix(schema,schema.getTargetNamespace());
-					if("http://www.w3.org/XML/1998/namespace".equals(info.uri)) {
-    					info.prefix = "xml";
-    				} else if("http://www.w3.org/2000/xmlns".equals(info.uri)) {
-    					info.prefix = "xmlns";
-    				} else {
-    					if(info.uri != null && info.uri != "") {
-	    					int n = 1;
-	    	    			if(info.prefix == null || info.prefix.equals("")) {
-	    	    				info.prefix = "p";
-	    	    			}
-	    	    			String prefix = info.prefix;
-	    	    			while(isDataInNamespaceList(namespaceList, 1, info.prefix)) {
-	    	    				info.prefix = prefix + n++;
-	    	    			}
-    					}
-    				}
-	    			URI relative = URI.createURI(xsdSchema.getSchemaLocation(), true);
-					URI absolute = URI.createURI(schema.getSchemaLocation(), true);
-					URI resolvedRelative = absolute.deresolve(relative);
-					info.locationHint = resolvedRelative.toString();
-	    			namespaceList.add(info);
-				}
-			}
-		}
-		return namespaceList;	
-	}
-
-
-    /**
-     * Searches for a given value in a list of namespaces.
-     * 
-     * @param namespaceList:	List of NamespaceInfo objects
-     * @param data:				integer representing the data in the namespace as follows:
-     * 								0:	uri
-     * 								1:	prefix
-     * 								2:	locationHint
-     * @param value				String containing the value for search
-     * @return					true if the value is found, false otherwise
-     */
-    private boolean isDataInNamespaceList(List namespaceList, int data, String value) {
-		if (namespaceList != null) {
-			Iterator i = namespaceList.iterator();
-			while (i.hasNext()) {
-				NamespaceInfo namespaceInfo = (NamespaceInfo) i.next();
-				switch(data) {
-					case 0:	if (namespaceInfo.uri != null && namespaceInfo.uri.equals(value)) {
-						return true;
-					}
-					case 1:	if (namespaceInfo.prefix != null && namespaceInfo.prefix.equals(value)) {
-						return true;
-					}
-					case 2:	if (namespaceInfo.locationHint != null && namespaceInfo.locationHint.equals(value)) {
-						return true;
-					}
-				}
-			}
-		}
-    	return false;
-    }
-  }
-  /**
-   * XSDAttributeUseAdapter implements CMAttributeDeclaration. A representation
-   * of the model object 'Attribute Use'.
-   */
-  public static class XSDAttributeUseAdapter extends XSDBaseAdapter implements CMAttributeDeclaration
-  {
-    // provides access to the XML Schema node
-    protected XSDAttributeUse xsdAttributeUse;
-    // provides access to the type of the attribute
-    protected CMDataType dataType = new DataTypeImpl();
-
-    /**
-     * Constructor.
-     * 
-     * @param xsdAttributeUse -
-     *          the XML Schema node.
-     */
-    public XSDAttributeUseAdapter(XSDAttributeUse xsdAttributeUse)
-    {
-      this.xsdAttributeUse = xsdAttributeUse;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdAttributeUse;
-    }
-
-    /**
-     * Returns a general XPath expression for the node.
-     * 
-     * @return a general XPath expression for the node.
-     */
-    public String getSpec()
-    {
-      return "//@" + getAttrName();
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return ATTRIBUTE_DECLARATION;
-    }
-
-    /**
-     * Returns the name of the node. Similar to getAttrName().
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return getAttrName();
-    }
-
-    /**
-     * getEnumAttr method
-     * 
-     * @return java.util.Enumeration
-     * @deprecated -- to be replaced in future with additional CMDataType
-     *             methods (currently found on CMDataTypeHelper)
-     */
-    public Enumeration getEnumAttr()
-    {
-      return Collections.enumeration(Collections.EMPTY_LIST);
-    }
-
-    /**
-     * Returns the name of this attribute. Similar to getNodeName().
-     * 
-     * @return the name of this attribute.
-     */
-    public String getAttrName()
-    {
-      return xsdAttributeUse.getAttributeDeclaration().getName();
-    }
-
-    /**
-     * Returns the type of the attribute.
-     * 
-     * @return the type of the attribute.
-     */
-    public CMDataType getAttrType()
-    {
-      return dataType;
-    }
-
-    /**
-     * Returns the value of the default or fixed constraint.
-     * 
-     * @return the value of the default or fixed constraint.
-     */
-    public String getDefaultValue()
-    {
-      return dataType.getImpliedValue();
-    }
-
-    /**
-     * Returns the usage constraint for this attribute. The usages are defined
-     * in CMAttributeDeclaration class (OPTIONAL, REQUIRED, FIXED or
-     * PROHIBITED).
-     * 
-     * @return the usage constraint for this attribute.
-     */
-    public int getUsage()
-    {
-      int useKind = OPTIONAL;
-      switch (xsdAttributeUse.getUse().getValue())
-      {
-        case XSDAttributeUseCategory.OPTIONAL : {
-          useKind = OPTIONAL;
-          break;
-        }
-        case XSDAttributeUseCategory.PROHIBITED : {
-          useKind = PROHIBITED;
-          break;
-        }
-        case XSDAttributeUseCategory.REQUIRED : {
-          useKind = REQUIRED;
-          break;
-        }
-      }
-      return useKind;
-    }
-
-    /*
-     * Returns the value of the form [attribute] which affects the target
-     * namespace of locally scoped features. If the form is not set on this
-     * attribute, then see if there is a globally defined default. @return the
-     * value of the form [attribute].
-     */
-    public Object getNSPrefixQualification()
-    {
-      String form = null;
-      if (xsdAttributeUse.getContent() != xsdAttributeUse.getAttributeDeclaration())
-      {
-      	form =  "qualified";
-      }	
-      else if (xsdAttributeUse.getContent().isSetForm())
-      {
-        form = xsdAttributeUse.getContent().getForm().getName();
-      }
-      else
-      {
-        XSDSchema schema = xsdAttributeUse.getSchema();
-        if (schema != null)
-          form = schema.getAttributeFormDefault().getName();
-      }
-      return form;
-    }
-
-    /**
-     * Return a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      // Check if it is an attribute reference first
-      XSDAttributeDeclaration xsdAttributeRef = xsdAttributeUse.getContent();
-      if (xsdAttributeRef != null && xsdAttributeRef.isAttributeDeclarationReference())
-      {
-        // Determine if it has annotations
-        boolean refHasDocumentation = false;
-        XSDAnnotation refAnnotation = xsdAttributeRef.getAnnotation();
-        if (refAnnotation != null)
-        {
-          // Determine if there is documentation
-          if (!refAnnotation.getUserInformation().isEmpty())
-          {
-            refHasDocumentation = true;
-          }
-        }
-        if (refHasDocumentation)
-          return getDocumentations(refAnnotation);
-      }
-      
-      // Otherwise proceed with getting the documentation as usual
-      XSDAttributeDeclaration xsdAttributeDeclaration =  xsdAttributeUse.getAttributeDeclaration();      
-      XSDAnnotation annotation = xsdAttributeDeclaration.getAnnotation();
-      
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdAttributeUse.getSchema());
-    }
-    /**
-     * XSDAttributeUseAdapter.DataTypeImpl An inner class to hold type
-     * information for this attribute.
-     */
-    public class DataTypeImpl implements CMDataType
-    {
-      /**
-       * Returns the type of the node. The types are defined in CMNode class
-       * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-       * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-       * DOCUMENTATION).
-       * 
-       * @return the type of this node.
-       */
-      public int getNodeType()
-      {
-        return CMNode.DATA_TYPE;
-      }
-
-      /**
-       * Returns the name of the attribute type. Same as getDataTypeName().
-       * 
-       * @return the name of the attribute type.
-       */
-      public String getNodeName()
-      {
-        return getDataTypeName();
-      }
-
-      /**
-       * Returns true if the property is supported for this class.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return true if the property is supported.
-       */
-      public boolean supports(String propertyName)
-      {
-    	  return (PROPERTY_WHITESPACE_FACET.equals(propertyName));
-      }
-
-      /**
-       * Returns the property value for the property name. Returns null if the
-       * property is not supported.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return the property value for the property name.
-       */
-      public Object getProperty(String propertyName)
-      {
-    	  if(PROPERTY_WHITESPACE_FACET.equals(propertyName))
-		  	return getWhiteSpaceFacetValue();
-    	  return null;
-      }
-
-      /**
-       * Returns the name of the attribute type. Same as getNodeName().
-       * 
-       * @return the name of the attribute type.
-       */
-      public String getDataTypeName()
-      {
-        XSDSimpleTypeDefinition sc = xsdAttributeUse.getAttributeDeclaration().getTypeDefinition();
-        String typeName = sc.getName();
-        return typeName != null ? typeName : "string";  //$NON-NLS-1$
-      }
-
-      /**
-       * Returns the kind of constraint: none, default or fixed. The kinds are
-       * defined in CMDataType class (IMPLIED_VALUE_NONE, IMPLIED_VALUE_FIXED or
-       * IMPLIED_VALUE_DEFAULT).
-       * 
-       * @return the kind of constraint: none, default or fixed.
-       */
-      public int getImpliedValueKind()
-      {
-        int result = IMPLIED_VALUE_NONE;
-        if (xsdAttributeUse.isSetConstraint())
-        {
-          if (xsdAttributeUse.getConstraint().getValue() == XSDConstraint.DEFAULT)
-            result = IMPLIED_VALUE_DEFAULT;
-          else if (xsdAttributeUse.getConstraint().getValue() == XSDConstraint.FIXED)
-            result = IMPLIED_VALUE_FIXED;
-        }
-        return result;
-      }
-
-      /**
-       * Returns the value of the default or fixed constraint.
-       * 
-       * @return the value of the default or fixed constraint.
-       */
-      public String getImpliedValue()
-      {
-        String result = null;
-        if (xsdAttributeUse.isSetConstraint())
-        {
-          result = xsdAttributeUse.getLexicalValue();
-        }
-        return result;
-      }
-
-      /**
-       * Returns the enumerated values for the attribute type.
-       * 
-       * @return the enumerated values for the attribute type.
-       */
-      public String[] getEnumeratedValues()
-      {
-        return getEnumeratedValuesForType(getXSDType());
-      }
-
-      /**
-       * Generate a valid value for the attribute based on its type.
-       * 
-       * @return a valid value for the attribute based on its type.
-       */
-      public String generateInstanceValue()
-      {
-        XSDAttributeDeclaration attr = xsdAttributeUse.getAttributeDeclaration();
-        return XSDTypeUtil.getInstanceValue(attr.getResolvedAttributeDeclaration().getTypeDefinition());
-      }
-
-      /**
-       * Returns the corresponding XML Schema type definition.
-       * 
-       * @return the corresponding XML Schema type definition.
-       */
-      protected XSDTypeDefinition getXSDType()
-      {
-        XSDAttributeDeclaration attr = xsdAttributeUse.getAttributeDeclaration();
-        return attr.getResolvedAttributeDeclaration().getTypeDefinition();
-      }
-      
-      /**
-       * Obtains the whitespace facet of the XSD simple type.
-       * 
-       * @return The whitespace facet for the XSD type. If none is
-       * defined, or it is a complex type, null.
-       */
-      private String getWhiteSpaceFacetValue()
-      {
-        XSDSimpleTypeDefinition def = getXSDType().getSimpleType();
-        return (def != null && def.getEffectiveWhiteSpaceFacet() != null) ? def.getEffectiveWhiteSpaceFacet().getLexicalValue() : null ;
-      }
-    }
-  }
-  /**
-   * ElementDeclarationBaseImpl implements CMElementDeclaration. This is the
-   * base class for XSDElementDeclaration and DerivedElementDeclarationImpl.
-   * 
-   * Abstract methods in this class are: public abstract Object getKey(); public
-   * abstract Object getNSPrefixQualification(); public abstract
-   * XSDElementDeclaration getXSDElementDeclaration(); public abstract
-   * XSDTypeDefinition getXSDType(); public abstract List getXSITypes(); public
-   * abstract CMElementDeclaration getDerivedElementDeclaration(String
-   * uriQualifiedTypeName); public abstract CMNode getDefinition(); public
-   * abstract String getDefinitionInfo(); public abstract CMNodeListImpl
-   * getSubstitutionGroup();
-   */
-  public static abstract class ElementDeclarationBaseImpl extends XSDBaseAdapter implements CMElementDeclaration
-  {
-    protected CMDataType dataType = new DataTypeImpl();
-    protected CMNamedNodeMap namedNodeMap;
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected abstract XSDElementDeclaration getXSDElementDeclaration();
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected abstract XSDElementDeclaration getResolvedXSDElementDeclaration();
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return ELEMENT_DECLARATION;
-    }
-
-    /**
-     * Returns the name of the node. The same as getElementName().
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return getElementName();
-    }
-
-    /**
-     * Returns the name of this element. The same as getNodeName().
-     * 
-     * @return the name of this element.
-     */
-    public String getElementName()
-    {
-      String result = getResolvedXSDElementDeclaration().getName();
-      return result != null ? result : "";
-    }
-
-    /**
-     * Returns true if the property is supported for this class.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return true if the property is supported.
-     */
-    public boolean supports(String propertyName)
-    {
-      return propertyName.equals(PROPERTY_XSITYPES) || propertyName.equals(PROPERTY_DERIVED_ELEMENT_DECLARATION) || propertyName.equals(PROPERTY_SUBSTITUTION_GROUP)
-          || propertyName.equals(PROPERTY_ABSTRACT) || super.supports(propertyName);
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public abstract Object getKey();
-
-    /**
-     * Returns the set of attributes defined for this element.
-     * 
-     * @return the set of attributes defined for this element.
-     */
-    public CMNamedNodeMap getAttributes()
-    {
-      CMNamedNodeMapImpl map = new CMNamedNodeMapImpl();
-      XSDTypeDefinition td = getXSDType();
-      getAttributes(map, td);
-      addXSITypeAttribute(map);
-      return map;
-    }
-
-    /**
-     * Gather the set of attributes defined for this element.
-     * 
-     * @param map -
-     *          used for returning the set of attributes.
-     * @param xsdTypeDefinition -
-     *          the type definition for this element.
-     */
-    public void getAttributes(CMNamedNodeMapImpl map, XSDTypeDefinition xsdTypeDefinition)
-    {
-      if (xsdTypeDefinition instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition ctd = (XSDComplexTypeDefinition) xsdTypeDefinition;
-        for (Iterator i = ctd.getAttributeUses().iterator(); i.hasNext();)
-        {
-          XSDAttributeUse xsdAttributeUse = (XSDAttributeUse) i.next();
-          XSDAttributeUseAdapter adapter = (XSDAttributeUseAdapter) getAdapter(xsdAttributeUse);
-          if (adapter != null && adapter.getNodeName() != null)
-          {
-            map.getHashtable().put(adapter.getNodeName(), adapter);
-          }
-        }
-      }
-    }
-
-    /**
-     * Returns the content for this element.
-     * 
-     * @return the content for this element.
-     */
-    public CMContent getContent()
-    {
-      CMContent result = null;
-      XSDTypeDefinition td = getXSDType();
-      if (td instanceof XSDComplexTypeDefinition)
-      {
-        DerivedChildVisitor dcv = new DerivedChildVisitor(td);
-        dcv.visitTypeDefinition(td);
-        CMNodeList nodeList = dcv.getChildNodeList();
-        if (nodeList.getLength() > 1)
-        {
-          result = new CMGroupImpl(nodeList, CMGroup.SEQUENCE);
-        }
-        else if (nodeList.getLength() > 0)
-        {
-          result = (CMContent) nodeList.item(0);
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Returns the content type of this element. The content type is defined in
-     * CMElementDeclaration (ANY, EMPTY, ELEMENT, MIXED, PCDATA or CDATA).
-     * 
-     * @return the content type of this element.
-     */
-    public int getContentType()
-    {
-      int contentType = EMPTY;
-      XSDTypeDefinition td = getXSDType();
-      if (td instanceof XSDSimpleTypeDefinition)
-      {
-        String typeName = td.getName();
-        if (typeName != null && typeName.equals("anyType"))
-        {
-          contentType = ANY;
-        }
-        else
-        {
-          contentType = PCDATA;
-        }
-      }
-      else if (td instanceof XSDComplexTypeDefinition)
-      {
-        XSDContentTypeCategory category = ((XSDComplexTypeDefinition) td).getContentTypeCategory();
-        if (category != null)
-        {
-          switch (category.getValue())
-          {
-            case XSDContentTypeCategory.ELEMENT_ONLY :
-              contentType = ELEMENT;
-              break;
-            case XSDContentTypeCategory.EMPTY :
-              contentType = EMPTY;
-              break;
-            case XSDContentTypeCategory.MIXED :
-              contentType = MIXED;
-              break;
-            case XSDContentTypeCategory.SIMPLE :
-              contentType = PCDATA;
-              break;
-          }
-        }
-      }
-      return contentType;
-    }
-
-    /**
-     * Returns the name of the element type.
-     * 
-     * @return the name of the element type.
-     */
-    public CMDataType getDataType()
-    {
-      CMDataType result = null;
-      int contentType = getContentType();
-      boolean hasDataType = contentType == PCDATA || contentType == MIXED;
-      if (hasDataType)
-      {
-        result = dataType;
-      }
-      return result;
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(getXSDElementDeclaration());
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(getXSDElementDeclaration());
-    }
-
-    /**
-     * Returns the referenced element declaration if this is an element
-     * reference. Otherwise it returns itself.
-     * 
-     * @return an element declaration.
-     */
-    protected abstract CMNode getDefinition();
-
-    /**
-     * Returns a string indicating whether the element declaration is global or
-     * local. Returns null if this is an element reference.
-     * 
-     * @return a string indicating whether the element declaration is global or
-     *         local.
-     */
-    protected abstract String getDefinitionInfo();
-
-    /**
-     * Returns the elements local to this element declaration.
-     * 
-     * @return the elements local to this element declaration.
-     */
-    public CMNamedNodeMap getLocalElements()
-    {
-      if (namedNodeMap == null)
-      {
-        LocalElementVisitor localElementVisitor = new LocalElementVisitor();
-        localElementVisitor.visitTypeDefinition(getXSDType());
-        namedNodeMap = localElementVisitor.getCMNamedNodeMap();
-      }
-      return namedNodeMap;
-    }
-
-    /**
-     * Returns the property value for the property name. Returns null if the
-     * property is not supported.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return the property value for the property name.
-     */
-    public Object getProperty(String propertyName)
-    {
-      Object result = null;
-      if (propertyName.equals(PROPERTY_DEFINITION_INFO))
-      {
-        result = getDefinitionInfo();
-      }
-      else if (propertyName.equals(PROPERTY_DEFINITION))
-      {
-        result = getDefinition();
-      }
-      else if (propertyName.equals(PROPERTY_XSITYPES))
-      {
-        result = getXSITypes();
-      }
-      else if (propertyName.startsWith(PROPERTY_DERIVED_ELEMENT_DECLARATION))
-      {
-        int index = propertyName.indexOf("=");
-        if (index != -1)
-        {
-          String uriQualifiedTypeName = propertyName.substring(index + 1);
-          result = getDerivedElementDeclaration(uriQualifiedTypeName);
-        }
-      }
-      else if (propertyName.equals(PROPERTY_SUBSTITUTION_GROUP))
-      {
-        return getSubstitutionGroup();
-      }
-      else if (propertyName.equals(PROPERTY_SUBSTITUTION_GROUP_VALUE))
-      {
-        return getSubstitutionGroupValue();
-      }
-      else if (propertyName.equals(PROPERTY_ABSTRACT))
-      {
-        return getAbstract();
-      }
-      else
-      {
-        result = super.getProperty(propertyName);
-      }
-      return result;
-    }
-
-    /**
-     * Returns the value of the 'Nillable' attribute. This represents the
-     * nillable infoset property. The default value is false.
-     * 
-     * @return the value of the 'Nillable' attribute.
-     */
-    public boolean isNillable()
-    {
-      if (getXSDElementDeclaration().isSetNillable())
-        return getXSDElementDeclaration().isNillable();
-      else
-        return false;
-    }
-
-    /**
-     * Returns the value of the substitutionGroup attribute.
-     * 
-     * @return value of the substitutionGroup attribute
-     */
-    public String getSubstitutionGroupValue()
-    {
-    	XSDElementDeclaration xsdElementDeclaration = getResolvedXSDElementDeclaration();
-    	if(xsdElementDeclaration != null)
-    	{
-    		Element element = xsdElementDeclaration.getElement();
-    		if(element != null)
-    		{
-    			if (element.hasAttribute(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE))
-    				return element.getAttribute(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE);
-    			else return null;
-    		}
-    	}
-      return "";
-    }
-    
-    
-    /**
-     * Returns whether the element is 'Abstract'.
-     * 
-     * @return true if the element is 'Abstract'.
-     */
-    public Boolean getAbstract()
-    {
-      boolean result = getResolvedXSDElementDeclaration().isAbstract();
-      // TODO... how do we handle elements with abstract type's ?
-      return result ? Boolean.TRUE : Boolean.FALSE;
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDElementDeclaration xsdElementDeclaration = getXSDElementDeclaration();
-      XSDAnnotation annotation = xsdElementDeclaration.getAnnotation();
-      
-      // Need to check to see if there are any documentation elements.  Just because
-      // there is an annotation element doesn't mean that the documentation element is
-      // also there, as it could contain just appinfo elements.
-      
-      boolean hasDocumentation = false;
-      
-      if (annotation != null) {
-    	  if (!annotation.getUserInformation().isEmpty()) {
-    		  hasDocumentation = true;
-    	  }
-      }
-
-      // The element may not have annotation and if it is referenced
-      // check the referenced attribute for the annotations.
-      if (hasDocumentation == false) {
-          if (xsdElementDeclaration.isElementDeclarationReference()) {
-        	  annotation = xsdElementDeclaration.getResolvedElementDeclaration().getAnnotation();
-          }
-      }
-      
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the corresponding XML Schema type definition.
-     * 
-     * @return the corresponding XML Schema type definition.
-     */
-    protected abstract XSDTypeDefinition getXSDType();
-
-    /**
-     * Returns a list of type names.
-     * 
-     * @return a list of type names.
-     */
-    protected abstract List getXSITypes();
-
-    /**
-     * Return the element declaration corresponding to the given uri qualified
-     * type name.
-     * 
-     * @param uriQualifiedTypeName -
-     *          a uri qualified type name
-     * @return corresponding element declaration.
-     */
-    protected abstract CMElementDeclaration getDerivedElementDeclaration(String uriQualifiedTypeName);
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected void addXSITypeAttribute(CMNamedNodeMapImpl map)
-    {
-      List list = getXSITypes();
-      int listSize = list.size();
-      if (listSize > 1)
-      {
-        CMDataType dataType = new CMDataTypeImpl("typeNames", (String) null);
-        CMAttributeDeclarationImpl attribute = new CMAttributeDeclarationImpl("type", CMAttributeDeclaration.OPTIONAL, dataType);
-        attribute.setCMDocument(xsiDocument);
-        attribute.setPrefixQualification(true);
-        attribute.setXSITypes(list);
-
-        // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=225447
-        // For now, don't clobber the attribute with the same 'type' name defined in the grammar
-        // with the xsi:type attribute.  The impact of this change will be that for content assist, the non-xsi
-        // type attribute will be presented; the generated XML from XSD will have this attribute created, and
-        // not the xsi:type attribute.
-        Hashtable hashTable = map.getHashtable();
-        String name = attribute.getNodeName();
-        if (!hashTable.containsKey(name))
-          hashTable.put(name, attribute);
-      }
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {      
-      XSDSchema schema = getResolvedXSDElementDeclaration().getSchema();
-      if (schema == null)
-        return null;
-      else  
-        return (CMDocument) getAdapter(schema);
-    }
-
-    /**
-     * Returns the substitution group for this element. The group consists of:
-     * 1. the element declaration itself 2. and any element declaration that has
-     * a {substitution group affiliation} in the group
-     * 
-     * @return the substitution group for this element.
-     */
-    protected abstract CMNodeListImpl getSubstitutionGroup();
-    /*
-     * XSDElementDeclarationAdapter.DataTypeImpl An inner class to hold type
-     * information for this element.
-     */
-    public class DataTypeImpl implements CMDataType
-    {
-      /**
-       * Returns the type of the node. The types are defined in CMNode class
-       * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-       * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-       * DOCUMENTATION).
-       * 
-       * @return the type of this node.
-       */
-      public int getNodeType()
-      {
-        return CMNode.DATA_TYPE;
-      }
-
-      /**
-       * Returns the name of the element type. Same as getDataTypeName().
-       * 
-       * @return the name of the element type.
-       */
-      public String getNodeName()
-      {
-        return getDataTypeName();
-      }
-
-      /**
-       * Returns true if the property is supported for this class.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return true if the property is supported.
-       */
-      public boolean supports(String propertyName)
-      {
-        return (PROPERTY_WHITESPACE_FACET.equals(propertyName));
-      }
-
-      /**
-       * Returns the property value for the property name. Returns null if the
-       * property is not supported.
-       * 
-       * @param propertyName -
-       *          name of a property
-       * @return the property value for the property name.
-       */
-      public Object getProperty(String propertyName)
-      {
-        if(PROPERTY_WHITESPACE_FACET.equals(propertyName))
-        	return getWhiteSpaceFacetValue();
-        return null;
-      }
-
-      /**
-       * Returns the name of the element type. Same as getNodeName().
-       * 
-       * @return the name of the element type.
-       */
-      public String getDataTypeName()
-      {
-        String typeName = null;
-        XSDSimpleTypeDefinition std = getXSDType().getSimpleType();
-        if (std != null)
-          typeName = std.getName();
-        return typeName != null ? typeName : "string"; //$NON-NLS-1$
-      }
-
-      /**
-       * Returns the kind of constraint: none, default or fixed. The kinds are
-       * defined in CMDataType class (IMPLIED_VALUE_NONE, IMPLIED_VALUE_FIXED or
-       * IMPLIED_VALUE_DEFAULT).
-       * 
-       * @return the kind of constraint: none, default or fixed.
-       */
-      public int getImpliedValueKind()
-      {
-        int result = IMPLIED_VALUE_NONE;
-        if (getXSDElementDeclaration().isSetConstraint())
-        {
-          if (getXSDElementDeclaration().getConstraint().getValue() == XSDConstraint.DEFAULT)
-            result = IMPLIED_VALUE_DEFAULT;
-          else if (getXSDElementDeclaration().getConstraint().getValue() == XSDConstraint.FIXED)
-            result = IMPLIED_VALUE_FIXED;
-        }
-        return result;
-      }
-
-      /**
-       * Returns the value of the default or fixed constraint.
-       * 
-       * @return the value of the default or fixed constraint.
-       */
-      public String getImpliedValue()
-      {
-        String result = null;
-        if (getXSDElementDeclaration().isSetConstraint())
-        {
-          result = getXSDElementDeclaration().getLexicalValue();
-        }
-        return result;
-      }
-
-      /**
-       * Returns the enumerated values for the attribute type.
-       * 
-       * @return the enumerated values for the attribute type.
-       */
-      public String[] getEnumeratedValues()
-      {
-        return getEnumeratedValuesForType(getXSDType());
-      }
-
-      public String generateInstanceValue()
-      {
-        return XSDTypeUtil.getInstanceValue(getXSDType());
-      }
-
-      /**
-       * Returns the cmdocument that is the owner of this cmnode.
-       * 
-       * @return the cmdocument corresponding to this cmnode.
-       */
-      public CMDocument getCMDocument()
-      {
-        return (CMDocument) getAdapter(getXSDElementDeclaration().getSchema());
-      }
-      
-      /**
-       * Obtains the whitespace facet of the XSD simple type.
-       * 
-       * @return The whitespace facet for the XSD type. If none is
-       * defined, or it is a complex type, null.
-       */
-      private String getWhiteSpaceFacetValue()
-      {
-        XSDSimpleTypeDefinition def = getXSDType().getSimpleType();
-        return (def != null && def.getEffectiveWhiteSpaceFacet() != null) ? def.getEffectiveWhiteSpaceFacet().getLexicalValue() : null ;
-      }
-    }
-  }
-  /**
-   * XSDElementDeclarationAdapter implements CMElementDeclaration. A
-   * representation of the model object 'Element Declaration'.
-   */
-  public static class XSDElementDeclarationAdapter extends ElementDeclarationBaseImpl
-  {
-    protected List derivedElementDeclarations = null;
-    protected List xsiTypes = null;
-    protected XSDElementDeclaration xsdElementDeclaration;
-    protected CMNodeListImpl substitutionGroup;
-
-    /**
-     * Constructor.
-     * 
-     * @param xsdElementDeclaration -
-     *          the XML Schema node.
-     */
-    public XSDElementDeclarationAdapter(XSDElementDeclaration xsdElementDeclaration)
-    {
-      this.xsdElementDeclaration = xsdElementDeclaration;
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getXSDElementDeclaration()
-    {
-      return xsdElementDeclaration;
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getResolvedXSDElementDeclaration()
-    {
-      return xsdElementDeclaration.getResolvedElementDeclaration();
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdElementDeclaration;
-    }
-
-    /**
-     * Returns the referenced element declaration if this is an element
-     * reference. Otherwise it returns itself.
-     * 
-     * @return an element declaration.
-     */
-    public CMNode getDefinition()
-    {
-      return getAdapter(xsdElementDeclaration.getResolvedElementDeclaration());
-    }
-
-    /**
-     * Returns a string indicating whether the element declaration is global or
-     * local. Returns null if this is an element reference.
-     * 
-     * @return a string indicating whether the element declaration is global or
-     *         local.
-     */
-    protected String getDefinitionInfo()
-    {
-      if (xsdElementDeclaration.isElementDeclarationReference())
-        return null;
-      else if (xsdElementDeclaration.isGlobal())
-        return DEFINITION_INFO_GLOBAL;
-      else
-        return DEFINITION_INFO_LOCAL;
-    }
-
-    public Object getNSPrefixQualification()
-    {
-      String form = null;
-      if (xsdElementDeclaration.isElementDeclarationReference())
-      {
-        form = "qualified";
-      }
-      else
-      {
-        if (xsdElementDeclaration.isSetForm())
-        {
-          form = xsdElementDeclaration.getForm().getName();
-        }
-        else
-        {
-          XSDSchema schema = xsdElementDeclaration.getSchema();
-          if (schema != null)
-            form = schema.getElementFormDefault().getName();
-        }
-      }
-      return form;
-    }
-
-    /**
-     * Returns the corresponding XML Schema type definition.
-     * 
-     * @return the corresponding XML Schema type definition.
-     */
-    protected XSDTypeDefinition getXSDType()
-    {
-      return xsdElementDeclaration.getResolvedElementDeclaration().getTypeDefinition();
-    }
-
-    /**
-     * Returns a list of type names.
-     * 
-     * @return a list of type names.
-     */
-    protected List getXSITypes()
-    {
-      if (xsiTypes == null)
-      {
-        computeDerivedTypeInfo();
-      }
-      return xsiTypes;
-    }
-
-    protected void computeDerivedTypeInfo()
-    {
-      xsiTypes = new Vector();
-      derivedElementDeclarations = new Vector();
-      computeDerivedTypeInfoHelper(getXSDType(), xsiTypes, derivedElementDeclarations);
-    }
-
-    protected void computeDerivedTypeInfoHelper(XSDTypeDefinition type, List typeNameList, List edList)
-    {
-      if (type instanceof XSDComplexTypeDefinition)
-      {
-        List derivedTypes = findTypesDerivedFrom(type);
-        ArrayList inclusiveDerivedTypes = new ArrayList();
-        inclusiveDerivedTypes.add(type);
-        if ((derivedTypes != null) && (derivedTypes.size() > 0))
-        {
-          inclusiveDerivedTypes.addAll(derivedTypes);
-        }
-        for (Iterator i = inclusiveDerivedTypes.iterator(); i.hasNext();)
-        {
-          XSDTypeDefinition derivedType = (XSDTypeDefinition) i.next();
-          XSDSchema schema = derivedType.getSchema();
-          if (schema != null)
-          {
-            String uri = schema.getTargetNamespace();
-            String name = derivedType.getName();
-            if (name != null)
-            {
-              name = uri != null ? ("[" + uri + "]" + name) : name;
-              typeNameList.add(name);
-              DerivedElementDeclarationImpl ed = new DerivedElementDeclarationImpl(this, derivedType, name);
-              edList.add(ed);
-            }
-          }
-        }
-      }
-    }
-
-    /**
-     * Return the element declaration corresponding to the given uri qualified
-     * type name.
-     * 
-     * @param uriQualifiedTypeName -
-     *          a uri qualified type name
-     * @return corresponding element declaration.
-     */
-    protected CMElementDeclaration getDerivedElementDeclaration(String uriQualifiedTypeName)
-    {
-      CMElementDeclaration result = null;
-      if (derivedElementDeclarations == null)
-      {
-        computeDerivedTypeInfo();
-      }
-      for (Iterator i = derivedElementDeclarations.iterator(); i.hasNext();)
-      {
-        DerivedElementDeclarationImpl ed = (DerivedElementDeclarationImpl) i.next();
-        if ((ed != null) && (ed.uriQualifiedTypeName != null))
-        {
-          if (ed.uriQualifiedTypeName.equals(uriQualifiedTypeName))
-          {
-            result = ed;
-            break;
-          }
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Returns the substitution group for this element. The group consists of:
-     * 1. the element declaration itself 2. and any element declaration that has
-     * a {substitution group affiliation} in the group
-     * 
-     * @return the substitution group for this element.
-     */
-    protected CMNodeListImpl getSubstitutionGroup()
-    {
-      if (substitutionGroup == null)
-      {
-        substitutionGroup = new CMNodeListImpl();
-        List sgroup = getResolvedXSDElementDeclaration().getSubstitutionGroup();
-        for (Iterator i = sgroup.iterator(); i.hasNext();)
-        {
-          XSDElementDeclaration ed = (XSDElementDeclaration) i.next();  
-          substitutionGroup.add(getAdapter(ed));
-        }
-      }
-      return substitutionGroup;
-    }
-  }
-  /**
-   * DerivedElementDeclarationImpl extends ElementDeclarationBaseImpl
-   *  
-   */
-  public static class DerivedElementDeclarationImpl extends ElementDeclarationBaseImpl
-  {
-    protected XSDElementDeclarationAdapter owner;
-    protected XSDTypeDefinition xsdType;
-    public String uriQualifiedTypeName;
-
-    /**
-     * Constructor.
-     * 
-     * @param owner -
-     * @param xsdType -
-     * @param uriQualifiedTypeName -
-     */
-    public DerivedElementDeclarationImpl(XSDElementDeclarationAdapter owner, XSDTypeDefinition xsdType, String uriQualifiedTypeName)
-    {
-      this.owner = owner;
-      this.xsdType = xsdType;
-      this.uriQualifiedTypeName = uriQualifiedTypeName;
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getXSDElementDeclaration()
-    {
-      return (XSDElementDeclaration) owner.getKey();
-    }
-
-    /**
-     * Returns corresponding XML Schema element declaration.
-     * 
-     * @return corresponding XML Schema element declaration.
-     */
-    protected XSDElementDeclaration getResolvedXSDElementDeclaration()
-    {
-      return ((XSDElementDeclaration) owner.getKey()).getResolvedElementDeclaration();
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return owner.getKey();
-    }
-
-    /**
-     * Returns the corresponding XML Schema type definition.
-     * 
-     * @return the corresponding XML Schema type definition.
-     */
-    protected XSDTypeDefinition getXSDType()
-    {
-      return xsdType;
-    }
-
-    /**
-     * Returns a list of type names.
-     * 
-     * @return a list of type names.
-     */
-    protected List getXSITypes()
-    {
-      return owner.getXSITypes();
-    }
-
-    /**
-     * Return the element declaration corresponding to the given uri qualified
-     * type name.
-     * 
-     * @param uriQualifiedTypeName -
-     *          a uri qualified type name
-     * @return corresponding element declaration.
-     */
-    protected CMElementDeclaration getDerivedElementDeclaration(String uriQualifiedTypeName)
-    {
-      return owner.getDerivedElementDeclaration(uriQualifiedTypeName);
-    }
-
-    /**
-     * Returns the referenced element declaration if this is an element
-     * reference. Otherwise it returns itself.
-     * 
-     * @return an element declaration.
-     */
-    protected CMNode getDefinition()
-    {
-      return this;
-    }
-
-    /**
-     * Returns a string indicating whether the element declaration is global or
-     * local. Returns null if this is an element reference.
-     * 
-     * @return a string indicating whether the element declaration is global or
-     *         local.
-     */
-    protected String getDefinitionInfo()
-    {
-      return owner.getDefinitionInfo();
-    }
-
-    /*
-     * Returns the value of the form [attribute] which affects the target
-     * namespace of locally scoped features. @return the value of the form
-     * [attribute].
-     */
-    public Object getNSPrefixQualification()
-    {
-      return owner.getNSPrefixQualification();
-    }
-
-    /**
-     * Returns the substitution group for this element. The group consists of:
-     * 1. the element declaration itself 2. and any element declaration that has
-     * a {substitution group affiliation} in the group
-     * 
-     * @return the substitution group for this element.
-     */
-    protected CMNodeListImpl getSubstitutionGroup()
-    {
-      return owner.getSubstitutionGroup();
-    }
-  }
-  /**
-   * XSDWildcardAdapter
-   */
-  public static class XSDWildcardAdapter extends XSDBaseAdapter implements CMAnyElement
-  {
-    protected XSDWildcard xsdWildcard;
-
-    public XSDWildcardAdapter(XSDWildcard xsdWildcard)
-    {
-      this.xsdWildcard = xsdWildcard;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdWildcard;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return ANY_ELEMENT;
-    }
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      return "any";
-    }
-
-    public String getNamespaceURI()
-    {
-    	if (xsdWildcard.getElement().hasAttribute(XSDConstants.NAMESPACE_ATTRIBUTE))
-    	{
-    		return xsdWildcard.getElement().getAttribute(XSDConstants.NAMESPACE_ATTRIBUTE);
-    	}
-    	else 
-    		return "##any";
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(xsdWildcard);
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(xsdWildcard);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdWildcard.getSchema());
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = xsdWildcard.getAnnotation();
-      return getDocumentations(annotation);
-    }
-  }
-  /**
-   * XSDModelGroupAdapter
-   */
-  public static class XSDModelGroupAdapter extends XSDBaseAdapter implements CMGroup
-  {
-    protected XSDModelGroup xsdModelGroup;
-
-    public XSDModelGroupAdapter()
-    {
-    }
-
-    public XSDModelGroupAdapter(XSDModelGroup xsdModelGroup)
-    {
-      this.xsdModelGroup = xsdModelGroup;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return GROUP;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdModelGroup;
-    }
-
-    /**
-     * Returns a list of the children of this group.
-     * 
-     * @return a list of the children of this group.
-     */
-    public CMNodeList getChildNodes()
-    {
-      CMNodeListImpl nodeList = new CMNodeListImpl();
-      if (xsdModelGroup != null)
-      {
-        for (Iterator i = xsdModelGroup.getParticles().iterator(); i.hasNext();)
-        {
-          XSDParticle particle = (XSDParticle) i.next();
-          XSDParticleContent content = particle.getContent();
-          CMNode adapter = getAdapter(content);
-          if (adapter != null)
-          {
-            nodeList.getList().add(adapter);
-          }
-        }
-      }
-      return nodeList;
-    }
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
-      return descriptionBuilder.buildDescription(this);
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(xsdModelGroup);
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(xsdModelGroup);
-    }
-
-    /**
-     * Return operator of this group -- CHOICE, SEQUENCE or ALL value.
-     * 
-     * @return the operator of this group.
-     */
-    public int getOperator()
-    {
-      int result = 0;
-      //todo... handle ALONE case by checkig if child count == 1
-      if (xsdModelGroup != null)
-      {
-        switch (xsdModelGroup.getCompositor().getValue())
-        {
-          case XSDCompositor.CHOICE : {
-            result = CHOICE;
-            break;
-          }
-          case XSDCompositor.SEQUENCE : {
-            result = SEQUENCE;
-            break;
-          }
-          case XSDCompositor.ALL : {
-            result = ALL;
-            break;
-          }
-        }
-      }
-      return result;
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = xsdModelGroup.getAnnotation();
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdModelGroup.getSchema());
-    }
-  }
-  /**
-   * XSDModelGroupDefinitionAdapter
-   */
-  public static class XSDModelGroupDefinitionAdapter extends XSDBaseAdapter implements CMGroup
-  {
-    protected XSDModelGroupDefinition xsdModelGroupDefinition;
-
-    public XSDModelGroupDefinitionAdapter(XSDModelGroupDefinition xsdModelGroupDefinition)
-    {
-      this.xsdModelGroupDefinition = xsdModelGroupDefinition;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return GROUP;
-    }
-
-    /**
-     * Returns the key for this cmnode which is the corresponding XML Schema
-     * node.
-     * 
-     * @return the key for this cmnode.
-     */
-    public Object getKey()
-    {
-      return xsdModelGroupDefinition;
-    }
-
-    /**
-     * Returns a list of the children of this group.
-     * 
-     * @return a list of the children of this group.
-     */
-    public CMNodeList getChildNodes()
-    {
-      CMNodeListImpl nodeList = new CMNodeListImpl();
-      XSDModelGroup modelGroup = xsdModelGroupDefinition.getResolvedModelGroupDefinition().getModelGroup();
-      if (modelGroup != null)
-      {
-        CMNode adapter = getAdapter(modelGroup);
-        nodeList.add(adapter);
-      }
-      return nodeList;
-    }
-
-    /**
-     * Returns the name of the node. The default value is an empty string value.
-     * All derived classes must override this method if they do not want the
-     * default value.
-     * 
-     * @return the name of the node.
-     */
-    public String getNodeName()
-    {
-      CMDescriptionBuilder descriptionBuilder = new CMDescriptionBuilder();
-      return descriptionBuilder.buildDescription(this);
-    }
-
-    /**
-     * Returns the value of 'Min Occurs' attribute. The default value is "1".
-     * 
-     * @return the value of the 'Min Occurs' attribute.
-     */
-    public int getMinOccur()
-    {
-      return getMinOccurs(xsdModelGroupDefinition);
-    }
-
-    /**
-     * Returns the value of the 'Max Occurs' attribute. The default value is
-     * "1".
-     * 
-     * @return the value of the 'Max Occurs' attribute.
-     */
-    public int getMaxOccur()
-    {
-      return getMaxOccurs(xsdModelGroupDefinition);
-    }
-
-    /**
-     * Return operator of this group -- CHOICE, SEQUENCE or ALL value.
-     * 
-     * @return the operator of this group.
-     */
-    public int getOperator()
-    {
-      return XSDCompositor.SEQUENCE;
-    }
-
-    /**
-     * Returns a list of documentation elements.
-     * 
-     * @return a list of documentation elements.
-     */
-    protected CMNodeList getDocumentation()
-    {
-      XSDAnnotation annotation = xsdModelGroupDefinition.getAnnotation();
-      return getDocumentations(annotation);
-    }
-
-    /**
-     * Returns the cmdocument that is the owner of this cmnode.
-     * 
-     * @return the cmdocument corresponding to this cmnode.
-     */
-    public CMDocument getCMDocument()
-    {
-      return (CMDocument) getAdapter(xsdModelGroupDefinition.getSchema());
-    }
-  }
-  /**
-   * DocumentationImpl implements CMDocumentation. A representation of the
-   * documentation element part of the 'User Information' feature. Working with
-   * the documentation element requires dropping down into the DOM model.
-   */
-  public static class DocumentationImpl implements CMDocumentation
-  {
-    protected Element documentation;
-
-    /**
-     * Constructor.
-     * 
-     * @param documentation -
-     *          a documentation element.
-     */
-    public DocumentationImpl(Element documentation)
-    {
-      this.documentation = documentation;
-    }
-
-    /**
-     * Returns the type of the node. The types are defined in CMNode class
-     * (ANY_ELEMENT, ATTRIBUTE_DECLARATION, DATA_TYPE, DOCUMENT,
-     * ELEMENT_DECLARATION, ENTITY_DECLARATION, GROUP, NAME_SPACE or
-     * DOCUMENTATION).
-     * 
-     * @return the type of this node.
-     */
-    public int getNodeType()
-    {
-      return DOCUMENTATION;
-    }
-
-    /**
-     * Returns an empty string value.
-     * 
-     * @return an empty string value.
-     */
-    public String getNodeName()
-    {
-      return "";
-    }
-
-    /**
-     * Returns false. This class does not support any properties.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return false.
-     */
-    public boolean supports(String propertyName)
-    {
-      return false;
-    }
-
-    /**
-     * Returns null. This class does not support any properties.
-     * 
-     * @param propertyName -
-     *          name of a property
-     * @return null.
-     */
-    public Object getProperty(String propertyName)
-    {
-      return null;
-    }
-
-    /**
-     * Returns the content of the documentation element.
-     * 
-     * @return the content of the documentation element.
-     */
-    public String getValue()
-    {
-      String content = "";
-      boolean contentFound = false;
-      NodeList nodes = documentation.getChildNodes();
-      for (int i = 0; i < nodes.getLength(); i++)
-      {
-        Node node = nodes.item(i);
-        if (node instanceof Text)
-        {
-          contentFound = true;
-          content += node.getNodeValue();
-        }
-      }
-      return contentFound ? content : null;
-    }
-
-    /**
-     * Returns the xml:lang attribute value of the documentation element.
-     * 
-     * @return the xml:lang attribute value of the documentation element.
-     */
-    public String getLanguage()
-    {
-      return documentation.hasAttributeNS(XSDConstants.XML_NAMESPACE_URI_1998, XML_LANG_ATTRIBUTE) ? documentation.getAttributeNS(XSDConstants.XML_NAMESPACE_URI_1998, XML_LANG_ATTRIBUTE) : null;
-    }
-
-    /**
-     * Returns the source attribute value of the documentation element.
-     * 
-     * @return the source attribute value of the documentation element.
-     */
-    public String getSource()
-    {
-      return documentation.hasAttributeNS(null, XSDConstants.SOURCE_ATTRIBUTE) ? documentation.getAttributeNS(null, XSDConstants.SOURCE_ATTRIBUTE) : null;
-    }
-  }
-  /**
-   * XSIDocument extends CMDocumentImpl. This class is used to hold those
-   * attributes that are for direct use in any XML documents. These attributes
-   * are in a different namespace, which has the namespace name
-   * http://www.w3.org/2001/XMLSchema-instance. Attributes in this namespace
-   * include: xsi:type xsi:nil xsi:schemaLocation xsi:noNamespaceSchemaLocation
-   */
-  public static class XSIDocument extends CMDocumentImpl
-  {
-    public CMAttributeDeclarationImpl nilAttribute;
-
-    /**
-     * Constructor. Creates the 'xsi:nil'
-     */
-    public XSIDocument()
-    {
-      super(XSDConstants.SCHEMA_INSTANCE_URI_2001);
-      // create the 'nill' attribute
-      String[] values = {"false", "true"};
-      nilAttribute = new CMAttributeDeclarationImpl("nil", CMAttributeDeclaration.REQUIRED, new CMDataTypeImpl("boolean", values));
-      nilAttribute.setPrefixQualification(true);
-      nilAttribute.setCMDocument(this);
-    }
-  }
-  /**
-   * Note this XSD model visitor differs from the XSD model visitor in
-   * org.eclipse.wst.xsd.editor plugin. In visitModelGroup method we call
-   * getParticles() instead of getContents(). This gathers all of the content of
-   * a derived type.
-   */
-  public static class XSDCMVisitor extends XSDVisitor
-  {
-    public void visitSimpleTypeDefinition(XSDSimpleTypeDefinition type)
-    {
-      XSDParticle ctd = type.getComplexType();
-      if (ctd != null)
-        visitParticle(ctd);
-    }
-
-    public void visitModelGroup(XSDModelGroup modelGroup)
-    {
-      if (modelGroup.getParticles() != null)
-      {
-        for (Iterator iterator = modelGroup.getParticles().iterator(); iterator.hasNext();)
-        {
-          XSDParticle particle = (XSDParticle) iterator.next();
-          visitParticle(particle);
-        }
-      }
-    }
-
-    public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-    {
-      XSDModelGroup modelGroup = modelGroupDef.getResolvedModelGroupDefinition().getModelGroup();
-      if (modelGroup != null)
-      {
-        visitModelGroup(modelGroup);
-      }
-    }
-  }
-  /**
-   * A visitor class that walks the xsd model and computes the list of children
-   * that belong to the initially visited element type.
-   */
-  public static class DerivedChildVisitor extends XSDCMVisitor
-  {
-    protected CMNodeListImpl childNodeList = new CMNodeListImpl();
-    protected List baseTypeList = new Vector();
-    Object root;
-
-    DerivedChildVisitor(Object root)
-    {
-      this.root = root;
-    }
-
-    public CMNodeListImpl getChildNodeList()
-    {
-      return childNodeList;
-    }
-
-    public void visitWildcard(XSDWildcard wildcard)
-    {
-      childNodeList.getList().add(getAdapter(wildcard));
-    }
-
-    public void visitElementDeclaration(XSDElementDeclaration element)
-    {
-      childNodeList.getList().add(getAdapter(element));
-    }
-
-    public void visitModelGroup(XSDModelGroup modelGroup)
-    {
-      childNodeList.getList().add(getAdapter(modelGroup));
-    }
-
-    public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDefinition)
-    {
-      childNodeList.getList().add(getAdapter(modelGroupDefinition));
-    }
-  }
-  /**
-   * A visitor class that gathers all of the elements within a type definition.
-   */
-  public static class LocalElementVisitor extends XSDCMVisitor
-  {
-    protected CMNamedNodeMapImpl namedNodeMap = new CMNamedNodeMapImpl();
-    protected List baseTypeList = new Vector();
-
-    public void visitElementDeclaration(XSDElementDeclaration element)
-    {
-      XSDElementDeclarationAdapter adapter = (XSDElementDeclarationAdapter) getAdapter(element);
-      namedNodeMap.getHashtable().put(adapter.getNodeName(), adapter);
-    }
-
-    public CMNamedNodeMap getCMNamedNodeMap()
-    {
-      return namedNodeMap;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDTypeUtil.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDTypeUtil.java
deleted file mode 100644
index f5867a3..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDTypeUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-/**
- * Helper class to generate valid values for built-in simple types.
- */
-
-public class XSDTypeUtil
-{
-  protected static Map defaultValue = new HashMap();
-
-  public static void initialize()
-  {
-    defaultValue.put("anySimpleType", null);
-    defaultValue.put("anyType", null);
-    defaultValue.put("anyURI", "http://tempuri.org");
-    defaultValue.put("base64Binary", "0");
-    defaultValue.put("boolean", "true");
-    defaultValue.put("byte", "0");
-    defaultValue.put("date", "2001-01-01");
-    defaultValue.put("dateTime", "2001-12-31T12:00:00");
-    defaultValue.put("decimal", "0.0");
-    defaultValue.put("double", "0.0");
-    defaultValue.put("duration", "P1D");
-    defaultValue.put("ENTITY", "entity");
-    defaultValue.put("ENTITIES", "entities");
-    defaultValue.put("float", "0.0");
-    defaultValue.put("gDay", "---01");
-    defaultValue.put("gMonth", "--01--");
-    defaultValue.put("gMonthDay", "--01-01");
-    defaultValue.put("gYear", "2001");
-    defaultValue.put("gYearMonth", "2001-01");
-    defaultValue.put("hexBinary", "0F00");
-    defaultValue.put("ID", null);
-    defaultValue.put("IDREF", null);
-    defaultValue.put("IDREFS", null);
-    defaultValue.put("int", "0");
-    defaultValue.put("integer", "0");
-    defaultValue.put("language", "EN");
-    defaultValue.put("long", "0");
-    defaultValue.put("Name", "Name");
-    defaultValue.put("NCName", "NCName");
-    defaultValue.put("negativeInteger", "-1");
-    defaultValue.put("NMTOKEN", "NMTOKEN");
-    defaultValue.put("NMTOKENS", "NMTOKENS");
-    defaultValue.put("nonNegativeInteger", "0");
-    defaultValue.put("nonPositiveInteger", "0");
-    defaultValue.put("normalizedString", null);
-    defaultValue.put("NOTATION", "NOTATION");
-    defaultValue.put("positiveInteger", "1");
-    defaultValue.put("QName", "QName");
-    defaultValue.put("short", "0");
-    defaultValue.put("string", null);
-    defaultValue.put("time", "12:00:00");
-    defaultValue.put("token", "token");
-    defaultValue.put("unsignedByte", "0");
-    defaultValue.put("unsignedInt", "0");
-    defaultValue.put("unsignedLong", "0");
-    defaultValue.put("unsignedShort", "0");
-  }
-
-
-  /*
-   * Returns true if the type is built-in.
-   * @param type - an XSDTypeDefinition object.
-   * @return true if the type is built-in.
-   */
-  public static boolean isBuiltIn(XSDTypeDefinition type)
-  { 
-    boolean result = false;
-    if (type instanceof XSDSimpleTypeDefinition)
-    {
-      String name = type.getName();
-      if (name != null)
-      {
-        return  defaultValue.containsKey(name); 
-      }
-    }
-    return result;
-  }
-
-
-  /**
-   * Returns a valid default value for the simple type.
-   * @param type - a simple built-in type.
-   * @return a valid default value for the simple type.
-   */
-  public static String getInstanceValue(XSDTypeDefinition type)
-  {
-    if (type != null)
-    {
-      if (isBuiltIn(type))
-      {
-        String nameID = type.getName();
-        return (String)defaultValue.get(nameID);
-      }
-      else
-      {
-        XSDTypeDefinition basetype = type.getBaseType();
-        if (basetype != type) return getInstanceValue(basetype);
-      }
-    }
-    return null;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDVisitor.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDVisitor.java
deleted file mode 100644
index 59f5838..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/XSDVisitor.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal;
-
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDIdentityConstraintDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNotationDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-
-public class XSDVisitor
-{
-  public XSDVisitor()
-  {
-  }
-  
-  protected XSDSchema schema;
-  protected Stack particleStack = new Stack();
-  
-  public void visitSchema(XSDSchema schema)
-  {
-    this.schema = schema;
-    for (Iterator iterator = schema.getAttributeDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeDeclaration attr = (XSDAttributeDeclaration) iterator.next();
-      visitAttributeDeclaration(attr);
-    }
-    for (Iterator iterator = schema.getTypeDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDTypeDefinition type = (XSDTypeDefinition) iterator.next();
-      visitTypeDefinition(type);
-    }
-    for (Iterator iterator = schema.getElementDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDElementDeclaration element = (XSDElementDeclaration) iterator.next();
-      visitElementDeclaration(element);
-    }
-    for (Iterator iterator = schema.getIdentityConstraintDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDIdentityConstraintDefinition identityConstraint = (XSDIdentityConstraintDefinition) iterator.next();
-      visitIdentityConstraintDefinition(identityConstraint);
-    }
-    for (Iterator iterator = schema.getModelGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDModelGroupDefinition modelGroup = (XSDModelGroupDefinition) iterator.next();
-      visitModelGroupDefinition(modelGroup);
-    }
-    for (Iterator iterator = schema.getAttributeGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupDefinition attributeGroup = (XSDAttributeGroupDefinition) iterator.next();
-      visitAttributeGroupDefinition(attributeGroup);
-    }
-    for (Iterator iterator = schema.getNotationDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDNotationDeclaration element = (XSDNotationDeclaration) iterator.next();
-      visitNotationDeclaration(element);
-    }
-    
-  }
-  
-  public void visitAttributeDeclaration(XSDAttributeDeclaration attr)
-  {
-  }
-  
-  public void visitTypeDefinition(XSDTypeDefinition type)
-  {
-    if (type instanceof XSDSimpleTypeDefinition)
-    {
-      visitSimpleTypeDefinition((XSDSimpleTypeDefinition)type);
-    }
-    else if (type instanceof XSDComplexTypeDefinition)
-    {
-      visitComplexTypeDefinition((XSDComplexTypeDefinition)type);
-    }
-  }
-  
-  public void visitElementDeclaration(XSDElementDeclaration element)
-  {
-    if (element.isElementDeclarationReference())
-    {
-    }
-    else if (element.getAnonymousTypeDefinition() != null)
-    {
-      visitTypeDefinition(element.getAnonymousTypeDefinition());
-    }
-  }
-  
-  public void visitIdentityConstraintDefinition(XSDIdentityConstraintDefinition identityConstraint)
-  {
-  }
-  
-  public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-  {
-    if (!modelGroupDef.isModelGroupDefinitionReference())
-    {
-      if (modelGroupDef.getModelGroup() != null)
-      {
-        visitModelGroup(modelGroupDef.getModelGroup());
-      }
-    }
-  }
-  
-  public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-  {
-  }
-  
-  public void visitNotationDeclaration(XSDNotationDeclaration notation)
-  {
-  }
-  
-  public void visitSimpleTypeDefinition(XSDSimpleTypeDefinition type)
-  {
-  }
-  
-  public void visitComplexTypeDefinition(XSDComplexTypeDefinition type)
-  {
-    if (type.getContentType() != null)
-    {
-      XSDComplexTypeContent complexContent = type.getContentType();
-      if (complexContent instanceof XSDSimpleTypeDefinition)
-      {
-        visitSimpleTypeDefinition((XSDSimpleTypeDefinition)complexContent);
-      }
-      else if (complexContent instanceof XSDParticle)
-      {
-        visitParticle((XSDParticle) complexContent);
-      }
-    }
-  }
-  
-  public void visitParticle(XSDParticle particle)
-  {
-    visitParticleContent(particle.getContent());
-  }
-  
-  public void visitParticleContent(XSDParticleContent particleContent)
-  {
-    if (particleContent instanceof XSDModelGroupDefinition)
-    {
-      XSDModelGroupDefinition modelGroupDef = (XSDModelGroupDefinition) particleContent;
-
-      if (particleStack.contains(modelGroupDef))
-      {
-        return;
-      }
-        
-      particleStack.push(modelGroupDef);
-      
-      visitModelGroupDefinition(modelGroupDef);
-      
-      particleStack.pop();
-    }
-    else if (particleContent instanceof XSDModelGroup)
-    {
-      visitModelGroup((XSDModelGroup)particleContent);
-    }
-    else if (particleContent instanceof XSDElementDeclaration)
-    {
-      visitElementDeclaration((XSDElementDeclaration)particleContent);
-    }
-    else if (particleContent instanceof XSDWildcard)
-    {
-      visitWildcard((XSDWildcard)particleContent);
-    }
-  }
-  
-  public void visitModelGroup(XSDModelGroup modelGroup)
-  {
-    if (modelGroup.getContents() != null)
-    {
-      for (Iterator iterator = modelGroup.getContents().iterator(); iterator.hasNext();)
-      {
-        XSDParticle particle = (XSDParticle) iterator.next();
-        visitParticle(particle);
-      }
-    }
-  }
-  
-  public void visitWildcard(XSDWildcard wildcard)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorAdapterFactory.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorAdapterFactory.java
deleted file mode 100644
index c0309f1..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorAdapterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocatorAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocatorImpl schemaLocator = new XSDSchemaLocatorImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorImpl.java b/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorImpl.java
deleted file mode 100644
index cbf0183..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-contentmodel/org/eclipse/wst/xsd/contentmodel/internal/util/XSDSchemaLocatorImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.contentmodel.internal.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocatorImpl extends AdapterImpl implements XSDSchemaLocator
-{
-    /**
-     * @see org.eclipse.xsd.util.XSDSchemaLocator#locateSchema(org.eclipse.xsd.XSDSchema,
-     *      java.lang.String, java.lang.String, java.lang.String)
-     */
-    public XSDSchema locateSchema(XSDSchema xsdSchema, String namespaceURI, String rawSchemaLocationURI, String resolvedSchemaLocationURI)
-    {
-      XSDSchema result = null;
-      String baseLocation = xsdSchema.getSchemaLocation();      
-      String resolvedURI = URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, rawSchemaLocationURI); 
-      if (resolvedURI == null) 
-      {
-        resolvedURI = resolvedSchemaLocationURI;       
-      }
-      try
-      {        
-        ResourceSet resourceSet = xsdSchema.eResource().getResourceSet();
-        URI uri = URI.createURI(resolvedURI);
-        Resource r = resourceSet.getResource(uri, false); 
-        XSDResourceImpl resolvedResource = null;
-        if (r instanceof XSDResourceImpl)
-        {
-          resolvedResource = (XSDResourceImpl)r;
-        }
-        else        
-        {  
-          String physicalLocation = URIResolverPlugin.createResolver().resolvePhysicalLocation(baseLocation, namespaceURI, resolvedURI);     
-          InputStream inputStream = resourceSet.getURIConverter().createInputStream(URI.createURI(physicalLocation));
-          resolvedResource = (XSDResourceImpl)resourceSet.createResource(URI.createURI("*.xsd"));
-          resolvedResource.setURI(uri);
-          resolvedResource.load(inputStream, null);           
-        }
-
-        result = resolvedResource.getSchema();
-      }
-      catch (IOException exception)
-      {
-        // It is generally not an error to fail to resolve.
-        // If a resource is actually created, 
-        // which happens only when we can create an input stream,
-        // then it's an error if it's not a good schema
-      }
-      return result;
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfiguration.java b/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfiguration.java
deleted file mode 100644
index 0a57f95..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidationConfiguration.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver, Standards for Technology in Automotive Retail, bug 1147033
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation;
-
-/**
- * An XSD validation configuration allows setting specific configuration
- * information for a WTP XSD validation run. Any features and properties
- * set on this configuration should not be confused with those from
- * parsers such as Xerces. (This object does not by default wrap features
- * and properties from specific parsers.)
- */
-public class XSDValidationConfiguration 
-{
-  public static String HONOUR_ALL_SCHEMA_LOCATIONS = "HONOUR_ALL_SCHEMA_LOCATIONS"; //$NON-NLS-1$
-  public static String FULL_SCHEMA_CONFORMANCE = "FULL_SCHEMA_CONFORMANCE"; //$NON-NLS-1$
-  private boolean honour_all_schema_locations = false;
-  private boolean fullSchemaConformance = true;
-  
-  /**
-   * Set a feature of this configuration.
-   * 
-   * @param feature
-   * 		The feature to set.
-   * @param value
-   * 		The value to set for the feature.
-   * @throws 
-   * 		An exception is thrown if the feature is not recognized.
-   */
-  public void setFeature(String feature, boolean value) throws Exception
-  {
-	if(HONOUR_ALL_SCHEMA_LOCATIONS.equals(feature))
-	  honour_all_schema_locations = value;
-	else if (FULL_SCHEMA_CONFORMANCE.equals(feature))
-		fullSchemaConformance = value;
-	else
-	  throw new Exception("Feature not recognized."); //$NON-NLS-1$
-	
-  }
-  
-  
-  /**
-   * Get the value for a given feature. If the feature is not defined
-   * this method will throw an exception.
-   * 
-   * @param feature
-   * 		The feature for which to retrieve the value.
-   * @return
-   * 		The feature's value, true or false.
-   * @throws 
-   * 		An exception is thrown if the feature is not recognized.
-   */
-  public boolean getFeature(String feature) throws Exception
-  {
-	if(HONOUR_ALL_SCHEMA_LOCATIONS.equals(feature))
-	  return honour_all_schema_locations;
-	else if (FULL_SCHEMA_CONFORMANCE.equals(feature))
-      return fullSchemaConformance;
-	
-	throw new Exception("Feature not recognized."); //$NON-NLS-1$
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidator.java b/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidator.java
deleted file mode 100644
index 1a6b5e9..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/XSDValidator.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver, Standards for Technology in Automotive Retail, bug 1147033
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation;
-
-import java.io.IOException;
-import java.io.InputStream;
-
-import org.apache.xerces.impl.Constants;
-import org.apache.xerces.parsers.XMLGrammarPreparser;
-import org.apache.xerces.util.XMLGrammarPoolImpl;
-import org.apache.xerces.xni.XMLResourceIdentifier;
-import org.apache.xerces.xni.XNIException;
-import org.apache.xerces.xni.grammars.XMLGrammarDescription;
-import org.apache.xerces.xni.parser.XMLEntityResolver;
-import org.apache.xerces.xni.parser.XMLErrorHandler;
-import org.apache.xerces.xni.parser.XMLInputSource;
-import org.apache.xerces.xni.parser.XMLParseException;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.xml.core.internal.validation.XMLValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationInfo;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.w3c.dom.DOMError;
-
-/**
- * The XSDValidator will validate XSD files.
- */
-public class XSDValidator
-{
-  protected URIResolver uriresolver = null;
-
-  public ValidationReport validate(String uri)
-  {
-    return validate(uri, null);
-  }
-  
-  public ValidationReport validate(String uri, InputStream inputStream)
-  {
-	return validate(uri, null, null);
-  }
-  
-  /**
-   * Validate the XSD file specified by the URI.
-   * 
-   * @param uri
-   * 		The URI of the XSD file to validate.
-   * @param inputStream 
-   * 		An input stream representing the XSD file to validate.
-   * @param configuration
-   * 		A configuration for this validation run.
-   */
-  public ValidationReport validate(String uri, InputStream inputStream, XSDValidationConfiguration configuration)
-  {
-	if(configuration == null)
-	{
-	  configuration = new XSDValidationConfiguration();
-	}
-	ValidationInfo valinfo = new ValidationInfo(uri);
-	XSDErrorHandler errorHandler = new XSDErrorHandler(valinfo);
-	try
-	{
-	  XMLGrammarPreparser grammarPreparser = new XMLGrammarPreparser();
-	  grammarPreparser.registerPreparser(XMLGrammarDescription.XML_SCHEMA,null/*schemaLoader*/);
-		  
-	  grammarPreparser.setProperty(Constants.XERCES_PROPERTY_PREFIX + Constants.XMLGRAMMAR_POOL_PROPERTY, new XMLGrammarPoolImpl());
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.CONTINUE_AFTER_FATAL_ERROR_FEATURE, false);
-      grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.NAMESPACES_FEATURE, true);
-      grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.NAMESPACE_PREFIXES_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.VALIDATION_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_VALIDATION_FEATURE, true);
-
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.EXTERNAL_GENERAL_ENTITIES_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.EXTERNAL_PARAMETER_ENTITIES_FEATURE, true);
-	  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.WARN_ON_DUPLICATE_ATTDEF_FEATURE, true);
-	     
-	  if(configuration.getFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS))
-	  {
-	    try
-	    {
-	      grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + "honour-all-schemaLocations", true); //$NON-NLS-1$
-	    }
-        catch (Exception e)
-	    {
-	      // catch the exception and ignore
-	    }
-	  }
-	  
-	  if(configuration.getFeature(XSDValidationConfiguration.FULL_SCHEMA_CONFORMANCE)) {
-		try
-		{
-		  grammarPreparser.setFeature(Constants.XERCES_FEATURE_PREFIX + Constants.SCHEMA_FULL_CHECKING, true);
-		}
-		catch (Exception e)
-		{
-			// ignore since we don't want to set it or can't.
-		}
-		
-	  }
-	      
-	  grammarPreparser.setErrorHandler(errorHandler);
-	  if (uriresolver != null)
-	  {
-	    XSDEntityResolver resolver = new XSDEntityResolver(uriresolver, uri);
-	    if (resolver != null)
-	    {
-	      grammarPreparser.setEntityResolver(resolver);
-	    }
-	  }
-
-	  try
-	  {
-	  	XMLInputSource is = new XMLInputSource(null, uri, uri, inputStream, null);
-	    grammarPreparser.getLoader(XMLGrammarDescription.XML_SCHEMA);
-		grammarPreparser.preparseGrammar(XMLGrammarDescription.XML_SCHEMA,is);
-	  }
-	  catch (Exception e)
-	  {
-	    //parser will return null pointer exception if the document is structurally invalid
-		//TODO: log error message
-		//System.out.println(e);
-      }
-	}
-	catch (Exception e)
-	{
-      // TODO: log error.
-	  //System.out.println(e);
-	}
-	return valinfo;
-  }
-
-  /**
-   * Set the URI resolver to use with XSD validation.
-   * 
-   * @param uriresolver
-   *          The URI resolver to use.
-   */
-  public void setURIResolver(URIResolver uriresolver)
-  {
-    this.uriresolver = uriresolver;
-  }
-
-  /**
-   * The XSDErrorHandler handle Xerces parsing errors and puts the errors
-   * into the given ValidationInfo object.
-   */
-  protected class XSDErrorHandler implements XMLErrorHandler
-  {
-	  
-    private final ValidationInfo valinfo;
-
-    public XSDErrorHandler(ValidationInfo valinfo)
-    {
-      this.valinfo = valinfo;
-    }
-    
-    /**
-     * Add a validation message with the given severity.
-     * 
-     * @param errorKey The Xerces error key.
-     * @param exception The exception that contains the information about the message.
-     * @param severity The severity of the validation message.
-     */
-    protected void addValidationMessage(String errorKey, XMLParseException exception, int severity)
-    { 
-      String systemId = exception.getExpandedSystemId();
-      if (systemId != null)
-      {
-        if (severity == DOMError.SEVERITY_WARNING)
-        {
-          valinfo.addWarning(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), systemId);
-        }
-        else
-        {
-          valinfo.addError(exception.getLocalizedMessage(), exception.getLineNumber(), exception.getColumnNumber(), systemId, errorKey, null);
-        }
-      }
-    }
-
-    /* (non-Javadoc)
-     * @see org.apache.xerces.xni.parser.XMLErrorHandler#warning(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-     */
-    public void warning(String domain, String key, XMLParseException exception) throws XNIException
-	{
-    	addValidationMessage(key, exception, DOMError.SEVERITY_WARNING);
-	}
-
-    /* (non-Javadoc)
-     * @see org.apache.xerces.xni.parser.XMLErrorHandler#error(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-     */
-    public void error(String domain, String key, XMLParseException exception) throws XNIException
-    {
-    	addValidationMessage(key, exception, DOMError.SEVERITY_ERROR);
-	}
-
-    /* (non-Javadoc)
-     * @see org.apache.xerces.xni.parser.XMLErrorHandler#fatalError(java.lang.String, java.lang.String, org.apache.xerces.xni.parser.XMLParseException)
-     */
-    public void fatalError(String domain, String key, XMLParseException exception) throws XNIException
-	{
-    	addValidationMessage(key, exception, DOMError.SEVERITY_FATAL_ERROR);
-	}
-  }
-
-  /**
-   * The XSDEntityResolver wraps an idresolver to provide entity resolution to
-   * the XSD validator.
-   */
-  protected class XSDEntityResolver implements XMLEntityResolver
-  {
-    private URIResolver uriresolver = null;
-
-    /**
-     * Constructor.
-     * 
-     * @param idresolver
-     *          The idresolver this entity resolver wraps.
-     * @param baselocation The base location to resolve with.
-     */
-    public XSDEntityResolver(URIResolver uriresolver, String baselocation)
-    {
-      this.uriresolver = uriresolver;
-    }
-    
-    /* (non-Javadoc)
-     * @see org.apache.xerces.xni.parser.XMLEntityResolver#resolveEntity(org.apache.xerces.xni.XMLResourceIdentifier)
-     */
-    public XMLInputSource resolveEntity(XMLResourceIdentifier resourceIdentifier) throws XNIException, IOException
-    {
-      String literalSystemId = resourceIdentifier.getLiteralSystemId();
-      if(literalSystemId != null)
-      {
-    	resourceIdentifier.setLiteralSystemId(literalSystemId.replace('\\','/'));
-      }
-        // TODO cs: In revision 1.1 we explicitly opened a stream to ensure
-        // file I/O problems produced messages. I've remove this fudge for now
-        // since I can't seem to reproduce the problem it was intended to fix.
-        // I'm hoping the newer Xerces code base has fixed this problem and the fudge is defunct.
-        return XMLValidator._internalResolveEntity(uriresolver, resourceIdentifier);
-      
-    }
-  }   
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/Validator.java b/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/Validator.java
deleted file mode 100644
index 5da031b..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/Validator.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver, Standards for Technology in Automotive Retail, bug 1147033
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import java.io.InputStream;
-import java.util.HashMap;
-
-import org.eclipse.wst.validation.internal.provisional.core.IMessage;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.preferences.XMLCorePreferenceNames;
-import org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator;
-import org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage;
-import org.eclipse.wst.xml.core.internal.validation.core.ValidationReport;
-import org.eclipse.wst.xsd.core.internal.XSDCorePlugin;
-import org.eclipse.wst.xsd.core.internal.preferences.XSDCorePreferenceNames;
-import org.eclipse.wst.xsd.core.internal.validation.XSDValidationConfiguration;
-
-public class Validator extends AbstractNestedValidator
-{
-  protected HashMap xsdConfigurations = new HashMap();
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator#setupValidation(org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext)
-   */
-  protected void setupValidation(NestedValidatorContext context) 
-  {
-	XSDValidationConfiguration configuration = new XSDValidationConfiguration();
-	boolean honourAllSchemaLocations = XMLCorePlugin.getDefault().getPluginPreferences().getBoolean(XMLCorePreferenceNames.HONOUR_ALL_SCHEMA_LOCATIONS);
-	boolean fullSchemaConformance = XSDCorePlugin.getDefault().getPluginPreferences().getBoolean(XSDCorePreferenceNames.FULL_SCHEMA_CONFORMANCE);
-	try
-	{
-	  configuration.setFeature(XSDValidationConfiguration.HONOUR_ALL_SCHEMA_LOCATIONS, honourAllSchemaLocations);
-	  configuration.setFeature(XSDValidationConfiguration.FULL_SCHEMA_CONFORMANCE, fullSchemaConformance);
-	}
-	catch(Exception e)
-	{
-	  // Unable to set the honour all schema locations option. Do nothing.
-	}
-	xsdConfigurations.put(context, configuration);
-	
-	super.setupValidation(context);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator#teardownValidation(org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext)
-   */
-  protected void teardownValidation(NestedValidatorContext context) 
-  {
-	xsdConfigurations.remove(context);
-	
-	super.teardownValidation(context);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator#validate(java.lang.String, java.io.InputStream, org.eclipse.wst.xml.core.internal.validation.core.NestedValidatorContext)
-   */
-  public ValidationReport validate(String uri, InputStream inputstream, NestedValidatorContext context)
-  {  
-	XSDValidator validator = XSDValidator.getInstance();
-	
-	XSDValidationConfiguration configuration = (XSDValidationConfiguration)xsdConfigurations.get(context);
-
-	ValidationReport valreport = null;
-	
-	valreport = validator.validate(uri, inputstream, configuration);
-		        
-	return valreport;
-  }
-	  
-  /**
-   * Store additional information in the message parameters. For XSD validation there
-   * are three additional pieces of information to store:
-   * param[0] = the column number of the error
-   * param[1] = the 'squiggle selection strategy' for which DOM part to squiggle
-   * param[2] = the name or value of what is to be squiggled
-   * 
-   * @see org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator#addInfoToMessage(org.eclipse.wst.xml.core.internal.validation.core.ValidationMessage, org.eclipse.wst.validation.internal.provisional.core.IMessage)
-   */
-  protected void addInfoToMessage(ValidationMessage validationMessage, IMessage message)
-  { 
-	String key = validationMessage.getKey();
-	if(key != null)
-	{
-	  XSDMessageInfoHelper messageInfoHelper = new XSDMessageInfoHelper();
-	  String[] messageInfo = messageInfoHelper.createMessageInfo(key, validationMessage.getMessage());
-
-	  message.setAttribute(COLUMN_NUMBER_ATTRIBUTE, new Integer(validationMessage.getColumnNumber()));
-	  message.setAttribute(SQUIGGLE_SELECTION_STRATEGY_ATTRIBUTE, messageInfo[0]);
-	  message.setAttribute(SQUIGGLE_NAME_OR_VALUE_ATTRIBUTE, messageInfo[1]);
-	}
-  }
-
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.xml.core.internal.validation.core.AbstractNestedValidator#getValidatorID()
-   */
-  protected String getValidatorID()
-  {
-    // Because this class is used as a delegate, return the id of the validator
-    // which delegates to this class.
-
-    return XSDDelegatingValidator.class.getName();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDDelegatingValidator.java b/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDDelegatingValidator.java
deleted file mode 100644
index 3f615ba..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDDelegatingValidator.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.validation.internal.delegates.DelegatingValidator;
-
-/**
- * This class provides a unique name (class name) which the validation framework
- * will use to identify the XSD validator. The actual delegating validator
- * functionality is provided by the base class. The actual validation
- * functionality is provided by the delegates registered with this class as
- * their target.
- */
-public class XSDDelegatingValidator extends DelegatingValidator
-{
-  /**
-   * Default constructor.
-   */
-  public XSDDelegatingValidator()
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelper.java b/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelper.java
deleted file mode 100644
index 5de3299..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDMessageInfoHelper.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-
-/**
- * The XSDMessageInfoHelper creates a string with the
- */
-public class XSDMessageInfoHelper
-{
-  public XSDMessageInfoHelper()
-  { super();
-  }
-
-  public String[] createMessageInfo(String errorKey, String errorMessage)
-  { 
-    //Now map the error key to what we would want to underline:
-    String nameOrValue = "";
-    String selectionStrategy = "";
-    if(errorKey != null)
-    {
-      if (errorKey.equals("s4s-elt-invalid-content.1") || errorKey.equals("s4s-elt-must-match.1") || 
-    		  errorKey.equals("s4s-att-must-appear") || errorKey.equals("s4s-elt-invalid-content.2"))  //$NON-NLS-1$  //$NON-NLS-2$  //$NON-NLS-3$  //$NON-NLS-4$
-      { 
-    	selectionStrategy = "START_TAG"; //$NON-NLS-1$
-      }
-      else if (errorKey.equals("s4s-att-not-allowed")) //$NON-NLS-1$
-      { 
-    	selectionStrategy = "ATTRIBUTE_NAME"; //$NON-NLS-1$
-        nameOrValue = getFirstStringBetweenSingleQuotes(errorMessage);
-      }
-      else if (errorKey.equals("s4s-att-invalid-value")) //$NON-NLS-1$
-      { 
-    	selectionStrategy = "ATTRIBUTE_VALUE"; //$NON-NLS-1$
-        nameOrValue = getFirstStringBetweenSingleQuotes(errorMessage);
-      }
-      else if (errorKey.equals("s4s-elt-character")) //$NON-NLS-1$
-      { 
-    	selectionStrategy = "TEXT"; //$NON-NLS-1$
-      }
-      else if (errorKey.equals("src-resolve.4.2") || errorKey.equals("src-resolve"))  //$NON-NLS-1$  //$NON-NLS-2$
-      { 
-    	selectionStrategy = "VALUE_OF_ATTRIBUTE_WITH_GIVEN_VALUE"; //$NON-NLS-1$
-        nameOrValue = getFirstStringBetweenSingleQuotes(errorMessage);
-      }
-      else if (errorKey.equals("EqRequiredInAttribute") || errorKey.equals("OpenQuoteExpected") || 
-    		  errorKey.equals("LessthanInAttValue")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      {
-      	selectionStrategy = "ATTRIBUTE_NAME"; //$NON-NLS-1$
-        nameOrValue = getFirstStringBetweenQuotes(errorMessage);
-      }
-      else if (errorKey.equals("ElementUnterminated")) //$NON-NLS-1$
-      {
-        selectionStrategy = "ENTIRE_ELEMENT"; //$NON-NLS-1$
-      }
-      else if (errorKey.equals("ETagUnterminated") || errorKey.equals("ETagRequired")) //$NON-NLS-1$  //$NON-NLS-2$
-      {
-        selectionStrategy = "END_TAG"; //$NON-NLS-1$
-      }
-    }
-    String messageInfo[] = new String[2];
-    messageInfo[0] = selectionStrategy;
-    messageInfo[1] = nameOrValue;
-    return messageInfo;    
-  }
-
-  /**
-   * This method is used to get the value between the first pair of single quotes
-   * It is used to extract information from the error Message (for example
-   * an attribute name)
-   * 
-   * @param s
-   * 		The string to extract the value from.
-   */
-  protected String getFirstStringBetweenSingleQuotes(String s)
-  {
-    return getFirstStringBetweenDelimiters(s, '\'');
-  }
-
-  /**
-   * This method is used to get the value between the first pair of quotes
-   * It is used to extract information from the error Message (for example
-   * an attribute name)
-   * 
-   * @param s
-   * 		The string to extract the value from.
-   */
-  protected String getFirstStringBetweenQuotes(String s)
-  {
-    return getFirstStringBetweenDelimiters(s, '\"');
-  }
-
-  /**
-   * This method is used to get the value between the first start and end occurrences of the given delimiter character.
-   * 
-   * @param s
-   * 		The string to extract the value from.
-   * @param delimiter 
-   * 		The start and end character
-   */
-  protected String getFirstStringBetweenDelimiters(String s, char delimiter)
-  {
-    int first = s.indexOf(delimiter);
-    int second = s.indexOf(delimiter, first + 1);
-    String stringBetweenDelimiters = null;
-    if (first != -1 && second != -1)
-    { 
-      stringBetweenDelimiters = s.substring(first + 1, second);
-    }
-    return stringBetweenDelimiters;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidator.java b/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidator.java
deleted file mode 100644
index fbe1a03..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src-validation/org/eclipse/wst/xsd/core/internal/validation/eclipse/XSDValidator.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.core.internal.validation.eclipse;
-
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-
-
-/**
- * An XSD validator specific to Eclipse. This validator will wrap the internal
- * XSD validator an provide automatic URI resolution support.
- * Using this class is equivalent to using the internal XSD validator and registering
- * the URI resolver from the URI resolution framework.
- */
-public class XSDValidator extends org.eclipse.wst.xsd.core.internal.validation.XSDValidator
-{
-  private static XSDValidator instance = null;
-  
-  /**
-   * Return the one and only instance of the XSD validator. The validator
-   * can be reused and cannot be customized so there should only be one instance of it.
-   * 
-   * @return The one and only instance of the XSD validator.
-   */
-  public static XSDValidator getInstance()
-  {
-    if(instance == null)
-    {
-      instance = new XSDValidator();
-    }
-    return instance;
-  }
-  /**
-   * Constructor. Create the XSD validator and set the URI resolver.
-   */
-  protected XSDValidator()
-  {
-    this.setURIResolver(URIResolverPlugin.createResolver());
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/XSDCorePlugin.java b/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/XSDCorePlugin.java
deleted file mode 100644
index 7b30f26..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/XSDCorePlugin.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2004, 2005 IBM Corporation and others.
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License v1.0
-* which accompanies this distribution, and is available at
-* http://www.eclipse.org/legal/epl-v10.html
-* 
-* Contributors:
-*     IBM Corporation - Initial API and implementation
-*******************************************************************************/
-package org.eclipse.wst.xsd.core.internal;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDCMManager;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class XSDCorePlugin extends Plugin {
-	//The shared instance.
-	private static XSDCorePlugin plugin;
-	
-	/**
-	 * The constructor.
-	 */
-	public XSDCorePlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-    XSDCMManager.getInstance().startup();
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static XSDCorePlugin getDefault() {
-		return plugin;
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/preferences/XSDCorePreferenceInitializer.java b/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/preferences/XSDCorePreferenceInitializer.java
deleted file mode 100644
index f81f24d..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/preferences/XSDCorePreferenceInitializer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.core.internal.preferences;
-
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.IEclipsePreferences;
-import org.eclipse.wst.xsd.core.internal.XSDCorePlugin;
-
-/**
- * Sets default values for XSD Core preferences
- */
-public class XSDCorePreferenceInitializer extends AbstractPreferenceInitializer {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#initializeDefaultPreferences()
-	 */
-	public void initializeDefaultPreferences() {
-		IEclipsePreferences node = new DefaultScope().getNode(XSDCorePlugin.getDefault().getBundle().getSymbolicName());
-		
-		// In order to provide the best compatibility and conformance to the XML Schema
-		// specification it is recommended that this be defaulted to true.
-		node.putBoolean(XSDCorePreferenceNames.FULL_SCHEMA_CONFORMANCE, true);
-		
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/preferences/XSDCorePreferenceNames.java b/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/preferences/XSDCorePreferenceNames.java
deleted file mode 100644
index 06fc74e..0000000
--- a/bundles/org.eclipse.wst.xsd.core/src/org/eclipse/wst/xsd/core/internal/preferences/XSDCorePreferenceNames.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.core.internal.preferences;
-
-/**
- * Common preference keys used by XSD core
- */
-public class XSDCorePreferenceNames {
-	private XSDCorePreferenceNames() {
-		// empty private constructor so users cannot instantiate class
-	}
-	/**
-	 * Indicates whether or not all schema locations should be honoured
-	 * during XSD validation.
-	 * <p>
-	 * Value is of type <code>boolean</code>.<br />
-	 * Possible values: {TRUE, FALSE}
-	 * </p>
-	 * @deprecated
-	 */
-	public static final String HONOUR_ALL_SCHEMA_LOCATIONS = "honourAllSchemaLocations";//$NON-NLS-1$
-	public static final String FULL_SCHEMA_CONFORMANCE = "fullSchemaConformance";//$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/.classpath b/bundles/org.eclipse.wst.xsd.ui/.classpath
deleted file mode 100644
index 492b51c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.classpath
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src-refactor"/>
-	<classpathentry kind="src" path="src-adt"/>
-	<classpathentry kind="src" path="src-adt-xsd"/>
-	<classpathentry kind="src" path="src-common"/>
-	<classpathentry kind="src" path="src-adt-xsd-typeviz"/>
-	<classpathentry kind="src" path="src-search"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/apache/xerces/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
-		<accessrules>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/validation/**"/>
-			<accessrule kind="accessible" pattern="org/eclipse/wst/common/ui/**"/>
-		</accessrules>
-	</classpathentry>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wst.xsd.ui/.cvsignore b/bundles/org.eclipse.wst.xsd.ui/.cvsignore
deleted file mode 100644
index 6500e4d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-bin
-xsdeditor.jar
-build.xml
-temp.folder
-org.eclipse.wst.xsd.ui_1.0.0.jar
-@dot
-src.zip
-javaCompiler...args
diff --git a/bundles/org.eclipse.wst.xsd.ui/.project b/bundles/org.eclipse.wst.xsd.ui/.project
deleted file mode 100644
index aab3824..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsd.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.core.resources.prefs b/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.core.runtime.prefs b/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 7ec5750..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon Apr 17 01:48:39 EDT 2006
-eclipse.preferences.version=1
-line.separator=\r\n
diff --git a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 95c882e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,79 +0,0 @@
-#Tue Jan 16 17:48:30 EST 2007

-eclipse.preferences.version=1

-org.eclipse.jdt.core.builder.cleanOutputFolder=clean

-org.eclipse.jdt.core.builder.duplicateResourceTask=warning

-org.eclipse.jdt.core.builder.invalidClasspath=ignore

-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch

-org.eclipse.jdt.core.circularClasspath=error

-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled

-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled

-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4

-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve

-org.eclipse.jdt.core.compiler.compliance=1.5

-org.eclipse.jdt.core.compiler.debug.lineNumber=generate

-org.eclipse.jdt.core.compiler.debug.localVariable=generate

-org.eclipse.jdt.core.compiler.debug.sourceFile=generate

-org.eclipse.jdt.core.compiler.doc.comment.support=enabled

-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100

-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning

-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore

-org.eclipse.jdt.core.compiler.problem.deprecation=ignore

-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled

-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled

-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning

-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning

-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore

-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore

-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error

-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error

-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning

-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning

-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore

-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error

-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled

-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore

-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error

-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public

-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled

-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private

-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore

-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error

-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error

-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning

-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore

-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning

-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error

-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled

-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error

-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled

-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore

-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore

-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning

-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore

-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning

-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore

-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error

-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore

-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled

-org.eclipse.jdt.core.compiler.problem.unusedImport=error

-org.eclipse.jdt.core.compiler.problem.unusedLabel=error

-org.eclipse.jdt.core.compiler.problem.unusedLocal=error

-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled

-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled

-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error

-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning

-org.eclipse.jdt.core.compiler.source=1.4

-org.eclipse.jdt.core.incompatibleJDKLevel=ignore

-org.eclipse.jdt.core.incompleteClasspath=error

diff --git a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.jdt.ui.prefs b/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5a782e1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue Jan 16 17:04:13 EST 2007
-eclipse.preferences.version=1
-internal.default.compliance=user
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<templates/>
diff --git a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.ltk.core.refactoring.prefs b/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.pde.prefs b/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index 061cd53..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,16 +0,0 @@
-#Mon Apr 17 02:01:33 EDT 2006

-compilers.incompatible-environment=0

-compilers.p.build=0

-compilers.p.deprecated=1

-compilers.p.illegal-att-value=0

-compilers.p.no-required-att=0

-compilers.p.not-externalized-att=0

-compilers.p.unknown-attribute=0

-compilers.p.unknown-class=0

-compilers.p.unknown-element=0

-compilers.p.unknown-resource=0

-compilers.p.unresolved-ex-points=0

-compilers.p.unresolved-import=0

-compilers.p.unused-element-or-attribute=0

-compilers.use-project=true

-eclipse.preferences.version=1

diff --git a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 341095c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,85 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %_UI_PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.wst.xsd.ui; singleton:=true
-Bundle-Version: 1.2.303.qualifier
-Bundle-Activator: org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.xsd.ui.internal.actions;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adapters;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.actions;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.design;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.design.directedit;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.design.editparts;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.design.figures;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.edit;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.editor;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.facade;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.outline;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.properties;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.typeviz;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.layouts;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.commands;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.common.actions;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.common.commands;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.common.properties.providers;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.common.properties.sections;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.common.util;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.design.editparts;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.design.editparts.model;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.design.editpolicies;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.design.figures;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.design.layouts;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.dialogs;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.editor;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.editor.icons;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.editor.search;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.navigation;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.nsedit;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.preferences;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.refactor;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.refactor.actions;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.refactor.rename;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.refactor.structure;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.refactor.util;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.refactor.wizard;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.search;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.search.actions;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.text;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.util;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.utils;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.validation;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.widgets;x-internal:=true,
- org.eclipse.wst.xsd.ui.internal.wizards;x-internal:=true
-Require-Bundle: org.eclipse.ui.views.properties.tabbed;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.wst.common.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.wst.xml.ui;bundle-version="[1.0.400,1.2.0)",
- org.eclipse.wst.common.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.xsd.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.wst.validation;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.ltk.core.refactoring;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.ltk.ui.refactoring;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.xsd.core;bundle-version="[1.1.300,1.2.0)",
- org.eclipse.search;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.filesystem;bundle-version="[1.2.0,2.0.0)"
-Import-Package: com.ibm.icu.util;version="3.8.1"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/bundles/org.eclipse.wst.xsd.ui/about.html b/bundles/org.eclipse.wst.xsd.ui/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/bundles/org.eclipse.wst.xsd.ui/build.properties b/bundles/org.eclipse.wst.xsd.ui/build.properties
deleted file mode 100644
index cc91274..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-source.. = src-search/,\
-           src-refactor/,\
-           src-adt/,\
-           src-adt-xsd/,\
-           src-adt-xsd-typeviz/,\
-           src-common/
-bin.includes = .,\
-               plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               META-INF/,\
-               about.html
-src.includes = component.xml
-output.. = bin/
-javacSource=1.4
-javacTarget=1.4
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/component.xml b/bundles/org.eclipse.wst.xsd.ui/component.xml
deleted file mode 100644
index 294443a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/component.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model"
-	name="org.eclipse.wst.xsd">
-	<component-depends unrestricted="true"></component-depends>
-	<plugin	id="org.eclipse.wst.xsd.ui" fragment="false" />
-	<plugin	id="org.eclipse.wst.xsd.core" fragment="false" />
-</component>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/XSDFile.gif b/bundles/org.eclipse.wst.xsd.ui/icons/XSDFile.gif
deleted file mode 100644
index 3900f1b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/XSDFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/blank.gif b/bundles/org.eclipse.wst.xsd.ui/icons/blank.gif
deleted file mode 100644
index 1936e21..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/blank.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/browsebutton.gif b/bundles/org.eclipse.wst.xsd.ui/icons/browsebutton.gif
deleted file mode 100644
index 13dae59..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/browsebutton.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/collapse_attr.gif b/bundles/org.eclipse.wst.xsd.ui/icons/collapse_attr.gif
deleted file mode 100644
index b872bee..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/collapse_attr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/ctool16/NewXSD.gif b/bundles/org.eclipse.wst.xsd.ui/icons/ctool16/NewXSD.gif
deleted file mode 100644
index b6efdd3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/ctool16/NewXSD.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/delete_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/delete_obj.gif
deleted file mode 100644
index b6922ac..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/delete_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/dlcl16/schemaview_co.gif b/bundles/org.eclipse.wst.xsd.ui/icons/dlcl16/schemaview_co.gif
deleted file mode 100644
index 5b67950..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/dlcl16/schemaview_co.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/dlcl16/showproperties_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/dlcl16/showproperties_obj.gif
deleted file mode 100644
index d94ff10..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/dlcl16/showproperties_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/capturescreen.gif b/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/capturescreen.gif
deleted file mode 100644
index 3570c90..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/capturescreen.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/help_contents.gif b/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/help_contents.gif
deleted file mode 100644
index 74bf617..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/help_contents.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/showproperties_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/showproperties_obj.gif
deleted file mode 100644
index d94ff10..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/dtool16/showproperties_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/elcl16/schemaview_co.gif b/bundles/org.eclipse.wst.xsd.ui/icons/elcl16/schemaview_co.gif
deleted file mode 100644
index f2d7f1b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/elcl16/schemaview_co.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/elcl16/showproperties_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/elcl16/showproperties_obj.gif
deleted file mode 100644
index 1dc19a3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/elcl16/showproperties_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/capturescreen.gif b/bundles/org.eclipse.wst.xsd.ui/icons/etool16/capturescreen.gif
deleted file mode 100644
index 176830a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/capturescreen.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/help_contents.gif b/bundles/org.eclipse.wst.xsd.ui/icons/etool16/help_contents.gif
deleted file mode 100644
index 9d70301..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/help_contents.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/showproperties_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/etool16/showproperties_obj.gif
deleted file mode 100644
index 1dc19a3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/showproperties_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/zoomminus.gif b/bundles/org.eclipse.wst.xsd.ui/icons/etool16/zoomminus.gif
deleted file mode 100644
index dd2c92f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/zoomminus.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/zoomplus.gif b/bundles/org.eclipse.wst.xsd.ui/icons/etool16/zoomplus.gif
deleted file mode 100644
index 466d756..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/etool16/zoomplus.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/expand_attr.gif b/bundles/org.eclipse.wst.xsd.ui/icons/expand_attr.gif
deleted file mode 100644
index 5c287e9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/expand_attr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/filter.gif b/bundles/org.eclipse.wst.xsd.ui/icons/filter.gif
deleted file mode 100644
index 6fe6f0e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/filter.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAnyAttributedis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAnyAttributedis.gif
deleted file mode 100644
index 2440a24..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAnyAttributedis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAnydis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAnydis.gif
deleted file mode 100644
index 44da751..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAnydis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroup.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroup.gif
deleted file mode 100644
index 5a8df73..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroup.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupRef.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupRef.gif
deleted file mode 100644
index b2c1db9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupRefdis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupRefdis.gif
deleted file mode 100644
index 79dc58f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupRefdis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupdis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupdis.gif
deleted file mode 100644
index 1e81677..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeGroupdis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeRefdis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeRefdis.gif
deleted file mode 100644
index f80af50..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributeRefdis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributedis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributedis.gif
deleted file mode 100644
index 121d192..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDAttributedis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexContent.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexContent.gif
deleted file mode 100644
index b90c12e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexContent.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexType.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexType.gif
deleted file mode 100644
index 878b94f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexType.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexTypedis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexTypedis.gif
deleted file mode 100644
index 36d1b3e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDComplexTypedis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDElementRefdis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDElementRefdis.gif
deleted file mode 100644
index 40bd3aa..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDElementRefdis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDElementdis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDElementdis.gif
deleted file mode 100644
index 7b56868..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDElementdis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroup.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroup.gif
deleted file mode 100644
index 462c2d4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroup.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupRef.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupRef.gif
deleted file mode 100644
index 068987b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupRefdis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupRefdis.gif
deleted file mode 100644
index e217e9b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupRefdis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupdis.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupdis.gif
deleted file mode 100644
index 98df7f4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDGroupdis.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDSimpleContent.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDSimpleContent.gif
deleted file mode 100644
index 2ae812c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/XSDSimpleContent.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/all_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/all_obj.gif
deleted file mode 100644
index da37fba..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/all_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/alldis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/alldis_obj.gif
deleted file mode 100644
index 6f5484c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/alldis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/annotationsheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/annotationsheader.gif
deleted file mode 100644
index 9bfb682..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/annotationsheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/attributegroupsheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/attributegroupsheader.gif
deleted file mode 100644
index 78092ff..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/attributegroupsheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/attributesheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/attributesheader.gif
deleted file mode 100644
index 9254879..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/attributesheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/choice_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/choice_obj.gif
deleted file mode 100644
index 8af583f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/choice_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/choicedis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/choicedis_obj.gif
deleted file mode 100644
index 7ecc4ff..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/choicedis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/directivesheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/directivesheader.gif
deleted file mode 100644
index 6000cb8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/directivesheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/elementsheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/elementsheader.gif
deleted file mode 100644
index 26f7206..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/elementsheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/error_marker.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/error_marker.gif
deleted file mode 100644
index 61e1e25..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/error_marker.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/error_tsk.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/error_tsk.gif
deleted file mode 100644
index 9b048d6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/error_tsk.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/extnsn_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/extnsn_obj.gif
deleted file mode 100644
index c24a95f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/extnsn_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/extnsndis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/extnsndis_obj.gif
deleted file mode 100644
index 843cd0e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/extnsndis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/groupsheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/groupsheader.gif
deleted file mode 100644
index 7ca11cd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/groupsheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/index.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/index.gif
deleted file mode 100644
index 5bf9ac0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/index.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/notationsheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/notationsheader.gif
deleted file mode 100644
index e05c645..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/notationsheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/sequence_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/sequence_obj.gif
deleted file mode 100644
index 16b8612..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/sequence_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/sequencedis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/sequencedis_obj.gif
deleted file mode 100644
index fd972de..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/sequencedis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/simpletype_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/simpletype_obj.gif
deleted file mode 100644
index 2e74430..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/simpletype_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/simpletypedis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/simpletypedis_obj.gif
deleted file mode 100644
index 320973e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/simpletypedis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_list_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_list_obj.gif
deleted file mode 100644
index 0b518c6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_list_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_listdis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_listdis_obj.gif
deleted file mode 100644
index b83825c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_listdis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_restrict_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_restrict_obj.gif
deleted file mode 100644
index d6a9afd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_restrict_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_restrictdis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_restrictdis_obj.gif
deleted file mode 100644
index 2b67663..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_restrictdis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_union_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_union_obj.gif
deleted file mode 100644
index 6613149..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_union_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_uniondis_obj.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_uniondis_obj.gif
deleted file mode 100644
index 717203b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/smpl_uniondis_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/typesheader.gif b/bundles/org.eclipse.wst.xsd.ui/icons/obj16/typesheader.gif
deleted file mode 100644
index 3267542..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/obj16/typesheader.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/attributeoverlay.gif b/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/attributeoverlay.gif
deleted file mode 100644
index 1931f92..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/attributeoverlay.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/error_ovr.gif b/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/error_ovr.gif
deleted file mode 100644
index 119dccc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/error_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/extnsn_ovr.gif b/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/extnsn_ovr.gif
deleted file mode 100644
index f34420b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/extnsn_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/extnsndis_ovr.gif b/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/extnsndis_ovr.gif
deleted file mode 100644
index 94eb768..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/extnsndis_ovr.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/textoverlay.gif b/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/textoverlay.gif
deleted file mode 100644
index d455c2b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/icons/ovr16/textoverlay.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.properties b/bundles/org.eclipse.wst.xsd.ui/plugin.properties
deleted file mode 100644
index 9d5fdaf..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.properties
+++ /dev/null
@@ -1,844 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-! Properties file for component: XMSCH - XML Tools -  XML Schema Editor
-! Packaged for translation in:  xml.zip
-
-!
-! Plugin
-!
-_UI_PLUGIN_NAME             = XML Schema Editor
-_UI_EDITOR_NAME             = XML Schema Editor
-
-_UI_ACTION_EXT_GENERATE      = &Generate
-_UI_ACTION_EXT_GENERATE_DDL  = &DDL...
-_UI_ACTION_EXT_GENERATE_DTD  = D&TD...
-_UI_ACTION_EXT_GENERATE_JAVA = &Java Beans...
-
-_UI_ACTION_EXT_GENERATE_XSD = &Generate XML Schema
-_UI_WIZARD_NAME_NEW_XSD     = XML Schema
-
-_UI_XML_TOOLS_PREFERENCE_PAGE  = XML
-_UI_XML_SCHEMA_PREFERENCE      = XML Schema Files
-_UI_XML_SCHEMA_EDITOR_PREFERENCE = Editor
-_UI_XML_SCHEMA_VALIDATOR_PREFERENCE = Validation
-
-_UI_WIZARD_NEW_XSD             = XML Schema
-_UI_CREATE_A_NEW_SCHEMA        = Create a new XML schema file
-
-! New property tabs
-_UI_LABEL_GENERAL          = General
-_UI_LABEL_ATTRIBUTES       = Attributes
-_UI_LABEL_DOCUMENTATION    = Documentation
-_UI_LABEL_TYPE_CONSTRAINTS = Constraints
-_UI_LABEL_APPLICATION_INFO = Application Info
-_UI_LABEL_EXTENSIONS       = Extensions
-_UI_LABEL_FACETS           = Facets
-_UI_LABEL_ENUMERATIONS     = Enumerations
-_UI_LABEL_ADVANCED         = Advanced
-
-_UI_LABEL_READ_ONLY     = read-only
-_UI_LABEL_KIND          = Kind:
-_UI_LABEL_VARIETY       = Variety:
-
-_UI_LABEL_APP_INFO      = App Info
-
-!
-! Schema File Window
-!
-_UI_LABEL_FILE_NAME              = File name:
-_UI_LABEL_VERSION                = Version:
-_UI_TOOLTIP_VERSION              = Convenient attribute to store version number
-_UI_LABEL_LANGUAGE               = Language:
-_UI_TOOLTIP_LANGUAGE             = Represents natural language identifiers
-_UI_GROUP_NAMESPACE              = Namespace
-_UI_LABEL_SCHEMA_PREFIX          = Prefix:
-_UI_TOOLTIP_SCHEMA_PREFIX        = The prefix associated with the current namespace.
-_UI_LABEL_TARGET_NAME_SPACE      = Target namespace:
-_UI_TOOLTIP_TARGET_NAME_SPACE    = The namespace for this schema.
-_UI_BUTTON_APPLY                 = Apply
-_UI_LABEL_ATTRIBUTE_FORM_DEFAULT = Attribute form default:
-_UI_TOOLTIP_ATTRIBUTE_FORM       = Indicates if all attributes in a schema must be qualified or not in the instance document
-_UI_LABEL_ELEMENT_FORM_DEFAULT   = Element form default:
-_UI_TOOLTIP_ELEMENT_FORM_DEFAULT = Indicates if all elements in a schema must be qualified or not in the instance document
-_UI_LABEL_BLOCK_DEFAULT          = Block default:
-_UI_TOOLTIP_BLOCK_DEFAULT        = Control derivations for every type and element in the schema
-_UI_LABEL_FINAL_DEFAULT          = Final default:
-_UI_TOOLTIP_FINAL_DEFAULT        = Control derivations for every type and element in the schema
-_UI_ACTION_DELETE_INCLUDE        = Delete
-_UI_ACTION_DELETE_NODES          = Delete Nodes
-! Note to translators: The following is the acronym for Uniform Resource Indicator
-_UI_LABEL_URI                    = URI:
-
-
-_UI_LABEL_ADD              = Add...
-_UI_LABEL_EDIT             = Edit...
-_UI_LABEL_PATTERNS         = Patterns
-_ERROR_FILE_ALREADY_EXISTS = The file name already exists: {0}
-
-!
-! Any Section
-!
-! Note to translators - translate only the word and
-_UI_LABEL_NAMESPACE_AND_PROCESS_CONTENTS = namespace and processContents
-
-!
-! minOccurs and maxOccurs section
-!
-! Note to translators - translate only the word and
-_UI_LABEL_MINOCCURS_AND_MAXOCCURS = minOccurs and maxOccurs
-
-!
-! Value Information Section
-!
-_UI_LABEL_VALUE_INFORMATION   = Value Information
-
-!
-! Notation window
-!
-_UI_NOTATION_NAME                = Name:
-_UI_NOTATION_PUBLIC              = Public:
-_UI_NOTATION_SYSTEM              = System:
-_UI_TOOLTIP_PUBLIC               = An optional public identifier
-_UI_TOOLTIP_SYSTEM               = An optional URI reference
-
-!
-! Complex Type Window
-!
-_UI_NAME                         = Name:
-_UI_ABSTRACT                     = Abstract:
-_UI_MIXED                        = Mixed:
-_UI_BLOCK                        = Block:
-_UI_FINAL                        = Final:
-
-_UI_CT_TOOLTIP_MIXED             = Indicates if type may contain mixed content
-_UI_CT_TOOLTIP_ABSTRACT          = When a complex type is declared abstract, it cannot be used in an instance document
-_UI_CT_TOOLTIP_FINAL             = You can use this to prevent further derivations
-_UI_CT_TOOLTIP_BLOCK             = You can use this to block any derivations
-
-!
-! SimpleContent and ComplexContent Window
-! 
-_UI_LABEL_DERIVED_BY            = Derived by:
-_UI_TOOLTIP_DERIVED_BY          = Derive by extension to inherit from a base type content model and add to it. Derive by restriction to restrict the content model of an existing type.
-
-!
-! Element & Element Ref Window
-!
-_UI_ELEMENT_NAME                 = Name:
-_UI_CHECKBOX_NILLABLE            = Nillable
-_UI_CHECKBOX_ABSTRACT            = Abstract
-_UI_SUBSTITUTION                 = Substitution group:
-_UI_MINIMUM                      = Minimum:
-_UI_MAXIMUM                      = Maximum:
-_UI_REFERENCE_NAME               = Reference name:
-
-_UI_TOOLTIP_ELEMENT_MINIMUM      = A non-negative integer that specifies the minimum number of times an element can occur.
-_UI_TOOLTIP_ELEMENT_MAXIMUM      = A non-negative integer or unbounded if there is no upper limit on the number of times the element can occur.
-_UI_TOOLTIP_ELEMENT_ABSTRACT     = When an element is declared abstract, a member of its equivalent class must appear in the instance document,
-_UI_TOOLTIP_ELEMENT_NIL          = If selected, an attribute can be included in the instance document to indicate that the element has a nil value.
-_UI_TOOLTIP_ELEMENT_SUBSTITUTION = Select the element that can be substituted by this element
-_UI_TOOLTIP_ELEMENT_FORM         = Indicates if the element is qualifed in the instance document
-_UI_TOOLTIP_ELEMENT_VALUE        = Provides a default or fixed value for the element.
-
-
-!
-! Attribute Window
-!    _UI_COMBO_BOX strings are used in code generation. 
-!    Probably don't need to be translated
-!
-_UI_COMBO_BOX_REQUIRED           = required
-_UI_COMBO_BOX_OPTIONAL           = optional
-_UI_COMBO_BOX_PROHIBITED         = prohibited
-
-_UI_FIXED                        = Fixed
-_UI_DEFAULT                      = Default
-_UI_ATTRIBUTE_NAME               = Attribute name:
-_UI_USAGE                        = Usage:
-_UI_FORM                         = Form qualification:
-
-_UI_LABEL_OTHER_ATTRIBUTES       = Other Attributes
-
-_UI_TOOLTIP_ATTRIBUTE_USE        = Indicates if the attribute is required, optional, or prohibited
-_UI_TOOLTIP_ATTRIBUTE_VALUE      = Provides default or fixed value for the attribute. Default value only valid if Usage value is set to optional.
-
-_UI_PROCESS_CONTENTS             = Process contents:
-
-!
-! Annotation - Doc & AppInfo Window
-!
-_UI_COMMENT                      = Comment
-_UI_TOOLTIP_COMMENT              = Information useful to the user or application
-_UI_SOURCE                       = Source:
-_UI_TOOLTIP_SOURCE               = An optional URI reference to supplement the local information
-_UI_LANGUAGE                     = Language:
-_UI_TOOLTIP_LANGUAGE_ANNOTATION  = Indicate the language in which the annotation is expressed
-
-!
-! Group
-! 
-_UI_CONTENT_MODEL               = Content model
-_UI_SEQUENCE                    = Sequence
-_UI_CHOICE                      = Choice
-_UI_ALL                         = All
-
-
-!
-! Simple Type Related Facets  - appear as entries in a table - restriction on simple type
-!
-_UI_GROUP_FACETS                = Facets
-_UI_LENGTH                      = Length
-_UI_MINIMUM_LENGTH              = Minimum Length
-_UI_MAXIMUM_LENGTH              = Maximum Length
-_UI_MINIMUM_INCLUSIVE           = Minimum Inclusive
-_UI_MAXIMUM_INCLUSIVE           = Maximum Inclusive
-_UI_MINIMUM_EXCLUSIVE           = Minimum Exclusive
-_UI_MAXIMUM_EXCLUSIVE           = Maximum Exclusive
-_UI_TOTAL_DIGITS                = Total Digits
-_UI_FRACTION_DIGITS             = Fraction Digits
-_UI_WHITE_SPACE                 = White Space
-_UI_FACET_NAME                  = Name
-_UI_FACET_VALUE                 = Value
-_UI_FACET_FIXED                 = Fixed
-
-_UI_TOOLTIP_LENGTH              = The number of units of length. Must be a non-negative integer.
-_UI_TOOLTIP_MIN_LEN             = The minimum number of units of length. Must be a non-negative integer.
-_UI_TOOLTIP_MAX_LEN             = The maximum number of units of length. Must be a non-negative integer.
-_UI_TOOLTIP_MAX_INCLUSIVE       = The upper bound of the value space. The value is itself included.
-_UI_TOOLTIP_MAX_EXCLUSIVE       = The upper bound of the value space. The value is itself excluded.
-_UI_TOOLTIP_MIN_INCLUSIVE       = The lower bound of the value space. The value is itself included.
-_UI_TOOLTIP_MIN_EXCLUSIVE       = The lower bound of the value space. The value is itself excluded.
-_UI_TOOLTIP_TOTAL_DIGITS        = The maximum number of decimal digits. Must be a positive integer.
-_UI_TOOLTIP_FRACTION_DIGITS     = The maximum number of decimal digits in the fractional part. Must be a non-negative integer.
-_UI_TOOLTIP_WHITE_SPACE         = Indicates if white space should be preserved, replaced or collapsed. 
-
-_UI_TOOLTIP_PATTERN             = Constrains the value to match a specific pattern. The pattern must be a regular expression. 
-_UI_TOOLTIP_ENUM                = Constrains the value to a specified set of values. 
-
-!
-! Simple/Complex Type Selection 
-!
-_UI_LABEL_TYPE_INFORMATION          = Type information
-_UI_LABEL_BASE_TYPE                 = Base type
-_UI_LABEL_BASE_TYPE_WITH_COLON      = Base type:
-_UI_LABEL_SET_BASE_TYPE             = Set Base Type
-_UI_ACTION_SET_BASE_TYPE            = Set Base Type...
-_UI_RADIO_NONE                      = None
-_UI_RADIO_BUILT_IN_SIMPLE_TYPE      = Built-in simple type
-_UI_RADIO_USER_DEFINED_SIMPLE_TYPE  = User-defined simple type
-_UI_RADIO_USER_DEFINED_COMPLEX_TYPE = User-defined complex type
-_UI_LABEL_NEW_COMPLEX_TYPE          = New Complex Type
-_UI_LABEL_NEW_SIMPLE_TYPE           = New Simple Type
-_UI_LABEL_SET_TYPE				    = Set Type
-_UI_LABEL_SET_EXISTING_TYPE 		= Set Existing Type...
-_UI_NO_TYPE                         = **none**
-_UI_LABEL_COMPONENTS				= Components:
-_UI_LABEL_QUALIFIER					= Qualifier:
-
-_UI_LABEL_COMPONENT_NAME			   = Component Name:
-_UI_LABEL_MATCHING_COMPONENTS		   = Matching Components:
-_UI_LABEL_MATCHING_TYPES		   	   = Matching Types:
-_UI_LABEL_TYPE_NAME					   = Type Name:
-_UI_LABEL_SPECIFIED_FILE			   = Specified File
-_UI_LABEL_ENCLOSING_PROJECT			   = Enclosing Project
-_UI_LABEL_WORKSPACE					   = Workspace
-_UI_LABEL_CURRENT_RESOURCE			   = Current Resource
-_UI_LABEL_SEARCH_SCOPE				   = Search Scope
-_UI_LABEL_NARROW_SEARCH_SCOPE_RESOURCE = Use resource view to narrow search scope
-_UI_LABEL_AVAILABLE_TYPES			   = Available Types
-
-
-!
-! Combo-box value 
-! NOTE TO TRANSLATOR: Do not translate following line
-_UI_DEFAULT_ANONYMOUS               = **anonymous**
-
-!
-! Unique, Key and KeyRef window
-!
-_UI_REFERENCE_KEY                   = Reference key
-_UI_SELECTOR                        = Selector
-_UI_FIELDS                          = Fields
-
-_UI_TOOLTIP_SELECTOR_TEXT           = Specifies an XPath expression relative to instances of the current element
-_UI_TOOLTIP_FIELD_TEXT              = Specifies an XPath expression relative to each element selected by the selector
-
-_UI_ADD_BUTTON                      = Add>>
-_UI_REMOVE_BUTTON                   = <<Remove
-
-!
-! Include & Imports
-!
-_UI_LABEL_PREFIX                = Prefix:
-_UI_LABEL_NAMESPACE             = Namespace:
-
-_UI_SCHEMA_INCLUDE_DESC         = Select a schema file so that the definitions in the schema file will be available in the current schema. The target namespace of the included schema must be the same as the target namespace of the current schema.
-_UI_LABEL_SCHEMA_IMPORT_DESC    = Select a schema file from a different namespace so that its definitions can be referenced by the current schema. You must associate a prefix with the new namespace for use in the current schema.
-
-_UI_LABEL_SCHEMA_LOCATION        = Schema location:
-_UI_BUTTON_SELECT                = Select
-_UI_FILEDIALOG_SELECT_XML_SCHEMA = Select XML schema file
-_UI_FILEDIALOG_SELECT_XML_DESC   = Select an XML schema file from the Workbench projects
-_UI_FILEDIALOG_SELECT_XML_URL    = Select an XML schema file from HTTP
-
-_UI_LABEL_LOADING_XML_SCHEMA     = Loading XML Schema
-_UI_LABEL_FINISH_LOADING         = Finish Loading
-_UI_LABEL_NO_LOCATION_SPECIFIED  = No Location Specified
-
-!
-! XSD Editor
-!
-_UI_TAB_SOURCE                  = Source
-_UI_TAB_DESIGN                  = Design
-!  Note to translators: Graph is the graphic view of the XML schema
-_UI_TAB_GRAPH                   = Graph
-_UI_MENU_UNDO                   = &Undo @Ctrl+Z
-_UI_MENU_REDO                   = &Redo @Ctrl+Y
-
-!
-! Task List Related Message
-!
-_UI_REF_FILE_ERROR_DESCRIPTION      = The errors below were detected when validating the file "{0}" via the file "{1}".  In most cases these errors can be detected by validating "{2}" directly.  However it is possible that errors will only occur when {2} is validated in the context of {3}.
-_UI_REF_FILE_ERROR_PUSH_HELP        = Push the help button below to read more.
-_UI_REF_FILE_ERROR_MESSAGE          = Referenced file contains errors ({0}).  For more information, right click on the message and select "Show Details..."
-_UI_REF_FILE_SHOW_DETAILS           = Show Details...
-
-
-!
-! XSDEditor Menu bar contributor
-!
-_UI_MENU_GENERATE_JAVA              = Generate &Java Beans...
-_UI_MENU_GENERATE_DTD               = Generate &DTD...
-_UI_MENU_GENERATE_SAMPLE_XML        = Generate XM&L...
-_UI_MENU_XSD_EDITOR                 = &XSD
-_UI_MENU_VALIDATE_XML               = &Validate XML Schema
-_UI_MENU_VALIDATE_XML_TOOLTIP       = Validate the current state of the XML Schema
-_UI_MENU_GENERATE_JAVA_TOOLTIP      = Generate Java beans for the XML Schema
-_UI_MENU_GENERATE_DTD_TOOLTIP       = Generate a DTD from the XML Schema
-_UI_MENU_GENERATE_SAMPLE_XML_TOOLTIP = Generate an XML from the XML Schema
-_UI_MENU_RELOAD_DEPENDENCIES_TOOLTIP = Reload Dependencies
-_UI_MENU_RELOAD_DEPENDENCIES = &Reload Dependencies
-
-!
-! Preference Page
-!
-_UI_TEXT_INDENT_LABEL                 = Indentation
-_UI_TEXT_INDENT_SPACES_LABEL          = &Number of spaces: 
-_UI_TEXT_XSD_NAMESPACE_PREFIX         = XML schema language
-_UI_TEXT_XSD_DEFAULT_PREFIX           = XML schema language constructs &prefix:
-_UI_QUALIFY_XSD                       = &Qualify XML schema language constructs
-_UI_SEPARATE_DESIGN_AND_SOURCE_VIEW   = Separate Source, Design and Graph view
-_UI_COMBINED_DESIGN_AND_SOURCE_VIEW   = Combined Source or Graph view with Design view 
-_UI_LABEL_EDITOR_LAYOUT               = Editor Layout
-_UI_PREF_DESIGN_VIEW_LAYOUT           = Design View Location
-_UI_PREF_DESIGN_BOTTOM                = Below
-_UI_PREF_DESIGN_RIGHT                 = Right
-_UI_TEXT_XSD_DEFAULT_TARGET_NAMESPACE = Default Target Namespace:
-
-!
-! Content Outline View action
-! NOTE TO TRANSLATOR: Do not translate the word(s) following "Add" on each line in
-!   this section i.e. Annotation, Documentation, AppInfo  These words are XML Schema keywords.
-_UI_ACTION_DELETE                  = D&elete
-_UI_ACTION_ADD_ANNOTATION          = Add &Annotation
-_UI_ACTION_ADD_DOC                 = Add &Documentation
-_UI_ACTION_ADD_APP_INFO            = Add A&ppInfo
-_UI_ACTION_ADD_GLOBAL_ELEMENT      = Add Glob&al Element
-_UI_ACTION_ADD_KEY                 = Add &Key
-_UI_ACTION_ADD_KEY_REF             = Add Key Re&f
-_UI_ACTION_ADD_UNIQUE              = Add Uni&que
-_UI_ACTION_ADD_GROUP               = Add G&roup
-_UI_ADD_GROUP_REF                  = Add Gr&oup Ref
-_UI_ACTION_ADD_CONTENT_MODEL       = Add Content &Model
-_UI_ACTION_ADD_ELEMENT             = Add &Element
-_UI_ACTION_ADD_ELEMENT_REF         = Add E&lement Ref
-_UI_ACTION_ADD_SIMPLE_TYPE         = Add &Simple Type
-_UI_ACTION_ADD_PATTERN             = Add &Pattern
-_UI_ACTION_ADD_ENUM                = Add En&umeration
-_UI_ACTION_ADD_ENUMS               = Add Enu&merations...
-_UI_ACTION_ADD_COMPLEX_TYPE        = Add Complex &Type
-_UI_ACTION_ADD_COMPLEX_CONTENT     = Add Comple&x Content
-_UI_ACTION_ADD_SIMPLE_CONTENT      = Add Simple &Content
-_UI_ACTION_ADD_ATTRIBUTE           = Add Attri&bute
-_UI_ACTION_ADD_ATTRIBUTE_GROUP     = Add Attr&ibute Group
-_UI_ACTION_ADD_ATTRIBUTE_GROUP_REF = Add A&ttribute Group Ref
-_UI_ACTION_ADD_INCLUDE             = Add In&clude
-_UI_ACTION_ADD_IMPORT              = Add &Import
-_UI_ACTION_ADD_REDEFINE            = Add Re&define
-_UI_ACTION_ADD_NOTATION            = Add &Notation
-_UI_ACTION_ADD_ANY_ELEMENT         = Add An&y
-_UI_ACTION_ADD_ANY_ATTRIBUTE       = Add &Any Attribute
-_UI_ACTION_ADD_GLOBAL_ATTRIBUTE    = Add &Global Attribute
-_UI_ACTION_ADD_ATTRIBUTE_REFERENCE = Add Attrib&ute Ref
-_UI_ACTION_ADD_RESTRICTION         = Add Re&striction
-_UI_ACTION_ADD_UNION               = Add U&nion
-_UI_ACTION_ADD_LIST                = Add &List
-_UI_ACTION_DELETE_GROUP_SCOPE      = D&elete
-_UI_ACTION_ADD_CHOICE              = Add &Choice
-_UI_ACTION_ADD_SEQUENCE            = Add Se&quence
-_UI_ACTION_ADD_ALL                 = Add &All
-_UI_ACTION_ADD_EXTENSION           = Add E&xtension
-_UI_ACTION_ADD_SELECTOR            = Add &Selector
-_UI_ACTION_ADD_FIELD               = Add &Field
-! NOTE TO TRANSLATOR: Translate Add and Node
-_UI_ACTION_ADD_SCHEMA_NODE         = Add &Schema Node
-! NOTE TO TRANSLATOR: TRANSLATE Add and Local
-_UI_ACTION_ADD_LOCAL_SIMPLE_TYPE   = Add Local &Simple Type
-_UI_ACTION_ADD_LOCAL_COMPLEX_TYPE  = Add Local &Complex Type
-_UI_ACTION_BACK_TO_SCHEMA_VIEW     = Back To Schema
-_UI_HOVER_BACK_TO_SCHEMA_VIEW     = Back to schema
-
-_UI_ACTION_MAKE_ANONYMOUS_TYPE_GLOBAL = Make Anonymous Type Global
-_UI_ACTION_OPEN_SCHEMA                = Open Schema
-
-_UI_ACTION_INSERT_BEFORE           = Insert Before
-_UI_ACTION_INSERT_AFTER            = Insert After
-
-_UI_OUTLINE_SORT                   = Sort alphabetically
-_UI_OUTLINE_DO_NOT_SORT            = Do not sort alphabetically
-
-_UI_OUTLINE_SHOW_COMPLEX_TYPE      = Show Complex Types Only
-_UI_OUTLINE_SHOW_SIMPLE_TYPE       = Show Simple Types Only
-_UI_OUTLINE_SHOW_ATTRIBUTE_GROUP   = Show Attribute Groups Only
-_UI_OUTLINE_SHOW_GROUP             = Show Groups Only
-_UI_OUTLINE_SHOW_GLOBAL_ELEMENT    = Show Global Elements Only
-_UI_OUTLINE_SHOW_REFERENCES        = Show Reference Content
-_UI_OUTLINE_SHOW_INHERITED         = Show Inherited Content
-
-_UI_ACTION_SET_MULTIPLICITY		   = Set Multiplicity
-
-!
-! New XML Schema Wizard
-!
-_UI_WIZARD_CREATE_XSD_MODEL_TITLE    = Create XML Schema
-
-! NOTE TO TRANSLATOR: Do not translate following line
-_UI_CREATEXSD                        = createXSD
-_UI_NEW_XML_SCHEMA_TITLE             = New XML Schema
-_UI_CREATE_A_NEW_XML_SCHEMA_DESC     = Create a new XML schema.
-
-! NOTE TO TRANSLATOR: Do not translate following line
-_UI_NEW_XML_SCHEMA_FILENAME          = NewXMLSchema.xsd
-
-!
-! XSD From RDB Schema Wizard
-!
-_UI_WIZARD_CREATE_XSD_FROM_RDB_TITLE = Create XSD from RDB Table
-
-
-!
-! Regular Expression Wizard
-!
-_UI_REGEX_WIZARD_CREATE_BUTTON = Create Regular Expression...
-_UI_TOOLTIP_REGEX_WIZARD_BUTTON = Launch the Regular Expression Wizard
-_UI_REGEX_WIZARD_TITLE = Regular Expression Wizard
-_UI_REGEX_WIZARD_COMPOSITION_PAGE_TITLE = Compose Regular Expression
-_UI_REGEX_WIZARD_COMPOSITION_PAGE_DESCRIPTION = To add a token, specify its contents and occurrence, then click Add.
-_UI_REGEX_WIZARD_INVALID_REGEX_ERROR_PREFIX = The current regular expression is not valid.  Reason:  
-_UI_REGEX_WIZARD_INVALID_TOKEN_ERROR_PREFIX = The current token is not valid.  Reason:  
-_UI_REGEX_WIZARD_INVALID_REGEX_ERROR = The current regular expression is not valid.
-_UI_REGEX_WIZARD_INVALID_TOKEN_ERROR = The current token is not valid.
-_UI_REGEX_WIZARD_INVALID_MIN_ERROR_SUFFIX = Invalid minimum range value.  The value must be a positive integer less than the maximum value.
-_UI_REGEX_WIZARD_MISSING_MIN_ERROR_SUFFIX = Invalid minimum range value.  A minimum range must be specified if a maximum range is specified.
-_UI_REGEX_WIZARD_INVALID_MAX_ERROR_SUFFIX = Invalid maximum range value.  The value must be a positive integer greater than the minimum value.
-_UI_REGEX_WIZARD_INVALID_REPEAT_ERROR_SUFFIX = Invalid repeat value.  The value must be a positive integer.
-_UI_REGEX_WIZARD_INVALID_SELECTION_ERROR = Nothing is currently selected.  Either make a selection or choose a different token. 
-_UI_REGEX_WIZARD_TOKEN_LABEL = Token contents:
-_UI_REGEX_WIZARD_AUTO_ESCAPE_CHECKBOX_LABEL = Auto escape
-_UI_REGEX_WIZARD_OCCURENCE_LABEL = Occurrence
-! Instructions for translators: The following label is used in a phrase to identify a range of values.
-! For example:  5 to 10.
-! The values are text fields that are initially blank so the user has to enter in values
-! For example:   _______ to ________
-_UI_REGEX_WIZARD_TO_LABEL = to
-_UI_REGEX_WIZARD_ADD_BUTTON_LABEL = Add 
-_UI_REGEX_WIZARD_CURRENT_REGEX_LABEL = Current regular expression:
-_UI_TOOLTIP_REGEX_WIZARD_TERMS = Content of new token
-_UI_TOOLTIP_REGEX_WIZARD_AUTO_ESCAPE_CHECKBOX = Insert escape characters to match metacharacter literals (e.g. converts \"*\" to \"\\*\")
-_UI_TOOLTIP_REGEX_WIZARD_ADD_BUTTON = Add this token to the regular expression
-_UI_TOOLTIP_REGEX_WIZARD_CURRENT_REGEX = The current regular expression
-_UI_TOOLTIP_REGEX_WIZARD_REPEAT = The number of times that the token must occur.
-_UI_TOOLTIP_REGEX_WIZARD_MIN = The minimum number of times that the token can occur.
-_UI_TOOLTIP_REGEX_WIZARD_MAX = The maximum number of times that the token can occur.
-_UI_TOOLTIP_REGEX_WIZARD_CARET_LABEL = The location where the new token will be inserted.
-_UI_REGEX_WIZARD_TESTING_PAGE_TITLE = Test Regular Expression
-_UI_REGEX_WIZARD_TESTING_PAGE_DESCRIPTION = To test the regular expression, enter sample text that you wish to match.  The success of the match will be indicated above.
-_UI_REGEX_WIZARD_REGEX_LABEL = Regular expression: 
-_UI_REGEX_WIZARD_SAMPLE_TEXT =  Sample text: 
-_UI_REGEX_WIZARD_MATCHES = The text matches the regular expression.
-_UI_REGEX_WIZARD_DOES_NOT_MATCH = The text does not match the regular expression.
-_UI_REGEX_WIZARD_TERM_ANY_CHAR = Any character
-_UI_REGEX_WIZARD_TERM_ALPHANUMERIC_CHAR = Alphanumeric character
-_UI_REGEX_WIZARD_TERM_WHITESPACE = Whitespace
-_UI_REGEX_WIZARD_TERM_DIGIT = Digit
-_UI_REGEX_WIZARD_TERM_UPPER = Upper case
-_UI_REGEX_WIZARD_TERM_LOWER = Lower case
-_UI_REGEX_WIZARD_TERM_SELECTION = Current selection
-_UI_REGEX_WIZARD_QUANTIFIER_SINGLE = Just once
-_UI_REGEX_WIZARD_QUANTIFIER_STAR = Zero or more
-_UI_REGEX_WIZARD_QUANTIFIER_PLUS = One or more
-_UI_REGEX_WIZARD_QUANTIFIER_OPTIONAL = Optional
-_UI_REGEX_WIZARD_QUANTIFIER_REPEAT = Repeat
-_UI_REGEX_WIZARD_QUANTIFIER_RANGE = Range
-
-!
-! Select Include File Wizard
-_UI_LABEL_INCLUDE_URL_FILE    = Select schema from:
-_UI_RADIO_URL                 = HTTP
-_UI_RADIO_FILE                = Workbench projects
-_UI_WIZARD_INCLUDE_FILE_TITLE = Include Another Schema
-_UI_WIZARD_INCLUDE_FILE_DESC  = Select another schema from workbench projects or from HTTP.
-_UI_LABEL_URL                 = URL:
-_UI_URL_START_WITH            = The URL must start with http://
-_UI_SPECIFY_URL               = Please specify a URL
-
-!
-! Enumerations Dialog
-_UI_ENUMERATIONS_DIALOG_TITLE = Add Enumerations
-_UI_LABEL_DELIMITER_CHAR      = &Delimiter characters:
-_UI_LABEL_PRESERVE_WHITESPACE = &Preserve leading and trailing whitespace
-
-_UI_ACTION_DELETE_ENUMERATION = Delete Enumeration
-
-!
-! Validate Schema 
-!
-_UI_DIALOG_XML_SCHEMA_INVALID_TITLE       = Validation Failed
-_UI_DIALOG_XML_SCHEMA_VALID_TITLE         = Validation Succeeded
-_UI_DIALOG_XML_SCHEMA_VALID_TEXT          = The XML schema file is valid.
-_UI_DIALOG_XML_SCHEMA_VALID_WITH_WARNINGS = The XML schema file is valid however warnings have been issued. See the Problems view for the warning messages.
-_UI_DIALOG_XML_SCHEMA_INVALID_TEXT        = The XML schema file is not valid. See the Problems view for the error messages.
-
-!
-! Combo-box choices 
-!
-! NOTE TO TRANSLATOR: Do not translate following 10 lines
-_UI_COMBO_QUALIFIED             = qualified
-_UI_COMBO_UNQUALIFIED           = unqualified
-_UI_COMBO_EXTENSION             = extension
-_UI_COMBO_RESTRICTION           = restriction
-_UI_COMBO_ALL                   = all
-_UI_COMBO_TRUE                  = true
-_UI_COMBO_FALSE                 = false
-_UI_COMBO_LAX                   = lax
-_UI_COMBO_SKIP                  = skip
-_UI_COMBO_STRICT                = strict
-
-! Generate DTD - pass as title and description for wizard page
-_UI_GENERATE_DTD_TITLE          = Generate DTD
-_UI_GENERATE_DTD_DESCRIPTION    = Generate a DTD from the selected XML schema file.
-
-! Generate DDL - pass as title and description for wizard page
-_UI_GENERATE_DDL_TITLE          = Generate DDL
-_UI_GENERATE_DDL_DESCRIPTION    = Generate DDL from the selected XML schema file.
-
-_UI_XML_SCHEMA_VALIDATOR            = XML Schema Validator
-
-! Generation from the Schema model - pre-condition check
-_UI_DIALOG_TITLE_GRAMMAR_ERROR      = Invalid Grammar
-_UI_DIALOG_INFO_SCHEMA_INVALID      = The schema file contains errors. Open it in the XML Schema editor and validate it for details.
-_UI_DIALOG_TITLE_NO_GLOBAL_ELEMENTS = No Global Elements
-_UI_DIALOG_INFO_NO_GLOBAL_ELEMENTS  = The selected schema has no global elements. Global elements are required to generate anything from an XML schema.
-
-! Section title for other attributes
-_UI_SECTION_ADVANCED_ATTRIBUTES   = Advanced
-
-! For undo action menus
-! Note to Translators: For the following "Change" phrases,
-! maxOccurs, minOccurs, lang, xpath are keywords so please
-! do no translate them.  These are for the undo action menus.
-! For example, if the user makes a change in the name of an
-! element, then the undo action would be Undo Element Name Change
-_UI_NAMESPACE_CHANGE           = Namespace Change
-_UI_PROCESSCONTENTS_CHANGE     = Process Contents Change
-_UI_MAXOCCURS_CHANGE           = maxOccurs Change
-_UI_MINOCCURS_CHANGE           = minOccurs Change
-_UI_SOURCE_ATTRIBUTE_CHANGE    = Source Change
-_UI_COMMENT_CHANGE             = Comment Change
-_UI_PREFIX_CHANGE              = Prefix Change
-_UI_ATTRIBUTEGROUP_REF_CHANGE  = Attribute Group Reference Change
-_UI_ATTRIBUTEGROUP_NAME_CHANGE = Attribute Group Name Change
-_UI_ATTRIBUTE_FIXED_CHANGE     = Attribute Fixed Change
-_UI_ATTRIBUTE_DEFAULT_CHANGE   = Attribute Default Change
-_UI_ATTRIBUTE_NAME_CHANGE      = Attribute Name Change
-_UI_ATTRIBUTE_VALUE_CHANGE     = Attribute Value Change
-_UI_ATTRIBUTE_USE_CHANGE       = Attribute Use Change
-_UI_ATTRIBUTE_FORM_CHANGE      = Attribute Form Change
-_UI_COMPLEXTYPE_NAME_CHANGE    = Complex Type Name Change
-_UI_COMPLEXTYPE_ABSTRACT_CHANGE = Complex Type Abstract Change
-_UI_COMPLEXTYPE_MIXED_CHANGE   = Complex Type Mixed Change
-_UI_COMPLEXTYPE_BLOCK_CHANGE   = Complex Type Block Change
-_UI_COMPLEXTYPE_FINAL_CHANGE   = Complex Type Final Change
-_UI_DOCUMENTATION_SOURCE_CHANGE = Documentation Source Change
-_UI_DOCUMENTATION_LANG_CHANGE   = Documentation lang Change
-_UI_DOCUMENTATION_COMMENT_CHANGE = Documentation Comment Change
-_UI_ELEMENT_NAME_CHANGE          = Element Name Change
-_UI_ELEMENT_VALUE_CHANGE         = Element Value Change
-_UI_ELEMENT_TYPE_CHANGE          = Element Type Change
-_UI_ENUM_VALUE_CHANGE            = Enum Value Change
-_UI_FIELD_XPATH_CHANGE           = Field xpath Change
-_UI_GROUP_REF_CHANGE             = Group Reference Change
-_UI_GROUP_SCOPE_CHANGE           = Content Model Change
-_UI_GROUP_NAME_CHANGE            = Group Name Change
-_UI_IMPORT_CHANGE                = Import Change
-_UI_KEY_NAME_CHANGE              = Key Name Change
-_UI_KEYREF_NAME_CHANGE           = Key Reference Name Change
-! Note to translators
-! For the following item, Refer is the keyref attribute to refer to some other key
-_UI_KEYREF_REFER_CHANGE          = Key Reference Refer Change
-_UI_NOTATION_NAME_CHANGE         = Notation Name Change
-_UI_NOTATION_PUBLIC_CHANGE       = Notation Public Change
-_UI_NOTATION_SYSTEM_CHANGE       = Notation System Change
-_UI_PATTERN_VALUE_CHANGE         = Pattern Value Change
-_UI_SCHEMA_VERSION_CHANGE        = Schema Version Change
-_UI_SCHEMA_LANG_CHANGE           = Schema lang Change
-_UI_SELECTOR_XPATH_CHANGE        = Selector xpath Change
-_UI_TYPE_CHANGE                  = Type Change
-_UI_DERIVEDBY_CHANGE             = Derivation Change
-_UI_FACET_CHANGE                 = Facet Change
-_UI_SIMPLETYPE_NAME_CHANGE       = SimpleType Name Change
-_UI_UNIQUE_NAME_CHANGE           = Unique Name Change
-_UI_SCHEMA_ATTRIBUTEFORMDEFAULT_CHANGE = Attribute Form Default Change
-_UI_SCHEMA_ELEMENTFORMDEFAULT_CHANGE = Element Form Default Change
-_UI_SCHEMA_BLOCKDEFAULT_CHANGE   = Block Default Change
-_UI_SCHEMA_FINALDEFAULT_CHANGE   = Final Default Change
-_UI_ELEMENT_SUBSTITUTIONGROUP_CHANGE = Substitution Group Change
-_UI_ELEMENT_FORM_CHANGE          = Form Change
-_UI_ELEMENT_BLOCK_CHANGE         = Block Change
-_UI_ELEMENT_FINAL_CHANGE         = Final Change
-_UI_ELEMENT_ABSTRACT_CHANGE      = Abstract Change
-_UI_ELEMENT_NILLABLE_CHANGE      = Nillable Change
-_UI_TARGETNAMESPACE_CHANGE       = Target Namespace Change
-
-! Window Headings for Flat View
-_UI_PAGE_HEADING_ANYATTRIBUTE = Any Attribute
-_UI_PAGE_HEADING_ANYELEMENT   = Any Element
-_UI_PAGE_HEADING_APPINFO            = AppInfo
-_UI_PAGE_HEADING_ATTRIBUTEGROUP_REF = Attribute Group Reference
-_UI_PAGE_HEADING_ATTRIBUTEGROUP     = Attribute Group
-_UI_PAGE_HEADING_ATTRIBUTE_REF      = Attribute Reference
-_UI_PAGE_HEADING_ATTRIBUTE          = Attribute
-_UI_PAGE_HEADING_COMPLEXTYPE        = Complex Type
-_UI_PAGE_HEADING_DOCUMENTATION      = Documentation
-_UI_PAGE_HEADING_ELEMENT     = Element
-_UI_PAGE_HEADING_ELEMENT_REF = Element Reference
-_UI_PAGE_HEADING_ENUM        = Enumeration
-_UI_PAGE_HEADING_FIELD       = Field
-_UI_PAGE_HEADING_GROUP_REF   = Group Reference
-_UI_PAGE_HEADING_CONTENTMODEL  = Content Model
-_UI_PAGE_HEADING_GROUP         = Group
-_UI_PAGE_HEADING_IMPORT        = Import
-_UI_PAGE_HEADING_INCLUDE       = Include
-_UI_PAGE_HEADING_KEYREF        = Key Reference
-_UI_PAGE_HEADING_KEY           = Key
-_UI_PAGE_HEADING_NOTATION      = Notation
-_UI_PAGE_HEADING_PATTERN       = Pattern
-_UI_PAGE_HEADING_REDEFINE      = Redefine
-_UI_PAGE_HEADING_SCHEMA        = Schema
-_UI_PAGE_HEADING_SELECTOR      = Selector
-_UI_PAGE_HEADING_LIST          = List
-_UI_PAGE_HEADING_UNION         = Union
-_UI_PAGE_HEADING_SIMPLECONTENT = Simple Content
-_UI_PAGE_HEADING_COMPLEXCONTENT = Complex Content
-_UI_PAGE_HEADING_RESTRICTION   = Restriction
-_UI_PAGE_HEADING_EXTENSION     = Extension
-_UI_PAGE_HEADING_SIMPLETYPE    = Simple Type
-_UI_PAGE_HEADING_UNIQUE        = Unique
-_UI_PAGE_HEADING_REFERENCE     = reference
-
-!
-! Graph page
-!
-_UI_GRAPH_SIMPLE_TYPES         = Simple Types
-_UI_GRAPH_COMPLEX_TYPES        = Complex Types
-_UI_GRAPH_GROUPS               = Groups
-_UI_GRAPH_GLOBAL_ATTRIBUTES    = Global Attributes
-_UI_GRAPH_GLOBAL_ELEMENTS      = Global Elements
-_UI_GRAPH_XSDSCHEMA            = Schema
-_UI_GRAPH_XSDSCHEMA_NO_NAMESPACE = (no target namespace specified)
-_UI_GRAPH_XSDCOMPLEXTYPEDEFINITION = XSD Complex Type Definition:
-_UI_GRAPH_XSDMODELGROUP        = XSD Model Group
-_UI_GRAPH_XSDPARTICLE          = XSD Particle
-_UI_GRAPH_VIEW_NOT_AVAILABLE   = View is not available for selected object.
-_UI_GRAPH_UNKNOWN_OBJECT       = Unknown object
-
-! Additional Categories
-_UI_GRAPH_TYPES                = Types
-_UI_GRAPH_ELEMENTS             = Elements
-_UI_GRAPH_ATTRIBUTES           = Attributes
-_UI_GRAPH_ATTRIBUTE_GROUPS     = Attribute Groups
-_UI_GRAPH_NOTATIONS            = Notations
-_UI_GRAPH_IDENTITY_CONSTRAINTS = Identity Constraints
-_UI_GRAPH_ANNOTATIONS          = Annotations
-_UI_GRAPH_DIRECTIVES           = Directives
-
-! For Union MemberTypes Dialog
-_UI_LABEL_SELECT_MEMBERTYPES   = Select from the available types and add to the memberTypes list
-_UI_LABEL_MEMBERTYPES_CHANGE   = Member Types Change
-_UI_LABEL_MEMBERTYPES_VALUE    = Member Types Value:
-_UI_LABEL_MEMBERTYPES          = Member types:
-
-_UI_LABEL_VARIETY_CHANGE       = Variety Change
-
-_UI_LABEL_FIXEDORDEFAULT_VALUE = Fixed/Default Value
-
-_UI_LABEL_ITEM_TYPE_CHANGE     = Item Type Change
-
-_UI_LABEL_INCLUDE_CHANGE       = Include Change
-
-_UI_LABEL_ITEM_TYPE            = Item type:
-_UI_LABEL_TYPE                 = Type
-_UI_LABEL_MODEL_GROUP          = Model Group
-
-_UI_LABEL_ABSENT               = absent
-
-_UI_WARNING_RESET_ATTRGRP_REF  = Reset attribute group reference <{0}>
-_UI_WARNING_REMOVE_ATTRGRP_REF = Remove attribute group reference <{0}>
-_UI_WARNING_RESET_ATTR_REF     = Reset attribute reference <{0}>
-_UI_WARNING_REMOVE_ATTR_REF    = Remove attribute reference <{0}>
-
-!======================================================================================
-!
-! Here is the list of Error string that have message IDs - make sure they are unique
-
-!
-!======================================================================================
-! These three errors appear in the select include wizard
-! The name of the file will be substituted in
-_UI_DIFFERENT_NAME_SPACE  = {0} is in a different namespace 
-_UI_SAME_NAME_SPACE       = {0} is in the same namespace
-_UI_INCORRECT_XML_SCHEMA  = {0} is an invalid XML schema file
-
-_ERROR_SCHEMA_NOT_EXIST         = Does not exist.
-_ERROR_LABEL_INVALID_PREFIX     = Invalid prefix. A prefix must not be empty or contain any space.
-
-! The name of the file will be substituted in
-_ERROR_SCHEMA_NAME_THE_SAME  = {0} is the current schema. A schema cannot include itself. Reset to the last valid schema.
-
-_ERROR_XSD_GENERATION                = Error generating XML schema
-_ERROR_NO_CONTAINER                  = No folder selected
-_ERROR_NO_FILE_NAME                  = No file name provided
-_ERROR_FILENAME_MUST_END_XSD         = The file name must end in .xsd
-
-
-!
-! For schema that has too many errors, an extended message. 
-!
-_ERROR_DIALOG_XML_SCHEMA_INVALID_TEXT  = The XML schema file is not valid.  
-_ERROR_MORE_ERRORS                    = There are more errors in the schema than are displayed in the Tasks view.  Correct the first {0} errors and re-validate the schema file.
-
-! DDL Generation Failed Dialog
-_UI_DIALOG_DDL_GEN_FAILED_TITLE     = DDL Generation Failed
-_ERROR_DIALOG_DDL_NOT_GENEREATED    = DDL has not been generated
-_UI_DIALOG_DDL_GEN_FAILED_REASON    = The selected schema has no global elements
-_UI_DIALOG_DDL_GEN_FAILED_REASON2   = None of the global elements in the schema have a complex type or they reference complex types that cannot be found.
-
-_EXC_OPEN_XSD = Cannot open XML Schema editor
-
-_ERROR_LABEL_PREFIX_EXISTS     = Prefix already exists
-
-_ERROR_REMOVE_LOCAL_SIMPLETYPE  = Remove local simple type from extension
-
-_WARN_INVALID_TARGET_NAMESPACE = The target namespace is not well-formed
-
-_ERROR_TARGET_NAMESPACE_AND_PREFIX = A target namespace must be associated with a prefix
-
-
-_UI_CONTAINMENT = Containment
-_UI_INHERITANCE = Inheritance
-_UI_SUBSTITUTION_GROUPS = Substitution Groups
-_UI_ANONYMOUS = **anonymous**
-_UI_VALUE = Value
-_UI_ANY_ELEMENT = Any Element
-_UI_SORT = Sort
-
-_UI_ACTION_EDIT_NAMESPACES = Edit Namespaces...
-
-
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-!======================================================================================
-!
-! Used by org.eclipse.wst.common.ui.internal.viewers.SelectSingleFileView
-!
-!======================================================================================
-_UI_LABEL_SOURCE_FILES   = Workbench Files
-_UI_LABEL_SELECTED_FILES = Selected Files
-
-_UI_IMPORT_BUTTON          = Import Files...
-_UI_IMPORT_BUTTON_TOOL_TIP = Import files from file system
-
-
-!======================================================================================
-!
-! refactoring
-!
-!======================================================================================
-refactoringActionSet.label=Refactor
-refactoringActionSet.description=XSD Editor refactoring actions
-refactoring.menu.label=Refactor
-refactoring.renameAction.label=Re&name...
-context.text.editor.xsd.name=Editing XSD context
-command.xsd.refactor.rename.element.name=Rename XSD element
-command.xsd.refactor.rename.element.description=Rename XSD element
-command.xsd.refactor.makeElementGlobal.element.name=Make local element global
-command.xsd.refactor.makeElementGlobal.element.description=Promotes local element to global level and replaces its references
-command.xsd.refactor.makeTypeGlobal.element.name=Make anonymous type global
-command.xsd.refactor.makeTypeGlobal.element.description=Promotes anonymous type to global level and replaces its references
-command.xsd.refactor.renameTargetNamespace.name=Rename Target Namespace
-command.xsd.refactor.renameTargetNamespace.description=Changes the target namespace of the schema
-xsd.resource.rename.participant.name=Rename XSD Component
-ExtensionsSchemasDescription=This extension point is deprecated, use extensionCategories
-ExtensionCategoriesDescription=Extension point for contributing to the 'built in' categories of extension elements for XML Schema
-XSDEditorExtensionConfiguration=This extension point is deprecated, use internalEditorConfiguration
-InternalEditorConfiguration=Extension point for extending the XML Schema Editor
-
-! Copied from sse
-23concat_EXC_=Resource {0} does not exist.
-32concat_EXC_=Editor could not be open on {0}
-An_error_has_occurred_when1_ERROR_=An error has occurred when initializing the input for the the editor's source page.
-OpenFileFromSource.label=Op&en Selection
-OpenFileFromSource.tooltip=Open an editor on the selected link
-OpenFileFromSource.image=
-OpenFileFromSource.description=Open an editor on the selected link
-
-AddTask.label=Add &Task...
-AddTask.tooltip=Add Task...
-AddBookmark.label=Add Boo&kmark...
-AddBookmark.tooltip=Add Bookmark...
-SelectRuler.label=Select Ruler
-
-_ZERO_OR_MORE = Zero or More
-_ZERO_OR_ONE  = Zero or One
-_ONE_OR_MORE  = One or More
-
-# For translators, as in structured DOM tree
-_UI_LABEL_STRUCTURED           = Structured
-
-_UI_LABEL_MOVE   				       = Move
-_UI_LABEL_RENAME 				       = Rename
-_UI_LABEL_TARGETNAMESPACE_CHANGE       = Target Namespace Change
-_INFO_RESET_ATTRIBUTE_GROUP_REFERENCE  = Reset attribute group reference
-_INFO_REMOVE_ATTRIBUTE_GROUP_REFERENCE = Remove attribute group reference
-
-Bundle-Vendor.0 = Eclipse.org
-search.declarations.label = Declarations
-search.references.label = References
-
-! extension points 
-ExtensionNodeCustomizationsDescription = Extension Node Customizations
-XMLSchemaEditorModes = XML Schema Editor Modes
-##
-XSD_Source_target_name=XML Schema Source
-XSD_hyperlink=XML Schema Content
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/plugin.xml b/bundles/org.eclipse.wst.xsd.ui/plugin.xml
deleted file mode 100644
index 05d7ef2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/plugin.xml
+++ /dev/null
@@ -1,521 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-	<extension point="org.eclipse.ui.editors">
-		<editor
-			name="%_UI_EDITOR_NAME"
-			icon="icons/XSDFile.gif"
-            contributorClass="org.eclipse.wst.xsd.ui.internal.editor.XSDMultiPageEditorContributor"
-            class="org.eclipse.wst.xsd.ui.internal.editor.InternalXSDMultiPageEditor"
-            id="org.eclipse.wst.xsd.ui.internal.editor.InternalXSDMultiPageEditor">
-            <contentTypeBinding
-                contentTypeId="org.eclipse.wst.xsd.core.xsdsource" />
-		</editor>
-	</extension>
-
-	<extension point="org.eclipse.ui.editorActions">
-        <editorContribution
-            targetID="org.eclipse.wst.xsd.ui.internal.editor.InternalXSDMultiPageEditor"
-            id="org.eclipse.wst.xsd.core.xsdsource.ruler.actions">
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               actionID="RulerDoubleClick"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction"/>
-         <action
-               label="%SelectRuler.label"
-               class="org.eclipse.ui.texteditor.SelectRulerAction"
-               actionID="RulerClick"
-               id="org.eclipse.ui.texteditor.SelectRulerAction"/>
-        </editorContribution>
-	</extension>
-
-	<extension point="org.eclipse.ui.newWizards">
-		<wizard
-			id="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard"
-			name="%_UI_WIZARD_NEW_XSD"
-			class="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard"
-			category="org.eclipse.wst.XMLCategory"
-			icon="icons/ctool16/NewXSD.gif">
-			<description>%_UI_CREATE_A_NEW_SCHEMA</description>
-			<selection class="org.eclipse.core.resources.IResource" />
-		</wizard>
-	</extension>
-
-	<extension point="org.eclipse.ui.preferencePages">
-		<page
-			name="%_UI_XML_SCHEMA_PREFERENCE"
-			category="org.eclipse.wst.xml.ui.preferences.xml"
-			class="org.eclipse.wst.xsd.ui.internal.preferences.XSDPreferencePage"
-			id="org.eclipse.wst.xsd.ui.internal.preferences.XSDPreferencePage">
-		</page>
-    <page
-          category="org.eclipse.wst.xsd.ui.internal.preferences.XSDPreferencePage"
-          class="org.eclipse.wst.xsd.ui.internal.preferences.XSDEditorPreferencePage"
-          id="org.eclipse.wst.xsd.ui.internal.preferences.XSDEditorPreferencePage"
-          name="%_UI_XML_SCHEMA_EDITOR_PREFERENCE">
-    </page>
-    <page
-          category="org.eclipse.wst.xsd.ui.internal.preferences.XSDPreferencePage"
-          class="org.eclipse.wst.xsd.ui.internal.preferences.XSDValidatorPreferencePage"
-          id="org.eclipse.wst.xsd.ui.internal.preferences.XSDValidatorPreferencePage"
-          name="%_UI_XML_SCHEMA_VALIDATOR_PREFERENCE">
-    </page>
-	</extension>
-	<extension point="org.eclipse.wst.sse.ui.editorConfiguration">
-		<provisionalDefinition
-			type="preferencepages"
-			value="org.eclipse.wst.xsd.ui.internal.preferences.XSDPreferencePage"
-			target="org.eclipse.wst.xsd.core.xsdsource" />
-   		<sourceViewerConfiguration
-			class="org.eclipse.wst.xsd.ui.internal.editor.StructuredTextViewerConfigurationXSD"
-			target="org.eclipse.wst.xsd.core.xsdsource" />
-	</extension>
-
-	<!-- ==================================================== -->
-	<!-- Support help on the tags                             -->
-	<!-- ==================================================== -->
-	<!--   <extension
-		point="org.eclipse.wst.xml.core.internal.contentmodel.annotationFiles">
-		<annotationFile
-		location="/w3c/schemaForCodeAssist-annotations.xml"
-		publicId="http://www.w3.org/2001/XMLSchema">
-		</annotationFile>
-		</extension>
-	-->
-	
-	
-   <extension 
-   		point="org.eclipse.ui.views.properties.tabbed.propertyContributor">
-     <propertyContributor
-           contributorId="org.eclipse.wst.xsd.ui.internal.editor"
-           labelProvider="org.eclipse.wst.xsd.ui.internal.common.properties.providers.XSDSectionLabelProvider">
-         <propertyCategory category="General"/>
-   		 <propertyCategory category="Documentation"/>
-         <propertyCategory category="Advanced"/>
-     </propertyContributor>
-   </extension>
-
-   <extension 
-    	point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-      <propertyTabs 
-            contributorId="org.eclipse.wst.xsd.ui.internal.editor">
-			<propertyTab
-				label="%_UI_LABEL_GENERAL"
-				category="General"
-				id="property.tab.general">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_TYPE_CONSTRAINTS"
-				category="General"
-				afterTab="property.tab.general"
-				id="property.tab.typeconstraints">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_ENUMERATIONS"
-				category="General"
-				afterTab="property.tab.general"
-				id="property.tab.enumerations">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_ADVANCED"
-				category="Advanced"
-				afterTab="property.tab.general"
-				id="property.tab.advanced">
-			</propertyTab>			
-			<propertyTab
-				label="%_UI_LABEL_DOCUMENTATION"
-				category="Documentation"
-				afterTab="property.tab.general"
-				id="property.tab.documentation">
-			</propertyTab>
-			<propertyTab
-				label="%_UI_LABEL_EXTENSIONS"
-				category="Documentation"
-				afterTab="property.tab.general"
-				id="property.tab.extensions">
-			</propertyTab>
-    </propertyTabs>
- </extension>
-
-
-<extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-   <propertySections contributorId="org.eclipse.wst.xsd.ui.internal.editor">
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDSchemaSection"  
-	 	id="prop.section.XSDSchemaSection">
-	    <input type="org.eclipse.xsd.XSDSchema">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.advanced" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDSchemaAdvancedSection"  
-	 	id="prop.section.XSDSchemaSection">
-	    <input type="org.eclipse.xsd.XSDSchema">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.SchemaLocationSection" 
-	 	id="prop.section.SchemaLocationSection">
-	    <input type="org.eclipse.xsd.XSDSchemaCompositor">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDComplexTypeSection"  
-	 	id="prop.section.XSDComplexTypeSection">
-	    <input type="org.eclipse.xsd.XSDComplexTypeDefinition">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.advanced" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDComplexTypeAdvancedSection"  
-	 	id="prop.section.XSDComplexTypeAdvancedSection">
-	    <input type="org.eclipse.xsd.XSDComplexTypeDefinition">
-	    </input>
-	 </propertySection>		 
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDElementDeclarationSection"  
-	 	id="prop.section.XSDElementDeclarationSection">
-	    <input type="org.eclipse.xsd.XSDElementDeclaration">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.advanced" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDElementDeclarationAdvancedSection"  
-	 	id="prop.section.XSDElementDeclarationAdvancedSection">
-	    <input type="org.eclipse.xsd.XSDElementDeclaration">
-	    </input>   
-	 </propertySection> 
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDAttributeDeclarationSection"
-	 	id="prop.section.XSDAttributeDeclarationSection">
-	    <input type="org.eclipse.xsd.XSDAttributeDeclaration">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDAttributeGroupDefinitionSection"  
-	 	id="prop.section.XSDAttributeGroupDefinitionSection">
-	    <input type="org.eclipse.xsd.XSDAttributeGroupDefinition">
-	    </input>
-	 </propertySection>	
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDModelGroupSection"  
-	 	id="prop.section.XSDModelGroupSection">
-	    <input type="org.eclipse.xsd.XSDModelGroup">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDModelGroupDefinitionSection"  
-	 	id="prop.section.XSDModelGroupDefinitionSection">
-	    <input type="org.eclipse.xsd.XSDModelGroupDefinition">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDSimpleTypeSection"
-	 	id="prop.section.XSDSimpleTypeSection">
-	    <input type="org.eclipse.xsd.XSDSimpleTypeDefinition">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.advanced" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDSimpleTypeAdvancedSection"  
-	 	id="prop.section.XSDSimpleTypeAdvancedSection">
-	    <input type="org.eclipse.xsd.XSDSimpleTypeDefinition">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.typeconstraints" 
-        class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDFacetSection"
-        filter="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDFacetSectionFilter"
-	 	id="prop.section.XSDFacetSection">
-	    <input type="org.eclipse.xsd.XSDConcreteComponent">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.documentation" 
-	 	class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.AnnotationSection" 
-	 	id="prop.section.AnnotationSection">
-	    <input type="org.eclipse.xsd.XSDConcreteComponent">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.extensions" 
-	 	class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.ExtensionsSection" 
-	 	id="prop.section.ExtensionsSection">
-	    <input type="org.eclipse.xsd.XSDConcreteComponent">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-	 	class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDAnyElementContentsSection" 
-	 	id="prop.section.general">
-	    <input type="org.eclipse.xsd.XSDWildcard">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-	 	class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDImportSection" 
-	 	id="prop.section.general">
-	    <input type="org.eclipse.xsd.XSDImport">
-	    </input>
-	 </propertySection>
-	 <propertySection tab="property.tab.general" 
-	 	class="org.eclipse.wst.xsd.ui.internal.common.properties.sections.XSDEnumerationFacetSection" 
-	 	id="prop.section.general">
-	    <input type="org.eclipse.xsd.XSDEnumerationFacet">
-	    </input>
-	 </propertySection>	 
-  </propertySections>
-</extension>
-
-  <!-- this extension point is deprecated, use extensionCategories -->
-  <extension-point id="ExtensionsSchemasDescription" name="%ExtensionsSchemasDescription"/>  
-  <extension-point id="extensionCategories" name="%ExtensionCategoriesDescription"/>
-
-  <!-- this extension point is deprecated, use internalEditorConfiguration -->  
-  <extension-point id="XSDEditorExtensionConfiguration" name="%XSDEditorExtensionConfiguration"/>
-  <extension-point id="internalEditorConfiguration" name="%InternalEditorConfiguration"/>
-  
-  <extension-point id="extensibilityNodeCustomizations" name="%ExtensionNodeCustomizationsDescription"/>
-  <extension-point id="editorModes" name="%XMLSchemaEditorModes"/>
-
-	<!-- intialize xsd reconcile validator -->
-	<extension point="org.eclipse.wst.sse.ui.sourcevalidation">
-		<validator
-			scope="total"
-			class="org.eclipse.wst.xsd.ui.internal.validation.DelegatingSourceValidatorForXSD"
-			id="org.eclipse.wst.xsd.ui.internal.validation.DelegatingSourceValidatorForXSD">
-			<contentTypeIdentifier
-				id="org.eclipse.wst.xsd.core.xsdsource">
-				<partitionType id="org.eclipse.wst.xml.XML_DEFAULT">
-				</partitionType>
-			</contentTypeIdentifier>
-		</validator>
-	</extension>
-
-	<extension point="org.eclipse.ui.contexts">
-		<context
-			id="org.eclipse.wst.xsd.ui.text.editor.context"
-			name="%context.text.editor.xsd.name"
-			parentId="org.eclipse.ui.textEditorScope" />
-	</extension>
-
-	<!-- this extension point is used to augment the ModelQuery to provide schema specific guided editing -->
-	<extension point="org.eclipse.wst.xml.core.modelQueryExtensions">
-		<modelQueryExtension
-			class="org.eclipse.wst.xsd.ui.internal.text.XSDModelQueryExtension"
-			contentType="org.eclipse.wst.xsd.core.xsdsource">
-		</modelQueryExtension>
-	</extension>
-
-	<!-- ============================================================================== -->
-	<!-- Register the XSDSearchParticpant against for XMLComponentSearchPatterns 		-->
-	<!-- ============================================================================== -->	
-	 <extension   
-		point="org.eclipse.wst.common.core.searchParticipants">
-		<searchParticipant
-			id="org.eclipse.wst.xsd.search.XSDSearchParticipant"
-			class="org.eclipse.wst.xsd.ui.internal.search.XSDSearchParticipant">
-			<enablement>
-			   <or>
-			      <with variable="pattern">
-					<instanceof value="org.eclipse.wst.xml.core.internal.search.XMLComponentSearchPattern"/>			   
-				  </with>
-				</or>
-			</enablement>
-		</searchParticipant>
-	</extension>
-
-	<!-- ============================================================================== -->	 
-    <!-- Register a 'rename' participant this enables us to provide refactoring for     --> 
-    <!-- renamed XML Schema components (e.g. elements, types etc.)                      --> 
-	<!-- ============================================================================== -->	 
-	<extension
-		point="org.eclipse.ltk.core.refactoring.renameParticipants">
-		<renameParticipant
-			name="%xsd.resource.rename.participant.name"
-			class="org.eclipse.wst.xsd.ui.internal.refactor.rename.XSDComponentRenameParticipant"
-			id="org.eclipse.wst.xsd.refactoring.XSDComponentRenameParticipant">
-			<enablement>
-				<with variable="element">
-					<instanceof
-						value="org.eclipse.xsd.XSDNamedComponent">
-					</instanceof>
-				</with>
-			</enablement>
-		</renameParticipant>
-		
-	</extension>
-	
-	<!-- ============================================================================== -->	 
-    <!-- Register a 'rename' participant this enables us to provide refactoring for     --> 
-    <!-- renamed resources.                                                             --> 
-	<!-- ============================================================================== -->	 
-<!--
-    <extension
-		point="org.eclipse.ltk.core.refactoring.renameParticipants">
-		<renameParticipant
-			name="%xsd.resource.rename.participant.name"
-			class="org.eclipse.wst.xsd.ui.internal.refactor.rename.ResourceRenameParticipant"
-			id="org.eclipse.wst.xsd.refactoring.XSDResourceRenameParticipant">
-			<enablement>
-				<with variable="element">
-					<instanceof value="org.eclipse.core.resources.IResource"/>
-				</with>
-			</enablement>
-		</renameParticipant>
-	</extension>
-	-->
-	<!-- ============================================================================================== -->
-	<!-- Register the  'Refactor', 'References' and 'Declarations' items to the design view	            -->
-	<!-- ============================================================================================== -->	    
-   <extension point="org.eclipse.ui.popupMenus"> 
-      <objectContribution 
-         id="org.eclipse.wst.xsd.ui.refactoring.menu.objectContrib" 
-         objectClass="org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter">  
-         <!-- 
-         cs : declaration search isn't fully implemented yet, removing this menu action for now
-         <action
-            id="org.eclipse.wst.xsd.ui.search.declarations.action" 
-            enablesFor="1"
-            style="pulldown"
-            menubarPath="search-slot"
-            label="%search.declarations.label"
-            class="org.eclipse.wst.xsd.ui.internal.search.actions.XSDSearchDeclarationsGroupActionDelegate"> 
-         </action>          
-         -->
-         <action
-            id="org.eclipse.wst.xsd.ui.search.references.action" 
-            enablesFor="1"
-            style="pulldown"
-            menubarPath="search-slot"
-            label="%search.references.label"
-            class="org.eclipse.wst.xsd.ui.internal.search.actions.XSDSearchReferencesGroupActionDelegate"> 
-         </action>
-         <action
-            id="org.eclipse.wst.xsd.ui.refactoring.menu.refactorGroup.object" 
-            enablesFor="1"
-            style="pulldown"
-            menubarPath="refactoring-slot"
-            label="%refactoringActionSet.label" 
-            class="org.eclipse.wst.xsd.ui.internal.refactor.actions.XSDRefactorGroupActionDelegate"> 
-         </action>   
-      </objectContribution>         
-      <!-- here we add the 'refactor' menu item to the source view -->
-      <viewerContribution
-        id="org.eclipse.wst.xsd.ui.refactoring.menu.source"
-        targetID="org.eclipse.wst.xsd.core.xsdsource.source.EditorContext">
-	    <action id="org.eclipse.wst.xsd.ui.refactoring.menu.refactorGroup.source"
-       		style="pulldown"
-            menubarPath="additions"
-            label="%refactoring.menu.label" 
-            class="org.eclipse.wst.xsd.ui.internal.refactor.actions.XSDRefactorGroupActionDelegate"> 
-  	    </action>
-       </viewerContribution>
-		<viewerContribution
-			targetID="org.eclipse.wst.xsd.core.xsdsource.source.RulerContext"
-			id="org.eclipse.wst.xsd.ui.ruler.context.actions">
-			<action
-				label="%AddTask.label"
-				helpContextId="org.eclipse.ui.AddTask_action_context"
-				class="org.eclipse.ui.texteditor.TaskRulerAction"
-				tooltip="%AddTask.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.TaskRulerAction">
-			</action>
-			<action
-				label="%AddBookmark.label"
-				helpContextId="org.eclipse.ui.bookmark_action_context"
-				class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-				tooltip="%AddBookmark.tooltip"
-				menubarPath="additions"
-				id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-			</action>
-		</viewerContribution>
-
-     </extension>
-
-	
-	<!-- 
-		The following extension to the file context menu is temporary until resource 
-		navigator will provide allow to extend refactor menu        
-	-->
-	
-	<!--extension point="org.eclipse.ui.popupMenus">
-	 <objectContribution
-		objectClass="org.eclipse.core.resources.IFile"
-		nameFilter="*.xsd"
-		id="org.wst.xsd.ui.rename">
-		<menu id="refactorXSDResource" path="additions" label="%refactoring.menu.label">
-		  <separator name="refactor"/>
-		</menu>
-	<action
-		label="%refactoring.renameAction.label"
-		menubarPath="refactorXSDResource/refactor"
-		class="org.eclipse.wst.xsd.ui.internal.refactor.actions.RenameResourceActionDelegate"
-		enablesFor="1"
-		id="org.eclipse.wst.xsd.ui.refactoring.actions.RenameResource">
-	 </action>
-	 </objectContribution>
-	</extension-->	
-
-	<extension point="org.eclipse.ui.commands">
-		<command
-			name="%command.xsd.refactor.rename.element.name"
-			description="%command.xsd.refactor.rename.element.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.xsd.ui.refactor.rename.element">
-		</command>
-		<command
-			name="%command.xsd.refactor.makeElementGlobal.element.name"
-			description="%command.xsd.refactor.makeElementGlobal.element.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.xsd.ui.refactor.makeElementGlobal">
-		</command>
-		<command
-			name="%command.xsd.refactor.makeTypeGlobal.element.name"
-			description="%command.xsd.refactor.makeTypeGlobal.element.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.xsd.ui.refactor.makeTypeGlobal">
-		</command>
-		<command
-			name="%command.xsd.refactor.renameTargetNamespace.name"
-			description="%command.xsd.refactor.renameTargetNamespace.description"
-			categoryId="org.eclipse.ui.category.edit"
-			id="org.eclipse.wst.xsd.ui.refactor.renameTargetNamespace">
-		</command>
-	</extension>
-	<extension
-		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectorTargets">
-		<target
-			id="org.eclipse.wst.xsd.core.xsdsource"
-			name="%XSD_Source_target_name">
-		</target>
-	</extension>
-	<extension
-		point="org.eclipse.ui.workbench.texteditor.hyperlinkDetectors">
-		<hyperlinkDetector
-			class="org.eclipse.wst.xsd.ui.internal.editor.XSDHyperlinkDetector"
-			id="org.eclipse.wst.xsd.ui.internal.editor.XSDHyperlinkDetector"
-			name="%XSD_hyperlink"
-			targetId="org.eclipse.wst.xsd.core.xsdsource">
-		</hyperlinkDetector>
-   </extension>
-
- <extension point="org.eclipse.ui.menus">
-	<menuContribution locationURI="toolbar:org.eclipse.wst.xml.ui.perspective.NewFileToolBar">
-        <command
-              commandId="org.eclipse.ui.newWizard"
-              icon="icons/ctool16/NewXSD.gif"
-              id="org.eclipse.wst.xsd.ui.newXSDFile"
-              style="push"
-              tooltip="%_UI_NEW_XML_SCHEMA_TITLE">
-             <parameter name="newWizardId" value="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard"/>
-          <visibleWhen checkEnabled="false">
-			<with variable="activeWorkbenchWindow.activePerspective">
-				<equals value="org.eclipse.wst.xml.ui.perspective"/>
-			</with>
-           </visibleWhen>         
-        </command>        
-     </menuContribution>
-  </extension>
-
- <extension point="org.eclipse.ui.navigator.navigatorContent">
-	<commonWizard type="new" wizardId="org.eclipse.wst.xsd.ui.internal.wizards.NewXSDWizard">
-		<enablement></enablement>
-	</commonWizard>
- </extension>
-</plugin>
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/TypeVizEditorMode.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/TypeVizEditorMode.java
deleted file mode 100644
index c48d12b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/TypeVizEditorMode.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz;
-
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.EditorMode;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ADTContentOutlineProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.TypeVizFigureFactory;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDEditPartFactory;
-
-public class TypeVizEditorMode extends EditorMode
-{
-  private EditPartFactory editPartFactory;
-  public final static String ID = "org.eclipse.wst.xsd.ui.typeviz";
-  
-  public Object getAdapter(Class adapter)
-  {
-    return null;
-  }
-
-  public String getDisplayName()
-  {
-    return "Advanced";
-  }
-
-  public EditPartFactory getEditPartFactory()
-  {
-    if (editPartFactory == null)
-    {
-      editPartFactory = new XSDEditPartFactory(new TypeVizFigureFactory());
-    }  
-    return editPartFactory;
-  }
-
-  public String getId()
-  {
-    return ID;
-  }
-
-  public IContentProvider getOutlineProvider()
-  {
-    return new ADTContentOutlineProvider();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/BoxFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/BoxFigure.java
deleted file mode 100644
index 95a904d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/BoxFigure.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;
-
-import java.util.Iterator;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.layouts.ColumnData;
-
-public class BoxFigure extends Figure
-{
-  protected ColumnData columnData = new ColumnData();  
-  public HeadingFigure headingFigure;
-  protected Figure contentPane;
-  
-  public boolean isSelected = false;
-
-  public BoxFigure()
-  {
-    super();
- 
-    boolean highContrast = false;
-    try
-    {
-      highContrast = Display.getDefault().getHighContrast();
-    }
-    catch (Exception e)
-    {
-    }
-    if (!highContrast)
-    {
-      setBackgroundColor(ColorConstants.white);
-    }
-    
-    headingFigure = new HeadingFigure();   
-    add(headingFigure);
-
-    contentPane = new Figure()
-    {
-      public void paint(Graphics graphics)
-      {
-        graphics.fillRectangle(getBounds());
-        super.paint(graphics);
-        boolean isFirst = false;
-        for (Iterator i = getChildren().iterator(); i.hasNext();)
-        {
-          Figure figure = (Figure) i.next();
-          if (isFirst)
-          {
-            isFirst = false;
-          }
-          else
-          {
-            Rectangle r = figure.getBounds();
-            graphics.drawLine(r.x, r.y + 1, r.x + r.width, r.y + 1);
-          }
-        }
-      }
-    };
-    contentPane.setLayoutManager(new ToolbarLayout());
-    add(contentPane);
-    headingFigure.setForegroundColor(ColorConstants.black); 
-  }
-
-  public void paint(Graphics graphics)
-  {
-    super.paint(graphics);
-    /*
-    // Fill for the header section
-    //
-    Rectangle r = getBounds().getCopy();
-    graphics.setBackgroundColor(ColorConstants.darkGray);
-    Color gradient1 = ColorConstants.lightGray;
-    if (isSelected)
-    {
-      gradient1 = ColorConstants.lightBlue;
-    }
-    Color gradient2 = ColorConstants.white;
-    graphics.setForegroundColor(gradient1);
-    graphics.setBackgroundColor(gradient2);
-    graphics.fillGradient(r.x + 1, r.y + 1, r.width - 2, nodeNameLabel.getBounds().height - 1, true);
-    nodeNameLabel.paint(graphics);
-    */
-  }
-
-  public IFigure getContentPane()
-  {
-    return contentPane;
-  }
-
-  public Label getNameLabel()
-  {
-    return headingFigure.getLabel();
-  }
-  
-  public HeadingFigure getHeadingFigure()
-  {
-    return headingFigure;
-  }
-  
-  public ColumnData getColumnData()
-  {
-    return columnData;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/CompartmentFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/CompartmentFigure.java
deleted file mode 100644
index a019ada..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/CompartmentFigure.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewerGraphicConstants;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.StructureEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.ICompartmentFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.layouts.RowLayout;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-
-public class CompartmentFigure extends Figure implements ICompartmentFigure
-{
-  public Label nodeNameLabel;
-  protected Figure contentPane;
-  protected Figure annotationArea;
-  public Figure rowFigure;
-
-  public CompartmentFigure()
-  {
-    super();
-
-    rowFigure = new Figure();
-    add(rowFigure);
-
-    annotationArea = new Figure() {
-      
-      public void paint(Graphics graphics)
-      {
-        super.paint(graphics);
-        try
-        {
-          graphics.pushState();  
-          graphics.setForegroundColor(ColorConstants.blue);
-          graphics.setFont(DesignViewerGraphicConstants.smallFont);
-          List children = getChildren();
-          for (Iterator i = children.iterator(); i.hasNext(); )
-          {
-            Figure object = (Figure)i.next();
-            traverse(object, graphics);          
-          }
-        }
-        finally
-        {
-          graphics.popState();
-        }
-      }
-      
-      private void traverse(Figure figure, Graphics graphics)
-      {
-        List children = figure.getChildren();
-        for (Iterator i = children.iterator(); i.hasNext(); )
-        {
-          Figure object = (Figure)i.next();
-          
-          if (object instanceof GenericGroupFigure)
-          {
-            GenericGroupFigure fig = (GenericGroupFigure) object;
-            if (fig.hasText())
-              graphics.drawText(fig.getText(), fig.getTextCoordinates());
-          }
-          traverse(object, graphics);
-        }
-        
-      }
-      
-    };
-    ToolbarLayout annotationLayout = new ToolbarLayout(false);
-    annotationLayout.setStretchMinorAxis(true);
-    annotationArea.setLayoutManager(annotationLayout);
-
-    // Need this to show content model structure on the left side of the figure
-    rowFigure.add(annotationArea);
-
-    contentPane = new Figure()
-    {
-      public void paint(Graphics graphics)
-      {
-        super.paint(graphics);
-        graphics.pushState();
-        try
-        {
-          boolean isFirst = true;
-          Color oldColor = graphics.getForegroundColor();
-          graphics.setForegroundColor(ColorConstants.lightGray);
-          for (Iterator i = getChildren().iterator(); i.hasNext();)
-          {
-            Figure figure = (Figure) i.next();
-            Rectangle r = figure.getBounds();
-//            if (figure instanceof FieldFigure)
-//            {
-//               Rectangle rChild = ((FieldFigure)figure).getNameFigure().getBounds();
-//               graphics.drawLine(rChild.right(), rChild.y, rChild.right(), rChild.bottom());
-//               graphics.setForegroundColor(ColorConstants.darkGray);
-//            }
-            if (isFirst)
-            {
-              isFirst = false;
-//               graphics.drawLine(r.x, r.y, r.x, r.y + r.height);
-            }
-            else
-            {
-              graphics.setForegroundColor(ColorConstants.white);
-              graphics.setBackgroundColor(ColorConstants.lightGray);              
-              graphics.fillGradient(r.x, r.y, r.width, 1, false);    
-//              graphics.drawLine(r.x, r.y, r.x + r.width, r.y);
-//            graphics.drawLine(r.x, r.y, r.x, r.y + r.height);
-            }
-          }
-          graphics.setForegroundColor(oldColor);
-        }
-        finally
-        {
-          graphics.popState();
-        }
-      }
-    };
-    contentPane.setLayoutManager(new ToolbarLayout());
-    rowFigure.add(contentPane);
-
-    RowLayout rowLayout = new RowLayout();
-    rowFigure.setLayoutManager(rowLayout);
-    rowLayout.setConstraint(annotationArea, "annotation");
-    rowLayout.setConstraint(contentPane, "contentPane");
-  }
-
-  public IFigure getContentPane()
-  {
-    return contentPane;
-  }
-
-  public IFigure getAnnotationPane()
-  {
-    return annotationArea;
-  }
-  
-  public void editPartAttached(EditPart owner)
-  {   
-    StructureEditPart structureEditPart = null;
-    for (EditPart parent = owner.getParent(); parent != null; parent = parent.getParent())
-    {
-      if (parent instanceof StructureEditPart)
-      {
-        structureEditPart = (StructureEditPart) parent;
-        break;
-      }
-    }
-    RowLayout rowLayout = (RowLayout)rowFigure.getLayoutManager();
-    IStructureFigure typeFigure = structureEditPart.getStructureFigure();    
-    Assert.isTrue(typeFigure instanceof StructureFigure, "Expected object of type StructureFigure");    
-    rowLayout.setColumnData(((StructureFigure)typeFigure).getColumnData());            
-  }
-
-  public void addSelectionFeedback()
-  {
-  }
-
-  public void removeSelectionFeedback()
-  {
-  }   
-  
-  public void refreshVisuals(Object model)
-  {
-    // TODO Auto-generated method stub
-    
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/FieldFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/FieldFigure.java
deleted file mode 100644
index c1d87cc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/FieldFigure.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.StructureEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFieldFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.layouts.RowLayout;
-
-public class FieldFigure extends Figure implements IFieldFigure
-{
-  // TODO: put this color is some common class
-  public static final Color cellColor = new Color(null, 224, 233, 246);
-
-// For fix to https://bugs.eclipse.org/bugs/show_bug.cgi?id=161940
-//  public static final Color leftOuterBorderColor = new Color(null, 253, 196, 88);
-//  public static final Color leftInnerBorderColor = new Color(null, 253, 226, 172);
-//  public static final Color rightOuterBorderColor = new Color(null, 150, 179, 224);
-//  public static final Color rightInnerBorderColor = new Color(null, 49, 106, 197);
-  
-  // Formatting constraints
-  public static final int TOP_MARGIN = 2; // pixels
-  public static final int BOTTOM_MARGIN = TOP_MARGIN + 1; // extra pixel for the
-                                                          // footer line
-  public static final int LEFT_MARGIN = 2;
-  public static final int RIGHT_MARGIN = LEFT_MARGIN;
-  public static final int RIGHT_SIDE_PADDING = 6;
-
-  // States requiring decorators, and their icons
-  // protected static final Image errorIcon = ICON_ERROR;
-
-  // Labels which handle presentation of name and type
-  public Figure rowFigure;
-  protected Label nameLabel;
-  protected Label nameAnnotationLabel;  // for occurrence text, or error icons
-  protected Label typeLabel;
-  protected Label typeAnnotationLabel;  // for occurrence text, or error icons
-  protected Label toolTipLabel;
-  
-  public boolean hasFocus = false;
-  
-  public FieldFigure()
-  {
-    super();
-    setLayoutManager(new ToolbarLayout());
-    rowFigure = new Figure();
-    RowLayout rowLayout = new RowLayout();
-    rowFigure.setLayoutManager(rowLayout);
-
-    add(rowFigure);
-
-    nameLabel = new Label();
-    nameLabel.setBorder(new MarginBorder(3, 5, 3, 5));
-    nameLabel.setLabelAlignment(PositionConstants.LEFT);
-    nameLabel.setOpaque(true);
-    rowFigure.add(nameLabel);
-    
-    nameAnnotationLabel = new Label();
-    nameAnnotationLabel.setBorder(new MarginBorder(3, 5, 3, 5));
-    nameAnnotationLabel.setLabelAlignment(PositionConstants.LEFT);
-    nameAnnotationLabel.setOpaque(true);
-    rowFigure.add(nameAnnotationLabel);
-    
-    toolTipLabel = new Label();
-//  Don't show tooltip for now.  Annoying vertical line shows up.  Safe fix.
-//    nameLabel.setToolTip(toolTipLabel);
-    typeLabel = new Label();
-    
-    // cs : we need to add some additional padding to the right
-    // so that when we edit the field there's room for the combobox's arrow
-    // and the type name won't be partially obscured
-    //
-    typeLabel.setBorder(new MarginBorder(3, 5, 3, 20));
-    typeLabel.setLabelAlignment(PositionConstants.LEFT);
-    typeLabel.setOpaque(true);
-    rowFigure.add(typeLabel);
-
-    typeAnnotationLabel = new Label() {
-      
-      public Dimension getPreferredSize(int wHint, int hHint)
-      {
-        if (getText() == null || getText().equals(""))
-        {
-          return new Dimension(0, 0);
-        }
-        return super.getPreferredSize(wHint, hHint);
-      }
-    };
-    typeAnnotationLabel.setBorder(new MarginBorder(3, 5, 3, 5));
-    typeAnnotationLabel.setLabelAlignment(PositionConstants.LEFT);
-    typeAnnotationLabel.setOpaque(true);
-    rowFigure.add(typeAnnotationLabel);
-// Don't show tooltip for now.  Annoying vertical line shows up.  Safe fix.
-//    typeAnnotationLabel.setToolTip(toolTipLabel);
-    
-    rowLayout.setConstraint(nameLabel, "name");
-    rowLayout.setConstraint(nameAnnotationLabel, "nameAnnotation");
-    rowLayout.setConstraint(typeLabel, "type");
-    rowLayout.setConstraint(typeAnnotationLabel, "typeAnnotation");
-  }
-
-  /**
-   * @return Returns the "name" string used by this figure.
-   */
-  public String getName()
-  {
-    return nameLabel.getText();
-  }
-
-  /**
-   * @return Returns the figure representing the attribute name
-   */
-  public Label getNameLabel()
-  {
-    return nameLabel;
-  }
-
-  /**
-   * @return Returns the "type" string used by this figure.
-   */
-  public String getType()
-  {
-    return typeLabel.getText();
-  }
-
-  /**
-   * @return Returns the figure representing the attribute's type
-   */
-  public Label getTypeLabel()
-  {
-    return typeLabel;
-  }
-
-  /**
-   * @param name
-   *          Set the "name" string used by this figure.
-   */
-  public void setName(String name)
-  {
-    nameLabel.setText(name);
-  }
-
-  /**
-   * @param type
-   *          Set the "type" string used by this figure.
-   */
-  public void setType(String type)
-  {
-    typeLabel.setText(type);
-  }
-  
-  public void setTypeToolTipText(String toolTip)
-  {
-    setNameToolTipText(toolTip);
-  }
-
-  public void setNameToolTipText(String toolTip)
-  {
-    if (toolTip.length() > 0)
-    {
-      nameLabel.setToolTip(toolTipLabel);
-      toolTipLabel.setText(toolTip);
-    }
-    else
-    {
-      nameLabel.setToolTip(null);
-    }
-  }
-  
-  public void setNameAnnotationLabel(String text)
-  {
-    nameAnnotationLabel.setText(text);
-  }
-
-  public void setNameAnnotationLabelIcon(Image icon)
-  {
-    nameAnnotationLabel.setIcon(icon);
-  }
-  
-  public Label getNameAnnotationLabel()
-  {
-    return nameAnnotationLabel;
-  }
-  
-  public void setTypeAnnotationLabel(String text)
-  {
-    typeAnnotationLabel.setText(text);
-  }
-
-  public void setTypeAnnotationLabelIcon(Image icon)
-  {
-    typeAnnotationLabel.setIcon(icon);
-  }
-
-  public Label getTypeAnnotationLabel()
-  {
-    return typeAnnotationLabel;
-  }
-  
-  public void recomputeLayout()
-  {
-    RowLayout layout = (RowLayout)rowFigure.getLayoutManager();
-    if (layout != null && layout.getColumnData() != null)
-    {
-      layout.getColumnData().clearColumnWidths();
-    }    
-  }
-  
-  public void editPartAttached(EditPart owner)
-  {
-    StructureEditPart structureEditPart = null;
-    for (EditPart parent = owner.getParent(); parent != null; parent = parent.getParent())
-    {
-      if (parent instanceof StructureEditPart)
-      {
-        structureEditPart = (StructureEditPart) parent;
-        break;
-      }
-    }
-    RowLayout rowLayout = (RowLayout)rowFigure.getLayoutManager();
-    IStructureFigure typeFigure = structureEditPart.getStructureFigure();    
-    Assert.isTrue(typeFigure instanceof StructureFigure, "Expected object of type StructureFigure");    
-    rowLayout.setColumnData(((StructureFigure)typeFigure).getColumnData());   
-  }
-  
-  public void addSelectionFeedback()
-  {
-    boolean highContrast = false;
-    try
-    {
-      highContrast = Display.getDefault().getHighContrast();
-    }
-    catch (Exception e)
-    {
-    }
-    if (highContrast)
-    {
-      rowFigure.setForegroundColor(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-      rowFigure.setBackgroundColor(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
-    }
-    else
-    {
-      rowFigure.setBackgroundColor(cellColor);
-    }
-  }
-  
-  public void removeSelectionFeedback()
-  {
-    boolean highContrast = false;
-    try
-    {
-      highContrast = Display.getDefault().getHighContrast();
-    }
-    catch (Exception e)
-    {
-    }
-    if (highContrast)
-    {
-      rowFigure.setForegroundColor(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
-      rowFigure.setBackgroundColor(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-    }
-    else
-    {
-      rowFigure.setBackgroundColor(getBackgroundColor());
-    }
-  }
-  
-  public void refreshVisuals(Object model)
-  {
-  }
-  
-  public void paint(Graphics graphics)
-  {
-    super.paint(graphics);
-    if (hasFocus)
-    {
-      try
-      {
-        graphics.pushState();
-        Rectangle r = getBounds();
-        graphics.setXORMode(true);
-        graphics.drawFocus(r.x, r.y + 1, r.width - 1, r.height - 2);
-      }
-      finally
-      {
-        graphics.popState();
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/HeadingFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/HeadingFigure.java
deleted file mode 100644
index 6c275d6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/HeadingFigure.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Color;
-
-public class HeadingFigure extends Figure
-{
-  public static final Color headerColor = new Color(null, 224, 233, 246);
-  Label label;
-  Color[] gradientColor = {ColorConstants.white,  
-                           ColorConstants.lightGray,
-                           ColorConstants.lightBlue,
-                           ColorConstants.gray};
-  boolean isSelected = false;
-  boolean isReadOnly = false;
-  
-  public HeadingFigure()
-  {
-    label = new Label();
-    label.setBorder(new MarginBorder(2));
-    ToolbarLayout toolbarLayout = new ToolbarLayout(false);
-    toolbarLayout.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
-    setLayoutManager(toolbarLayout);
-    add(label);
-  }
-  
-  public void setGradientColors(Color[] colors)
-  {
-    this.gradientColor = colors;
-  }
-  
-  public void setSelected(boolean isSelected)
-  {
-    this.isSelected = isSelected;
-  }
-
-  public void setIsReadOnly(boolean isReadOnly)
-  {
-    this.isReadOnly = isReadOnly;
-  }
-  
-  public void paint(Graphics graphics)
-  {
-    super.paint(graphics);
-    
-    graphics.pushState();
-    try
-    {
-      // Fill for the header section
-      //
-      Rectangle r = getBounds().getCopy();
-      graphics.setBackgroundColor(ColorConstants.lightGray);
-  
-      Color gradient1 = isReadOnly ? gradientColor[1] : headerColor;
-      if (isSelected && isReadOnly) gradient1 = gradientColor[3];
-      else if (isSelected && !isReadOnly) gradient1 = gradientColor[2];
-      Color gradient2 = gradientColor[0];
-      graphics.setForegroundColor(gradient1);
-      graphics.setBackgroundColor(gradient2);
-      Rectangle labelBounds = label.getBounds();
-      graphics.fillGradient(r.x+1, r.y+1, r.width-2, labelBounds.height - 2, true);    
-      graphics.setForegroundColor(ColorConstants.darkGray);
-      label.paint(graphics);    
-    }
-    finally
-    {
-      graphics.popState();
-    }
-  }
-
-  public Label getLabel()
-  {
-    return label;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/RoundedLineBorder.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/RoundedLineBorder.java
deleted file mode 100644
index 93e80f1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/RoundedLineBorder.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.swt.graphics.Color;
-
-public class RoundedLineBorder extends LineBorder
-{
-  protected int arcLength;   
-  protected int lineStyle = Graphics.LINE_SOLID;
-
-  public RoundedLineBorder(Color c, int width, int arcLength)
-  {
-    super(c, width);     
-    this.arcLength = arcLength;
-  }
-
-  public RoundedLineBorder(int width, int arcLength)
-  {
-    super(width);     
-    this.arcLength = arcLength;
-  }
-  
-  public RoundedLineBorder(Color c, int width, int arcLength, int lineStyle)
-  {
-    super(c, width);
-    this.arcLength = arcLength;
-    this.lineStyle = lineStyle;
-  }
-
-  public RoundedLineBorder(int width, int arcLength, int lineStyle)
-  {
-    super(width);
-    this.arcLength = arcLength;
-    this.lineStyle = lineStyle;
-  }
-
-  public void paint(IFigure figure, Graphics graphics, Insets insets)
-  {
-    int rlbWidth = getWidth();
-    tempRect.setBounds(getPaintRectangle(figure, insets));
-    if (rlbWidth%2 == 1)
-    {
-      tempRect.width--;
-      tempRect.height--;
-    }
-    tempRect.shrink(rlbWidth/2,rlbWidth/2);
-    graphics.setLineWidth(rlbWidth);
-    graphics.setLineStyle(lineStyle);
-    if (getColor() != null)
-      graphics.setForegroundColor(getColor());
-    graphics.drawRoundRectangle(tempRect, arcLength, arcLength);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/StructureFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/StructureFigure.java
deleted file mode 100644
index 990f64b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/StructureFigure.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-
-
-public class StructureFigure extends BoxFigure implements IStructureFigure
-{
-  public void editPartAttached(EditPart owner)
-  {
-    // nothing to do here :-)
-  }
-
-  public void addSelectionFeedback()
-  {
-    LineBorder boxFigureLineBorder = (LineBorder)getBorder();
-    boxFigureLineBorder.setWidth(2);
-    // TODO (cs) need to fix this
-    //boxFigureLineBorder.setColor(getComplexType().isReadOnly() ? ColorConstants.darkGray : ColorConstants.darkBlue);  
-    getHeadingFigure().setSelected(true);
-    repaint();
-  }
-
-  public void removeSelectionFeedback()
-  {
-    LineBorder boxFigureLineBorder = (LineBorder)getBorder();
-    boxFigureLineBorder.setWidth(1);
-    getHeadingFigure().setSelected(false);
-    repaint();
-  }  
-  
-  public boolean hitTestHeader(Point location)
-  {
-    IFigure target = getHeadingFigure();
-    Rectangle b = target.getBounds().getCopy();
-    target.translateToAbsolute(b);  
-    return b.contains(location);
-  }
-  
-  public void refreshVisuals(Object model)
-  {
-    IStructure structure = (IStructure)model;
-    getNameLabel().setText(structure.getName());
-    getHeadingFigure().setIsReadOnly(structure.isReadOnly());
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/TypeVizFigureFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/TypeVizFigureFactory.java
deleted file mode 100644
index 08260fb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/figures/TypeVizFigureFactory.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures;
-
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.ICompartmentFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFieldFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.design.figures.IExtendedFigureFactory;
-import org.eclipse.wst.xsd.ui.internal.design.figures.IModelGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.design.figures.ModelGroupFigure;
-
-public class TypeVizFigureFactory implements IExtendedFigureFactory
-{  
-  public IStructureFigure createStructureFigure(Object model)
-  {
-    StructureFigure figure = new StructureFigure();
-    figure.setBorder(new LineBorder(1));    
-    ToolbarLayout toolbarLayout = new ToolbarLayout();
-    toolbarLayout.setStretchMinorAxis(true);
-    figure.setLayoutManager(toolbarLayout);
-
-    if (model instanceof ITreeElement)
-    {
-      figure.getNameLabel().setIcon(((ITreeElement)model).getImage());
-    }    
-    //figure.getHeadingFigure().setIsReadOnly(getComplexType().isReadOnly());
-    // we should organize ITreeElement and integrate it with the facade    
-    return figure;
-  }
-
-  public IFieldFigure createFieldFigure(Object model)
-  {
-    // TODO Auto-generated method stub
-    return new FieldFigure();
-  }
-  
-  public ICompartmentFigure createCompartmentFigure(Object model)
-  {
-    CompartmentFigure figure = new CompartmentFigure();
-    figure.setBorder(new MarginBorder(1));
-    ToolbarLayout toolbarLayout = new ToolbarLayout(false);
-    toolbarLayout.setStretchMinorAxis(true);
-    figure.setLayoutManager(toolbarLayout);
-    return figure;
-  }  
-  
-  public IModelGroupFigure createModelGroupFigure(Object model)
-  {
-    // TODO Auto-generated method stub
-    return new ModelGroupFigure();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/layouts/ColumnData.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/layouts/ColumnData.java
deleted file mode 100644
index 58e9dab..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/layouts/ColumnData.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.layouts;
-
-import java.util.HashMap;
-import java.util.Iterator;
-
-public class ColumnData
-{
-  HashMap map = new HashMap();
-  
-  class Entry
-  {
-    int width = 0;
-    int weight = 1;
-  }
-  
-  public void clearColumnWidths()
-  {
-    for (Iterator i = map.values().iterator(); i.hasNext();)
-    {
-      Entry entry = (Entry)i.next();
-      entry.width = 0;
-    }  
-  }  
-  
-  private Entry lookupOrCreateColumnEntry(String identifier)
-  {
-    Entry entry = (Entry)map.get(identifier);
-    if (entry == null)
-    {
-      entry = new Entry();
-      map.put(identifier, entry);
-    }  
-   return entry; 
-  }  
-  
-  void stretchColumnWidthIfNeeded(String identifier, int width)
-  {
-    Entry entry = lookupOrCreateColumnEntry(identifier);
-    entry.width = Math.max(entry.width, width);
-  }
-  
-  int getColumnWidth(String identifier)
-  {
-    Entry entry = (Entry)map.get(identifier);
-    if (entry != null)
-    {
-      return entry.width;
-    }  
-    else
-    {
-      return 0;//hmm should we return -1 ?
-    }  
-  }
-  
-  int getColumnWeight(String identifier)
-  {
-    Entry entry = (Entry)map.get(identifier);
-    if (entry != null)
-    {
-      return entry.weight;
-    }  
-    else
-    {
-      return 0;
-    }  
-  }
-  
-  public void setColumnWeight(String identifier, int weight)
-  {
-    Entry entry = lookupOrCreateColumnEntry(identifier);
-    entry.weight = weight;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/layouts/RowLayout.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/layouts/RowLayout.java
deleted file mode 100644
index fc90677..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd-typeviz/org/eclipse/wst/xsd/ui/internal/adt/typeviz/design/layouts/RowLayout.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.layouts;
-
-import java.util.HashMap;
-import java.util.List;
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-public class RowLayout extends AbstractLayout
-{
-  // layout is associated with a parent context
-  // any layout manager under the parent context is connected
-  // column rows are maintained accross container boundaries  
-  protected ColumnData columnData;
-  protected HashMap figureToContstraintMap = new HashMap();
-  
-  public RowLayout()
-  {
-    super();
-  }
-  
-
-  // this method computes the minimum size required to display the figures
-  //
-  private Dimension calculateChildrenSize(IFigure container, List children, int wHint, int hHint, boolean preferred)
-  {
-    Dimension childSize;
-    IFigure child;
-    int height = 0;
-    int width = 0;
-    
-    //IRowFigure figure = (IRowFigure)container;
-    
-    // for each cell in the row
-    //
-    for (int i = 0; i < children.size(); i++)
-    {
-      child = (IFigure) children.get(i);
-      String columnIdenifier = (String)getConstraint(child);
-             
-      // first we compute the child size without regard for columnData
-      //
-      childSize = child.getPreferredSize(wHint, hHint);// : child.getMinimumSize(wHint, hHint);
-        
-      // now that the columnData has been populated we can consider if the row needs to be larger
-      //
-      int effectiveWidth = childSize.width;
-      if (columnIdenifier != null)
-      {  
-        columnData.stretchColumnWidthIfNeeded(columnIdenifier, childSize.width);
-        effectiveWidth = columnData.getColumnWidth(columnIdenifier);
-      }                       
-      height = Math.max(childSize.height, height);
-      width += effectiveWidth;
-    }  
-    return new Dimension(width, height);
-  }
-  
-  
-  
-  protected Dimension calculatePreferredSize(IFigure container, int wHint, int hHint)
-  {    
-    List children = container.getChildren();
-    Dimension prefSize = calculateChildrenSize(container, children, wHint, hHint, true);
-    return prefSize;
-  }
-
-  public void layout(IFigure parent)
-  {
-    // layout a table with the columns aligned      
-    //IRowFigure rowFigure = (IRowFigure)parent;    
-    Rectangle clientArea = parent.getClientArea();   
-    List children = parent.getChildren();
-    Rectangle r = new Rectangle();
-    r.x = clientArea.x;
-    r.y = clientArea.y;
-    r.height = clientArea.height;
-    
-    int childrenSize = children.size();
-    Rectangle[] bounds = new Rectangle[childrenSize];
-    
-    // for each cell in the row
-    //
-    int requiredWidth = 0;
-    int totalColumnWeight = 0;
-    for (int i = 0; i < childrenSize; i++)
-    {
-      IFigure child = (IFigure) children.get(i);
-      //String columnIdenifier = figure.getColumnIdentifier(child);             
-      // first we compute the child size without regard for columnData
-      //
-      Dimension childSize = child.getPreferredSize(-1, -1);
-      
-      int columnWidth = -1;
-      //String columnIdentifier = rowFigure.getColumnIdentifier(child);
-      String columnIdentifier = (String)getConstraint(child);
-      if (columnIdentifier != null)
-      {
-        //columnData.stretchColumnWidthIfNeeded(columnIdentifier, childSize.width);        
-        columnWidth = columnData.getColumnWidth(columnIdentifier);
-        totalColumnWeight += columnData.getColumnWeight(columnIdentifier);
-      }  
-      r.width = Math.max(childSize.width, columnWidth);
-      requiredWidth += r.width;
-      bounds[i] = new Rectangle(r);      
-      r.x += r.width;
-    }          
-    if (totalColumnWeight < 1)
-    {
-      totalColumnWeight = 1;
-    }
-    int extraWidth = Math.max(clientArea.width - requiredWidth, 0);    
-    int extraWidthAllocated = 0;
-    for (int i = 0; i < childrenSize; i++)
-    {
-      IFigure child = (IFigure) children.get(i);      
-      Rectangle b = bounds[i];    
-      if (extraWidth > 0)
-      {  
-        String columnIdentifier = (String)getConstraint(child);
-        if (columnIdentifier != null)
-        {        
-          int weight = columnData.getColumnWeight(columnIdentifier);
-          float fraction = (float)weight / (float)totalColumnWeight;
-          int extraWidthForChild = (int)(extraWidth * fraction);
-       
-          b.width += extraWidthForChild;        
-          b.x += extraWidthAllocated;
-          extraWidthAllocated += extraWidthForChild;
-        }  
-        else
-        {
-          b.x += extraWidthAllocated;
-        }
-      }
-      child.setBounds(new Rectangle(b));  
-    }  
-  }
-
-  public ColumnData getColumnData()
-  {
-    return columnData;
-  }
-
-  public void setColumnData(ColumnData columnData)
-  {
-    this.columnData = columnData;
-  }    
-  
-  public Object getConstraint(IFigure child)
-  {
-    return figureToContstraintMap.get(child);
-  }
-  
-  public void setConstraint(IFigure child, Object constraint)
-  {
-    figureToContstraintMap.put(child, constraint);
-  }
-  
-  public void invalidate()
-  {
-    //figureToContstraintMap.clear();
-    //this.columnData.clearColumnWidths();
-    super.invalidate();
-   
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java
deleted file mode 100644
index 15f3b73..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/CreateElementAction.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.actions;
-import java.util.List;
-
-import org.eclipse.gef.ui.parts.AbstractEditPartViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-// issue (cs) can we remove this?
-//
-public class CreateElementAction extends Action
-{
-  protected String description;
-  protected Element parentNode;
-
-  protected ISelectionProvider selectionProvider;
-  protected XSDSchema xsdSchema;
-
-  protected Object sourceContext;
-
-  /**
-   * Constructor for CreateElementAction.
-   */
-  public CreateElementAction()
-  {
-    super();
-  }
-  /**
-   * Constructor for CreateElementAction.
-   * @param text
-   */
-  public CreateElementAction(String text)
-  {
-    super(text);
-  }
-  /**
-   * Constructor for CreateElementAction.
-   * @param text
-   * @param image
-   */
-  public CreateElementAction(String text, ImageDescriptor image)
-  {
-    super(text, image);
-  }
-
-  public void setXSDSchema(XSDSchema xsdSchema)
-  {
-    this.xsdSchema = xsdSchema;
-  }
-  
-  public void setSelectionProvider(ISelectionProvider selectionProvider)
-  {
-    this.selectionProvider = selectionProvider;
-  }
-
-  public void setSourceContext(Object sourceContext)
-  {
-    this.sourceContext = sourceContext;
-  }
-  
-  /**
-   * Gets the parentNode.
-   * @return Returns a Element
-   */
-  public Element getParentNode()
-  {
-    return parentNode;
-  }
-
-  /**
-   * Sets the parentNode.
-   * @param parentNode The parentNode to set
-   */
-  public void setParentNode(Element parentNode)
-  {
-    this.parentNode = parentNode;
-  }
-
-  boolean isGlobal = false;
-  
-  public void setIsGlobal(boolean isGlobal)
-  {
-    this.isGlobal = isGlobal;
-  }
-  
-  public boolean getIsGlobal()
-  {
-    return isGlobal;
-  }
-
-  protected Node relativeNode;
-  protected String elementTag;
-  public void setElementTag(String elementTag)
-  {
-    this.elementTag = elementTag;
-  }
-  
-  public DocumentImpl getDocument()
-  {
-    return (DocumentImpl) getParentNode().getOwnerDocument();
-  }
-    
-  public void beginRecording(String description)
-  {
-    getDocument().getModel().beginRecording(this, description);
-  }
-  
-  public void endRecording()
-  {
-    DocumentImpl doc = getDocument();
-    
-    doc.getModel().endRecording(this);    
-  }
-  
-  public Element createAndAddNewChildElement()
-  {
-    String prefix = parentNode.getPrefix();
-    prefix = (prefix == null) ? "" : (prefix + ":"); //$NON-NLS-1$ //$NON-NLS-2$
-    Element childNode = getDocument().createElementNS(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, prefix + elementTag);
-    if (getAttributes() != null)
-    {
-      List attributes = getAttributes();
-      for (int i = 0; i < attributes.size(); i++)
-      {
-        DOMAttribute attr = (DOMAttribute) attributes.get(i);
-        childNode.setAttribute(attr.getName(), attr.getValue());
-      }
-    }
-    if (getRelativeNode() == null)
-    {
-      parentNode.appendChild(childNode);
-    }
-    else
-    {
-      parentNode.insertBefore(childNode,getRelativeNode());
-    }
-    
-    if (isGlobal && getRelativeNode() == null)
-    {
-      Text textNode = getDocument().createTextNode("\n\n"); //$NON-NLS-1$
-      parentNode.appendChild(textNode);
-    }
-    else if (isGlobal && getRelativeNode() != null)
-    {
-      Text textNode = getDocument().createTextNode("\n\n"); //$NON-NLS-1$
-      parentNode.insertBefore(textNode, getRelativeNode());
-    }
-
-    formatChild(childNode);
-    
-    return childNode;
-  }    
-    
-  protected void formatChild(Element child)
-  {
-    if (child instanceof IDOMNode)
-    {
-      IDOMModel model = ((IDOMNode)child).getModel();
-      try
-      {
-        // tell the model that we are about to make a big model change
-        model.aboutToChangeModel();
-        
-	      IStructuredFormatProcessor formatProcessor = new FormatProcessorXML();
-		    formatProcessor.formatNode(child);
-      }
-      finally
-      {
-        // tell the model that we are done with the big model change
-        model.changedModel(); 
-      }
-    }
-  }
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {
-    beginRecording(getDescription());
-    final Element child = createAndAddNewChildElement();
-    endRecording();
-
-    if (selectionProvider != null)
-    {
-      final XSDConcreteComponent comp = xsdSchema.getCorrespondingComponent(child);
-//      selectionProvider.setSelection(new StructuredSelection(comp));
-      
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        if (comp instanceof XSDAttributeDeclaration)
-        {
-          if (((XSDAttributeDeclaration)comp).getContainer() instanceof XSDAttributeUse)
-          {
-            if (comp.getContainer().getContainer() instanceof XSDAttributeGroupDefinition)
-            {
-              selectionProvider.setSelection(new StructuredSelection(comp.getContainer()));
-            }
-            else if (comp.getContainer().getContainer() instanceof XSDComplexTypeDefinition)
-            {
-              if (XSDDOMHelper.inputEquals(child, XSDConstants.ATTRIBUTE_ELEMENT_TAG, true))
-              {
-                selectionProvider.setSelection(new StructuredSelection(comp.getContainer()));
-              }
-              else
-              {
-                selectionProvider.setSelection(new StructuredSelection(comp));
-              }
-            }
-            else
-            {
-              selectionProvider.setSelection(new StructuredSelection(comp));
-            }
-          }
-          else
-          {
-            selectionProvider.setSelection(new StructuredSelection(comp));
-          }
-        }
-        else
-        {
-          selectionProvider.setSelection(new StructuredSelection(comp));
-        }
-        if (comp instanceof XSDNamedComponent)
-        {
-          if (sourceContext instanceof AbstractEditPartViewer)
-          {
-//            AbstractEditPartViewer viewer = (AbstractEditPartViewer)sourceContext;
-          
-//            Object obj = viewer.getSelectedEditParts().get(0);
-            
-//            if (obj instanceof GraphicalEditPart)
-//            {
-//              if (obj instanceof ElementDeclarationEditPart)
-//              {
-//                XSDElementDeclaration elem = ((ElementDeclarationEditPart)obj).getXSDElementDeclaration();
-//                if (!elem.isElementDeclarationReference())
-//                {
-//                  ((ElementDeclarationEditPart)obj).doEditName();
-//                }
-//              }
-//              else if (obj instanceof ModelGroupDefinitionEditPart)
-//              {
-//                XSDModelGroupDefinition group = ((ModelGroupDefinitionEditPart)obj).getXSDModelGroupDefinition();
-//                if (!group.isModelGroupDefinitionReference())
-//                {
-//                  ((ModelGroupDefinitionEditPart)obj).doEditName();
-//                }
-//              }
-//              else if (obj instanceof ComplexTypeDefinitionEditPart)
-//              {
-//                XSDComplexTypeDefinition ct = ((ComplexTypeDefinitionEditPart)obj).getXSDComplexTypeDefinition();
-//                if (ct.getName() != null)
-//                {
-//                  ((ComplexTypeDefinitionEditPart)obj).doEditName();
-//                }
-//              }
-//              else if (obj instanceof TopLevelComponentEditPart)
-//              {
-//                ((TopLevelComponentEditPart)obj).doEditName();
-//              }
-//            }
-
-          }
-        }
-      }
-    };
-    Display.getDefault().timerExec(50,runnable);
-    }
-  }
-
-  /**
-   * Gets the relativeNode.
-   * @return Returns a Element
-   */
-  public Node getRelativeNode()
-  {
-    return relativeNode;
-  }
-
-  /**
-   * Sets the relativeNode.
-   * @param relativeNode The relativeNode to set
-   */
-  public void setRelativeNode(Node relativeNode)
-  {
-    this.relativeNode = relativeNode;
-  }
-
-  /**
-   * Gets the description.
-   * @return Returns a String
-   */
-  public String getDescription()
-  {
-    if (description == null)
-    {
-      return getText();
-    }
-    return description;
-  }
-
-  /**
-   * Sets the description.
-   * @param description The description to set
-   */
-  public void setDescription(String description)
-  {
-    this.description = description;
-  }
-
-  protected List attributes;
-  /**
-   * Gets the nameAttribute.
-   * @return Returns a String
-   */
-  public List getAttributes()
-  {
-    return attributes;
-  }
-
-  /**
-   * Sets the attributes.
-   * @param attributes The attributes to set
-   */
-  public void setAttributes(List attributes)
-  {
-    this.attributes = attributes;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/DOMAttribute.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/DOMAttribute.java
deleted file mode 100644
index 5c4f35a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/DOMAttribute.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.actions;
-
-// issue (cs) remove this
-/**
- * @version 	1.0
- * @author
- */
-public class DOMAttribute
-{
-  /**
-   * Constructor for DOMAttribute.
-   */
-  public DOMAttribute()
-  {
-    super();
-  }
-  
-  /**
-   * Constructor for DOMAttribute.
-   */
-  public DOMAttribute(String name, String value)
-  {
-    super();
-    this.name = name;
-    this.value = value;
-  }
-  
-  protected String name, value;
-  /**
-   * Gets the value.
-   * @return Returns a String
-   */
-  public String getValue()
-  {
-    return value;
-  }
-
-  /**
-   * Sets the value.
-   * @param value The value to set
-   */
-  public void setValue(String value)
-  {
-    this.value = value;
-  }
-
-  /**
-   * Gets the name.
-   * @return Returns a String
-   */
-  public String getName()
-  {
-    return name;
-  }
-
-  /**
-   * Sets the name.
-   * @param name The name to set
-   */
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/IXSDToolbarAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/IXSDToolbarAction.java
deleted file mode 100644
index 52199f6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/IXSDToolbarAction.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorPart;
-
-public interface IXSDToolbarAction extends IAction
-{
-  public void setEditorPart(IEditorPart editorPart);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDAttributeAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDAttributeAction.java
deleted file mode 100644
index 069a2f7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDAttributeAction.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.w3c.dom.Node;
-
-public class MoveXSDAttributeAction extends MoveXSDBaseAction
-{
-  private static int INSERT_BEFORE = 0;
-  private static int INSERT_AFTER = 1;
-  private static int INSERT_DIRECT = 2;
-  protected List selectedNodes;
-  protected Node parentNode;
-  protected Node previousRefChild, nextRefChild;
-  int insertType;
-
-  XSDConcreteComponent parentComponent;
-  XSDConcreteComponent selected, previousRefComponent, nextRefComponent;
-  boolean insertAtEnd = true;
-  
-  public MoveXSDAttributeAction(XSDConcreteComponent parentComponent, XSDConcreteComponent selected, XSDConcreteComponent previousRefChildComponent, XSDConcreteComponent nextRefChildComponent)
-  {
-    super();
-    this.parentComponent = parentComponent;
-    this.selected = selected;
-    this.previousRefComponent = previousRefChildComponent;
-    this.nextRefComponent = nextRefChildComponent;
-
-    if (parentComponent == null)
-      return;
-    parentNode = parentComponent.getElement();
-    nextRefChild = nextRefChildComponent != null ? nextRefChildComponent.getElement() : null;
-    previousRefChild = previousRefChildComponent != null ? previousRefChildComponent.getElement() : null;
-
-    if (nextRefComponent != null)
-    {
-      if (nextRefComponent.getContainer().getContainer() == parentComponent)
-      {
-        insertType = INSERT_BEFORE;
-      }
-    }
-    if (previousRefComponent != null)
-    {
-      if (previousRefComponent.getContainer().getContainer() == parentComponent)
-      {
-        insertType = INSERT_AFTER;
-      }
-    }
-    if (nextRefChildComponent == null && previousRefChildComponent == null)
-    {
-      insertType = INSERT_DIRECT;
-    }
-  }
-  
-  public MoveXSDAttributeAction(XSDConcreteComponent parentComponent, XSDConcreteComponent selected, XSDConcreteComponent previousRefChildComponent, XSDConcreteComponent nextRefChildComponent, boolean insertAtEnd)
-  {
-    this(parentComponent, selected, previousRefChildComponent, nextRefChildComponent);
-    this.insertAtEnd = insertAtEnd;
-  }
-  
-  public boolean canMove()
-  {
-    boolean result = true;
-   
-    if (nextRefComponent instanceof XSDElementDeclaration || previousRefComponent instanceof XSDElementDeclaration || parentComponent == null)
-      return false;
-
-    return result;
-  }
-
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {
-    if (parentComponent instanceof XSDAttributeGroupDefinition)
-    {
-      moveUnderXSDAttributeGroupDefinition((XSDAttributeGroupDefinition) parentComponent);
-    }
-    else if (parentComponent instanceof XSDComplexTypeDefinition)
-    {
-      moveUnderXSDComplexTypeDefinition((XSDComplexTypeDefinition) parentComponent);
-    }
-  }
-
-  protected void moveUnderXSDAttributeGroupDefinition(XSDAttributeGroupDefinition parentGroup)
-  {
-    int originalIndex = 0;
-    for (Iterator iterator = parentGroup.getContents().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupContent attributeGroupContent = (XSDAttributeGroupContent) iterator.next();
-      if (attributeGroupContent instanceof XSDAttributeUse)
-      {
-        XSDAttributeDeclaration attribute = ((XSDAttributeUse) attributeGroupContent).getContent();
-        if (attribute == selected)
-        {
-          parentGroup.getContents().remove(attribute.getContainer());
-          break;
-        }
-      }
-      originalIndex++;
-    }
-    int index = 0;
-    boolean addedBack = false;
-    if (insertType == INSERT_DIRECT)
-    {
-      XSDConcreteComponent container = selected.getContainer();
-      if (container != null)
-      {
-        if (insertAtEnd)
-          ((XSDAttributeGroupDefinition) parentComponent).getResolvedAttributeGroupDefinition().getContents().add(container);
-        else
-          ((XSDAttributeGroupDefinition) parentComponent).getResolvedAttributeGroupDefinition().getContents().add(0, container);
-        addedBack = true;
-      }
-      return;
-    }
-
-    List attributeGroupContents = parentGroup.getContents();
-    for (Iterator iterator = attributeGroupContents.iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupContent attributeGroupContent = (XSDAttributeGroupContent) iterator.next();
-      if (attributeGroupContent instanceof XSDAttributeUse)
-      {
-        XSDAttributeDeclaration attribute = ((XSDAttributeUse) attributeGroupContent).getContent();
-        if (insertType == INSERT_BEFORE)
-        {
-          if (attribute == nextRefComponent)
-          {
-            parentGroup.getContents().add(index, selected.getContainer());
-            addedBack = true;
-            break;
-          }
-          if (selected == nextRefComponent && originalIndex == index)
-          {
-            parentGroup.getContents().add(index, selected.getContainer());
-            addedBack = true;
-            break;
-          }
-        }
-        else if (insertType == INSERT_AFTER)
-        {
-          if (attribute == previousRefComponent)
-          {
-            parentGroup.getContents().add(index + 1, selected.getContainer());
-            addedBack = true;
-            break;
-          }
-          if (selected == previousRefComponent && originalIndex == index)
-          {
-            parentGroup.getContents().add(index, selected.getContainer());
-            addedBack = true;
-            break;
-          }
-        }
-      }
-      index++;
-    }
-    if (attributeGroupContents.size() == 0)
-    {
-      parentGroup.getContents().add(selected.getContainer());
-      addedBack = true;
-    }
-
-    if (!addedBack)
-    {
-      parentGroup.getContents().add(originalIndex, selected.getContainer());
-    }
-  }
-
-  protected void moveUnderXSDComplexTypeDefinition(XSDComplexTypeDefinition complexType)
-  {
-    int originalIndex = 0;
-    for (Iterator iterator = complexType.getAttributeContents().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupContent attributeGroupContent = (XSDAttributeGroupContent) iterator.next();
-      if (attributeGroupContent instanceof XSDAttributeUse)
-      {
-        XSDAttributeDeclaration attribute = ((XSDAttributeUse) attributeGroupContent).getContent();
-        if (attribute == selected)
-        {
-          complexType.getAttributeContents().remove(attribute.getContainer());
-          break;
-        }
-      }
-      originalIndex++;
-    }
-    int index = 0;
-    boolean addedBack = false;
-    List attributeGroupContents = complexType.getAttributeContents();
-    for (Iterator iterator = attributeGroupContents.iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupContent attributeGroupContent = (XSDAttributeGroupContent) iterator.next();
-      if (attributeGroupContent instanceof XSDAttributeUse)
-      {
-        XSDAttributeDeclaration attribute = ((XSDAttributeUse) attributeGroupContent).getContent();
-        if (insertType == INSERT_AFTER)
-        {
-          if (attribute == previousRefComponent)
-          {
-            complexType.getAttributeContents().add(index + 1, selected.getContainer());
-            addedBack = true;
-            break;
-          }
-        }
-        else if (insertType == INSERT_BEFORE)
-        {
-          if (attribute == nextRefComponent)
-          {
-            complexType.getAttributeContents().add(index, selected.getContainer());
-            addedBack = true;
-            break;
-          }
-        }
-      }
-      index++;
-    }
-    if (attributeGroupContents.size() == 0)
-    {
-      complexType.getAttributeContents().add(selected.getContainer());
-      addedBack = true;
-    }
-
-    if (!addedBack)
-    {
-      complexType.getAttributeContents().add(originalIndex, selected.getContainer());
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDBaseAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDBaseAction.java
deleted file mode 100644
index c6d9906..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDBaseAction.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.actions;
-
-import org.eclipse.jface.action.Action;
-
-public class MoveXSDBaseAction extends Action
-{
-
-  public MoveXSDBaseAction()
-  {
-    super();
-  }
-
-  public boolean canMove()
-  {
-    return true;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDElementAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDElementAction.java
deleted file mode 100644
index 7e73ff5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/MoveXSDElementAction.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.actions;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.w3c.dom.Node;
-
-public class MoveXSDElementAction extends MoveXSDBaseAction
-{
-  private static int INSERT_BEFORE = 0;
-  private static int INSERT_AFTER = 1;
-  private static int INSERT_DIRECT = 2;
-  protected List selectedNodes;
-  protected Node parentNode;
-  protected Node previousRefChild, nextRefChild;
-  int insertType;
-
-  XSDModelGroup parentModelGroup;
-  XSDConcreteComponent selected, previousRefComponent, nextRefComponent;
-  boolean insertAtEnd = true;
-
-  public MoveXSDElementAction(XSDModelGroup parentComponent, XSDConcreteComponent selected, XSDConcreteComponent previousRefChildComponent, XSDConcreteComponent nextRefChildComponent)
-  {
-    super();
-    this.parentModelGroup = parentComponent;
-    this.selected = selected;
-    this.previousRefComponent = previousRefChildComponent;
-    this.nextRefComponent = nextRefChildComponent;
-
-    if (parentComponent == null)
-      return;
-    parentNode = parentComponent.getElement();
-    nextRefChild = nextRefChildComponent != null ? nextRefChildComponent.getElement() : null;
-    previousRefChild = previousRefChildComponent != null ? previousRefChildComponent.getElement() : null;
-
-    if (nextRefComponent != null)
-    {
-      if (nextRefComponent.getContainer().getContainer() == parentModelGroup)
-      {
-        insertType = INSERT_BEFORE;
-      }
-    }
-    if (previousRefComponent != null)
-    {
-      if (previousRefComponent.getContainer().getContainer() == parentModelGroup)
-      {
-        insertType = INSERT_AFTER;
-      }
-    }
-    if (nextRefChildComponent == null && previousRefChildComponent == null)
-    {
-      insertType = INSERT_DIRECT;
-    }
-  }
-
-  public MoveXSDElementAction(XSDModelGroup parentComponent, XSDConcreteComponent selected, XSDConcreteComponent previousRefChildComponent, XSDConcreteComponent nextRefChildComponent, boolean insertAtEnd)
-  {
-    this(parentComponent, selected, previousRefChildComponent, nextRefChildComponent);
-    this.insertAtEnd = insertAtEnd;
-  }
-  
-  public boolean canMove()
-  {
-    boolean result = true;
-   
-    if (nextRefComponent instanceof XSDAttributeDeclaration || previousRefComponent instanceof XSDAttributeDeclaration || parentModelGroup == null)
-      return false;
-
-    return result;
-  }
-
-  /*
-   * @see IAction#run()
-   */
-  public void run()
-  {
-    int originalIndex = 0;
-    for (Iterator particles = parentModelGroup.getContents().iterator(); particles.hasNext();)
-    {
-      XSDParticle particle = (XSDParticle) particles.next();
-      XSDParticleContent particleContent = particle.getContent();
-      if (particleContent == selected)
-      {
-        parentModelGroup.getContents().remove(particle);
-        break;
-      }
-      originalIndex++;
-    }
-    int index = 0;
-    boolean addedBack = false;
-    if (insertType == INSERT_DIRECT)
-    {
-      XSDConcreteComponent container = selected.getContainer();
-      if (container != null)
-      {
-        XSDConcreteComponent container2 = container.getContainer();
-        if (container2 instanceof XSDModelGroup)
-        {
-          ((XSDModelGroup) container2).getContents().remove(container);
-        }
-        if (insertAtEnd)
-          parentModelGroup.getContents().add(container);
-        else
-          parentModelGroup.getContents().add(0, container);
-        addedBack = true;
-      }
-      return;
-    }
-
-    List particles = parentModelGroup.getContents();
-    for (Iterator iterator = particles.iterator(); iterator.hasNext();)
-    {
-      XSDParticle particle = (XSDParticle) iterator.next();
-      XSDParticleContent particleContent = particle.getContent();
-      if (insertType == INSERT_BEFORE)
-      {
-        if (particleContent == nextRefComponent)
-        {
-          parentModelGroup.getContents().add(index, selected.getContainer());
-          addedBack = true;
-          break;
-        }
-        if (selected == nextRefComponent && originalIndex == index)
-        {
-          parentModelGroup.getContents().add(index, selected.getContainer());
-          addedBack = true;
-          break;
-        }
-      }
-      else if (insertType == INSERT_AFTER)
-      {
-        if (particleContent == previousRefComponent)
-        {
-          parentModelGroup.getContents().add(index + 1, selected.getContainer());
-          addedBack = true;
-          break;
-        }
-        if (selected == previousRefComponent && originalIndex == index)
-        {
-          parentModelGroup.getContents().add(index, selected.getContainer());
-          addedBack = true;
-          break;
-        }
-      }
-      index++;
-    }
-    if (particles.size() == 0)
-    {
-      parentModelGroup.getContents().add(selected.getContainer());
-      addedBack = true;
-    }
-
-    if (!addedBack)
-    {
-      parentModelGroup.getContents().add(originalIndex, selected.getContainer());
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/XSDEditNamespacesAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/XSDEditNamespacesAction.java
deleted file mode 100644
index a6fe004..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/actions/XSDEditNamespacesAction.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.actions;
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xml.ui.internal.util.XMLCommonResources;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNamespaceInformationCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.nsedit.SchemaPrefixChangeHandler;
-import org.eclipse.wst.xsd.ui.internal.nsedit.TargetNamespaceChangeHandler;
-import org.eclipse.wst.xsd.ui.internal.widgets.XSDEditSchemaInfoDialog;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class XSDEditNamespacesAction extends Action
-{
-  private Element element;
-  private String resourceLocation;
-  private XSDSchema xsdSchema;
-  private DOMNamespaceInfoManager namespaceInfoManager = new DOMNamespaceInfoManager();
-
-  public XSDEditNamespacesAction(String label, Element element, Node node)
-  {
-    super();
-    setText(label);
-
-    this.element = element;
-    // /////////////////// This needs to be changed....
-    this.resourceLocation = "dummy";
-  }
-
-  public XSDEditNamespacesAction(String label, Element element, Node node, XSDSchema schema)
-  {
-    this(label, element, node);
-    xsdSchema = schema;
-  }
-
-  public void run()
-  {
-    if (element != null)
-    {
-      Shell shell = XMLCommonResources.getInstance().getWorkbench().getActiveWorkbenchWindow().getShell();
-      String targetNamespace = null;
-      if (xsdSchema != null)
-      {
-        targetNamespace = xsdSchema.getTargetNamespace();
-      }
-      XSDEditSchemaInfoDialog dialog = new XSDEditSchemaInfoDialog(shell, new Path(resourceLocation), targetNamespace);
-
-      List namespaceInfoList = namespaceInfoManager.getNamespaceInfoList(element);
-      List oldNamespaceInfoList = NamespaceInfo.cloneNamespaceInfoList(namespaceInfoList);
-
-      // here we store a copy of the old info for each NamespaceInfo
-      // this info will be used in createPrefixMapping() to figure out how to
-      // update the document in response to these changes
-      for (Iterator i = namespaceInfoList.iterator(); i.hasNext();)
-      {
-        NamespaceInfo info = (NamespaceInfo) i.next();
-        NamespaceInfo oldCopy = new NamespaceInfo(info);
-        info.setProperty("oldCopy", oldCopy); //$NON-NLS-1$
-      }
-
-      dialog.setNamespaceInfoList(namespaceInfoList);
-      dialog.create();
-      dialog.getShell().setSize(500, 400);
-      dialog.getShell().setText(XMLCommonResources.getInstance().getString("_UI_MENU_EDIT_SCHEMA_INFORMATION_TITLE")); //$NON-NLS-1$
-      dialog.setBlockOnOpen(true);
-      dialog.open();
-
-      String xsdPrefix = null; //$NON-NLS-1$
-      String origXSDPrefix = xsdSchema.getSchemaForSchemaQNamePrefix();
-      String newTNSPrefix = "";
-
-      if (dialog.getReturnCode() == Window.OK)
-      {
-        Element xsdSchemaElement = xsdSchema.getElement();
-        DocumentImpl doc = (DocumentImpl) xsdSchemaElement.getOwnerDocument();
-
-        List newInfoList = dialog.getNamespaceInfoList();
-
-        // see if we need to rename any prefixes
-        Map prefixMapping = createPrefixMapping(oldNamespaceInfoList, namespaceInfoList);
-
-        String origTNSPrefix = null;
-        Map origPrefixMap = xsdSchema.getQNamePrefixToNamespaceMap();
-        for (Iterator iter = origPrefixMap.keySet().iterator(); iter.hasNext();)
-        {
-          String key = (String) iter.next();
-          String ns = (String) origPrefixMap.get(key);
-          if ((targetNamespace == null && ns == null) || targetNamespace != null && targetNamespace.equals(ns))
-          {
-            origTNSPrefix = key;
-            break;
-          }
-        }
-        Map map2 = new Hashtable();
-        for (Iterator iter = newInfoList.iterator(); iter.hasNext();)
-        {
-          NamespaceInfo ni = (NamespaceInfo) iter.next();
-          String pref = ni.prefix;
-          String uri = ni.uri;
-          if (pref == null)
-            pref = ""; //$NON-NLS-1$
-          if (uri == null)
-            uri = ""; //$NON-NLS-1$
-          if (XSDConstants.isSchemaForSchemaNamespace(uri))
-          {
-            xsdPrefix = pref;
-          }
-          if (uri.equals(dialog.getTargetNamespace()))
-          {
-            newTNSPrefix = pref;
-          }
-          map2.put(pref, uri);
-        }
-
-        if (map2.size() > 0)
-        {
-          try
-          {
-
-            doc.getModel().beginRecording(this, XSDEditorPlugin.getXSDString("_UI_NAMESPACE_CHANGE"));
-            boolean targetNamespaceChanged = (targetNamespace != null && !targetNamespace.equals(dialog.getTargetNamespace()) || targetNamespace == null && dialog.getTargetNamespace() != null);
-            boolean tnsPrefixChanged = !newTNSPrefix.equals(origTNSPrefix);
-            boolean xsdPrefixChanged = (!(origXSDPrefix == null && xsdPrefix.equals("")) || (origXSDPrefix != null && !origXSDPrefix.equals(xsdPrefix)));
-
-            xsdSchema.setIncrementalUpdate(false);
-
-            // First handle the prefix change for the target namespace
-            if (tnsPrefixChanged)
-            {
-              prefixMapping.remove(origTNSPrefix);
-              UpdateNamespaceInformationCommand command = new UpdateNamespaceInformationCommand(Messages._UI_ACTION_NAMESPACE_INFORMATION_CHANGE, xsdSchema, newTNSPrefix, targetNamespace);
-              command.execute();
-              xsdSchema.update();
-            }
-            // Second, handle the target namespace change
-            if (targetNamespaceChanged)
-            {
-              // set the targetNamespace attribute
-              xsdSchema.setTargetNamespace(dialog.getTargetNamespace());
-
-              TargetNamespaceChangeHandler targetNamespaceChangeHandler = new TargetNamespaceChangeHandler(xsdSchema, targetNamespace, dialog.getTargetNamespace());
-              targetNamespaceChangeHandler.resolve();
-            }
-            // Third, handle the schema for schema prefix change
-            if (xsdPrefixChanged)
-            {
-              if (xsdPrefix != null && xsdPrefix.length() == 0)
-              {
-                xsdSchema.setSchemaForSchemaQNamePrefix(null);
-              }
-              else
-              {
-                xsdSchema.setSchemaForSchemaQNamePrefix(xsdPrefix);
-              }
-
-              namespaceInfoManager.removeNamespaceInfo(element);
-              namespaceInfoManager.addNamespaceInfo(element, newInfoList, false);
-              xsdSchema.setIncrementalUpdate(true);
-
-              // Now change the references to any schema types/components ie. string --> xs:string
-              SchemaPrefixChangeHandler spch = new SchemaPrefixChangeHandler(xsdSchema, xsdPrefix);
-              spch.resolve();
-
-              // Change the prefix for all schema components
-              updateAllNodes(element, xsdPrefix);
-
-              prefixMapping.remove(origXSDPrefix != null? origXSDPrefix : ""); //$NON-NLS-1$
-            }
-            // Now handle the other changes. PrefixMapping size should be
-            // greater than 0 for any remaining prefix changes
-
-            if (prefixMapping.size() > 0)
-            {
-              for (Iterator iter = prefixMapping.keySet().iterator(); iter.hasNext();)
-              {
-                String oldPrefix = (String) iter.next();
-                String newPrefix = (String) prefixMapping.get(oldPrefix);
-
-                // Now update any references to this old prefix in the schema
-                // with the value of the new prefix
-                String ns = (String) origPrefixMap.get(oldPrefix);
-                SchemaPrefixChangeHandler spch = new SchemaPrefixChangeHandler(xsdSchema, newPrefix, ns != null? ns : ""); //$NON-NLS-1$
-                spch.resolve();
-              }
-            }
-            namespaceInfoManager.removeNamespaceInfo(element);
-            namespaceInfoManager.addNamespaceInfo(element, newInfoList, false);
-
-            xsdSchema.setIncrementalUpdate(true);
-          }
-          catch (Exception e)
-          {
-          }
-          finally
-          {
-            xsdSchema.update();
-            doc.getModel().endRecording(this);
-          }
-        }
-      }
-    }
-  }
-
-  protected Map createPrefixMapping(List oldList, List newList)
-  {
-    Map map = new Hashtable();
-
-    Hashtable oldURIToPrefixTable = new Hashtable();
-    for (Iterator i = oldList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo oldInfo = (NamespaceInfo) i.next();
-      oldURIToPrefixTable.put(oldInfo.uri, oldInfo);
-    }
-
-    for (Iterator i = newList.iterator(); i.hasNext();)
-    {
-      NamespaceInfo newInfo = (NamespaceInfo) i.next();
-      NamespaceInfo oldInfo = (NamespaceInfo) oldURIToPrefixTable.get(newInfo.uri != null ? newInfo.uri : ""); //$NON-NLS-1$
-
-      // if oldInfo is non null ... there's a matching URI in the old set
-      // we can use its prefix to detemine out mapping
-      //
-      // if oldInfo is null ... we use the 'oldCopy' we stashed away
-      // assuming that the user changed the URI and the prefix
-      if (oldInfo == null)
-      {
-        oldInfo = (NamespaceInfo) newInfo.getProperty("oldCopy"); //$NON-NLS-1$
-      }
-
-      if (oldInfo != null)
-      {
-        String newPrefix = newInfo.prefix != null ? newInfo.prefix : ""; //$NON-NLS-1$
-        String oldPrefix = oldInfo.prefix != null ? oldInfo.prefix : ""; //$NON-NLS-1$
-        if (!oldPrefix.equals(newPrefix))
-        {
-          map.put(oldPrefix, newPrefix);
-        }
-      }
-    }
-    return map;
-  }
-
-  private void updateAllNodes(Element element, String prefix)
-  {
-    element.setPrefix(prefix);
-    NodeList list = element.getChildNodes();
-    if (list != null)
-    {
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        Node child = list.item(i);
-        if (child != null && child instanceof Element)
-        {
-          child.setPrefix(prefix);
-          if (child.hasChildNodes())
-          {
-            updateAllNodes((Element) child, prefix);
-          }
-        }
-      }
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/CategoryAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/CategoryAdapter.java
deleted file mode 100644
index cd995ee..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/CategoryAdapter.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IModelProxy;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeGroupDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDComplexTypeDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDSchemaDirectiveAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDSimpleTypeDefinitionAction;
-import org.eclipse.xsd.XSDSchema;
-
-public class CategoryAdapter extends XSDBaseAdapter implements IModelProxy, IActionProvider, IADTObjectListener
-{
-  protected String text;
-  protected Image image;
-  protected Object parent;
-  protected int groupType;
-  protected Collection children, allChildren;  // children from current schema, children from current schema and includes
-  XSDSchema xsdSchema;
-
-  public CategoryAdapter(String label, Image image, Collection children, XSDSchema xsdSchema, int groupType)
-  {
-    this.text = label;
-    this.image = image;
-    this.parent = xsdSchema;
-    this.xsdSchema = xsdSchema;
-    this.target = xsdSchema;
-    this.children = children;
-    this.groupType = groupType;
-  }
-
-  public final static int ATTRIBUTES = 1;
-  public final static int ELEMENTS = 2;
-  public final static int TYPES = 3;
-  public final static int GROUPS = 5;
-  public final static int DIRECTIVES = 6;
-  public final static int NOTATIONS = 7;
-  public final static int ATTRIBUTE_GROUPS = 8;
-  public final static int IDENTITY_CONSTRAINTS = 9;
-  public final static int ANNOTATIONS = 10;
-
-  public XSDSchema getXSDSchema()
-  {
-    return xsdSchema;
-  }
-
-  public int getGroupType()
-  {
-    return groupType;
-  }
-
-  public Image getImage()
-  {
-    return image;
-  }
-
-  public String getText()
-  {
-    return text;
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    return (ITreeElement[]) children.toArray(new ITreeElement[0]);
-  }
-  
-  public ITreeElement[] getAllChildren()
-  {
-    return (ITreeElement[]) allChildren.toArray(new ITreeElement[0]);
-  }
-
-  public void setChildren(Collection list)
-  {
-    children = list;
-  }
-
-  public void setAllChildren(Collection list)
-  {
-    allChildren = list;
-  }
-
-  public Object getParent(Object element)
-  {
-    return xsdSchema;
-  }
-
-  public boolean hasChildren(Object element)
-  {
-    return true;
-  }
-
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {
-
-  }
-
-  public String[] getActions(Object object)
-  {    
-    Collection actionIDs = new ArrayList();
-    
-    switch (groupType)
-    {
-      case TYPES : {
-        actionIDs.add(AddXSDComplexTypeDefinitionAction.ID);
-        actionIDs.add(AddXSDSimpleTypeDefinitionAction.ID);
-        break;
-      }
-      case ELEMENTS : {
-        actionIDs.add(AddXSDElementAction.ID);
-        break;
-      }
-      case GROUPS : {
-        actionIDs.add(AddXSDModelGroupDefinitionAction.MODELGROUPDEFINITION_ID);
-        break;
-      }
-      case ATTRIBUTES : {
-        actionIDs.add(AddXSDAttributeDeclarationAction.ID);
-        actionIDs.add(AddXSDAttributeGroupDefinitionAction.ID);
-        break;
-      }
-      case ATTRIBUTE_GROUPS : {
-        actionIDs.add(AddXSDAttributeGroupDefinitionAction.ID);
-        break;
-      }
-      case DIRECTIVES : {
-        actionIDs.add(AddXSDSchemaDirectiveAction.INCLUDE_ID);
-        actionIDs.add(AddXSDSchemaDirectiveAction.IMPORT_ID);
-        actionIDs.add(AddXSDSchemaDirectiveAction.REDEFINE_ID);
-        break;
-      }
-    }
-    actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-    actionIDs.add(ShowPropertiesViewAction.ID);
-    return (String [])actionIDs.toArray(new String[0]);
-  }
-  
-  public void propertyChanged(Object object, String property)
-  {
-    if (getText().equals(property))
-      notifyListeners(this, property);
-  }
-
-  public List getTypes()
-  {
-    return null;
-  }
-
-  public IModel getModel()
-  {
-    return (IModel)XSDAdapterFactory.getInstance().adapt(xsdSchema);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/RedefineCategoryAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/RedefineCategoryAdapter.java
deleted file mode 100644
index 83e8c92..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/RedefineCategoryAdapter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedAttributeGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedComplexTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedModelGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedSimpleTypeAction;
-import org.eclipse.xsd.XSDRedefine;
-
-
-public class RedefineCategoryAdapter extends CategoryAdapter
-{
-  protected XSDRedefine xsdRedefine;
-  private XSDRedefineAdapter xsdRedefineAdapter;
-
-  public RedefineCategoryAdapter(String label, Image image, Collection children, XSDRedefine xsdRedefine, XSDRedefineAdapter xsdRedefineAdapter, int groupType)
-  {
-    super(label, image, children, xsdRedefine.getSchema(), groupType);
-    this.xsdRedefine = xsdRedefine;
-    this.target = xsdRedefine;
-    this.xsdRedefineAdapter = xsdRedefineAdapter;
-  }
-
-  public XSDRedefine getXSDRedefine()
-  {
-    return xsdRedefine;
-  }
-
-  public String[] getActions(Object object)
-  {
-    Collection actionIDs = new ArrayList();
-
-    switch (groupType)
-    {
-      case TYPES:
-      {
-        actionIDs.add(AddXSDRedefinedComplexTypeAction.ID);
-        actionIDs.add(AddXSDRedefinedSimpleTypeAction.ID);
-        break;
-      }
-      case GROUPS:
-      {
-        actionIDs.add(AddXSDRedefinedModelGroupAction.ID);
-        break;
-      }
-      case ATTRIBUTES:
-      case ATTRIBUTE_GROUPS:
-      {
-        actionIDs.add(AddXSDRedefinedAttributeGroupAction.ID);
-        break;
-      }
-    }
-    actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-    actionIDs.add(ShowPropertiesViewAction.ID);
-    return (String[])actionIDs.toArray(new String [0]);
-  }
-
-  public IModel getModel()
-  {
-    return (IModel)XSDAdapterFactory.getInstance().adapt(xsdRedefine.getSchema());
-  }
-
-
-  public XSDRedefineAdapter getXsdRedefineAdapter() {
-	return xsdRedefineAdapter;
-  }
-  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAdapterFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAdapterFactory.java
deleted file mode 100644
index a05ce01..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAdapterFactory.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDSwitch;
-
-public class XSDAdapterFactory extends AdapterFactoryImpl
-{
-  protected static XSDAdapterFactory instance;
-  
-  public static XSDAdapterFactory getInstance()
-  {
-    if (instance == null)
-    {
-      // first use the one defined by the configuration
-      instance = XSDEditorPlugin.getPlugin().getXSDEditorConfiguration().getAdapterFactory();
-      // if there isn't one, then use the default
-      if (instance == null)
-        instance = new XSDAdapterFactory();
-    }
-    return instance;
-  }
-  
-  public Adapter createAdapter(Notifier target)
-  {
-    XSDSwitch xsdSwitch = new XSDSwitch()
-    {
-      public Object caseXSDSchemaDirective(XSDSchemaDirective object)
-      {
-        return new XSDSchemaDirectiveAdapter();
-      }
-      
-      public Object caseXSDWildcard(XSDWildcard object)
-      {
-        return new XSDWildcardAdapter();
-      }
-      
-      public Object caseXSDAttributeGroupDefinition(XSDAttributeGroupDefinition object)
-      {
-        return new XSDAttributeGroupDefinitionAdapter();
-      }
-
-      public Object caseXSDModelGroupDefinition(XSDModelGroupDefinition object)
-      {
-        return new XSDModelGroupDefinitionAdapter();
-      }
-      
-      public Object caseXSDAttributeDeclaration(XSDAttributeDeclaration object)
-      {
-        return new XSDAttributeDeclarationAdapter();
-      }
-
-      public Object caseXSDAttributeUse(XSDAttributeUse object)
-      {
-        return new XSDAttributeUseAdapter();
-      }
-      
-      public Object caseXSDParticle(XSDParticle object)
-      {
-        return new XSDParticleAdapter();
-      }
-
-      public Object caseXSDElementDeclaration(XSDElementDeclaration object)
-      {
-        return new XSDElementDeclarationAdapter();
-      }
-      
-      public Object caseXSDSimpleTypeDefinition(XSDSimpleTypeDefinition object)
-      {
-        return new XSDSimpleTypeDefinitionAdapter();
-      }
-      
-      public Object caseXSDComplexTypeDefinition(XSDComplexTypeDefinition object)
-      {
-        // we don't like exposing the 'anyType' type as a visible complex type
-        // so we adapt it in a specialized way so that it's treated as simple type
-        // that way it doesn't show up as a reference from a field
-        //
-        if ("anyType".equals(object.getName())) //$NON-NLS-1$
-        {
-          return new XSDAnyTypeDefinitionAdapter(); 
-        }  
-        else
-        {             
-          return new XSDComplexTypeDefinitionAdapter();
-        }  
-      }
-      
-      public Object caseXSDModelGroup(XSDModelGroup object)
-      {
-        return new XSDModelGroupAdapter();
-      }
-
-      public Object caseXSDSchema(XSDSchema object)
-      {
-        return new XSDSchemaAdapter();
-      }
-      
-      public Object caseXSDEnumerationFacet(XSDEnumerationFacet object)
-      {
-        return new XSDEnumerationFacetAdapter();
-      }
-      
-      public Object caseXSDRedefine(XSDRedefine object)
-      {
-        return new XSDRedefineAdapter();
-      }
-    };
-    Object o = xsdSwitch.doSwitch((EObject) target);
-    Adapter result = null;
-    if (o instanceof Adapter)
-    {
-      result = (Adapter) o;
-    }
-    else
-    {
-//      Thread.dumpStack();
-    }
-    return result;
-  }
-
-  public Adapter adapt(Notifier target)
-  {
-    return adapt(target, this);
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAnyTypeDefinitionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAnyTypeDefinitionAdapter.java
deleted file mode 100644
index 3e8dc51..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAnyTypeDefinitionAdapter.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-public class XSDAnyTypeDefinitionAdapter extends XSDTypeDefinitionAdapter
-{
-  public boolean isComplexType()
-  {
-    return false;
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return false;
-  }
-
-  public String[] getActions(Object object)
-  {
-	return null;
-  }
-
-  public boolean isAnonymous()
-  {
-    return false;
-  }
-
-  public IADTObject getTopContainer()
-  {
-    return null;
-  }
-
-  public Command getDeleteCommand()
-  {
-    return null;
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(((XSDConcreteComponent)target).getSchema());
-    return (IModel)adapter;
-  } 
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeDeclarationAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeDeclarationAdapter.java
deleted file mode 100644
index 2ed6b4f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeDeclarationAdapter.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDAttributeDeclarationAdapter extends XSDBaseAttributeAdapter implements IActionProvider
-{
-  protected XSDAttributeDeclaration getXSDAttributeDeclaration()
-  {
-    return (XSDAttributeDeclaration)target;
-  }
- 
-  protected XSDAttributeDeclaration getResolvedXSDAttributeDeclaration()
-  {
-    return getXSDAttributeDeclaration().getResolvedAttributeDeclaration();
-  }
-  
-  public boolean isGlobal()
-  {
-    return getXSDAttributeDeclaration().eContainer() instanceof XSDSchema;
-  }
-  
-  public boolean isReference()
-  {
-    return getXSDAttributeDeclaration().isAttributeDeclarationReference();
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDAttributeDeclaration().getSchema());
-    return (IModel)adapter;
-  }
-
-  // https://bugs.eclipse.org/bugs/show_bug.cgi?id=251008
-  public String[] getActions(Object object)
-  {    
-    if(!isGlobal())
-    {    	    	
-    	List defaultActions = new ArrayList();
-    	defaultActions = Arrays.asList(super.getActions(object));
-    	
-    	ArrayList list = new ArrayList();
-    	list.add(BaseSelectionAction.SUBMENU_START_ID + Messages._UI_ACTION_INSERT_ATTRIBUTE);
-    	list.add(AddXSDAttributeDeclarationAction.BEFORE_SELECTED_ID);
-    	list.add(AddXSDAttributeDeclarationAction.AFTER_SELECTED_ID);
-    	list.add(BaseSelectionAction.SUBMENU_END_ID);
-    	
-    	int len = defaultActions.size();
-    	for(int i = 0; i < len; i++)
-    	{
-    		if (defaultActions.get(i).equals(AddXSDAttributeDeclarationAction.ID))
-    		{
-    		  continue;
-    		}
-    		list.add(defaultActions.get(i));
-    	}
-      return (String [])list.toArray(new String[0]);
-    }
-    else
-    {
-    	return super.getActions(object);
-    }    
-  }  
-  
-  
-  public boolean isFocusAllowed()
-  {
-    return isGlobal();
-  }
-  
-  public String getTypeNameQualifier()
-  {
-    XSDTypeDefinition type = getResolvedXSDAttributeDeclaration().getTypeDefinition();
-    if (type != null)
-    {
-      return type.getTargetNamespace();
-    }
-    return "";
-  }
-
-  public IADTObject getTopContainer()
-  {
-    if (!isGlobal())
-    {
-      return getGlobalXSDContainer(getXSDAttributeDeclaration());
-    }
-    return this;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java
deleted file mode 100644
index fc6c9db..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeGroupDefinitionAdapter.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyAttributeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDWildcard;
-
-public class XSDAttributeGroupDefinitionAdapter extends XSDBaseAdapter implements IStructure, IActionProvider, IGraphElement, IADTObjectListener
-{
-  public static final Image ATTRIBUTE_GROUP_REF_ICON_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAttributeGroupRef.gif");
-  public static final Image ATTRIBUTE_GROUP_REF_DISABLED_ICON_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAttributeGroupRefdis.gif");
-  public static final Image ATTRIBUTE_GROUP_ICON_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAttributeGroup.gif");
-  public static final Image ATTRIBUTE_GROUP_DISABLED_ICON_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAttributeGroupdis.gif");
-	  
-  protected List fields = null;
-  protected List otherThingsToListenTo = null;
-
-  public XSDAttributeGroupDefinitionAdapter()
-  {
-    super();
-  }
-
-  public XSDAttributeGroupDefinition getXSDAttributeGroupDefinition()
-  {
-    return (XSDAttributeGroupDefinition) target;
-  }
-
-  public Image getImage()
-  {
-    XSDAttributeGroupDefinition xsdAttributeGroupDefinition = (XSDAttributeGroupDefinition) target;
-    if (xsdAttributeGroupDefinition.isAttributeGroupDefinitionReference())
-    {
-      return isReadOnly() ? ATTRIBUTE_GROUP_REF_DISABLED_ICON_IMAGE : ATTRIBUTE_GROUP_REF_ICON_IMAGE;
-    }
-    else
-    {
-      return isReadOnly() ? ATTRIBUTE_GROUP_DISABLED_ICON_IMAGE : ATTRIBUTE_GROUP_ICON_IMAGE;
-    }
-  }
-
-  public String getText()
-  {
-    XSDAttributeGroupDefinition xsdAttributeGroupDefinition = (XSDAttributeGroupDefinition) target;
-    String result = xsdAttributeGroupDefinition.isAttributeGroupDefinitionReference() ? xsdAttributeGroupDefinition.getQName() : xsdAttributeGroupDefinition.getName();
-    return result == null ? Messages._UI_LABEL_ABSENT : result;
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    XSDAttributeGroupDefinition xsdAttributeGroup = (XSDAttributeGroupDefinition) target;
-    List list = new ArrayList();
-    Iterator iterator = xsdAttributeGroup.getContents().iterator();    
-    while (iterator.hasNext())
-    {
-    	Object o = iterator.next();
-    	if (o instanceof XSDAttributeUse)
-    	{
-    		list.add(((XSDAttributeUse)o).getAttributeDeclaration());
-    	}
-    	else
-    	{
-    		list.add(o);
-    	}
-    }
-    XSDWildcard wildcard = xsdAttributeGroup.getAttributeWildcardContent();
-    if (wildcard != null)
-    {
-    	list.add(wildcard);
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return (ITreeElement[]) adapterList.toArray(new ITreeElement[0]);
-  }
-  
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-    list.add(AddXSDAttributeDeclarationAction.ID);
-    list.add(AddXSDAnyAttributeAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(DeleteAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    Object schema = getEditorSchema();
-    XSDAttributeGroupDefinition attributeGroupDefinition = getXSDAttributeGroupDefinition();
-    if (attributeGroupDefinition.getSchema() == schema)
-    {
-      XSDConcreteComponent container = attributeGroupDefinition.getContainer();
-      if (container == schema || container instanceof XSDRedefine)
-      {
-        list.add(SetInputToGraphView.ID);
-      }
-    }
-    else
-    {
-      list.add(OpenInNewEditor.ID);
-    }
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-    return (String [])list.toArray(new String[0]);
-  }
-
-  public Command getAddNewFieldCommand(String fieldKind)
-  {
-    return null;
-  }
-
-  public Command getDeleteCommand()
-  {
-    return new DeleteCommand(getXSDAttributeGroupDefinition());
-  }
-
-  public List getFields()
-  {
-    if (fields == null)
-    {
-      fields = new ArrayList();
-      otherThingsToListenTo = new ArrayList();
-      XSDVisitorForFields visitor = new XSDVisitorForFields();
-      visitor.visitAttributeGroupDefinition(getXSDAttributeGroupDefinition());
-      populateAdapterList(visitor.concreteComponentList, fields);
-      populateAdapterList(visitor.thingsWeNeedToListenTo, otherThingsToListenTo);
-      for (Iterator i = otherThingsToListenTo.iterator(); i.hasNext();)
-      {
-        Adapter adapter = (Adapter) i.next();
-        if (adapter instanceof IADTObject)
-        {
-          IADTObject adtObject = (IADTObject) adapter;
-          adtObject.registerListener(this);
-        }
-      }
-    }
-    return fields;
-  }
-
-  protected void clearFields()
-  {
-    if (otherThingsToListenTo != null)
-    {
-      for (Iterator i = otherThingsToListenTo.iterator(); i.hasNext();)
-      {
-        Adapter adapter = (Adapter) i.next();
-        if (adapter instanceof IADTObject)
-        {
-          IADTObject adtObject = (IADTObject) adapter;
-          adtObject.unregisterListener(this);
-        }
-      }
-    }
-    fields = null;
-    otherThingsToListenTo = null;
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDAttributeGroupDefinition().getSchema());
-    return (IModel)adapter;
-  }
-
-  public String getName()
-  {
-    // TODO (cs) ... review this
-    return getText();
-  }
-
-  public boolean isFocusAllowed()
-  {
-    XSDAttributeGroupDefinition xsdAttributeGroupDefinition = (XSDAttributeGroupDefinition) target;
-    if (xsdAttributeGroupDefinition.isAttributeGroupDefinitionReference())
-    {
-      return false;
-    }
-    return true;
-  }
-
-  public IADTObject getTopContainer()
-  {
-    XSDAttributeGroupDefinition attrGroupDef = getXSDAttributeGroupDefinition();
-    XSDConcreteComponent container = attrGroupDef.getContainer();
-    if (container instanceof XSDSchema || container instanceof XSDRedefine)
-      return this;
-    else
-      return getGlobalXSDContainer(attrGroupDef);
-  }
-
-  public void notifyChanged(Notification msg)
-  {
-    clearFields();
-    super.notifyChanged(msg);
-  }
-  
-  public void propertyChanged(Object object, String property)
-  {
-    clearFields();
-    notifyListeners(this, null);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeUseAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeUseAdapter.java
deleted file mode 100644
index 668365c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDAttributeUseAdapter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDAttributeUseAdapter extends XSDBaseAttributeAdapter implements IActionProvider
-{
-  protected XSDAttributeDeclaration getXSDAttributeDeclaration()
-  {
-    return getXSDAttributeUse().getAttributeDeclaration();
-  }
-
-  protected XSDAttributeDeclaration getResolvedXSDAttributeDeclaration()
-  {
-    return getXSDAttributeDeclaration().getResolvedAttributeDeclaration();
-  }
-  
-  protected XSDAttributeUse getXSDAttributeUse()
-  {
-    return (XSDAttributeUse)target;
-  }
-
-  public XSDAttributeUseAdapter()
-  {
-    super();
-  }
-
-  public String getText()
-  {
-    return getTextForAttributeUse(getXSDAttributeUse(), true);
-  }
-
-  public String getTextForAttributeUse(XSDAttributeUse attributeUse, boolean showType)
-  {
-    XSDAttributeDeclaration ad = attributeUse.getAttributeDeclaration();
-      
-    StringBuffer result  = new StringBuffer();
-    result.append(getTextForAttribute(ad, showType));
-    /*
-    if (xsdAttributeUse.isSetConstraint())
-    {
-      if (result.length() != 0)
-      {
-        result.append("  ");
-      }
-      result.append('<');
-      result.append(xsdAttributeUse.getConstraint());
-      result.append("=\"");
-      result.append(xsdAttributeUse.getLexicalValue());
-      result.append("\">");
-    }
-    */
-    return result.toString();
-  }
-  
-  public boolean isGlobal()
-  {
-    return false;
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDAttributeDeclaration().getSchema());
-    return (IModel)adapter;
-  }
-  
-  public String getTypeNameQualifier()
-  {
-    XSDTypeDefinition type = getResolvedXSDAttributeDeclaration().getTypeDefinition();
-    if (type != null)
-    {
-      return type.getTargetNamespace();
-    }
-    return "";
-  }
-
-  public IADTObject getTopContainer()
-  {
-    return getGlobalXSDContainer(getXSDAttributeUse());
-  }
-
-  public boolean isReference()
-  {
-    return getXSDAttributeUse().getAttributeDeclaration().isAttributeDeclarationReference();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDBaseAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDBaseAdapter.java
deleted file mode 100644
index 4db258d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDBaseAdapter.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.w3c.dom.Element;
-
-public class XSDBaseAdapter extends AdapterImpl implements IADTObject, ITreeElement
-{  
-  protected List listenerList = new ArrayList();
-  
-  public boolean isAdapterForType(Object type)
-  {
-    return type == XSDAdapterFactory.getInstance();
-  }
-  
-  public void populateAdapterList(List notifierList, List adapterList)
-  {
-    for (Iterator i = notifierList.iterator(); i.hasNext(); )
-    {
-      Object obj = i.next();
-      if (obj instanceof XSDConcreteComponent)
-      {
-        XSDConcreteComponent component = (XSDConcreteComponent)obj;
-        adapterList.add(XSDAdapterFactory.getInstance().adapt(component));
-      }
-      else
-      {
-        adapterList.add(obj);
-      }
-    }
-  }  
-  
-  public void registerListener(IADTObjectListener listener)
-  {
-    if (!listenerList.contains(listener))
-    {
-      listenerList.add(listener);
-    }
-  }
-  
-  public void unregisterListener(IADTObjectListener listener)
-  {
-    listenerList.remove(listener);
-  }
-  
-  public void notifyChanged(Notification msg)
-  {
-    super.notifyChanged(msg);
-    notifyListeners(this, null);
-  }
-  
-  protected void notifyListeners(Object changedObject, String property)
-  {
-    List clonedListenerList = new ArrayList();
-    clonedListenerList.addAll(listenerList);
-    for (Iterator i = clonedListenerList.iterator(); i.hasNext(); )
-    {
-      IADTObjectListener listener = (IADTObjectListener)i.next();
-      listener.propertyChanged(this, property);
-    }      
-  }
-    
-  public ITreeElement[] getChildren()
-  {
-    return null;
-  }
-  
-  public Image getImage()
-  {
-    return null;
-  }
-  
-  public String getText()
-  {
-    return ""; //$NON-NLS-1$
-  }
-  
-  public ITreeElement getParent()
-  {
-    return null;
-  }
-  
-  public boolean hasChildren()
-  {
-    if (getChildren() != null)
-    {
-      return getChildren().length > 0;
-    }
-    return false;
-  }
-  
-
-  /**
-   * Implements IField getContainerType.  Get parent Complex Type containing the field
-   * @return IComplexType
-   */
-  public IComplexType getContainerType()
-  {
-    XSDConcreteComponent xsdConcreteComponent = (XSDConcreteComponent) target;
-    XSDConcreteComponent parent = null;
-    XSDComplexTypeDefinition ct = null;
-    for (parent = xsdConcreteComponent.getContainer(); parent != null; )
-    {
-      if (parent instanceof XSDComplexTypeDefinition)
-      {
-        ct = (XSDComplexTypeDefinition)parent;
-        break;
-      }
-      parent = parent.getContainer();
-    }
-    if (ct != null)
-    {
-      return (IComplexType)XSDAdapterFactory.getInstance().adapt(ct);
-    }
-    return null;
-  }
-  
-  public boolean isReadOnly()
-  {
-    XSDSchema xsdSchema = null;
-    try
-    {
-      IEditorPart editorPart = null;
-      IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-      if (window != null)
-      {
-        IWorkbenchPage page = window.getActivePage();
-        if (page != null)
-        {
-          editorPart = page.getActiveEditor();
-        }
-      }
-      if (target instanceof XSDConcreteComponent)
-      {
-        xsdSchema = ((XSDConcreteComponent)target).getSchema();
-      }
-      if (editorPart == null)
-      {
-        return fallBackCheckIsReadOnly();
-      }
-      
-      XSDSchema editorSchema = (XSDSchema)editorPart.getAdapter(XSDSchema.class);
-      if (xsdSchema != null && xsdSchema == editorSchema)
-      {
-        return false;
-      }
-      else
-      {
-        return fallBackCheckIsReadOnly();
-      }
-    }
-    catch(Exception e)
-    {
-
-    }
-    return true;
-  }
-  
-  private boolean fallBackCheckIsReadOnly()
-  {
-    Element element = ((XSDConcreteComponent)target).getElement();
-    if (element instanceof IDOMNode
-        || element instanceof ElementImpl)
-    {
-       return false;
-    }
-    return true;
-  }
-
-  protected Object getEditorSchema()
-  {
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-    return editorPart.getAdapter(XSDSchema.class);
-  }
-  
-  protected IADTObject getGlobalXSDContainer(XSDConcreteComponent component)
-  {
-    XSDConcreteComponent c = component.getContainer();
-    // We want the top most structural component
-    while (c != null && 
-           !(c.getContainer() instanceof XSDSchema) && 
-           !(c instanceof XSDComplexTypeDefinition) &&
-           !(c instanceof XSDSimpleTypeDefinition) &&
-           !(c instanceof XSDModelGroupDefinition) &&
-           !(c instanceof XSDAttributeGroupDefinition))
-    {
-      c = c.getContainer();
-    }
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(c);
-    if (adapter instanceof IADTObject)
-      return (IADTObject)adapter;
-    return null;
-  }
-
-  /**
-   * Indicates the presence of an abstract attribute
-   * @return true if the component's abstract attribute is true
-   */
-  public boolean isAbstract()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDBaseAttributeAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDBaseAttributeAdapter.java
deleted file mode 100644
index 9984076..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDBaseAttributeAdapter.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-
-// a base adapter for reuse by an AttributeUse and AttributeDeclaration
-//
-public abstract class XSDBaseAttributeAdapter extends XSDBaseAdapter implements IField, IGraphElement
-{
-  protected abstract XSDAttributeDeclaration getXSDAttributeDeclaration();
-  protected abstract XSDAttributeDeclaration getResolvedXSDAttributeDeclaration();
-
-  public XSDBaseAttributeAdapter()
-  {
-    super();
-  }
-
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-    if (!isGlobal())
-    {
-      list.add(AddXSDAttributeDeclarationAction.ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-    }
-    list.add(DeleteAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    Object schema = getEditorSchema();
-    if (getXSDAttributeDeclaration().getSchema() == schema)
-    {
-      if (getXSDAttributeDeclaration().getContainer() == schema)
-      {
-        list.add(SetInputToGraphView.ID);
-      }
-    }
-    else
-    {
-      list.add(OpenInNewEditor.ID);
-    }
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-    return (String[]) list.toArray(new String[0]);
-  }
-
-  public Command getDeleteCommand()
-  {
-    return new DeleteCommand(getXSDAttributeDeclaration());
-  }
-
-  public String getKind()
-  {
-    return XSDConstants.ATTRIBUTE_ELEMENT_TAG;
-  }
-
-  public int getMaxOccurs()
-  {
-    // TODO Auto-generated method stub
-    return -3;
-  }
-
-  public int getMinOccurs()
-  {
-    // TODO Auto-generated method stub
-    return -3;
-  }
-
-  public String getName()
-  {
-    XSDAttributeDeclaration resolvedAttributeDeclaration = getResolvedXSDAttributeDeclaration();
-    String name = resolvedAttributeDeclaration.getName();
-    return (name == null) ? "" : name; //$NON-NLS-1$
-  }
-
-  public IType getType()
-  {
-    XSDTypeDefinition td = getResolvedXSDAttributeDeclaration().getTypeDefinition();
-    return (td != null) ? (IType) XSDAdapterFactory.getInstance().adapt(td) : null;
-  }
-
-  public String getTypeName()
-  {
-    IType type = getType();
-    if (type != null)
-    {  
-      return type.getName();
-    }
-    return "";
-  }
-
-  public String getTypeNameQualifier()
-  {
-    XSDAttributeDeclaration attr = getResolvedXSDAttributeDeclaration();
-    if (attr != null)
-    {
-      if (attr.getTypeDefinition() != null)
-      {
-        return attr.getTypeDefinition().getTargetNamespace();        
-      }
-    }
-    return null;
-  }
-
-  public Command getUpdateMaxOccursCommand(int maxOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateMinOccursCommand(int minOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateNameCommand(String name)
-  {
-    return new UpdateNameCommand(Messages._UI_ACTION_UPDATE_NAME, getResolvedXSDAttributeDeclaration(), name);
-  }
-
-  public Command getUpdateTypeNameCommand(String typeName, String quailifier)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement#getImage()
-   */
-  public Image getImage()
-  {
-    XSDAttributeDeclaration xsdAttributeDeclaration = getXSDAttributeDeclaration();  // don't want the resolved attribute
-    if (xsdAttributeDeclaration.isAttributeDeclarationReference())
-    {
-      if (isReadOnly())
-      {
-        return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAttributeRefdis.gif");
-      }
-      return XSDEditorPlugin.getXSDImage("icons/XSDAttributeRef.gif"); //$NON-NLS-1$
-    }
-    else
-    {
-      if (isReadOnly())
-      {
-        return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAttributedis.gif");
-      }
-      return XSDEditorPlugin.getXSDImage("icons/XSDAttribute.gif"); //$NON-NLS-1$
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement#getText()
-   */
-  public String getText()
-  {
-    return getTextForAttribute(getResolvedXSDAttributeDeclaration(), true);
-  }
-
-  public String getTextForAttribute(XSDAttributeDeclaration ad, boolean showType)
-  {
-    ad = ad.getResolvedAttributeDeclaration();
-    String name = ad.getName();
-    StringBuffer result = new StringBuffer();
-    if (name == null)
-    {
-      result.append(" " + Messages._UI_LABEL_ABSENT + " ");  //$NON-NLS-1$ //$NON-NLS-2$
-    }
-    else
-    {
-      result.append(name);
-    }
-    if (ad.getAnonymousTypeDefinition() == null && ad.getTypeDefinition() != null)
-    {
-      result.append(" : "); //$NON-NLS-1$
-      // result.append(resolvedAttributeDeclaration.getTypeDefinition().getQName(xsdAttributeDeclaration));
-      result.append(ad.getTypeDefinition().getName());
-    }
-    return result.toString();
-  }
-
-  public boolean isGlobal()
-  {
-    return false;
-  }
-  
-  public boolean isReference()
-  {
-    return false;
-  }
-  
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDAttributeDeclaration().getSchema());
-    return (IModel)adapter;
-  }  
-
-  public boolean isFocusAllowed()
-  {
-    return false;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDChildUtility.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDChildUtility.java
deleted file mode 100644
index 191110c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDChildUtility.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDSwitch;
-              
-
-public class XSDChildUtility
-{              
-  static public List getModelChildren(Object model)
-  {
-    XSDChildVisitor visitor = new XSDChildVisitor(model);
-    visitor.visitXSDObject(model);
-    return visitor.list;
-  }
-
-  static public List getImmediateDerivedTypes(XSDComplexTypeDefinition complexType)
-  {
-    ArrayList typesDerivedFrom = new ArrayList();
-
-    // A handy convenience method quickly gets all 
-    // typeDefinitions within our schema; note that 
-    // whether or not this returns types in included, 
-    // imported, or redefined schemas is subject to change
-    List typedefs = complexType.getSchema().getTypeDefinitions();
-
-    for (Iterator iter = typedefs.iterator(); iter.hasNext(); )
-    {
-      XSDTypeDefinition typedef = (XSDTypeDefinition)iter.next();
-      // Walk the baseTypes from this typedef seeing if any 
-      // of them match the requested one
-      if (complexType.equals(typedef.getBaseType()))
-      {
-        // We found it, return the original one and continue
-        typesDerivedFrom.add(typedef);
-      }
-    }
-    return typesDerivedFrom;
-  }
-  // TODO... use the XSDVisitor defined in xsdeditor.util instead
-  //          
-  public static class XSDChildVisitor extends XSDVisitor
-  {
-    Object root;
-    List list = new ArrayList();
-
-    public XSDChildVisitor(Object root)
-    {
-      this.root = root;
-    }                  
-
-    public void visitXSDModelGroup(XSDModelGroup xsdModelGroup)
-    {
-      if (xsdModelGroup != root)
-      {
-        list.add(xsdModelGroup); 
-      }                         
-      else
-      {
-        super.visitXSDModelGroup(xsdModelGroup);
-      }
-    }
-
-    public void visitXSDModelGroupDefinition(XSDModelGroupDefinition xsdModelGroupDefinition)
-    {
-      if (xsdModelGroupDefinition != root)
-      {
-        list.add(xsdModelGroupDefinition);
-      }                         
-      else
-      {
-        super.visitXSDModelGroupDefinition(xsdModelGroupDefinition);
-      }
-    }
-
-    public void visitXSDElementDeclaration(XSDElementDeclaration xsdElementDeclaration)
-    {
-      if (xsdElementDeclaration != root)
-      {
-        list.add(xsdElementDeclaration);
-        
-      }                         
-      else
-      {
-        super.visitXSDElementDeclaration(xsdElementDeclaration);
-      }
-    }
-
-    public void visitXSDComplexTypeDefinition(XSDComplexTypeDefinition xsdComplexTypeDefinition)
-    {
-      if (xsdComplexTypeDefinition != root)
-      {                                    
-        if (xsdComplexTypeDefinition.getName() != null || getModelChildren(xsdComplexTypeDefinition).size() > 0)
-        {
-          list.add(xsdComplexTypeDefinition);
-        }
-      }                         
-      else
-      {
-        super.visitXSDComplexTypeDefinition(xsdComplexTypeDefinition);
-      }
-    }    
-
-    public void visitXSDWildcard(XSDWildcard xsdWildCard)
-    {
-      if (xsdWildCard != root)
-      {                                    
-        list.add(xsdWildCard);        
-      }                         
-      else
-      {
-        super.visitXSDWildcard(xsdWildCard);
-      }
-    }
-  }
-               
-
-  public static class XSDVisitor
-  { 
-    int indent = 0;
-                 
-    public void visitXSDObject(Object object)
-    {           
-      if (object == null)
-        return;
-
-      XSDSwitch theSwitch = new XSDSwitch()
-      {   
-        public Object caseXSDComplexTypeDefinition(XSDComplexTypeDefinition object)
-        {
-          visitXSDComplexTypeDefinition(object);
-          return null;
-        } 
-
-        public Object caseXSDAttributeUse(XSDAttributeUse object)
-        {
-          visitXSDAttributeUse(object);
-          return null;
-        }
-
-        public Object caseXSDElementDeclaration(XSDElementDeclaration object)
-        {
-          visitXSDElementDeclaration(object);
-          return null;
-        }
-
-        public Object caseXSDModelGroupDefinition(XSDModelGroupDefinition object)
-        {
-          visitXSDModelGroupDefinition(object);
-          return super.caseXSDModelGroupDefinition(object);
-        }
-
-        public Object caseXSDModelGroup(XSDModelGroup object)
-        {
-          visitXSDModelGroup(object);
-          return super.caseXSDModelGroup(object);
-        }
-
-        public Object caseXSDParticle(XSDParticle object)
-        { 
-          visitXSDParticle(object);
-          return null;
-        } 
-
-        public Object caseXSDSchema(XSDSchema object)
-        { 
-          visitXSDSchema(object);
-          return null;
-        } 
-
-        public Object caseXSDWildcard(XSDWildcard object)
-        { 
-          visitXSDWildcard(object);
-          return null;
-        } 
-      };
-      theSwitch.doSwitch((EObject)object);
-    }
-         
-    public void visitXSDAttributeUse(XSDAttributeUse xsdAttributeUse)
-    {  
-//      printIndented("@" + xsdAttributeUse.getAttributeDeclaration().getName());
-    }
-
-    public void visitXSDSchema(XSDSchema xsdSchema)
-    {         
-      indent += 2;
-      for (Iterator iterator = xsdSchema.getElementDeclarations().iterator(); iterator.hasNext(); )
-      {
-        visitXSDObject(iterator.next());
-      }
-      indent -= 2;
-    }
-
-    public void visitXSDElementDeclaration(XSDElementDeclaration xsdElementDeclaration)
-    {      
-      indent += 2;         
-      XSDTypeDefinition td = xsdElementDeclaration.getTypeDefinition();
-      if (td == null)
-      {
-        td = xsdElementDeclaration.getAnonymousTypeDefinition();
-      }                       
-      visitXSDObject(td);
-      indent -= 2;
-    }
-   
-    public void visitXSDComplexTypeDefinition(XSDComplexTypeDefinition xsdComplexTypeDefinition)
-    {
-      indent += 2;
-      for (Iterator i = xsdComplexTypeDefinition.getAttributeUses().iterator(); i.hasNext(); )
-      {        
-        visitXSDObject(i.next());
-      }
-      visitXSDObject(xsdComplexTypeDefinition.getContent());
-      indent -= 2;
-    }
-
-    public void visitXSDModelGroup(XSDModelGroup xsdModelGroup)
-    {
-      indent += 2;
-      for (Iterator iterator = xsdModelGroup.getContents().iterator(); iterator.hasNext(); )
-      {
-        visitXSDObject(iterator.next());
-      } 
-      indent -= 2;
-    }     
-
-    public void visitXSDModelGroupDefinition(XSDModelGroupDefinition xsdModelGroupDefinition)
-    {
-      indent += 2;
-      visitXSDObject(xsdModelGroupDefinition.getResolvedModelGroupDefinition().getModelGroup());
-      indent -= 2;
-    }
-
-    public void visitXSDParticle(XSDParticle xsdParticle)
-    {
-      indent += 2;                 
-      if (xsdParticle.getContent() != null)
-        visitXSDObject(xsdParticle.getContent());
-      indent -= 2;
-    } 
-
-    public void visitXSDWildcard(XSDWildcard object)
-    { 
-
-    }
-
-    public void printIndented(String string)
-    { 
-      //String spaces = "";
-      //for (int i = 0; i < indent; i++)
-      //{
-      //  spaces += " ";
-      //}               
-     
-    }
-  } 
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDComplexTypeDefinitionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDComplexTypeDefinitionAdapter.java
deleted file mode 100644
index 5946be6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDComplexTypeDefinitionAdapter.java
+++ /dev/null
@@ -1,511 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyAttributeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeGroupDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetBaseTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDElementCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.SpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.TargetConnectionSpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDDerivationMethod;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDComplexTypeDefinitionAdapter extends XSDTypeDefinitionAdapter implements IComplexType, IADTObjectListener
-{
-  protected List fields = null;
-  protected List otherThingsToListenTo = null;
-
-  public XSDComplexTypeDefinition getXSDComplexTypeDefinition()
-  {
-    return (XSDComplexTypeDefinition) target;
-  }
-
-  public IType getSuperType()
-  {
-    XSDTypeDefinition td = getXSDTypeDefinition().getBaseType();
-
-    // test to filter out the 'anyType' type ... don't want to see that
-    //
-    if (td != null && !td.getName().equals("anyType")) //$NON-NLS-1$
-    {
-      return (IType) XSDAdapterFactory.getInstance().adapt(td);
-    }
-    return null;
-  }
-
-  protected void clearFields()
-  {
-    if (otherThingsToListenTo != null)
-    {
-      for (Iterator i = otherThingsToListenTo.iterator(); i.hasNext();)
-      {
-        Adapter adapter = (Adapter) i.next();
-        if (adapter instanceof IADTObject)
-        {
-          IADTObject adtObject = (IADTObject) adapter;
-          adtObject.unregisterListener(this);
-        }
-      }
-    }
-    fields = null;
-    otherThingsToListenTo = null;
-  }
-
-  public List getFields()
-  {
-    if (fields == null)
-    {
-      fields = new ArrayList();
-      otherThingsToListenTo = new ArrayList();
-
-      XSDVisitorForFields visitor = new XSDVisitorForFieldsWithSpaceFillers();
-      visitor.visitComplexTypeDefinition(getXSDComplexTypeDefinition());
-      populateAdapterList(visitor.concreteComponentList, fields);
-      populateAdapterList(visitor.thingsWeNeedToListenTo, otherThingsToListenTo);
-      for (Iterator i = otherThingsToListenTo.iterator(); i.hasNext();)
-      {
-        Adapter adapter = (Adapter) i.next();
-        if (adapter instanceof IADTObject)
-        {
-          IADTObject adtObject = (IADTObject) adapter;
-          adtObject.registerListener(this);
-        }
-      }
-    }
-    return fields;
-  }
-
-  class XSDVisitorForFieldsWithSpaceFillers extends XSDVisitorForFields
-  {
-    public XSDVisitorForFieldsWithSpaceFillers()
-    {
-      super();
-    }
-
-    public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-    {
-      for (Iterator it = attributeGroup.getContents().iterator(); it.hasNext();)
-      {
-        Object o = it.next();
-        if (o instanceof XSDAttributeUse)
-        {
-          XSDAttributeUse attributeUse = (XSDAttributeUse) o;
-          concreteComponentList.add(attributeUse.getAttributeDeclaration());
-          thingsWeNeedToListenTo.add(attributeUse.getAttributeDeclaration());
-        }
-        else if (o instanceof XSDAttributeGroupDefinition)
-        {
-          XSDAttributeGroupDefinition attrGroup = (XSDAttributeGroupDefinition) o;
-          thingsWeNeedToListenTo.add(attrGroup);
-          if (attrGroup.isAttributeGroupDefinitionReference())
-          {
-            attrGroup = attrGroup.getResolvedAttributeGroupDefinition();
-            if (attrGroup.getContents().size() == 0)
-            {
-              concreteComponentList.add(new SpaceFiller("attribute")); //$NON-NLS-1$
-            }
-            visitAttributeGroupDefinition(attrGroup);
-          }
-        }
-      }
-    }
-
-    public void visitModelGroup(XSDModelGroup modelGroup)
-    {
-      int numOfChildren = modelGroup.getContents().size();
-      if (numOfChildren == 0)
-      {
-        concreteComponentList.add(new SpaceFiller("element")); //$NON-NLS-1$
-      }
-      super.visitModelGroup(modelGroup);
-    }
-    
-    public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-    {
-      XSDModelGroupDefinition resolvedModelGroupDef = modelGroupDef.getResolvedModelGroupDefinition();
-      if (visitedGroups.contains(resolvedModelGroupDef.getModelGroup()))
-      {
-        concreteComponentList.add(new SpaceFiller("element")); //$NON-NLS-1$
-      }
-      super.visitModelGroupDefinition(modelGroupDef);
-    }
-  }
-
-  public List getModelGroups()
-  {
-    List groups = new ArrayList();
-    groups.addAll(XSDChildUtility.getModelChildren(getXSDComplexTypeDefinition()));
-    return groups;
-  }
-
-  public List getAttributeGroupContent()
-  {
-    EList attrContent = getXSDComplexTypeDefinition().getAttributeContents();
-    List attrUses = new ArrayList();
-    List list = new ArrayList();
-
-    for (Iterator it = attrContent.iterator(); it.hasNext();)
-    {
-      XSDAttributeGroupContent attrGroupContent = (XSDAttributeGroupContent) it.next();
-
-      if (attrGroupContent instanceof XSDAttributeGroupDefinition)
-      {
-        XSDAttributeGroupDefinition attributeGroupDefinition = (XSDAttributeGroupDefinition) attrGroupContent;
-        list.add(XSDAdapterFactory.getInstance().adapt(attributeGroupDefinition));
-        getAttributeUses(attributeGroupDefinition, attrUses);
-      }
-      else
-      {
-        attrUses.add(attrGroupContent);
-        list.add(new TargetConnectionSpaceFiller(this));
-      }
-    }
-    return list;
-  }
-
-  public boolean isComplexType()
-  {
-    return true;
-  }
-
-  public void notifyChanged(Notification msg)
-  {
-    clearFields();
-    super.notifyChanged(msg);
-  }
-
-  public Command getUpdateNameCommand(String newName)
-  {
-    return new UpdateNameCommand(Messages._UI_ACTION_UPDATE_NAME, getXSDComplexTypeDefinition(), newName);
-  }
-
-  public Command getAddNewFieldCommand(String fieldKind)
-  {
-    return new AddXSDElementCommand(Messages._UI_ACTION_ADD_FIELD, getXSDComplexTypeDefinition());
-  }
-
-  public Command getDeleteCommand()
-  {
-    return new DeleteCommand(getXSDComplexTypeDefinition());
-  }
-
-  protected class AddNewFieldCommand extends Command
-  {
-    protected String defaultName;
-    protected String fieldKind;
-
-    AddNewFieldCommand(String defaultName, String fieldKind)
-    {
-      this.defaultName = defaultName;
-      this.fieldKind = fieldKind;
-    }
-  }
-
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-    Object schema = getEditorSchema();
-    
-    XSDComplexTypeDefinition complexType = getXSDComplexTypeDefinition();
-    Object contentType = getContentType();
-    XSDDerivationMethod derivation = complexType.getDerivationMethod();
-    if (contentType instanceof XSDSimpleTypeDefinition)
-    {
-      List fields = getFields();
-      boolean hasSimpleContentAttributes = false;
-      for (Iterator iterator = fields.iterator(); iterator.hasNext(); )
-      {
-        Object field = iterator.next();
-        // We have attributes, so we need to add the compartment for housing the attributes
-        if (field instanceof XSDAttributeDeclarationAdapter)
-        {
-          hasSimpleContentAttributes = true;
-          break;
-        }
-      }
-
-      if (hasSimpleContentAttributes || XSDDerivationMethod.EXTENSION_LITERAL.equals(derivation))
-      {
-        list.add(AddXSDAttributeDeclarationAction.ID);
-      }
-      else if (XSDDerivationMethod.RESTRICTION_LITERAL.equals(derivation))
-      {
-        list.add(AddXSDEnumerationFacetAction.ID);
-      }
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(SetBaseTypeAction.ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(DeleteAction.ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-    }
-    else
-    {
-      list.add(AddXSDElementAction.ID);
-      list.add(AddXSDElementAction.REF_ID);
-      list.add(AddXSDAnyElementAction.ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(AddXSDAttributeDeclarationAction.ID);
-      list.add(AddXSDAttributeDeclarationAction.REF_ID);
-      list.add(AddXSDAttributeGroupDefinitionAction.REF_ID);
-      list.add(AddXSDAnyAttributeAction.ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(AddXSDModelGroupAction.SEQUENCE_ID);
-      list.add(AddXSDModelGroupAction.CHOICE_ID);
-      list.add(AddXSDModelGroupAction.ALL_ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(DeleteAction.ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(SetBaseTypeAction.ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-    }
-    if (complexType.getSchema() == schema)
-    {
-      XSDConcreteComponent container = complexType.getContainer();
-      if (container == schema || container instanceof XSDRedefine)
-      {
-        list.add(SetInputToGraphView.ID);
-      }
-    }
-    else
-    {
-      list.add(OpenInNewEditor.ID);
-    }
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-    String[] result = new String[list.size()];
-    list.toArray(result);
-    return result;
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    clearFields();
-    notifyListeners(this, null);
-  }
-
-  class BogusAction extends Action
-  {
-    BogusAction(String name)
-    {
-      super(name);
-    }
-
-    public void run()
-    {
-      // TODO Auto-generated method stub
-      super.run();
-    }
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    XSDComplexTypeDefinition xsdComplexTypeDefinition = getXSDComplexTypeDefinition();
-    List list = new ArrayList();
-    // Add attributes
-    for (Iterator i = xsdComplexTypeDefinition.getAttributeContents().iterator(); i.hasNext();)
-    {
-      Object obj = i.next();
-      if (obj instanceof XSDAttributeUse)
-      {
-        list.add(((XSDAttributeUse)obj).getAttributeDeclaration());
-      }
-      else if (obj instanceof XSDAttributeGroupDefinition)
-      {
-        getAttributeUses((XSDAttributeGroupDefinition) obj, list);
-      }
-    }
-    // Add enumerations     
-    boolean canHaveEnumerations = xsdComplexTypeDefinition.getContentType() instanceof XSDSimpleTypeDefinition &&	
-    		XSDDerivationMethod.RESTRICTION_LITERAL.equals(xsdComplexTypeDefinition.getDerivationMethod());
-    if (canHaveEnumerations)
-    {
-    	Object contentType = getContentType();
-    	if (contentType != null)
-    	{
-    		for (Iterator iterator = ((XSDSimpleTypeDefinition)contentType).getEnumerationFacets().iterator(); iterator.hasNext();)
-    		{
-    			XSDEnumerationFacet enumerationFacet = (XSDEnumerationFacet)iterator.next();
-    			list.add(enumerationFacet);
-    		}
-    	}
-    }
-    XSDWildcard anyAttr = xsdComplexTypeDefinition.getAttributeWildcard();
-    if (anyAttr != null)
-      list.add(anyAttr);
-    // get immediate XSD Model Group of this complex type
-    if (xsdComplexTypeDefinition.getContent() != null)
-    {
-      XSDComplexTypeContent xsdComplexTypeContent = xsdComplexTypeDefinition.getContent();
-      if (xsdComplexTypeContent instanceof XSDParticle)
-      {
-        XSDParticleContent particleContent = ((XSDParticle) xsdComplexTypeContent).getContent();
-        if (particleContent instanceof XSDModelGroup)
-        {
-          list.add(particleContent);
-        }
-      }
-    }
-    // get inherited XSD Model Group of this complex type
-    boolean showInheritedContent = XSDEditorPlugin.getPlugin().getShowInheritedContent();
-    if (showInheritedContent)
-    {
-      XSDTypeDefinition typeDef = xsdComplexTypeDefinition.getBaseTypeDefinition();
-      if (typeDef instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition baseCT = (XSDComplexTypeDefinition) typeDef;
-        if (baseCT.getTargetNamespace() != null && !baseCT.getTargetNamespace().equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001))
-        {
-          if (baseCT.getContent() != null)
-          {
-            XSDComplexTypeContent xsdComplexTypeContent = baseCT.getContent();
-            if (xsdComplexTypeContent instanceof XSDParticle)
-            {
-              XSDParticleContent particleContent = ((XSDParticle) xsdComplexTypeContent).getContent();
-              if (particleContent instanceof XSDModelGroup)
-              {
-                list.add(particleContent);
-              }
-            }
-          }
-        }
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return (ITreeElement[]) adapterList.toArray(new ITreeElement[0]);
-  }
-
-  public Image getImage()
-  {
-    if (isReadOnly())
-    {
-      return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDComplexTypedis.gif"); //$NON-NLS-1$
-    }
-    return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDComplexType.gif"); //$NON-NLS-1$
-  }
-
-  public String getText()
-  {
-    XSDComplexTypeDefinition xsdComplexTypeDefinition = (XSDComplexTypeDefinition) target;
-
-    StringBuffer result = new StringBuffer();
-
-    result.append(xsdComplexTypeDefinition.getName() == null ? "local type" : xsdComplexTypeDefinition.getName()); //$NON-NLS-1$
-
-    XSDTypeDefinition baseTypeDefinition = xsdComplexTypeDefinition.getBaseTypeDefinition();
-    if (baseTypeDefinition != null && baseTypeDefinition != xsdComplexTypeDefinition.getContent() && baseTypeDefinition.getName() != null && !XSDConstants.isURType(baseTypeDefinition))
-    {
-      result.append(" : "); //$NON-NLS-1$
-      result.append(baseTypeDefinition.getQName(xsdComplexTypeDefinition));
-    }
-
-    return result.toString();
-  }
-
-  public void getAttributeUses(XSDAttributeGroupDefinition attributeGroupDefinition, List list)
-  {
-    Iterator i = attributeGroupDefinition.getResolvedAttributeGroupDefinition().getContents().iterator();
-
-    while (i.hasNext())
-    {
-      XSDAttributeGroupContent attrGroupContent = (XSDAttributeGroupContent) i.next();
-
-      if (attrGroupContent instanceof XSDAttributeGroupDefinition)
-      {
-        getAttributeUses((XSDAttributeGroupDefinition) attrGroupContent, list);
-      }
-      else
-      {
-        list.add(XSDAdapterFactory.getInstance().adapt(attrGroupContent));
-      }
-    }
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDComplexTypeDefinition().getSchema());
-    return (IModel)adapter;
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return true;
-  }
-
-  public boolean isAnonymous()
-  {
-    XSDComplexTypeDefinition xsdComplexTypeDefinition = (XSDComplexTypeDefinition) target;
-    return !(xsdComplexTypeDefinition.eContainer() instanceof XSDSchema ||
-             xsdComplexTypeDefinition.eContainer() instanceof XSDRedefine);
-  }
-
-  public IADTObject getTopContainer()
-  {
-    return this;
-  }
-  
-  public boolean isAbstract()
-  {
-    return getXSDComplexTypeDefinition().isAbstract();
-  }
-
-  public Object getContentType()
-  {
-    return getXSDComplexTypeDefinition().getContent();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDElementDeclarationAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDElementDeclarationAdapter.java
deleted file mode 100644
index c1501d7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDElementDeclarationAdapter.java
+++ /dev/null
@@ -1,339 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.osgi.util.TextProcessor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.IAnnotationProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicityAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDElementDeclarationAdapter extends XSDParticleAdapter implements IField, IActionProvider, IAnnotationProvider, IGraphElement
-{
-  protected XSDElementDeclaration getXSDElementDeclaration()
-  {
-    return (XSDElementDeclaration) target;
-  }
-
-  public String getName()
-  {
-    String name = getXSDElementDeclaration().getResolvedElementDeclaration().getName();
-    return (name == null) ? "" : name; //$NON-NLS-1$
-  }
-
-  public String getTypeName()
-  {
-    IType type = getType();
-    if (type != null)
-    {  
-      return type.getName();
-    }
-    return null;
-  }
-
-  public String getTypeNameQualifier()
-  {
-    XSDTypeDefinition type = getXSDElementDeclaration().getResolvedElementDeclaration().getTypeDefinition();
-    if (type != null)
-    {
-      return type.getTargetNamespace();
-    }
-    return "";
-  }
-
-  public IType getType()
-  {
-    XSDTypeDefinition td = getXSDElementDeclaration().getResolvedElementDeclaration().getTypeDefinition();
-    //if (td != null &&
-    //    td.getTargetNamespace() != null && td.getTargetNamespace().equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001)) return null;
-    return (td != null) ? (IType) XSDAdapterFactory.getInstance().adapt(td) : null;
-  }
- 
-  public Image getImage()
-  {
-    XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration) target;
-    
-    if (!xsdElementDeclaration.isElementDeclarationReference())
-    {
-      if (isReadOnly())
-      {
-        return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDElementdis.gif");
-      }
-      return XSDEditorPlugin.getXSDImage("icons/XSDElement.gif"); //$NON-NLS-1$
-    }
-    else
-    {
-      if (isReadOnly())
-      {
-        return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDElementRefdis.gif");
-      }        
-      return XSDEditorPlugin.getXSDImage("icons/XSDElementRef.gif"); //$NON-NLS-1$
-    }
-  }
-
-  public String getText()
-  {
-    XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration) target;
-    XSDElementDeclaration resolvedElementDeclaration = xsdElementDeclaration.getResolvedElementDeclaration();
-    //String name = xsdElementDeclaration != resolvedElementDeclaration ? xsdElementDeclaration.getQName() : xsdElementDeclaration.getName();
-    String name = resolvedElementDeclaration.getName();
-
-    StringBuffer result = new StringBuffer();
-    if (name == null)
-    {
-      result.append(Messages._UI_LABEL_ABSENT);
-    }
-    else
-    {
-      result.append(name);
-    }
-
-    if (!xsdElementDeclaration.isGlobal())
-    {
-      Element element = xsdElementDeclaration.getElement();
-      boolean hasMinOccurs = element.hasAttribute(XSDConstants.MINOCCURS_ATTRIBUTE);
-      boolean hasMaxOccurs = element.hasAttribute(XSDConstants.MAXOCCURS_ATTRIBUTE);
-
-      if (hasMinOccurs || hasMaxOccurs)
-      {
-        result.append(" ["); //$NON-NLS-1$
-        if (hasMinOccurs)
-        {
-          int min = ((XSDParticle) xsdElementDeclaration.getContainer()).getMinOccurs();
-          if (min == XSDParticle.UNBOUNDED)
-          {
-            result.append("*"); //$NON-NLS-1$
-          }
-          else
-          {
-            result.append(String.valueOf(min));
-          }
-        }
-        else
-        // print default
-        {
-          int min = ((XSDParticle) xsdElementDeclaration.getContainer()).getMinOccurs();
-          result.append(String.valueOf(min));
-        }
-        if (hasMaxOccurs)
-        {
-          int max = ((XSDParticle) xsdElementDeclaration.getContainer()).getMaxOccurs();
-          result.append(".."); //$NON-NLS-1$
-          if (max == XSDParticle.UNBOUNDED)
-          {
-            result.append("*"); //$NON-NLS-1$
-          }
-          else
-          {
-            result.append(String.valueOf(max));
-          }
-        }
-        else
-        // print default
-        {
-          result.append(".."); //$NON-NLS-1$
-          int max = ((XSDParticle) xsdElementDeclaration.getContainer()).getMaxOccurs();
-          result.append(String.valueOf(max));
-
-        }
-        result.append("]"); //$NON-NLS-1$
-      }
-    }
-
-    if (resolvedElementDeclaration.getAnonymousTypeDefinition() == null && resolvedElementDeclaration.getTypeDefinition() != null)
-    {
-      result.append(" : "); //$NON-NLS-1$
-      // result.append(resolvedElementDeclaration.getTypeDefinition().getQName(xsdElementDeclaration));
-      result.append(resolvedElementDeclaration.getTypeDefinition().getName());
-    }
-
-    String text = result.toString();
-    String processedString = TextProcessor.process(text, ":");
-    return processedString;
-
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration) target;
-    List list = new ArrayList();
-    XSDTypeDefinition type = null;
-    if (xsdElementDeclaration.isElementDeclarationReference())
-    {
-      type = xsdElementDeclaration.getResolvedElementDeclaration().getTypeDefinition();
-    }
-    else
-    {
-      type = xsdElementDeclaration.getAnonymousTypeDefinition();
-      if (type == null)
-      {
-        type = xsdElementDeclaration.getTypeDefinition();
-      }
-    }
-
-    if (type instanceof XSDComplexTypeDefinition && type.getTargetNamespace() != null && !type.getTargetNamespace().equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001))
-    {
-      XSDComplexTypeDefinition ctType = (XSDComplexTypeDefinition) type;
-      if (ctType != null)
-      {
-        if (xsdElementDeclaration.isGlobal())
-          list.add(ctType);
-      }
-    }
-
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return (ITreeElement[]) adapterList.toArray(new ITreeElement[0]);
-
-  }
-  
-  public String getKind()
-  {
-    return "element"; //$NON-NLS-1$
-  }
-  
-  public boolean isGlobal()
-  {
-    return getXSDElementDeclaration().eContainer() instanceof XSDSchema;
-  }
-  
-  public boolean isReference()
-  {
-	  return ((XSDElementDeclaration) target).isElementDeclarationReference();
-  }
-
-  public Command getUpdateMaxOccursCommand(int maxOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateMinOccursCommand(int minOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateNameCommand(String name)
-  {
-    return new UpdateNameCommand(Messages._UI_ACTION_UPDATE_NAME, getXSDElementDeclaration().getResolvedElementDeclaration(), name);
-  }
-
-  public Command getUpdateTypeNameCommand(String typeName, String quailifier)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getDeleteCommand()
-  {
-    // TODO Auto-generated method stub
-    return new DeleteCommand(getXSDElementDeclaration());
-  }
-  
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-
-    if (!isGlobal())
-    {
-      list.add(BaseSelectionAction.SUBMENU_START_ID + Messages._UI_ACTION_INSERT_ELEMENT);
-      list.add(AddXSDElementAction.BEFORE_SELECTED_ID);
-      list.add(AddXSDElementAction.AFTER_SELECTED_ID);
-      list.add(BaseSelectionAction.SUBMENU_END_ID);
-    }
-
-    list.add(BaseSelectionAction.SUBMENU_START_ID + Messages._UI_ACTION_SET_TYPE);
-    list.add(SetTypeAction.SET_NEW_TYPE_ID);
-    list.add(SetTypeAction.SELECT_EXISTING_TYPE_ID);
-    list.add(BaseSelectionAction.SUBMENU_END_ID);
-
-    list.add(BaseSelectionAction.SUBMENU_START_ID + Messages._UI_ACTION_SET_MULTIPLICITY);
-    list.add(SetMultiplicityAction.REQUIRED_ID);
-    list.add(SetMultiplicityAction.ZERO_OR_ONE_ID);
-    list.add(SetMultiplicityAction.ZERO_OR_MORE_ID);
-    list.add(SetMultiplicityAction.ONE_OR_MORE_ID);    
-    list.add(BaseSelectionAction.SUBMENU_END_ID);
-
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(DeleteAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    Object schema = getEditorSchema();
-    if (getXSDElementDeclaration().getSchema() == schema)
-    {
-      if (getXSDElementDeclaration().getContainer() == schema)
-      {
-        list.add(SetInputToGraphView.ID);
-      }
-    }
-    else
-    {
-      list.add(OpenInNewEditor.ID);
-    }
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-    return (String [])list.toArray(new String[0]);
-  }
-  
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDElementDeclaration().getSchema());
-    return (IModel)adapter;
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return isGlobal();
-  }
-
-  public IADTObject getTopContainer()
-  {
-    if (!isGlobal())
-    {
-      return getGlobalXSDContainer(getXSDElementDeclaration());
-    }
-    return this;
-  }
-  
-  public boolean isAbstract()
-  {
-    return getXSDElementDeclaration().isAbstract();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDEmptyFieldAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDEmptyFieldAdapter.java
deleted file mode 100644
index 7e9b8fc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDEmptyFieldAdapter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-
-/**
- * @deprecated not used
- */
-public class XSDEmptyFieldAdapter extends XSDBaseAdapter implements IField
-{
-  String kind;
-  public XSDEmptyFieldAdapter()
-  {
-    super();
-  }
-
-  public String getKind()
-  {
-    return kind;
-  }
-  
-  public void setKind(String kind)
-  {
-    this.kind = kind;
-  }
-
-  public String getName()
-  {
-    return null;
-  }
-
-  public String getTypeName()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public String getTypeNameQualifier()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public IType getType()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public int getMinOccurs()
-  {
-    // TODO Auto-generated method stub
-    return 0;
-  }
-
-  public int getMaxOccurs()
-  {
-    // TODO Auto-generated method stub
-    return 0;
-  }
-  
-  public boolean isGlobal()
-  {
-    return false;
-  }
-
-  public Command getUpdateMinOccursCommand(int minOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateMaxOccursCommand(int maxOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateTypeNameCommand(String typeName, String quailifier)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateNameCommand(String name)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getDeleteCommand()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public IModel getModel()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public boolean isReference()
-  {
-    // TODO Auto-generated method stub
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDEnumerationFacetAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDEnumerationFacetAdapter.java
deleted file mode 100644
index e6dfbe9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDEnumerationFacetAdapter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDEnumerationFacet;
-
-public class XSDEnumerationFacetAdapter extends XSDBaseAdapter implements IActionProvider, IGraphElement
-{
-  public XSDEnumerationFacet getXSDEnumerationFacet()
-  {
-    return (XSDEnumerationFacet)target;
-  }
-  
-  public XSDEnumerationFacetAdapter()
-  {
-    super();
-  }
-
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-    
-    list.add(BaseSelectionAction.SUBMENU_START_ID + Messages._UI_ACTION_INSERT_ENUMERATION);
-    list.add(AddXSDEnumerationFacetAction.BEFORE_SELECTED_ID);
-    list.add(AddXSDEnumerationFacetAction.AFTER_SELECTED_ID);
-    list.add(BaseSelectionAction.SUBMENU_END_ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(DeleteAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-    return (String [])list.toArray(new String[0]);
-  }
-  
-  public Image getImage()
-  {
-    return XSDEditorPlugin.getXSDImage("icons/XSDSimpleEnum.gif"); //$NON-NLS-1$
-  }
-
-  public Command getDeleteCommand()
-  {
-    return new DeleteCommand(getXSDEnumerationFacet());
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDEnumerationFacet().getSchema());
-    return (IModel)adapter;
-  }
-
-  public IADTObject getTopContainer()
-  {
-    return getGlobalXSDContainer(getXSDEnumerationFacet());
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return false;
-  }
-  
-  public String getText()
-  {
-    return getXSDEnumerationFacet().getLexicalValue();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupAdapter.java
deleted file mode 100644
index 904acec..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupAdapter.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicityAction;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.design.figures.ModelGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDModelGroupAdapter extends XSDParticleAdapter implements IActionProvider, IGraphElement
-{
-  XSDModelGroup getXSDModelGroup()
-  {
-    return (XSDModelGroup) target;
-  }
-
-  public XSDModelGroupAdapter()
-  {
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement#getImage()
-   */
-  public Image getImage()
-  {
-    XSDModelGroup xsdModelGroup = getXSDModelGroup();
-    if (XSDCompositor.CHOICE_LITERAL == xsdModelGroup.getCompositor())
-    {
-      return ModelGroupFigure.CHOICE_ICON_IMAGE;
-    }
-    else if (XSDCompositor.ALL_LITERAL == xsdModelGroup.getCompositor())
-    {
-      return ModelGroupFigure.ALL_ICON_IMAGE;
-    }
-    else
-    {
-      return ModelGroupFigure.SEQUENCE_ICON_IMAGE;
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement#getText()
-   */
-  public String getText()
-  {
-    XSDModelGroup xsdModelGroup = getXSDModelGroup();
-
-    StringBuffer result = new StringBuffer();
-    String name = xsdModelGroup.getCompositor().getName();
-    if (name != null)
-    {
-      result.append(name);
-    }
-
-    Element element = xsdModelGroup.getElement();
-
-    if (element != null)
-    {
-      boolean hasMinOccurs = element.hasAttribute(XSDConstants.MINOCCURS_ATTRIBUTE);
-      boolean hasMaxOccurs = element.hasAttribute(XSDConstants.MAXOCCURS_ATTRIBUTE);
-
-      if (hasMinOccurs || hasMaxOccurs)
-      {
-        result.append(" ["); //$NON-NLS-1$
-        if (hasMinOccurs)
-        {
-          int min = ((XSDParticle) xsdModelGroup.getContainer()).getMinOccurs();
-          if (min == XSDParticle.UNBOUNDED)
-          {
-            result.append("*"); //$NON-NLS-1$
-          }
-          else
-          {
-            result.append(String.valueOf(min));
-          }
-        }
-        else
-        // print default
-        {
-          int min = ((XSDParticle) xsdModelGroup.getContainer()).getMinOccurs();
-          result.append(String.valueOf(min));
-        }
-        if (hasMaxOccurs)
-        {
-          int max = ((XSDParticle) xsdModelGroup.getContainer()).getMaxOccurs();
-          result.append(".."); //$NON-NLS-1$
-          if (max == XSDParticle.UNBOUNDED)
-          {
-            result.append("*"); //$NON-NLS-1$
-          }
-          else
-          {
-            result.append(String.valueOf(max));
-          }
-        }
-        else
-        // print default
-        {
-          result.append(".."); //$NON-NLS-1$
-          int max = ((XSDParticle) xsdModelGroup.getContainer()).getMaxOccurs();
-          result.append(String.valueOf(max));
-        }
-        result.append("]"); //$NON-NLS-1$
-      }
-    }
-    return result.toString();
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    XSDModelGroup xsdModelGroup = getXSDModelGroup();
-    List list = new ArrayList();
-    for (Iterator i = xsdModelGroup.getContents().iterator(); i.hasNext(); )
-    {
-       Object object = i.next();
-       XSDParticleContent particle = ((XSDParticle)object).getContent();
-       if (particle instanceof XSDElementDeclaration)
-       {
-         list.add(particle);
-       }
-       else if (particle instanceof XSDWildcard)
-       {
-         list.add(particle);
-       }
-       else if (particle instanceof XSDModelGroup)
-       {
-         list.add(particle);
-       }
-       else if (particle instanceof XSDModelGroupDefinition)
-       { 
-    	 //list.add(((XSDModelGroupDefinition)particle).getResolvedModelGroupDefinition());
-    	 list.add(particle);
-       }
-    }
-
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return (ITreeElement []) adapterList.toArray(new ITreeElement[0]);
-  }
-
-  public Object getParent(Object object)
-  {
-    XSDModelGroup element = (XSDModelGroup) object;
-    return element.getContainer();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider#getActions(java.lang.Object)
-   */
-  public String[] getActions(Object object)
-  {
-     Collection actionIDs = new ArrayList();
-     actionIDs.add(AddXSDElementAction.ID);
-     actionIDs.add(AddXSDElementAction.REF_ID);
-     actionIDs.add(AddXSDAnyElementAction.ID);
-     // Add Element Ref
-     actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-     actionIDs.add(AddXSDModelGroupAction.SEQUENCE_ID);
-     actionIDs.add(AddXSDModelGroupAction.CHOICE_ID);
-     actionIDs.add(AddXSDModelGroupAction.ALL_ID);
-     actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-     actionIDs.add(AddXSDModelGroupDefinitionAction.MODELGROUPDEFINITIONREF_ID);
-//     actionIDs.add(AddFieldAction.ID);
-     actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-     // Add Any
-
-     actionIDs.add(BaseSelectionAction.SUBMENU_START_ID + Messages._UI_ACTION_SET_MULTIPLICITY);
-     actionIDs.add(SetMultiplicityAction.REQUIRED_ID);
-     actionIDs.add(SetMultiplicityAction.ZERO_OR_ONE_ID);
-     actionIDs.add(SetMultiplicityAction.ZERO_OR_MORE_ID);
-     actionIDs.add(SetMultiplicityAction.ONE_OR_MORE_ID);    
-     actionIDs.add(BaseSelectionAction.SUBMENU_END_ID);
-    
-     if (!(getParent(target) instanceof XSDModelGroupDefinition))
-     {
-       actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-       actionIDs.add(DeleteAction.ID);
-     }    
-     actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-     actionIDs.add(ShowPropertiesViewAction.ID);
-        
-     return (String [])actionIDs.toArray(new String[0]);
-  }
-
-  public int getMaxOccurs()
-  {
-    return getMaxOccurs(getXSDModelGroup());
-  }
-
-  public int getMinOccurs()
-  {
-    return getMinOccurs(getXSDModelGroup());
-  }
-
-  public IADTObject getTopContainer()
-  {
-    XSDModelGroup xsdModelGroup = getXSDModelGroup();
-    return getGlobalXSDContainer(xsdModelGroup);
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return false;
-  }
-
-  public Command getDeleteCommand() 
-  {
-    return new DeleteCommand(getXSDModelGroup());	
-  }
-  
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDModelGroup().getSchema());
-    return (IModel)adapter;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java
deleted file mode 100644
index ed77609..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDModelGroupDefinitionAdapter.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicityAction;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.SpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDModelGroupDefinitionAdapter extends XSDParticleAdapter implements IStructure, IActionProvider, IGraphElement, IADTObjectListener
-{
-  public static final Image MODEL_GROUP_ICON = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDGroup.gif"); //$NON-NLS-1$
-  public static final Image MODEL_GROUP_DISABLED_ICON = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDGroupdis.gif"); //$NON-NLS-1$
-  public static final Image MODEL_GROUP_REF_ICON = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDGroupRef.gif"); //$NON-NLS-1$
-  public static final Image MODEL_GROUP_REF_DISABLED_ICON = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDGroupRefdis.gif"); //$NON-NLS-1$
-
-  protected List fields = null;
-  protected List otherThingsToListenTo = null;
-  
-  public XSDModelGroupDefinitionAdapter()
-  {
-    super();
-  }
-
-  public XSDModelGroupDefinition getXSDModelGroupDefinition()
-  {
-    return (XSDModelGroupDefinition) target;
-  }
-
-  public Image getImage()
-  {
-    XSDModelGroupDefinition xsdModelGroupDefinition = (XSDModelGroupDefinition) target;
-
-    if (xsdModelGroupDefinition.isModelGroupDefinitionReference())
-    {
-      if (isReadOnly())
-      {
-        return MODEL_GROUP_REF_DISABLED_ICON;
-      }
-      return MODEL_GROUP_REF_ICON;
-    }
-    else
-    {
-      if (isReadOnly())
-      {
-        return MODEL_GROUP_DISABLED_ICON;
-      }
-      return MODEL_GROUP_ICON;
-    }
-  }
-
-  public String getText()
-  {
-    XSDModelGroupDefinition xsdModelGroupDefinition = (XSDModelGroupDefinition) target;
-    if (xsdModelGroupDefinition.getResolvedModelGroupDefinition().getContainer() == null) return "";   // Removed
-    String result = xsdModelGroupDefinition.isModelGroupDefinitionReference() ? xsdModelGroupDefinition.getQName() : xsdModelGroupDefinition.getName();
-    return result == null ? Messages._UI_LABEL_ABSENT : result;
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    XSDModelGroupDefinition def = (XSDModelGroupDefinition)target;
-    List list = new ArrayList();
-    // Bug246036 - need to stop showing element content in a cycle.
-    // And, we should not show any element content for references otherwise there will be two
-    // entries in the tree viewer for the same item
-    if (!def.isModelGroupDefinitionReference())
-    {
-      XSDModelGroup xsdModelGroup = ((XSDModelGroupDefinition) target).getResolvedModelGroupDefinition().getModelGroup();
-      if (xsdModelGroup != null)
-        list.add(xsdModelGroup);
-    }
-
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return (ITreeElement[]) adapterList.toArray(new ITreeElement[0]);
-
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider#getActions(java.lang.Object)
-   */
-  public String[] getActions(Object object)
-  {
-    Collection list = new ArrayList();
-
-    XSDModelGroupDefinition modelGroupDefinition = getXSDModelGroupDefinition();
-    boolean isModelGroupReference = modelGroupDefinition.isModelGroupDefinitionReference();
-    if (!isModelGroupReference)
-    {
-      list.add(AddXSDElementAction.ID);
-      list.add(AddXSDElementAction.REF_ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(AddXSDModelGroupAction.SEQUENCE_ID);
-      list.add(AddXSDModelGroupAction.CHOICE_ID);
-      list.add(AddXSDModelGroupAction.ALL_ID);
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-    }
-    
-    list.add(DeleteAction.ID);
-    
-    if (isModelGroupReference)
-    {
-      list.add(BaseSelectionAction.SEPARATOR_ID);
-      list.add(BaseSelectionAction.SUBMENU_START_ID + Messages._UI_ACTION_SET_MULTIPLICITY);
-      list.add(SetMultiplicityAction.REQUIRED_ID);
-      list.add(SetMultiplicityAction.ZERO_OR_ONE_ID);
-      list.add(SetMultiplicityAction.ZERO_OR_MORE_ID);
-      list.add(SetMultiplicityAction.ONE_OR_MORE_ID);    
-      list.add(BaseSelectionAction.SUBMENU_END_ID); 
-    }
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    Object schema = getEditorSchema();
-    if (modelGroupDefinition.getSchema() == schema)
-    {
-      XSDConcreteComponent container = modelGroupDefinition.getContainer();
-      if (container == schema || container instanceof XSDRedefine)
-      {
-        list.add(SetInputToGraphView.ID);
-      }
-    }
-    else
-    {
-      list.add(OpenInNewEditor.ID);
-    }
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-
-    return (String [])list.toArray(new String[0]);
-  }
-
-  public Command getAddNewFieldCommand(String fieldKind)
-  {
-    return null;
-  }
-
-  public Command getDeleteCommand()
-  {
-    return new DeleteCommand(getXSDModelGroupDefinition());
-  }
-
-  // TODO Common this up with XSDComplexType's.  See also getFields 
-  protected void clearFields()
-  {
-    if (otherThingsToListenTo != null)
-    {
-      for (Iterator i = otherThingsToListenTo.iterator(); i.hasNext();)
-      {
-        Adapter adapter = (Adapter) i.next();
-        if (adapter instanceof IADTObject)
-        {
-          IADTObject adtObject = (IADTObject) adapter;
-          adtObject.unregisterListener(this);
-        }
-      }
-    }
-    fields = null;
-    otherThingsToListenTo = null;
-  }
-
-  public List getFields()
-  {
-    List fields = new ArrayList();
-    otherThingsToListenTo = new ArrayList();
-    XSDVisitorForFields visitor = new XSDVisitorForGroupFieldsWithSpaceFillers();
-    visitor.visitModelGroupDefinition(getXSDModelGroupDefinition());
-    populateAdapterList(visitor.concreteComponentList, fields);
-    
-    // TODO (cs) common a base class for a structure thingee
-    //
-    populateAdapterList(visitor.thingsWeNeedToListenTo, otherThingsToListenTo);
-    for (Iterator i = otherThingsToListenTo.iterator(); i.hasNext();)
-    {
-      Adapter adapter = (Adapter) i.next();
-      if (adapter instanceof IADTObject)
-      {
-        IADTObject adtObject = (IADTObject) adapter;
-        adtObject.registerListener(this);
-      }
-    }
-    return fields;
-  }
-
-  protected class XSDVisitorForGroupFieldsWithSpaceFillers extends XSDVisitorForFields
-  {
-    public XSDVisitorForGroupFieldsWithSpaceFillers()
-    {
-      super();
-    }
-
-    public void visitModelGroup(XSDModelGroup modelGroup)
-    {
-      int numOfChildren = modelGroup.getContents().size();
-      if (numOfChildren == 0)
-      {
-        concreteComponentList.add(new SpaceFiller("element")); //$NON-NLS-1$
-      }
-      super.visitModelGroup(modelGroup);
-    }
-    
-    public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-    {
-      XSDModelGroupDefinition resolvedModelGroupDef = modelGroupDef.getResolvedModelGroupDefinition();
-      if (visitedGroups.contains(resolvedModelGroupDef.getModelGroup()))
-      {
-        concreteComponentList.add(new SpaceFiller("element")); //$NON-NLS-1$
-      }
-      super.visitModelGroupDefinition(modelGroupDef);
-    }
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDModelGroupDefinition().getSchema());
-    return (IModel)adapter;
-  }
-  public String getName()
-  {
-    return getText();
-  }
-
-  public boolean isFocusAllowed()
-  {
-    XSDModelGroupDefinition xsdModelGroupDefinition = (XSDModelGroupDefinition) target;
-    if (xsdModelGroupDefinition.isModelGroupDefinitionReference())
-    { 
-      return false;
-    }
-    return true;
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    clearFields();
-    notifyListeners(this, null);
-  }
-  
-  public int getMaxOccurs()
-  {
-    return getMaxOccurs(getXSDModelGroupDefinition());
-  }
-
-  public int getMinOccurs()
-  {
-    return getMinOccurs(getXSDModelGroupDefinition());
-  }
-
-  public IADTObject getTopContainer()
-  {
-    XSDModelGroupDefinition group = getXSDModelGroupDefinition();
-    XSDConcreteComponent container = group.getContainer();
-    if (container instanceof XSDSchema || container instanceof XSDRedefine)
-      return this;
-    else
-      return getGlobalXSDContainer(group);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDParticleAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDParticleAdapter.java
deleted file mode 100644
index a26649c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDParticleAdapter.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import org.eclipse.wst.xsd.ui.internal.adt.design.IAnnotationProvider;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-
-public class XSDParticleAdapter extends XSDBaseAdapter implements IAnnotationProvider
-{
-  public XSDParticleAdapter()
-  {
-    super();
-  }
-
-  public int getMaxOccurs()
-  {
-    return getMaxOccurs((XSDConcreteComponent) target);
-  }
-
-  public int getMinOccurs()
-  {
-    return getMinOccurs((XSDConcreteComponent) target);
-  }
-
-  public static int getMinOccurs(XSDConcreteComponent component)
-  {
-    int minOccur = -2;
-    if (component != null)
-    {
-      Object o = component.getContainer();
-      if (o instanceof XSDParticle)
-      {
-        if (((XSDParticle) o).isSetMinOccurs())
-        {
-          try
-          {
-            minOccur = ((XSDParticle) o).getMinOccurs();
-          }
-          catch (Exception e)
-          {
-          }
-        }
-      }
-    }
-    return minOccur;
-  }
-
-  public static int getMaxOccurs(XSDConcreteComponent component)
-  {
-    int maxOccur = -2;
-    if (component != null)
-    {
-      Object o = component.getContainer();
-      if (o instanceof XSDParticle)
-      {
-        if (((XSDParticle) o).isSetMaxOccurs())
-        {
-          try
-          {
-            maxOccur = ((XSDParticle) o).getMaxOccurs();
-          }
-          catch (Exception e)
-          {
-          }
-        }
-      }
-    }
-    return maxOccur;
-  }
-
-  public String getNameAnnotationString()
-  {
-    return buildAnnotationString(true);
-  }
-
-  public String getNameAnnotationToolTipString()
-  {
-    return buildAnnotationString(false);
-  }
-
-  public String getTypeAnnotationString()
-  {
-    return null;
-  }
-
-  public String getTypeAnnotationToolTipString()
-  {
-    return null;
-  }
-
-  protected String buildAnnotationString(boolean isForLabel)
-  {
-    String occurenceDescription = ""; //$NON-NLS-1$
-    String toolTipDescription = ""; //$NON-NLS-1$
-    // TODO: set int values as defined constants
-    // -2 means the user didn't specify (so the default is 1)
-    int minOccurs = getMinOccurs();
-    int maxOccurs = getMaxOccurs();
-
-    // This is for the attribute field case, which has no
-    // occurrence attributes
-    if (minOccurs == -3 && maxOccurs == -3)
-    {
-      occurenceDescription = ""; //$NON-NLS-1$
-    }
-    else if (minOccurs == 0 && (maxOccurs == -2 || maxOccurs == 1))
-    {
-      occurenceDescription = "[0..1]"; //$NON-NLS-1$
-      toolTipDescription = Messages._UI_LABEL_OPTIONAL;
-    }
-    else if (minOccurs == 0 && maxOccurs == -1)
-    {
-      occurenceDescription = "[0..*]"; //$NON-NLS-1$
-      toolTipDescription = Messages._UI_LABEL_ZERO_OR_MORE;
-    }
-    else if ((minOccurs == 1 && maxOccurs == -1) || (minOccurs == -2 && maxOccurs == -1))
-    {
-      occurenceDescription = "[1..*]"; //$NON-NLS-1$
-      toolTipDescription = Messages._UI_LABEL_ONE_OR_MORE;
-    }
-    else if ((minOccurs == 1 && maxOccurs == 1) || (minOccurs == -2 && maxOccurs == 1) || (minOccurs == 1 && maxOccurs == -2))
-    {
-      occurenceDescription = "[1..1]"; //$NON-NLS-1$
-      toolTipDescription = Messages._UI_LABEL_REQUIRED;
-    }
-    else if (minOccurs == -2 && maxOccurs == -2)
-    {
-      occurenceDescription = ""; //$NON-NLS-1$
-      // none specified, so don't have any toolTip description
-    }
-    else
-    {
-      if (maxOccurs == -2)
-        maxOccurs = 1;
-      String maxSymbol = maxOccurs == -1 ? "*" : "" + maxOccurs; //$NON-NLS-1$ //$NON-NLS-2$
-      String minSymbol = minOccurs == -2 ? "1" : "" + minOccurs; //$NON-NLS-1$ //$NON-NLS-2$
-      occurenceDescription = "[" + minSymbol + ".." + maxSymbol + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      toolTipDescription = Messages._UI_LABEL_ARRAY;
-    }
-
-    if (isForLabel)
-    {
-      return occurenceDescription;
-    }
-    else
-    {
-      return toolTipDescription;
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDRedefineAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDRedefineAdapter.java
deleted file mode 100644
index fc5285c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDRedefineAdapter.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDRedefineContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-
-public class XSDRedefineAdapter extends XSDSchemaDirectiveAdapter
-{
-
-  public XSDRedefineAdapter()
-  {
-    super();
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    XSDRedefine xsdRedefine = (XSDRedefine)getTarget();
-
-    children = new ArrayList();
-
-    if (attributesCategory != null)
-    {
-      List attributes = getCategoryChildren(CategoryAdapter.ATTRIBUTES);
-      List groups = getCategoryChildren(CategoryAdapter.GROUPS);
-      List types = getCategoryChildren(CategoryAdapter.TYPES);
-
-      attributesCategory.setChildren(attributes);
-      attributesCategory.setAllChildren(attributes);
-      typesCategory.setChildren(types);
-      typesCategory.setAllChildren(types);
-      groupsCategory.setChildren(groups);
-      groupsCategory.setAllChildren(groups);
-    }
-    else
-    {
-      createCategoryAdapters(xsdRedefine);
-    }
-
-    children.add(attributesCategory);
-    children.add(typesCategory);
-    children.add(groupsCategory);
-
-    return (ITreeElement[])children.toArray(new ITreeElement [0]);
-  }
-
-  public IADTObject getTopContainer()
-  {
-    return this;
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return true;
-  }
-
-  protected List types = null;
-
-  protected List children, allChildren;
-
-  protected CategoryAdapter attributesCategory;
-
-  protected CategoryAdapter typesCategory;
-
-  protected CategoryAdapter groupsCategory;
-
-  /**
-   * Create all the category adapters
-   * 
-   * @param xsdRedefine the parent redefine component
-   */
-  private void createCategoryAdapters(XSDRedefine xsdRedefine)
-  {
-    List attributes = getCategoryChildren(CategoryAdapter.ATTRIBUTES);
-    List groups = getCategoryChildren(CategoryAdapter.GROUPS);
-    List types = getCategoryChildren(CategoryAdapter.TYPES);
-
-    XSDEditorPlugin xsdEditorPlugin = XSDEditorPlugin.getDefault();
-    attributesCategory = new RedefineCategoryAdapter(
-      Messages._UI_GRAPH_REDEFINE_ATTRIBUTE_GROUPS,
-      xsdEditorPlugin.getIconImage("obj16/attributesheader"), attributes, xsdRedefine, this, CategoryAdapter.ATTRIBUTES); //$NON-NLS-1$
-    attributesCategory.setAllChildren(attributes);
-    registerListener(attributesCategory);
-
-    typesCategory = new RedefineCategoryAdapter(
-      Messages._UI_GRAPH_REDEFINE_TYPES,
-      xsdEditorPlugin.getIconImage("obj16/typesheader"), types, xsdRedefine, this, CategoryAdapter.TYPES); //$NON-NLS-1$
-    typesCategory.setAllChildren(types);
-    registerListener(typesCategory);
-
-    groupsCategory = new RedefineCategoryAdapter(
-      Messages._UI_GRAPH_REDEFINE_GROUPS,
-      xsdEditorPlugin.getIconImage("obj16/groupsheader"), groups, xsdRedefine, this, CategoryAdapter.GROUPS); //$NON-NLS-1$
-    groupsCategory.setAllChildren(groups);
-    registerListener(groupsCategory);
-  }
-
-  public void notifyChanged(final Notification msg)
-  {
-    class CategoryNotification extends NotificationImpl
-    {
-      protected Object category;
-
-      public CategoryNotification(Object category)
-      {
-        super(msg.getEventType(), msg.getOldValue(), msg.getNewValue(), msg.getPosition());
-        this.category = category;
-      }
-
-      public Object getNotifier()
-      {
-        return category;
-      }
-
-      public Object getFeature()
-      {
-        return msg.getFeature();
-      }
-    }
-
-    if (children == null)
-    {
-      getChildren();
-    }
-
-    Object newValue = msg.getNewValue();
-
-    if (XSDPackage.eINSTANCE.getXSDRedefine_Contents() == msg.getFeature())
-    {
-      if (newValue instanceof XSDAttributeGroupDefinition)
-      {
-        CategoryAdapter adapter = getCategory(CategoryAdapter.ATTRIBUTES);
-        Assert.isTrue(adapter != null);
-        List list = getCategoryChildren(CategoryAdapter.ATTRIBUTES);
-        adapter.setChildren(list);
-        adapter.setAllChildren(list);
-        notifyListeners(new CategoryNotification(adapter), adapter.getText());
-        return;
-      }
-      else if (newValue instanceof XSDComplexTypeDefinition || newValue instanceof XSDSimpleTypeDefinition)
-      {
-        CategoryAdapter adapter = getCategory(CategoryAdapter.TYPES);
-        Assert.isTrue(adapter != null);
-        List types = getCategoryChildren(CategoryAdapter.TYPES);
-        adapter.setChildren(types);
-        adapter.setAllChildren(types);
-        notifyListeners(new CategoryNotification(adapter), adapter.getText());
-        return;
-      }
-      else if (newValue instanceof XSDModelGroupDefinition)
-      {
-        CategoryAdapter adapter = getCategory(CategoryAdapter.GROUPS);
-        Assert.isTrue(adapter != null);
-        List list = getCategoryChildren(CategoryAdapter.GROUPS);
-        adapter.setChildren(list);
-        adapter.setAllChildren(list);
-        notifyListeners(new CategoryNotification(adapter), adapter.getText());
-        return;
-      }
-      else if (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_Annotations())
-      {
-        return;
-      }
-    }
-    super.notifyChanged(msg);
-  }
-
-  private void updateCategories()
-  {
-    getChildren();
-  }
-
-  public CategoryAdapter getCategory(int category)
-  {
-    if (children == null)
-    {
-      updateCategories();
-    }
-    int length = children.size();
-    CategoryAdapter adapter = null;
-    for (int index = 0; index < length; index++)
-    {
-      adapter = (CategoryAdapter)children.get(index);
-      if (adapter.getGroupType() == category)
-      {
-        break;
-      }
-    }
-    return adapter;
-  }
-
-  public String[] getActions(Object object)
-  {
-    Collection actionIDs = new ArrayList();
-
-    actionIDs.add(DeleteAction.ID);
-    actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-    actionIDs.add(SetInputToGraphView.ID);
-    actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-    actionIDs.add(ShowPropertiesViewAction.ID);
-
-    return (String[])actionIDs.toArray(new String [0]);
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    notifyListeners(object, property);
-  }
-
-  public Image getImage()
-  {
-    return XSDEditorPlugin.getXSDImage("icons/XSDRedefine.gif"); //$NON-NLS-1$
-  }
-
-  private List getCategoryChildren(int category)
-  {
-    List list = new ArrayList();
-    XSDRedefine redefine = (XSDRedefine)target;
-    Iterator iterator = redefine.getContents().iterator();
-    while (iterator.hasNext())
-    {
-      XSDRedefineContent redefineContent = (XSDRedefineContent)iterator.next();
-
-      if (redefineContent instanceof XSDAttributeGroupDefinition && category == CategoryAdapter.ATTRIBUTES)
-      {
-        list.add(redefineContent);
-      }
-      else if (redefineContent instanceof XSDModelGroupDefinition && category == CategoryAdapter.GROUPS)
-      {
-        list.add(redefineContent);
-      }
-      else if (redefineContent instanceof XSDComplexTypeDefinition && category == CategoryAdapter.TYPES)
-      {
-        list.add(redefineContent);
-      }
-      else if (redefineContent instanceof XSDSimpleTypeDefinition && category == CategoryAdapter.TYPES)
-      {
-        list.add(redefineContent);
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return adapterList;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaAdapter.java
deleted file mode 100644
index db29fe9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaAdapter.java
+++ /dev/null
@@ -1,531 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Tada Takatoshi / Fujitsu - bug 245480 - provided initial patch
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.impl.NotificationImpl;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDComplexTypeDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDPackage;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDSchemaAdapter extends XSDBaseAdapter implements IActionProvider, IModel, IADTObjectListener
-{
-  protected List types = null;
-  protected List children, allChildren;
-
-  protected CategoryAdapter fDirectivesCategory;
-  protected CategoryAdapter fElementsCategory;
-  protected CategoryAdapter fAttributesCategory;
-  protected CategoryAdapter fTypesCategory;
-  protected CategoryAdapter fGroupsCategory;
-
-  /**
-   * Create all the category adapters
-   * 
-   * @param xsdSchema
-   */
-  protected void createCategoryAdapters(XSDSchema xsdSchema)
-  {
-    List directivesList = getDirectives(xsdSchema);
-    List elementsList = getGlobalElements(xsdSchema);
-    List attributesList = getAttributeList(xsdSchema);
-    List groups = getGroups(xsdSchema);
-    List types = getComplexTypes(xsdSchema);
-    types.addAll(getSimpleTypes(xsdSchema));
-
-    fDirectivesCategory = new CategoryAdapter(Messages._UI_GRAPH_DIRECTIVES, XSDEditorPlugin.getDefault().getIconImage("obj16/directivesheader"), directivesList, xsdSchema, CategoryAdapter.DIRECTIVES); //$NON-NLS-1$
-    fDirectivesCategory.setAllChildren(directivesList);
-    registerListener(fDirectivesCategory);
-
-    fElementsCategory = new CategoryAdapter(Messages._UI_GRAPH_ELEMENTS, XSDEditorPlugin.getDefault().getIconImage("obj16/elementsheader"), elementsList, xsdSchema, CategoryAdapter.ELEMENTS);  //$NON-NLS-1$
-    fElementsCategory.setAllChildren(getGlobalElements(xsdSchema, true));
-    registerListener(fElementsCategory);
-
-    fAttributesCategory = new CategoryAdapter(Messages._UI_GRAPH_ATTRIBUTES, XSDEditorPlugin.getDefault().getIconImage("obj16/attributesheader"), attributesList, xsdSchema, CategoryAdapter.ATTRIBUTES);   //$NON-NLS-1$
-    fAttributesCategory.setAllChildren(getAttributeList(xsdSchema,true));
-    registerListener(fAttributesCategory);
-
-    fTypesCategory = new CategoryAdapter(Messages._UI_GRAPH_TYPES, XSDEditorPlugin.getDefault().getIconImage("obj16/typesheader"), types, xsdSchema, CategoryAdapter.TYPES);  //$NON-NLS-1$
-    fTypesCategory.setAllChildren(getTypes(xsdSchema, true));
-    registerListener(fTypesCategory);
-
-    fGroupsCategory = new CategoryAdapter(Messages._UI_GRAPH_GROUPS, XSDEditorPlugin.getDefault().getIconImage("obj16/groupsheader"), groups, xsdSchema, CategoryAdapter.GROUPS); //$NON-NLS-1$
-    fGroupsCategory.setAllChildren(getGroups(xsdSchema,true));
-    registerListener(fGroupsCategory);
-  }
-
-  public List getTypes()
-  {
-    if (types == null)
-    {
-      types = new ArrayList();
-      XSDSchema schema = (XSDSchema) target;
-      List concreteComponentList = new ArrayList();
-      for (Iterator i = schema.getContents().iterator(); i.hasNext();)
-      {
-        XSDConcreteComponent component = (XSDConcreteComponent) i.next();
-        if (component instanceof XSDTypeDefinition)
-        {
-          concreteComponentList.add(component);
-        }
-      }
-      populateAdapterList(concreteComponentList, types);
-    }
-    return types;
-  }
-  
-  protected boolean isSameNamespace(String ns1, String ns2)
-  {
-    if (ns1 == null) ns1 = "";
-    if (ns2 == null) ns2 = "";
-    
-    if (ns1.equals(ns2))
-    {
-      return true;
-    }
-    return false;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement#getChildren()
-   */
-  public ITreeElement[] getChildren()
-  {
-    XSDSchema xsdSchema = (XSDSchema) getTarget();
-
-    children = new ArrayList();
-
-    // just set categoryadapters' children if category adapters are
-    // already created
-    if (fDirectivesCategory != null)
-    {
-      List directivesList = getDirectives(xsdSchema);
-      List elementsList = getGlobalElements(xsdSchema);
-      List attributesList = getAttributeList(xsdSchema);
-      List groups = getGroups(xsdSchema);
-      List types = getComplexTypes(xsdSchema);
-      types.addAll(getSimpleTypes(xsdSchema));
-
-      fDirectivesCategory.setChildren(directivesList);
-      fDirectivesCategory.setAllChildren(directivesList);
-      fElementsCategory.setChildren(elementsList);
-      fElementsCategory.setAllChildren(getGlobalElements(xsdSchema, true));
-      fAttributesCategory.setChildren(attributesList);
-      fAttributesCategory.setAllChildren(getAttributeList(xsdSchema, true));
-      fTypesCategory.setChildren(types);
-      fTypesCategory.setAllChildren(getTypes(xsdSchema, true));
-      fGroupsCategory.setChildren(groups);
-      fGroupsCategory.setAllChildren(getGroups(xsdSchema, true));
-    }
-    else
-    {
-      createCategoryAdapters(xsdSchema);
-    }
-
-    children.add(fDirectivesCategory);
-    children.add(fElementsCategory);
-    children.add(fAttributesCategory);
-    children.add(fTypesCategory);
-    children.add(fGroupsCategory);
-
-    return (ITreeElement[]) children.toArray(new ITreeElement[0]);
-  }
-
-  public void notifyChanged(final Notification msg)
-  {
-    class CategoryNotification extends NotificationImpl
-    {
-      protected Object category;
-
-      public CategoryNotification(Object category)
-      {
-        super(msg.getEventType(), msg.getOldValue(), msg.getNewValue(), msg.getPosition());
-        this.category = category;
-      }
-
-      public Object getNotifier()
-      {
-        return category;
-      }
-
-      public Object getFeature()
-      {
-        return msg.getFeature();
-      }
-    }
-
-    if (children == null)
-    {
-      getChildren();
-    }
-    
-    Object newValue = msg.getNewValue();
-    
-    Object oldValue = msg.getOldValue();
-    // Bug 245480 - Deletion of Include, Import and Redefine is not reflected in the Outline view
-    // We only want to refresh the Directives folder for any changes to XSDDirectives.  The first case covers
-    // changes to one directive, whereas the missing case as reported in bug 245480 covers changes to a list
-    // of directives.
-    boolean updateDirectivesCategory = false;
-    if (oldValue instanceof XSDSchemaDirective)
-    {
-      updateDirectivesCategory = true;
-    }
-    else if (oldValue instanceof Collection)
-    {
-      Iterator iterator = ((Collection) oldValue).iterator();
-      while (iterator.hasNext())
-      {
-        Object obj = iterator.next();
-        if (obj instanceof XSDSchemaDirective)
-        {
-          // if we find at least one directive, then we should refresh the folder
-          updateDirectivesCategory = true;
-          break;
-        }
-      }
-    }
-    
-    if (newValue instanceof XSDInclude || newValue instanceof XSDImport || newValue instanceof XSDRedefine ||
-        (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_Contents() && updateDirectivesCategory) || // handle the case for delete directive
-         msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_IncorporatedVersions()) // updates to the imports/includes
-    {
-      CategoryAdapter adapter = getCategory(CategoryAdapter.DIRECTIVES);
-      Assert.isTrue(adapter != null);
-      XSDSchema xsdSchema = adapter.getXSDSchema();
-      adapter.setChildren(getDirectives(xsdSchema));
-      adapter.setAllChildren(getDirectives(xsdSchema));
-      notifyListeners(new CategoryNotification(adapter), adapter.getText());
-      return;
-    }
-    else if (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_ElementDeclarations())
-    {
-      CategoryAdapter adapter = getCategory(CategoryAdapter.ELEMENTS);
-      Assert.isTrue(adapter != null);
-      XSDSchema xsdSchema = adapter.getXSDSchema();
-      adapter.setChildren(getGlobalElements(xsdSchema));
-      adapter.setAllChildren(getGlobalElements(xsdSchema, true));
-      notifyListeners(new CategoryNotification(adapter), adapter.getText());
-      return;
-    }
-    else if (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_AttributeDeclarations() ||
-             msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_AttributeGroupDefinitions())
-    {
-      CategoryAdapter adapter = getCategory(CategoryAdapter.ATTRIBUTES);
-      Assert.isTrue(adapter != null);
-      XSDSchema xsdSchema = adapter.getXSDSchema();
-      adapter.setChildren(getAttributeList(xsdSchema));
-      adapter.setAllChildren(getAttributeList(xsdSchema, true));
-      notifyListeners(new CategoryNotification(adapter), adapter.getText());
-      return;
-    }
-    else if (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_TypeDefinitions())
-    {
-      CategoryAdapter adapter = getCategory(CategoryAdapter.TYPES);
-      Assert.isTrue(adapter != null);
-      XSDSchema xsdSchema = adapter.getXSDSchema();
-      List types = getComplexTypes(xsdSchema);
-      types.addAll(getSimpleTypes(xsdSchema));
-
-      adapter.setChildren(types);
-      adapter.setAllChildren(getTypes(xsdSchema, true));
-      notifyListeners(new CategoryNotification(adapter), adapter.getText());
-      return;
-    }
-    else if (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_ModelGroupDefinitions())
-    {
-      CategoryAdapter adapter = getCategory(CategoryAdapter.GROUPS);
-      Assert.isTrue(adapter != null);
-      XSDSchema xsdSchema = adapter.getXSDSchema();
-      adapter.setChildren(getGroups(xsdSchema));
-      adapter.setAllChildren(getGroups(xsdSchema, true));
-      notifyListeners(new CategoryNotification(adapter), adapter.getText());
-      return;
-    }
-    else if (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_Annotations())
-    {
-      return;
-    }
-    else if (msg.getFeature() == XSDPackage.eINSTANCE.getXSDSchema_SchemaLocation())
-    {
-      notifyListeners(msg, null);
-      return;
-    }
-    
-    types = null;
-    getTypes();
-
-    super.notifyChanged(msg);
-  }
-  
-  public void updateCategories()
-  {
-    // TODO: revisit this
-    getChildren();
-  }
-  
-  public CategoryAdapter getCategory(int category)
-  {
-    if (children == null) updateCategories(); // init categories
-    int length = children.size();
-    CategoryAdapter adapter = null;
-    for (int i = 0; i < length; i++)
-    {
-      adapter = (CategoryAdapter) children.get(i);
-      if (adapter.getGroupType() ==  category)
-      {
-        break;
-      }
-    }
-    return adapter;
-  }
-
-  public List getDirectives(XSDSchema schema)
-  {
-    List list = new ArrayList();
-    for (Iterator i = schema.getContents().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof XSDSchemaDirective)
-      {
-        list.add(o);
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return adapterList;
-  }
-  
-  public List getGlobalElements(XSDSchema schema, boolean showFromIncludes)
-  {
-    List elements = schema.getElementDeclarations();
-    List list = new ArrayList();
-    for (Iterator i = elements.iterator(); i.hasNext();)
-    {
-      XSDElementDeclaration elem = (XSDElementDeclaration) i.next();
-      if (isSameNamespace(elem.getTargetNamespace(),schema.getTargetNamespace()) && (elem.getRootContainer() == schema || showFromIncludes))
-      {
-        list.add(elem);
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return adapterList;
-  }
-
-  public List getGlobalElements(XSDSchema schema)
-  {
-    return getGlobalElements(schema, false);
-  }
-
-  /**
-   * @param schema
-   * @return
-   */
-  public List getComplexTypes(XSDSchema schema, boolean showFromIncludes)
-  {
-    List allTypes = schema.getTypeDefinitions();
-    List list = new ArrayList();
-    for (Iterator i = allTypes.iterator(); i.hasNext();)
-    {
-      XSDTypeDefinition td = (XSDTypeDefinition) i.next();
-      if (td instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition ct = (XSDComplexTypeDefinition) td;
-        if (isSameNamespace(ct.getTargetNamespace(),schema.getTargetNamespace()) && (ct.getRootContainer() == schema || showFromIncludes))
-        {
-          list.add(ct);
-        }
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return adapterList;
-  }
-
-  public List getComplexTypes(XSDSchema schema)
-  {
-    return getComplexTypes(schema, false);
-  }
-  
-  public List getTypes(XSDSchema schema, boolean showFromIncludes)
-  {
-    List list = getComplexTypes(schema, showFromIncludes);
-    list.addAll(getSimpleTypes(schema, showFromIncludes));
-    return list;
-  }
-  
-  public List getAttributeGroupList(XSDSchema xsdSchema, boolean showFromIncludes)
-  {
-    List attributeGroupList = new ArrayList();
-    for (Iterator i = xsdSchema.getAttributeGroupDefinitions().iterator(); i.hasNext();)
-    {
-      XSDAttributeGroupDefinition attrGroup = (XSDAttributeGroupDefinition) i.next();
-      if (isSameNamespace(attrGroup.getTargetNamespace(), xsdSchema.getTargetNamespace()) && (attrGroup.getRootContainer() == xsdSchema || showFromIncludes))
-      {
-        attributeGroupList.add(attrGroup);
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(attributeGroupList, adapterList);
-    return adapterList;
-  }
-  
-  public List getAttributeGroupList(XSDSchema xsdSchema)
-  {
-    return getAttributeGroupList(xsdSchema, false);
-  }
-
-  public List getAttributeList(XSDSchema xsdSchema, boolean showFromIncludes)
-  {
-    List attributesList = new ArrayList();
-    for (Iterator iter = xsdSchema.getAttributeDeclarations().iterator(); iter.hasNext();)
-    {
-      Object o = iter.next();
-      if (o instanceof XSDAttributeDeclaration)
-      {
-        XSDAttributeDeclaration attr = (XSDAttributeDeclaration) o;
-        if (attr != null)
-        {
-          if (attr.getTargetNamespace() != null)
-          {
-            if (!(attr.getTargetNamespace().equals(XSDConstants.SCHEMA_INSTANCE_URI_2001)))
-            {
-              if (isSameNamespace(attr.getTargetNamespace(), xsdSchema.getTargetNamespace()) && (attr.getRootContainer() == xsdSchema || showFromIncludes))
-              {
-                attributesList.add(attr);
-              }
-            }
-          }
-          else
-          {
-            if (isSameNamespace(attr.getTargetNamespace(), xsdSchema.getTargetNamespace()) && (attr.getRootContainer() == xsdSchema || showFromIncludes))
-            {
-              attributesList.add(attr);
-            }
-          }
-        }
-      }
-    }
-    
-    attributesList.addAll(getAttributeGroupList(xsdSchema, showFromIncludes));
-    
-    List adapterList = new ArrayList();
-    populateAdapterList(attributesList, adapterList);
-    return adapterList;
-  }
-  
-  public List getAttributeList(XSDSchema xsdSchema)
-  {
-    return getAttributeList(xsdSchema, false);
-  }
-
-  public List getSimpleTypes(XSDSchema schema, boolean showFromIncludes)
-  {
-    List allTypes = schema.getTypeDefinitions();
-    List list = new ArrayList();
-    for (Iterator i = allTypes.iterator(); i.hasNext();)
-    {
-      XSDTypeDefinition td = (XSDTypeDefinition) i.next();
-      if (td instanceof XSDSimpleTypeDefinition)
-      {
-        XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) td;
-        if (isSameNamespace(st.getTargetNamespace(),schema.getTargetNamespace()) && (st.getRootContainer() == schema || showFromIncludes))
-        {
-          list.add(st);
-        }
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return adapterList;
-  }
-  
-  public List getSimpleTypes(XSDSchema schema)
-  {
-    return getSimpleTypes(schema, false);
-  }
-
-  public List getGroups(XSDSchema schema, boolean showFromIncludes)
-  {
-    List groups = schema.getModelGroupDefinitions();
-    List list = new ArrayList();
-    for (Iterator i = groups.iterator(); i.hasNext();)
-    {
-      XSDModelGroupDefinition group = (XSDModelGroupDefinition) i.next();
-      if (isSameNamespace(group.getTargetNamespace(),schema.getTargetNamespace()) && (group.getRootContainer() == schema || showFromIncludes))
-      {
-        list.add(group);
-      }
-    }
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return adapterList;
-  }
-  
-  public List getGroups(XSDSchema schema)
-  {
-    return getGroups(schema, false);
-  }
-
-  public String[] getActions(Object object)
-  {
-     Collection actionIDs = new ArrayList();
-     actionIDs.add(AddXSDElementAction.ID);
-     actionIDs.add(AddXSDComplexTypeDefinitionAction.ID);
-
-     actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-     actionIDs.add(ShowPropertiesViewAction.ID);
-     return (String [])actionIDs.toArray(new String[0]);
-  }
-
-  public void propertyChanged(Object object, String property)
-  {
-    notifyListeners(object, property);
-  }
-  
-  public Image getImage()
-  {
-    return XSDEditorPlugin.getXSDImage("icons/XSDFile.gif"); //$NON-NLS-1$
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaDirectiveAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaDirectiveAdapter.java
deleted file mode 100644
index d7e89eb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSchemaDirectiveAdapter.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-
-public class XSDSchemaDirectiveAdapter extends XSDBaseAdapter implements IActionProvider, IGraphElement
-{
-  public Image getImage()
-  {
-    XSDSchemaDirective object = (XSDSchemaDirective) target;
-    if (object instanceof XSDImport)
-    {
-      return XSDEditorPlugin.getXSDImage("icons/XSDImport.gif"); //$NON-NLS-1$
-    }
-    else if (object instanceof XSDInclude)
-    {
-      return XSDEditorPlugin.getXSDImage("icons/XSDInclude.gif"); //$NON-NLS-1$
-    }
-    else if (object instanceof XSDRedefine)
-    {
-      return XSDEditorPlugin.getXSDImage("icons/XSDRedefine.gif"); //$NON-NLS-1$
-    }
-    return null;
-  }
-
-  public String getText()
-  {
-    XSDSchemaDirective directive = (XSDSchemaDirective) target;
-    String result = "";
-
-    String location = directive.getSchemaLocation();
-    if (location == null || location.equals("") )
-    {
-      result = "(" + Messages._UI_LABEL_NO_LOCATION_SPECIFIED + ")"; 
-    }
-    else
-    {
-      result = location;
-    }  
-
-    // only show the namespace when the directiave is an import
-    // (otherwise the namespace is obviously the same as the containing schema's)
-    if (directive instanceof XSDImport)
-    {
-      XSDImport importObj = (XSDImport) directive;
-      String namespace = importObj.getNamespace();
-      if (namespace != null)
-      {  
-        result += "  {" + namespace + "}";
-      }      
-    }
-    return result;
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    List list = new ArrayList();
-
-    List adapterList = new ArrayList();
-    populateAdapterList(list, adapterList);
-    return (ITreeElement[]) adapterList.toArray(new ITreeElement[0]);
-  }
-  
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-    list.add(OpenInNewEditor.ID);
-    list.add(DeleteAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-    
-    return (String [])list.toArray(new String[0]);
-  }
-
-  public Command getDeleteCommand()
-  {
-    XSDSchemaDirective object = (XSDSchemaDirective) target;
-    return new DeleteCommand(object);
-  }
-
-  public IModel getModel()
-  {
-    XSDSchema object = ((XSDSchemaDirective) target).getSchema();
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(object);
-    return (IModel)adapter;
-  }
-
-  public IADTObject getTopContainer()
-  {
-    // There is currently no drill-down details view of directives
-    // The top level container is the schema
-    return getModel();
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return false;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSimpleContentAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSimpleContentAdapter.java
deleted file mode 100644
index a66f6a9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSimpleContentAdapter.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class XSDSimpleContentAdapter extends XSDBaseAdapter implements IActionProvider, IGraphElement
-{
-
-  public XSDSimpleContentAdapter()
-  {
-  }
-  
-  public XSDSimpleTypeDefinition getXSDSimpleTypeContent()
-  {
-    return (XSDSimpleTypeDefinition)target;
-  }
-
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-    return (String [])list.toArray(new String[0]);
-  }
-
-  public Command getDeleteCommand()
-  {
-    return new DeleteCommand(getXSDSimpleTypeContent());
-  }
-
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDSimpleTypeContent().getSchema());
-    return (IModel)adapter;
-  }
-
-  public IADTObject getTopContainer()
-  {
-    XSDConcreteComponent c = getXSDSimpleTypeContent().getContainer();
-    if (c instanceof XSDComplexTypeDefinition)
-    {
-      XSDComplexTypeDefinition ct = (XSDComplexTypeDefinition) c;
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(ct);
-      if (adapter instanceof IADTObject)
-        return (IADTObject)adapter;
-    }
- 
-    return null; 
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return false;
-  }
-  
-  public Image getImage()
-  {
-    if (isReadOnly())
-    {
-      return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDSimpleContent.gif"); //$NON-NLS-1$
-    }
-    return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDSimpleContent.gif"); //$NON-NLS-1$
-  }
-  
-  public String getText()
-  {
-    return "";
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSimpleTypeDefinitionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSimpleTypeDefinitionAdapter.java
deleted file mode 100644
index 5f6b379..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDSimpleTypeDefinitionAdapter.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetBaseTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDSimpleTypeDefinitionAdapter extends XSDTypeDefinitionAdapter
-{
-  public Image getImage()
-  {
-    if (isReadOnly())
-    {
-      return XSDEditorPlugin.getPlugin().getIcon("obj16/simpletypedis_obj.gif"); //$NON-NLS-1$
-    }
-    return XSDEditorPlugin.getPlugin().getIcon("obj16/simpletype_obj.gif"); //$NON-NLS-1$
-  }
-  
-  public String getDisplayName()
-  {
-    return getName();
-  }
-
-  public String getText()
-  {
-    return getText(true);
-  }
-
-  public String getText(boolean showType)
-  {
-    XSDSimpleTypeDefinition xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition) target;
-
-    StringBuffer result = new StringBuffer();
-
-    result.append(xsdSimpleTypeDefinition.getName() == null ? Messages._UI_LABEL_LOCAL_TYPE : xsdSimpleTypeDefinition.getName());
-
-    if (showType)
-    {
-      XSDSimpleTypeDefinition baseTypeDefinition = xsdSimpleTypeDefinition.getBaseTypeDefinition();
-      if (baseTypeDefinition != null && XSDVariety.ATOMIC_LITERAL == xsdSimpleTypeDefinition.getVariety())
-      {
-        if (baseTypeDefinition.getName() != null && !xsdSimpleTypeDefinition.getContents().contains(baseTypeDefinition) && !XSDConstants.isAnySimpleType(baseTypeDefinition))
-        {
-          result.append(" : "); //$NON-NLS-1$
-          result.append(baseTypeDefinition.getQName(xsdSimpleTypeDefinition));
-        }
-      }
-      else
-      {
-        XSDSimpleTypeDefinition itemTypeDefinition = xsdSimpleTypeDefinition.getItemTypeDefinition();
-        if (itemTypeDefinition != null)
-        {
-          if (itemTypeDefinition.getName() != null)
-          {
-            result.append(" : "); //$NON-NLS-1$
-            result.append(itemTypeDefinition.getQName(xsdSimpleTypeDefinition));
-          }
-        }
-        else
-        {
-          List memberTypeDefinitions = xsdSimpleTypeDefinition.getMemberTypeDefinitions();
-          if (!memberTypeDefinitions.isEmpty())
-          {
-            boolean first = true;
-            for (Iterator members = memberTypeDefinitions.iterator(); members.hasNext();)
-            {
-              XSDSimpleTypeDefinition memberTypeDefinition = (XSDSimpleTypeDefinition) members.next();
-              if (memberTypeDefinition.getName() != null)
-              {
-                if (first)
-                {
-                  result.append(" : "); //$NON-NLS-1$
-                  first = false;
-                }
-                else
-                {
-                  result.append(" | "); //$NON-NLS-1$
-                }
-                result.append(memberTypeDefinition.getQName(xsdSimpleTypeDefinition));
-              }
-              else
-              {
-                break;
-              }
-            }
-          }
-          else if (result.length() == 0)
-          {
-            result.append(Messages._UI_LABEL_ABSENT);
-          }
-        }
-      }
-    }
-
-    return result.toString();
-  }
-
-  public boolean hasChildren()
-  {
-    return true;
-  }
-  
-  public boolean isComplexType()
-  {
-    return false;
-  }
-
-  public boolean isFocusAllowed()
-  {
-    XSDSimpleTypeDefinition xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition) target;
-    if (XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(xsdSimpleTypeDefinition.getTargetNamespace()))
-    {
-      return false;
-    }
-    if (xsdSimpleTypeDefinition.getName() == null)
-    {
-      return isAnonymous();
-    }
-    return true;
-  }
-  
-  public String[] getActions(Object object)
-  {
-    List list = new ArrayList();
-    list.add(AddXSDEnumerationFacetAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(SetBaseTypeAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(DeleteAction.ID);
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    Object schema = getEditorSchema();
-    XSDTypeDefinition typeDefinition = getXSDTypeDefinition();
-    if (typeDefinition.getSchema() == schema)
-    {
-      XSDConcreteComponent container = typeDefinition.getContainer();
-      if (container == schema || container instanceof XSDRedefine)
-      {
-        list.add(SetInputToGraphView.ID);
-      }
-    }
-    else
-    {
-      list.add(OpenInNewEditor.ID);
-    }
-    list.add(BaseSelectionAction.SEPARATOR_ID);
-    list.add(ShowPropertiesViewAction.ID);
-    
-    return (String [])list.toArray(new String[0]);
-  }
-
-  public boolean isAnonymous()
-  {
-    XSDSimpleTypeDefinition xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition) target;
-    EObject eContainer = xsdSimpleTypeDefinition.eContainer();
-    return !(eContainer instanceof XSDSchema ||
-             eContainer instanceof XSDRedefine);
-  }
-
-  public IADTObject getTopContainer()
-  {
-    return this;
-  }
-
-  public Command getDeleteCommand() 
-  {
-    return new DeleteCommand(getXSDTypeDefinition());	
-  }
-  
-  public IModel getModel()
-  {
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(getXSDTypeDefinition().getSchema());
-    return (IModel)adapter;
-  }
-
-  public ITreeElement[] getChildren()
-  {
-    List adapterList = new ArrayList();
-    XSDSimpleTypeDefinition xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition) target;
-    List list = xsdSimpleTypeDefinition.getEnumerationFacets();
-    populateAdapterList(list, adapterList);
-    return (ITreeElement[]) adapterList.toArray(new ITreeElement[0]);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDTypeDefinitionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDTypeDefinitionAdapter.java
deleted file mode 100644
index 7ecd548..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDTypeDefinitionAdapter.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public abstract class XSDTypeDefinitionAdapter extends XSDBaseAdapter implements IType, IActionProvider, IGraphElement
-{
-  public XSDTypeDefinition getXSDTypeDefinition()
-  {
-    return (XSDTypeDefinition)target;
-  }
-
-  public String getName()
-  {
-    EObject eContainer = getXSDTypeDefinition().eContainer();
-    if (eContainer instanceof XSDSchema || eContainer instanceof XSDRedefine)
-    {  
-      return getXSDTypeDefinition().getName();
-    }
-    else 
-    {
-      if (eContainer instanceof XSDNamedComponent)
-      {
-         XSDNamedComponent ed = (XSDNamedComponent)eContainer;
-         return "(" + ed.getName() + "Type)";                //$NON-NLS-1$ //$NON-NLS-2$
-      }
-    }
-    return null;
-  }
-
-  public String getQualifier()
-  {
-    return getXSDTypeDefinition().getTargetNamespace();
-  }
-
-  public IType getSuperType()
-  {
-    XSDTypeDefinition td = getXSDTypeDefinition().getBaseType();
-    return td != null ? (IType)XSDAdapterFactory.getInstance().adapt(td) : null;
-  }
-
-  public Command getUpdateNameCommand(String newName)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public boolean isComplexType()
-  {
-    return false;
-  }    
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDVisitor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDVisitor.java
deleted file mode 100644
index 5e2b5c1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDVisitor.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.Iterator;
-import java.util.Stack;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDIdentityConstraintDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNotationDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-
-public class XSDVisitor
-{
-  public XSDVisitor()
-  {
-    circularDefinitionFound = false;
-    visitedGroups = new Stack();
-  }
-  
-  public boolean circularDefinitionFound = false;
-  protected XSDSchema schema;
-  protected Stack visitedGroups = new Stack();
-  
-  public void visitSchema(XSDSchema schema)
-  {
-    this.schema = schema;
-    for (Iterator iterator = schema.getAttributeDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeDeclaration attr = (XSDAttributeDeclaration) iterator.next();
-      visitAttributeDeclaration(attr);
-    }
-    for (Iterator iterator = schema.getTypeDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDTypeDefinition type = (XSDTypeDefinition) iterator.next();
-      visitTypeDefinition(type);
-    }
-    for (Iterator iterator = schema.getElementDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDElementDeclaration element = (XSDElementDeclaration) iterator.next();
-      visitElementDeclaration(element);
-    }
-    for (Iterator iterator = schema.getIdentityConstraintDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDIdentityConstraintDefinition identityConstraint = (XSDIdentityConstraintDefinition) iterator.next();
-      visitIdentityConstraintDefinition(identityConstraint);
-    }
-    for (Iterator iterator = schema.getModelGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDModelGroupDefinition modelGroup = (XSDModelGroupDefinition) iterator.next();
-      visitModelGroupDefinition(modelGroup);
-    }
-    for (Iterator iterator = schema.getAttributeGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupDefinition attributeGroup = (XSDAttributeGroupDefinition) iterator.next();
-      visitAttributeGroupDefinition(attributeGroup);
-    }
-    for (Iterator iterator = schema.getNotationDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDNotationDeclaration element = (XSDNotationDeclaration) iterator.next();
-      visitNotationDeclaration(element);
-    }
-    
-  }
-  
-  public void visitAttributeDeclaration(XSDAttributeDeclaration attr)
-  {
-  }
-  
-  public void visitTypeDefinition(XSDTypeDefinition type)
-  {
-    if (type instanceof XSDSimpleTypeDefinition)
-    {
-      visitSimpleTypeDefinition((XSDSimpleTypeDefinition)type);
-    }
-    else if (type instanceof XSDComplexTypeDefinition)
-    {
-      visitComplexTypeDefinition((XSDComplexTypeDefinition)type);
-    }
-  }
-  
-  public void visitElementDeclaration(XSDElementDeclaration element)
-  {
-    if (element.isElementDeclarationReference())
-    {
-      visitElementDeclaration(element.getResolvedElementDeclaration());
-    }
-    else if (element.getAnonymousTypeDefinition() != null)
-    {
-      visitTypeDefinition(element.getAnonymousTypeDefinition());
-    }
-  }
-  
-  public void visitIdentityConstraintDefinition(XSDIdentityConstraintDefinition identityConstraint)
-  {
-  }
-  
-  public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-  {
-    if (!modelGroupDef.isModelGroupDefinitionReference())
-    {
-      if (modelGroupDef.getModelGroup() != null)
-      {
-        if ((visitedGroups.contains(modelGroupDef.getResolvedModelGroupDefinition().getModelGroup())))
-        {
-          circularDefinitionFound = true;
-          return;
-        }
-        visitedGroups.push(modelGroupDef.getModelGroup());
-        visitModelGroup(modelGroupDef.getModelGroup());
-        visitedGroups.pop();
-      }
-    }
-    else
-    {
-      XSDModelGroupDefinition resolvedGroupDef = modelGroupDef.getResolvedModelGroupDefinition();
-      XSDModelGroup modelGroup = resolvedGroupDef.getModelGroup();
-
-      if ((visitedGroups.contains(modelGroup)))
-      {
-        circularDefinitionFound = true;
-        return;
-      }
-
-      visitedGroups.push(modelGroup);
-      if (modelGroup != null)
-      {
-        visitModelGroup(modelGroup);
-      }
-      visitedGroups.pop();
-    }
-  }
-
-  public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-  {
-    for (Iterator it = attributeGroup.getContents().iterator(); it.hasNext(); )
-    {
-      Object o = it.next();
-      if (o instanceof XSDAttributeUse)
-      {
-        XSDAttributeUse attrUse = (XSDAttributeUse)o;
-        visitAttributeDeclaration(attrUse.getContent());
-      }
-      else if (o instanceof XSDAttributeGroupDefinition)
-      {
-        XSDAttributeGroupDefinition attrGroup = (XSDAttributeGroupDefinition)o;
-        visitAttributeGroupDefinition(attrGroup.getResolvedAttributeGroupDefinition());
-      }
-    }
-  }
-  
-  public void visitRedefine(XSDRedefine redefine)
-  {
-	  
-  }
-  
-  public void visitNotationDeclaration(XSDNotationDeclaration notation)
-  {
-  }
-  
-  public void visitSimpleTypeDefinition(XSDSimpleTypeDefinition type)
-  {
-  }
-  
-  public void visitComplexTypeContent(XSDSimpleTypeDefinition content)
-  {
-    
-  }
-  
-  public void visitComplexTypeDefinition(XSDComplexTypeDefinition type)
-  {
-    if (type.getContent() != null)
-    {
-      XSDComplexTypeContent complexContent = type.getContent();
-      if (complexContent instanceof XSDSimpleTypeDefinition)
-      {
-        visitComplexTypeContent((XSDSimpleTypeDefinition)complexContent);
-      }
-      else if (complexContent instanceof XSDParticle)
-      {
-        visitParticle((XSDParticle) complexContent);
-      }
-    }
-  }
-  
-  public void visitParticle(XSDParticle particle)
-  {
-    visitParticleContent(particle.getContent());
-  }
-  
-  public void visitParticleContent(XSDParticleContent particleContent)
-  {
-    if (particleContent instanceof XSDModelGroupDefinition)
-    {
-      visitModelGroupDefinition((XSDModelGroupDefinition) particleContent);
-    }
-    else if (particleContent instanceof XSDModelGroup)
-    {
-      visitModelGroup((XSDModelGroup)particleContent);
-    }
-    else if (particleContent instanceof XSDElementDeclaration)
-    {
-      visitElementDeclaration((XSDElementDeclaration)particleContent);
-    }
-    else if (particleContent instanceof XSDWildcard)
-    {
-      visitWildcard((XSDWildcard)particleContent);
-    }
-  }
-  
-  public void visitModelGroup(XSDModelGroup modelGroup)
-  {
-    if (modelGroup.getContents() != null)
-    {
-      for (Iterator iterator = modelGroup.getContents().iterator(); iterator.hasNext();)
-      {
-        XSDParticle particle = (XSDParticle) iterator.next();
-        visitParticle(particle);
-      }
-    }
-  }
-  
-  public void visitWildcard(XSDWildcard wildcard)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDVisitorForFields.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDVisitorForFields.java
deleted file mode 100644
index 48a0f34..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDVisitorForFields.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- * 
- */
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-
-public class XSDVisitorForFields extends XSDVisitor
-{
-  public XSDVisitorForFields()
-  {
-    super();
-  }
-
-  public List concreteComponentList = new ArrayList();
-  public List thingsWeNeedToListenTo = new ArrayList();
-  
-  public void visitComplexTypeDefinition(XSDComplexTypeDefinition type)
-  {
-    if (type.getAttributeContents() != null)
-    {
-      for (Iterator iter = type.getAttributeContents().iterator(); iter.hasNext(); )
-      {
-        XSDAttributeGroupContent attrGroupContent = (XSDAttributeGroupContent)iter.next();
-        if (attrGroupContent instanceof XSDAttributeUse)
-        {
-          XSDAttributeUse attrUse = (XSDAttributeUse)attrGroupContent;
-          
-          visitAttributeDeclaration(attrUse.getContent());
-
-//          if (attrUse.getAttributeDeclaration() != attrUse.getContent())
-//          {
-//            visitAttributeDeclaration(attrUse.getContent());
-//          }
-//          else
-//          {
-//            thingsWeNeedToListenTo.add(attrUse.getAttributeDeclaration());
-//            concreteComponentList.add(attrUse.getAttributeDeclaration());
-//          }
-        }
-        else if (attrGroupContent instanceof XSDAttributeGroupDefinition)
-        {
-          XSDAttributeGroupDefinition attrGroup = (XSDAttributeGroupDefinition)attrGroupContent;
-          thingsWeNeedToListenTo.add(attrGroup);
-          if (attrGroup.isAttributeGroupDefinitionReference())
-          {
-            attrGroup = attrGroup.getResolvedAttributeGroupDefinition();
-            visitAttributeGroupDefinition(attrGroup);
-          }
-        }
-      }
-    }
-    if (type.getAttributeWildcard() != null)
-    {
-      thingsWeNeedToListenTo.add(type.getAttributeWildcard());
-      concreteComponentList.add(type.getAttributeWildcard());
-    }
-    super.visitComplexTypeDefinition(type);
-  }
-  
-  public void visitComplexTypeContent(XSDSimpleTypeDefinition content)
-  {
-    thingsWeNeedToListenTo.add(content);
-    
-    super.visitComplexTypeContent(content);   
-  }
-
-  
-  public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-  {
-    // listen to definition in case it changes
-    XSDModelGroupDefinition resolvedModelGroupDef = modelGroupDef.getResolvedModelGroupDefinition();
-    if (visitedGroups.contains(resolvedModelGroupDef.getModelGroup())) return;
-   
-    if (modelGroupDef.isModelGroupDefinitionReference())
-    {
-      // if it's a reference we need to listen to the reference incase it changes
-      if (!thingsWeNeedToListenTo.contains(modelGroupDef))
-        thingsWeNeedToListenTo.add(modelGroupDef);      
-    }
-    super.visitModelGroupDefinition(modelGroupDef);
-  }
-  
-  public void visitModelGroup(XSDModelGroup modelGroup)
-  {
-    super.visitModelGroup(modelGroup);
-    thingsWeNeedToListenTo.add(modelGroup); 
-  }
-  
-  public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-  {
-    for (Iterator it = attributeGroup.getContents().iterator(); it.hasNext(); )
-    {
-      Object o = it.next();
-      if (o instanceof XSDAttributeUse)
-      {
-        XSDAttributeUse attributeUse = (XSDAttributeUse)o;
-        concreteComponentList.add(attributeUse.getAttributeDeclaration());
-        thingsWeNeedToListenTo.add(attributeUse.getAttributeDeclaration());
-      }
-      else if (o instanceof XSDAttributeGroupDefinition)
-      {
-        XSDAttributeGroupDefinition attrGroup = (XSDAttributeGroupDefinition)o;
-        thingsWeNeedToListenTo.add(attrGroup);
-        if (attrGroup.isAttributeGroupDefinitionReference())
-        {
-          attrGroup = attrGroup.getResolvedAttributeGroupDefinition();
-          visitAttributeGroupDefinition(attrGroup);
-        }
-      }
-    }
-    
-    XSDWildcard anyAttribute = attributeGroup.getAttributeWildcardContent();
-    if (anyAttribute != null)
-    {
-      concreteComponentList.add(anyAttribute);
-      thingsWeNeedToListenTo.add(anyAttribute);
-    }
-    
-  }
-  
-  public void visitParticle(XSDParticle particle)
-  {
-    thingsWeNeedToListenTo.add(particle);
-    super.visitParticle(particle);
-  }
-  
-  public void visitWildcard(XSDWildcard wildcard)
-  {
-    concreteComponentList.add(wildcard);
-  }
-
-  public void visitElementDeclaration(XSDElementDeclaration element)
-  {
-    if (element.isElementDeclarationReference())
-    {
-      thingsWeNeedToListenTo.add(element);
-      thingsWeNeedToListenTo.add(element.getResolvedElementDeclaration());
-      // now, add the reference as a field
-      concreteComponentList.add(element);
-    }
-    else
-    {
-      concreteComponentList.add(element.getResolvedElementDeclaration());
-      // note... we intentionally ommit the call to super.visitElementDeclaration()
-      // since we don't want to delve down deeper than the element      
-    }
-  }
-  
-  public void visitAttributeDeclaration(XSDAttributeDeclaration attr)
-  {
-    if (attr.isAttributeDeclarationReference())
-    {
-      thingsWeNeedToListenTo.add(attr);
-      thingsWeNeedToListenTo.add(attr.getResolvedAttributeDeclaration());
-      concreteComponentList.add(attr);
-    }
-    else
-    {
-      concreteComponentList.add(attr.getResolvedAttributeDeclaration());
-      thingsWeNeedToListenTo.add(attr.getResolvedAttributeDeclaration());
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDWildcardAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDWildcardAdapter.java
deleted file mode 100644
index 1d9c140..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/adapters/XSDWildcardAdapter.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adapters;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDWildcardAdapter extends XSDParticleAdapter implements IField, IActionProvider, IGraphElement
-{
-//  public static final Image ANYELEMENT_ICON = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAny.gif"); //$NON-NLS-1$
-//  public static final Image ANYELEMENT_DISABLED_ICON = XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAny.gif"); //$NON-NLS-1$
-  
-  public XSDWildcardAdapter()
-  {
-
-  }
-  
-  public Image getImage()
-  {
-    XSDWildcard xsdWildcard = (XSDWildcard) target;
-    
-    if (xsdWildcard.eContainer() instanceof XSDParticle)
-    {
-      if (isReadOnly())
-      {
-        return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAnydis.gif"); //$NON-NLS-1$
-      }
-      return XSDEditorPlugin.getXSDImage("icons/XSDAny.gif"); //$NON-NLS-1$
-    }
-    else
-    {
-      if (isReadOnly())
-      {
-        return XSDEditorPlugin.getPlugin().getIcon("obj16/XSDAnyAttributedis.gif"); //$NON-NLS-1$
-      }
-      return XSDEditorPlugin.getXSDImage("icons/XSDAnyAttribute.gif"); //$NON-NLS-1$
-    }
-  }
-
-  public String getText()
-  {
-    XSDWildcard xsdWildcard = (XSDWildcard) target;
-
-    StringBuffer result = new StringBuffer();
-    Element element = xsdWildcard.getElement();
-
-    if (element != null)
-    {
-      result.append(element.getNodeName());
-      boolean hasMinOccurs = element.hasAttribute(XSDConstants.MINOCCURS_ATTRIBUTE);
-      boolean hasMaxOccurs = element.hasAttribute(XSDConstants.MAXOCCURS_ATTRIBUTE);
-
-      if (hasMinOccurs || hasMaxOccurs)
-      {
-        result.append(" ["); //$NON-NLS-1$
-        if (hasMinOccurs)
-        {
-
-          int min = ((XSDParticle) xsdWildcard.getContainer()).getMinOccurs();
-          if (min == XSDParticle.UNBOUNDED)
-          {
-            result.append("*"); //$NON-NLS-1$
-          }
-          else
-          {
-            result.append(String.valueOf(min));
-          }
-        }
-        else
-        // print default
-        {
-          int min = ((XSDParticle) xsdWildcard.getContainer()).getMinOccurs();
-          result.append(String.valueOf(min));
-        }
-        if (hasMaxOccurs)
-        {
-          int max = ((XSDParticle) xsdWildcard.getContainer()).getMaxOccurs();
-          result.append(".."); //$NON-NLS-1$
-          if (max == XSDParticle.UNBOUNDED)
-          {
-            result.append("*"); //$NON-NLS-1$
-          }
-          else
-          {
-            result.append(String.valueOf(max));
-          }
-        }
-        else
-        // print default
-        {
-          result.append(".."); //$NON-NLS-1$
-          int max = ((XSDParticle) xsdWildcard.getContainer()).getMaxOccurs();
-          result.append(String.valueOf(max));
-        }
-        result.append("]"); //$NON-NLS-1$
-      }
-    }
-    return result.toString();
-
-  }
-
-  public boolean hasChildren()
-  {
-    return false;
-  }
-
-  public Object getParent(Object object)
-  {
-    XSDWildcard xsdWildcard = (XSDWildcard) target;
-    return xsdWildcard.getContainer();
-  }
-
-  public Command getDeleteCommand()
-  {
-	  return new DeleteCommand((XSDWildcard) target);	
-  }
-
-  public String getKind()
-  {
-    XSDWildcard xsdWildcard = (XSDWildcard) target;
-    if (xsdWildcard.eContainer() instanceof XSDParticle)
-    {
-      return "element"; //$NON-NLS-1$
-    }
-    return "attribute";
-  }
-
-  public IModel getModel()
-  {
-    return null;
-  }
-
-  public String getName()
-  {
-    XSDWildcard xsdWildcard = (XSDWildcard) target;
-    if (xsdWildcard.eContainer() instanceof XSDParticle)
-    {
-      return "any"; //$NON-NLS-1$
-    }
-    return "anyAttribute"; //$NON-NLS-1$
-  }
-  
-  public IType getType()
-  {
-    return null;
-  }
-
-  public String getTypeName()
-  {
-    return ""; //$NON-NLS-1$
-  }
-
-  public String getTypeNameQualifier()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateMaxOccursCommand(int maxOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateMinOccursCommand(int minOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateNameCommand(String name)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateTypeNameCommand(String typeName, String quailifier)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public boolean isGlobal()
-  {
-    return false;
-  }
-
-  public boolean isReference()
-  {
-    return false;
-  }
-
-  public String[] getActions(Object object)
-  {
-    Collection actionIDs = new ArrayList();
-    actionIDs.add(DeleteAction.ID);
-    actionIDs.add(BaseSelectionAction.SEPARATOR_ID);
-    actionIDs.add(ShowPropertiesViewAction.ID);
-    return (String [])actionIDs.toArray(new String[0]);
-  }
-
-  public IADTObject getTopContainer()
-  {
-    return getGlobalXSDContainer((XSDWildcard) target);
-  }
-
-  public boolean isFocusAllowed()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/BaseDragAndDropCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/BaseDragAndDropCommand.java
deleted file mode 100644
index 2edf44e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/BaseDragAndDropCommand.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.commands;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FreeformLayout;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RoundedRectangle;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.xsd.ui.internal.actions.MoveXSDBaseAction;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.common.commands.BaseCommand;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.ConnectableEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.TargetConnectionSpacingFigureEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDBaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-public abstract class BaseDragAndDropCommand extends BaseCommand
-{
-  protected static int ABOVE_IS_CLOSER = 0;
-  protected static int BELOW_IS_CLOSER = 1;
-  
-  protected EditPartViewer viewer;    
-  protected ChangeBoundsRequest request;
-  protected boolean canExecute;
-  protected GraphicalEditPart target;
-  
-  protected GraphicalEditPart leftSiblingEditPart;
-  protected GraphicalEditPart rightSiblingEditPart;
-  protected Point location;
-
-  protected ConnectableEditPart parentEditPart;
-  protected XSDConcreteComponent previousRefComponent = null, nextRefComponent = null, xsdComponentToDrag;
-  protected XSDBaseFieldEditPart itemToDrag;
-  protected Rectangle originalLocation;
-  protected Polyline polyLine;
-  
-  protected MoveXSDBaseAction action;
-  protected List targetSpacesList = new ArrayList();
-  protected int closerSibling;
-  
-  public BaseDragAndDropCommand(EditPartViewer viewer, ChangeBoundsRequest request)
-  {
-    this.viewer = viewer;                    
-    this.request = request;
-  }
-  
-  protected abstract void setup();
- 
-  /**
-   * Provides the DOM element associated with the parent XSD component. 
-   * This element is used in the the undo/redo mechanism.   
-   * @return the DOM element associated with the parent XSD component.
-   */
-  protected abstract Element getElement();
-  
-  public PointList getConnectionPoints(Rectangle draggedFigureBounds)
-  {
-    PointList pointList = null;
-    if (target != null && itemToDrag != null && parentEditPart != null)
-    {
-      pointList = getConnectionPoints(parentEditPart, itemToDrag, draggedFigureBounds);
-    }
-    return pointList != null ? pointList : new PointList();
-  }
-  
-  // This method supports the preview connection line function related to drag and drop
-  //     
-  public PointList getConnectionPoints(ConnectableEditPart parentEditPart, BaseFieldEditPart childRefEditPart, Rectangle draggedFigureBounds)
-  {           
-    PointList pointList = new PointList();                         
-    int[] data = new int[1];
-    Point a = getConnectionPoint(parentEditPart, childRefEditPart, data);
-    if (a != null)
-    {   
-      int draggedFigureBoundsY = draggedFigureBounds.y + draggedFigureBounds.height/2;
-
-      pointList.addPoint(a); 
-      
-      if (data[0] == 0) // insert between 2 items
-      {                                         
-        int x = a.x + 5;
-        pointList.addPoint(new Point(x, a.y));
-        pointList.addPoint(new Point(x, draggedFigureBoundsY));        
-        pointList.addPoint(new Point(draggedFigureBounds.x, draggedFigureBoundsY));
-      }
-      else // insert at first or last position
-      {
-        pointList.addPoint(new Point(a.x, draggedFigureBoundsY));   
-        pointList.addPoint(new Point(draggedFigureBounds.x, draggedFigureBoundsY));
-      }
-    }       
-    return pointList;
-  }
-
-  // This method supports the preview connection line function related to drag and drop
-  //     
-  protected Point getConnectionPoint(ConnectableEditPart parentEditPart, BaseFieldEditPart childRefEditPart, int[] data)
-  {                      
-    Point point = null;     
-    List childList = parentEditPart.getChildren();         
-    if (parentEditPart.getFigure() instanceof GenericGroupFigure && childList.size() > 0)
-    {
-      point = new Point();
-
-      Rectangle r = getConnectedEditPartConnectionBounds(parentEditPart);  
-      point.x = r.x + r.width;
-      point.y = r.y + r.height/2;
-    }    
-    return point;
-  }
-
-  protected Rectangle getConnectedEditPartConnectionBounds(ConnectableEditPart editPart)
-  {
-    return getZoomedBounds(((GenericGroupFigure)editPart.getFigure()).getIconFigure().getBounds());
-  }
-    
-  public void redo()
-  {
-  }
-
-  public void undo()
-  {
-  }
-
-  public void execute()
-  {
-    if (canExecute)
-    {
-    	// Wrap the drag and drop operation for easy undo and redo.
-    	beginRecording(this.getElement());
-		action.run();
-		endRecording();
-    }
-  }
-  
-  public boolean canExecute()
-  {
-    return canExecute;
-  }
-  
-  protected void commonSetup(List siblings, GraphicalEditPart movingEditPart)
-  {
-    closerSibling = ABOVE_IS_CLOSER;
-    int pointerYLocation = location.y;
-    int index;
-    
-    for (index = 0; index < siblings.size(); index++)
-    {
-      GraphicalEditPart sibling = (GraphicalEditPart) siblings.get(index);
-      if (sibling instanceof BaseFieldEditPart)
-      {
-        int siblingYLocation = getZoomedBounds(sibling.getFigure().getBounds()).getCenter().y;
-
-        if (siblingYLocation > pointerYLocation)
-        {
-          rightSiblingEditPart = sibling;
-          if (index > 0)
-          {
-            leftSiblingEditPart = (GraphicalEditPart) siblings.get(index - 1);
-          }
-
-          if (leftSiblingEditPart != null && Math.abs(getZoomedBounds(leftSiblingEditPart.getFigure().getBounds()).getCenter().y - pointerYLocation) > Math.abs(siblingYLocation - pointerYLocation))
-          {
-            closerSibling = BELOW_IS_CLOSER;
-          }
-          break;
-        }
-      }
-    }
-
-    boolean isHandled = handleFirstAndLastDropTargets(index, siblings);
-    if (!isHandled)
-      handleOtherTargets(index);
-
-    calculateLeftAndRightXSDComponents();
-    
-    xsdComponentToDrag = (XSDConcreteComponent) ((XSDBaseAdapter) itemToDrag.getModel()).getTarget();    
-  }
-  
-  protected void calculateLeftAndRightXSDComponents()
-  {
-    if (leftSiblingEditPart instanceof XSDBaseFieldEditPart)
-    {
-      Object leftModel = ((XSDBaseFieldEditPart) leftSiblingEditPart).getModel();
-      previousRefComponent = null;
-      if (leftModel instanceof XSDBaseAdapter)
-      {
-        XSDBaseAdapter leftAdapter = (XSDBaseAdapter) leftModel;
-        previousRefComponent = (XSDConcreteComponent) leftAdapter.getTarget();
-      }
-    }
-
-    if (rightSiblingEditPart instanceof XSDBaseFieldEditPart)
-    {
-      Object rightModel = ((XSDBaseFieldEditPart) rightSiblingEditPart).getModel();
-      nextRefComponent = null;
-      if (rightModel instanceof XSDBaseAdapter)
-      {
-        XSDBaseAdapter rightAdapter = (XSDBaseAdapter) rightModel;
-        nextRefComponent = (XSDConcreteComponent) rightAdapter.getTarget();
-      }
-    }
-  }
-  
-  protected boolean handleFirstAndLastDropTargets(int index, List siblings)
-  {
-    // Handle case where you drop to first position
-    if (index == 0 && siblings.size() > 0)
-    {
-      leftSiblingEditPart = null;
-      rightSiblingEditPart = (GraphicalEditPart) siblings.get(0);
-      closerSibling = BELOW_IS_CLOSER;
-    }
-    // Handle case where you drop to last position
-    else if (index > 0 && index == siblings.size())
-    {
-      leftSiblingEditPart = (GraphicalEditPart) siblings.get(index - 1);
-      rightSiblingEditPart = null;
-    }
-    return false;
-  }
-
-  protected void handleOtherTargets(int index)
-  {
-    int in = 0;
-    ConnectableEditPart previousModelEditPart = null;
-    for (Iterator i = targetSpacesList.iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      previousModelEditPart = parentEditPart;
-      TargetConnectionSpacingFigureEditPart sp = (TargetConnectionSpacingFigureEditPart) o;
-      if (sp.getParent() instanceof ConnectableEditPart)
-        parentEditPart = (ConnectableEditPart)sp.getParent();
-      else
-        parentEditPart = null;
-      in++;
-      if (in > index)
-      {
-        if (closerSibling == ABOVE_IS_CLOSER)
-        {
-          parentEditPart = previousModelEditPart;
-        }
-        break;
-      }
-    }    
-  }
-  
-  protected List calculateFieldEditParts()
-  {
-    List list = target.getParent().getChildren();
-    List listOfFields = new ArrayList();
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof BaseFieldEditPart)
-      {
-        listOfFields.add(o);
-      }
-    }
-    return listOfFields;
-  }
-  
-  protected PointList drawLines(Polyline polyLine)
-  {
-    PointList pointList = new PointList();
-
-    if (leftSiblingEditPart != null)
-    {
-      Rectangle leftRectangle = getZoomedBounds(leftSiblingEditPart.getFigure().getBounds());
-      int xCoord = leftRectangle.x;
-      int yCoord = leftRectangle.y;
-      int height = leftRectangle.height;
-      int width = leftRectangle.width;
-
-      // Draw left end line
-      addLineToPolyline(polyLine, xCoord, yCoord + height + 3, xCoord, yCoord + height - 3);
-      addLineToPolyline(polyLine, xCoord, yCoord + height - 3, xCoord, yCoord + height);
-
-      // Draw horizontal line
-      addLineToPolyline(polyLine, xCoord, yCoord + height, xCoord + width, yCoord + height);
-
-      // Draw right end line
-      addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height - 3);
-      addLineToPolyline(polyLine, xCoord + width, yCoord + height, xCoord + width, yCoord + height + 3);
-    }
-    else if (rightSiblingEditPart != null)
-    {
-      Rectangle rightRectangle = getZoomedBounds(rightSiblingEditPart.getFigure().getBounds());
-      int xCoord = rightRectangle.x;
-      int yCoord = rightRectangle.y;
-      int width = rightRectangle.width;
-
-      // Draw left end line
-      addLineToPolyline(polyLine, xCoord, yCoord + 3, xCoord, yCoord - 3);
-      addLineToPolyline(polyLine, xCoord, yCoord - 3, xCoord, yCoord);
-
-      // Draw horizontal line
-      addLineToPolyline(polyLine, xCoord, yCoord, xCoord + width, yCoord);
-
-      // Draw right end line
-      addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord - 3);
-      addLineToPolyline(polyLine, xCoord + width, yCoord, xCoord + width, yCoord + 3);
-    }
-
-    return pointList;
-  }
-
-  protected Polyline addLineToPolyline(Polyline polyline, int x1, int y1, int x2, int y2)
-  {
-    polyline.addPoint(new Point(x1, y1));
-    polyline.addPoint(new Point(x2, y2));
-
-    return polyline;
-  }
-  
-  public IFigure getFeedbackFigure()
-  {
-    Figure panel = new Figure();
-    panel.setLayoutManager(new FreeformLayout());
-    panel.setOpaque(false);
-
-    Polyline feedbackFigure = new Polyline();
-    feedbackFigure.setLineWidth(2);
-    drawLines(feedbackFigure);
-    originalLocation = new Rectangle(feedbackFigure.getBounds());
-    panel.add(feedbackFigure);
-
-    polyLine = new Polyline();
-    polyLine.setLineStyle(Graphics.LINE_DASHDOT);
-    polyLine.setLineWidth(1);
-    panel.add(polyLine);
-    
-    panel.setBounds(originalLocation);
-    
-    addConnectorToParent(panel);
-
-    if (parentEditPart != null && parentEditPart.getFigure() instanceof GenericGroupFigure)
-    {
-      GenericGroupFigure fig = (GenericGroupFigure)parentEditPart.getFigure();
-      Rectangle iconBounds = getZoomedBounds(fig.getIconFigure().getBounds());
-      RoundedRectangle roundedRectangle = new RoundedRectangle();
-      roundedRectangle.setFill(false);
-      roundedRectangle.setOpaque(true);
-//      roundedRectangle.setBounds(new Rectangle(iconBounds.x, iconBounds.y, iconBounds.width - 1, iconBounds.height - 1));
-      roundedRectangle.setBounds(iconBounds);
-      panel.add(roundedRectangle);
-    }
-    return panel;
-  }
-  
-  protected void addConnectorToParent(IFigure p)
-  {
-    Rectangle r = originalLocation.getCopy();
-    Rectangle pBounds = r.getCopy();
-    PointList pointList = getConnectionPoints(r);
-
-    if (pointList != null && pointList.size() > 0)
-    {
-      polyLine.setPoints(pointList);
-      Point firstPoint = pointList.getFirstPoint();
-      if (firstPoint != null)
-      {
-        pBounds = pBounds.getUnion(new Rectangle(firstPoint.x, firstPoint.y, 1, 1));
-      }
-    }
-
-    if (parentEditPart != null)
-    {
-      if (parentEditPart.getFigure() instanceof GenericGroupFigure)
-      {
-        GenericGroupFigure fig = (GenericGroupFigure)parentEditPart.getFigure();
-        Rectangle iconBounds = getZoomedBounds(fig.getIconFigure().getBounds());
-        pBounds = pBounds.getUnion(iconBounds);
-      }
-    }
-
-    p.setBounds(pBounds);
-    p.validate();
-  }
-  
-  public Point getZoomedPoint(Point p)
-  {
-    double factor = ((ScalableRootEditPart)viewer.getRootEditPart()).getZoomManager().getZoom();
-
-    int x = (int)Math.round(p.x * factor);
-    int y = (int)Math.round(p.y * factor);
-
-    return new Point(x, y);
-  }
-  
-  public Rectangle getZoomedBounds(Rectangle r)
-  {
-    double factor = ((ScalableRootEditPart)viewer.getRootEditPart()).getZoomManager().getZoom();
-
-    int x = (int)Math.round(r.x * factor);
-    int y = (int)Math.round(r.y * factor);
-    int width = (int)Math.round(r.width * factor);
-    int height = (int)Math.round(r.height * factor);
-
-    return new Rectangle(x, y, width, height);
-  }
-
-  protected void handleKeyboardDragAndDrop(XSDBaseFieldEditPart leftField, XSDBaseFieldEditPart rightField, int direction)
-  {
-    target = leftField;
-    if (direction == PositionConstants.SOUTH)
-    {
-      if (itemToDrag == target)
-        return;
-      target = rightField;
-    }
-    this.location = null;
-    if (target != null)
-      this.location = target.getFigure().getBounds().getCenter();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/XSDAttributeDragAndDropCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/XSDAttributeDragAndDropCommand.java
deleted file mode 100644
index 7c09eb0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/XSDAttributeDragAndDropCommand.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.commands;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.xsd.ui.internal.actions.MoveXSDAttributeAction;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDWildcardAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CompartmentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.ComplexTypeEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.AttributeGroupDefinitionEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.TargetConnectionSpacingFigureEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDAttributesForAnnotationEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDBaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDWildcard;
-import org.w3c.dom.Element;
-
-public class XSDAttributeDragAndDropCommand extends BaseDragAndDropCommand
-{
-  public XSDAttributeDragAndDropCommand(EditPartViewer viewer, ChangeBoundsRequest request, GraphicalEditPart target, XSDBaseFieldEditPart itemToDrag, Point location)
-  {
-    super(viewer, request);
-    setLabel(Messages._UI_ACTION_DRAG_DROP_ATTRIBUTE);
-    this.target = target;
-    this.itemToDrag = itemToDrag;
-    this.location = location;
-    setup();
-  }
-
-  public XSDAttributeDragAndDropCommand(XSDBaseFieldEditPart itemToDrag, XSDBaseFieldEditPart leftField, XSDBaseFieldEditPart rightField, int direction)
-  {
-    super(itemToDrag.getViewer(), null); 
-    setLabel(Messages._UI_ACTION_DRAG_DROP_ATTRIBUTE); 
-    this.itemToDrag = itemToDrag;
-    canExecute = false;
-    handleKeyboardDragAndDrop(leftField, rightField, direction);
-  }
-  
-  protected void handleKeyboardDragAndDrop(XSDBaseFieldEditPart leftField, XSDBaseFieldEditPart rightField, int direction)
-  {
-    super.handleKeyboardDragAndDrop(leftField, rightField, direction);
-    if (direction == PositionConstants.NORTH)
-    {
-      if (target == null)
-      {
-        target = rightField;
-        this.location = target.getFigure().getBounds().getTop();
-      }
-      else if (!(leftField.getModel() instanceof XSDAttributeDeclarationAdapter)
-                 || leftField.getModel() instanceof XSDWildcardAdapter)
-      {
-        target = rightField;
-        this.location = target.getFigure().getBounds().getTop();
-      }
-    }
-    if (location == null) return;
-    setup();
-  }
-  
-  protected void setup()
-  {
-    canExecute = false;
-
-    // Drop target is attribute group ref
-    if (target instanceof AttributeGroupDefinitionEditPart)
-    {
-      parentEditPart = (AttributeGroupDefinitionEditPart) target;
-      if (((GenericGroupFigure) parentEditPart.getFigure()).getIconFigure().getBounds().contains(location))
-      {
-        xsdComponentToDrag = (XSDConcreteComponent) ((XSDAttributeDeclarationAdapter) itemToDrag.getModel()).getTarget();
-        action = new MoveXSDAttributeAction(((AttributeGroupDefinitionEditPart) parentEditPart).getXSDAttributeGroupDefinition(), xsdComponentToDrag, null, null);
-        canExecute = action.canMove();
-      }
-    }
-    else if (target instanceof BaseFieldEditPart)
-    {
-      targetSpacesList = new ArrayList();
-      // Calculate the list of all sibling field edit parts;
-      List targetEditPartSiblings = calculateFieldEditParts();
-      calculateAttributeGroupList();
-
-      // Get 'left' and 'right' siblings
-      doDrop(targetEditPartSiblings, itemToDrag);
-    }
-  }  
-  
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.xsd.ui.internal.commands.BaseDragAndDropCommand#getElement()
-   */
-  protected Element getElement()
-  {
-	  XSDAttributeDeclarationAdapter adapter = (XSDAttributeDeclarationAdapter) itemToDrag.getModel();
-	  XSDAttributeDeclaration target = (XSDAttributeDeclaration)adapter.getTarget();
-	  XSDConcreteComponent parent = (XSDConcreteComponent)target.eContainer();
-	  return parent.getElement();
-  }
-
-  protected void doDrop(List siblings, GraphicalEditPart movingEditPart)
-  {
-    commonSetup(siblings, movingEditPart);
-
-    if ((previousRefComponent instanceof XSDAttributeDeclaration || previousRefComponent instanceof XSDWildcard) 
-        && (nextRefComponent instanceof XSDAttributeDeclaration || nextRefComponent instanceof XSDWildcard))
-    {
-      XSDConcreteComponent parent = previousRefComponent.getContainer().getContainer();
-      if (closerSibling == BELOW_IS_CLOSER)
-      {
-        parent = nextRefComponent.getContainer().getContainer();
-      }
-      action = new MoveXSDAttributeAction(parent, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-    }
-    else if (previousRefComponent == null && (nextRefComponent instanceof XSDAttributeDeclaration || nextRefComponent instanceof XSDWildcard))
-    {
-      XSDConcreteComponent parent = nextRefComponent.getContainer().getContainer();
-      if (closerSibling == ABOVE_IS_CLOSER)
-      {
-        if (leftSiblingEditPart == null)
-        {
-          action = new MoveXSDAttributeAction(parent, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-        }
-        else if (parentEditPart != null)
-        {
-          action = new MoveXSDAttributeAction(parentEditPart.getXSDConcreteComponent(), xsdComponentToDrag, previousRefComponent, nextRefComponent);
-        }
-      }
-      else
-      {
-        action = new MoveXSDAttributeAction(parent, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-      }
-    }
-    else if (previousRefComponent instanceof XSDAttributeDeclaration && nextRefComponent == null)
-    {
-      XSDConcreteComponent parent = previousRefComponent.getContainer().getContainer();
-      if (closerSibling == ABOVE_IS_CLOSER)
-      {
-        action = new MoveXSDAttributeAction(parent, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-      }
-      else
-      {
-        if (rightSiblingEditPart == null)
-        {
-          action = new MoveXSDAttributeAction(parent, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-        }
-        else
-        {
-          action = new MoveXSDAttributeAction(parent, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-        }
-      }
-    }
-
-    if (action != null)
-      canExecute = action.canMove();
-  }
-
-  
-  // Attribute Group related helper method 
-  
-  protected void calculateAttributeGroupList()
-  {
-    EditPart editPart = target;
-    while (editPart != null)
-    {
-      if (editPart instanceof ComplexTypeEditPart)
-      {
-        List list = editPart.getChildren();
-        for (Iterator i = list.iterator(); i.hasNext();)
-        {
-          Object child = i.next();
-          if (child instanceof CompartmentEditPart)
-          {
-            List compartmentList = ((CompartmentEditPart) child).getChildren();
-            for (Iterator it = compartmentList.iterator(); it.hasNext();)
-            {
-              Object obj = it.next();
-              if (obj instanceof XSDAttributesForAnnotationEditPart)
-              {
-                XSDAttributesForAnnotationEditPart groups = (XSDAttributesForAnnotationEditPart) obj;
-                List groupList = groups.getChildren();
-                for (Iterator iter = groupList.iterator(); iter.hasNext();)
-                {
-                  Object groupChild = iter.next();
-                  if (groupChild instanceof TargetConnectionSpacingFigureEditPart)
-                  {
-                    targetSpacesList.add(groupChild);
-                  }
-                  else if (groupChild instanceof AttributeGroupDefinitionEditPart)
-                  {
-                    getAttributeGroupEditParts((AttributeGroupDefinitionEditPart) groupChild);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      editPart = editPart.getParent();
-    }
-
-  }
-
-  // Attribute Group related helper method
-  
-  protected List getAttributeGroupEditParts(AttributeGroupDefinitionEditPart attributeGroupEditPart)
-  {
-    List groupList = new ArrayList();
-    List list = attributeGroupEditPart.getChildren();
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      Object object = i.next();
-      if (object instanceof TargetConnectionSpacingFigureEditPart)
-      {
-        targetSpacesList.add(object);
-      }
-      else if (object instanceof AttributeGroupDefinitionEditPart)
-      {
-        AttributeGroupDefinitionEditPart groupRef = (AttributeGroupDefinitionEditPart) object;
-        List groupRefChildren = groupRef.getChildren();
-        for (Iterator it = groupRefChildren.iterator(); it.hasNext();)
-        {
-          Object o = it.next();
-          if (o instanceof TargetConnectionSpacingFigureEditPart)
-          {
-            targetSpacesList.add(o);
-          }
-          else if (o instanceof AttributeGroupDefinitionEditPart)
-          {
-            AttributeGroupDefinitionEditPart aGroup = (AttributeGroupDefinitionEditPart) o;
-            groupList.add(aGroup);
-            groupList.addAll(getAttributeGroupEditParts(aGroup));
-          }
-        }
-      }
-    }
-    return groupList;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/XSDElementDragAndDropCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/XSDElementDragAndDropCommand.java
deleted file mode 100644
index 95f45b3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/commands/XSDElementDragAndDropCommand.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.commands;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.xsd.ui.internal.actions.MoveXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDWildcardAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CompartmentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.ComplexTypeEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.StructureEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.ModelGroupDefinitionReferenceEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.ModelGroupEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.TargetConnectionSpacingFigureEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDBaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDGroupsForAnnotationEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDWildcard;
-import org.w3c.dom.Element;
-
-
-public class XSDElementDragAndDropCommand extends BaseDragAndDropCommand
-{
-  protected ModelGroupEditPart topMostGroup;
-
-  public XSDElementDragAndDropCommand(EditPartViewer viewer, ChangeBoundsRequest request, GraphicalEditPart target, XSDBaseFieldEditPart itemToDrag, Point location)
-  {
-    super(viewer, request);
-    setLabel(Messages._UI_ACTION_DRAG_DROP_ELEMENT);
-    this.target = target;
-    this.itemToDrag = itemToDrag;
-    this.location = location;
-    setup();
-  }
-  
-  public XSDElementDragAndDropCommand(XSDBaseFieldEditPart itemToDrag, XSDBaseFieldEditPart leftField, XSDBaseFieldEditPart rightField, int direction)
-  {
-    super(itemToDrag.getViewer(), null); 
-    setLabel(Messages._UI_ACTION_DRAG_DROP_ELEMENT); 
-    this.itemToDrag = itemToDrag;
-    canExecute = false;
-    handleKeyboardDragAndDrop(leftField, rightField, direction);
-  }
-  
-  protected void handleKeyboardDragAndDrop(XSDBaseFieldEditPart leftField, XSDBaseFieldEditPart rightField, int direction)
-  {
-    super.handleKeyboardDragAndDrop(leftField, rightField, direction);
-    if (direction == PositionConstants.NORTH)
-    {
-      if (target == null)
-      {
-        target = rightField;
-        this.location = target.getFigure().getBounds().getTop();
-      }
-      else if (!(leftField.getModel() instanceof XSDElementDeclarationAdapter)
-                 || leftField.getModel() instanceof XSDWildcardAdapter)
-      {
-        target = rightField;
-        this.location = target.getFigure().getBounds().getTop();
-      }
-    }
-    if (location == null) return;
-    setup();
-  }
-
-  protected void setup()
-  {
-    canExecute = false;
-
-    // Drop target is model group
-    if (target instanceof ModelGroupEditPart)
-    {
-      parentEditPart = (ModelGroupEditPart) target;
-      if (((GenericGroupFigure) parentEditPart.getFigure()).getIconFigure().getBounds().contains(location))
-      {
-        xsdComponentToDrag = (XSDConcreteComponent) ((XSDElementDeclarationAdapter) itemToDrag.getModel()).getTarget();
-        action = new MoveXSDElementAction(((ModelGroupEditPart) target).getXSDModelGroup(), xsdComponentToDrag, null, null);
-        canExecute = action.canMove();
-      }
-    }
-    else if (target instanceof BaseFieldEditPart)
-    {
-      targetSpacesList = new ArrayList();
-      // Calculate the list of all sibling field edit parts;
-      List targetEditPartSiblings = calculateFieldEditParts();
-      calculateModelGroupList();
-
-      doDrop(targetEditPartSiblings, itemToDrag);
-    }
-  }
-  
-  /*
-   * (non-Javadoc)
-   * @see org.eclipse.wst.xsd.ui.internal.commands.BaseDragAndDropCommand#getElement()
-   */
-  protected Element getElement()
-  {
-	  XSDElementDeclarationAdapter adapter = (XSDElementDeclarationAdapter) itemToDrag.getModel();
-	  XSDElementDeclaration target = (XSDElementDeclaration)adapter.getTarget();
-	  XSDConcreteComponent parent = (XSDConcreteComponent)target.eContainer();	  
-	  return parent.getElement();
-  }
-  
-  protected void doDrop(List siblings, GraphicalEditPart movingEditPart)
-  {
-    commonSetup(siblings, movingEditPart);
-
-    // Can common this code up with XSDAttributeDragAndDropCommand... 
-    if ((previousRefComponent instanceof XSDElementDeclaration || previousRefComponent instanceof XSDWildcard)
-        && (nextRefComponent instanceof XSDElementDeclaration || nextRefComponent instanceof XSDWildcard)) 
-    {
-      XSDModelGroup modelGroup = (XSDModelGroup) previousRefComponent.getContainer().getContainer();
-      if (parentEditPart != null)
-        modelGroup = ((ModelGroupEditPart) parentEditPart).getXSDModelGroup();
-      action = new MoveXSDElementAction(modelGroup, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-    }
-    else if (previousRefComponent == null && (nextRefComponent instanceof XSDElementDeclaration || nextRefComponent instanceof XSDWildcard))
-    {
-      if (closerSibling == ABOVE_IS_CLOSER)
-      {
-        if (leftSiblingEditPart == null)
-        {
-          action = new MoveXSDElementAction(topMostGroup.getXSDModelGroup(), xsdComponentToDrag, null, null, false);
-        }
-        else if (parentEditPart != null)
-        {
-          action = new MoveXSDElementAction(((ModelGroupEditPart) parentEditPart).getXSDModelGroup(), xsdComponentToDrag, previousRefComponent, nextRefComponent);
-        }
-      }
-      else
-      {
-        XSDModelGroup modelGroup = (XSDModelGroup) nextRefComponent.getContainer().getContainer();
-        action = new MoveXSDElementAction(modelGroup, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-      }
-    }
-    else if ((previousRefComponent instanceof XSDElementDeclaration || previousRefComponent instanceof XSDWildcard)  
-        && nextRefComponent == null)
-    {
-      XSDModelGroup modelGroup = (XSDModelGroup)previousRefComponent.getContainer().getContainer();
-      if (parentEditPart != null)
-        modelGroup = ((ModelGroupEditPart) parentEditPart).getXSDModelGroup();
-      if (closerSibling == ABOVE_IS_CLOSER)
-      {
-        action = new MoveXSDElementAction(modelGroup, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-      }
-      else
-      {
-        if (rightSiblingEditPart == null)
-        {
-          action = new MoveXSDElementAction(topMostGroup.getXSDModelGroup(), xsdComponentToDrag, null, null, true);
-        }
-        else
-        {
-          action = new MoveXSDElementAction(modelGroup, xsdComponentToDrag, previousRefComponent, nextRefComponent);
-        }
-      }
-    }
-
-    if (action != null)
-      canExecute = action.canMove();
-  }
-
-  /**
-   * overrides base
-   */
-  protected boolean handleFirstAndLastDropTargets(int index, List siblings)
-  {
-    // This boolean is to handle the Top and Bottom drop targets for which we want to drop
-    // to the top most model group
-    // TODO: I need to rearrange this code better
-    boolean isHandled = false;
-    int pointerYLocation = location.y;
-    // We need to find the parent editpart, which is the model group
-    // Handle case where you drop to first position
-    if (index == 0 && siblings.size() > 0)
-    {
-      leftSiblingEditPart = null;
-      rightSiblingEditPart = (GraphicalEditPart) siblings.get(0);
-      int siblingYLocation = getZoomedBounds(rightSiblingEditPart.getFigure().getBounds()).getCenter().y;
-      closerSibling = BELOW_IS_CLOSER;
-      if (Math.abs(pointerYLocation - siblingYLocation) > getZoomedBounds(rightSiblingEditPart.getFigure().getBounds()).height / 4)
-      {
-        isHandled = true;
-        parentEditPart = topMostGroup;
-        if (topMostGroup != null)
-          closerSibling = ABOVE_IS_CLOSER;
-      }
-    }
-    // Handle case where you drop to last position
-    if (index > 0 && index == siblings.size())
-    {
-      leftSiblingEditPart = (GraphicalEditPart) siblings.get(index - 1);
-      int siblingYLocation = getZoomedBounds(leftSiblingEditPart.getFigure().getBounds()).getCenter().y;
-      if (Math.abs(pointerYLocation - siblingYLocation) > getZoomedBounds(leftSiblingEditPart.getFigure().getBounds()).height / 4)
-      {
-        isHandled = true;
-        parentEditPart = topMostGroup;
-        if (topMostGroup != null)
-          closerSibling = BELOW_IS_CLOSER;
-      }
-    }
-    return isHandled;
-  }
-
-  // Methods specific to element as drag source
-  
-  // Model Group related helper method
-  protected void calculateModelGroupList()
-  {
-    EditPart editPart = target;
-    while (editPart != null)
-    {
-      if (editPart instanceof ModelGroupEditPart)
-      {
-        getModelGroupEditParts((ModelGroupEditPart) editPart);
-      }
-      else if (editPart instanceof ComplexTypeEditPart || editPart instanceof StructureEditPart)
-      {
-        boolean foundTop = false;
-        List list = editPart.getChildren();
-        for (Iterator i = list.iterator(); i.hasNext();)
-        {
-          Object child = i.next();
-          if (child instanceof CompartmentEditPart)
-          {
-            List compartmentList = ((CompartmentEditPart) child).getChildren();
-            for (Iterator it = compartmentList.iterator(); it.hasNext();)
-            {
-              Object obj = it.next();
-              if (obj instanceof XSDGroupsForAnnotationEditPart)
-              {
-                XSDGroupsForAnnotationEditPart groups = (XSDGroupsForAnnotationEditPart) obj;
-                List groupList = groups.getChildren();
-                for (Iterator iter = groupList.iterator(); iter.hasNext();)
-                {
-                  Object groupChild = iter.next();
-                  if (groupChild instanceof ModelGroupEditPart)
-                  {
-                    if (!foundTop)
-                    {
-                      foundTop = true;
-                      topMostGroup = (ModelGroupEditPart) groupChild;
-                    }
-                    getModelGroupEditParts((ModelGroupEditPart) groupChild);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      editPart = editPart.getParent();
-    }
-  }
-
-  // Model Group related helper method
-  
-  protected List getModelGroupEditParts(ModelGroupEditPart modelGroupEditPart)
-  {
-    List modelGroupList = new ArrayList();
-    List list = modelGroupEditPart.getChildren();
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      Object object = i.next();
-      if (object instanceof TargetConnectionSpacingFigureEditPart)
-      {
-        targetSpacesList.add(object);
-      }
-      else if (object instanceof ModelGroupDefinitionReferenceEditPart)
-      {
-        ModelGroupDefinitionReferenceEditPart groupRef = (ModelGroupDefinitionReferenceEditPart) object;
-        List groupRefChildren = groupRef.getChildren();
-        for (Iterator it = groupRefChildren.iterator(); it.hasNext();)
-        {
-          Object o = it.next();
-          if (o instanceof ModelGroupEditPart)
-          {
-            getModelGroupEditParts((ModelGroupEditPart) o);
-          }
-        }
-      }
-      else if (object instanceof ModelGroupEditPart)
-      {
-        getModelGroupEditParts((ModelGroupEditPart) object);
-      }
-    }
-    return modelGroupList;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/AttributeGroupDefinitionEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/AttributeGroupDefinitionEditPart.java
deleted file mode 100644
index 93c4fee..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/AttributeGroupDefinitionEditPart.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeGroupDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CenteredConnectionAnchor;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.TargetConnectionSpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-
-public class AttributeGroupDefinitionEditPart extends ConnectableEditPart
-{
-  public AttributeGroupDefinitionEditPart()
-  {
-    super();
-  }
-
-  public XSDAttributeGroupDefinition getXSDAttributeGroupDefinition()
-  {
-    if (getModel() instanceof XSDAttributeGroupDefinitionAdapter)
-    {
-      XSDAttributeGroupDefinitionAdapter adapter = (XSDAttributeGroupDefinitionAdapter) getModel();
-      return (XSDAttributeGroupDefinition) adapter.getTarget();
-    }
-//    else if (getModel() instanceof XSDAttributeGroupDefinition)
-//    {
-//      return (XSDAttributeGroupDefinition) getModel();
-//    }
-    return null;
-
-  }
-
-  protected IFigure createFigure()
-  {
-    GenericGroupFigure figure = new GenericGroupFigure();
-    XSDAttributeGroupDefinitionAdapter adapter = (XSDAttributeGroupDefinitionAdapter) getModel();
-    figure.getIconFigure().image = adapter.getImage();
-    return figure;
-  }
-
-  protected List getModelChildren()
-  {
-    List list = new ArrayList();
-    
-    XSDAttributeGroupDefinitionAdapter adapter = (XSDAttributeGroupDefinitionAdapter)getModel();
-    XSDAttributeGroupDefinition attributeGroupDefinition = adapter.getXSDAttributeGroupDefinition();
-    Iterator i = attributeGroupDefinition.getResolvedAttributeGroupDefinition().getContents().iterator();
-
-    while (i.hasNext())
-    {
-      XSDAttributeGroupContent attrGroupContent = (XSDAttributeGroupContent) i.next();
-
-      if (attrGroupContent instanceof XSDAttributeGroupDefinition)
-      {
-        list.add(XSDAdapterFactory.getInstance().adapt(attrGroupContent));
-      }
-      else if (attrGroupContent instanceof XSDAttributeUse)
-      {
-        list.add(new TargetConnectionSpaceFiller((XSDBaseAdapter)XSDAdapterFactory.getInstance().adapt(((XSDAttributeUse)attrGroupContent).getAttributeDeclaration())));
-      }
-      else
-      {
-        list.add(new TargetConnectionSpaceFiller((XSDBaseAdapter)getModel()));
-      }
-    }
-    
-    if (list.isEmpty())
-    {
-      list.add(new TargetConnectionSpaceFiller((XSDBaseAdapter)getModel()));
-    }
-
-    return list;
-  }
-
-
-  public ReferenceConnection createConnectionFigure(BaseEditPart child)
-  {
-    ReferenceConnection connectionFigure = new ReferenceConnection();
-
-    connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(((GenericGroupFigure)getFigure()).getIconFigure(), CenteredConnectionAnchor.RIGHT, 0, 0));
-
-    if (child instanceof AttributeGroupDefinitionEditPart)
-    {
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(((AttributeGroupDefinitionEditPart) child).getTargetFigure(), CenteredConnectionAnchor.LEFT, 0, 0));
-    }
-    else if (child instanceof TargetConnectionSpacingFigureEditPart)
-    {
-//      TargetConnectionSpacingFigureEditPart elem = (TargetConnectionSpacingFigureEditPart) child;
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(((TargetConnectionSpacingFigureEditPart) child).getFigure(), CenteredConnectionAnchor.LEFT, 0, 0));
-    }
-
-    connectionFigure.setHighlight(false);
-    return connectionFigure;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/CategoryEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/CategoryEditPart.java
deleted file mode 100644
index 88f312c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/CategoryEditPart.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.ViewportLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.wst.xsd.ui.internal.adapters.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.EditPartNavigationHandlerUtil;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.HeadingFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.RoundedLineBorder;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.SelectionHandlesEditPolicyImpl;
-import org.eclipse.wst.xsd.ui.internal.design.layouts.ContainerLayout;
-
-public class CategoryEditPart extends BaseEditPart
-{
-  protected SelectionHandlesEditPolicyImpl selectionHandlesEditPolicy;
-  Figure outerPane;
-  HeadingFigure headingFigure;
-  protected ScrollPane scrollpane;
-  protected int minimumHeight = 400;
-
-  public int getType()
-  {
-    return ((CategoryAdapter) getModel()).getGroupType();
-  }
-
-  protected IFigure createFigure()
-  {
-    outerPane = new Figure();
-    outerPane.setBorder(new RoundedLineBorder(1, 6));
-
-    headingFigure = new HeadingFigure();
-    outerPane.add(headingFigure);
-    headingFigure.getLabel().setText(((CategoryAdapter) getModel()).getText());
-    headingFigure.getLabel().setIcon(((CategoryAdapter) getModel()).getImage());
-
-    int minHeight = SWT.DEFAULT;
-    switch (getType())
-    {
-    case CategoryAdapter.DIRECTIVES:
-    {
-      minHeight = 80;
-      break;
-    }
-    case CategoryAdapter.ATTRIBUTES:
-    case CategoryAdapter.GROUPS:
-    {
-      minHeight = 100;
-      break;
-    }
-    }
-
-    final int theMinHeight = minHeight;
-     
-    ToolbarLayout outerLayout = new ToolbarLayout(false)
-    {
-      protected Dimension calculatePreferredSize(IFigure parent, int width, int height)
-      {
-        Dimension d = super.calculatePreferredSize(parent, width, height);
-        d.union(new Dimension(250, theMinHeight));
-        return d;
-      }
-    };
-    outerLayout.setStretchMinorAxis(true);
-    outerPane.setLayoutManager(outerLayout);
-
-    RectangleFigure line = new RectangleFigure()
-    {
-      public Dimension getPreferredSize(int wHint, int hHint)
-      {
-        Dimension d = super.getPreferredSize(wHint, hHint);
-        d.width += 20;
-        d.height = 1;
-        return d;
-      }
-    };
-    ToolbarLayout lineLayout = new ToolbarLayout(false);
-    lineLayout.setVertical(true);
-    lineLayout.setStretchMinorAxis(true);
-    line.setLayoutManager(lineLayout);
-    outerPane.add(line);
-
-    scrollpane = new ScrollPane();
-    scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC); // ScrollPane.ALWAYS);
-    outerPane.add(scrollpane);
-
-    Figure pane = new Figure();
-    pane.setBorder(new MarginBorder(5, 8, 5, 8));
-    ContainerLayout layout = new ContainerLayout();
-    layout.setHorizontal(false);
-    layout.setSpacing(0);
-    pane.setLayoutManager(layout);
-
-    Viewport viewport = new Viewport();
-    viewport.setContentsTracksHeight(true);
-    ViewportLayout viewportLayout = new ViewportLayout()
-    {
-      protected Dimension calculatePreferredSize(IFigure parent, int width, int height)
-      {
-        Dimension d = super.calculatePreferredSize(parent, width, height);
-        if (theMinHeight > 0)
-          d.height = Math.min(d.height, theMinHeight);
-        else
-        {
-          double factor = getZoomManager().getZoom();
-          int scaledHeight = (int)Math.round((getViewer().getControl().getBounds().height - minimumHeight) / factor); // adjust for other categories and spaces
-          d.height = Math.max(250, scaledHeight);
-        }
-        d.width = Math.min(d.width, 300);
-        return d;
-      }
-    };
-    viewport.setLayoutManager(viewportLayout);
-
-    scrollpane.setViewport(viewport);
-    scrollpane.setContents(pane);
-
-    return outerPane;
-  }
-
-  public void refreshVisuals()
-  {
-    super.refreshVisuals();
-
-    RoundedLineBorder border = (RoundedLineBorder) outerPane.getBorder();
-    border.setWidth(isSelected ? 2 : 1);
-    headingFigure.setSelected(isSelected);
-    outerPane.repaint();
-
-    headingFigure.getLabel().setText(((CategoryAdapter) getModel()).getText());
-  }
-
-  public IFigure getContentPane()
-  {
-    return scrollpane.getContents();
-  }
-
-  public Label getNameLabel()
-  {
-    return headingFigure.getLabel();
-  }
-
-  public HeadingFigure getHeadingFigure()
-  {
-    return headingFigure;
-  }
-
-  protected EditPart createChild(Object model)
-  {
-    EditPart editPart = new TopLevelComponentEditPart();
-    editPart.setModel(model);
-    editPart.setParent(this);
-    return editPart;
-  }
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-    EditPart result = null; 
-    if (editPart instanceof TopLevelComponentEditPart)
-    {
-      if (direction == PositionConstants.SOUTH)
-      {
-        result = EditPartNavigationHandlerUtil.getNextSibling(editPart);
-      }
-      else if (direction == PositionConstants.NORTH)
-      {
-        result = EditPartNavigationHandlerUtil.getPrevSibling(editPart);
-      }      
-      if (result != null)
-      {
-        scrollTo((AbstractGraphicalEditPart)editPart);
-      }  
-    }     
-    else
-    {
-      result = ((BaseEditPart)getParent()).doGetRelativeEditPart(editPart, direction);
-    }  
-    return result;
-  }
-
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    // cs : oddly arrowing up and down true items in the list is not handled nicely
-    // by the canned GEF GraphicalViewerKeyHandler so this navigation policy is need to fix that    
-    selectionHandlesEditPolicy = new SelectionHandlesEditPolicyImpl();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, selectionHandlesEditPolicy);
-  }
-
-  protected List getModelChildren()
-  {
-    CategoryAdapter adapter = (CategoryAdapter) getModel();
-    List children = new ArrayList(Arrays.asList(adapter.getAllChildren()));
-    return children;
-  }
-
-  public void scrollTo(AbstractGraphicalEditPart topLevel)
-  {
-    Rectangle topLevelBounds = topLevel.getFigure().getBounds();
-    Rectangle categoryBounds = figure.getBounds();
-    int scrollValue = scrollpane.getVerticalScrollBar().getValue();
-    int location = topLevelBounds.y + scrollValue - categoryBounds.y;
-    scrollpane.scrollVerticalTo(location - categoryBounds.height / 2);
-  }
-  
-  public void setMinimumHeight(int minimumHeight)
-  {
-    this.minimumHeight = minimumHeight;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ConnectableEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ConnectableEditPart.java
deleted file mode 100644
index 5132936..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ConnectableEditPart.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CompartmentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.design.figures.CenteredIconFigure;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.design.figures.IExtendedFigureFactory;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-public abstract class ConnectableEditPart extends BaseEditPart
-{
-  protected ArrayList connectionFigures = new ArrayList();
-  
-  public IExtendedFigureFactory getExtendedFigureFactory()
-  {
-    EditPartFactory factory = getViewer().getEditPartFactory();
-    Assert.isTrue(factory instanceof IExtendedFigureFactory, "EditPartFactory must be an instanceof of IExtendedFigureFactory");     //$NON-NLS-1$
-    return (IExtendedFigureFactory)factory; 
-  }
-  
-  public ConnectableEditPart()
-  {
-    super();
-  }
-  
-  protected IFigure createFigure()
-  {
-    GenericGroupFigure figure = new GenericGroupFigure();
-    return figure;
-  }
-
-  public XSDConcreteComponent getXSDConcreteComponent()
-  {
-    return (XSDConcreteComponent)((XSDBaseAdapter)getModel()).getTarget();
-  }
-  
-  public List getConnectionFigures()
-  {
-    return connectionFigures;
-  }
-  
-  public abstract ReferenceConnection createConnectionFigure(BaseEditPart child);
-  
-  public void activate()
-  {
-    super.activate();
-    activateConnection();
-  }
-
-  protected void activateConnection()
-  {
-    if (connectionFigures == null)
-    {
-      connectionFigures = new ArrayList();
-    }
-    for (Iterator i = getChildren().iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof BaseEditPart)
-      {
-        BaseEditPart g = (BaseEditPart) o;
-        ReferenceConnection figure = createConnectionFigure(g);
-        connectionFigures.add(figure);
-        figure.setPoints(figure.getPoints());
-
-        getLayer(LayerConstants.CONNECTION_LAYER).add(figure);
-      }
-    }
-  }
-  
-  public void deactivate()
-  {
-    super.deactivate();
-    deactivateConnection();
-  }
-
-  protected void deactivateConnection()
-  {
-    // if we have a connection, remove it
-    ReferenceConnection connectionFigure;
-    if (connectionFigures != null && !connectionFigures.isEmpty())
-    {
-      for (Iterator i = connectionFigures.iterator(); i.hasNext();)
-      {
-        connectionFigure = (ReferenceConnection) i.next();
-
-        if (getLayer(LayerConstants.CONNECTION_LAYER).getChildren().contains(connectionFigure))
-        {
-          getLayer(LayerConstants.CONNECTION_LAYER).remove(connectionFigure);
-        }
-      }
-      connectionFigures = null;
-    }
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-    refreshConnection();
-  }
-
-  protected void refreshConnection()
-  {
-    if (!isActive())
-      return;
-
-    if (connectionFigures == null || connectionFigures.isEmpty())
-    {
-      activateConnection();
-    }
-    else
-    {
-      deactivateConnection();
-      activateConnection();
-    }
-  }
-  
-  public void addFeedback()
-  {
-    ReferenceConnection connectionFigure;
-    if (connectionFigures != null && !connectionFigures.isEmpty())
-    {
-      for (Iterator i = connectionFigures.iterator(); i.hasNext();)
-      {
-        connectionFigure = (ReferenceConnection) i.next();
-        connectionFigure.setHighlight(true);
-      }
-    }
-    GenericGroupFigure figure = (GenericGroupFigure)getFigure();
-    figure.getIconFigure().setMode(CenteredIconFigure.SELECTED);
-    figure.getIconFigure().refresh();
-  }
-  
-  public void removeFeedback()
-  {
-    ReferenceConnection connectionFigure;
-    if (connectionFigures != null && !connectionFigures.isEmpty())
-    {
-      for (Iterator i = connectionFigures.iterator(); i.hasNext();)
-      {
-        connectionFigure = (ReferenceConnection) i.next();
-        connectionFigure.setHighlight(false);
-      }
-    }
-    GenericGroupFigure figure = (GenericGroupFigure)getFigure();
-    figure.getIconFigure().setMode(CenteredIconFigure.NORMAL);
-    figure.getIconFigure().refresh();
-  }
-  
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    GenericGroupFigure figure = (GenericGroupFigure)getFigure();
-    figure.getIconFigure().refresh();
-  }
-
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
-  }
-
-  protected void addChildVisual(EditPart childEditPart, int index)
-  {
-    IFigure child = ((GraphicalEditPart) childEditPart).getFigure();
-    getContentPane().add(child, index);
-  }
-
-  protected void removeChildVisual(EditPart childEditPart)
-  {
-    IFigure child = ((GraphicalEditPart) childEditPart).getFigure();
-    getContentPane().remove(child);
-  }
-  
-  public IFigure getContentPane()
-  {
-    return ((GenericGroupFigure)getFigure()).getContentFigure();
-  }
-
-  public Figure getTargetFigure()
-  {
-    return ((GenericGroupFigure)getFigure()).getTargetFigure();
-  }
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-    EditPart result = null;
-    if (direction == PositionConstants.WEST)
-    {
-      if (getParent() instanceof ConnectableEditPart)
-      {
-        result = getParent();
-      }
-      else
-      {
-        result = this;
-      }
-    }
-    else if (direction == PositionConstants.EAST)
-    {    
-      result = (EditPart) editPart.getChildren().get(0);
-      TargetConnectionSpacingFigureEditPart target = null;
-      boolean foundSelectableGroup = false;
-      for (Iterator i = editPart.getChildren().iterator(); i.hasNext(); )
-      {
-        EditPart child = (EditPart)i.next();
-        if (!(child instanceof TargetConnectionSpacingFigureEditPart))
-        {
-          foundSelectableGroup = true;
-          result = child;
-          break;
-        }
-      }
-      if (result instanceof TargetConnectionSpacingFigureEditPart)
-      {
-        target = (TargetConnectionSpacingFigureEditPart) result;
-      }
-      if (!foundSelectableGroup && target != null)
-      {
-        EditPart parent = editPart.getParent();
-        while (!(parent instanceof CompartmentEditPart))
-        {
-          parent = parent.getParent();
-          if (parent == null) break;
-        }
-        for (Iterator i = parent.getChildren().iterator(); i.hasNext(); )
-        {
-          EditPart child = (EditPart) i.next();
-          if (child instanceof BaseFieldEditPart && !(child instanceof SpaceFillerForFieldEditPart))
-          {
-            BaseFieldEditPart field = (BaseFieldEditPart) child;
-            if (field.getFigure().getBounds().getCenter().y < target.getFigure().getBounds().bottom() &&
-                field.getFigure().getBounds().getCenter().y > target.getFigure().getBounds().y)
-            {
-              return child;
-            }
-          }
-        }
-        return editPart;
-      }
-    }
-    else if (direction == KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD)
-    {
-      result = (EditPart) editPart.getChildren().get(0);
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupDefinitionReferenceEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupDefinitionReferenceEditPart.java
deleted file mode 100644
index 8a1ff8b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupDefinitionReferenceEditPart.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDModelGroupDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CenteredConnectionAnchor;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.TargetConnectionSpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-
-public class ModelGroupDefinitionReferenceEditPart extends ConnectableEditPart
-{
-  GenericGroupFigure figure;
-  
-  public ModelGroupDefinitionReferenceEditPart()
-  {
-    super();
-  }
-
-  protected IFigure createFigure()
-  {
-    figure = new GenericGroupFigure();
-    return figure;
-  }
-  
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    XSDModelGroupDefinitionAdapter adapter = (XSDModelGroupDefinitionAdapter)getModel();
-    figure.getIconFigure().image = adapter.getImage();
-
-    GenericGroupFigure groupFigure = (GenericGroupFigure)getFigure();
-    String nodeName = "";
-    
-    // TODO: commmon this up with ModelGroupEditPart, XSDParticleAdapter's code
-    
-    // -2 means the user didn't specify (so the default is 1)
-    int minOccurs = adapter.getMinOccurs();
-    int maxOccurs = adapter.getMaxOccurs();
-    String occurenceDescription = ""; //$NON-NLS-1$
-    
-    if (minOccurs == -3 && maxOccurs == -3)
-    {
-      occurenceDescription = nodeName;
-      groupFigure.setText(null);
-    }
-    else if (minOccurs == 0 && (maxOccurs == -2 || maxOccurs == 1))
-    {
-      occurenceDescription = nodeName + " [0..1]"; //$NON-NLS-1$
-      groupFigure.setText("0..1");
-    }
-    else if ((minOccurs == 1 && maxOccurs == 1) ||
-             (minOccurs == -2 && maxOccurs == 1) ||
-             (minOccurs == 1 && maxOccurs == -2))
-    {
-      occurenceDescription = nodeName + " [1..1]"; //$NON-NLS-1$
-      groupFigure.setText("1..1");
-    }
-    else if (minOccurs == -2 && maxOccurs == -2)
-    {
-      occurenceDescription = nodeName;
-      groupFigure.setText(null);
-    }
-    else
-    {
-      if (maxOccurs == -2) maxOccurs = 1;
-      String maxSymbol = maxOccurs == -1 ? "*" : "" + maxOccurs; //$NON-NLS-1$ //$NON-NLS-2$
-      
-      String minSymbol = minOccurs == -2 ? "1" : "" + minOccurs; //$NON-NLS-1$ //$NON-NLS-2$
-      occurenceDescription = nodeName + " [" + minSymbol + ".." + maxSymbol + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      groupFigure.setText(minSymbol + ".." + maxSymbol);
-    }
-
-    groupFigure.getIconFigure().setToolTipText(occurenceDescription);
-    groupFigure.getIconFigure().repaint();
-
-  }
-
-  protected List getModelChildren()
-  {
-    List list = new ArrayList();
-
-    XSDModelGroupDefinitionAdapter adapter = (XSDModelGroupDefinitionAdapter)getModel();
-    XSDModelGroupDefinition groupDef = ((XSDModelGroupDefinition) adapter.getTarget());
-    XSDModelGroupDefinition resolvedGroupDef = groupDef.getResolvedModelGroupDefinition();
-    XSDModelGroup xsdModelGroup = resolvedGroupDef.getModelGroup();
-    
-    ArrayList listOfVisibleGroupRefs = new ArrayList();
-    for (EditPart ep = getParent(); ep != null; )
-    {
-      Object object = ep.getModel();
-      if (object instanceof XSDModelGroupDefinitionAdapter)
-      {
-        Object model = ((XSDModelGroupDefinitionAdapter)object).getTarget();
-        if (model instanceof XSDModelGroupDefinition)
-        {
-          listOfVisibleGroupRefs.add(((XSDModelGroupDefinition)model).getResolvedModelGroupDefinition());          
-        }
-      }
-      ep = ep.getParent();
-    }
-    
-    boolean isCyclic = (listOfVisibleGroupRefs.contains(resolvedGroupDef));
-    
-    if (xsdModelGroup != null && !isCyclic)
-      list.add(XSDAdapterFactory.getInstance().adapt(xsdModelGroup));
-    
-    if (isCyclic)
-      list.add(new TargetConnectionSpaceFiller(null));
-
-    return list;
-  }
-
-  public ReferenceConnection createConnectionFigure(BaseEditPart child)
-  {
-    ReferenceConnection connectionFigure = new ReferenceConnection();
-
-    connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(((GenericGroupFigure)getFigure()).getIconFigure(), CenteredConnectionAnchor.RIGHT, 0, 0));
-    if (child instanceof ModelGroupEditPart)
-    {
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(((ModelGroupEditPart) child).getTargetFigure(), CenteredConnectionAnchor.LEFT, 0, 0));
-    }
-    else // for the cyclic group references
-    {
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(((GenericGroupFigure) getFigure()).getIconFigure(), CenteredConnectionAnchor.RIGHT, 0, 0));
-    }
-    
-    connectionFigure.setHighlight(false);
-
-    return connectionFigure;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
deleted file mode 100644
index 1a03f37..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ModelGroupEditPart.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDModelGroupAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CenteredConnectionAnchor;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.TargetConnectionSpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.design.figures.GenericGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.design.figures.ModelGroupFigure;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class ModelGroupEditPart extends ConnectableEditPart
-{
-  protected IFigure createFigure()
-  {
-    return getExtendedFigureFactory().createModelGroupFigure(getModel());
-  }
-  
-  public XSDParticle getXSDParticle()
-  {
-    Object o = getXSDModelGroup().getContainer();
-    return (o instanceof XSDParticle) ? (XSDParticle) o : null;
-  }
-
-  public XSDModelGroup getXSDModelGroup()
-  {
-    if (getModel() instanceof XSDModelGroupAdapter)
-    {
-      XSDModelGroupAdapter adapter = (XSDModelGroupAdapter) getModel();
-      return (XSDModelGroup) adapter.getTarget();
-    }
-//    else if (getModel() instanceof XSDModelGroup)
-//    {
-//      return (XSDModelGroup) getModel();
-//    }
-    return null;
-
-  }
-
-  
-  
-  protected void refreshVisuals()
-  {
-    boolean isReadOnly = false;
-    GenericGroupFigure modelGroupFigure = (GenericGroupFigure)getFigure();
-    
-    XSDModelGroupAdapter adapter = (XSDModelGroupAdapter) getModel();
-    isReadOnly = adapter.isReadOnly();
-    
-    String nodeName = "";
-    Image image;
-    switch (getXSDModelGroup().getCompositor().getValue())
-    {
-      case XSDCompositor.ALL:
-      {
-        image = isReadOnly ? ModelGroupFigure.ALL_ICON_DISABLED_IMAGE :ModelGroupFigure.ALL_ICON_IMAGE;
-        modelGroupFigure.getIconFigure().image = XSDCommonUIUtils.getUpdatedImage((XSDConcreteComponent)adapter.getTarget(), image, isReadOnly);
-        nodeName = XSDConstants.ALL_ELEMENT_TAG;
-        break;
-      }
-      case XSDCompositor.CHOICE:
-      {
-        image = isReadOnly ? ModelGroupFigure.CHOICE_ICON_DISABLED_IMAGE : ModelGroupFigure.CHOICE_ICON_IMAGE;
-        modelGroupFigure.getIconFigure().image = XSDCommonUIUtils.getUpdatedImage((XSDConcreteComponent)adapter.getTarget(), image, isReadOnly); 
-        nodeName = XSDConstants.CHOICE_ELEMENT_TAG;
-        break;
-      }
-      case XSDCompositor.SEQUENCE:
-      {
-        image = isReadOnly ? ModelGroupFigure.SEQUENCE_ICON_DISABLED_IMAGE : ModelGroupFigure.SEQUENCE_ICON_IMAGE;
-        modelGroupFigure.getIconFigure().image = XSDCommonUIUtils.getUpdatedImage((XSDConcreteComponent)adapter.getTarget(), image, isReadOnly); 
-        nodeName = XSDConstants.SEQUENCE_ELEMENT_TAG;
-        break;
-      }
-    }
-    
-//    String occurenceDescription = adapter.getNameAnnotationToolTipString();
-//    modelGroupFigure.getIconFigure().setToolTip(occurenceDescription);
-
-    // TODO: commmon this up with XSDParticleAdapter's code
-    
-    // -2 means the user didn't specify (so the default is 1)
-    int minOccurs = adapter.getMinOccurs();
-    int maxOccurs = adapter.getMaxOccurs();
-    String occurenceDescription = ""; //$NON-NLS-1$
-    
-    if (minOccurs == -3 && maxOccurs == -3)
-    {
-      occurenceDescription = nodeName;
-      modelGroupFigure.setText(null);
-    }
-    else if (minOccurs == 0 && (maxOccurs == -2 || maxOccurs == 1))
-    {
-      occurenceDescription = nodeName + " [0..1]"; //$NON-NLS-1$
-      modelGroupFigure.setText("0..1");
-    }
-    else if ((minOccurs == 1 && maxOccurs == 1) ||
-             (minOccurs == -2 && maxOccurs == 1) ||
-             (minOccurs == 1 && maxOccurs == -2))
-    {
-      occurenceDescription = nodeName + " [1..1]"; //$NON-NLS-1$
-      modelGroupFigure.setText("1..1");
-    }
-    else if (minOccurs == -2 && maxOccurs == -2)
-    {
-      occurenceDescription = nodeName;
-      modelGroupFigure.setText(null);
-    }
-    else
-    {
-      if (maxOccurs == -2) maxOccurs = 1;
-      String maxSymbol = maxOccurs == -1 ? "*" : "" + maxOccurs; //$NON-NLS-1$ //$NON-NLS-2$
-      
-      String minSymbol = minOccurs == -2 ? "1" : "" + minOccurs; //$NON-NLS-1$ //$NON-NLS-2$
-      occurenceDescription = nodeName + " [" + minSymbol + ".." + maxSymbol + "]"; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-      modelGroupFigure.setText(minSymbol + ".." + maxSymbol);
-    }
-
-    modelGroupFigure.getIconFigure().setToolTipText(occurenceDescription);
-    modelGroupFigure.getIconFigure().repaint();
-
-    refreshConnection();
-  }
-
-  protected List getModelChildren()
-  {
-//    XSDModelGroupAdapter modelGroupAdapter = (XSDModelGroupAdapter)getModel();
-//    ArrayList ch = new ArrayList();
-//    ITreeElement [] tree = modelGroupAdapter.getChildren();
-//    int length = tree.length;
-//    for (int i = 0; i < length; i++)
-//    {
-//      ch.add(tree[i]);
-//    }
-
-    List list = new ArrayList();
-    XSDModelGroup xsdModelGroup = getXSDModelGroup();
-    for (Iterator i = xsdModelGroup.getContents().iterator(); i.hasNext();)
-    {
-      XSDParticle next = (XSDParticle) i.next();
-      if (next.getContent() instanceof XSDElementDeclaration)
-      {
-        XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) next.getContent();
-        Adapter adapter = XSDAdapterFactory.getInstance().adapt(elementDeclaration);
-        list.add(new TargetConnectionSpaceFiller((XSDBaseAdapter)adapter));
-      }
-      if (next.getContent() instanceof XSDModelGroupDefinition)
-      {
-        XSDModelGroupDefinition def = (XSDModelGroupDefinition) next.getContent();
-        Adapter adapter = XSDAdapterFactory.getInstance().adapt(def);
-        list.add(adapter);
-      }
-      else if (next.getTerm() instanceof XSDModelGroup)
-      {
-        XSDModelGroup modelGroup = (XSDModelGroup) next.getTerm();
-        Adapter adapter = XSDAdapterFactory.getInstance().adapt(modelGroup);
-        list.add(adapter);
-      }
-      else if (next.getTerm() instanceof XSDWildcard)
-      {
-        XSDWildcard wildCard = (XSDWildcard)next.getTerm();
-        Adapter adapter = XSDAdapterFactory.getInstance().adapt(wildCard);
-        list.add(new TargetConnectionSpaceFiller((XSDBaseAdapter)adapter));
-      }
-    }
-
-    if (list.size() == 0)
-      list.add(new TargetConnectionSpaceFiller(null));
-
-    return list;
-//    return ch;
-  }
-
-  public ReferenceConnection createConnectionFigure(BaseEditPart child)
-  {
-    ReferenceConnection connectionFigure = new ReferenceConnection();
-    GenericGroupFigure modelGroupFigure = (GenericGroupFigure)getFigure();
-  
-    connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(modelGroupFigure.getIconFigure(), CenteredConnectionAnchor.RIGHT, 0, 0));
-
-    if (child instanceof ModelGroupEditPart)
-    {
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(((ModelGroupEditPart) child).getTargetFigure(), CenteredConnectionAnchor.LEFT, 0, 0));
-    }
-    else if (child instanceof TargetConnectionSpacingFigureEditPart)
-    {
-      TargetConnectionSpacingFigureEditPart elem = (TargetConnectionSpacingFigureEditPart) child;
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(elem.getFigure(), CenteredConnectionAnchor.LEFT, 0, 1));
-    }
-    else if (child instanceof ModelGroupDefinitionReferenceEditPart)
-    {
-      ModelGroupDefinitionReferenceEditPart elem = (ModelGroupDefinitionReferenceEditPart) child;
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(elem.getFigure(), CenteredConnectionAnchor.LEFT, 0, 1));
-    }
-    connectionFigure.setHighlight(false);
-    return connectionFigure;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ReferenceConnection.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ReferenceConnection.java
deleted file mode 100644
index fd63dbe..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/ReferenceConnection.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-public class ReferenceConnection extends PolylineConnection
-{
-  protected boolean highlight = false;
-
-  protected static final Color activeConnection = ColorConstants.black;
-  public static final Color inactiveConnection = new Color(null, 198, 195, 198);
-
-  public ReferenceConnection()
-  {
-    super();
-    setConnectionRouter(new XSDModelGroupRouter());
-  }
-
-  public void setConnectionRouter(ConnectionRouter cr)
-  {
-    if (cr != null && getConnectionRouter() != null && !(getConnectionRouter() instanceof XSDModelGroupRouter))
-      super.setConnectionRouter(cr);
-  }
-
-  public boolean isHighlighted()
-  {
-    return highlight;
-  }
-
-  public void setHighlight(boolean highlight)
-  {
-    this.highlight = highlight;
-    
-    boolean highContrast = false;
-    try
-    {
-      highContrast = Display.getDefault().getHighContrast();
-    }
-    catch (Exception e)
-    {
-    }
-    if (highContrast)
-    {
-      setForegroundColor(highlight ? Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND) : ColorConstants.lightGray);
-    }
-    else
-    {
-      setForegroundColor(highlight ? activeConnection : inactiveConnection);
-    }
-    setOpaque(highlight);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/SpaceFillerForFieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/SpaceFillerForFieldEditPart.java
deleted file mode 100644
index 30f44ee..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/SpaceFillerForFieldEditPart.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class SpaceFillerForFieldEditPart extends BaseFieldEditPart
-{
-  Label space;
-  public SpaceFillerForFieldEditPart()
-  {
-    super();
-  }
-
-  protected IFigure createFigure()
-  {
-    space = new Label(""); //$NON-NLS-1$
-    space.setIcon(XSDEditorPlugin.getXSDImage("icons/Dot.gif")); //$NON-NLS-1$
-    space.setBorder(new MarginBorder(3, 0, 3, 0));
-    return space;
-  }
-
-  protected void refreshVisuals()
-  {
-  }
-
-  protected void createEditPolicies()
-  {
-
-  }
-  
-  public boolean isSelectable()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TargetConnectionSpacingFigureEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TargetConnectionSpacingFigureEditPart.java
deleted file mode 100644
index dad1a8b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TargetConnectionSpacingFigureEditPart.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.figures.SpacingFigure;
-
-public class TargetConnectionSpacingFigureEditPart extends BaseEditPart
-{
-  public TargetConnectionSpacingFigureEditPart()
-  {
-    super();
-  }
-
-  SpacingFigure figure;
-
-  protected IFigure createFigure()
-  {
-    figure = new SpacingFigure();
-    return figure;
-  }
-
-  public IFigure getConnectionFigure()
-  {
-    return figure;
-  }
-
-  protected void createEditPolicies()
-  {
-
-  }
-  
-  public boolean isSelectable()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TopLevelComponentEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TopLevelComponentEditPart.java
deleted file mode 100644
index d7caf36..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/TopLevelComponentEditPart.java
+++ /dev/null
@@ -1,460 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.parts.AbstractEditPartViewer;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaDirectiveAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.IAutoDirectEdit;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.INamedEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootContentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IFeedbackHandler;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.IADTUpdateCommand;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.SimpleDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.FieldFigure;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.GraphNodeDragTracker;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.SelectionHandlesEditPolicyImpl;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.TopLevelComponentLabelCellEditorLocator;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.TopLevelNameDirectEditManager;
-import org.eclipse.wst.xsd.ui.internal.design.figures.HyperLinkLabel;
-import org.eclipse.wst.xsd.ui.internal.design.layouts.FillLayout;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.utils.OpenOnSelectionHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDImportImpl;
-
-public class TopLevelComponentEditPart extends BaseEditPart implements IFeedbackHandler, INamedEditPart, IAutoDirectEdit
-{
-  protected Label label;
-  // protected Label arrowLabel;
-  protected Figure labelHolder = new Figure();
-  protected SelectionHandlesEditPolicyImpl selectionHandlesEditPolicy;
-  protected ADTDirectEditPolicy adtDirectEditPolicy = new ADTDirectEditPolicy();
-  protected SimpleDirectEditPolicy simpleDirectEditPolicy = new SimpleDirectEditPolicy();
-  protected boolean isReadOnly;
-  protected boolean isSelected;
-  private Font italicFont;
-
-  protected IFigure createFigure()
-  {
-    Figure typeGroup = new Figure()
-    {
-      public void paint(Graphics graphics)
-      {
-        super.paint(graphics);
-        if (hasFocus)
-        {
-          try
-          {
-            graphics.pushState();
-            Rectangle r = getBounds();
-            graphics.setXORMode(true);
-            graphics.drawFocus(r.x, r.y + 1, r.width - 1, r.height - 2);
-          }
-          finally
-          {
-            graphics.popState();
-          }
-        }
-        
-      }
-    };
-    typeGroup.setLayoutManager(new ToolbarLayout());
-
-    labelHolder = new Figure();
-    FillLayout fillLayout = new FillLayout();
-    labelHolder.setLayoutManager(fillLayout);
-    typeGroup.add(labelHolder);
-
-    label = new HyperLinkLabel();
-    label.setOpaque(true);
-    label.setBorder(new MarginBorder(1, 2, 2, 5));
-    if (!isHighContrast)
-      label.setForegroundColor(ColorConstants.black);
-    labelHolder.add(label);
-
-    return typeGroup;
-  }
-
-  public void deactivate()
-  {
-    if (italicFont != null)
-    {
-      italicFont.dispose();
-      italicFont = null;
-    }
-    super.deactivate();
-  }
-
-  public void refreshVisuals()
-  {
-    XSDBaseAdapter adapter = (XSDBaseAdapter) getModel();
-    if (adapter != null)
-    {
-      isReadOnly = adapter.isReadOnly();
-      label.setForegroundColor(computeLabelColor());
-      label.setText(adapter.getText());
-      Image image = adapter.getImage();
-      if (image != null)
-      {
-        label.setIcon(XSDCommonUIUtils.getUpdatedImage((XSDConcreteComponent) adapter.getTarget(), image, isReadOnly));
-      }
-      // arrowLabel.setVisible(Boolean.TRUE.equals(adapter.getProperty(getModel(),
-      // "drillDown")));
-      
-      if (adapter.isAbstract())
-      {
-        if (italicFont == null)
-        {
-          Font font = label.getFont();
-          italicFont = getItalicFont(font);
-        }
-        if (italicFont != null)
-        {
-          label.setFont(italicFont);
-        }
-      }
-      else
-      {
-        label.setFont(label.getParent().getFont());
-      }
-    }
-    else
-    {
-      label.setText(Messages._UI_GRAPH_UNKNOWN_OBJECT + getModel().getClass().getName());
-      // arrowLabel.setVisible(false);
-    }
-
-    if (reselect)
-    {
-      getViewer().select(this);
-      setReselect(false);
-    }
-  }
-
-  public List getModelChildren()
-  {
-    return Collections.EMPTY_LIST;
-  }
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-    return ((BaseEditPart)this.getParent()).doGetRelativeEditPart(editPart, direction);
-  }
-
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    // installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new
-    // NonResizableEditPolicy());
-    // selectionHandlesEditPolicy = new SelectionHandlesEditPolicyImpl();
-    // installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE,
-    // selectionHandlesEditPolicy);
-
-    SelectionHandlesEditPolicyImpl policy = new SelectionHandlesEditPolicyImpl();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, policy);
-
-    SelectionEditPolicy feedBackSelectionEditPolicy = new SelectionEditPolicy()
-    {
-      protected void hideSelection()
-      {
-        EditPart editPart = getHost();
-        if (editPart instanceof IFeedbackHandler)
-        {
-          ((IFeedbackHandler) editPart).removeFeedback();
-        }
-      }
-
-      protected void showSelection()
-      {
-        EditPart editPart = getHost();
-        if (editPart instanceof IFeedbackHandler)
-        {
-          ((IFeedbackHandler) editPart).addFeedback();
-        }
-      }
-    };
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, feedBackSelectionEditPolicy);
-
-    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
-  }
-
-  public Color computeLabelColor()
-  {
-    Color color = ColorConstants.black;
-    if (isHighContrast)
-    { 
-      color = Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
-    }
-
-    if (isSelected)
-    {
-      if (isHighContrast)
-      {
-        color = ColorConstants.listBackground;
-      }
-      else
-      {
-        color = ColorConstants.black;
-      }
-    }
-    else if (isReadOnly)
-    {
-      color = ColorConstants.gray;
-    }
-    return color;
-  }
-
-  public void addFeedback()
-  {
-    isSelected = true;
-
-    if (isHighContrast)
-    {
-      labelHolder.setBackgroundColor(ColorConstants.listForeground);
-    }
-    else
-    {
-      labelHolder.setBackgroundColor(FieldFigure.cellColor);
-    }
-    label.setForegroundColor(computeLabelColor());
-    // labelHolder.setFill(true);
-
-    if (doScroll)
-    {
-      CategoryEditPart categoryEP = (CategoryEditPart) getParent();
-      categoryEP.scrollTo(this);
-      setScroll(false);
-    }
-  }
-
-  private boolean doScroll = false;
-
-  public void setScroll(boolean doScroll)
-  {
-    this.doScroll = doScroll;
-  }
-
-  public void removeFeedback()
-  {
-    isSelected = false;
-    labelHolder.setBackgroundColor(null);
-    label.setForegroundColor(computeLabelColor());
-    // labelHolder.setFill(false);
-  }
-
-  public void performRequest(Request request)
-  {
-    // Do not open on or set focus on direct edit type 
-    if (request.getType() == RequestConstants.REQ_OPEN)
-    {
-
-      Object model = getModel();
-      if (model instanceof IGraphElement)
-      {
-        if (((IGraphElement)model).isFocusAllowed())
-        {
-          if (request instanceof LocationRequest)
-          {
-            LocationRequest locationRequest = (LocationRequest) request;
-            Point p = locationRequest.getLocation();
-
-            if (hitTest(labelHolder, p))
-            {
-              performDrillDownAction();
-            }
-          }
-        }
-      }
-      else if (model instanceof XSDSchemaDirectiveAdapter)
-      {
-        if (request instanceof LocationRequest)
-        {
-          LocationRequest locationRequest = (LocationRequest) request;
-          Point p = locationRequest.getLocation();
-
-          if (hitTest(labelHolder, p))
-          {
-            XSDSchemaDirective dir = (XSDSchemaDirective)((XSDSchemaDirectiveAdapter)model).getTarget();
-            String schemaLocation = "";
-            // force load of imported schema
-            if (dir instanceof XSDImportImpl)
-            {
-              ((XSDImportImpl)dir).importSchema();
-            }
-            if (dir.getResolvedSchema() != null)
-            {
-              schemaLocation = URIHelper.removePlatformResourceProtocol(dir.getResolvedSchema().getSchemaLocation());
-              if (schemaLocation != null)
-              {
-                OpenOnSelectionHelper.openXSDEditor(dir.getResolvedSchema());
-              }
-            }
-          }
-        }        
-      }
-    }
-  }
-
-  public boolean hitTest(IFigure target, Point location)
-  {
-    Rectangle b = target.getBounds().getCopy();
-    target.translateToAbsolute(b);
-    return b.contains(location);
-  }
-
-  protected void performDrillDownAction()
-  {
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        EditPart editPart = ((AbstractEditPartViewer) getViewer()).getRootEditPart().getContents();
-        if (editPart instanceof RootContentEditPart)
-        {
-          IEditorPart editorPart = getEditorPart();
-//          ActionRegistry registry = (ActionRegistry) editorPart.getAdapter(ActionRegistry.class);
-//          IAction action = registry.getAction(SetInputToGraphView.ID);
-//          action.run();
-          ActionRegistry registry = (ActionRegistry) editorPart.getAdapter(ActionRegistry.class);
-          if (registry != null)
-          {
-            IAction action = registry.getAction(OpenInNewEditor.ID);
-            if (action != null)
-            action.run();
-            return;
-          }
-        }
-      }
-    };
-    Display.getCurrent().asyncExec(runnable);
-  }
-  
-  public void doEditName(boolean addFromDesign)
-  {
-    if (!addFromDesign) return;
-    
-//    removeFeedback();
-
-    Object object = ((XSDBaseAdapter) getModel()).getTarget();
-    if (object instanceof XSDNamedComponent)
-    {
-      Point p = label.getLocation();
-      TopLevelNameDirectEditManager manager = new TopLevelNameDirectEditManager(TopLevelComponentEditPart.this, new TopLevelComponentLabelCellEditorLocator(TopLevelComponentEditPart.this, p), (XSDNamedComponent) object);
-      NameUpdateCommandWrapper wrapper = new NameUpdateCommandWrapper();
-      adtDirectEditPolicy.setUpdateCommand(wrapper);
-      manager.show();
-    }
-  }
-  
-  class NameUpdateCommandWrapper extends Command implements IADTUpdateCommand
-  {
-    Command command;
-    protected DirectEditRequest request;
-    
-    public NameUpdateCommandWrapper()
-    {
-      super(Messages._UI_ACTION_UPDATE_NAME);
-    }
-
-    public void setRequest(DirectEditRequest request)
-    {
-      this.request = request;
-    }
-    
-    public void execute()
-    {
-      XSDBaseAdapter adapter = (XSDBaseAdapter)getModel();
-      Object newValue = request.getCellEditor().getValue();
-      if (newValue instanceof String && ((String)newValue).length() > 0)
-      {
-        UpdateNameCommand command = new UpdateNameCommand(Messages._UI_ACTION_UPDATE_NAME, (XSDNamedComponent)adapter.getTarget(), (String)newValue);
-        if (command != null)
-          command.execute();
-      }
-     }
-  }
-
-  static boolean reselect = false;
-
-  public void setReselect(boolean state)
-  {
-    reselect = state;
-  }
-
-  public Label getNameLabelFigure()
-  {
-    return label;
-  }
-
-  public void performDirectEdit(Point cursorLocation)
-  {
-   
-  }
-  
-  public void setSelected(int value)
-  {
-    // if it is selected, we want to scroll to it
-    if (doScroll)
-      setScroll(true);
-    super.setSelected(value);
-  }
-
-  public void setFocus(boolean b)
-  {
-    super.setFocus(b);
-    hasFocus = b;
-    getFigure().repaint();
-  }
-  
-  public DragTracker getDragTracker(Request request)
-  {
-    return new GraphNodeDragTracker(this);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDAttributesForAnnotationEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDAttributesForAnnotationEditPart.java
deleted file mode 100644
index 13b4dd5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDAttributesForAnnotationEditPart.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDComplexTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.SectionEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Annotation;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-
-public class XSDAttributesForAnnotationEditPart extends SectionEditPart
-{
-  public XSDAttributesForAnnotationEditPart()
-  {
-    super();
-  }
-
-  protected List getModelChildren()
-  {
-    IStructure structure =  ((Annotation)getModel()).getOwner();
-    if (structure instanceof IComplexType)
-    {  
-      complexType = (IComplexType)structure;
-      if (complexType instanceof XSDComplexTypeDefinitionAdapter)
-      {
-        XSDComplexTypeDefinitionAdapter adapter = (XSDComplexTypeDefinitionAdapter) complexType;
-        return adapter.getAttributeGroupContent();
-      }
-    }
-    return Collections.EMPTY_LIST;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDBaseFieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDBaseFieldEditPart.java
deleted file mode 100644
index 6edac9c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDBaseFieldEditPart.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.IAnnotationProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.AttributeReferenceDirectEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.ElementReferenceDirectEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.LabelCellEditorLocator;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.LabelEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.ReferenceDirectEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFieldFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.FieldFigure;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.DragAndDropEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.SelectionHandlesEditPolicyImpl;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-public class XSDBaseFieldEditPart extends BaseFieldEditPart
-{
-
-  public XSDBaseFieldEditPart()
-  {
-    super();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.gef.editparts.AbstractEditPart#refreshVisuals()
-   */
-  protected void refreshVisuals()
-  {
-    IFieldFigure figure = getFieldFigure();
-    IField field = (IField) getModel();
-    
-    figure.getNameLabel().setText(field.getName());
-    figure.getTypeLabel().setText(field.getTypeName());
-    figure.refreshVisuals(getModel());
-    if (field.isReadOnly())
-    {
-      figure.setForegroundColor(ColorConstants.darkGray);
-    }
-    else
-    {
-      if (isHighContrast)
-      {
-        figure.setForegroundColor(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
-        figure.setBackgroundColor(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-      }
-      else
-        figure.setForegroundColor(ColorConstants.black);     
-    }
-
-    String occurrenceDescription = ""; //$NON-NLS-1$
-    if (field instanceof IAnnotationProvider)
-    {
-      occurrenceDescription = ((IAnnotationProvider)field).getNameAnnotationString();
-    }
-    refreshIcon();
-    figure.getNameAnnotationLabel().setText(occurrenceDescription);
-    
-    figure.recomputeLayout();
-
-
-    if (getRoot() != null)
-      ((GraphicalEditPart)getRoot()).getFigure().invalidateTree();
-  }
-  
-  protected void refreshIcon()  
-  {
-    IFieldFigure figure = getFieldFigure();   
-    // our model implements ITreeElement
-    if (getModel() instanceof XSDBaseAdapter)
-    {
-      Image image = ((XSDBaseAdapter)getModel()).getImage();
-      boolean isReadOnly = ((XSDBaseAdapter)getModel()).isReadOnly();
-      figure.getNameLabel().setIcon(image);
-      
-      if (image != null)
-      {
-        XSDConcreteComponent comp = (XSDConcreteComponent) ((XSDBaseAdapter)getModel()).getTarget();
-        figure.getNameLabel().setIcon(XSDCommonUIUtils.getUpdatedImage(comp, image, isReadOnly));
-      }
-    }    
-  }
-
-  public void addNotify()
-  {
-    super.addNotify();
-    getFieldFigure().editPartAttached(this);
-  }
-
-  protected SelectionHandlesEditPolicyImpl selectionHandlesEditPolicy = new SelectionHandlesEditPolicyImpl();
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, selectionHandlesEditPolicy);
-    if (!isFileReadOnly())
-      installEditPolicy(EditPolicy.PRIMARY_DRAG_ROLE, new DragAndDropEditPolicy(getViewer(), selectionHandlesEditPolicy));
-  }
-  
-  protected void directEditNameField()
-  {
-    Object model = getModel();
-    IFieldFigure fieldFigure = getFieldFigure();
-    if ( model instanceof IField) 
-    {
-      IField field = (IField) model;
-      if (field.isReference())
-      {
-        ReferenceDirectEditManager manager = null;
-        if (field instanceof XSDElementDeclarationAdapter)
-        {
-          manager = new ElementReferenceDirectEditManager((IField) model, this, fieldFigure.getNameLabel());
-        }
-        else if (field instanceof XSDAttributeDeclarationAdapter)
-        {
-          manager = new AttributeReferenceDirectEditManager((IField) model, this, fieldFigure.getNameLabel());
-        }
-        if (manager != null)
-        {
-          ReferenceUpdateCommand elementUpdateCommand = new ReferenceUpdateCommand();
-          elementUpdateCommand.setDelegate(manager);
-          adtDirectEditPolicy.setUpdateCommand(elementUpdateCommand);
-          manager.show();
-        }
-      }
-      else
-      {
-        LabelEditManager manager = new LabelEditManager(this, new LabelCellEditorLocator(this, null));
-        NameUpdateCommandWrapper wrapper = new NameUpdateCommandWrapper();
-        adtDirectEditPolicy.setUpdateCommand(wrapper);
-        manager.show();
-      }
-    }
-  }
-  
-  public void setFocus(boolean focus)
-  {
-    super.setFocus(focus);
-    hasFocus = focus;
-    ((FieldFigure)getFigure()).hasFocus = hasFocus;
-    getFigure().repaint();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDEditPartFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDEditPartFactory.java
deleted file mode 100644
index 211b787..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDEditPartFactory.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeGroupDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDModelGroupAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDModelGroupDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSimpleTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.ADTEditPartFactory;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.ColumnEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CompartmentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Annotation;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.ICompartmentFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFieldFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.TypeVizFigureFactory;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.SpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.TargetConnectionSpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.design.figures.IExtendedFigureFactory;
-import org.eclipse.wst.xsd.ui.internal.design.figures.IModelGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-public class XSDEditPartFactory extends ADTEditPartFactory implements IExtendedFigureFactory
-{
-  protected IExtendedFigureFactory delegate;
-  
-  public XSDEditPartFactory()
-  {
-    delegate = XSDEditorPlugin.getPlugin().getXSDEditorConfiguration().getFigureFactory();
-    if (delegate == null)
-      delegate = new TypeVizFigureFactory();
-  }
-  
-  public XSDEditPartFactory(IExtendedFigureFactory figureFactory)
-  {
-    delegate = figureFactory;
-  }
-  
-
-  public EditPart doCreateEditPart(EditPart context, Object model)
-  {
-    EditPart child = null;
-    // Override edit part where desired
-    
-    if (model instanceof IField)
-    {
-      if (model instanceof SpaceFiller)
-      {
-        child = new SpaceFillerForFieldEditPart();
-      }
-      else if (context instanceof CompartmentEditPart)
-      {  
-        child = new XSDBaseFieldEditPart();
-      }
-    }
-    else if (model instanceof XSDSchemaAdapter)
-    {
-      child = new XSDSchemaEditPart();
-    }
-    else if (model instanceof CategoryAdapter)
-    {
-      child = new CategoryEditPart();
-    }
-    else if (model instanceof XSDSimpleTypeDefinitionAdapter)
-    {
-      child = new XSDSimpleTypeEditPart();
-    }
-    else if (model instanceof XSDModelGroupAdapter)
-    {
-      child = new ModelGroupEditPart();
-    }
-    else if (model instanceof Annotation)
-    {
-      Annotation annotation = (Annotation) model;
-      String kind = annotation.getCompartment().getKind();
-      if (kind.equals("element")) //$NON-NLS-1$
-      {
-        child = new XSDGroupsForAnnotationEditPart();
-      }
-      else if (kind.equals("attribute")) //$NON-NLS-1$
-      {
-        child = new XSDAttributesForAnnotationEditPart();
-      }
-    }
-    else if (!(context instanceof ColumnEditPart))
-    {   
-      if (model instanceof TargetConnectionSpaceFiller)
-      {
-        child = new TargetConnectionSpacingFigureEditPart();
-      }
-      else if (model instanceof XSDModelGroupDefinitionAdapter)
-      {
-        child = new ModelGroupDefinitionReferenceEditPart();
-      }
-      else if (model instanceof XSDAttributeGroupDefinitionAdapter)
-      {
-        child = new AttributeGroupDefinitionEditPart();
-      }
-    }
-    // if we don't have a specialzied XSD edit part to create
-    // then we simply call the super class to create a generic ADT edit part
-    //
-    if (child == null)
-    {
-      child = super.doCreateEditPart(context, model);
-    }
-
-    // if at this this point we have not created an edit part we simply
-    // create a placeholder edit part to provide the most robust behaviour possible
-    //    
-    if (child == null)
-    {
-      // TODO (cs) log an error message here, since we shouldn't really get here 
-      child = new SpaceFillerForFieldEditPart();
-    }  
-    return child;
-  }
-
-  public ICompartmentFigure createCompartmentFigure(Object model)
-  {
-    return delegate.createCompartmentFigure(model);
-  }
-  
-  public IStructureFigure createStructureFigure(Object model)
-  {
-    IStructureFigure figure = delegate.createStructureFigure(model);
-    if (model instanceof XSDBaseAdapter)
-    {
-      XSDConcreteComponent comp = (XSDConcreteComponent) ((XSDBaseAdapter)model).getTarget();
-      boolean isReadOnly = ((XSDBaseAdapter)model).isReadOnly();
-      figure.getNameLabel().setIcon(XSDCommonUIUtils.getUpdatedImage( comp, ((XSDBaseAdapter)model).getImage(), isReadOnly));
-    }
-    return figure;
-  }  
-
-  public IFieldFigure createFieldFigure(Object model)
-  {
-    return delegate.createFieldFigure(model);
-  }
-  
-  public IModelGroupFigure createModelGroupFigure(Object model)
-  {
-    return delegate.createModelGroupFigure(model);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDGroupsForAnnotationEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDGroupsForAnnotationEditPart.java
deleted file mode 100644
index c065b36..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDGroupsForAnnotationEditPart.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDComplexTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDModelGroupDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.SectionEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Annotation;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-
-public class XSDGroupsForAnnotationEditPart extends SectionEditPart
-{
-  public XSDGroupsForAnnotationEditPart()
-  {
-    super();
-  }
-
-  protected List getModelChildren()
-  {
-    List xsdModelGroupList = new ArrayList();
-    List adapterList = new ArrayList();
-    
-    IStructure structure =  ((Annotation)getModel()).getOwner();
-    if (structure instanceof IComplexType)
-    {  
-      complexType = (IComplexType)structure;
-      if (complexType instanceof XSDComplexTypeDefinitionAdapter)
-      {
-        XSDComplexTypeDefinitionAdapter adapter = (XSDComplexTypeDefinitionAdapter) complexType;
-        xsdModelGroupList = adapter.getModelGroups();
-      }
-      
-      for (Iterator i = xsdModelGroupList.iterator(); i.hasNext(); )
-      {
-        Object obj = i.next();
-        if (obj instanceof XSDModelGroup)
-        {
-          adapterList.add(XSDAdapterFactory.getInstance().adapt((XSDModelGroup)obj));
-        }
-        else if (obj instanceof XSDModelGroupDefinition)
-        {
-          adapterList.add(XSDAdapterFactory.getInstance().adapt((XSDModelGroupDefinition)obj));
-        }
-      }
-    }
-    else if (structure instanceof XSDModelGroupDefinitionAdapter)
-    {
-      XSDModelGroupDefinitionAdapter adapter = (XSDModelGroupDefinitionAdapter) structure;
-      XSDModelGroup group = adapter.getXSDModelGroupDefinition().getModelGroup();
-      if (group != null)
-      {
-        adapterList.add(XSDAdapterFactory.getInstance().adapt(group));
-      }
-    }
-    
-    return adapterList;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDModelGroupRouter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDModelGroupRouter.java
deleted file mode 100644
index a195782..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDModelGroupRouter.java
+++ /dev/null
@@ -1,378 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.draw2d.AbstractRouter;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Ray;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-// TODO Manhattan connection router is final
-public class XSDModelGroupRouter extends AbstractRouter
-{
-  public XSDModelGroupRouter()
-  {
-    super();
-  }
-  private Map rowsUsed = new HashMap();
-  private Map colsUsed = new HashMap();
-
-  private Map reservedInfo = new HashMap();
-
-  private class ReservedInfo {
-    public List reservedRows = new ArrayList(2);
-    public List reservedCols = new ArrayList(2);
-  }
-
-  private static Ray  UP    = new Ray(0, -1),
-              DOWN  = new Ray(0, 1),
-              LEFT  = new Ray(-1, 0),
-              RIGHT = new Ray(1, 0);
-
-
-  /**
-   * @see org.eclipse.draw2d.ConnectionRouter#invalidate(Connection)
-   */
-  public void invalidate(Connection connection) {
-    removeReservedLines(connection);
-  }
-
-  private int getColumnNear(Connection connection, int r, int n, int x) {
-    int min = Math.min(n, x),
-      max = Math.max(n, x);
-    if (min > r) {
-      max = min;
-      min = r - (min - r);
-    }
-    if (max < r) {
-      min = max;
-      max = r + (r - max);
-    }
-    int proximity = 0;
-    int direction = -1;
-    if (r % 2 == 1)
-      r--;
-    Integer i;
-    while (proximity < r) {
-      i = new Integer(r + proximity * direction);
-      if (!colsUsed.containsKey(i)) {
-        colsUsed.put(i, i);
-        reserveColumn(connection, i);
-        return i.intValue();
-      }
-      int j = i.intValue();
-      if (j <= min)
-        return j + 2;
-      if (j >= max)
-        return j - 2;
-      if (direction == 1)
-        direction = -1;
-      else {
-        direction = 1;
-        proximity += 2;
-      }
-    }
-    return r;
-  }
-
-  /**
-   * Returns the direction the point <i>p</i> is in relation to the given rectangle.
-   * Possible values are LEFT (-1,0), RIGHT (1,0), UP (0,-1) and DOWN (0,1).
-   * 
-   * @param r the rectangle
-   * @param p the point
-   * @return the direction from <i>r</i> to <i>p</i>
-   */
-  protected Ray getDirection(Rectangle r, Point p) {
-    int i, distance = Math.abs(r.x - p.x);
-    Ray direction;
-    
-    direction = LEFT;
-
-    i = Math.abs(r.y - p.y);
-    if (i <= distance) {
-      distance = i;
-      direction = UP;
-    }
-
-    i = Math.abs(r.bottom() - p.y);
-    if (i <= distance) {
-      distance = i;
-      direction = DOWN;
-    }
-
-    i = Math.abs(r.right() - p.x);
-    if (i < distance) {
-      distance = i;
-      direction = RIGHT;
-    }
-
-    return direction;
-  }
-
-  protected Ray getEndDirection(Connection conn) {
-    ConnectionAnchor anchor = conn.getTargetAnchor();
-    Point p = getEndPoint(conn);
-    Rectangle rect;
-    if (anchor.getOwner() == null)
-      rect = new Rectangle(p.x - 1, p.y - 1, 2, 2);
-    else {
-      rect = conn.getTargetAnchor().getOwner().getBounds().getCopy();
-      conn.getTargetAnchor().getOwner().translateToAbsolute(rect);
-    }
-    return getDirection(rect, p);
-  }
-
-  protected int getRowNear(Connection connection, int r, int n, int x) {
-    int min = Math.min(n, x),
-      max = Math.max(n, x);
-    if (min > r) {
-      max = min;
-      min = r - (min - r);
-    }
-    if (max < r) {
-      min = max;
-      max = r + (r - max);
-    }
-
-    int proximity = 0;
-    int direction = -1;
-    if (r % 2 == 1)
-      r--;
-    Integer i;
-    while (proximity < r) {
-      i = new Integer(r + proximity * direction);
-      if (!rowsUsed.containsKey(i)) {
-        rowsUsed.put(i, i);
-        reserveRow(connection, i);
-        return i.intValue();
-      }
-      int j = i.intValue();
-      if (j <= min)
-        return j + 2;
-      if (j >= max)
-        return j - 2;
-      if (direction == 1)
-        direction = -1;
-      else {
-        direction = 1;
-        proximity += 2;
-      }
-    }
-    return r;
-  }
-
-  protected Ray getStartDirection(Connection conn) {
-    ConnectionAnchor anchor = conn.getSourceAnchor();
-    Point p = getStartPoint(conn);
-    Rectangle rect;
-    if (anchor.getOwner() == null)
-      rect = new Rectangle(p.x - 1, p.y - 1, 2, 2);
-    else {
-      rect = conn.getSourceAnchor().getOwner().getBounds().getCopy();
-      conn.getSourceAnchor().getOwner().translateToAbsolute(rect);
-    }
-    return getDirection(rect, p);
-  }
-
-  protected void processPositions(Ray start, Ray end, List positions, 
-                    boolean horizontal, Connection conn) {
-    removeReservedLines(conn);
-
-    int pos[] = new int[positions.size() + 2];
-    if (horizontal)
-      pos[0] = start.x;
-    else
-      pos[0] = start.y;
-    int i;
-    for (i = 0; i < positions.size(); i++) {
-      pos[i + 1] = ((Integer)positions.get(i)).intValue();
-    }
-    if (horizontal == (positions.size() % 2 == 1))
-      pos[++i] = end.x;
-    else
-      pos[++i] = end.y;
-
-    PointList points = new PointList();
-    points.addPoint(new Point(start.x, start.y));
-    Point p;
-    int current, prev, min, max;
-    boolean adjust;
-    for (i = 2; i < pos.length - 1; i++) {
-      horizontal = !horizontal;
-      prev = pos[i - 1];
-      current = pos[i];
-
-      adjust = (i != pos.length - 2);
-      if (horizontal) {
-        if (adjust) {
-          min = pos[i - 2];
-          max = pos[i + 2];
-          pos[i] = current = getRowNear(conn, current, min, max);
-        }
-        p = new Point(prev, current);
-      } else {
-        if (adjust) {
-          min = pos[i - 2];
-          max = pos[i + 2];
-          pos[i] = current = getColumnNear(conn, current, min, max);
-        }
-        p = new Point(current, prev);
-      }
-      points.addPoint(p);
-    }
-    points.addPoint(new Point(end.x, end.y));
-    conn.setPoints(points);
-  }
-
-  /**
-   * @see org.eclipse.draw2d.ConnectionRouter#remove(Connection)
-   */
-  public void remove(Connection connection) {
-    removeReservedLines(connection);
-  }
-
-  protected void removeReservedLines(Connection connection) {
-    ReservedInfo rInfo = (ReservedInfo) reservedInfo.get(connection);
-    if (rInfo == null) 
-      return;
-    
-    for (int i = 0; i < rInfo.reservedRows.size(); i++) {
-      rowsUsed.remove(rInfo.reservedRows.get(i));
-    }
-    for (int i = 0; i < rInfo.reservedCols.size(); i++) {
-      colsUsed.remove(rInfo.reservedCols.get(i));
-    }
-    reservedInfo.remove(connection);
-  }
-
-  protected void reserveColumn(Connection connection, Integer column) {
-    ReservedInfo info = (ReservedInfo) reservedInfo.get(connection);
-    if (info == null) {
-      info = new ReservedInfo();
-      reservedInfo.put(connection, info);
-    }
-    info.reservedCols.add(column);
-  }
-
-  protected void reserveRow(Connection connection, Integer row) {
-    ReservedInfo info = (ReservedInfo) reservedInfo.get(connection);
-    if (info == null) {
-      info = new ReservedInfo();
-      reservedInfo.put(connection, info);
-    }
-    info.reservedRows.add(row);
-  }
-
-  /**
-   * @see org.eclipse.draw2d.ConnectionRouter#route(Connection)
-   */
-  public void route(Connection conn) {
-    if ((conn.getSourceAnchor() == null) || (conn.getTargetAnchor() == null)) 
-      return;
-    int i;
-    Point startPoint = getStartPoint(conn);
-    conn.translateToRelative(startPoint);
-    Point endPoint = getEndPoint(conn);
-    conn.translateToRelative(endPoint);
-
-    Ray start = new Ray(startPoint);
-    Ray end = new Ray(endPoint);
-    Ray average = new Ray(startPoint.x + 4, startPoint.y); // start.getAveraged(end);
-
-    Ray direction = new Ray(start, end);
-    Ray startNormal = getStartDirection(conn);
-    Ray endNormal   = getEndDirection(conn);
-
-    List positions = new ArrayList(5);
-    boolean horizontal = startNormal.isHorizontal();
-    if (horizontal) 
-      positions.add(new Integer(start.y));
-    else
-      positions.add(new Integer(start.x));
-    horizontal = !horizontal;
-
-    if (startNormal.dotProduct(endNormal) == 0) {
-      if ((startNormal.dotProduct(direction) >= 0) 
-        && (endNormal.dotProduct(direction) <= 0)) {
-        // 0
-      } else {
-        // 2
-        if (startNormal.dotProduct(direction) < 0)
-          i = startNormal.similarity(start.getAdded(startNormal.getScaled(10)));
-        else {
-          if (horizontal) 
-            i = average.y;
-          else 
-            i = average.x;
-        }
-        positions.add(new Integer(i));
-        horizontal = !horizontal;
-
-        if (endNormal.dotProduct(direction) > 0)
-          i = endNormal.similarity(end.getAdded(endNormal.getScaled(10)));
-        else {
-          if (horizontal) 
-            i = average.y;
-          else 
-            i = average.x;
-        }
-        positions.add(new Integer(i));
-        horizontal = !horizontal;
-      }
-    } else {
-      if (startNormal.dotProduct(endNormal) > 0) {
-        //1
-        if (startNormal.dotProduct(direction) >= 0)
-          i = startNormal.similarity(start.getAdded(startNormal.getScaled(10)));
-        else
-          i = endNormal.similarity(end.getAdded(endNormal.getScaled(10)));
-        positions.add(new Integer(i));
-        horizontal = !horizontal;
-      } else {
-        //3 or 1
-        if (startNormal.dotProduct(direction) < 0) {
-          i = startNormal.similarity(start.getAdded(startNormal.getScaled(10)));
-          positions.add(new Integer(i));
-          horizontal = !horizontal;
-        }
-
-        if (horizontal) 
-          i = average.y;
-        else 
-          i = average.x;
-        positions.add(new Integer(i));
-        horizontal = !horizontal;
-
-        if (startNormal.dotProduct(direction) < 0) {
-          i = endNormal.similarity(end.getAdded(endNormal.getScaled(10)));
-          positions.add(new Integer(i));
-          horizontal = !horizontal;
-        }
-      }
-    }
-    if (horizontal) 
-      positions.add(new Integer(end.y));
-    else 
-      positions.add(new Integer(end.x));
-    
-    processPositions(start, end, positions, startNormal.isHorizontal(), conn);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSchemaEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSchemaEditPart.java
deleted file mode 100644
index bc0ad7a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSchemaEditPart.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.osgi.util.TextProcessor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adapters.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.HeadingFigure;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.SelectionHandlesEditPolicyImpl;
-import org.eclipse.wst.xsd.ui.internal.design.layouts.FillLayout;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDSchemaEditPart extends BaseEditPart
-{
-  protected Label label;
-
-  protected Figure outer, contentFigure;
-  protected HeadingFigure headingFigure;
-
-  public IFigure getContentPane()
-  {
-    return contentFigure;
-  }
-
-  protected IFigure createFigure()
-  {
-    outer = new Figure();
-    outer.setBorder(new LineBorder(1));
-
-    FillLayout fillLayout = new FillLayout(4);
-    outer.setLayoutManager(fillLayout);
-
-    headingFigure = new HeadingFigure();
-    outer.add(headingFigure);
-
-    RectangleFigure line = new RectangleFigure()
-    {
-      public Dimension getPreferredSize(int wHint, int hHint)
-      {
-        Dimension d = super.getPreferredSize(wHint, hHint);
-        d.height = 1;
-        return d;
-      }
-    };
-    ToolbarLayout lineLayout = new ToolbarLayout(false);
-    lineLayout.setVertical(true);
-    lineLayout.setStretchMinorAxis(true);
-    line.setLayoutManager(lineLayout);
-    outer.add(line);
-
-    contentFigure = new Figure();
-    contentFigure.setBorder(new MarginBorder(4));
-    fillLayout = new FillLayout(4);
-    contentFigure.setLayoutManager(fillLayout);
-
-    outer.add(contentFigure);
-    return outer;
-  }
-
-  protected List getModelChildren()
-  {
-    XSDSchemaAdapter schemaAdapter = (XSDSchemaAdapter) getModel();
-    List list = new ArrayList();
-
-// Bug 103870: undo blanks out schema view    
-//    schemaAdapter.updateCategories();
-
-    List templist = new ArrayList();
-    templist.add(schemaAdapter.getCategory(CategoryAdapter.DIRECTIVES));
-    Holder holder = new Holder(templist);
-    list.add(holder);
-
-    templist = new ArrayList();
-    templist.add(schemaAdapter.getCategory(CategoryAdapter.ELEMENTS));
-    templist.add(schemaAdapter.getCategory(CategoryAdapter.TYPES));
-    holder = new Holder(templist);
-    list.add(holder);
-
-    templist = new ArrayList();
-    templist.add(schemaAdapter.getCategory(CategoryAdapter.ATTRIBUTES));
-    templist.add(schemaAdapter.getCategory(CategoryAdapter.GROUPS));
-    holder = new Holder(templist);
-    list.add(holder);
-
-    return list;
-  }
-
-  protected EditPart createChild(Object model)
-  {
-    CategoryRowEditPart result = new CategoryRowEditPart();
-    result.setModel(model);
-    result.setParent(this);
-    return result;
-  }
-
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    
-    LineBorder border = (LineBorder) outer.getBorder();
-    border.setWidth(isSelected ? 2 : 1);
-    headingFigure.setSelected(isSelected);
-
-    XSDSchemaAdapter schemaAdapter = (XSDSchemaAdapter) getModel();
-    Image image = schemaAdapter.getImage();
-    headingFigure.getLabel().setIcon(image);
-    if (image != null)
-    {
-      headingFigure.getLabel().setIcon(XSDCommonUIUtils.getUpdatedImage((XSDConcreteComponent) schemaAdapter.getTarget(), image, false));
-    }
-    outer.repaint();
-    
-    String targetNamespaceValue = ((XSDSchema) ((XSDSchemaAdapter) getModel()).getTarget()).getTargetNamespace();
-    targetNamespaceValue = TextProcessor.process(targetNamespaceValue);
-
-    if (targetNamespaceValue == null || targetNamespaceValue.length() == 0)
-    {
-      targetNamespaceValue = Messages._UI_GRAPH_XSDSCHEMA_NO_NAMESPACE;
-    }
-    headingFigure.getLabel().setText(Messages._UI_GRAPH_XSDSCHEMA + " : " + targetNamespaceValue);  //$NON-NLS-1$
-  }
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-      EditPart result = null;
-      if (editPart instanceof CategoryEditPart)
-      {
-        CategoryAdapter adapter = (CategoryAdapter)editPart.getModel();    
-        switch (adapter.getGroupType())
-        { 
-          case CategoryAdapter.DIRECTIVES:
-          {
-            if (direction == PositionConstants.SOUTH)
-            {
-              result = getCategoryEditPart(CategoryAdapter.ELEMENTS);
-            }  
-            break;
-          }
-          case CategoryAdapter.ELEMENTS:
-          {
-            if (direction == PositionConstants.SOUTH)
-            {
-              result = getCategoryEditPart(CategoryAdapter.ATTRIBUTES);
-            }           
-            else if (direction == PositionConstants.NORTH)
-            {
-              result = getCategoryEditPart(CategoryAdapter.DIRECTIVES);
-            } 
-            break;
-          }
-          case CategoryAdapter.TYPES:
-          {
-            if (direction == PositionConstants.SOUTH)
-            {
-              result = getCategoryEditPart(CategoryAdapter.GROUPS);
-            }           
-            else if (direction == PositionConstants.NORTH)
-            {
-              result = getCategoryEditPart(CategoryAdapter.DIRECTIVES);
-            } 
-            break;        
-          }
-          case CategoryAdapter.ATTRIBUTES:      
-          {
-            if (direction == PositionConstants.NORTH)
-            {
-              result = getCategoryEditPart(CategoryAdapter.ELEMENTS);
-            }    
-            break;
-          }   
-          case CategoryAdapter.GROUPS:      
-          {
-            if (direction == PositionConstants.NORTH)
-            {
-              result = getCategoryEditPart(CategoryAdapter.TYPES);
-            }    
-            break;
-          }
-        }        
-      } 
-      else if (editPart == this)
-      {       
-        if (direction == KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD)
-        {
-          result = ((CategoryRowEditPart)getChildren().get(0)).doGetRelativeEditPart(editPart, direction);        
-        }          
-      }  
-      return result;               
-  }
-  
-  protected EditPart getCategoryEditPart(int kind)
-  {
-    for (Iterator j = getChildren().iterator(); j.hasNext(); )      
-    {    
-      EditPart row = (EditPart)j.next();    
-      for (Iterator i = row.getChildren().iterator(); i.hasNext(); )
-      {
-        EditPart editPart = (EditPart)i.next();
-        if (editPart instanceof CategoryEditPart)
-        {
-          CategoryEditPart categoryEditPart = (CategoryEditPart)editPart;
-          CategoryAdapter adapter = (CategoryAdapter)categoryEditPart.getModel();
-          if (adapter.getGroupType() == kind)
-          {
-            return editPart;
-          }
-        }  
-      }
-    }
-    return null;
-  }  
-
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new SelectionHandlesEditPolicyImpl());    
-  }
-
-  protected class Holder
-  {
-    List list;
-
-    public Holder(List list)
-    {
-      this.list = list;
-    }
-
-    public List getList()
-    {
-      return list;
-    }
-  }
-
-  protected class CategoryRowEditPart extends BaseEditPart
-  {
-    protected XSDSchema schema;
-    protected Figure contentPane;
-
-    protected IFigure createFigure()
-    {
-      Figure containerFigure = new Figure();
-      containerFigure.setBorder(new MarginBorder(4, 4, 4, 4));
-      // containerFigure.setBorder(new LineBorder(1));
-      // containerFigure.setBackgroundColor(ColorConstants.green);
-
-      FillLayout fillLayout = new FillLayout(4);
-      fillLayout.setHorizontal(true);
-      containerFigure.setLayoutManager(fillLayout);
-      
-      return containerFigure;
-    }
-    
-    public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-    {
-      if (editPart instanceof CategoryEditPart)
-      {
-        if (direction == KeyBoardAccessibilityEditPolicy.OUT_TO_PARENT)
-        {
-          return getParent();
-        }  
-      }  
-      else if (editPart instanceof XSDSchemaEditPart)
-      {
-        if (direction == KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD)
-        {
-          return (EditPart)getChildren().get(0);
-        }  
-      }  
-      return ((XSDSchemaEditPart)getParent()).doGetRelativeEditPart(editPart, direction);
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.gef.editparts.AbstractGraphicalEditPart#getContentPane()
-     */
-    public IFigure getContentPane()
-    {
-      return super.getContentPane();
-    }
-
-    protected List getModelChildren()
-    {
-      Holder holder = (Holder) getModel();
-      return holder.getList();
-    }
-
-    protected void createEditPolicies()
-    {
-      super.createEditPolicies();
-    }
-    
-    public boolean isSelectable()
-    {
-      return false;
-    }
-
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSimpleTypeEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSimpleTypeEditPart.java
deleted file mode 100644
index c752add..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/XSDSimpleTypeEditPart.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ManhattanConnectionRouter;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSimpleTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseTypeConnectingEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.CenteredConnectionAnchor;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.ColumnEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.TypeReferenceConnection;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.HeadingFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.RoundedLineBorder;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.StructureFigure;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class XSDSimpleTypeEditPart extends BaseTypeConnectingEditPart
-{
-  protected StructureFigure figure;
-  protected ADTDirectEditPolicy adtDirectEditPolicy = new ADTDirectEditPolicy();
-  
-  public XSDSimpleTypeEditPart()
-  {
-    super();
-  }
-  
-  public XSDSimpleTypeDefinition getXSDSimpleTypeDefinition()
-  {
-    return (XSDSimpleTypeDefinition)((XSDSimpleTypeDefinitionAdapter)getModel()).getTarget();
-  }
-
-  protected IFigure createFigure()
-  {
-    figure = new StructureFigure();
-    figure.setBorder(new RoundedLineBorder(1, 10));    
-    ToolbarLayout toolbarLayout = new ToolbarLayout();
-    toolbarLayout.setStretchMinorAxis(true);
-    figure.setLayoutManager(toolbarLayout);
-    return figure;
-  }
-  
-  protected void refreshVisuals()
-  {
-    XSDSimpleTypeDefinitionAdapter adapter = (XSDSimpleTypeDefinitionAdapter)getModel();
-    String name = adapter.getDisplayName();
-    HeadingFigure headingFigure = figure.getHeadingFigure();
-    headingFigure.setIsReadOnly(adapter.isReadOnly());
-    Label label = headingFigure.getLabel();
-    label.setText(name);
-    label.setIcon(XSDCommonUIUtils.getUpdatedImage(adapter.getXSDTypeDefinition(), adapter.getImage(), adapter.isReadOnly()));    
-  }
-  
-  public IStructureFigure getStructureFigure()
-  {
-    return (IStructureFigure)getFigure();
-  }
-
-  public IFigure getContentPane()
-  {
-    return getStructureFigure().getContentPane();
-  }
-  
-  
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
-    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
-  }
-
-  public void addFeedback()
-  {
-    getStructureFigure().addSelectionFeedback();
-    super.addFeedback();
-  }
-  
-  public void removeFeedback()
-  {
-    getStructureFigure().removeSelectionFeedback();
-    super.removeFeedback();    
-  }
-
-  public ReferenceConnection createConnectionFigure(BaseEditPart child)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public TypeReferenceConnection createConnectionFigure()
-  {
-    TypeReferenceConnection connectionFigure = null;
-    XSDSimpleTypeDefinitionAdapter adapter = (XSDSimpleTypeDefinitionAdapter)getModel();
-    IType superType = adapter.getSuperType();
-
-    if (superType != null)
-    {      
-      AbstractGraphicalEditPart referenceTypePart = (AbstractGraphicalEditPart)getTargetEditPart(superType);
-      
-      if (referenceTypePart != null)
-      {
-        connectionFigure = new TypeReferenceConnection(true);
-        // draw a line out from the top         
-        connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(getFigure(), CenteredConnectionAnchor.TOP, 1));
-        
-        // TODO (cs) need to draw the target anchor to look like a UML inheritance relationship
-        // adding a label to the connection would help to
-        connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(referenceTypePart.getFigure(), CenteredConnectionAnchor.BOTTOM, 0, 0));
-        connectionFigure.setConnectionRouter(new ManhattanConnectionRouter());
-        ((CenteredConnectionAnchor)connectionFigure.getSourceAnchor()).setOther((CenteredConnectionAnchor)connectionFigure.getTargetAnchor());
-        connectionFigure.setHighlight(false);
-
-      }
-    }    
-    return connectionFigure;
-  }
-  
-  protected EditPart getTargetEditPart(IType type)
-  {
-    ColumnEditPart columnEditPart = null;
-    for (EditPart editPart = this; editPart != null; editPart = editPart.getParent())
-    {
-      if (editPart instanceof ColumnEditPart)
-      {
-        columnEditPart = (ColumnEditPart)editPart;
-        break;
-      }  
-    }     
-    if (columnEditPart != null)
-    {
-      for (Iterator i = columnEditPart.getChildren().iterator(); i.hasNext(); )
-      {
-        EditPart child = (EditPart)i.next();
-        if (child.getModel() == type)
-        {
-          return child;
-        }         
-      }  
-    }
-    return null;
-  }
-
-  public void performRequest(Request request)
-  {  
-    if (request.getType() == RequestConstants.REQ_OPEN)
-    {
-      Object model = getModel();
-      if (request instanceof LocationRequest)
-      {
-        LocationRequest locationRequest = (LocationRequest)request;
-        Point p = locationRequest.getLocation();
-         
-        if (getStructureFigure().hitTestHeader(p))
-        {          
-          // TODO: !!! This should be moved to the adt-xsd package
-          // 
-          if (model instanceof XSDSimpleTypeDefinitionAdapter)     
-          {
-            XSDSimpleTypeDefinitionAdapter adapter = (XSDSimpleTypeDefinitionAdapter)model;
-            XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition)adapter.getTarget();
-            IWorkbench workbench = PlatformUI.getWorkbench();
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-            IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-            Object schema = editorPart.getAdapter(XSDSchema.class);
-            ActionRegistry registry = getEditorActionRegistry(editorPart);
-            if (registry != null)
-            {
-              if (schema == st.getSchema())
-              {
-                IAction action = registry.getAction(SetInputToGraphView.ID);
-                action.run();
-              }
-              else
-              {
-                IAction action = registry.getAction(OpenInNewEditor.ID);
-                action.run();
-              }
-            }
-          }          
-        }
-      }
-    }
-  }
-  
-  protected ActionRegistry getEditorActionRegistry(IEditorPart editor)
-  {
-    return (ActionRegistry) editor.getAdapter(ActionRegistry.class);
-  }
-
-  protected boolean shouldDrawConnection()
-  {
-    if (getModel() instanceof IType)
-    {
-      if (((IType)getModel()).getSuperType() != null)
-        return true;
-    } 
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/model/SpaceFiller.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/model/SpaceFiller.java
deleted file mode 100644
index 30ab79a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/model/SpaceFiller.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts.model;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-/**
- * Dummy class to add space to field list
- *
- */
-public class SpaceFiller implements IField
-{
-  String kind;
-  public SpaceFiller(String kind)
-  {
-    super();
-    this.kind = kind;
-  }
-
-  public Image getImage()
-  {
-    if (kind.equals("attribute")) //$NON-NLS-1$
-    {
-      return XSDEditorPlugin.getXSDImage("icons/XSDAttribute.gif"); //$NON-NLS-1$
-    }
-    else
-    {
-      return XSDEditorPlugin.getXSDImage("icons/XSDElement.gif"); //$NON-NLS-1$
-    }
-  }
-  
-  public String getKind()
-  {
-    return kind;
-  }
-  
-  public void setKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public boolean isGlobal()
-  {
-    return false;
-  }
-
-  public IComplexType getContainerType()
-  {
-    return null;
-  }
-
-  public String getName()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public String getTypeName()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public String getTypeNameQualifier()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public IType getType()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public int getMinOccurs()
-  {
-    // TODO Auto-generated method stub
-    return 0;
-  }
-
-  public int getMaxOccurs()
-  {
-    // TODO Auto-generated method stub
-    return 0;
-  }
-
-  public Command getUpdateMinOccursCommand(int minOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateMaxOccursCommand(int maxOccurs)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateTypeNameCommand(String typeName, String quailifier)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getUpdateNameCommand(String name)
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Command getDeleteCommand()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public void registerListener(IADTObjectListener listener)
-  {
-    // TODO Auto-generated method stub
-    
-  }
-
-  public void unregisterListener(IADTObjectListener listener)
-  {
-    // TODO Auto-generated method stub
-    
-  }
-  
-  public boolean isReadOnly()
-  {
-    return true;
-  }
-
-  public IModel getModel()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public boolean isReference()
-  {
-    // TODO Auto-generated method stub
-    return false;
-  }
-
-  public boolean isAbstract()
-  {
-    // TODO Auto-generated method stub
-    return false;
-  }
-}
-
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/model/TargetConnectionSpaceFiller.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/model/TargetConnectionSpaceFiller.java
deleted file mode 100644
index 73eae5a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editparts/model/TargetConnectionSpaceFiller.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editparts.model;
-
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-
-public class TargetConnectionSpaceFiller implements IADTObject
-{
-  private XSDBaseAdapter adapter;
-  
-  public TargetConnectionSpaceFiller(XSDBaseAdapter adapter)
-  {
-    this.adapter = adapter;
-  }
-
-  public XSDBaseAdapter getAdapter()
-  {
-    return adapter;
-  }
-
-  public void registerListener(IADTObjectListener listener)
-  {
-    
-  }
-
-  public void unregisterListener(IADTObjectListener listener)
-  {
-   
-  }
-
-  public boolean isReadOnly()
-  {
-    return false;
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/DragAndDropEditPolicy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/DragAndDropEditPolicy.java
deleted file mode 100644
index 142e3f6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/DragAndDropEditPolicy.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editpolicies;
-
-import java.util.List;
-
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAttributeAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.commands.BaseDragAndDropCommand;
-import org.eclipse.wst.xsd.ui.internal.commands.XSDAttributeDragAndDropCommand;
-import org.eclipse.wst.xsd.ui.internal.commands.XSDElementDragAndDropCommand;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDBaseFieldEditPart;
-
-
-public class DragAndDropEditPolicy extends org.eclipse.gef.editpolicies.GraphicalEditPolicy
-{ 
-  protected EditPartViewer viewer;
-  protected SelectionHandlesEditPolicyImpl selectionHandlesEditPolicy;
-
-  public DragAndDropEditPolicy(EditPartViewer viewer, SelectionHandlesEditPolicyImpl selectionHandlesEditPolicy)
-  {
-    this.viewer = viewer;
-    this.selectionHandlesEditPolicy = selectionHandlesEditPolicy;
-  }
-
-  public boolean understandsRequest(Request req)
-  {
-    return true;
-  }                           
-
-  
-  public org.eclipse.gef.commands.Command getCommand(Request request)
-  {             
-    BaseDragAndDropCommand command = null;                            
-    if (request instanceof ChangeBoundsRequest)
-    {
-      ChangeBoundsRequest changeBoundsRequest = (ChangeBoundsRequest)request;
-      Point location = changeBoundsRequest.getLocation();
-      
-      GraphicalEditPart target = (GraphicalEditPart)viewer.findObjectAt(location);
-      location = getPointerLocation(changeBoundsRequest.getLocation());
-      ((GraphicalEditPart)viewer.getRootEditPart()).getFigure().translateToRelative(location);
-
-      List list = changeBoundsRequest.getEditParts();
-      // allow drag and drop of only one selected object
-      if (list.size() == 1)
-      {
-        Object itemToDrag = list.get(0);
-        if (itemToDrag instanceof XSDBaseFieldEditPart)
-        {
-          XSDBaseFieldEditPart selected = (XSDBaseFieldEditPart) itemToDrag;
-          if (selected.getModel() instanceof XSDElementDeclarationAdapter)
-          {
-            command = new XSDElementDragAndDropCommand(viewer, (ChangeBoundsRequest)request, target, selected, location);
-            selectionHandlesEditPolicy.setDragAndDropCommand(command);
-          }
-          else if (selected.getModel() instanceof XSDBaseAttributeAdapter)
-          {
-            command = new XSDAttributeDragAndDropCommand(viewer, (ChangeBoundsRequest)request, target, selected, location);
-            selectionHandlesEditPolicy.setDragAndDropCommand(command);
-          }
-        }
-      }
-    } 
-    return command;             
-  }                         
-  
-  protected Point getPointerLocation(Point origPointerLocation)
-  {
-     Point compensatedLocation = origPointerLocation;
-     FigureCanvas figureCanvas = (FigureCanvas) viewer.getControl();
-     int yOffset = figureCanvas.getViewport().getVerticalRangeModel().getValue();
-     int xOffset = figureCanvas.getViewport().getHorizontalRangeModel().getValue();
-     compensatedLocation.y = compensatedLocation.y + yOffset;
-     compensatedLocation.x = compensatedLocation.x + xOffset;
-     return compensatedLocation;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/GraphNodeDragTracker.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/GraphNodeDragTracker.java
deleted file mode 100644
index 26b229b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/GraphNodeDragTracker.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editpolicies;
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.tools.DragEditPartsTracker;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-
-                                   
-public class GraphNodeDragTracker extends DragEditPartsTracker 
-{                                     
-  protected EditPart editPart; 
-           
-  public GraphNodeDragTracker(EditPart editPart)
-  {
-    super(editPart);
-    this.editPart = editPart;
-  } 
-                                              
-  protected Command getCommand() 
-  { 
-	  Request request = getTargetRequest();
-    return editPart.getCommand(request); 
-  }
-  
-  protected void performSelection()
-  {
-    performAdditionalSelection();
-    super.performSelection();
-  }
-  
-  protected void performAdditionalSelection()
-  {
-    EditPartViewer viewer = getCurrentViewer();
-    // This code selects the fields in-between the last selected field and the newly
-    // selected field, if the shift key is held down.  Note that the selection logic
-    // can be improved so that already selected but, a) incompatible edit part figures, or b)
-    // like-edit part figures from other parents, should be unselected.
-    if (getCurrentInput().isShiftKeyDown())
-    {
-      // This list contains the fields
-      List list = editPart.getParent().getChildren();
-      // Get the index of the current selection
-      int currentIndex = list.indexOf(editPart);
-      // List of all the currently selected edit parts
-      List currentSelected = viewer.getSelectedEditParts();
-      int size = currentSelected.size();
-      if (size > 0)
-      {
-        Object lastSelected = currentSelected.get(size - 1);
-        if (lastSelected instanceof BaseEditPart)
-        {
-          // Here, we determine the upper and lower limit of the indices
-          int lowerIndex = -1, upperIndex = -1;
-          int lastSelectedIndex = list.indexOf(lastSelected);
-          if (lastSelectedIndex >= 0 && lastSelectedIndex < currentIndex)
-          {
-            lowerIndex = lastSelectedIndex;
-            upperIndex = currentIndex;
-          } 
-          else if (lastSelectedIndex >= 0 && lastSelectedIndex > currentIndex)
-          {
-            lowerIndex = currentIndex;
-            upperIndex = lastSelectedIndex;
-          }
-          if (lowerIndex >= 0 && upperIndex >= 0)
-          {          
-            for (int i = lowerIndex; i < upperIndex; i++)
-            {
-              viewer.appendSelection((EditPart) list.get(i));
-            }
-          }
-        }
-      }
-    }
-  }
-} 
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/SelectionHandlesEditPolicyImpl.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/SelectionHandlesEditPolicyImpl.java
deleted file mode 100644
index d7f0b39..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/SelectionHandlesEditPolicyImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editpolicies;
-                                 
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.requests.ChangeBoundsRequest;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.commands.BaseDragAndDropCommand;
-
-public class SelectionHandlesEditPolicyImpl	extends ADTSelectionFeedbackEditPolicy
-{
-  protected IFigure feedback;
-  protected Rectangle originalLocation;
-  protected BaseDragAndDropCommand dragAndDropCommand;
-  protected Polyline polyLine;
-  protected RectangleFigure ghostShape;
-
-  public boolean understandsRequest(Request request)
-  {    
-    boolean result = false;
-
-    if (REQ_MOVE.equals(request.getType()))
-    {  
-      result = false; 
-    }
-    else
-    {
-      result = super.understandsRequest(request);
-    }
-    return result;
-  }
-  
-
-  public org.eclipse.gef.commands.Command getCommand(Request request) 
-  {                                          
-    return null;  
-  }   
-
-  public void setDragAndDropCommand(BaseDragAndDropCommand dragAndDropCommand)
-  {
-    this.dragAndDropCommand = dragAndDropCommand;
-  }
-
-  public void showSourceFeedback(Request request)
-  {   
-      eraseChangeBoundsFeedback(null);
-      if (dragAndDropCommand != null && dragAndDropCommand.canExecute()) {
-        if (REQ_MOVE.equals(request.getType()) || REQ_ADD.equals(request.getType())) {
-          if (dragAndDropCommand != null && dragAndDropCommand.getFeedbackFigure() != null) {
-            feedback = dragAndDropCommand.getFeedbackFigure();
-            addFeedback(feedback);
-          }
-        }
-      }
-  }
-
-  public void deactivate()
-  {
-	  if (feedback != null)
-    {
-		  removeFeedback(feedback);
-		  feedback = null;
-	  }
-	  hideFocus();
-	  super.deactivate();
-  }
-
-  /**
-   * Erase feedback indicating that the receiver object is 
-   * being dragged.  This method is called when a drag is
-   * completed or cancelled on the receiver object.
-   * @param dragTracker org.eclipse.gef.tools.DragTracker The drag tracker of the tool performing the drag.
-   */
-  protected void eraseChangeBoundsFeedback(ChangeBoundsRequest request) 
-  {
-	  if (feedback != null) 
-    {		      
-		  removeFeedback(feedback);
-	  }
-	  feedback = null;
-	  originalLocation = null;
-  }
-
-  /**
-   * Erase feedback indicating that the receiver object is 
-   * being dragged.  This method is called when a drag is
-   * completed or cancelled on the receiver object.
-   * @param dragTracker org.eclipse.gef.tools.DragTracker The drag tracker of the tool performing the drag.
-   */
-  public void eraseSourceFeedback(Request request) 
-  {
-    if (REQ_MOVE.equals(request.getType()) ||  REQ_ADD.equals(request.getType()))
-    {
-		  eraseChangeBoundsFeedback((ChangeBoundsRequest)request);
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/TopLevelComponentLabelCellEditorLocator.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/TopLevelComponentLabelCellEditorLocator.java
deleted file mode 100644
index a594a50..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/TopLevelComponentLabelCellEditorLocator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editpolicies;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.LabelCellEditorLocator;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.INamedEditPart;
-
-public class TopLevelComponentLabelCellEditorLocator extends LabelCellEditorLocator
-{
-  public TopLevelComponentLabelCellEditorLocator(INamedEditPart namedEditPart, Point cursorLocation)
-  {
-    super(namedEditPart, cursorLocation);
-  }
-
-  public void relocate(CellEditor celleditor)
-  {
-    Text text = (Text) celleditor.getControl();
-
-    Label label = namedEditPart.getNameLabelFigure();
-    
-    if (text.getBounds().x <= 0)
-    {
-      super.relocate(celleditor);  
-    }
-    else
-    {
-      org.eclipse.swt.graphics.Point sel = text.getSelection();
-      org.eclipse.swt.graphics.Point pref = text.computeSize(-1, -1);
-      Rectangle rect = label.getTextBounds().getCopy();
-      label.translateToAbsolute(rect);
-      text.setBounds(rect.x, rect.y-1, rect.width, pref.y+1);
-      text.setSelection(0);
-      text.setSelection(sel); 
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/TopLevelNameDirectEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/TopLevelNameDirectEditManager.java
deleted file mode 100644
index fd92420..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/editpolicies/TopLevelNameDirectEditManager.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.editpolicies;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.part.CellEditorActionHandler;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.INamedEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.TopLevelComponentEditPart;
-import org.eclipse.xsd.XSDNamedComponent;
-
-public class TopLevelNameDirectEditManager extends DirectEditManager
-{
-  protected XSDNamedComponent component;
-  private IActionBars actionBars;
-  private CellEditorActionHandler actionHandler;
-  private IAction copy, cut, paste, undo, redo, find, selectAll, delete;
-  private Font scaledFont;
-
-  public TopLevelNameDirectEditManager(GraphicalEditPart source, CellEditorLocator locator, XSDNamedComponent component)
-  {
-    super(source, null, locator);
-    this.component = component;
-  }
-
-  /**
-   * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-   */
-  protected void bringDown()
-  {
-    if (actionHandler != null)
-    {
-      actionHandler.dispose();
-      actionHandler = null;
-    }
-    if (actionBars != null)
-    {
-      restoreSavedActions(actionBars);
-      actionBars.updateActionBars();
-      actionBars = null;
-    }
-
-    Font disposeFont = scaledFont;
-    scaledFont = null;
-    super.bringDown();
-    if (disposeFont != null)
-      disposeFont.dispose();
-
-    if (getEditPart() instanceof TopLevelComponentEditPart)
-    {
-      Runnable runnable = new Runnable()
-      {
-        public void run()
-        {
-          IWorkbench workbench = PlatformUI.getWorkbench();
-          IEditorPart editor = workbench.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-          Object adapter = editor.getAdapter(ISelectionProvider.class);
-          if (adapter instanceof ISelectionProvider)
-          {
-            ISelectionProvider sel = (ISelectionProvider) adapter;
-            sel.setSelection(new StructuredSelection(getEditPart().getModel()));
-          }
-        }
-      };
-      Display.getCurrent().asyncExec(runnable);
-    }
-  }
-
-  public void showFeedback()
-  {
-    super.showFeedback();
-  }
-
-  protected CellEditor createCellEditorOn(Composite composite)
-  {
-    return new TextCellEditor(composite, SWT.SINGLE | SWT.WRAP);
-  }
-
-  protected void initCellEditor()
-  {
-    Text text = (Text) getCellEditor().getControl();
-    Label label = ((INamedEditPart) getEditPart()).getNameLabelFigure();
-
-    if (label != null)
-    {
-      scaledFont = label.getFont();
-
-      Color color = label.getBackgroundColor();
-      text.setBackground(color);
-
-      String initialLabelText = component.getName();
-      getCellEditor().setValue(initialLabelText);
-    }
-    else
-    {
-      scaledFont = label.getParent().getFont();
-      text.setBackground(label.getParent().getBackgroundColor());
-    }
-
-    FontData data = scaledFont.getFontData()[0];
-    Dimension fontSize = new Dimension(0, data.getHeight());
-    label.getParent().translateToAbsolute(fontSize);
-    data.setHeight(fontSize.height);
-    scaledFont = new Font(null, data);
-
-    text.setFont(scaledFont);
-    // text.selectAll();
-
-    // Hook the cell editor's copy/paste actions to the actionBars so that they
-    // can
-    // be invoked via keyboard shortcuts.
-    actionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorSite().getActionBars();
-    saveCurrentActions(actionBars);
-    actionHandler = new CellEditorActionHandler(actionBars);
-    actionHandler.addCellEditor(getCellEditor());
-    actionBars.updateActionBars();
-  }
-
-  private void restoreSavedActions(IActionBars actionBars)
-  {
-    actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
-    actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);
-    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=252509
-    // Delete action (key) doesn't always work.  The saved action could be the 
-    // CellEditorActionHandler's DeleteActionHandler...due to timing issues.
-    // We'll only restore the delete action if it is indeed the one for the Design view.
-    // We should update the other actions too, but currently, none are applicable.
-    if (delete instanceof BaseSelectionAction)
-    {
-      actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), delete);
-    }
-    actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), selectAll);
-    actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);
-    actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), find);
-    actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);
-    actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);
-  }
-
-  private void saveCurrentActions(IActionBars actionBars)
-  {
-    copy = actionBars.getGlobalActionHandler(ActionFactory.COPY.getId());
-    paste = actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId());
-    IAction currentDeleteAction = actionBars.getGlobalActionHandler(ActionFactory.DELETE.getId());
-    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=252509
-    // Delete action (key) doesn't always work.  The saved action could be the 
-    // CellEditorActionHandler's DeleteActionHandler...due to timing issues.
-    // We'll only restore the delete action if it is indeed the one for the Design view.
-    // We should update the other actions too, but currently, none are applicable.
-    if (currentDeleteAction instanceof BaseSelectionAction)
-    {
-      delete = currentDeleteAction;
-    }
-    selectAll = actionBars.getGlobalActionHandler(ActionFactory.SELECT_ALL.getId());
-    cut = actionBars.getGlobalActionHandler(ActionFactory.CUT.getId());
-    find = actionBars.getGlobalActionHandler(ActionFactory.FIND.getId());
-    undo = actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());
-    redo = actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());
-  }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/CategoryFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/CategoryFigure.java
deleted file mode 100644
index ad12539..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/CategoryFigure.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.ScrollPane;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.Viewport;
-import org.eclipse.draw2d.ViewportLayout;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.HeadingFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.RoundedLineBorder;
-import org.eclipse.wst.xsd.ui.internal.design.layouts.FillLayout;
-
-public class CategoryFigure extends Figure
-{
-  protected ScrollPane scrollpane;
-  protected Figure outerPane;
-  public HeadingFigure headingFigure;
-  Figure contentPane;
-
-  public CategoryFigure(int type)
-  {
-    super();
-
-    outerPane = new Figure();
-    outerPane.setBorder(new RoundedLineBorder(1, 6));
-
-    ToolbarLayout layout = new ToolbarLayout(false);
-    layout.setVertical(true);
-    layout.setStretchMinorAxis(true);
-    FillLayout fillLayout = new FillLayout(3);
-    fillLayout.setHorizontal(false);
-
-    FillLayout outerLayout = new FillLayout();
-    outerPane.setLayoutManager(outerLayout);
-
-    add(outerPane);
-
-    headingFigure = new HeadingFigure();
-    outerPane.add(headingFigure);
-
-    Figure line = new Figure();
-    line.setBorder(new LineBorder(1));
-    ToolbarLayout lineLayout = new ToolbarLayout(false);
-    lineLayout.setVertical(true);
-    lineLayout.setStretchMinorAxis(true);
-    line.setLayoutManager(lineLayout);
-    outerPane.add(line);
-
-    scrollpane = new ScrollPane();
-    scrollpane.setForegroundColor(ColorConstants.black);
-    scrollpane.setVerticalScrollBarVisibility(ScrollPane.AUTOMATIC);
-    outerPane.add(scrollpane);
-
-    Figure pane = new Figure();
-    pane.setBorder(new MarginBorder(5, 8, 5, 8));
-    ToolbarLayout toolbarLayout = new ToolbarLayout(false);
-    toolbarLayout.setSpacing(3);
-    pane.setLayoutManager(toolbarLayout); // good
-
-    Viewport viewport = new Viewport();
-    viewport.setContentsTracksHeight(true);
-    ViewportLayout viewportLayout = new ViewportLayout();
-    viewport.setLayoutManager(viewportLayout);
-
-    scrollpane.setViewport(viewport);
-    scrollpane.setContents(pane);
-  }
-
-  public HeadingFigure getHeadingFigure()
-  {
-    return headingFigure;
-  }
-
-  public ScrollPane getScrollPane()
-  {
-    return scrollpane;
-  }
-
-  public IFigure getContentPane()
-  {
-    return scrollpane.getContents();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/CenteredIconFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/CenteredIconFigure.java
deleted file mode 100644
index 2177289..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/CenteredIconFigure.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-            
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.RoundedRectangle;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.ReferenceConnection;
-
-public class CenteredIconFigure extends RoundedRectangle
-{                         
-  public static final int NORMAL = 0;
-  public static final int SELECTED = 1;
-  public static final int HOVER = 2;
-  public Image image;
-  protected Label toolTipLabel;
-  protected int mode = 0;
-  
-  public CenteredIconFigure()
-  {
-    super();
-    setFill(true);   
-    toolTipLabel = new Label();
-    setCornerDimensions(new Dimension(5,5));
-  }
-  
-  public CenteredIconFigure(Image img)
-  {
-    this();
-    this.image = img;
-  }
-  
-  public void refresh()
-  {
-    repaint();
-  }
-  
-  protected void outlineShape(Graphics graphics)
-  {
-    graphics.pushState();
-    try
-    {
-      if (mode == NORMAL)
-      { // TODO: common up and organize colors....
-        graphics.setForegroundColor(ReferenceConnection.inactiveConnection);
-      }
-      else if (mode == SELECTED)
-      {
-        boolean highContrast = false;
-        try
-        {
-          highContrast = Display.getDefault().getHighContrast();
-        }
-        catch (Exception e)
-        {
-        }
-        if (highContrast)
-        {
-          graphics.setForegroundColor(Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND));
-        }
-        else
-        {
-          graphics.setForegroundColor(ColorConstants.black);
-        }
-      }
-      super.outlineShape(graphics);
-    }
-    finally
-    {
-      graphics.popState();
-    }
-  }
-
-  protected void fillShape(Graphics g)
-  {    
-    super.fillShape(g);
-    if (image != null)
-    {                         
-      Rectangle r = getBounds();
-      Dimension imageSize = new Dimension(15, 15);
-      g.drawImage(image, r.x + (r.width - imageSize.width)/2, r.y + (r.height - imageSize.height)/2 - 1);
-    }
-  }
-
-  public Label getToolTipLabel()
-  {
-    return toolTipLabel;
-  }
-  
-  public void setMode(int mode)
-  {
-    this.mode = mode;  
-  }
-  
-  public void setToolTipText(String text)
-  {
-    if (text.length() > 0)
-    {
-      setToolTip(toolTipLabel);
-      toolTipLabel.setText(text);
-    }
-    else
-    {
-      setToolTip(null);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/GenericGroupFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/GenericGroupFigure.java
deleted file mode 100644
index c0117ce..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/GenericGroupFigure.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.design.layouts.ModelGroupLayout;
-
-public class GenericGroupFigure extends Figure
-{
-  protected CenteredIconFigure centeredIconFigure;
-  protected Figure contentFigure;
-  protected String text;
-  protected boolean hasText = false;
-  protected Label textFigure;
-  
-  public GenericGroupFigure()
-  {
-    super();
-    setLayoutManager(new ModelGroupLayout(true));
-   
-    centeredIconFigure = new CenteredIconFigure();
-    centeredIconFigure.setPreferredSize(new Dimension(15, 15));
-
-    add(centeredIconFigure);
-    contentFigure = new Figure();
-    contentFigure.setLayoutManager(new ModelGroupLayout(false, 0));
-    add(contentFigure);
-  }
-  
-  public void setText(String text)
-  {
-    this.text = text;
-    hasText = false;
-    if (text != null && text.length() > 0)
-    {
-      hasText = true;
-    }
-  }
-  
-  public boolean hasText()
-  {
-    return hasText;
-  }
-  
-  public String getText()
-  {
-    return text;
-  }
-  
-  public Point getTextCoordinates()
-  {
-    Rectangle rect = centeredIconFigure.getBounds();
-    return new Point(rect.x, rect.y + 14);
-  }
-  
-  public void setIconFigure(Image image)
-  {
-    centeredIconFigure.image = image;
-  }
-
-  public CenteredIconFigure getTargetFigure()
-  {
-    return centeredIconFigure;
-  }
-  
-  public CenteredIconFigure getIconFigure()
-  {
-    return centeredIconFigure;
-  }
-  
-  public Figure getContentFigure()
-  {
-    return contentFigure;
-  }
-  
-  public void setToolTipText(String text)
-  {
-    centeredIconFigure.setToolTipText(text);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/HyperLinkLabel.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/HyperLinkLabel.java
deleted file mode 100644
index b4ef29f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/HyperLinkLabel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-
-import org.eclipse.draw2d.FigureUtilities;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-
-public class HyperLinkLabel extends Label
-{
-  protected void paintFigure(Graphics graphics)
-  {
-    super.paintFigure(graphics);   
-    graphics.setFont(getFont());
-        
-    // TODO (cs) this lookup to find " :" is a hack
-    // that's specialized for element and type label text
-    // we need to make the TopLevelComponent use two labels in this case
-    //    
-    String string = getText();
-    int index = string.indexOf(" :");
-    if (index != -1)
-    {
-      string = string.substring(0, index);
-    }
-    // end hack
-    
-    Point p = getTextLocation();      
-    Dimension textSize =  FigureUtilities.getTextExtents(string, getFont());
-    int textWidth = textSize.width;
-    int textHeight = textSize.height;
-    int descent = graphics.getFontMetrics().getDescent();
-    int lineY = bounds.y + p.y + textHeight - descent + 1;      
-    int lineX = bounds.x + p.x;
-    graphics.drawLine(lineX, lineY, lineX + textWidth, lineY); 
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/IExtendedFigureFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/IExtendedFigureFactory.java
deleted file mode 100644
index e107b57..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/IExtendedFigureFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFigureFactory;
-
-public interface IExtendedFigureFactory extends IFigureFactory
-{
-  IModelGroupFigure createModelGroupFigure(Object model);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/IModelGroupFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/IModelGroupFigure.java
deleted file mode 100644
index 10ff423..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/IModelGroupFigure.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IADTFigure;
-
-public interface IModelGroupFigure extends IADTFigure
-{
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/ModelGroupFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/ModelGroupFigure.java
deleted file mode 100644
index 7009930..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/ModelGroupFigure.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class ModelGroupFigure extends GenericGroupFigure implements IModelGroupFigure
-{
-  public static final Image SEQUENCE_ICON_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/sequence_obj.gif"); //$NON-NLS-1$
-  public static final Image SEQUENCE_ICON_DISABLED_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/sequencedis_obj.gif"); //$NON-NLS-1$
-  public static final Image CHOICE_ICON_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/choice_obj.gif"); //$NON-NLS-1$
-  public static final Image CHOICE_ICON_DISABLED_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/choicedis_obj.gif"); //$NON-NLS-1$
-  public static final Image ALL_ICON_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/all_obj.gif"); //$NON-NLS-1$
-  public static final Image ALL_ICON_DISABLED_IMAGE = XSDEditorPlugin.getPlugin().getIcon("obj16/alldis_obj.gif"); //$NON-NLS-1$
-  
-  public ModelGroupFigure()
-  {
-    super();
-  }
-
-  public void setIconFigure(Image image)
-  {
-    centeredIconFigure.image = image;
-  }
-
-  public void addSelectionFeedback()
-  {
-    // TODO Auto-generated method stub
-    
-  }
-
-  public void editPartAttached(EditPart owner)
-  {
-    // TODO Auto-generated method stub
-    
-  }
-
-  public void refreshVisuals(Object model)
-  {
-    // TODO Auto-generated method stub
-    
-  }
-
-  public void removeSelectionFeedback()
-  {
-    // TODO Auto-generated method stub   
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/SpacingFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/SpacingFigure.java
deleted file mode 100644
index fa6a55a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/figures/SpacingFigure.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.figures;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class SpacingFigure extends Label
-{
-  public SpacingFigure()
-  {
-    super(""); //$NON-NLS-1$
-    setIcon(XSDEditorPlugin.getXSDImage("icons/Dot.gif")); //$NON-NLS-1$
-    setBorder(new MarginBorder(3, 0, 3, 0));
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/ContainerLayout.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/ContainerLayout.java
deleted file mode 100644
index 6209800..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/ContainerLayout.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.layouts;
-                   
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.wst.xsd.ui.internal.design.figures.SpacingFigure;
-              
-
-public class ContainerLayout extends AbstractLayout
-{                                         
-  protected boolean isHorizontal;
-  protected int spacing = 0;
-  protected int border = 0; 
-
-  public ContainerLayout()
-  { 
-    this(true, 0); 
-  }             
-
-  public ContainerLayout(boolean isHorizontal, int spacing)
-  {
-    this.isHorizontal = isHorizontal;   
-    this.spacing = spacing;
-  }  
-
-  public void setHorizontal(boolean isHorizontal)
-  {
-    this.isHorizontal = isHorizontal;
-  }  
-
-  public void setSpacing(int spacing)
-  {
-    this.spacing = spacing;
-  }  
-
-  public void setBorder(int border)
-  {
-    this.border = border;
-  }  
-
-  protected int alignFigure(IFigure parent, IFigure child)
-  { 
-    return -1;
-  }
-
-  /**
-   * Calculates and returns the preferred size of the container 
-   * given as input.
-   * 
-   * @param figure  Figure whose preferred size is required.
-   * @return  The preferred size of the passed Figure.
-   * @since 2.0
-   */
-  protected Dimension calculatePreferredSizeHelper(IFigure parent)
-  { 
-    Dimension	preferred = new Dimension();
-  	List children = parent.getChildren();
-		                                        
-	  for (int i=0; i < children.size(); i++)
-    {
-		  IFigure child = (IFigure)children.get(i);      
-    
-      Dimension	childSize = child.getPreferredSize();
-	  
-      if (isHorizontal)
-      {
-		    preferred.width += childSize.width;
-		    preferred.height = Math.max(preferred.height, childSize.height);
-      }
-      else
-      {  
-        preferred.height += childSize.height;
-        preferred.width = Math.max(preferred.width, childSize.width);
-      }
-	  }   
-
-    int childrenSize = children.size();
-    if (childrenSize > 1)
-    {                      
-      if (isHorizontal)    
-      {
-        preferred.width += spacing * (childrenSize - 1);
-      }
-      else
-      {
-		    preferred.height += spacing * (childrenSize - 1);
-      } 
-    }
-                          
-    preferred.width += border * 2;
-    preferred.height += border * 2;
-	  preferred.width += parent.getInsets().getWidth();
-	  preferred.height += parent.getInsets().getHeight();       
-  
-  	return preferred;
-  }
-
-  protected Dimension calculatePreferredSize(IFigure parent, int width, int height)
-  {    
-    Dimension	preferred = null;                                              
-                                  
-    // Here we ensure that an unexpanded container is given a size of (0,0)
-    //
-//    if (parent instanceof IExpandable)
-//    {
-//      IExpandable expandableFigure = (IExpandable)parent;
-//      if (!expandableFigure.isExpanded())
-//      {
-//        preferred = new Dimension(); 
-//      }
-//    }   
-    
-    if (preferred == null)
-    {
-	    preferred = calculatePreferredSizeHelper(parent);    
-    }
-    
-    return preferred;
-  }
-     
-
-  protected void adjustLayoutLocation(IFigure parent, Dimension dimension)
-  {     
-  }   
-
-  public void layout(IFigure parent)
-  {       
-  	List children = parent.getChildren();
- 
-    int rx = 0;
-    Dimension	dimension = new Dimension();                                          
-
-
-	  for (int i=0; i < children.size(); i++)
-    {
-		  IFigure child = (IFigure)children.get(i);
-		  Dimension	childSize = child.getPreferredSize();
-      if (isHorizontal)
-      {   
-        dimension.height = Math.max(dimension.height, childSize.height);
-        rx += childSize.width;
-      }
-      else
-      {
-        dimension.width = Math.max(dimension.width, childSize.width);
-      }
-    }
-
-	  //dimension.width += parent.getInsets().left;
-    //dimension.height += parent.getInsets().top;
-
-    if (isHorizontal)
-    {
-      dimension.height += border*2;
-    	dimension.width += border;
-    }
-    else
-    {
-      dimension.width += border*2;
-    	dimension.height += border;
-    }
-    adjustLayoutLocation(parent, dimension);    
-
-    for (int i=0; i < children.size(); i++)
-    {
-      IFigure child = (IFigure)children.get(i);
-	    Dimension	childSize = child.getPreferredSize();
-        
-      if (isHorizontal)
-      {   
-        int y = -1; 
-    
-        y = alignFigure(parent, child);
-    
-        if (y == -1)
-        {
-           y = (dimension.height - childSize.height) / 2;                                      
-        }                      
-                                                   
-        Rectangle rectangle = new Rectangle(dimension.width, y, childSize.width, childSize.height);
-        rectangle.translate(parent.getClientArea().getLocation());                           
-
-
-        child.setBounds(rectangle);                           
-	      dimension.width += childSize.width; 
-        dimension.width += spacing;       
-
-        if (child instanceof SpacingFigure)
-        {          
-          int availableHorizontalSpace = parent.getClientArea().width - rx;
-          dimension.width += availableHorizontalSpace;
-        }           
-      }
-      else
-      {
-        Rectangle rectangle = new Rectangle(0, dimension.height, childSize.width, childSize.height);
-	      rectangle.translate(parent.getClientArea().getLocation());                                  
-        
-
-        child.setBounds(rectangle);  
-        dimension.height += childSize.height;
-        dimension.height += spacing;
-      }
-	  }	      
-  }                                      
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/FillLayout.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/FillLayout.java
deleted file mode 100644
index 14fe8e5b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/FillLayout.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.layouts;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-public class FillLayout extends AbstractLayout
-{
-  protected boolean isHorizontal = false;
-  protected int spacing = 0;
-  public Dimension min;
-
-  public FillLayout()
-  {
-  }
-
-  public FillLayout(int spacing)
-  {
-    this.spacing = spacing;
-  }
-
-  public void setHorizontal(boolean isHorizontal)
-  {
-    this.isHorizontal = isHorizontal;
-  }
-
-  /**
-   * Calculates and returns the preferred size of the input container. This is
-   * the size of the largest child of the container, as all other children fit
-   * into this size.
-   * 
-   * @param figure
-   *          Container figure for which preferred size is required.
-   * @return The preferred size of the input figure.
-   */
-
-  protected Dimension calculatePreferredSize(IFigure figure, int width, int height)
-  {
-    Dimension d = calculatePreferredClientAreaSize(figure);
-    d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight());
-    d.union(getBorderPreferredSize(figure));
-    return d;
-  }
-
-  protected Dimension calculatePreferredClientAreaSize(IFigure figure)
-  {
-    Dimension d = new Dimension();
-    List children = figure.getChildren();
-
-    for (Iterator i = children.iterator(); i.hasNext();)
-    {
-      IFigure child = (IFigure) i.next();
-      Dimension childSize = child.getPreferredSize();
-
-      if (isHorizontal)
-      {
-        d.width += childSize.width;
-        d.height = Math.max(childSize.height, d.height);
-      }
-      else
-      {
-        d.height += childSize.height;
-        d.width = Math.max(childSize.width, d.width);
-      }
-    }
-
-    int childrenSize = children.size();
-    if (childrenSize > 0)
-    {
-      if (isHorizontal)
-      {
-        d.width += spacing * (childrenSize - 1);
-      }
-      else
-      {
-        d.height += spacing * (childrenSize - 1);
-      }
-    }
-
-    if (min != null)
-    {
-      d.width = Math.max(d.width, min.width);
-      d.height = Math.max(d.height, min.height);
-    }
-    return d;
-  }
-
-  /*
-   * Returns the minimum size required by the input container. This is the size
-   * of the largest child of the container, as all other children fit into this
-   * size.
-   */
-  public Dimension getMinimumSize(IFigure figure, int width, int height)
-  {
-    Dimension d = new Dimension();
-    List children = figure.getChildren();
-    IFigure child;
-
-    for (int i = 0; i < children.size(); i++)
-    {
-      child = (IFigure) children.get(i);
-      d.union(child.getMinimumSize());
-    }
-    d.expand(figure.getInsets().getWidth(), figure.getInsets().getHeight());
-    return d;
-  }
-
-  public Dimension getPreferredSize(IFigure figure, int width, int height)
-  {
-    return calculatePreferredSize(figure, width, height);
-  }
-
-  /*
-   * Lays out the children on top of each other with their sizes equal to that
-   * of the available paintable area of the input container figure.
-   */
-  public void layout(IFigure figure)
-  {
-    Dimension preferredSize = calculatePreferredClientAreaSize(figure);
-    Rectangle r = figure.getClientArea().getCopy();
-    List children = figure.getChildren();
-
-    int nChildren = children.size();
-    int extraHorizontalSpace = r.width - preferredSize.width;
-
-    for (Iterator i = children.iterator(); i.hasNext();)
-    {
-      IFigure child = (IFigure) i.next();
-      Dimension preferredChildSize = child.getPreferredSize();
-
-      if (isHorizontal)
-      {
-        int w = preferredChildSize.width + (extraHorizontalSpace / nChildren);
-        child.setBounds(new Rectangle(r.x, r.y, w, Math.max(preferredSize.height, r.height)));
-        r.x += w + spacing;
-      }
-      else
-      {
-        child.setBounds(new Rectangle(r.x, r.y, Math.max(preferredSize.width, r.width), preferredChildSize.height));
-        r.y += preferredChildSize.height + spacing;
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/ModelGroupLayout.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/ModelGroupLayout.java
deleted file mode 100644
index 69f7b79..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/design/layouts/ModelGroupLayout.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.design.layouts;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.wst.xsd.ui.internal.design.figures.ModelGroupFigure;
-import org.eclipse.wst.xsd.ui.internal.design.figures.SpacingFigure;
-
-public class ModelGroupLayout extends AbstractLayout
-{
-  protected boolean isHorizontal;
-  protected int spacing = 10;
-  protected int border = 0;
-
-  public ModelGroupLayout()
-  {
-    this(0);
-  }
-
-  public ModelGroupLayout(boolean isHorizontal)
-  {
-    this.isHorizontal = isHorizontal;
-  }
-
-  public ModelGroupLayout(boolean isHorizontal, int spacing)
-  {
-    this.isHorizontal = isHorizontal;
-    this.spacing = spacing;
-  }
-
-  public ModelGroupLayout(int spacing)
-  {
-    super();
-    this.spacing = spacing;
-  }
-
-  protected Dimension calculatePreferredSize(IFigure container, int wHint, int hHint)
-  {
-    Dimension preferred = new Dimension();
-    List children = container.getChildren();
-
-    for (int i = 0; i < children.size(); i++)
-    {
-      IFigure child = (IFigure) children.get(i);
-
-      Dimension childSize = child.getPreferredSize();
-
-      if (isHorizontal)
-      {
-        preferred.width += childSize.width;
-        preferred.height = Math.max(preferred.height, childSize.height);
-      }
-      else
-      {
-        preferred.height += childSize.height;
-        preferred.width = Math.max(preferred.width, childSize.width);
-      }
-    }
-
-    int childrenSize = children.size();
-    if (childrenSize > 1)
-    {
-      if (isHorizontal)
-      {
-        preferred.width += spacing * (childrenSize - 1);
-      }
-      else
-      {
-        preferred.height += spacing * (childrenSize - 1);
-      }
-    }
-
-    preferred.width += border * 2;
-    preferred.height += border * 2;
-    preferred.width += container.getInsets().getWidth();
-    preferred.height += container.getInsets().getHeight();
-
-    return preferred;
-  }
-
-  public void layout(IFigure container)
-  {
-    List children = container.getChildren();
-
-    int rx = 0;
-    Dimension dimension = new Dimension();
-
-    for (int i = 0; i < children.size(); i++)
-    {
-      IFigure child = (IFigure) children.get(i);
-      Dimension childSize = child.getPreferredSize();
-      if (isHorizontal)
-      {
-        dimension.height = Math.max(dimension.height, childSize.height);
-        rx += childSize.width;
-      }
-      else
-      {
-        dimension.width = Math.max(dimension.width, childSize.width);
-      }
-    }
-
-    if (isHorizontal)
-    {
-      dimension.height += border * 2;
-      dimension.width += border;
-    }
-    else
-    {
-      dimension.width += border * 2;
-      dimension.height += border;
-    }
-
-    Rectangle r = container.getClientArea();
-    dimension = new Dimension(r.width, r.height);
-    Point p = new Point(0, 0);
-
-    for (Iterator i = children.iterator(); i.hasNext();)
-    {
-      IFigure child = (IFigure) i.next();
-      Dimension childSize = child.getPreferredSize();
-
-      if (isHorizontal)
-      {
-        Rectangle rectangle = new Rectangle(p.x, 0, childSize.width, childSize.height);
-
-        // last child
-        if (!i.hasNext())
-        {
-          rectangle.width = dimension.width - rectangle.x;
-        }
-
-        if (p.x == 0)
-        {
-          rectangle.y = r.height / 2 - childSize.height / 2;
-        }
-        else
-        {
-          rectangle.y = r.height / 2 - childSize.height / 2;
-        }
-
-        rectangle.translate(container.getClientArea().getLocation());
-        child.setBounds(rectangle);
-        p.x += childSize.width;
-        p.x += spacing;
-
-      }
-      else
-      {
-        Rectangle rectangle = new Rectangle(0, p.y, childSize.width, childSize.height);
-
-        if (child instanceof SpacingFigure)
-        {
-          rectangle.x = dimension.width + 6;
-        }
-        else if (child instanceof ModelGroupFigure)
-        {
-          rectangle.width = dimension.width - rectangle.x;
-        }
-        else
-        {
-          rectangle.width = dimension.width - rectangle.x;
-        }
-
-        rectangle.translate(container.getClientArea().getLocation());
-        child.setBounds(rectangle);
-        p.y += childSize.height;
-        p.y += spacing;
-      }
-    }
-  }
-
-  public void setSpacing(int spacing)
-  {
-    this.spacing = spacing;
-  }
-
-  protected int alignFigure(IFigure parent, IFigure child)
-  {
-    return -1;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/BuiltInTypesTreeViewerProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/BuiltInTypesTreeViewerProvider.java
deleted file mode 100644
index f0cecbb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/BuiltInTypesTreeViewerProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation 
- *     Trung de Irene <trungha@ca.ibm.com>
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.util.XSDConstants;
-
-
-/**
- * This class provides the content for SelectBuiltInTypesForFilterDialog
- * readability Warning: Some simple tricks to tweak efficiency are used
- */
-public class BuiltInTypesTreeViewerProvider {
-	
-	ILabelProvider labelProvider;
-	
-	ITreeContentProvider contentProvider;
-	
-//	private static final String CONST_PARENT = "parent";
-	
-	/**
-	 * Currently there are 3 subgroups: Numbers, Data and Time, Other
-	 * Folks can choose to expand to more subgroups
-	 */
-	private static int BUILT_IN_TYPES_SUB_GROUP = 3;
-	
-    static String[] numberTypes = 
-    	{ "base64Binary", "byte", "decimal", "double", "float", "hexBinary",
-    	  "int", "integer", "long", "negativeInteger", "nonNegativeInteger",
-    	  "nonPositiveInteger", "positiveInteger", "short", "unsignedByte",
-    	  "unsignedInt", "unsignedLong", "unsignedShort"};
-    
-    static String[] dateAndTimeTypes =
-    	{ "date", "dateTime", "duration", "gDay",
-    	  "gMonth", "gMonthDay", "gYear", "gYearMonth", "time"};
-	
-	
-    public static List getAllBuiltInTypes() {
-        List items = new ArrayList();
-        //for (int i = 0; i < XSDDOMHelper.dataType.length; i++) {
-        //  items.add(XSDDOMHelper.dataType[i][0]);
-        //}
-        Iterator it = items.iterator();
-        
-        List mainContainer = new ArrayList(BUILT_IN_TYPES_SUB_GROUP);
-        ComponentSpecification header = new ComponentSpecification("", "Root", null);
-        mainContainer.add(header);
-        
-        List numbersGroup = new ArrayList();
-        header = new ComponentSpecification("", "Numbers", null);
-        numbersGroup.add(header);
-        mainContainer.add(numbersGroup);
-        
-        List dateAndTimeGroup = new ArrayList();
-        header = new ComponentSpecification("", "Date and Time", null);
-        dateAndTimeGroup.add(header);
-        mainContainer.add(dateAndTimeGroup);
-        
-        List otherGroup = new ArrayList();
-        header = new ComponentSpecification("", "Other", null);
-        otherGroup.add(header);
-        mainContainer.add(otherGroup);
-
-        while (it.hasNext()) {
-        	Object item = it.next();
-            String name = item.toString();
-
-            ComponentSpecification builtInTypeItem = new ComponentSpecification(name, XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, null);
-          
-            // if this built-In Type is in Number group 
-            if ( partOf(name, numberTypes) ){
-            	// Set parent
-            	//builtInTypeItem.addAttributeInfo(CONST_PARENT, numbersGroup);
-            	
-            	numbersGroup.add(builtInTypeItem);
-            }
-            // if this built-In Type is in Date-and-Time group 
-            else if ( partOf(name, dateAndTimeTypes)){
-            	//builtInTypeItem.addAttributeInfo(CONST_PARENT, dateAndTimeGroup);
-            	dateAndTimeGroup.add(builtInTypeItem);
-            }
-            // otherwise, put in Other group
-            else {
-            	//builtInTypeItem.addAttributeInfo(CONST_PARENT, otherGroup);
-            	otherGroup.add(builtInTypeItem);
-            }
-        }
-
-        return mainContainer;
-    }
-    
-    public ILabelProvider getLabelProvider(){
-		if (labelProvider != null)
-			return labelProvider;
-		
-		labelProvider = new BuiltInTypeLabelProvider();
-		return labelProvider;
-	}
-	
-	public ITreeContentProvider getContentProvider() {
-		if (contentProvider != null)
-			return contentProvider;
-		
-		contentProvider = new BuiltInTypesTreeContentProvider();
-		return contentProvider;
-	}
-	
-	/**
-	 * Determines whether an equivalent of 'item' appears in 'array'
-	 * @param item
-	 * @param array
-	 * @return
-	 */
-	private static boolean partOf(String item, String[] array){
-	    for(int i = 0; i < array.length; i++ ){
-	    	if ( item.equals(array[i]) ){
-	    		return true;
-	    	}            		
-	    }
-	    return false;
-	}
-	
-	class BuiltInTypeLabelProvider implements ILabelProvider{
-		public Image getImage(Object element) {			
-			if ( getText(element).equals("Numbers") )
-				return XSDEditorPlugin.getXSDImage("icons/XSDNumberTypes.gif");
-			if ( getText(element).equals("Date and Time") )
-				return XSDEditorPlugin.getXSDImage("icons/XSDDateAndTimeTypes.gif");
-			if ( getText(element).equals("Other") )
-				return XSDEditorPlugin.getXSDImage("icons/browsebutton.gif");
-			if ( element instanceof ComponentSpecification ){
-				return XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-			}
-			return null;
-		}
-
-		public String getText(Object element) {
-			ComponentSpecification spec = null;
-			
-			/* if not non-leaf node, the first element has the name for 
-			 * the whole list */
-			if (element instanceof List){
-				spec = (ComponentSpecification) ((List) element).get(0);
-			}
-			else if (element instanceof ComponentSpecification ){
-				spec = (ComponentSpecification) element;
-			}
-			return spec.getName();
-		}
-
-		public void addListener(ILabelProviderListener listener) {
-			
-		}
-
-		public void dispose() {
-		}
-
-		public boolean isLabelProperty(Object element, String property) {
-			return false;
-		}
-
-		public void removeListener(ILabelProviderListener listener) {
-			
-		}  
-		
-	}
-
-
-	class BuiltInTypesTreeContentProvider implements ITreeContentProvider {
-
-		public Object[] getChildren(Object parentElement) {
-			if (parentElement instanceof List) {
-				List parentContent = (List) parentElement;
-				
-				/** Ignore the first element (which contains the name of this list
-				 * ie. 'Numbers', 'Date and time', 'Other') */
-				return parentContent.subList(1, parentContent.size()).toArray();
-			}
-			return new Object[0];
-		}
-
-		public Object[] getElements(Object inputElement) {
-			return getChildren(inputElement);
-		}
-
-		public Object getParent(Object element) {
-		    return null;
-		}
-
-		public boolean hasChildren(Object element) {
-			if (getChildren(element).length > 1) {
-				return true;
-			}
-			return false;
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		public void dispose() {
-		}
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/IOpenInNewEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/IOpenInNewEditor.java
deleted file mode 100644
index 5e2c520..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/IOpenInNewEditor.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-public interface IOpenInNewEditor
-{
-  public void openXSDEditor();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewAttributeDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewAttributeDialog.java
deleted file mode 100644
index 5602942..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewAttributeDialog.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-public class NewAttributeDialog extends NewComponentDialog implements IComponentDialog
-{
-  protected XSDSchema schema;
-  protected Object setObject;
-  protected int typeKind;
-  protected Object selection;
-
-  public NewAttributeDialog()
-  {
-    super(Display.getCurrent().getActiveShell(), Messages._UI_LABEL_NEW_ATTRIBUTE, "NewAttribute");     //$NON-NLS-1$
-  }
-
-  public NewAttributeDialog(XSDSchema schema)
-  {
-    super(Display.getCurrent().getActiveShell(), Messages._UI_LABEL_NEW_ATTRIBUTE, "NewAttribute");     //$NON-NLS-1$
-    this.schema = schema;
-  }
-  
-  private void setup() {
-    if (schema != null) {
-      List usedNames = getUsedElementNames();
-      setUsedNames(usedNames);
-      setDefaultName(XSDCommonUIUtils.createUniqueElementName("NewAttribute", schema.getAttributeDeclarations()));
-    }
-  }
-  
-  public int createAndOpen()
-  {
-  setup();
-    int returnCode = super.createAndOpen();
-    if (returnCode == 0)
-    {
-      if (setObject instanceof Adapter)
-      {  
-        //Command command = new AddComplexTypeDefinitionCommand(getName(), schema);
-      }        
-    }  
-    return returnCode;
-  }
-
-  public ComponentSpecification getSelectedComponent()
-  {
-    ComponentSpecification componentSpecification =  new ComponentSpecification(null, getName(), null);    
-    componentSpecification.setMetaName(IXSDSearchConstants.ATTRIBUTE_META_NAME);
-    componentSpecification.setNew(true);
-    return componentSpecification;
-  }
-
-  public void setInitialSelection(ComponentSpecification componentSpecification)
-  {
-    // TODO Auto-generated method stub
-  }
-  
-  private List getUsedElementNames() {
-    List usedNames = new ArrayList();     
-    if (schema != null ) {
-      List elementsList = schema.getAttributeDeclarations();
-      Iterator elements = elementsList.iterator(); 
-      while (elements.hasNext()) {
-        usedNames.add(((XSDAttributeDeclaration) elements.next()).getName());
-      }
-    }
-    
-    return usedNames;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewComponentDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewComponentDialog.java
deleted file mode 100644
index aa0c49e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewComponentDialog.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-
-public class NewComponentDialog extends Dialog implements ModifyListener
-{
-  protected Text nameField; 
-  protected Button okButton;
-  protected String name;                             
-  protected String title;
-  protected Label errorMessageLabel;
-  protected List usedNames;
-
-  public NewComponentDialog(Shell parentShell, String title, String defaultName) 
-  {
-    super(parentShell);
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    name = defaultName;      
-    this.title = title;
-  }
-  
-  public NewComponentDialog(Shell parentShell, String title, String defaultName, List usedNames) 
-  {
-    super(parentShell);
-    setShellStyle(getShellStyle() | SWT.RESIZE);
-    name = defaultName;      
-    this.title = title;
-    this.usedNames = usedNames;
-  }
-
-  public int createAndOpen()
-  {
-    create();
-    getShell().setText(title);
-    setBlockOnOpen(true);
-    return open();
-  }
-
-  protected Control createContents(Composite parent)  
-  {
-    Control control = super.createContents(parent);
-    nameField.forceFocus();
-    nameField.selectAll();  
-    updateErrorMessage();
-    return control;
-  }
-
-
-  protected void createButtonsForButtonBar(Composite parent) 
-  {
-    okButton = createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-    createButton(parent, IDialogConstants.CANCEL_ID, IDialogConstants.CANCEL_LABEL, false);
-  }
-
-  protected void createHeaderContent(Composite parent)
-  {
-  }
-  
-  protected void createExtendedContent(Composite parent)
-  {
-  }
-
-  protected Control createDialogArea(Composite parent) 
-  {
-    Composite dialogArea = (Composite)super.createDialogArea(parent);
-    
-    createHeaderContent(dialogArea);
-
-    Composite composite = new Composite(dialogArea, SWT.NONE);
-    GridLayout layout = new GridLayout();
-    layout.numColumns = 2;
-    layout.marginWidth = 0;
-    composite.setLayout(layout);
-
-    GridData gdFill= new GridData();
-    gdFill.horizontalAlignment= GridData.FILL;
-    gdFill.grabExcessHorizontalSpace= true;
-    gdFill.verticalAlignment= GridData.FILL;
-    gdFill.grabExcessVerticalSpace= true;
-    composite.setLayoutData(gdFill);
-
-    Label nameLabel = new Label(composite, SWT.NONE);
-    nameLabel.setText(Messages.UI_LABEL_NAME);
-
-    nameField = new Text(composite, SWT.SINGLE | SWT.BORDER);
-    GridData gd= new GridData();
-    gd.horizontalAlignment= GridData.FILL;
-    gd.grabExcessHorizontalSpace= true;
-    gd.widthHint = 200;
-    nameField.setLayoutData(gd);
-    nameField.setText(name);
-    nameField.addModifyListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(nameField, XSDEditorCSHelpIds.NEWTYPE_NAME);
-
-    createExtendedContent(dialogArea);
-
-    // error message
-    errorMessageLabel = new Label(dialogArea, SWT.NONE);
-    errorMessageLabel.setText("error message goes here");
-    GridData gd2 = new GridData();
-    gd2.horizontalAlignment= GridData.FILL;
-    gd2.grabExcessHorizontalSpace= true;
-    gd2.widthHint = 200;
-    errorMessageLabel.setLayoutData(gd2);          
-//    Color color = new Color(errorMessageLabel.getDisplay(), 200, 0, 0);
-//    errorMessageLabel.setForeground(color);
-
-    return dialogArea;
-  }
-  
-  public void modifyText(ModifyEvent e) 
-  {                        
-    updateErrorMessage();
-  }        
-
-  protected String computeErrorMessage(String name)
-  {
-  	if (usedNames == null)
-  		return null;
-  	
-  	Iterator iterator = usedNames.iterator();
-  	while (iterator.hasNext()) {
-  		if (name.equalsIgnoreCase((String) iterator.next())) {
-  			return org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ERROR_NAME_ALREADY_USED; //$NON-NLS-1$
-  		}
-  	}
-  	
-  	return null;
-  }
-
-  protected void updateErrorMessage()
-  {                 
-    String errorMessage = null;
-    String name = nameField.getText().trim();
-    if (name.length() > 0)
-    {                                
-      errorMessage = computeErrorMessage(name);
-    }   
-    else
-    {
-      errorMessage = ""; //$NON-NLS-1$
-    }  
-    errorMessageLabel.setText(errorMessage != null ? errorMessage : ""); //$NON-NLS-1$
-    okButton.setEnabled(errorMessage == null);
-  }
- 
-  protected void buttonPressed(int buttonId) 
-  {
-    if (buttonId == IDialogConstants.OK_ID)
-    {
-      name = nameField.getText();
-    }
-    super.buttonPressed(buttonId);
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-  
-  public void setUsedNames(List usedNames) {
-	  this.usedNames = usedNames;
-  }
-  
-  public void setDefaultName(String name) {
-	  this.name = name;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewElementButtonHandler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewElementButtonHandler.java
deleted file mode 100644
index 9c83571..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewElementButtonHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import org.eclipse.wst.common.ui.internal.search.dialogs.INewComponentHandler;
-
-public class NewElementButtonHandler implements INewComponentHandler
-{
-  public NewElementButtonHandler()
-  {
-  }
-
-  public void openNewComponentDialog()
-  {
-    NewElementDialog newElementDialog = new NewElementDialog();
-    newElementDialog.createAndOpen();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewElementDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewElementDialog.java
deleted file mode 100644
index 2a0619b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewElementDialog.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-public class NewElementDialog extends NewComponentDialog implements IComponentDialog
-{
-	  protected XSDSchema schema;
-	  protected Object setObject;
-	  protected int typeKind;
-	  protected Object selection;
-
-	  public NewElementDialog()
-	  {
-	    super(Display.getCurrent().getActiveShell(), Messages._UI_LABEL_NEW_ELEMENT, "NewElement");     //$NON-NLS-1$
-	  }
-
-	  public NewElementDialog(XSDSchema schema)
-	  {
-	    super(Display.getCurrent().getActiveShell(), Messages._UI_LABEL_NEW_ELEMENT, "NewElement");     //$NON-NLS-1$
-	    this.schema = schema;
-	  }
-	  
-	  private void setup() {
-		  if (schema != null) {
-			  List usedNames = getUsedElementNames();
-			  setUsedNames(usedNames);
-			  setDefaultName(XSDCommonUIUtils.createUniqueElementName("NewElement", schema.getElementDeclarations()));
-		  }
-	  }
-	  
-	  public int createAndOpen()
-	  {
-		setup();
-	    int returnCode = super.createAndOpen();
-	    if (returnCode == 0)
-	    {
-	      if (setObject instanceof Adapter)
-	      {  
-	        //Command command = new AddComplexTypeDefinitionCommand(getName(), schema);
-	      }        
-	    }  
-	    return returnCode;
-	  }
-
-	  public ComponentSpecification getSelectedComponent()
-	  {
-	    ComponentSpecification componentSpecification =  new ComponentSpecification(null, getName(), null);    
-	    componentSpecification.setMetaName(IXSDSearchConstants.ELEMENT_META_NAME);
-	    componentSpecification.setNew(true);
-	    return componentSpecification;
-	  }
-
-	  public void setInitialSelection(ComponentSpecification componentSpecification)
-	  {
-	    // TODO Auto-generated method stub
-	  }
-	  
-	  private List getUsedElementNames() {
-		  List usedNames = new ArrayList();		  
-		  if (schema != null ) {
-			  List elementsList = schema.getElementDeclarations();
-			  Iterator elements = elementsList.iterator(); 
-			  while (elements.hasNext()) {
-				  usedNames.add(((XSDElementDeclaration) elements.next()).getName());
-			  }
-		  }
-		  
-		  return usedNames;
-	  }
-	}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewTypeButtonHandler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewTypeButtonHandler.java
deleted file mode 100644
index e815a88..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewTypeButtonHandler.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import org.eclipse.wst.common.ui.internal.search.dialogs.INewComponentHandler;
-
-public class NewTypeButtonHandler implements INewComponentHandler
-{
-  public NewTypeButtonHandler()
-  {
-  }
-
-  public void openNewComponentDialog()
-  {
-    NewTypeDialog newTypeDialog = new NewTypeDialog();
-    newTypeDialog.createAndOpen();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewTypeDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewTypeDialog.java
deleted file mode 100644
index 45fec61..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/NewTypeDialog.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class NewTypeDialog extends NewComponentDialog implements IComponentDialog
-{
-  protected XSDSchema schema;
-  protected static int SIMPLE_TYPE = 0;
-  protected static int COMPLEX_TYPE = 1;
-  protected Object setObject;
-  protected int typeKind;
-  protected Object selection;
-  protected boolean allowComplexType = true;
-  protected boolean allowAnonymousType = true;
-  protected boolean anonymousType = false;
-  private Button complexTypeButton;
-  private Button simpleTypeButton;
-  private Button anonymousTypeCheckBox;
-
-  public NewTypeDialog()
-  {
-    super(Display.getCurrent().getActiveShell(), Messages._UI_LABEL_NEW_TYPE, "NewType");     //$NON-NLS-1$
-  }
-
-  public NewTypeDialog(XSDSchema schema)
-  {
-    super(Display.getCurrent().getActiveShell(), Messages._UI_LABEL_NEW_TYPE, "NewType");     //$NON-NLS-1$
-    this.schema = schema;
-  }
-  
-  private void setup() {
-	  if (schema != null) {
-		  List usedNames = getUsedTypeNames();
-		  setUsedNames(usedNames);
-		  setDefaultName(XSDCommonUIUtils.createUniqueElementName(name, schema.getTypeDefinitions()));
-	  }
-  }
-  
-  public int createAndOpen()
-  {
-	setup();
-    int returnCode = super.createAndOpen();
-    if (returnCode == 0)
-    {
-      if (setObject instanceof Adapter)
-      {  
-        //Command command = new AddComplexTypeDefinitionCommand(getName(), schema);
-      }        
-    }  
-    return returnCode;
-  }
-
-  public ComponentSpecification getSelectedComponent()
-  {
-    ComponentSpecification componentSpecification;
-    if ( anonymousType )
-    	componentSpecification = new ComponentSpecification(null, null, null);
-    else
-    	componentSpecification =  new ComponentSpecification(null, getName(), null);    
-    componentSpecification.setMetaName(typeKind == COMPLEX_TYPE ? IXSDSearchConstants.COMPLEX_TYPE_META_NAME : IXSDSearchConstants.SIMPLE_TYPE_META_NAME);
-    componentSpecification.setNew(true);
-    //componentSpecification.
-    return componentSpecification;
-  }
-
-  public void setInitialSelection(ComponentSpecification componentSpecification)
-  {
-    // TODO Auto-generated method stub
-  }
-
-  protected void createHeaderContent(Composite parent)
-  {
-    complexTypeButton = new Button(parent, SWT.RADIO);
-    complexTypeButton.setText(Messages._UI_LABEL_COMPLEX_TYPE);
-    complexTypeButton.setEnabled(allowComplexType);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(complexTypeButton, XSDEditorCSHelpIds.NEWTYPE_COMPLEXTYPE);
-    
-    simpleTypeButton = new Button(parent, SWT.RADIO);
-    simpleTypeButton.setText(Messages._UI_LABEL_SIMPLE_TYPE);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(simpleTypeButton, XSDEditorCSHelpIds.NEWTYPE_SIMPLETYPE);
-    
-    SelectionAdapter listener = new SelectionAdapter()
-    {
-      public void widgetSelected(SelectionEvent e)
-      {
-        if (e.widget == simpleTypeButton)
-        {
-          typeKind = SIMPLE_TYPE;
-        }
-        else if (e.widget == complexTypeButton)
-        {
-          typeKind = COMPLEX_TYPE;
-        }
-        else if (allowAnonymousType && e.widget == anonymousTypeCheckBox)
-        {
-          if (anonymousTypeCheckBox.getSelection() == true)
-          {
-        	  nameField.setEnabled(false);
-        	  anonymousType = true;
-          }
-          else
-          {
-        	  nameField.setEnabled(true);
-        	  anonymousType = false;
-          }
-        }
-      }
-    };
-    if (allowComplexType)
-    {
-      complexTypeButton.setSelection(true);
-      typeKind = COMPLEX_TYPE;
-    }
-    else
-    {
-      simpleTypeButton.setSelection(true);
-      typeKind = SIMPLE_TYPE;
-    }
-
-    simpleTypeButton.addSelectionListener(listener);
-    complexTypeButton.addSelectionListener(listener);
-    
-    Label separator = new Label(parent, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    separator.setLayoutData(gd);
-
-    if (allowAnonymousType )
-    {
-      anonymousTypeCheckBox = new Button(parent, SWT.CHECK);
-      anonymousTypeCheckBox.setText(Messages._UI_LABEL_CREATE_ANON_TYPE);
-    }    
-
-    if (anonymousTypeCheckBox != null)
-      anonymousTypeCheckBox.addSelectionListener(listener);    
-  }
-
-  /**
-   * This method will be removed in the next WTP release.
-   * @deprecated
-   */
-  protected String getNormalizedLocation(String location)
-  {
-    try
-    {
-      URL url = new URL(location);
-      URL resolvedURL = FileLocator.resolve(url);
-      location = resolvedURL.getPath();
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-    return location;
-  }
-
-  public void allowComplexType(boolean value)
-  {
-    this.allowComplexType= value;
-  }
-  
-  public void allowAnonymousType(boolean value)
-  {
-	this.allowAnonymousType = value;
-  }
-  
-  private List getUsedTypeNames() {
-	  List usedNames = new ArrayList();
-
-	  if (schema != null) {
-		  List typesList = schema.getTypeDefinitions();
-		  Iterator types = typesList.iterator();
-		  while (types.hasNext()) {
-			  usedNames.add(((XSDTypeDefinition) types.next()).getName());
-		  }
-	  }
-	  
-	  return usedNames;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/SelectBuiltInTypesForFilteringDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/SelectBuiltInTypesForFilteringDialog.java
deleted file mode 100644
index a437d6c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/SelectBuiltInTypesForFilteringDialog.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation 
- *     Trung de Irene <trungha@ca.ibm.com>
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.CheckedTreeSelectionDialog;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-/**
- * The BuiltInTypesFilteringDialog is a SelectionDialog that allows the user to
- *  select a ...
- */
-public class SelectBuiltInTypesForFilteringDialog extends CheckedTreeSelectionDialog {
-
-	public final static String CUSTOM_LIST_SEPARATOR = XSDEditorPlugin.CUSTOM_LIST_SEPARATOR;
-
-	public SelectBuiltInTypesForFilteringDialog(Shell parent, 
-			ILabelProvider labelProvider, ITreeContentProvider contentProvider) {
-		super(parent, labelProvider, contentProvider);
-
-		init();
-	}
-	
-	public CheckboxTreeViewer getTreeViewer(){
-		return super.getTreeViewer();
-	}
-	
-	private void init(){
-		// grey state enable
-		setContainerMode(true);
-		
-		setTitle(Messages._UI_LABEL_SET_COMMON_BUILT_IN_TYPES);
-		setMessage(Messages._UI_LABEL_SELECT_TYPES_FILTER_OUT);
-		
-		//super.create();
-		//super.getTreeViewer().setSorter(new ViewerSorter());
-		
-	}
-	
-	/**
-	 *   Returns a String acting as list of built-in types selected by the user
-	 * in the filter dialog (white space acts as the item separator).
-	 *   Suggest using getSelectedBuiltInTypesFromString
-	 * to get a concrete array of selected types.
-	 *   We can only store String in the plugin preference's storage so we have 
-	 * use this method for conversion
-	 */
-	public static String getTypesListInString(Object[] chosenTypes) {
-		String returningList = ""; //$NON-NLS-1$
-		for (int i = 0; i < chosenTypes.length; i++){
-			if ( chosenTypes[i] instanceof ComponentSpecification){
-				ComponentSpecification aType = 
-					(ComponentSpecification) chosenTypes[i];
-
-				returningList += aType.getName() + CUSTOM_LIST_SEPARATOR;
-			}
-			/* else selectedBuiltInTypes[i] instanceof List, ie. a parentNode
-			 * we ignore it. */
-		}
-		return returningList;
-	}
-	
-	/**
-	 * Filters out all built-In type not recorded in the 'listString' and 
-	 * returns the result in a List
-	 * Warning: recursive method
-	 * @param listString 
-	 * @param aContainer 
-	 * 			Containing all types
-	 * @return a subset of what 'aContainer' has as specified by 'listString'
-	 */
-	public static List getSelectedBuiltInTypesFromString(String listString, 
-			List aContainer) {
-		List selectedTypes = new ArrayList();
-
-		// ignore the 'header' item in the container, starting from i = 1
-		for (int i = 1; i < aContainer.size(); i++){
-			Object o = aContainer.get(i);
-			if ( o instanceof ComponentSpecification){
-				ComponentSpecification aType = (ComponentSpecification) o;
-				String typeName = aType.getName();
-				// if typeName's name appears in 'listString'
-				if ( listString.indexOf(typeName + CUSTOM_LIST_SEPARATOR) != -1)
-					selectedTypes.add(o);
-			}
-			else if ( o instanceof List){
-				selectedTypes.addAll( getSelectedBuiltInTypesFromString(listString, (List) o) ); 
-			}
-		}
-		return selectedTypes;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDEditSchemaNS.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDEditSchemaNS.java
deleted file mode 100644
index 43e520d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDEditSchemaNS.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditSchemaInfoDialog;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesDialog;
-
-public class XSDEditSchemaNS extends EditSchemaInfoDialog
-{
-  CommonEditNamespacesDialog editNamespacesControl;
-
-  public XSDEditSchemaNS(Shell parentShell, IPath resourceLocation)
-  {
-    super(parentShell, resourceLocation);
-  }
-
-  protected Control createDialogArea(Composite parent)
-  {
-    Composite composite = new Composite(parent, SWT.NONE);
-    composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    editNamespacesControl = new CommonEditNamespacesDialog(composite, resourceLocation, XMLUIMessages._UI_NAMESPACE_DECLARATIONS);
-
-    editNamespacesControl.setNamespaceInfoList(namespaceInfoList);
-    editNamespacesControl.updateErrorMessage(namespaceInfoList);
-
-    return composite;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java
deleted file mode 100644
index fa66e20..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/dialogs/XSDGraphViewerDialog.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.dialogs;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.IDialogSettings;
-import org.eclipse.jface.dialogs.PopupDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.events.ControlListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootContentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.TypeVizFigureFactory;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDEditPartFactory;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDGraphViewerDialog extends PopupDialog
-{
-  protected Object model;
-  protected ScrollingGraphicalViewer viewer;
-  protected IOpenInNewEditor openInNewEditorHelper;
-  private OpenEditorLinkListener linkListener;
-  private Label nsInfoLabel;
-  private Hyperlink link;
-  private String infoText;
-  private Font infoFont;
-  private String uniqueID;
-  private PreviewControlListener moveListener;
-  
-  private static String X_ORIGIN = "DIALOG_X_ORIGIN"; //$NON-NLS-1$
-  private static String Y_ORIGIN = "DIALOG_Y_ORIGIN"; //$NON-NLS-1$
-  private boolean isHighContrast = false;
-
-  public XSDGraphViewerDialog(Shell parentShell, String titleText, String infoText, Object model, String ID)
-  {
-    super(parentShell, HOVER_SHELLSTYLE, true, true, true, false, titleText, infoText);
-    setModel(model);
-    linkListener = new OpenEditorLinkListener();
-    this.infoText = infoText;
-    this.uniqueID = ID;
-    Assert.isTrue(ID != null && ID.length() > 0);    
-    moveListener = new PreviewControlListener();
-    try 
-    {
-      isHighContrast = Display.getDefault().getHighContrast();
-    }
-    catch (Exception e) {
-      // ignore 
-    }
-    create();
-  }
-
-  public void setOpenExternalEditor(IOpenInNewEditor helper)
-  {
-    this.openInNewEditorHelper = helper;
-  }
-  
-  protected void fillDialogMenu(IMenuManager dialogMenu)
-  {
-    super.fillDialogMenu(dialogMenu);
-    dialogMenu.add(new Separator());
-    dialogMenu.add(new SetOpenInEditor());
-  }
-
-  protected Control createDialogArea(Composite parent)
-  {
-    viewer = new ScrollingGraphicalViewer();
-    Composite c = new Composite(parent, SWT.NONE);
-
-    if (isHighContrast)
-    {
-      c.setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-    }
-    else
-    {
-      c.setBackground(ColorConstants.white);
-    }
-    c.setLayout(new FillLayout());
-
-    RootEditPart root = new RootEditPart();
-    viewer.setRootEditPart(root);
-
-    viewer.createControl(c);
-    if (isHighContrast)
-    {
-      viewer.getControl().setBackground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
-    }
-    else
-    {
-      viewer.getControl().setBackground(ColorConstants.white);
-    }
-    EditPartFactory editPartFactory = new XSDEditPartFactory(new TypeVizFigureFactory());
-    viewer.setEditPartFactory(editPartFactory);
-
-    RootContentEditPart rootContentEditPart = new RootContentEditPart();
-    rootContentEditPart.setModel(model);
-    viewer.setContents(rootContentEditPart);
-    
-    getShell().addControlListener(moveListener);
-    return c;
-  }
-  
-  protected Control createInfoTextArea(Composite parent)
-  {
-    Composite infoComposite = new Composite(parent, SWT.NONE);
-    GridLayout gridLayout = new GridLayout(2, false);
-    gridLayout.marginHeight = 0;
-    gridLayout.marginWidth = 0;
-    infoComposite.setLayout(gridLayout);
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    infoComposite.setLayoutData(gd);
-
-    nsInfoLabel = new Label(infoComposite, SWT.LEFT);
-    nsInfoLabel.setText(infoText);
-
-    Font font = nsInfoLabel.getFont();
-    FontData[] fontDatas = font.getFontData();
-    for (int i = 0; i < fontDatas.length; i++)
-    {
-      fontDatas[i].setHeight(fontDatas[i].getHeight() * 9 / 10);
-    }
-    infoFont = new Font(nsInfoLabel.getDisplay(), fontDatas);
-    nsInfoLabel.setFont(infoFont);
-    gd = new GridData(GridData.FILL_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_BEGINNING);
-    nsInfoLabel.setLayoutData(gd);
-    nsInfoLabel.setForeground(parent.getDisplay().getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW));
-
-    link = new Hyperlink(infoComposite, SWT.RIGHT);
-    link.setText(Messages._UI_ACTION_OPEN_IN_NEW_EDITOR);
-    link.setFont(infoFont);
-    link.addHyperlinkListener(linkListener);
-    return infoComposite;
-  }
-  
-  private void setModel(Object model)
-  {
-    Assert.isTrue(model instanceof XSDConcreteComponent);
-    this.model = XSDAdapterFactory.getInstance().adapt((XSDConcreteComponent) model);
-  }
-    
-  protected class SetOpenInEditor extends Action
-  {
-    public SetOpenInEditor()
-    {
-      super(Messages._UI_ACTION_OPEN_IN_NEW_EDITOR);
-    }
-    
-    public void run()
-    {
-      if (openInNewEditorHelper != null)
-      {
-        try
-        {
-          openInNewEditorHelper.openXSDEditor();
-        }
-        catch (Exception e)
-        {
-          
-        }
-      }
-    }
-  }
-  
-  protected IDialogSettings getDialogSettings()
-  {
-    IDialogSettings settings= XSDEditorPlugin.getDefault().getDialogSettings().getSection(uniqueID);
-    if (settings == null)
-      settings= XSDEditorPlugin.getDefault().getDialogSettings().addNewSection(uniqueID);
-
-    return settings;
-  }
-  
-  protected Point getInitialLocation(Point initialSize)
-  {
-    Point result = super.getInitialLocation(initialSize);
-
-    IDialogSettings settings = getDialogSettings();
-    if (settings != null)
-    {
-      try
-      {
-
-        String prefix = uniqueID == null ? getClass().getName() : uniqueID;
-        int x = settings.getInt(prefix + X_ORIGIN);
-        int y = settings.getInt(prefix + Y_ORIGIN);
-        result = new Point(x, y);
-        Shell parent = getParentShell();
-        if (parent != null)
-        {
-          Point parentLocation = parent.getLocation();
-          result.x += parentLocation.x;
-          result.y += parentLocation.y;
-        }
-      }
-      catch (NumberFormatException e)
-      {
-      }
-    }
-    return result;
-  }
-
-  protected void saveDialogBounds(Shell shell)
-  {
-    IDialogSettings settings = getDialogSettings();
-    if (settings != null)
-    {
-      Point shellLocation = shell.getLocation();
-      Shell parent = getParentShell();
-      if (parent != null)
-      {
-        Point parentLocation = parent.getLocation();
-        shellLocation.x -= parentLocation.x;
-        shellLocation.y -= parentLocation.y;
-      }
-      String prefix = uniqueID == null ? getClass().getName() : uniqueID;
-      settings.put(prefix + X_ORIGIN, shellLocation.x);
-      settings.put(prefix + Y_ORIGIN, shellLocation.y);
-    }
-  }
-
-  
-  public boolean close()
-  {
-    getShell().removeControlListener(moveListener);
-    if (link != null)
-      link.removeHyperlinkListener(linkListener);
-    if (infoFont != null)
-      infoFont.dispose();
-    infoFont = null;
-    return super.close();
-  }
-  
-  private final class OpenEditorLinkListener implements IHyperlinkListener
-  {
-
-    public void linkActivated(HyperlinkEvent e)
-    {
-      new SetOpenInEditor().run();
-      close();
-    }
-
-    public void linkEntered(HyperlinkEvent e)
-    {
-      link.setForeground(ColorConstants.lightBlue);
-    }
-
-    public void linkExited(HyperlinkEvent e)
-    {
-      link.setForeground(link.getParent().getForeground());
-    }
-    
-  }
-  
-  protected class PreviewControlListener implements ControlListener
-  {
-
-    public void controlMoved(ControlEvent e)
-    {
-      saveDialogBounds(getShell());
-    }
-
-    public void controlResized(ControlEvent e)
-    {
-    }
-  }
-
-  /**
-   * @deprecated since 1.2.101
-   * @param xsdComponent
-   * @param schema
-   * @param editorName
-   */
-  public static void openNonXSDResourceSchema(XSDConcreteComponent xsdComponent, XSDSchema schema, String editorName)
-  {
-    openInlineSchema(getCurrentEditorInput(), xsdComponent, schema, editorName);
-  }
-  
-  public static void openInlineSchema(IEditorInput editorInput, XSDConcreteComponent xsdComponent, XSDSchema schema, String editorName)
-  {
-    OpenInNewEditor.openInlineSchema(editorInput, xsdComponent, schema, editorName);
-  }
-
-  /**
-   * @deprecated
-   */
-  public static void openXSDEditor(XSDConcreteComponent xsdComponent)
-  {
-    openXSDEditor(getCurrentEditorInput(), xsdComponent.getSchema(), xsdComponent);
-  }
-
-  public static void openXSDEditor(IEditorInput editorInput, XSDSchema schema, XSDConcreteComponent xsdComponent)
-  {
-    OpenInNewEditor.openXSDEditor(editorInput, schema, xsdComponent);
-  }
-  
-  private static IEditorInput getCurrentEditorInput()
-  {
-    try
-    {
-      IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-      IWorkbenchPage page = null;
-      if (workbenchWindow != null)
-      {
-        page = workbenchWindow.getActivePage();
-        if (page != null)
-        {
-          IEditorPart editorPart = page.getActiveEditor();
-          if (editorPart != null)
-          {
-            return editorPart.getEditorInput();
-          }
-        }
-      }
-    }
-    catch (Exception e)
-    {
-      
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/BaseHyperlinkDetector.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/BaseHyperlinkDetector.java
deleted file mode 100644
index 5d43161..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/BaseHyperlinkDetector.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.ITextViewer;
-import org.eclipse.jface.text.Region;
-import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.ITextRegion;
-import org.eclipse.wst.sse.core.utils.StringUtils;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * Base class for hyperlinks detectors. Provides a framework and common code for
- * hyperlink detectors. TODO: Can we pull this class further up the inheritance
- * hierarchy?
- */
-public abstract class BaseHyperlinkDetector extends AbstractHyperlinkDetector
-{
-  /*
-   * (non-Javadoc)
-   */
-  public IHyperlink[] detectHyperlinks(ITextViewer textViewer, IRegion region, boolean canShowMultipleHyperlinks)
-  {
-    if (region == null || textViewer == null)
-    {
-      return null;
-    }
-
-    List hyperlinks = new ArrayList(0);
-    IDocument document = textViewer.getDocument();
-    int offset = region.getOffset();
-
-    IDOMNode node = getCurrentNode(document, offset);
-
-    // This call allows us to determine whether an attribute is linkable,
-    // without incurring the cost of asking for the target component.
-
-    if (!isLinkable(node))
-    {
-      return null;
-    }
-
-    IRegion hyperlinkRegion = getHyperlinkRegion(node);
-
-    // createHyperlink is a template method. Derived classes, should override.
-
-    IHyperlink hyperlink = createHyperlink(document, node, hyperlinkRegion);
-
-    if (hyperlink != null)
-    {
-      hyperlinks.add(hyperlink);
-    }
-
-    if (hyperlinks.size() == 0)
-    {
-      return null;
-    }
-
-    return (IHyperlink[]) hyperlinks.toArray(new IHyperlink[0]);
-  }
-
-  /**
-   * Determines whether a node is "linkable" that is, the component it refers to
-   * can be the target of a "go to definition" navigation.
-   * 
-   * @param node the node to test, must not be null;
-   * @return true if the node is linkable, false otherwise.
-   */
-  private boolean isLinkable(IDOMNode node)
-  {
-    if (node == null)
-    {
-      return false;
-    }
-
-    short nodeType = node.getNodeType();
-
-    boolean isLinkable = false;
-
-    if (nodeType == Node.ATTRIBUTE_NODE)
-    {
-      IDOMAttr attr = (IDOMAttr) node;
-      String name = attr.getName();
-
-      // isLinkableAttribute is a template method. Derived classes should
-      // override.
-
-      isLinkable = isLinkableAttribute(name);
-    }
-
-    return isLinkable;
-  }
-
-  /**
-   * Determines whether an attribute is "linkable" that is, the component it
-   * points to can be the target of a "go to definition" navigation. Derived
-   * classes should override.
-   * 
-   * @param name the attribute name. Must not be null.
-   * @return true if the attribute is linkable, false otherwise.
-   */
-  protected abstract boolean isLinkableAttribute(String name);
-
-  /**
-   * Creates a hyperlink based on the selected node. Derived classes should
-   * override.
-   * 
-   * @param document the source document.
-   * @param node the node under the cursor.
-   * @param region the text region to use to create the hyperlink.
-   * @return a new IHyperlink for the node or null if one cannot be created.
-   */
-  protected abstract IHyperlink createHyperlink(IDocument document, IDOMNode node, IRegion region);
-
-  /**
-   * Locates the attribute node under the cursor.
-   * 
-   * @param offset the cursor offset.
-   * @param parent the parent node
-   * @return an IDOMNode representing the attribute if one is found at the
-   *         offset or null otherwise.
-   */
-  protected IDOMNode getAttributeNode(int offset, IDOMNode parent)
-  {
-    IDOMAttr attrNode = null;
-    NamedNodeMap map = parent.getAttributes();
-
-    for (int index = 0; index < map.getLength(); index++)
-    {
-      attrNode = (IDOMAttr) map.item(index);
-      boolean located = attrNode.contains(offset);
-      if (located)
-      {
-        if (attrNode.hasNameOnly())
-        {
-          attrNode = null;
-        }
-        break;
-      }
-    }
-
-    if (attrNode == null)
-    {
-      return parent;
-    }
-    return attrNode;
-  }
-
-  /**
-   * Returns the node the cursor is currently on in the document or null if no
-   * node is selected
-   * 
-   * @param offset the current cursor offset.
-   * @return IDOMNode either element, doctype, text, attribute or null
-   */
-  private IDOMNode getCurrentNode(IDocument document, int offset)
-  {
-    IndexedRegion inode = null;
-    IStructuredModel sModel = null;
-
-    try
-    {
-      sModel = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-      inode = sModel.getIndexedRegion(offset);
-      if (inode == null)
-        inode = sModel.getIndexedRegion(offset - 1);
-    }
-    finally
-    {
-      if (sModel != null)
-        sModel.releaseFromRead();
-    }
-
-    if (inode instanceof IDOMNode)
-    {
-      IDOMNode node = (IDOMNode) inode;
-
-      if (node.hasAttributes())
-      {
-        node = getAttributeNode(offset, node);
-      }
-      return node;
-    }
-
-    return null;
-  }
-
-  /**
-   * Get the text region corresponding to an IDOMNode.
-   * 
-   * @param node the node for which we want the text region. Must not be null.
-   * @return an IRegion for the node, or null if the node is not recognized.
-   */
-  protected IRegion getHyperlinkRegion(IDOMNode node)
-  {
-    if (node == null)
-    {
-      return null;
-    }
-
-    IRegion hyperRegion = null;
-    short nodeType = node.getNodeType();
-
-    switch (nodeType)
-    {
-      case Node.ELEMENT_NODE : 
-        {
-          hyperRegion = new Region(node.getStartOffset(), node.getEndOffset() - node.getStartOffset());
-        }
-      break;
-      case Node.ATTRIBUTE_NODE : 
-        {
-          IDOMAttr att = (IDOMAttr) node;
-  
-          int regOffset = att.getValueRegionStartOffset();
-  
-          // ISSUE: We are using a deprecated method here. Is there
-          // a better way to get what we need?
-  
-          ITextRegion valueRegion = att.getValueRegion();
-          if (valueRegion != null)
-          {
-            int regLength = valueRegion.getTextLength();
-            String attValue = att.getValueRegionText();
-  
-            // Do not include quotes in attribute value region and only
-            // underline the actual value, not the quotes.
-            
-            if (StringUtils.isQuoted(attValue))
-            {
-              regLength = regLength - 2;
-              regOffset++;
-            }
-            hyperRegion = new Region(regOffset, regLength);
-          }
-        }
-        break;
-      default :
-        // Do nothing.
-        break;
-    }
- 
-    return hyperRegion;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/ISelectionMapper.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/ISelectionMapper.java
deleted file mode 100644
index a51c0fd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/ISelectionMapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.jface.viewers.ISelection;
-
-public interface ISelectionMapper
-{
-  ISelection mapSelection(ISelection selectedObject);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/InternalXSDMultiPageEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/InternalXSDMultiPageEditor.java
deleted file mode 100644
index 3343e55..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/InternalXSDMultiPageEditor.java
+++ /dev/null
@@ -1,1468 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.KeyStroke;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.PrintAction;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IContentProvider;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.IPostSelectionProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.INavigationLocation;
-import org.eclipse.ui.INavigationLocationProvider;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.adapters.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.RedefineCategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDRedefineAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.AddFieldAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseDirectEditAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DesignSelectAll;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewGraphicalViewer;
-import org.eclipse.wst.xsd.ui.internal.adt.design.IKeyboardDrag;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootContentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ADTMultiPageEditor;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.EditorMode;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.EditorModeManager;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.IADTEditorInput;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ProductCustomizationProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ADTContentOutlinePage;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.TypeVizEditorMode;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyAttributeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAnyElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeGroupDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDComplexTypeDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDModelGroupDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedAttributeGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedComplexTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedModelGroupAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefinedSimpleTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDSchemaDirectiveAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDSimpleTypeDefinitionAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetBaseTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicityAction;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetTypeAction;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.IDocumentChangedNotifier;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.navigation.DesignViewNavigationLocation;
-import org.eclipse.wst.xsd.ui.internal.navigation.MultiPageEditorTextSelectionNavigationLocation;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelAdapter;
-import org.eclipse.wst.xsd.ui.internal.utils.OpenOnSelectionHelper;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class InternalXSDMultiPageEditor extends ADTMultiPageEditor implements ITabbedPropertySheetPageContributor, INavigationLocationProvider
-{
-  // IModel model;
-  IStructuredModel structuredModel;
-  XSDSchema xsdSchema;
-  XSDModelAdapter schemaNodeAdapter;
-  private OutlineTreeSelectionChangeListener fOutlineListener;
-  private SourceEditorSelectionListener fSourceEditorSelectionListener;
-  private XSDSelectionManagerSelectionListener fXSDSelectionListener;
-  private InternalDocumentChangedNotifier internalDocumentChangedNotifier = new InternalDocumentChangedNotifier();
-  private static final String XSD_EDITOR_MODE_EXTENSION_ID = "org.eclipse.wst.xsd.ui.editorModes"; //$NON-NLS-N$ 
-  private XSDPreferenceStoreListener xsdPreferenceStoreListener;
-  
-  class InternalDocumentChangedNotifier implements IDocumentChangedNotifier
-  {
-    List list = new ArrayList();
-    
-    public void addListener(INodeAdapter adapter)
-    {
-      list.add(adapter);
-    }
-
-    public void removeListener(INodeAdapter adapter)
-    {
-      list.remove(adapter);
-    }
-    
-    public void notifyListeners(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-    {
-      List clone = new ArrayList(list.size());     
-      clone.addAll(list);
-      for (Iterator i = clone.iterator(); i.hasNext(); )
-      {
-        INodeAdapter adapter = (INodeAdapter)i.next();
-        adapter.notifyChanged(notifier, eventType, changedFeature, oldValue, newValue, pos);
-      }
-    }
-  }
-  
-  protected void setInputToGraphicalViewer(IDocument newDocument)
-  {
-    IStructuredModel structuredModel = null;
-    try
-    {
-      // only set input if structured model already exists
-      // (meaning source editor is already managing the model)
-      structuredModel = StructuredModelManager.getModelManager().getExistingModelForRead(newDocument);
-      if ((structuredModel != null) && (structuredModel instanceof IDOMModel))
-      {
-        Document doc = ((IDOMModel) structuredModel).getDocument();
-        if (doc != null)
-        {
-          XSDModelAdapter modelAdapter = XSDModelAdapter.lookupOrCreateModelAdapter(doc);
-          if (modelAdapter != null) // Assert should not be null
-          {
-            modelAdapter.setSchema(xsdSchema);
-            xsdSchema = modelAdapter.resetSchema(doc);
-            model = (IModel) XSDAdapterFactory.getInstance().adapt(xsdSchema);
-          }
-        }
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally
-    {
-      if (structuredModel != null)
-      {
-        structuredModel.releaseFromRead();
-      }
-    }
-  }
-  
- 
-  public IModel buildModel()
-  {
-    try
-    {      
-      IEditorInput editorInput = getEditorInput();
-      
-      // If the input schema is from the WSDL Editor, then use that inline schema
-      if (editorInput instanceof IADTEditorInput)
-      {
-        xsdSchema = ((IADTEditorInput) editorInput).getSchema();
-        if (xsdSchema != null)
-          model = (IModel) XSDAdapterFactory.getInstance().adapt(xsdSchema);
-      }
-      
-      Document document = null;
-      IDocument doc = structuredTextEditor.getDocumentProvider().getDocument(getEditorInput());
-      if (doc instanceof IStructuredDocument)
-      {
-        IStructuredModel model = null;
-        try
-        {
-        // TODO: for StorageEditorInputs, should be forRead
-          model = StructuredModelManager.getModelManager().getExistingModelForEdit(doc);
-          if (model == null)
-          {
-            model = StructuredModelManager.getModelManager().getModelForEdit((IStructuredDocument) doc);
-          }
-          document = ((IDOMModel) model).getDocument();
-        }
-        finally
-        {
-          if (model != null)
-          {
-            model.releaseFromEdit();
-          }
-        }
-      }
-      Assert.isNotNull(document);
-
-      if (model != null)
-        return model;
-      
-      xsdSchema = XSDModelAdapter.lookupOrCreateSchema(document);
-      model = (IModel) XSDAdapterFactory.getInstance().adapt(xsdSchema);              
-    }
-    catch (Exception e)
-    {
-
-    }
-    
-//    try
-//    {
-//      EPackage.Registry reg = EPackage.Registry.INSTANCE;
-//      XSDPackage xsdPackage = (XSDPackage) reg.getEPackage(XSDPackage.eNS_URI);
-//      xsdSchema = xsdPackage.getXSDFactory().createXSDSchema();
-//      resourceSet = XSDSchemaImpl.createResourceSet();
-//      IFile resourceFile = editorInput.getFile();
-//      structuredModel = StructuredModelManager.getModelManager().getModelForEdit(resourceFile);
-//      // If the resource is in the workspace....
-//      // otherwise the user is trying to open an external file
-//      if (resourceFile != null)
-//      {
-//        String pathName = resourceFile.getFullPath().toString();
-//        xsdResource = resourceSet.getResource(URI.createPlatformResourceURI(pathName), true);
-//        resourceSet.getResources().add(xsdResource);
-//        Object obj = xsdResource.getContents().get(0);
-//        if (obj instanceof XSDSchema)
-//        {
-//          xsdSchema = (XSDSchema) obj;
-//          xsdSchema.setElement(((IDOMModel) structuredModel).getDocument().getDocumentElement());
-//          model = (IModel) XSDAdapterFactory.getInstance().adapt(xsdSchema);
-//        }
-//        
-//        // If the input schema is from the WSDL Editor, then use that inline schema
-//        if (editorInput instanceof XSDFileEditorInput)
-//        {
-//          xsdSchema = ((XSDFileEditorInput) editorInput).getSchema();
-//          model = (IModel) XSDAdapterFactory.getInstance().adapt(xsdSchema);
-//        }
-//        if (xsdSchema.getElement() != null)
-//          
-//          // TODO (cs) ... we need to look into performance issues when we add elements
-//          // seems to be that formatting is causig lots of notification and things get terribly slow
-//          // I'm specializing the method below to add an isModelStateChanging check that should
-//          // help here ... but we need to investigate further
-//          new XSDModelReconcileAdapter(xsdSchema.getElement().getOwnerDocument(), xsdSchema)
-//          {
-//            public void handleNotifyChange(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index)
-//            {
-//              if (notifier instanceof NodeImpl)
-//              {
-//                NodeImpl nodeImpl = (NodeImpl)notifier;
-//                if (!nodeImpl.getModel().isModelStateChanging())
-//                {             
-//                  super.handleNotifyChange(notifier, eventType, feature, oldValue, newValue, index);
-//                  internalDocumentChangedNotifier.notifyListeners(notifier, eventType, feature, oldValue, newValue, index);
-//                }  
-//              }
-//            }
-//          };
-//        xsdResource.setModified(false);
-//      }
-//    }
-//    catch (StackOverflowError e)
-//    {
-//    }
-//    catch (Exception ex)
-//    {
-//    }
-    return model;
-  }
-
-  public void dispose()
-  {
-    IStructuredModel structuredModel = null;
-    XSDModelAdapter modelAdapter = null;
-    IDOMDocument doc = null;
-    IDocument idoc = structuredTextEditor.getDocumentProvider().getDocument(getEditorInput());
-    if (idoc != null)
-    {
-      structuredModel = StructuredModelManager.getModelManager().getExistingModelForRead(idoc);
-      if ((structuredModel != null) && (structuredModel instanceof IDOMModel))
-      {
-        try
-        {
-          if ((structuredModel != null) && (structuredModel instanceof IDOMModel))
-          {
-            doc = ((IDOMModel) structuredModel).getDocument();
-            if (doc != null)
-            {
-              modelAdapter = (XSDModelAdapter) doc.getExistingAdapter(XSDModelAdapter.class);
-              if (modelAdapter != null)
-              {
-                doc.getModel().removeModelStateListener(modelAdapter.getModelReconcileAdapter());
-                doc.removeAdapter(modelAdapter.getModelReconcileAdapter());
-                doc.removeAdapter(modelAdapter);
-                modelAdapter.clear();
-                modelAdapter = null;
-              }
-            }
-          }
-        }
-        finally
-        {
-          structuredModel.releaseFromRead();
-        }
-      }
-    }
-   
-
-
-    if (fOutlinePage != null)
-    {
-//      if (fOutlinePage instanceof ConfigurableContentOutlinePage && fOutlineListener != null)
-//      {
-//        ((ConfigurableContentOutlinePage) fOutlinePage).removeDoubleClickListener(fOutlineListener);
-//      }
-      if (fOutlineListener != null)
-      {
-        fOutlinePage.removeSelectionChangedListener(fOutlineListener);
-      }
-    }
-    getSelectionManager().removeSelectionChangedListener(fXSDSelectionListener);
-    XSDEditorPlugin.getDefault().getPreferenceStore().removePropertyChangeListener(xsdPreferenceStoreListener);
-    xsdPreferenceStoreListener = null;
-    super.dispose();
-  }
-
-  protected void initializeGraphicalViewer()
-  {
-    RootContentEditPart root = new RootContentEditPart();
-    if (!(getEditorInput() instanceof IADTEditorInput))
-    {
-      root.setModel(model);
-    }
-    graphicalViewer.setContents(root);
-  }
-  
-  protected void configureGraphicalViewer()
-  {
-    super.configureGraphicalViewer();
-    graphicalViewer.getKeyHandler().put(KeyStroke.getPressed(SWT.F2, 0), getActionRegistry().getAction(GEFActionConstants.DIRECT_EDIT));
-    // get edit part factory from extension
-    EditPartFactory editPartFactory = getEditorModeManager().getCurrentMode().getEditPartFactory();
-    graphicalViewer.setEditPartFactory(editPartFactory);   
-  }
-
-  public Object getAdapter(Class type)
-  {
-    if (type == org.eclipse.ui.views.properties.IPropertySheetPage.class)
-    {
-      XSDTabbedPropertySheetPage page = new XSDTabbedPropertySheetPage(this);
-      return page;
-    }
-    else if (type == ISelectionProvider.class)
-    {
-      return getSelectionManager();
-    }  
-    else if (type == XSDSchema.class)
-    {
-      return xsdSchema;
-    }
-    else if (type == IKeyboardDrag.class)
-    {
-      return new KeyboardDragImpl();
-    }
-    else if (type == IContentOutlinePage.class)
-    {
-      Object adapter = super.getAdapter(type);
-      if (adapter != null)
-      {
-        IContentOutlinePage page = (IContentOutlinePage) adapter;
-        fOutlineListener = new OutlineTreeSelectionChangeListener();
-        page.addSelectionChangedListener(fOutlineListener);
-        
-//        if (page instanceof ConfigurableContentOutlinePage)
-//        {
-//          ((ConfigurableContentOutlinePage) page).addDoubleClickListener(fOutlineListener);
-//        }
-        return page;
-      }
-    }
-    else if (type == XSDAttributeReferenceEditManager.class)
-    {
-    	IEditorInput editorInput = getEditorInput();
-    	if (editorInput instanceof IFileEditorInput)
-    	{
-    		IFileEditorInput fileEditorInput = (IFileEditorInput) editorInput;
-    		// TODO (cs) currently we assume the schema editor will only ever edit a
-    		// single schema
-    		/// but if we want to enable the schema editor to edit wsdl files we
-    		// should pass in
-    		// an array of schemas
-    		// hmm.. perhaps just pass in a ResourceSet
-    		XSDSchema[] schemas = {xsdSchema};
-    		return new XSDAttributeReferenceEditManager(fileEditorInput.getFile(), schemas);
-    	}
-    }
-    else if (type == XSDElementReferenceEditManager.class)
-    {
-      IEditorInput editorInput = getEditorInput();
-      if (editorInput instanceof IFileEditorInput)
-      {
-        IFileEditorInput fileEditorInput = (IFileEditorInput) editorInput;
-        // TODO (cs) currently we assume the schema editor will only ever edit a
-        // single schema
-        /// but if we want to enable the schema editor to edit wsdl files we
-        // should pass in
-        // an array of schemas
-        // hmm.. perhaps just pass in a ResourceSet
-        XSDSchema[] schemas = {xsdSchema};
-        return new XSDElementReferenceEditManager(fileEditorInput.getFile(), schemas);
-      }
-    }
-    else if (type == XSDTypeReferenceEditManager.class)
-    {
-      IEditorInput editorInput = getEditorInput();
-      if (editorInput instanceof IFileEditorInput)
-      {
-        IFileEditorInput fileEditorInput = (IFileEditorInput) editorInput;
-        // TODO (cs) currently we assume the schema editor will only ever edit a
-        // single schema
-        // but if we want to enable the schema editor to edit wsdl files we
-        // should pass in
-        // an array of schemas
-        // hmm.. perhaps just pass in a ResourceSet
-        XSDSchema[] schemas = {xsdSchema};
-        return new XSDTypeReferenceEditManager(fileEditorInput.getFile(), schemas);
-      }
-    }
-    else if (type == XSDComplexTypeBaseTypeEditManager.class)
-    {
-      IEditorInput editorInput = getEditorInput();
-      if (editorInput instanceof IFileEditorInput)
-      {
-        IFileEditorInput fileEditorInput = (IFileEditorInput) editorInput;
-        // TODO (cs) currently we assume the schema editor will only ever edit a
-        // single schema
-        // but if we want to enable the schema editor to edit wsdl files we
-        // should pass in
-        // an array of schemas
-        // hmm.. perhaps just pass in a ResourceSet
-        XSDSchema[] schemas = {xsdSchema};
-        return new XSDComplexTypeBaseTypeEditManager(fileEditorInput.getFile(), schemas);
-      }
-    }
-    else if (type == XSDSubstitutionGroupEditManager.class)
-    {
-      IEditorInput editorInput = getEditorInput();
-      if (editorInput instanceof IFileEditorInput)
-      {
-        IFileEditorInput fileEditorInput = (IFileEditorInput) editorInput;
-        XSDSchema[] schemas = {xsdSchema};
-        return new XSDSubstitutionGroupEditManager(fileEditorInput.getFile(), schemas);
-      }
-    }
-    else if (type == ITextEditor.class)
-    {
-      return getTextEditor();
-    }
-    else if (type == ISelectionMapper.class)
-    {
-      return new XSDSelectionMapper();
-    }
-    else if (type == IDocumentChangedNotifier.class)
-    {
-      return internalDocumentChangedNotifier;
-    }  
-    else if (type == ProductCustomizationProvider.class)
-    {
-      return XSDEditorPlugin.getPlugin().getProductCustomizationProvider();
-    }  
-    return super.getAdapter(type);
-  }
-
-  public String getContributorId()
-  {
-    return "org.eclipse.wst.xsd.ui.internal.editor"; //$NON-NLS-1$
-  }
-
-  public XSDSchema getXSDSchema()
-  {
-    return xsdSchema;
-  }
-
-  /**
-   * Method openOnGlobalReference. The comp argument is a resolved xsd schema
-   * object from another file. This is created and called from another schema
-   * model to allow F3 navigation to open a new editor and choose the referenced
-   * object within that editor context
-   * 
-   * @param comp
-   */
-  public void openOnGlobalReference(XSDConcreteComponent comp)
-  {
-    XSDConcreteComponent namedComponent = openOnSelectionHelper.openOnGlobalReference(comp);
-    
-    if (namedComponent == null)
-    {
-      namedComponent = getXSDSchema();
-    }
-    XSDBaseAdapter adapter = (XSDBaseAdapter) XSDAdapterFactory.getInstance().adapt(namedComponent);
-    getSelectionManager().setSelection(new StructuredSelection(adapter));
-    IAction action = getActionRegistry().getAction(SetInputToGraphView.ID);
-    if (action != null)
-    {
-      action.run();
-    }
-
-  }
-  
-  protected OpenOnSelectionHelper openOnSelectionHelper;
-
-  public OpenOnSelectionHelper getOpenOnSelectionHelper()
-  {
-    return openOnSelectionHelper;
-  }
-
-  /**
-   * Creates the pages of the multi-page editor.
-   */
-  protected void createPages()
-  {
-    super.createPages();
-    
-//    selectionProvider = getSelectionManager();
-//    getEditorSite().setSelectionProvider(selectionProvider);
-//    
-//    structuredTextEditor = new StructuredTextEditor();
-//    model = buildModel((IFileEditorInput) getEditorInput());
-//    createGraphPage();
-//    createSourcePage();
-
-    openOnSelectionHelper = new OpenOnSelectionHelper(getTextEditor(), getXSDSchema());
-
-    ISelectionProvider provider = getTextEditor().getSelectionProvider();
-    fSourceEditorSelectionListener = new SourceEditorSelectionListener();
-    if (provider instanceof IPostSelectionProvider)
-    {
-      ((IPostSelectionProvider) provider).addPostSelectionChangedListener(fSourceEditorSelectionListener);
-    }
-    else
-    {
-      provider.addSelectionChangedListener(fSourceEditorSelectionListener);
-    }
-    fXSDSelectionListener = new XSDSelectionManagerSelectionListener();
-    getSelectionManager().addSelectionChangedListener(fXSDSelectionListener);
-    
-    xsdPreferenceStoreListener = new XSDPreferenceStoreListener();
-    XSDEditorPlugin.getDefault().getPreferenceStore().addPropertyChangeListener(xsdPreferenceStoreListener);
-  }
-
-  protected class XSDPreferenceStoreListener implements IPropertyChangeListener
-  {
-    public void propertyChange(PropertyChangeEvent evt)
-    {
-      String property = evt.getProperty();
-      if (XSDEditorPlugin.CONST_SHOW_EXTERNALS.equals(property))
-      {
-        ((GraphicalEditPart) graphicalViewer.getContents()).getFigure().invalidateTree();
-        graphicalViewer.getContents().refresh();
-      }
-    }
-  }
-
-  public boolean isReadOnly()
-  {
-    IEditorInput editorInput = getEditorInput();
-    return !(editorInput instanceof IFileEditorInput || editorInput instanceof FileStoreEditorInput);
-  }
-  
-  protected void createActions()
-  {
-    super.createActions();
-    
-    ActionRegistry registry = getActionRegistry();
-    
-    // add an isReadOnly method to the editorPart instead
-    if (!isReadOnly())
-    {
-    BaseSelectionAction action = new AddFieldAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    registry.registerAction(action);
-    action = new DeleteAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    registry.registerAction(action);
-    
-    action = new DesignSelectAll(this);
-    action.setSelectionProvider(getSelectionManager());
-    registry.registerAction(action);
-    
-    action = new AddXSDRedefinedComplexTypeAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, Messages._UI_IMAGE_COMPLEX_TYPE));
-    registry.registerAction(action);
-    
-    action = new AddXSDRedefinedSimpleTypeAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, Messages._UI_IMAGE_SIMPLE_TYPE));
-    registry.registerAction(action);
-    
-    action = new AddXSDRedefinedAttributeGroupAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, Messages._UI_IMAGE_ATTRIBUTE_GROUP));
-    registry.registerAction(action);
-    
-    action = new AddXSDRedefinedModelGroupAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, Messages._UI_IMAGE_MODEL_GROUP));
-    registry.registerAction(action);
-    
-    action = new SetBaseTypeAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    registry.registerAction(action);
-    
-    action = new AddXSDElementAction(this, AddXSDElementAction.ID, Messages._UI_ACTION_ADD_ELEMENT, false);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDElement.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDElementAction(this, AddXSDElementAction.BEFORE_SELECTED_ID, Messages._UI_ACTION_BEFORE, false);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDElement.gif"));
-    registry.registerAction(action);       
-    
-    action = new AddXSDElementAction(this, AddXSDElementAction.AFTER_SELECTED_ID, Messages._UI_ACTION_AFTER, false);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDElement.gif"));
-    registry.registerAction(action);      
-    
-    action = new AddXSDElementAction(this, AddXSDElementAction.REF_ID, Messages._UI_ACTION_ADD_ELEMENT_REF, true);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDElementRef.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDModelGroupAction(this, XSDCompositor.SEQUENCE_LITERAL, AddXSDModelGroupAction.SEQUENCE_ID);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDSequence.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDModelGroupAction(this, XSDCompositor.CHOICE_LITERAL, AddXSDModelGroupAction.CHOICE_ID);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDChoice.gif"));
-    registry.registerAction(action);
-    
-    action = new AddXSDModelGroupAction(this, XSDCompositor.ALL_LITERAL, AddXSDModelGroupAction.ALL_ID);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAll.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDModelGroupDefinitionAction(this, false);
-    action.setId(AddXSDModelGroupDefinitionAction.MODELGROUPDEFINITION_ID);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDGroup.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDModelGroupDefinitionAction(this, true);
-    action.setId(AddXSDModelGroupDefinitionAction.MODELGROUPDEFINITIONREF_ID);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/obj16/XSDGroupRef.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDComplexTypeDefinitionAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDComplexType.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDSimpleTypeDefinitionAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDSimpleType.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDAttributeDeclarationAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAttribute.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDAttributeDeclarationAction(this, AddXSDAttributeDeclarationAction.BEFORE_SELECTED_ID, Messages._UI_ACTION_BEFORE, false);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAttribute.gif"));
-    registry.registerAction(action);
-    
-    action = new AddXSDAttributeDeclarationAction(this, AddXSDAttributeDeclarationAction.AFTER_SELECTED_ID, Messages._UI_ACTION_AFTER, false);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAttribute.gif"));
-    registry.registerAction(action);
-    
-    action = new AddXSDAttributeDeclarationAction(this, AddXSDAttributeDeclarationAction.REF_ID, Messages._UI_ACTION_ADD_ATTRIBUTE_REF, true);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAttributeRef.gif"));
-    registry.registerAction(action);
-
-    action = new OpenInNewEditor(this);
-    action.setSelectionProvider(getSelectionManager());
-    registry.registerAction(action);
-
-    action = new ShowPropertiesViewAction(this);
-    registry.registerAction(action);
-
-    action = new AddXSDAttributeGroupDefinitionAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAttributeGroup.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDAttributeGroupDefinitionAction(this, AddXSDAttributeGroupDefinitionAction.REF_ID);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAttributeGroupRef.gif"));
-    registry.registerAction(action);
-
-    action = new DeleteXSDConcreteComponentAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    registry.registerAction(action);
-
-    action = new AddXSDAnyElementAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAny.gif"));
-    registry.registerAction(action);
-    
-    action = new AddXSDAnyAttributeAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDAnyAttribute.gif"));
-    registry.registerAction(action);
-    
-    action = new AddXSDSchemaDirectiveAction(this, AddXSDSchemaDirectiveAction.INCLUDE_ID, Messages._UI_ACTION_ADD_INCLUDE);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDInclude.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDEnumerationFacetAction(this);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDSimpleEnum.gif"));
-    registry.registerAction(action);
-    
-    action = new AddXSDEnumerationFacetAction(this, AddXSDEnumerationFacetAction.BEFORE_SELECTED_ID, Messages._UI_ACTION_BEFORE);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDSimpleEnum.gif"));
-    registry.registerAction(action);       
-
-    action = new AddXSDEnumerationFacetAction(this, AddXSDEnumerationFacetAction.AFTER_SELECTED_ID, Messages._UI_ACTION_AFTER);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDSimpleEnum.gif"));
-    registry.registerAction(action);       
-
-    action = new AddXSDSchemaDirectiveAction(this, AddXSDSchemaDirectiveAction.IMPORT_ID, Messages._UI_ACTION_ADD_IMPORT);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDImport.gif"));
-    registry.registerAction(action);
-
-    action = new AddXSDSchemaDirectiveAction(this, AddXSDSchemaDirectiveAction.REDEFINE_ID, Messages._UI_ACTION_ADD_REDEFINE);
-    action.setSelectionProvider(getSelectionManager());
-    action.setImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/XSDRedefine.gif"));
-    registry.registerAction(action);
-    
-    SetTypeAction setNewComplexTypeAction = new SetTypeAction(Messages._UI_ACTION_NEW, SetTypeAction.SET_NEW_TYPE_ID, this);
-    setNewComplexTypeAction.setSelectionProvider(getSelectionManager());
-    
-    registry.registerAction(setNewComplexTypeAction);
-        
-    SetTypeAction setExistingTypeAction = new SetTypeAction(Messages._UI_ACTION_BROWSE, SetTypeAction.SELECT_EXISTING_TYPE_ID, this);
-    setExistingTypeAction.setSelectionProvider(getSelectionManager());
-    registry.registerAction(setExistingTypeAction);
-
-    addMultiplicityMenu(registry);
-    
-    PrintAction printAction = new PrintAction(this);
-    registry.registerAction(printAction);
-    
-    BaseDirectEditAction directEditAction = new BaseDirectEditAction(this);
-    directEditAction.setSelectionProvider(getSelectionManager());
-    registry.registerAction(directEditAction);
-    
-    }
-    else
-    {
-      BaseSelectionAction action = new OpenInNewEditor(this);
-      action.setSelectionProvider(getSelectionManager());
-      registry.registerAction(action);
-
-      action = new ShowPropertiesViewAction(this);
-      registry.registerAction(action);
-      
-      PrintAction printAction = new PrintAction(this);
-      registry.registerAction(printAction);
-    }
-  }
-  
-  protected void addMultiplicityMenu(ActionRegistry registry)
-  {
-    SetMultiplicityAction oneMultiplicity = new SetMultiplicityAction(this, "1..1 (" + Messages._UI_LABEL_REQUIRED + ")", SetMultiplicityAction.REQUIRED_ID); //$NON-NLS-1$ //$NON-NLS-2$
-    oneMultiplicity.setMaxOccurs(1);
-    oneMultiplicity.setMinOccurs(1);
-    oneMultiplicity.setSelectionProvider(getSelectionManager());
-    registry.registerAction(oneMultiplicity);
-
-    SetMultiplicityAction zeroOrMoreMultiplicity = new SetMultiplicityAction(this, "0..* (" + Messages._UI_LABEL_ZERO_OR_MORE + ")", SetMultiplicityAction.ZERO_OR_MORE_ID); //$NON-NLS-1$ //$NON-NLS-2$
-    zeroOrMoreMultiplicity.setMaxOccurs(-1);
-    zeroOrMoreMultiplicity.setMinOccurs(0);
-    zeroOrMoreMultiplicity.setSelectionProvider(getSelectionManager());
-    registry.registerAction(zeroOrMoreMultiplicity);
-    
-    SetMultiplicityAction zeroOrOneMultiplicity = new SetMultiplicityAction(this, "0..1 (" + Messages._UI_LABEL_OPTIONAL + ")", SetMultiplicityAction.ZERO_OR_ONE_ID); //$NON-NLS-1$ //$NON-NLS-2$
-    zeroOrOneMultiplicity.setMaxOccurs(1);
-    zeroOrOneMultiplicity.setMinOccurs(0);
-    zeroOrOneMultiplicity.setSelectionProvider(getSelectionManager());
-    registry.registerAction(zeroOrOneMultiplicity);
-
-    SetMultiplicityAction oneOrMoreMultiplicity = new SetMultiplicityAction(this, "1..* (" + Messages._UI_LABEL_ONE_OR_MORE + ")", SetMultiplicityAction.ONE_OR_MORE_ID); //$NON-NLS-1$ //$NON-NLS-2$
-    oneOrMoreMultiplicity.setMaxOccurs(-1);
-    oneOrMoreMultiplicity.setMinOccurs(1);
-    oneOrMoreMultiplicity.setSelectionProvider(getSelectionManager());
-    registry.registerAction(oneOrMoreMultiplicity);
-    
-  }
-
-  /**
-   * Listener on SSE's outline page's selections that converts DOM selections
-   * into xsd selections and notifies XSD selection manager
-   */
-  class OutlineTreeSelectionChangeListener implements ISelectionChangedListener, IDoubleClickListener
-  {
-    public OutlineTreeSelectionChangeListener()
-    {
-    }
-
-    private ISelection getXSDSelection(ISelection selection)
-    {
-      ISelection sel = null;
-      if (selection instanceof IStructuredSelection)
-      {
-        IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-        Object o = structuredSelection.getFirstElement();
-        if (o != null)
-        {
-          sel = new StructuredSelection(o);
-        }
-          
-      }
-      return sel;
-    }
-
-    /**
-     * Determines DOM node based on object (xsd node)
-     * 
-     * @param object
-     * @return
-     */
-    private Object getObjectForOtherModel(Object object)
-    {
-      Node node = null;
-      if (object instanceof Node)
-      {
-        node = (Node) object;
-      }
-      else if (object instanceof XSDComponent)
-      {
-        node = ((XSDComponent) object).getElement();
-      }
-      else if (object instanceof RedefineCategoryAdapter)
-      {
-        node = ((RedefineCategoryAdapter) object).getXSDRedefine().getElement();
-      }
-      else if (object instanceof CategoryAdapter)
-      {
-        node = ((CategoryAdapter) object).getXSDSchema().getElement();
-      }
-      else if (object instanceof XSDBaseAdapter)
-      {
-        if (((XSDBaseAdapter) object).getTarget() instanceof XSDConcreteComponent)
-        {
-          node = ((XSDConcreteComponent) ((XSDBaseAdapter) object).getTarget()).getElement();
-        }
-      }
-      // the text editor can only accept sed nodes!
-      //
-      if (!(node instanceof IDOMNode))
-      {
-        node = null;
-      }
-      return node;
-    }
-
-    public void doubleClick(DoubleClickEvent event)
-    {
-      /*
-       * Selection in outline tree changed so set outline tree's selection into
-       * editor's selection and say it came from outline tree
-       */
-      if (getSelectionManager() != null && getSelectionManager().getEnableNotify())
-      {
-        ISelection selection = getXSDSelection(event.getSelection());
-        if (selection != null)
-        {
-          getSelectionManager().setSelection(selection, fOutlinePage);
-        }
-        if (getTextEditor() != null && selection instanceof IStructuredSelection)
-        {
-          int start = -1;
-          int length = 0;
-          Object o = ((IStructuredSelection) selection).getFirstElement();
-          if (o != null)
-            o = getObjectForOtherModel(o);
-          if (o instanceof IndexedRegion)
-          {
-            start = ((IndexedRegion) o).getStartOffset();
-            length = ((IndexedRegion) o).getEndOffset() - start;
-          }
-          if (start > -1)
-          {
-            getTextEditor().selectAndReveal(start, length);
-          }
-        }
-      }
-    }
-
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-      /*
-       * Selection in outline tree changed so set outline tree's selection into
-       * editor's selection and say it came from outline tree
-       */
-      if (getSelectionManager() != null && getSelectionManager().getEnableNotify())
-      {
-        ISelection selection = getXSDSelection(event.getSelection());
-        if (selection != null)
-        {
-          getSelectionManager().setSelection(selection, fOutlinePage);
-        }
-      }
-    }
-  }
-  
- 
-  /**
-   * Listener on SSE's source editor's selections that converts DOM selections
-   * into xsd selections and notifies XSD selection manager
-   */
-  private class SourceEditorSelectionListener implements ISelectionChangedListener
-  {
-    /**
-     * Determines XSD node based on object (DOM node)
-     * 
-     * @param object
-     * @return
-     */
-    private Object getXSDNode(Object object)
-    {
-      // get the element node
-      Element element = null;
-      if (object instanceof Node)
-      {
-        Node node = (Node) object;
-        if (node != null)
-        {
-          if (node.getNodeType() == Node.ELEMENT_NODE)
-          {
-            element = (Element) node;
-          }
-          else if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-          {
-            element = ((Attr) node).getOwnerElement();
-          }
-          else if (node.getNodeType() == Node.PROCESSING_INSTRUCTION_NODE)
-          {
-            return model; 
-          }
-        }
-      }
-      Object o = element;
-      if (element != null)
-      {
-        Object modelObject = getXSDSchema().getCorrespondingComponent(element);
-        if (modelObject != null)
-        {
-          o = modelObject;
-          o = XSDAdapterFactory.getInstance().adapt((Notifier) modelObject);
-        }
-      }
-      return o;
-    }
-
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-      if (getSelectionManager().getEnableNotify() && getActivePage() == 1)
-      {
-        ISelection selection = event.getSelection();
-        if (selection instanceof IStructuredSelection)
-        {
-          List xsdSelections = new ArrayList();
-          for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();)
-          {
-            Object domNode = i.next();
-            Object xsdNode = getXSDNode(domNode);
-            if (xsdNode != null)
-            {
-              xsdSelections.add(xsdNode);
-            }
-            if (xsdNode instanceof XSDRedefineAdapter)
-            	return;
-          }
-          if (!xsdSelections.isEmpty())
-          {
-            StructuredSelection xsdSelection = new StructuredSelection(xsdSelections);
-            getSelectionManager().setSelection(xsdSelection, getTextEditor().getSelectionProvider());
-          }
-        }
-      }
-    }
-  }
-  /**
-   * Listener on XSD's selection manager's selections that converts XSD
-   * selections into DOM selections and notifies SSE's selection provider
-   */
-  private class XSDSelectionManagerSelectionListener implements ISelectionChangedListener
-  {
-    /**
-     * Determines DOM node based on object (xsd node)
-     * 
-     * @param object
-     * @return
-     */
-    private Object getObjectForOtherModel(Object object)
-    {
-      Node node = null;
-      if (object instanceof Node)
-      {
-        node = (Node) object;
-      }
-      else if (object instanceof XSDComponent)
-      {
-        node = ((XSDComponent) object).getElement();
-      }
-      else if (object instanceof RedefineCategoryAdapter)
-      {
-        RedefineCategoryAdapter category = (RedefineCategoryAdapter)object;
-        node = category.getXSDRedefine().getElement();
-      }
-      else if (object instanceof CategoryAdapter)
-      {
-        node = ((CategoryAdapter) object).getXSDSchema().getElement();
-      }
-      else if (object instanceof XSDBaseAdapter)
-      {
-        if (((XSDBaseAdapter) object).getTarget() instanceof XSDConcreteComponent)
-        {
-          node = ((XSDConcreteComponent) ((XSDBaseAdapter) object).getTarget()).getElement();
-        }
-      }
-      else if (object instanceof String)
-      {
-        // This case was added to make the F3/hyperlink navigation work when an
-        // inline schema from a WSDL document is opened in the schema editor.
-        // The string is expected to be a URI fragment used to identify an XSD
-        // component in the context of the enclosing WSDL resource.
-
-        String uriFragment = (String) object;
-        Resource resource = xsdSchema.eResource();
-        EObject modelObject = resource.getEObject(uriFragment);
-
-        if (modelObject != null && modelObject instanceof XSDComponent)
-        {
-          XSDComponent component = (XSDComponent) modelObject;
-          node = component.getElement();
-        }
-      }
-      
-      // the text editor can only accept sed nodes!
-      //
-      if (!(node instanceof IDOMNode))
-      {
-        node = null;
-      }
-      return node;
-    }
-
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-		// do not fire selection in source editor if the current active page is the InternalXSDMultiPageEditor (source)
-		// We only want to make source selections if the active page is either the outline or properties (a modify
-		// has been done via the outline or properties and not the source view).  We don't want to be selecting
-		// and unselecting things in the source when editing in the source!!
-    	boolean makeSelection = true;
-		if (PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage() != null) {
-			IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			if (page.getActivePart() instanceof InternalXSDMultiPageEditor) {
-				if (getActiveEditor() instanceof StructuredTextEditor) {
-					makeSelection = false;
-				}
-			}
-		}
-    	
-      // do not fire selection in source editor if selection event came
-      // from source editor
-      if (event.getSource() != getTextEditor().getSelectionProvider() && makeSelection)
-      {
-        ISelection selection = event.getSelection();
-        if (selection instanceof IStructuredSelection)
-        {
-          List otherModelObjectList = new ArrayList();
-          for (Iterator i = ((IStructuredSelection) selection).iterator(); i.hasNext();)
-          {
-            Object modelObject = i.next();
-            Object otherModelObject = getObjectForOtherModel(modelObject);
-            if (otherModelObject != null)
-            {
-              otherModelObjectList.add(otherModelObject);
-            }
-          }
-          if (!otherModelObjectList.isEmpty())
-          {
-            // here's an ugly hack... if we allow text selections to fire during
-            // SetInputToGraphView action we screw up the navigation history!
-            //            
-            //TODO (cs) ... we need to prevent the source editor from messing up the navigation history
-            //
-            if (getActivePage() == SOURCE_PAGE_INDEX)
-            {  
-              StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
-              getTextEditor().getSelectionProvider().setSelection(nodeSelection);
-            }  
-          }
-        }
-      }
-    }
-    
-    public void doSetSelection()
-    {
-      ISelection iSelection = getSelectionManager().getSelection();
-      if (iSelection != null)
-      {
-        Object firstElement = ((StructuredSelection)iSelection).getFirstElement();
-        Object otherModelObject = getObjectForOtherModel(firstElement);
-        if (otherModelObject != null)
-        {
-          StructuredSelection nodeSelection = new StructuredSelection(otherModelObject);
-          getTextEditor().getSelectionProvider().setSelection(nodeSelection);
-        }
-      }
-    }
-  }
-  
-  // Bug 145590.  Workaround to update source position when flipping to the source page.
-  // Unfortunately, this will still add an entry to the navigation history, but this
-  // behaviour is an improvement than without this change
-  boolean doUpdateSourceLocation = false;
-  protected void pageChange(int newPageIndex)
-  {
-    super.pageChange(newPageIndex);
-    doUpdateSourceLocation = newPageIndex == SOURCE_PAGE_INDEX;
-    if (doUpdateSourceLocation && fXSDSelectionListener != null)
-      fXSDSelectionListener.doSetSelection();
-
-  }
-  
-  public void propertyChanged(Object source, int propId)
-  {
-    switch (propId)
-    {
-      // when refactor rename while file is open in editor, need to reset
-      // editor contents to reflect new document
-      case IEditorPart.PROP_INPUT:
-      {
-        if (source == structuredTextEditor && xsdSchema != null)
-        {
-          IStructuredModel structuredModel = StructuredModelManager.getModelManager().getExistingModelForRead(getDocument());
-          try
-          {
-            if (structuredModel instanceof IDOMModel)
-            {
-              Document schemaDocument = xsdSchema.getDocument();
-              Document domModelDocument = ((IDOMModel)structuredModel).getDocument();
-              // if dom documents are not the same, they need to be reset
-              if (schemaDocument != domModelDocument)
-              {
-                XSDModelAdapter modelAdapter = null;
-                if (schemaDocument instanceof IDOMDocument)
-                {
-                  // save this model adapter for cleanup later
-                  modelAdapter = (XSDModelAdapter) ((IDOMDocument)schemaDocument).getExistingAdapter(XSDModelAdapter.class);
-                }
-                
-                // update multipage editor with new editor input
-                IEditorInput editorInput = structuredTextEditor.getEditorInput();
-                setInput(editorInput);
-                setPartName(editorInput.getName());
-                getCommandStack().markSaveLocation();
-                
-                // Now do the clean up model adapter
-                if (modelAdapter != null)
-                {
-                  modelAdapter.clear();
-                  modelAdapter = null;
-                }
-              }
-            }
-          }
-          finally
-          {
-            if (structuredModel != null)
-              structuredModel.releaseFromRead();
-          }
-        }
-        break;
-      }
-    }
-    super.propertyChanged(source, propId);
-  }
-
-  public INavigationLocation createEmptyNavigationLocation()
-  {
-    if (getActivePage() == 0)
-    {
-      return new DesignViewNavigationLocation(this);
-    }
-    else
-    {
-      return new MultiPageEditorTextSelectionNavigationLocation(getTextEditor(), false);
-    }
-  }
-
-  public INavigationLocation createNavigationLocation()
-  {
-    if (getActivePage() == DESIGN_PAGE_INDEX)
-    {
-      try
-      {
-        RootEditPart rootEditPart = graphicalViewer.getRootEditPart();
-        EditPart editPart = rootEditPart.getContents();
-        if (editPart instanceof RootContentEditPart)
-        {
-          RootContentEditPart rootContentEditPart = (RootContentEditPart)editPart;
-          Object input = rootContentEditPart.getInput();      
-          if (input instanceof Adapter)
-          {
-            XSDConcreteComponent concreteComponent = (XSDConcreteComponent)((Adapter)input).getTarget();
-            
-            Object object = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getAdapter(ProductCustomizationProvider.class);
-            if (object instanceof ProductCustomizationProvider)
-            {
-              ProductCustomizationProvider productCustomizationProvider = (ProductCustomizationProvider)object;
-              if (productCustomizationProvider != null)
-              {
-                return productCustomizationProvider.getNavigationLocation(this, concreteComponent, rootContentEditPart);
-              }
-            }
-            return new DesignViewNavigationLocation(this, concreteComponent);
-          }
-        }   
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-      return null;
-    }
-    else
-    {
-      return new MultiPageEditorTextSelectionNavigationLocation(getTextEditor(), true);
-    }
-  }
-  
-  
-  public void editorModeChanged(EditorMode newEditorMode)
-  {
-    //if (isInitializing)
-    //  return;
-    
-    EditPartFactory editPartFactory = newEditorMode.getEditPartFactory();
-    if (editPartFactory != null)
-    {  
-      graphicalViewer.setEditPartFactory(editPartFactory);
-      if (graphicalViewer instanceof DesignViewGraphicalViewer)
-      {  
-        DesignViewGraphicalViewer viewer = (DesignViewGraphicalViewer)graphicalViewer;  
-        IADTObject input = viewer.getInput();
-        viewer.setInput(null);
-        //viewer.getRootEditPart().refresh();
-       // viewer.getRootEditPart().getContents().refresh();
-        viewer.setInput(input);
-        
-        floatingToolbar.setEditPartFactory(editPartFactory);
-        floatingToolbar.setModel(getModel());
-        floatingToolbar.refresh(!(input instanceof IModel));
-        
-        Control control = graphicalViewer.getControl();
-        if (control instanceof Composite)
-        {
-          Composite parent = ((Composite)control).getParent();
-          parent.layout();
-        }
-      }
-    }  
-    IContentProvider provider = newEditorMode.getOutlineProvider();
-    if (provider != null)
-    {
-      ADTContentOutlinePage outline = (ADTContentOutlinePage)getContentOutlinePage();
-      if (outline != null)
-      {
-        TreeViewer treeViewer = outline.getTreeViewer();
-        if (treeViewer != null)
-        {      
-          outline.getTreeViewer().setContentProvider(provider);
-          outline.getTreeViewer().refresh();
-        }
-      }  
-    }  
-  }  
-  
-  private static final String DEFAULT_EDITOR_MODE_ID = "org.eclipse.wst.xsd.ui.defaultEditorModeId"; //$NON-NLS-1$
-  //private boolean isInitializing = false;
-  protected EditorModeManager createEditorModeManager()
-  {
-    final ProductCustomizationProvider productCustomizationProvider = (ProductCustomizationProvider)getAdapter(ProductCustomizationProvider.class);
-    EditorModeManager manager = new EditorModeManager(XSD_EDITOR_MODE_EXTENSION_ID)
-    {
-      public void init()
-      {
-        if (productCustomizationProvider == null || 
-            productCustomizationProvider.isEditorModeApplicable(TypeVizEditorMode.ID))
-        {  
-          addMode(new TypeVizEditorMode());
-        }  
-        super.init();                
-      }       
-      
-      protected EditorMode getDefaultMode()
-      {
-        String defaultModeId = XSDEditorPlugin.getPlugin().getPreferenceStore().getString(DEFAULT_EDITOR_MODE_ID);
-        if (defaultModeId != null)
-        {
-          EditorMode editorMode = getEditorMode(defaultModeId);
-          if (editorMode != null)
-          {
-            return editorMode;
-          }  
-        }               
-        return super.getDefaultMode();
-      }
-    };
-    manager.setProductCustomizationProvider(productCustomizationProvider);
-    return manager;
-  }
-  
-  protected void storeCurrentModePreference(String id)
-  {
-    XSDEditorPlugin.getPlugin().getPreferenceStore().setValue(DEFAULT_EDITOR_MODE_ID, id);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-   */
-  public void doSave(IProgressMonitor monitor)
-  {
-    XSDDirectivesManager.removeUnusedXSDImports(((XSDSchema)getAdapter(XSDSchema.class)));
-    super.doSave(monitor);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.part.EditorPart#doSaveAs()
-   */
-  public void doSaveAs()
-  {
-    // When performing a save as, the document changes.   Our model state listeners should listen
-    // to the new document.
-    
-    // First get the current document
-    IDocument currentDocument = getDocument();
-    XSDModelAdapter modelAdapter = null;
-    IDOMDocument doc = null;
-    if (currentDocument != null)
-    {
-      IStructuredModel structuredModel = StructuredModelManager.getModelManager().getExistingModelForRead(currentDocument);
-      if (structuredModel != null)
-      {
-        try
-        {
-          if ((structuredModel != null) && (structuredModel instanceof IDOMModel))
-          {
-            // Get the associated IDOMDocument model
-            doc = ((IDOMModel) structuredModel).getDocument();
-            // and now get our adapter that listens to DOM changes
-            if (doc != null)
-            {
-              modelAdapter = (XSDModelAdapter) doc.getExistingAdapter(XSDModelAdapter.class);
-            }
-          }
-        }
-        finally
-        {
-          structuredModel.releaseFromRead();
-        }
-      }
-    }
-    
-    IEditorInput editorInput = structuredTextEditor.getEditorInput();
-    // perform save as
-    structuredTextEditor.doSaveAs();
-    // if saveAs cancelled then don't setInput because the input hasn't change
-    // See AbstractDecoratedTextEditor's performSaveAs
-    if (editorInput != structuredTextEditor.getEditorInput())
-    {
-      setInput(structuredTextEditor.getEditorInput());
-      setPartName(structuredTextEditor.getEditorInput().getName());
-    
-      getCommandStack().markSaveLocation();
-   
-      // Now do the clean up on the old document
-      if (modelAdapter != null)
-      {
-        // clear out model adapter
-        modelAdapter.clear();
-        modelAdapter = null;
-      }
-    }
-  }
-  
-  protected void doPostEditorOpenTasks() 
-  {
-		// Bug 204868: do the selection after the editor part is created, so that 
-		// AbstractTextEditor.markInNavigationHistory() won't cause the creation 
-        // of its own editor part.
-		// Select the schema to show the properties
-		getSelectionManager().setSelection(new StructuredSelection(getModel()));
-  }
-}  
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/KeyboardDragImpl.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/KeyboardDragImpl.java
deleted file mode 100644
index c0fc8e3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/KeyboardDragImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.IKeyboardDrag;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.commands.BaseDragAndDropCommand;
-import org.eclipse.wst.xsd.ui.internal.commands.XSDAttributeDragAndDropCommand;
-import org.eclipse.wst.xsd.ui.internal.commands.XSDElementDragAndDropCommand;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDBaseFieldEditPart;
-import org.eclipse.xsd.XSDWildcard;
-
-public class KeyboardDragImpl implements IKeyboardDrag
-{
-  public void performKeyboardDrag(GraphicalEditPart movingElement, int direction)
-  {
-    KeyBoardAccessibilityEditPolicy policy = (KeyBoardAccessibilityEditPolicy) movingElement.getEditPolicy(KeyBoardAccessibilityEditPolicy.KEY);
-
-    EditPart rightElement = policy.getRelativeEditPart(movingElement, direction);
-    policy = (KeyBoardAccessibilityEditPolicy) rightElement.getEditPolicy(KeyBoardAccessibilityEditPolicy.KEY);
-    EditPart leftElement = (policy != null) ? policy.getRelativeEditPart(rightElement, direction) : null;
-
-    // TODO: add support for extenders
-    if (!(movingElement instanceof XSDBaseFieldEditPart)) return;
-    
-    XSDBaseFieldEditPart movingField = (XSDBaseFieldEditPart) movingElement;
-    XSDBaseFieldEditPart leftField = (XSDBaseFieldEditPart) leftElement;
-    XSDBaseFieldEditPart rightField = (XSDBaseFieldEditPart) rightElement;
-    
-    Object movingObject = movingField.getModel();
-    
-    BaseDragAndDropCommand command = null;
-    if (movingObject instanceof XSDElementDeclarationAdapter || movingObject instanceof XSDWildcard)
-    {
-      command = new XSDElementDragAndDropCommand(movingField, leftField, rightField, direction);
-    }
-    else if (movingObject instanceof XSDAttributeDeclarationAdapter)
-    {
-      command = new XSDAttributeDragAndDropCommand(movingField, leftField, rightField, direction);
-    }
-    
-    if (command != null && command.canExecute())
-    {
-      command.execute();
-      // This is to reselect the moved item
-      try
-      {
-        IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        if (editor != null && editor.getAdapter(ISelectionProvider.class) != null)
-        {
-          ISelectionProvider provider = (ISelectionProvider) editor.getAdapter(ISelectionProvider.class);
-          if (provider != null)
-          {
-            provider.setSelection(new StructuredSelection(movingElement.getModel()));
-          }
-        }
-      }
-      catch (Exception e)
-      {
-
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/Logger.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/Logger.java
deleted file mode 100644
index 4127452..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/Logger.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.Bundle;
-
-/**
- * Small convenience class to log messages to plugin's log file and also, if
- * desired, the console. This class should only be used by classes in this
- * plugin. Other plugins should make their own copy, with appropriate ID.
- */
-public class Logger {
-	private static final String PLUGIN_ID = "org.eclipse.wst.xsd.ui"; //$NON-NLS-1$
-	
-	public static final int ERROR = IStatus.ERROR; // 4
-	public static final int ERROR_DEBUG = 200 + ERROR;
-	public static final int INFO = IStatus.INFO; // 1
-	public static final int INFO_DEBUG = 200 + INFO;
-
-	public static final int OK = IStatus.OK; // 0
-
-	public static final int OK_DEBUG = 200 + OK;
-
-	private static final String TRACEFILTER_LOCATION = "/debug/tracefilter"; //$NON-NLS-1$
-	public static final int WARNING = IStatus.WARNING; // 2
-	public static final int WARNING_DEBUG = 200 + WARNING;
-
-	/**
-	 * Adds message to log.
-	 * 
-	 * @param level
-	 *            severity level of the message (OK, INFO, WARNING, ERROR,
-	 *            OK_DEBUG, INFO_DEBUG, WARNING_DEBUG, ERROR_DEBUG)
-	 * @param message
-	 *            text to add to the log
-	 * @param exception
-	 *            exception thrown
-	 */
-	protected static void _log(int level, String message, Throwable exception) {
-		if (level == OK_DEBUG || level == INFO_DEBUG || level == WARNING_DEBUG || level == ERROR_DEBUG) {
-			if (!isDebugging())
-				return;
-		}
-
-		int severity = IStatus.OK;
-		switch (level) {
-			case INFO_DEBUG :
-			case INFO :
-				severity = IStatus.INFO;
-				break;
-			case WARNING_DEBUG :
-			case WARNING :
-				severity = IStatus.WARNING;
-				break;
-			case ERROR_DEBUG :
-			case ERROR :
-				severity = IStatus.ERROR;
-		}
-		message = (message != null) ? message : "null"; //$NON-NLS-1$
-		Status statusObj = new Status(severity, PLUGIN_ID, severity, message, exception);
-		Bundle bundle = Platform.getBundle(PLUGIN_ID);
-		if (bundle != null) 
-			Platform.getLog(bundle).log(statusObj);
-	}
-
-	/**
-	 * Prints message to log if category matches /debug/tracefilter option.
-	 * 
-	 * @param message
-	 *            text to print
-	 * @param category
-	 *            category of the message, to be compared with
-	 *            /debug/tracefilter
-	 */
-	protected static void _trace(String category, String message, Throwable exception) {
-		if (isTracing(category)) {
-			message = (message != null) ? message : "null"; //$NON-NLS-1$
-			Status statusObj = new Status(IStatus.OK, PLUGIN_ID, IStatus.OK, message, exception);
-			Bundle bundle = Platform.getBundle(PLUGIN_ID);
-			if (bundle != null) 
-				Platform.getLog(bundle).log(statusObj);
-		}
-	}
-
-	/**
-	 * @return true if the platform is debugging
-	 */
-	public static boolean isDebugging() {
-		return Platform.inDebugMode();
-	}
-
-	/**
-	 * Determines if currently tracing a category
-	 * 
-	 * @param category
-	 * @return true if tracing category, false otherwise
-	 */
-	public static boolean isTracing(String category) {
-		if (!isDebugging())
-			return false;
-
-		String traceFilter = Platform.getDebugOption(PLUGIN_ID + TRACEFILTER_LOCATION);
-		if (traceFilter != null) {
-			StringTokenizer tokenizer = new StringTokenizer(traceFilter, ","); //$NON-NLS-1$
-			while (tokenizer.hasMoreTokens()) {
-				String cat = tokenizer.nextToken().trim();
-				if (category.equals(cat)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	public static void log(int level, String message) {
-		_log(level, message, null);
-	}
-
-	public static void log(int level, String message, Throwable exception) {
-		_log(level, message, exception);
-	}
-
-	public static void logException(String message, Throwable exception) {
-		_log(ERROR, message, exception);
-	}
-
-	public static void logException(Throwable exception) {
-		_log(ERROR, exception.getMessage(), exception);
-	}
-
-	public static void trace(String category, String message) {
-		_trace(category, message, null);
-	}
-
-	public static void traceException(String category, String message, Throwable exception) {
-		_trace(category, message, exception);
-	}
-
-	public static void traceException(String category, Throwable exception) {
-		_trace(category, exception.getMessage(), exception);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/Messages.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/Messages.java
deleted file mode 100644
index 20a5da9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/Messages.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver, Standards for Technology in Automotive Retail, bug 1147033
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS
-{
-  static 
-  {
-    NLS.initializeMessages("org.eclipse.wst.xsd.ui.internal.editor.messages", Messages.class); //$NON-NLS-1$
-  }
-
-  public Messages()
-  {
-    super();
-  }
-  
-  public static String UI_LABEL_BASE_TYPE;
-  public static String UI_LABEL_DERIVED_BY;
-  public static String UI_LABEL_INHERIT_FROM;
-  public static String UI_LABEL_INHERIT_BY;
-  public static String UI_LABEL_DOCUMENTATION;
-  public static String UI_LABEL_APP_INFO;
-  public static String UI_LABEL_SET_TYPE;
-  public static String UI_LABEL_TYPE;
-  public static String UI_LABEL_NAME;
-  public static String UI_LABEL_KIND;
-  public static String UI_LABEL_MINOCCURS;
-  public static String UI_LABEL_MAXOCCURS;
-  public static String UI_NO_TYPE;
-  public static String UI_PAGE_HEADING_REFERENCE;
-  public static String UI_LABEL_READ_ONLY;
-  public static String UI_LABEL_COMPONENTS;
-
-  public static String _UI_GRAPH_TYPES;
-  public static String _UI_GRAPH_REDEFINE_TYPES;
-  public static String _UI_GRAPH_ELEMENTS;
-  public static String _UI_GRAPH_ATTRIBUTES;
-  public static String _UI_GRAPH_ATTRIBUTE_GROUPS;
-  public static String _UI_GRAPH_REDEFINE_ATTRIBUTE_GROUPS;
-  public static String _UI_GRAPH_NOTATIONS;
-  public static String _UI_GRAPH_IDENTITY_CONSTRAINTS;
-  public static String _UI_GRAPH_ANNOTATIONS;
-  public static String _UI_GRAPH_DIRECTIVES;
-  public static String _UI_GRAPH_GROUPS;
-  public static String _UI_GRAPH_REDEFINE_GROUPS;
-  
-  public static String _UI_LABEL_NO_LOCATION_SPECIFIED;
-  public static String _UI_NO_TYPE_DEFINED;
-  public static String _UI_ACTION_UPDATE_NAME;
-  public static String _UI_LABEL_ABSENT;
-  public static String _UI_ACTION_ADD_FIELD;
-  public static String _UI_ACTION_SET_MULTIPLICITY;
-  public static String _UI_LABEL_OPTIONAL;
-  public static String _UI_LABEL_ZERO_OR_MORE;
-  public static String _UI_LABEL_ONE_OR_MORE;
-  public static String _UI_LABEL_REQUIRED;
-  public static String _UI_LABEL_ARRAY;
-  public static String _UI_ACTION_SET_TYPE;
-  public static String _UI_LABEL_LOCAL_TYPE;
-  
-  public static String _UI_GRAPH_UNKNOWN_OBJECT;
-  public static String _UI_GRAPH_XSDSCHEMA;
-  public static String _UI_GRAPH_XSDSCHEMA_NO_NAMESPACE;
-  public static String _UI_LABEL_SET_COMMON_BUILT_IN_TYPES;
-  public static String _UI_LABEL_SELECT_TYPES_FILTER_OUT;
-  public static String _UI_LABEL_NEW_TYPE;
-  public static String _UI_VALUE_NEW_TYPE;  
-  public static String _UI_LABEL_COMPLEX_TYPE;
-  public static String _UI_LABEL_SIMPLE_TYPE;
-  public static String _UI_LABEL_NEW_ELEMENT;
-  public static String _UI_LABEL_NEW_ATTRIBUTE;
-  public static String _UI_MENU_XSD_EDITOR;
-  public static String _UI_LABEL_SOURCE;
-  public static String _UI_ACTION_BEFORE;
-  public static String _UI_ACTION_AFTER;
-  public static String _UI_ACTION_ADD_ELEMENT;
-  public static String _UI_ACTION_INSERT_ELEMENT;
-  public static String _UI_ACTION_ADD_ELEMENT_REF;
-  public static String _UI_ACTION_NEW;
-  public static String _UI_ACTION_BROWSE;
-  public static String _UI_ACTION_UPDATE_ELEMENT_REFERENCE;
-  public static String _UI_ACTION_UPDATE_ATTRIBUTE_REFERENCE;
-  public static String _UI_LABEL_TARGET_NAMESPACE;
-  public static String _UI_LABEL_NO_NAMESPACE;
-  public static String _UI_ACTION_ADD_COMPLEX_TYPE;
-  public static String _UI_ACTION_ADD_SIMPLE_TYPE;
-  public static String _UI_LABEL_NAME_SEARCH_FILTER_TEXT;
-  public static String _UI_LABEL_ELEMENTS_COLON;
-  public static String _UI_LABEL_ATTRIBUTES_COLON;
-  public static String _UI_LABEL_ATTRIBUTES_PROCESSCONTENTS;
-  public static String _UI_LABEL_ATTRIBUTES_NAMESPACE;
-  public static String _UI_LABEL_SET_ELEMENT_REFERENCE;
-  public static String _UI_LABEL_SET_ATTRIBUTE_REFERENCE;
-  public static String _UI_LABEL_REDEFINE_COMPONENT;
-  public static String _UI_LABEL_TYPES_COLON;
-  public static String _UI_LABEL_SET_TYPE;
-
-  public static String _UI_TEXT_INDENT_LABEL;
-  public static String _UI_TEXT_INDENT_SPACES_LABEL; 
-  public static String _UI_TEXT_XSD_NAMESPACE_PREFIX;
-  public static String _UI_TEXT_XSD_DEFAULT_PREFIX;
-  public static String _UI_QUALIFY_XSD;
-  public static String _UI_TEXT_XSD_DEFAULT_TARGET_NAMESPACE;
-  public static String _UI_VALIDATING_FILES;
-  public static String _UI_FULL_CONFORMANCE;
-  public static String _UI_TEXT_HONOUR_ALL_SCHEMA_LOCATIONS;
-  
-  public static String _ERROR_LABEL_INVALID_PREFIX;
-  public static String _UI_ACTION_ADD_INCLUDE;
-  public static String _UI_ACTION_ADD_IMPORT;
-  public static String _UI_ACTION_ADD_REDEFINE;
-  public static String _UI_ACTION_ADD_ATTRIBUTE;
-  public static String _UI_ACTION_INSERT_ATTRIBUTE;
-  public static String _UI_ACTION_ADD_ATTRIBUTE_REF;
-  public static String _UI_ACTION_DRAG_DROP_ELEMENT;
-  public static String _UI_ACTION_DRAG_DROP_ATTRIBUTE;
-  public static String _UI_ACTION_REDEFINE_COMPLEX_TYPE;
-  public static String _UI_ACTION_REDEFINE_SIMPLE_TYPE;
-  public static String _UI_ACTION_REDEFINE_ATTRIBUTE_GROUP;
-  public static String _UI_ACTION_REDEFINE_MODEL_GROUP;
-  
-  public static String _UI_IMAGE_COMPLEX_TYPE;
-  public static String _UI_IMAGE_SIMPLE_TYPE;
-  public static String _UI_IMAGE_MODEL_GROUP;
-  public static String _UI_IMAGE_ATTRIBUTE_GROUP;
-
-  // TODO: TO REMOVE
-  public static String _UI_LABEL_ELEMENTFORMDEFAULT;
-  // TODO: TO REMOVE
-  public static String _UI_LABEL_ATTRIBUTEFORMDEFAULT;
-  public static String _UI_LABEL_CREATE_ANON_TYPE;  
-  public static String _UI_XML_TEXT_EDITOR_PREFS_LINK;
-  public static String _UI_XML_VALIDATOR_PREFS_LINK;
-  
-  public static String _UI_TEXT_ENABLE_AUTO_IMPORT_CLEANUP;
-  public static String _UI_TEXT_ENABLE_AUTO_OPEN_SCHEMA_DIALOG;
-  public static String _UI_GRAPH_REDEFINE_SCHEMA;
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/SourcePageActionContributor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/SourcePageActionContributor.java
deleted file mode 100644
index d85ed36..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/SourcePageActionContributor.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML;
-
-
-/**
- * SourcePageActionContributor
- * 
- * This class is for multi page editor's source page contributor.
- *
- * 
- */
-public class SourcePageActionContributor extends ActionContributorXML {
-
-	private IActionBars fBars;
-
-	/**
-	 * This method calls:
-	 * <ul>
-	 *  <li><code>contributeToMenu</code> with <code>bars</code>' menu manager</li>
-	 *  <li><code>contributeToToolBar</code> with <code>bars</code>' tool bar
-	 *    manager</li>
-	 *  <li><code>contributeToStatusLine</code> with <code>bars</code>' status line
-	 *    manager</li>
-	 * </ul>
-	 * The given action bars are also remembered and made accessible via 
-	 * <code>getActionBars</code>.
-	 * 
-	 * @param bars the action bars
-	 * 
-	 */
-	public void init(IActionBars bars) {
-		fBars = bars;
-		contributeToMenu(bars.getMenuManager());
-		contributeToToolBar(bars.getToolBarManager());
-		contributeToStatusLine(bars.getStatusLineManager());
-	}
-
-	/**
-	 * Returns this contributor's action bars.
-	 *
-	 * @return the action bars
-	 */
-	public IActionBars getActionBars() {
-		return fBars;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/StructuredTextViewerConfigurationXSD.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/StructuredTextViewerConfigurationXSD.java
deleted file mode 100644
index 62ac66b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/StructuredTextViewerConfigurationXSD.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.Map;
-
-import org.eclipse.jface.text.source.ISourceViewer;
-import org.eclipse.wst.xml.ui.StructuredTextViewerConfigurationXML;
-
-/**
- * Configuration for editing XSD content type
- */
-public class StructuredTextViewerConfigurationXSD extends StructuredTextViewerConfigurationXML {
-	protected Map getHyperlinkDetectorTargets(ISourceViewer sourceViewer) {
-		Map targets = super.getHyperlinkDetectorTargets(sourceViewer);
-		targets.put("org.eclipse.wst.xsd.core.xsdsource", null);  //$NON-NLS-1$
-		return targets;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDAttributeReferenceEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDAttributeReferenceEditManager.java
deleted file mode 100644
index df4cab6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDAttributeReferenceEditManager.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDAttributeDeclarationCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeReferenceAndManagerDirectivesCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeReferenceCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.dialogs.NewAttributeDialog;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDAttributeReferenceEditManager extends XSDElementReferenceEditManager implements ComponentReferenceEditManager
-{
-  public XSDAttributeReferenceEditManager(IFile currentFile, XSDSchema[] schemas)
-  {
-    super(currentFile, schemas);
-  }
-
-  public IComponentDialog getBrowseDialog()
-  {
-    XSDSearchListDialogDelegate dialogDelegate = 
-      new XSDSearchListDialogDelegate(XSDSearchListDialogDelegate.ATTRIBUTE_META_NAME, currentFile, schemas);
-    return dialogDelegate;
-  }
-
-  public IComponentDialog getNewDialog()
-  {
-    if (schemas.length > 0) {
-      return new NewAttributeDialog(schemas[0]);
-    }
-    else {
-      return new NewAttributeDialog();
-    }
-  }
-
-  public void modifyComponentReference(Object referencingObject, ComponentSpecification referencedComponent)
-  {
-    XSDAttributeDeclaration concreteComponent = null;
-    if (referencingObject instanceof Adapter)
-    {
-      Adapter adapter = (Adapter)referencingObject;
-      if (adapter.getTarget() instanceof XSDAttributeDeclaration)
-      {
-        concreteComponent = (XSDAttributeDeclaration)adapter.getTarget();
-      }
-    }
-    else if (referencingObject instanceof XSDConcreteComponent)
-    {
-      concreteComponent = (XSDAttributeDeclaration) referencingObject;
-    }
-    if (concreteComponent != null)
-    {
-        if (referencedComponent.isNew())
-        {  
-          XSDAttributeDeclaration attributeDec = null;
-          if (referencedComponent.getMetaName() == IXSDSearchConstants.ATTRIBUTE_META_NAME)
-          {  
-            AddXSDAttributeDeclarationCommand command = new AddXSDAttributeDeclarationCommand(Messages._UI_ACTION_ADD_ATTRIBUTE, concreteComponent.getSchema());
-            command.setNameToAdd(referencedComponent.getName());
-            command.execute();
-            attributeDec = (XSDAttributeDeclaration) command.getAddedComponent();
-          }
-          if (attributeDec != null)
-          {
-            Command command = new UpdateAttributeReferenceCommand(Messages._UI_ACTION_UPDATE_ATTRIBUTE_REFERENCE, concreteComponent, attributeDec);
-            command.execute();
-          }
-          XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-        }  
-        else
-        {
-          Command command = new UpdateAttributeReferenceAndManagerDirectivesCommand(concreteComponent, referencedComponent.getName(), referencedComponent.getQualifier(), referencedComponent.getFile());
-          command.setLabel(Messages._UI_ACTION_UPDATE_ATTRIBUTE_REFERENCE);
-          command.execute();
-        }  
-      }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDComplexTypeBaseTypeEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDComplexTypeBaseTypeEditManager.java
deleted file mode 100644
index 002aa76..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDComplexTypeBaseTypeEditManager.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDComplexTypeDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDSimpleTypeDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.SetBaseTypeAndManagerDirectivesCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.SetBaseTypeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDComplexTypeBaseTypeEditManager extends XSDTypeReferenceEditManager
-{
-  public XSDComplexTypeBaseTypeEditManager(IFile currentFile, XSDSchema[] schemas)
-  {
-    super(currentFile, schemas);
-  }
-
-  public ComponentSpecification[] getQuickPicks()
-  {
-    return super.getQuickPicks();
-  }
-  
-  public IComponentDialog getBrowseDialog()
-  {
-    XSDSearchListDialogDelegate dialogDelegate = new XSDSearchListDialogDelegate(XSDSearchListDialogDelegate.TYPE_META_NAME, currentFile, schemas);
-    return dialogDelegate;
-  }
-
-  // TODO common this up
-  public void modifyComponentReference(Object referencingObject, ComponentSpecification component)
-  {
-    XSDConcreteComponent concreteComponent = null;
-    if (referencingObject instanceof Adapter)
-    {
-      Adapter adpater = (Adapter)referencingObject;
-      if (adpater.getTarget() instanceof XSDConcreteComponent)
-      {
-        concreteComponent = (XSDConcreteComponent)adpater.getTarget();
-      }
-    }
-    else if (referencingObject instanceof XSDConcreteComponent)
-    {
-      concreteComponent = (XSDConcreteComponent) referencingObject;
-    }
-    
-    if (concreteComponent instanceof XSDComplexTypeDefinition)
-    {
-      if (component.isNew())
-      {  
-        XSDTypeDefinition td = null;
-        if (component.getMetaName() == IXSDSearchConstants.COMPLEX_TYPE_META_NAME)
-        {  
-          AddXSDComplexTypeDefinitionCommand command = new AddXSDComplexTypeDefinitionCommand(Messages._UI_ACTION_ADD_COMPLEX_TYPE, concreteComponent.getSchema());
-          command.setNameToAdd(component.getName());
-          command.execute();
-          td = command.getCreatedComplexType();
-        }
-        else
-        {
-          AddXSDSimpleTypeDefinitionCommand command = new AddXSDSimpleTypeDefinitionCommand(Messages._UI_ACTION_ADD_SIMPLE_TYPE, concreteComponent.getSchema());
-          command.setNameToAdd(component.getName());
-          command.execute();
-          td = command.getCreatedSimpleType();
-        }  
-        if (td != null)
-        {
-          Command command = new SetBaseTypeCommand(concreteComponent, td);
-          command.execute();
-        }
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }  
-      else
-      {  
-        Command command = new SetBaseTypeAndManagerDirectivesCommand(concreteComponent, component.getName(), component.getQualifier(), component.getFile());
-        command.setLabel(Messages._UI_ACTION_SET_BASE_TYPE);
-        command.execute();
-      }
-    }
-    else if (concreteComponent instanceof XSDSimpleTypeDefinition)
-    {
-      if (component.isNew())
-      {  
-        XSDTypeDefinition td = null;
-        if (component.getMetaName() == IXSDSearchConstants.SIMPLE_TYPE_META_NAME)
-        {  
-          AddXSDSimpleTypeDefinitionCommand command = new AddXSDSimpleTypeDefinitionCommand(Messages._UI_ACTION_ADD_SIMPLE_TYPE, concreteComponent.getSchema());
-          command.setNameToAdd(component.getName());
-          command.execute();
-          td = command.getCreatedSimpleType();
-        }
-        if (td != null)
-        {
-          Command command = new SetBaseTypeCommand(concreteComponent, td);
-          command.execute();
-        }
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }  
-      else
-      {  
-        Command command = new SetBaseTypeAndManagerDirectivesCommand(concreteComponent, component.getName(), component.getQualifier(), component.getFile());
-        command.execute();
-      }
-    }
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorCSHelpIds.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorCSHelpIds.java
deleted file mode 100644
index 332e199..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorCSHelpIds.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-/**
- * 
- * Context Sensitive Help IDs
- *
- */
-public class XSDEditorCSHelpIds
-{
-  public static final String PLUGIN_NAME = "org.eclipse.wst.xsd.ui";
-  
-  public static final String REGEX_WIZARD_PAGE = PLUGIN_NAME + ".xsduw0010";
-  public static final String REGEX_TOKEN_CONTENTS = PLUGIN_NAME + ".xsduw0020";
-  public static final String REGEX_JUST_ONCE = PLUGIN_NAME + ".xsduw0030";
-  public static final String REGEX_ZERO_OR_MORE = PLUGIN_NAME + ".xsduw0040";
-  public static final String REGEX_ONE_OR_MORE = PLUGIN_NAME + ".xsduw0050";
-  public static final String REGEX_OPTIONAL = PLUGIN_NAME + ".xsduw0060";
-  public static final String REGEX_REPEAT_RADIO = PLUGIN_NAME + ".xsduw0070";
-  public static final String REGEX_RANGE_RADIO = PLUGIN_NAME + ".xsduw0080";
-  public static final String REGEX_REPEAT_FIELD = PLUGIN_NAME + ".xsduw0090";
-  public static final String REGEX_RANGE_MINIMUM_FIELD = PLUGIN_NAME + ".xsduw0100";
-  public static final String REGEX_RANGE_MAXIMUM_FIELD = PLUGIN_NAME + ".xsduw0110";
-  public static final String REGEX_ADD_BUTTON = PLUGIN_NAME + ".xsduw0120";
-  public static final String REGEX_CURRENT_VALUE = PLUGIN_NAME + ".xsduw0130";
-  
-  public static final String REGEX_TEST_PAGE = PLUGIN_NAME + ".xsduw0200";
-  public static final String REGEX_SAMPLE_TEXT = PLUGIN_NAME + ".xsduw0210";
-  
-  public static final String RENAME_NEW_NAME = PLUGIN_NAME + ".xsduw0300";
-  public static final String RENAME_UPDATE_REFERENCES = PLUGIN_NAME + ".xsduw0310";
-  
-  public static final String NEWTYPE_COMPLEXTYPE = PLUGIN_NAME + ".xsdud0010";
-  public static final String NEWTYPE_SIMPLETYPE = PLUGIN_NAME + ".xsdud0020";
-  public static final String NEWTYPE_NAME = PLUGIN_NAME + ".xsdud0030";
-  
-  public static final String SETTYPE_NAME = PLUGIN_NAME + ".xsdud0050"; // these 3 are in common.ui
-  public static final String SETTYPE_TYPES = PLUGIN_NAME + ".xsdud0060";
-  public static final String SETTYPE_SEARCHSCOPES = PLUGIN_NAME + ".xsdud0070";
-  
-  public static final String ADD_ENUMERATIONS__NO_NAME = PLUGIN_NAME + ".xsdud0090";
-  public static final String ADD_ENUMERATIONS__DELIMITER_CHARS = PLUGIN_NAME + ".xsdud0100";
-  public static final String ADD_ENUMERATIONS__PRESERVE_LEAD_AND_TRAIL_WHITESPACES = PLUGIN_NAME + ".xsdud0110";
-  
-  public static final String ADD_EXTENSIONS_COMPONENTS__EXTENSION_CATEGORIES = PLUGIN_NAME + ".xsdud0130";
-  public static final String ADD_EXTENSIONS_COMPONENTS__AVAILABLE_COMPONENTS_TO_ADD = PLUGIN_NAME + ".xsdud0140";
-  public static final String ADD_EXTENSIONS_COMPONENTS__ADD = PLUGIN_NAME + ".xsdud0150";
-  public static final String ADD_EXTENSIONS_COMPONENTS__DELETE = PLUGIN_NAME + ".xsdud0160";
-  public static final String ADD_EXTENSIONS_COMPONENTS__EDIT = PLUGIN_NAME + ".xsdud0170";
-  
-  public static final String ADD_CATEGORY__NAME = PLUGIN_NAME + ".xsdud0190";
-  public static final String ADD_CATEGORY__SCHEMA = PLUGIN_NAME + ".xsdud0200"; // can't invoke help, this is a CLabel, not text Field
-  
-  public static final String XML_CATALOG_ENTRIES__ENTRIES_TREELIST = PLUGIN_NAME + ".xsdud0220";
-  public static final String XML_CATALOG_ENTRIES__DETAILS = PLUGIN_NAME + ".xsdud0230";
-  
-  public static final String XMLSCHEMAFILES_PREFERENCES__QUALIFY_XMLSCHEMA_LANGUAGE_CONSTRUCTS = PLUGIN_NAME + ".xsduf0010";
-  public static final String XMLSCHEMAFILES_PREFERENCES__XML_SCHEMA_LANGUAGE_CONSTRUCTS_PREFIX = PLUGIN_NAME + ".xsduf0020";
-  public static final String XMLSCHEMAFILES_PREFERENCES__DEFAULT_TARGETNAMESPACE = PLUGIN_NAME + ".xsduf0030";
-  public static final String XMLSCHEMAFILES_PREFERENCES__HONOUR_ALL_SCHEMA_LOCATIONS = PLUGIN_NAME + ".xsduf0040";
-  public static final String XMLSCHEMAFILES_PREFERENCES__IMPORT_CLEANUP = PLUGIN_NAME + ".xsduf0050";
-  
-  public static final String DOCUMENTATION_TAB__NO_LABEL = PLUGIN_NAME + ".xsdup0010";
-  
-  public static final String EXTENSIONS_TAB__EXTENSIONS = PLUGIN_NAME + ".xsdup0030";
-  public static final String EXTENSIONS_TAB__ADD = PLUGIN_NAME + ".xsdup0040";
-  public static final String EXTENSIONS_TAB__DELETE = PLUGIN_NAME + ".xsdup0050";
-  public static final String EXTENSIONS_TAB__EXTENSIONS_DETAILS = PLUGIN_NAME + ".xsdup0060";
-  
-  public static final String CONSTRAINTS_TAB__MINIMUM_LENGTH = PLUGIN_NAME + ".xsdup0080";
-  public static final String CONSTRAINTS_TAB__MAXIMUM_LENGTH = PLUGIN_NAME + ".xsdup0090";
-  public static final String CONSTRAINTS_TAB__COLLAPSE_WHITESPACE = PLUGIN_NAME + ".xsdup0100";
-  public static final String CONSTRAINTS_TAB__ENUMERATIONS = PLUGIN_NAME + ".xsdup0110";
-  public static final String CONSTRAINTS_TAB__PATTERNS = PLUGIN_NAME + ".xsdup0120";
-  public static final String CONSTRAINTS_TAB__NO_LABEL = PLUGIN_NAME + ".xsdup0130";
-  
-  public static final String GENERAL_TAB__SCHEMA__PREFIX = PLUGIN_NAME + ".xsdup0200";
-  public static final String GENERAL_TAB__SCHEMA__TARGETNAMESPACE = PLUGIN_NAME + ".xsdup0210";
-  public static final String GENERAL_TAB__SCHEMA__ADVANCED = PLUGIN_NAME + ".xsdup0220";
-  
-  public static final String ADVANCE_TAB__SCHEMA_ELEMENT_FORM_DEFAULT = PLUGIN_NAME + ".xsdup0450";
-  public static final String ADVANCE_TAB__SCHEMA_ATTRIBUTE_FORM_DEFAULT = PLUGIN_NAME + ".xsdup0460";
-  public static final String ADVANCE_TAB__SCHEMA_BLOCK_DEFAULT = PLUGIN_NAME + ".xsdup0470";
-  public static final String ADVANCE_TAB__SCHEMA_FINAL_DEFAULT = PLUGIN_NAME + ".xsdup0480";
-  
-  public static final String GENERAL_TAB__ELEMENT__NAME = PLUGIN_NAME + ".xsdup0230";
-  public static final String GENERAL_TAB__ELEMENT__TYPE = PLUGIN_NAME + ".xsdup0240";
-  public static final String GENERAL_TAB__ELEMENT__REFERENCE = PLUGIN_NAME + ".xsdup0250";
-  public static final String GENERAL_TAB__ELEMENT__MIN_OCCURENCE = PLUGIN_NAME + ".xsdup0180";
-  public static final String GENERAL_TAB__ELEMENT__MAX_OCCURENCE = PLUGIN_NAME + ".xsdup0190";
-  
-  public static final String GENERAL_TAB__COMPLEX_TYPE__NAME = PLUGIN_NAME + ".xsdup0260";
-  public static final String GENERAL_TAB__COMPLEX_TYPE__INHERIT_FROM = PLUGIN_NAME + ".xsdup0270";
-  public static final String GENERAL_TAB__COMPLEX_TYPE__INHERIT_BY = PLUGIN_NAME + ".xsdup0280";
-  
-  public static final String GENERAL_TAB__SIMPLE_TYPE__NAME = PLUGIN_NAME + ".xsdup0290";
-  public static final String GENERAL_TAB__SIMPLE_TYPE__VARIETY = PLUGIN_NAME + ".xsdup0300";
-  public static final String GENERAL_TAB__SIMPLE_TYPE__BASE_TYPE = PLUGIN_NAME + ".xsdup0310";
-  
-  public static final String GENERAL_TAB__ATTRIBUTE__NAME = PLUGIN_NAME + ".xsdup0320";
-  public static final String GENERAL_TAB__ATTRIBUTE__TYPE = PLUGIN_NAME + ".xsdup0330";
-  
-  public static final String GENERAL_TAB__ATTRIBUTEGROUP__NAME = PLUGIN_NAME + ".xsdup0340";
-  
-  public static final String GENERAL_TAB__MODELGROUP_DEFINITION__NAME = PLUGIN_NAME + ".xsdup0350";
-  
-  public static final String GENERAL_TAB__INCLUDE_REDEFINE__SCHEMALOCATION = PLUGIN_NAME + ".xsdup0360";
-  
-  public static final String GENERAL_TAB__IMPORT__SCHEMALOCATION = PLUGIN_NAME + ".xsdup0370";
-  public static final String GENERAL_TAB__IMPORT__NAMESPACE = PLUGIN_NAME + ".xsdup0380";
-  public static final String GENERAL_TAB__IMPORT__PREFIX = PLUGIN_NAME + ".xsdup0390";
-  
-  public static final String GENERAL_TAB__ANYELEMENT__NAMESPACE = PLUGIN_NAME + ".xsdup0400";
-  public static final String GENERAL_TAB__ANYELEMENT__PROCESSCONTENTS = PLUGIN_NAME + ".xsdup0410";
-  public static final String GENERAL_TAB__ANYELEMENT__MIN_OCCURENCE = PLUGIN_NAME + ".xsdup0180";
-  public static final String GENERAL_TAB__ANYELEMENT__MAX_OCCURENCE = PLUGIN_NAME + ".xsdup0190";
-  
-  public static final String GENERAL_TAB__ANYATTRIBUTE__NAMESPACE = PLUGIN_NAME + ".xsdup0400";  // these 4 are not used, same as anyelement above
-  public static final String GENERAL_TAB__ANYATTRIBUTE__PROCESSCONTENTS = PLUGIN_NAME + ".xsdup0410";
-  public static final String GENERAL_TAB__ANYATTRIBUTE__MIN_OCCURENCE = PLUGIN_NAME + ".xsdup0180";
-  public static final String GENERAL_TAB__ANYATTRIBUTE__MAX_OCCURENCE = PLUGIN_NAME + ".xsdup0190";
-  
-  public static final String GENERAL_TAB__MODELGROUP__KIND = PLUGIN_NAME + ".xsdup0420";
-  public static final String GENERAL_TAB__MODELGROUP__MIN_OCCURENCE = PLUGIN_NAME + ".xsdup0180"; //can't invoke help
-  public static final String GENERAL_TAB__MODELGROUP__MAX_OCCURENCE = PLUGIN_NAME + ".xsdup0190"; // can't invoke help
-  
-  public static final String GENERAL_TAB__MODELGROUP_REFS__REF = PLUGIN_NAME + ".xsdup0430";
-  
-  public static final String GENERAL_TAB__ATTRIBUTEGROUP_REFS__REF = PLUGIN_NAME + ".xsdup0440";
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorConfiguration.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorConfiguration.java
deleted file mode 100644
index 89e5800..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorConfiguration.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.wst.xsd.ui.internal.actions.IXSDToolbarAction;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.design.figures.IExtendedFigureFactory;
-
-public class XSDEditorConfiguration
-{
-  public static final String XSDEDITORCONFIGURATIONEXTENSIONID = "org.eclipse.wst.xsd.ui.XSDEditorExtensionConfiguration"; //$NON-NLS-1$
-  public static final String INTERNALEDITORCONFIGURATION_EXTENSIONID = "org.eclipse.wst.xsd.ui.internalEditorConfiguration"; //$NON-NLS-1$
-  public static final String CLASSNAME = "class"; //$NON-NLS-1$
-  public static final String ADAPTERFACTORY = "adapterFactory"; //$NON-NLS-1$
-  public static final String TOOLBARACTION = "toolbarAction"; //$NON-NLS-1$
-  public static final String FIGUREFACTORY = "figureFactory"; //$NON-NLS-1$
-  public static final String EDITPARTFACTORY = "editPartFactory"; //$NON-NLS-1$
-
-  List definedExtensionsList = null;
-
-  public XSDEditorConfiguration()
-  {
-
-  }
-
-  public XSDAdapterFactory getAdapterFactory()
-  {
-    if (definedExtensionsList == null)
-    {
-      readXSDConfigurationRegistry();
-    }
-    if (!definedExtensionsList.isEmpty())
-    {
-      return ((XSDEditorExtensionProperties) definedExtensionsList.get(0)).getAdapterFactory();
-    }
-    return null;
-  }
-
-  public EditPartFactory getEditPartFactory()
-  {
-    if (definedExtensionsList == null)
-    {
-      readXSDConfigurationRegistry();
-    }
-    if (!definedExtensionsList.isEmpty())
-    {
-      return ((XSDEditorExtensionProperties) definedExtensionsList.get(0)).getEditPartFactory();
-    }
-    return null;
-  }
-
-  public IExtendedFigureFactory getFigureFactory()
-  {
-    if (definedExtensionsList == null)
-    {
-      readXSDConfigurationRegistry();
-    }
-    if (!definedExtensionsList.isEmpty())
-    {
-      return ((XSDEditorExtensionProperties) definedExtensionsList.get(0)).getFigureFactory();
-    }
-    return null;
-  }
-
-  public List getToolbarActions()
-  {
-    if (definedExtensionsList == null)
-    {
-      readXSDConfigurationRegistry();
-    }
-    if (!definedExtensionsList.isEmpty())
-    {
-      return ((XSDEditorExtensionProperties) definedExtensionsList.get(0)).getActionList();
-    }
-    return Collections.EMPTY_LIST;
-  }
-
-  protected Object loadClass(IConfigurationElement element, String classString)
-  {
-    String pluginId = element.getDeclaringExtension().getContributor().getName();
-
-    try
-    {
-      Class theClass = Platform.getBundle(pluginId).loadClass(classString);
-      Object instance = theClass.newInstance();
-
-      return instance;
-    }
-    catch (Exception e)
-    {
-
-    }
-    return null;
-  }
-
-  public void readXSDConfigurationRegistry()
-  {
-    definedExtensionsList = new ArrayList();
-    updateList(INTERNALEDITORCONFIGURATION_EXTENSIONID);
-    updateList(XSDEDITORCONFIGURATIONEXTENSIONID);
-  }
-  
-  private void updateList(String ID)
-  {
-    IConfigurationElement[] xsdEditorExtensionList = Platform.getExtensionRegistry().getConfigurationElementsFor(ID);
-    boolean definedExtensionsExist = (xsdEditorExtensionList != null && xsdEditorExtensionList.length > 0);
-    
-    if (definedExtensionsExist)
-    {
-
-      for (int i = 0; i < xsdEditorExtensionList.length; i++)
-      {
-        XSDEditorExtensionProperties properties = new XSDEditorExtensionProperties();
-        definedExtensionsList.add(properties);
-  
-        IConfigurationElement element = xsdEditorExtensionList[i];
-        String adapterFactoryClass = element.getAttribute(ADAPTERFACTORY);
-        if (adapterFactoryClass != null)
-        {
-          Object object = loadClass(element, adapterFactoryClass);
-          XSDAdapterFactory adapterFactory = null;
-          if (object instanceof XSDAdapterFactory)
-          {
-            adapterFactory = (XSDAdapterFactory) object;
-            properties.setAdapterFactory(adapterFactory);
-          }
-        }
-  
-        String figureFactoryClass = element.getAttribute(FIGUREFACTORY);
-        if (figureFactoryClass != null)
-        {
-          Object object = loadClass(element, figureFactoryClass);
-          IExtendedFigureFactory figureFactory = null;
-          if (object instanceof IExtendedFigureFactory)
-          {
-            figureFactory = (IExtendedFigureFactory) object;
-            properties.setFigureFactoryList(figureFactory);
-          }
-        }
-  
-        IConfigurationElement[] toolbarActions = element.getChildren(TOOLBARACTION);
-        List actionList = new ArrayList();
-        if (toolbarActions != null)
-        {
-          for (int j = 0; j < toolbarActions.length; j++)
-          {
-            IConfigurationElement actionElement = toolbarActions[j];
-            String actionClass = actionElement.getAttribute(CLASSNAME);
-            IXSDToolbarAction action = null;
-            if (actionClass != null)
-            {
-              Object object = loadClass(actionElement, actionClass);
-              if (object instanceof IXSDToolbarAction)
-              {
-                action = (IXSDToolbarAction) object;
-                actionList.add(action);
-              }
-            }
-          }
-        }
-        properties.setActionList(actionList);
-  
-        String editPartFactoryClass = element.getAttribute(EDITPARTFACTORY);
-        if (editPartFactoryClass != null)
-        {
-          Object object = loadClass(element, editPartFactoryClass);
-          EditPartFactory editPartFactory = null;
-          if (object instanceof EditPartFactory)
-          {
-            editPartFactory = (EditPartFactory) object;
-            properties.setEditPartFactoryList(editPartFactory);
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorContextIds.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorContextIds.java
deleted file mode 100644
index 2f1bc75..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorContextIds.java
+++ /dev/null
@@ -1,464 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-/**
- * Context help id constants.
- */
-public interface XSDEditorContextIds 
-{
-  public static final String PLUGIN_NAME = "org.eclipse.wst.xsd.ui.internal";
-
-  /* CONTEXT_IDs New XSD Wizard uses the WizardNewFileCreationPage from org.eclipse.ui.dialogs */
- 
-  /* CONTEXT_IDs for XSDEditor follow the xsdexxx context IDs */
-
-  /* CONTEXT_ID xsde0010 for XSD Editor Design View */
-  public static final String XSDE_SCHEMA_DESIGN_VIEW      = PLUGIN_NAME + ".xsde0010";
-  /* no CONTEXT_ID for File Name Text Edit (not editable) */
-  /* CONTEXT_ID xsde0020 for Version Text Edit */
-  public static final String XSDE_SCHEMA_VERSION          = PLUGIN_NAME + ".xsde0020";
-  /* CONTEXT_ID xsde0030 for Language Text Edit */
-  public static final String XSDE_SCHEMA_LANGUAGE         = PLUGIN_NAME + ".xsde0030";
-  /* CONTEXT_ID xsde0040 for Namespace Group */
-  public static final String XSDE_SCHEMA_NAMESPACE_GROUP  = PLUGIN_NAME + ".xsde0040";
-  /* CONTEXT_ID xsde0050 for Prefix Text Edit */
-  public static final String XSDE_SCHEMA_PREFIX           = PLUGIN_NAME + ".xsde0050";
-  /* CONTEXT_ID xsde0060 for Target namespace Text Edit */
-  public static final String XSDE_SCHEMA_TARGET_NAMESPACE = PLUGIN_NAME + ".xsde0060";
-  /* CONTEXT_ID xsde0070 for Apply Push Button */
-  public static final String XSDE_SCHEMA_APPLY            = PLUGIN_NAME + ".xsde0070";
-  /* CONTEXT_ID xsde0080 for Attribute form default Combo Box */
-  public static final String XSDE_SCHEMA_ATTRIBUTE        = PLUGIN_NAME + ".xsde0080";
-  /* CONTEXT_ID xsde0090 for Element form default Combo Box */
-  public static final String XSDE_SCHEMA_ELEMENT          = PLUGIN_NAME + ".xsde0090";
-  /* CONTEXT_ID xsde0100 for Block default Combo Box */
-  public static final String XSDE_SCHEMA_BLOCK            = PLUGIN_NAME + ".xsde0100";
-  /* CONTEXT_ID xsde0110 for Final Default Combo Box */
-  public static final String XSDE_SCHEMA_FINAL            = PLUGIN_NAME + ".xsde0110";
-
-  
-  /* CONTEXT_ID xsde0200 for Annotations Comment Group - only used generically */
-  /* CONTEXT_ID      - used in Documentation Design View */
-  /* CONTEXT_ID      - used in App Info Design View */
-  public static final String XSDE_ANNOTATION_COMMENT_GROUP = PLUGIN_NAME + ".xsde0200";
-  /* CONTEXT_ID xsde0210 for Annotations Comment Group - only used generically */
-  /* CONTEXT_ID      - used in Documentation Design View */
-  /* CONTEXT_ID      - used in App Info Design View */
-  public static final String XSDE_ANNOTATION_COMMENT       = PLUGIN_NAME + ".xsde0210";
-  
-  /* CONTEXT_ID xsde0300 for Documentation Design View */
-  public static final String XSDE_DOCUMENTATION_DESIGN_VIEW   = PLUGIN_NAME + ".xsde0300";
-  /* CONTEXT_ID xsde0310 for Source Text Edit */
-  public static final String XSDE_DOCUMENTATION_SOURCE        = PLUGIN_NAME + ".xsde0310";
-  /* CONTEXT_ID xsde0320 for Language Text Edit */
-  public static final String XSDE_DOCUMENTATION_LANGUAGE      = PLUGIN_NAME + ".xsde0320";
-  /* CONTEXT_ID Comment Group is from Annotations Window xsde0200 */
-  /* CONTEXT_ID Comment Multi-line Edit is from Annotations Window xsd0210 */
-
-  /* CONTEXT_ID xsde0400 for App Info Design View */
-  public static final String XSDE_APP_INFO_DESIGN_VIEW = PLUGIN_NAME + ".xsde0400";
-  /* CONTEXT_ID xsde0410 for App Info Source Text Edit */
-  public static final String XSDE_APP_INFO_SOURCE = PLUGIN_NAME + ".xsde0410";
-  /* CONTEXT_ID Comment Group is from Annotations Window xsde0200 */
-  /* CONTEXT_ID Comment Multi-line Edit is from Annotations Window xsd0210 */
-
-  /* CONTEXT_ID xsde0500 for Complex Type Design View */
-  public static final String XSDE_COMPLEX_DESIGN_VIEW = PLUGIN_NAME + ".xsde0500";
-  /* CONTEXT_ID xsde0510 for Name Text Edit */
-  public static final String XSDE_COMPLEX_NAME        = PLUGIN_NAME + ".xsde0510";
-  /* CONTEXT_ID xsde0520 for Abstract Combo Box */
-  public static final String XSDE_COMPLEX_ABSTRACT    = PLUGIN_NAME + ".xsde0520";
-  /* CONTEXT_ID xsde0530 for Mixed Combo Box */
-  public static final String XSDE_COMPLEX_MIXED       = PLUGIN_NAME + ".xsde0530";
-  /* CONTEXT_ID xsde0540 for Block Combo Box */
-  public static final String XSDE_COMPLEX_BLOCK       = PLUGIN_NAME + ".xsde0540";
-  /* CONTEXT_ID xsde0550 for Final Combo Box */
-  public static final String XSDE_COMPLEX_FINAL       = PLUGIN_NAME + ".xsde0550";
-
-  /* CONTEXT_ID xsde0600 for Simple Type Design View */
-  public static final String XSDE_SIMPLE_DESIGN_VIEW = PLUGIN_NAME + ".xsde0600";
-  /* CONTEXT_ID xsde0610 for Name Text Edit */
-  public static final String XSDE_SIMPLE_NAME        = PLUGIN_NAME + ".xsde0610";
-
-  /* CONTEXT_ID for Global Element and Element Design Views are the same */
-  /* CONTEXT_ID xsde0700 for Element Design View */
-  public static final String XSDE_ELEMENT_DESIGN_VIEW = PLUGIN_NAME + ".xsde0700";
-  /* CONTEXT_ID xsde0710 for Element Name Text Edit */
-  public static final String XSDE_ELEMENT_NAME         = PLUGIN_NAME + ".xsde0710";
-  /* CONTEXT_ID Type Information Group is from Type Helper xsde0900 */
-  /* CONTEXT_ID Built-in simple type Radio Button is from Type Helper xsde0920 */
-  /* CONTEXT_ID User-defined simple type Radio Button is from Type Helper xsde0930 */
-  /* CONTEXT_ID User-defined complex type Radio Button is from Type Helper xsde0940 */
-  /* CONTEXT_ID Type information Combo Box is from Type Helper xsde0950 */
-  /* CONTEXT_ID xsde0720 for Abstract Check Box */
-  public static final String XSDE_ELEMENT_ABSTRACT     = PLUGIN_NAME + ".xsde0720";
-  /* CONTEXT_ID xsde0730 for Nillable Check Box */
-  public static final String XSDE_ELEMENT_NILLABLE     = PLUGIN_NAME + ".xsde0730";
-  /* CONTEXT_ID xsde0740 for Value Group */
-  public static final String XSDE_ELEMENT_VALUE        = PLUGIN_NAME + ".xsde0740";
-  /* CONTEXT_ID xsde0750 for Fixed Radio Button */
-  public static final String XSDE_ELEMENT_FIXED        = PLUGIN_NAME + ".xsde0750";
-  /* CONTEXT_ID xsde0760 for Default Radio Button */
-  public static final String XSDE_ELEMENT_DEFAULT      = PLUGIN_NAME + ".xsde0760";
-  /* CONTEXT_ID xsde0770 for Value Group */
-  public static final String XSDE_ELEMENT_VALUE_GROUP  = PLUGIN_NAME + ".xsde0770";
-  /* CONTEXT_ID xsde0780 for Minimum Text Edit */
-  public static final String XSDE_ELEMENT_MINIMUM      = PLUGIN_NAME + ".xsde0780";
-  /* CONTEXT_ID xsde0790 for Maximum Text Edit */
-  public static final String XSDE_ELEMENT_MAXIMUM      = PLUGIN_NAME + ".xsde0790";
-  /* CONTEXT_ID xsde0800 for Block Combo Box */
-  public static final String XSDE_ELEMENT_BLOCK        = PLUGIN_NAME + ".xsde0800";
-  /* CONTEXT_ID xsde0810 for Final Combo Box */
-  public static final String XSDE_ELEMENT_FINAL        = PLUGIN_NAME + ".xsde0810";
-  /* CONTEXT_ID xsde0820 for Substitution Group Combo Box */
-  public static final String XSDE_ELEMENT_SUBSTITUTION = PLUGIN_NAME + ".xsde0820";
-  /* CONTEXT_ID xsde0830 for Form Qualification Combo Box */                    
-  public static final String XSDE_ELEMENT_FORM         = PLUGIN_NAME + ".xsde0830";
-
-  /* CONTEXT_ID xsde0900 for Type Helper Group - only used generically */
-  /* CONTEXT_ID      - used in Global Element Design View */
-  /* CONTEXT_ID      - used in Global Attribute Design View */
-  /* CONTEXT_ID      - used in Simple Content Design View */
-  /* CONTEXT_ID      - used in Restriction Design View */
-  /* CONTEXT_ID      - used in List Design View */
-  /* CONTEXT_ID      - used in Union Design View */
-  public static final String XSDE_TYPE_HELPER_GROUP    = PLUGIN_NAME + ".xsde0900";
-  /* CONTEXT_ID xsde0910 for None Radio Button - only used generically */
-  /* CONTEXT_ID      - used in Simple Content Design View */
-  /* CONTEXT_ID      - used in Restriction Design View */
-  /* CONTEXT_ID      - used in List Design View */
-  /* CONTEXT_ID      - used in Union Design View */
-  public static final String XSDE_TYPE_HELPER_NONE     = PLUGIN_NAME + ".xsde0910";
-  /* CONTEXT_ID xsde0920 for Built-in simple type Radio Button - only used generically */
-  /* CONTEXT_ID      - used in Global Element Design View */
-  /* CONTEXT_ID      - used in Global Attribute Design View */
-  /* CONTEXT_ID      - used in Simple Content Design View */
-  /* CONTEXT_ID      - used in Restriction Design View */
-  /* CONTEXT_ID      - used in List Design View */
-  /* CONTEXT_ID      - used in Union Design View */
-  public static final String XSDE_TYPE_HELPER_BUILT_IN = PLUGIN_NAME + ".xsde0920";
-  /* CONTEXT_ID xsde0930 for User-defined simple type Radio Button - only used generically */
-  /* CONTEXT_ID      - used in Global Element Design View */
-  /* CONTEXT_ID      - used in Global Attribute Design View */
-  /* CONTEXT_ID      - used in Simple Content Design View */
-  /* CONTEXT_ID      - used in Restriction Design View */
-  /* CONTEXT_ID      - used in List Design View */
-  /* CONTEXT_ID      - used in Union Design View */
-  public static final String XSDE_TYPE_HELPER_USER_DEFINED_SIMPLE = PLUGIN_NAME + ".xsde0930";
-  /* CONTEXT_ID xsde0940 for User-defined complex type Radio Button - only used generically */
-  /* CONTEXT_ID      - used in Global Element Design View */
-  public static final String XSDE_TYPE_HELPER_USER_DEFINED_COMPLEX = PLUGIN_NAME + ".xsde0940";
-  /* CONTEXT_ID xsde0950 for Type information Combo Box - only used generically */
-  /* CONTEXT_ID      - used in Global Element Design View */
-  /* CONTEXT_ID      - used in Global Attribute Design View */
-  /* CONTEXT_ID      - used in Simple Content Design View */
-  /* CONTEXT_ID      - used in Restriction Design View */
-  /* CONTEXT_ID      - used in List Design View */
-  public static final String XSDE_TYPE_HELPER_TYPE = PLUGIN_NAME + ".xsde0950";
-
-  /* CONTEXT_ID xsde1000 for Attribute Design View */
-  public static final String XSDE_ATTRIBUTE_DESIGN_VIEW = PLUGIN_NAME + ".xsde1000";
-  /* CONTEXT_ID xsde1010 for Attribute Name Text Edit */
-  public static final String XSDE_ATTRIBUTE_NAME        = PLUGIN_NAME + ".xsde1010";
-  /* CONTEXT_ID Type Information Group is from Type Helper xsde0900 */
-  /* CONTEXT_ID Built-in simple type Radio Button is from Type Helper xsde0920 */
-  /* CONTEXT_ID User-defined simple type Radio Button is from Type Helper xsde0930 */
-  /* CONTEXT_ID Type information Combo Box is from Type Helper xsde0950 */
-  /* CONTEXT_ID xsde1020 for Value Group */
-  public static final String XSDE_ATTRIBUTE_VALUE_GROUP = PLUGIN_NAME + ".xsde1020";
-  /* CONTEXT_ID xsde1030 for Fixed Radio Button */
-  public static final String XSDE_ATTRIBUTE_FIXED       = PLUGIN_NAME + ".xsde1030";
-  /* CONTEXT_ID xsde1040 for Default Radio Button */
-  public static final String XSDE_ATTRIBUTE_DEFAULT     = PLUGIN_NAME + ".xsde1040";
-  /* CONTEXT_ID xsde1050 for Value Text Edit */
-  public static final String XSDE_ATTRIBUTE_VALUE       = PLUGIN_NAME + ".xsde1050";
-  /* CONTEXT_ID xsde1060 for Usage Combo Box */
-  public static final String XSDE_ATTRIBUTE_USAGE       = PLUGIN_NAME + ".xsde1060";
-  /* CONTEXT_ID xsde1070 for Form qualificaiton Combo Box */
-  public static final String XSDE_ATTRIBUTE_FORM        = PLUGIN_NAME + ".xsde1070";
-
-  /* CONTEXT_ID xsde1100 for Element Ref Window Design View */
-  public static final String XSDE_ELEMENT_REF_DESIGN_VIEW = PLUGIN_NAME + ".xsde1100";
-  /* CONTEXT_ID xsde1110 for Reference Name Combo Box */
-  public static final String XSDE_ELEMENT_REF_REFERENCE   = PLUGIN_NAME + ".xsde1110";
-  /* CONTEXT_ID xsde1120 for Minimum Text Edit */
-  public static final String XSDE_ELEMENT_REF_MINIMUM     = PLUGIN_NAME + ".xsde1120";
-  /* CONTEXT_ID xsde1130 for Maximum Text Edit */
-  public static final String XSDE_ELEMENT_REF_MAXIMUM     = PLUGIN_NAME + ".xsde1130";
-  
-  /* CONTEXT_ID xsde1200 for Simple Content Design View - used generically */
-  /* CONTEXT_ID      - used in Simple Content Design View */ 
-  /* CONTEXT_ID      - used in Complex Content Design View */
-    public static final String XSDE_SIMPLE_CONTENT_DESIGN_VIEW = PLUGIN_NAME + ".xsde1200";
-  /* CONTEXT_ID Base Type Group is from Type Helper xsde0900 */
-  /* CONTEXT_ID None Radio Button is from Type Helper xsde0910 */
-  /* CONTEXT_ID Built-in simple type Radio Button is from Type Helper xsde0920 */
-  /* CONTEXT_ID User-defined simple type Radio Button is from Type Helper xsde0930 */
-  /* CONTEXT_ID Type information Combo Box is from Type Helper xsde0950 */
-  /* CONTEXT_ID xsde1210 for Derived by Combo Box - used generically */
-  /* CONTEXT_ID      - used in Simple Content Design View */ 
-  /* CONTEXT_ID      - used in Complex Content Design View */
-  public static final String XSDE_SIMPLE_CONTENT_DERIVED = PLUGIN_NAME + ".xsde1210";
-
-  /* CONTEXT_ID xsde1300 for Restriction Design View */
-  public static final String XSDE_RESTRICTION_DESIGN_VIEW  = PLUGIN_NAME + ".xsde1300";
-  /* CONTEXT_ID Base Type Group is from Type Helper xsde0900 */
-  /* CONTEXT_ID None Radio Button is from Type Helper xsde0910 */
-  /* CONTEXT_ID Built-in simple type Radio Button is from Type Helper xsde0920 */
-  /* CONTEXT_ID User-defined simple type Radio Button is from Type Helper xsde0930 */
-  /* CONTEXT_ID Type information Combo Box is from Type Helper xsde0950 */
-  /* CONTEXT_ID xsde1310 for Facets Group */
-  public static final String XSDE_RESTRICTION_FACETS_GROUP = PLUGIN_NAME + ".xsde1310";
-  /* CONTEXT_ID xsde1320 for Facets Table */
-  public static final String XSDE_RESTRICTION_FACETS       = PLUGIN_NAME + ".xsde1320";
-
-  /* CONTEXT_ID xsde1400 for List Design View */
-  public static final String XSDE_LIST_DESIGN_VIEW  = PLUGIN_NAME + ".xsde1400";
-  /* CONTEXT_ID Base Type Group is from Type Helper xsde0900 */
-  /* CONTEXT_ID None Radio Button is from Type Helper xsde0910 */
-  /* CONTEXT_ID Built-in simple type Radio Button is from Type Helper xsde0920 */
-  /* CONTEXT_ID User-defined simple type Radio Button is from Type Helper xsde0930 */
-  /* CONTEXT_ID Type information Combo Box is from Type Helper xsde0950 */
-
-  /* CONTEXT_ID xsde1500 for Attribute Group Design View */
-  public static final String XSDE_ATTRIBUTE_GROUP_DESIGN_VIEW = PLUGIN_NAME + ".xsde1500";
-  /* CONTEXT_ID xsde1510 for Name Text Edit */
-  public static final String XSDE_ATTRIBUTE_GROUP_NAME = PLUGIN_NAME + ".xsde1510";
-
-  /* CONTEXT_ID for Global Attribute and Attribute Design Views are the same */
-  /* CONTEXT_ID xsde1600 for Attribute Group Reference Design View */
-  public static final String XSDE_ATTRIBUTE_GROUP_REF_DESIGN_VIEW = PLUGIN_NAME + ".xsde1600";
-  /* CONTEXT_ID xsde1610 for Reference Name Combo Box */
-  public static final String XSDE_ATTRIBUTE_GROUP_REF_NAME = PLUGIN_NAME + ".xsde1610";
-
-  /* CONTEXT_ID xsde1700 for Attribute Reference Design View */
-  public static final String XSDE_ATTRIBUTE_REF_DESIGN_VIEW = PLUGIN_NAME + ".xsde1700";
-  /* CONTEXT_ID xsde1710 for Reference Name Combo Box */
-  public static final String XSDE_ATTRIBUTE_REF_NAME = PLUGIN_NAME + ".xsde1710";
-
-  /* CONTEXT_ID xsde1800 for Pattern Design View */
-  public static final String XSDE_PATTERN_DESIGN_VIEW = PLUGIN_NAME + ".xsde1800";
-  /* CONTEXT_ID xsde1810 for Value Text Edit */
-  public static final String XSDE_PATTERN_VALUE   = PLUGIN_NAME + ".xsde1810";
-  /* CONTEXT_ID xsde1820 for Create Regular Expression Push Button */
-  public static final String XSDE_PATTERN_REGULAR = PLUGIN_NAME + ".xsde1820";
-
-  /* CONTEXT_ID xsde1900 for Enum Design View */
-  public static final String XSDE_ENUM_DESIGN_VIEW = PLUGIN_NAME + ".xsde1900";
-  /* CONTEXT_ID xsde1910 for Value Text Edit */
-  public static final String XSDE_ENUM_VALUE       = PLUGIN_NAME + ".xsde1910";
-  
-  /* CONTEXT_ID xsde2000 for Include Design Page */
-  public static final String XSDE_INCLUDE_DESIGN_VIEW = PLUGIN_NAME + ".xsde2000";
-  /* no CONTEXT_ID for Schema Location Text Edit (not editable) */
-  /* CONTEXT_ID Select Push Button is from Include Helper xsde2100 */ 
-  
-  /* CONTEXT_ID xsde2100 for Include Helper Select Push Button - used generically */
-  /* CONTEXT_ID      - used in Include Design View */
-  /* CONTEXT_ID      - used in Import Design View */
-  public static final String XSDE_INCLUDE_HELPER_SELECT = PLUGIN_NAME + ".xsde2100";
-
-  /* CONTEXT_ID xsde2200 for Import Design Page */
-  public static final String XSDE_IMPORT_DESIGN_VIEW = PLUGIN_NAME + ".xsde2200";
-  /* no CONTEXT_ID for Schema Location Text Edit (not editable) */
-  /* CONTEXT_ID Select Push Button is from Include Helper xsde2100 */
-  /* CONTEXT_ID xsde2210 for Prefix Text Edit */
-  public static final String XSDE_IMPORT_PREFIX      = PLUGIN_NAME + ".xsde2210";
-  /* no CONTEXT_ID for Namespace Text Edit (not editable) */
-
-  /* CONTEXT_ID xsde2300 for Redefine Design View */
-  public static final String XSDE_REDEFINE_DESIGN_VIEW = PLUGIN_NAME + ".xsde2300";
-  /* no CONTEXT_ID for Schema Location Text Edit (not editable) */
-  /* CONTEXT_ID Select Push Button is from Include Helper xsde2100 */
-
-  /* CONTEXT_ID xsde2400 for Group Design View */
-  public static final String XSDE_GROUP_DESIGN_VIEW = PLUGIN_NAME + ".xsde2400";
-  /* CONTEXT_ID xsde2410 for Name Text Edit */
-  public static final String XSDE_GROUP_NAME        = PLUGIN_NAME + ".xsde2410";
-
-  /* CONTEXT_ID xsde2500 for Group Scope Design View */
-  public static final String XSDE_GROUP_SCOPE_DESIGN_VIEW   = PLUGIN_NAME + ".xsde2500";
-  /* CONTEXT_ID xsde2510 for Content model Group */
-  public static final String XSDE_GROUP_SCOPE_CONTENT_GROUP = PLUGIN_NAME + ".xsde2510";
-  /* CONTEXT_ID xsde2520 for Sequence Radio Button */
-  public static final String XSDE_GROUP_SCOPE_SEQUENCE = PLUGIN_NAME + ".xsde2520";
-  /* CONTEXT_ID xsde2530 for Choice Radio Button */
-  public static final String XSDE_GROUP_SCOPE_CHOICE   = PLUGIN_NAME + ".xsde2530";
-  /* CONTEXT_ID xsde2540 for All Radio Button */
-  public static final String XSDE_GROUP_SCOPE_ALL      = PLUGIN_NAME + ".xsde2540";
-  /* CONTEXT_ID xsde2550 for Minimum Text Edit */
-  public static final String XSDE_GROUP_SCOPE_MINIMUM  = PLUGIN_NAME + ".xsde2550";
-  /* CONTEXT_ID xsde2560 for Maximum Text Edit*/
-  public static final String XSDE_GROUP_SCOPE_MAXIMUM  = PLUGIN_NAME + ".xsde2560";
-
-  /* CONTEXT_ID xsde2600 for Group Ref Design View */
-  public static final String XSDE_GROUP_REF_DESIGN_VIEW = PLUGIN_NAME + ".xsde2600";
-  /* CONTEXT_ID xsde2610 for Reference name Combo Box */
-  public static final String XSDE_GROUP_REF_REFERENCE   = PLUGIN_NAME + ".xsde2610";
-  /* CONTEXT_ID xsde2620 for Minimum Text Edit */
-  public static final String XSDE_GROUP_REF_MINIMUM     = PLUGIN_NAME + ".xsde2620";
-  /* CONTEXT_ID xsde2630 for Maximum Text Edit */
-  public static final String XSDE_GROUP_REF_MAXIMUM     = PLUGIN_NAME + ".xsde2630";
-
-  /* CONTEXT_ID xsde2700 for Unique Design View */
-  public static final String XSDE_UNIQUE_DESIGN_VIEW = PLUGIN_NAME + ".xsde2700";
-  /* CONTEXT_ID Name Text Edit is from Unique Base xsde2800 */
-  /* CONTEXT_ID Selector Group is from Unique Base xsde2810 */
-  /* CONTEXT_ID Selector Mulit-line Edit is from Unique Base xsde2820 */
-  /* CONTEXT_ID Fields Group is from Unique Base xsde2830 */
-  /* CONTEXT_ID Source Text Edit is from Unique Base xsde2840 */
-  /* CONTEXT_ID Add Push Button is from Unique Base xsde2850 */
-  /* CONTEXT_ID Remove Push Button is from Unique Base xsde2860 */
-  /* CONTEXT_ID Target List Box is from Unique Base xsde2870 */
-  
-  /* CONTEXT_ID xsde2800 for Unique Base Name Text Edit - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_NAME = PLUGIN_NAME + ".xsde2800";
-  /* CONTEXT_ID xsde2810 for Selector Group - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_SELECTOR_GROUP = PLUGIN_NAME + ".xsde2810";
-  /* CONTEXT_ID xsde2820 for Selector Multi-line Edit - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_SELECTOR       = PLUGIN_NAME + ".xsde2820";
-  /* CONTEXT_ID xsde2830 for Fields Group - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_FIELDS_GROUP   = PLUGIN_NAME + ".xsde2830";
-  /* CONTEXT_ID xsde2840 for Source Text Edit - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_SOURCE         = PLUGIN_NAME + ".xsde2840";
-  /* CONTEXT_ID xsde2850 for Add Push Button - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_ADD            = PLUGIN_NAME + ".xsde2850";
-  /* CONTEXT_ID xsde2860 for Remove Push Button - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_REMOVE         = PLUGIN_NAME + ".xsde2860";
-  /* CONTEXT_ID xsde2870 for Target List Box - used generically */
-  /* CONTEXT_ID      - used in Unique Design View */
-  /* CONTEXT_ID      - used in Key Design View */
-  /* CONTEXT_ID      - used in Key Ref Design View */
-  public static final String XSDE_UNIQUE_BASE_TARGET         = PLUGIN_NAME + ".xsde2870";
-
-  /* CONTEXT_ID xsde2900 for Key Design View */
-  public static final String XSDE_KEY_DESIGN_VIEW = PLUGIN_NAME + ".xsde2900";
-  /* CONTEXT_ID Name Text Edit is from Unique Base xsde2800 */
-  /* CONTEXT_ID Selector Group is from Unique Base xsde2810 */
-  /* CONTEXT_ID Selector Mulit-line Edit is from Unique Base xsde2820 */
-  /* CONTEXT_ID Fields Group is from Unique Base xsde2830 */
-  /* CONTEXT_ID Source Text Edit is from Unique Base xsde2840 */
-  /* CONTEXT_ID Add Push Button is from Unique Base xsde2850 */
-  /* CONTEXT_ID Remove Push Button is from Unique Base xsde2860 */
-  /* CONTEXT_ID Target List Box is from Unique Base xsde2870 */
-  /* CONTEXT_ID xsde2900 for Key Design View */
-  
-  /* CONTEXT_ID xsde2950 for Key Ref Design View */
-  public static final String XSDE_KEY_REF_DESIGN_VIEW = PLUGIN_NAME + ".xsde2950";
-  /* CONTEXT_ID Name Text Edit is from Unique Base xsde2800 */
-  /* CONTEXT_ID xsde2960 for Reference Key Combo Box */
-  public static final String XSDE_KEY_REF_REFERENCE = PLUGIN_NAME + ".xsde2960";
-  /* CONTEXT_ID Selector Group is from Unique Base xsde2810 */
-  /* CONTEXT_ID Selector Mulit-line Edit is from Unique Base xsde2820 */
-  /* CONTEXT_ID Fields Group is from Unique Base xsde2830 */
-  /* CONTEXT_ID Source Text Edit is from Unique Base xsde2840 */
-  /* CONTEXT_ID Add Push Button is from Unique Base xsde2850 */
-  /* CONTEXT_ID Remove Push Button is from Unique Base xsde2860 */
-  /* CONTEXT_ID Target List Box is from Unique Base xsde2870 */
-
-  /* CONTEXT_ID xsde3000 for Any Element Design View */
-  public static final String XSDE_ANY_ELEMENT_VIEW = PLUGIN_NAME + ".xsde3000";
-  /* CONTEXT_ID xsde3010 for Namespace Text Edit */
-  public static final String XSDE_ANY_ELEMENT_NAMESPACE = PLUGIN_NAME + ".xsde3010";
-  /* CONTEXT_ID xsde3020 for Process Contents Combo Box */
-  public static final String XSDE_ANY_ELEMENT_PROCESS   = PLUGIN_NAME + ".xsde3020";
-  /* CONTEXT_ID xsde3030 for Minimum Text Edit */
-  public static final String XSDE_ANY_ELEMENT_MINIMUM   = PLUGIN_NAME + ".xsde3030";
-  /* CONTEXT_ID xsde3040 for Maximum Text Edit */
-  public static final String XSDE_ANY_ELEMENT_MAXIMUM   = PLUGIN_NAME + ".xsde3040";
-
-  /* CONTEXT_ID xsde3100 for Any Attribute Design View */
-  public static final String XSDE_ANY_ATTRIBUTE_VIEW = PLUGIN_NAME + ".xsde3100";
-  /* CONTEXT_ID xsde3110 for Namespace Text Edit */
-  public static final String XSDE_ANY_ATTRIBUTE_NAMESPACE = PLUGIN_NAME + ".xsde3110";
-  /* CONTEXT_ID xsde3120 for Process Contents Combo Box */
-  public static final String XSDE_ANY_ATTRIBUTE_PROCESS   = PLUGIN_NAME + ".xsde3120";
-
-  /* no CONTEXT_ID for Union Design View - uses a generic interface */
-  /* CONTEXT_ID Type Information Group is from Type Helper xsde0900 */
-  /* CONTEXT_ID Built-in simple type Radio Button is from Type Helper xsde0920 */
-  /* CONTEXT_ID User-defined simple type Radio Button is from Type Helper xsde0930 */
-  /* CONTEXT_ID Type information Combo Box is from Type Helper xsde0950 */
-
-  /* CONTEXT_ID xsde3200 for Notation Design View */
-  public static final String XSDE_NOTATION_VIEW = PLUGIN_NAME + ".xsde3200";
-
-  /* CONTEXT_ID xsde4000 for Source View */
-  public static final String XSDE_SOURCE_VIEW = PLUGIN_NAME + ".xsde4000";
-
-  /* CONTEXT_IDs for Regular Expression Wizard follow the xsdrxxx context IDs */
-  
-  /* CONTEXT_ID xsdr0010 for Compose Regular Expression Page */
-  public static final String XSDR_COMPOSITION_PAGE         = PLUGIN_NAME + ".xsdr0010";
-  /* CONTEXT_ID xsdr0015 for Token Contents Combo Box */
-  public static final String XSDR_COMPOSITION_TOKEN = PLUGIN_NAME + ".xsdr0015";
-  /* CONTEXT_ID xsdr0020 for Occurrece Group */
-  public static final String XSDR_COMPOSITION_OCCURRENCE_GROUP = PLUGIN_NAME + ".xsdr0020";
-  /* CONTEXT_ID xsdr0030 for Just once Radio Button */
-  public static final String XSDR_COMPOSITION_JUST_ONCE    = PLUGIN_NAME + ".xsdr0030";
-  /* CONTEXT_ID xsdr0040 for Zero or more Radio Button */
-  public static final String XSDR_COMPOSITION_ZERO_OR_MORE = PLUGIN_NAME + ".xsdr0040";
-  /* CONTEXT_ID xsdr0050 for One or more Radio Button */
-  public static final String XSDR_COMPOSITION_ONE_OR_MORE  = PLUGIN_NAME + ".xsdr0050";
-  /* CONTEXT_ID xsdr0060 for Optional Radio Button */
-  public static final String XSDR_COMPOSITION_OPTIONAL     = PLUGIN_NAME + ".xsdr0060";
-  /* CONTEXT_ID xsdr0070 for Repeat Radio Button */
-  public static final String XSDR_COMPOSITION_REPEAT       = PLUGIN_NAME + ".xsdr0070";
-  /* CONTEXT_ID xsdr0080 for Range Radio Button */
-  public static final String XSDR_COMPOSITION_RANGE        = PLUGIN_NAME + ".xsdr0080";
-  /* CONTEXT_ID xsdr0090 for Repeat Text Edit */
-  public static final String XSDR_COMPOSITION_REPEAT_TEXT  = PLUGIN_NAME + ".xsdr0090";
-  /* CONTEXT_ID xsdr0100 for Range Minimum Text Edit */
-  public static final String XSDR_COMPOSITION_RANGE_MIN    = PLUGIN_NAME + ".xsdr0100";
-  /* CONTEXT_ID xsdr0110 for Range Maximum Text Edit */
-  public static final String XSDR_COMPOSITION_RANGE_MAX    = PLUGIN_NAME + ".xsdr0110";
-  /* CONTEXT_ID xsdr0120 for Add Push Button */
-  public static final String XSDR_COMPOSITION_ADD          = PLUGIN_NAME + ".xsdr0120";
-  /* CONTEXT_ID xsdr0130 for Current Regular Expression Text Edit */
-  public static final String XSDR_COMPOSITION_CURRENT      = PLUGIN_NAME + ".xsdr0130";
-
-  /* CONTEXT_ID xsdr0200 for Test Regular Expression Page */
-  public static final String XSDR_TEST_PAGE   = PLUGIN_NAME + ".xsdr0200";
-  /* no CONTEXT_ID for Regular Expression Text Edit (not editable) */
-  /* CONTEXT_ID xsdr0210 for Sample Text Text Edit */
-  public static final String XSDR_TEST_SAMPLE = PLUGIN_NAME + ".xsdr0210";
-
-  /* CONTEXT_IDs for Preferences Page follows the xsdpxxx context IDs */
-  
-  /* CONTEXT_ID xsdp0010 for XML Schema Preferences Page */
-  public static final String XSDP_PREFERENCE_PAGE = PLUGIN_NAME + ".xsdp0010";
-  /* CONTEXT_ID xsdp0020 for XML Schema Editor Preferences Page */
-  public static final String XSDP_EDITOR_PREFERENCE_PAGE = PLUGIN_NAME + ".xsdp0020";
-  /* CONTEXT_ID xsdp0030 for XML Schema Validator Preferences Page */
-  public static final String XSDP_VALIDATOR_PREFERENCE_PAGE = PLUGIN_NAME + ".xsdp0030";
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorExtensionProperties.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorExtensionProperties.java
deleted file mode 100644
index f87139a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorExtensionProperties.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.List;
-
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.design.figures.IExtendedFigureFactory;
-
-public class XSDEditorExtensionProperties
-{
-  XSDAdapterFactory adapterFactory;
-  IExtendedFigureFactory figureFactory;
-  EditPartFactory editPartFactory;
-  List actionList;
-
-  public XSDEditorExtensionProperties()
-  {
-
-  }
-
-  public void setActionList(List actionList)
-  {
-    this.actionList = actionList;
-  }
-
-  public void setAdapterFactory(XSDAdapterFactory adapterFactory)
-  {
-    this.adapterFactory = adapterFactory;
-  }
-
-  public void setEditPartFactoryList(EditPartFactory editPartFactory)
-  {
-    this.editPartFactory = editPartFactory;
-  }
-
-  public void setFigureFactoryList(IExtendedFigureFactory figureFactory)
-  {
-    this.figureFactory = figureFactory;
-  }
-
-  public List getActionList()
-  {
-    return actionList;
-  }
-
-  public XSDAdapterFactory getAdapterFactory()
-  {
-    return adapterFactory;
-  }
-
-  public EditPartFactory getEditPartFactory()
-  {
-    return editPartFactory;
-  }
-
-  public IExtendedFigureFactory getFigureFactory()
-  {
-    return figureFactory;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorPlugin.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorPlugin.java
deleted file mode 100644
index 3354dd6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDEditorPlugin.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.plugin.*;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ProductCustomizationProvider;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.ExtensionsSchemasRegistry;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeCustomizationRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.*;
-
-public class XSDEditorPlugin extends AbstractUIPlugin
-{
-  public static final String PLUGIN_ID = "org.eclipse.wst.xsd.ui"; //$NON-NLS-1$
-  public static final String EDITOR_ID = "org.eclipse.wst.xsd.ui.internal.editor.InternalXSDMultiPageEditor";  //$NON-NLS-1$
-  public static final String CONST_XSD_DEFAULT_PREFIX_TEXT = "org.eclipse.wst.xmlschema.xsdDefaultPrefixText"; //$NON-NLS-1$
-  public static final String CONST_PREFERED_BUILT_IN_TYPES = "org.eclipse.wst.xmlschema.preferedBuiltInTypes";  //$NON-NLS-1$
-  public static final String CUSTOM_LIST_SEPARATOR = "\n"; //$NON-NLS-1$
-  public static final String EXTENSIONS_SCHEMAS_EXTENSIONID = "org.eclipse.wst.xsd.ui.extensionCategories"; //$NON-NLS-1$
-  private static final String DEPRECATED_EXTENSIONS_SCHEMAS_EXTENSIONID = "org.eclipse.wst.xsd.ui.ExtensionsSchemasDescription"; //$NON-NLS-1$  
-  public final static String DEFAULT_TARGET_NAMESPACE = "http://www.example.org"; //$NON-NLS-1$
-  public final static String XSD_CONTENT_TYPE_ID = "org.eclipse.wst.xsd.core.xsdsource"; //$NON-NLS-1$
-  
-	//The shared instance.
-	private static XSDEditorPlugin plugin;
-	//Resource bundle.
-	private ResourceBundle resourceBundle;
-  private ExtensionsSchemasRegistry registry;  
-  private NodeCustomizationRegistry nodeCustomizationRegistry;
-  private XSDEditorConfiguration xsdEditorConfiguration = null;
-  
-  public static final String CONST_USE_SIMPLE_EDIT_MODE = PLUGIN_ID + ".useSimpleEditMode"; //$NON-NLS-1$
-  public static final String CONST_SHOW_INHERITED_CONTENT = PLUGIN_ID + ".showInheritedContent"; //$NON-NLS-1$
-
-  public static final String CONST_XSD_LANGUAGE_QUALIFY = "org.eclipse.wst.xmlschema.xsdQualify"; //$NON-NLS-1$
-  public static final String CONST_DEFAULT_TARGET_NAMESPACE = "org.eclipse.wst.xmlschema.defaultTargetnamespaceText"; //$NON-NLS-1$
-  public static final String CONST_SHOW_EXTERNALS = PLUGIN_ID + ".showExternals"; //$NON-NLS-1$
-  public static final String CONST_XSD_IMPORT_CLEANUP = PLUGIN_ID + ".autoImportCleanup"; //$NON-NLS-1$
-  public static final String CONST_XSD_AUTO_OPEN_SCHEMA_LOCATION_DIALOG = PLUGIN_ID + ".autoOpenSchemaLocationDialog"; //$NON-NLS-1$
-  
-  public static String DEFAULT_PAGE = "org.eclipse.wst.xsd.ui.internal.defaultPage";
-  public static String DESIGN_PAGE = "org.eclipse.wst.xsd.ui.internal.designPage";
-  public static String SOURCE_PAGE = "org.eclipse.wst.xsd.ui.internal.sourcePage";
-
-	/**
-	 * The constructor.
-	 */
-	public XSDEditorPlugin() {
-		super();
-		plugin = this;
-	}
-
-	/**
-	 * This method is called upon plug-in activation
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-	}
-
-	/**
-	 * This method is called when the plug-in is stopped
-	 */
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		plugin = null;
-		resourceBundle = null;
-	}
-
-	/**
-	 * Returns the shared instance.
-	 */
-	public static XSDEditorPlugin getDefault() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the string from the plugin's resource bundle,
-	 * or 'key' if not found.
-	 */
-	public static String getResourceString(String key) {
-		ResourceBundle bundle = XSDEditorPlugin.getDefault().getResourceBundle();
-		try {
-			return (bundle != null) ? bundle.getString(key) : key;
-		} catch (MissingResourceException e) {
-			return key;
-		}
-	}
-  
-  public static String getResourceString(String key, Object o)
-  {
-      return getResourceString(key, new Object[] { o});
-  }
-
-  public static String getResourceString(String key, Object[] objects)
-  {
-      return MessageFormat.format(getResourceString(key), objects);
-  }
-	
-  public static String getResourceString(String key, Object o1, Object o2)
-  {
-      return getResourceString(key, new Object[] { o1, o2});
-  }
-
-	/**
-	 * Returns the plugin's resource bundle,
-	 */
-	public ResourceBundle getResourceBundle() {
-		try {
-			if (resourceBundle == null)
-				// resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.xsd.ui.internal.editor.EditorPluginResources");
-        resourceBundle = Platform.getResourceBundle(getBundle());
-		} catch (MissingResourceException x) {
-			resourceBundle = null;
-		}
-		return resourceBundle;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin("org.eclipse.wst.xsd.ui", path); //$NON-NLS-1$
-	}
-	
-	public static ImageDescriptor getImageDescriptor(String name, boolean getBaseURL) {
-		try {
-			URL installURL = getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
-			String imageString = getBaseURL ? "icons/" + name : name; //$NON-NLS-1$
-
-			URL imageURL = new URL(installURL, imageString);
-			return ImageDescriptor.createFromURL(imageURL);
-		} catch (MalformedURLException e) {
-			return null;
-		}
-	}
-
-	public Image getIcon(String name)
-	{
-	  try {
-		ImageRegistry imageRegistry = getImageRegistry();
-
-		if (imageRegistry.get(name) != null) {
-			return imageRegistry.get(name);
-		}
-		else {
-			URL installURL = getDefault().getBundle().getEntry("/"); //$NON-NLS-1$
-			String imageString = "icons/" + name; //$NON-NLS-1$
-
-			URL imageURL = new URL(installURL, imageString);
-			imageRegistry.put(name, ImageDescriptor.createFromURL(imageURL));
-			return imageRegistry.get(name);
-		}
-
-	  } catch (Exception e) {
-		return null;
-	  }
-	}
-	
-	public static XSDEditorPlugin getPlugin() {
-		return plugin;
-	}
-
-	public static String getXSDString(String key) {
-		return getResourceString(key);
-	}
-
-  /**
-   * This gets the string resource and does one substitution.
-   */
-  public String getString(String key, Object s1) {
-    return MessageFormat.format(Platform.getResourceBundle(getBundle()).getString(key), new Object[]{s1});
-  }
-  
-	public static Image getXSDImage(String iconName) {
-		return getDefault().getImage(iconName);
-	}
-
-	public Image getImage(String iconName) {
-		ImageRegistry imageRegistry = getImageRegistry();
-
-		if (imageRegistry.get(iconName) != null) {
-			return imageRegistry.get(iconName);
-		}
-		else {
-			imageRegistry.put(iconName, ImageDescriptor.createFromFile(getClass(), iconName));
-			return imageRegistry.get(iconName);
-		}
-	}
-	
-	public URL getBaseURL() {
-		return getDescriptor().getInstallURL();
-	}
-
-	public Image getIconImage(String object) {
-		try {
-			return ExtendedImageRegistry.getInstance().getImage(new URL(getBaseURL() + "icons/" + object + ".gif")); //$NON-NLS-1$ //$NON-NLS-2$
-		}
-		catch (MalformedURLException exception) {
-
-		}
-		return null;
-	}
-
-  public boolean getShowInheritedContent()
-  {
-    return getPreferenceStore().getBoolean(CONST_SHOW_INHERITED_CONTENT);
-  }
-  
-  protected void initializeDefaultPreferences(IPreferenceStore store)
-  {
-    store.setDefault(CONST_SHOW_INHERITED_CONTENT, false);
-    store.setDefault(CONST_XSD_DEFAULT_PREFIX_TEXT, "xsd"); //$NON-NLS-1$
-    store.setDefault(CONST_XSD_LANGUAGE_QUALIFY, false);
-    store.setDefault(DEFAULT_PAGE, DESIGN_PAGE);
-    store.setDefault(CONST_DEFAULT_TARGET_NAMESPACE, DEFAULT_TARGET_NAMESPACE);
-    store.setDefault(CONST_SHOW_EXTERNALS, false);
-    store.setDefault(CONST_XSD_IMPORT_CLEANUP, false);
-    store.setDefault(CONST_XSD_AUTO_OPEN_SCHEMA_LOCATION_DIALOG, true);
-    
-    //Even the last item in the list must contain a trailing List separator
-    store.setDefault(CONST_PREFERED_BUILT_IN_TYPES,     		
-    		"boolean"+ CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"date" + CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"dateTime" + CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"double" + CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"float" + CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"hexBinary" + CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"int" + CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"string" + CUSTOM_LIST_SEPARATOR + //$NON-NLS-1$
-    		"time" + CUSTOM_LIST_SEPARATOR); //$NON-NLS-1$
-  }
-
-  public ExtensionsSchemasRegistry getExtensionsSchemasRegistry()
-  {
-    if (registry == null)
-    {
-      registry = new ExtensionsSchemasRegistry(EXTENSIONS_SCHEMAS_EXTENSIONID);
-      registry.__internalSetDeprecatedExtensionId(DEPRECATED_EXTENSIONS_SCHEMAS_EXTENSIONID);
-      registry.setPrefStore(XSDEditorPlugin.getPlugin().getPreferenceStore() );
-    }
-    return registry;
-  }
-
- 
-  public XSDEditorConfiguration getXSDEditorConfiguration()
-  {
-    if (xsdEditorConfiguration == null)
-    {
-      xsdEditorConfiguration = new XSDEditorConfiguration();
-    }
-    return xsdEditorConfiguration;
-  }
-
-  /**
-   * Get the xml schema default namespace prefix
-   */
-  public String getXMLSchemaPrefix()
-  {
-    return getPreferenceStore().getString(CONST_XSD_DEFAULT_PREFIX_TEXT);
-  }
-
-  public boolean getShowExternals()
-  {
-    return getPreferenceStore().getBoolean(CONST_SHOW_EXTERNALS);
-  }
-  
-  public void setShowExternals(boolean doShow)
-  {
-    getPreferenceStore().setValue(CONST_SHOW_EXTERNALS, doShow);
-  }
-  
-  public boolean getRemoveImportSetting()
-  {
-    return getPreferenceStore().getBoolean(CONST_XSD_IMPORT_CLEANUP);
-  }
-
-  public boolean getAutomaticallyOpenSchemaLocationDialogSetting()
-  {
-    return getPreferenceStore().getBoolean(CONST_XSD_AUTO_OPEN_SCHEMA_LOCATION_DIALOG);
-  }
-  
-  /**
-   * Get the xml schema default target namespace
-   */
-  public String getXMLSchemaTargetNamespace() {
-    String targetNamespace = getPreferenceStore().getString(CONST_DEFAULT_TARGET_NAMESPACE);
-    if (!targetNamespace.endsWith("/")) { //$NON-NLS-1$
-      targetNamespace = targetNamespace + "/"; //$NON-NLS-1$
-    }
-    return targetNamespace;
-  }
-
-  /**
-   * Get the xml schema language qualification
-   */
-  public boolean isQualifyXMLSchemaLanguage() {
-    return getPreferenceStore().getBoolean(CONST_XSD_LANGUAGE_QUALIFY);
-  }
-
-  public static Shell getShell() {
-    return getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell();
-  }
-  
-  public void setSourcePageAsDefault()
-  {
-    getPreferenceStore().setValue(DEFAULT_PAGE, SOURCE_PAGE);
-  }
-
-  public void setDesignPageAsDefault()
-  {
-    getPreferenceStore().setValue(DEFAULT_PAGE, DESIGN_PAGE);
-  }
-  
-  /**
-   * Method getDefaultPage.
-   * 
-   * @return String value of the string constant that is the default page
-   *         the editor should turn to when first opened. Changes to the
-   *         last visible page when the editor was closed
-   */
-  public String getDefaultPage() {
-    return getPreferenceStore().getString(DEFAULT_PAGE);
-  }
-
-  public NodeCustomizationRegistry getNodeCustomizationRegistry()
-  {
-    if (nodeCustomizationRegistry == null)
-    {  
-      nodeCustomizationRegistry = new NodeCustomizationRegistry("foo");
-    }
-    return nodeCustomizationRegistry;
-  }
-  
-  private static final String PRODUCT_CUSTOMIZATION_PROVIDER_PLUGIN_ID = "org.eclipse.wst.xsd.ui.productCustomizationProviderPluginId"; //$NON-NLS-1$
-  private static final String PRODUCT_CUSTOMIZATION_PROVIDER_CLASS_NAME = "org.eclipse.wst.xsd.ui.productCustomizationProviderClassName"; //$NON-NLS-1$
-  
-  private static ProductCustomizationProvider productCustomizationProvider;
-  private static boolean productCustomizationProviderInitialized = false;
-  
-  public ProductCustomizationProvider getProductCustomizationProvider()
-  {
-    if (!productCustomizationProviderInitialized)
-    {
-      productCustomizationProviderInitialized = true;
-      String pluginName = getPreferenceStore().getString(PRODUCT_CUSTOMIZATION_PROVIDER_PLUGIN_ID);
-      String className = getPreferenceStore().getString(PRODUCT_CUSTOMIZATION_PROVIDER_CLASS_NAME);
-      if (pluginName != null && pluginName.length() > 0 &&
-          className != null && className.length() > 0)
-      {
-        try
-        {
-          Bundle bundle = Platform.getBundle(pluginName);
-          Class clazz = bundle.loadClass(className);
-          productCustomizationProvider = (ProductCustomizationProvider)clazz.newInstance();
-        }          
-        catch (Exception e)
-        {          
-        }
-      }
-    }  
-    return productCustomizationProvider;
-  } 
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDElementReferenceEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDElementReferenceEditManager.java
deleted file mode 100644
index 6d03aec..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDElementReferenceEditManager.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentDescriptionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDElementCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateElementReferenceAndManageDirectivesCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateElementReferenceCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.dialogs.NewElementDialog;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDElementReferenceEditManager implements ComponentReferenceEditManager
-{  
-  protected IFile currentFile;
-  protected XSDSchema[] schemas;
-  
-  public XSDElementReferenceEditManager(IFile currentFile, XSDSchema[] schemas)
-  {
-    this.currentFile = currentFile;
-    this.schemas = schemas;
-  }
-  
-  public void addToHistory(ComponentSpecification component)
-  {
-    // TODO (cs) implement me!    
-  }
-
-  public IComponentDialog getBrowseDialog()
-  {
-    //XSDSetExistingTypeDialog dialog = new XSDSetExistingTypeDialog(currentFile, schemas);
-    //return dialog;
-    XSDSearchListDialogDelegate dialogDelegate = 
-    	new XSDSearchListDialogDelegate(XSDSearchListDialogDelegate.ELEMENT_META_NAME, currentFile, schemas);
-    return dialogDelegate;
-  }
-
-  public IComponentDescriptionProvider getComponentDescriptionProvider()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public ComponentSpecification[] getHistory()
-  {
-    // TODO (cs) implement this properly - should this history be global or local to each editor?
-    // This is something we should play around with ourselves to see what feels right.
-    //
-    List list = new ArrayList();
-    ComponentSpecification result[] = new ComponentSpecification[list.size()];
-    list.toArray(result);
-    return result;
-  }
-
-  public IComponentDialog getNewDialog()
-  {
-	  if (schemas.length > 0) {
-		  return new NewElementDialog(schemas[0]);
-	  }
-	  else {
-		  return new NewElementDialog();
-	  }
-  }
-
-  public ComponentSpecification[] getQuickPicks()
-  {
-    // TODO (cs) implement this properly - we should be providing a list of the 
-    // most 'common' built in schema types here
-    // I believe Trung will be working on a perference page to give us this list
-    // for now let's hard code some values
-    //
-    List list = new ArrayList();
-    
-    ComponentSpecification result[] = new ComponentSpecification[list.size()];
-    list.toArray(result);
-    return result;
-  }
-  
-//TODO not changed yet
-  public void modifyComponentReference(Object referencingObject, ComponentSpecification component)
-  {
-    XSDElementDeclaration concreteComponent = null;
-    if (referencingObject instanceof Adapter)
-    {
-      Adapter adapter = (Adapter)referencingObject;
-      if (adapter.getTarget() instanceof XSDElementDeclaration)
-      {
-        concreteComponent = (XSDElementDeclaration)adapter.getTarget();
-      }
-    }
-    else if (referencingObject instanceof XSDConcreteComponent)
-    {
-      concreteComponent = (XSDElementDeclaration) referencingObject;
-    }
-    if (concreteComponent != null)
-    {
-        if (component.isNew())
-        {  
-          XSDElementDeclaration elementDec = null;
-          if (component.getMetaName() == IXSDSearchConstants.ELEMENT_META_NAME)
-          {  
-            AddXSDElementCommand command = new AddXSDElementCommand(Messages._UI_ACTION_ADD_ELEMENT, concreteComponent.getSchema());
-            command.setNameToAdd(component.getName());
-            command.execute();
-            elementDec = (XSDElementDeclaration) command.getAddedComponent();
-          }
-          if (elementDec != null)
-          {
-            Command command = new UpdateElementReferenceCommand(Messages._UI_ACTION_UPDATE_ELEMENT_REFERENCE, concreteComponent, elementDec);
-            command.execute();
-          }
-          XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-        }  
-        else
-        {
-          Command command = new UpdateElementReferenceAndManageDirectivesCommand(concreteComponent, component.getName(), component.getQualifier(), component.getFile());
-          command.setLabel(Messages._UI_ACTION_UPDATE_ELEMENT_REFERENCE);
-          command.execute();
-        }  
-      }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDFileEditorInput.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDFileEditorInput.java
deleted file mode 100644
index 62f283f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDFileEditorInput.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.IADTEditorInput;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDFileEditorInput extends FileEditorInput implements IADTEditorInput
-{
-  private IFile file;
-  private XSDSchema schema;
-  private String editorName;
-
-  public XSDFileEditorInput(IFile file, XSDSchema schema) {
-    super(file);
-    if (file == null) {
-      throw new IllegalArgumentException();
-    }
-    this.file = file;
-    this.schema = schema;
-    editorName = file.getName();
-  }
-
-  public IFile getFile()
-  {
-    return file;
-  }
-
-  public XSDSchema getSchema()
-  {
-    return schema;
-  }
-
-  public void setEditorName(String name)
-  {
-    editorName = name;
-  }
- 
-  public String getName()
-  {
-    if (editorName != null)
-    {
-      return editorName;
-    }
-    return super.getName();
-  }
-  
-  public String getToolTipText()
-  {
-    if (schema != null)
-    {
-      String ns = schema.getTargetNamespace();
-      if (ns != null && ns.length() > 0)
-        return Messages._UI_LABEL_TARGET_NAMESPACE + ns;
-      else
-        return Messages._UI_LABEL_NO_NAMESPACE;
-    }
-    return super.getToolTipText();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlink.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlink.java
deleted file mode 100644
index 960ed5d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlink.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * XSDHyperlink knows how to open links from XSD files.
- * 
- * @see XSDHyperlinkDetector
- */
-public class XSDHyperlink implements IHyperlink
-{
-  private IRegion fRegion;
-  private XSDConcreteComponent fComponent;
-
-  public XSDHyperlink(IRegion region, XSDConcreteComponent component)
-  {
-    fRegion = region;
-    fComponent = component;
-  }
-
-  public IRegion getHyperlinkRegion()
-  {
-    return fRegion;
-  }
-
-  public String getTypeLabel()
-  {
-    return null;
-  }
-
-  public String getHyperlinkText()
-  {
-    return Messages._UI_ACTION_SET_AS_FOCUS;
-  }
-
-  public void open()
-  {
-    XSDSchema schema = fComponent.getSchema();
-
-    if (schema == null)
-    {
-      return;
-    }
-
-    String schemaLocation = schema.getSchemaLocation();
-    schemaLocation = URIHelper.removePlatformResourceProtocol(schemaLocation);
-    IPath schemaPath = new Path(schemaLocation);
-    IFile schemaFile = ResourcesPlugin.getWorkspace().getRoot().getFile(schemaPath);
-
-    boolean fileExists = schemaFile != null && schemaFile.exists();
-
-    if (!fileExists)
-    {
-      return;
-    }
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    if (workbenchWindow != null)
-    {
-      IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-      IEditorPart editorPart = workbenchPage.getActiveEditor();
-      
-      workbenchPage.getNavigationHistory().markLocation(editorPart);
-      
-      try
-      {
-        editorPart = IDE.openEditor(workbenchPage, schemaFile, true);
-        if (editorPart instanceof InternalXSDMultiPageEditor)
-        {
-          ((InternalXSDMultiPageEditor) editorPart).openOnGlobalReference(fComponent);
-        }
-      }
-      catch (PartInitException pie)
-      {
-        Logger.log(Logger.WARNING_DEBUG, pie.getMessage(), pie);
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkDetector.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkDetector.java
deleted file mode 100644
index 8e27f14..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkDetector.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *     Jens Lukowski/Innoopract - initial renaming/restructuring
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jface.text.IRegion;
-import org.eclipse.jface.text.hyperlink.IHyperlink;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelAdapter;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Attr;
-
-/**
- * Detects hyperlinks for XSD files. Used by the XSD text editor to provide a
- * "Go to declaration" functionality similar with the one provided by the Java
- * editor.
- */
-public class XSDHyperlinkDetector extends BaseHyperlinkDetector
-{
-  /**
-   * Determines whether an attribute is "linkable" that is, the component it
-   * points to can be the target of a "go to definition" navigation. Derived
-   * classes should override.
-   * 
-   * @param name the attribute name. Must not be null.
-   * @return true if the attribute is linkable, false otherwise.
-   */
-  protected boolean isLinkableAttribute(String name)
-  {
-    boolean isLinkable = name.equals(XSDConstants.TYPE_ATTRIBUTE) ||
-      name.equals(XSDConstants.REFER_ATTRIBUTE) || 
-      name.equals(XSDConstants.REF_ATTRIBUTE) || 
-      name.equals(XSDConstants.BASE_ATTRIBUTE) || 
-      name.equals(XSDConstants.SCHEMALOCATION_ATTRIBUTE) || 
-      name.equals(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE) ||
-      name.equals(XSDConstants.ITEMTYPE_ATTRIBUTE) ||
-      name.equals(XSDConstants.MEMBERTYPES_ATTRIBUTE)
-      ;
-
-    return isLinkable;
-  }
-
-  /**
-   * Creates a hyperlink based on the selected node. Derived classes should
-   * override.
-   * 
-   * @param document the source document.
-   * @param node the node under the cursor.
-   * @param region the text region to use to create the hyperlink.
-   * @return a new IHyperlink for the node or null if one cannot be created.
-   */
-  protected IHyperlink createHyperlink(IDocument document, IDOMNode node, IRegion region)
-  {
-    XSDSchema xsdSchema = getXSDSchema(document);
-
-    if (xsdSchema == null)
-    {
-      return null;
-    }
-
-    XSDConcreteComponent targetComponent = getTargetXSDComponent(xsdSchema, node);
-
-    if (targetComponent != null)
-    {
-      IRegion nodeRegion = getHyperlinkRegion(node);
-
-      return new XSDHyperlink(nodeRegion, targetComponent);
-    }
-
-    return null;
-  }
-
-  /**
-   * Finds the XSD component for the given node.
-   * 
-   * @param xsdSchema cannot be null
-   * @param node cannot be null
-   * @return XSDConcreteComponent
-   */
-  private XSDConcreteComponent getTargetXSDComponent(XSDSchema xsdSchema, IDOMNode node)
-  {
-    XSDConcreteComponent xsdComponent = xsdSchema.getCorrespondingComponent(node);
-
-    String attributeName = null;
-    
-    if (node instanceof Attr)
-    {
-      Attr attribute = (Attr)node;
-      attributeName = attribute != null ? attribute.getName(): null;
-    }
-    
-    XSDHyperlinkTargetLocator xsdHyperlinkTargetLocator = new XSDHyperlinkTargetLocator();
-    XSDConcreteComponent component = xsdHyperlinkTargetLocator.locate(xsdComponent, attributeName); 
-    
-    return component;
-  }
-
-  /**
-   * Gets the xsd schema from document
-   * 
-   * @param document
-   * @return XSDSchema or null of one does not exist yet for document
-   */
-  private XSDSchema getXSDSchema(IDocument document)
-  {
-    XSDSchema schema = null;
-    IStructuredModel model = StructuredModelManager.getModelManager().getExistingModelForRead(document);
-    if (model != null)
-    {
-      try
-      {
-        if (model instanceof IDOMModel)
-        {
-          IDOMDocument domDoc = ((IDOMModel) model).getDocument();
-          if (domDoc != null)
-          {
-            XSDModelAdapter modelAdapter = (XSDModelAdapter) domDoc.getExistingAdapter(XSDModelAdapter.class);
-            /*
-             * ISSUE: Didn't want to go through initializing schema if it does
-             * not already exist, so just attempted to get existing adapter. If
-             * doesn't exist, just don't bother working.
-             */
-            if (modelAdapter != null)
-              schema = modelAdapter.getSchema();
-          }
-        }
-      }
-      finally
-      {
-        model.releaseFromRead();
-      }
-    }
-    return schema;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkTargetLocator.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkTargetLocator.java
deleted file mode 100644
index c04aebd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDHyperlinkTargetLocator.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.List;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDIdentityConstraintDefinition;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-import org.eclipse.xsd.util.XSDConstants;
-import org.eclipse.xsd.util.XSDSwitch;
-
-/**
- * A custom XSDSwitch used to locate the "referenced" component. Used by the
- * hyperlink/F3 navigation mechanism. Made a separate class because it is used
- * from the WSDL editor as well.
- */
-public class XSDHyperlinkTargetLocator extends XSDSwitch
-{
-  /**
-   * Holds the attribute name if the cursor/mouse is over an attribute.
-   */
-  private String attributeName;
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.xsd.util.XSDSwitch#caseXSDAttributeDeclaration(org.eclipse.xsd.XSDAttributeDeclaration)
-   */
-  public Object caseXSDAttributeDeclaration(XSDAttributeDeclaration attributeDeclaration)
-  {
-    XSDConcreteComponent target = null;
-
-    if (attributeDeclaration.isAttributeDeclarationReference())
-    {
-      target = attributeDeclaration.getResolvedAttributeDeclaration();
-    }
-    else if (attributeDeclaration.getAnonymousTypeDefinition() == null)
-    {
-      target = attributeDeclaration.getTypeDefinition();
-
-      // Avoid navigating to built in data types.
-
-      if (isFromSchemaForSchema(target))
-      {
-        target = null;
-      }
-    }
-    return target;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.xsd.util.XSDSwitch#caseXSDAttributeGroupDefinition(org.eclipse.xsd.XSDAttributeGroupDefinition)
-   */
-  public Object caseXSDAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroupDefinition)
-  {
-    XSDConcreteComponent target = null;
-
-    if (attributeGroupDefinition.isAttributeGroupDefinitionReference())
-    {
-      target = attributeGroupDefinition.getResolvedAttributeGroupDefinition();
-    }
-
-    return target;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.xsd.util.XSDSwitch#caseXSDElementDeclaration(org.eclipse.xsd.XSDElementDeclaration)
-   */
-  public Object caseXSDElementDeclaration(XSDElementDeclaration elementDeclaration)
-  {
-    XSDConcreteComponent target = null;
-
-    if (elementDeclaration.isElementDeclarationReference())
-    {
-      target = elementDeclaration.getResolvedElementDeclaration();
-    }
-    else
-    {
-      XSDConcreteComponent typeDefinition = null;
-
-      if (elementDeclaration.getAnonymousTypeDefinition() == null)
-      {
-        typeDefinition = elementDeclaration.getTypeDefinition();
-      }
-
-      XSDConcreteComponent substitutionGroupAffiliation = elementDeclaration.getSubstitutionGroupAffiliation();
-
-      if (typeDefinition != null && substitutionGroupAffiliation != null)
-      {
-        // There are 2 things we can navigate to: if the cursor is anywhere on
-        // the
-        // substitution attribute then jump to that, otherwise just go to the
-        // base type.
-
-        if (XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE.equals(attributeName))
-        {
-          target = substitutionGroupAffiliation;
-        }
-        else
-        {
-          target = typeDefinition;
-        }
-      }
-      else
-      {
-        target = typeDefinition != null ? typeDefinition : substitutionGroupAffiliation;
-      }
-
-      if (isFromSchemaForSchema(target))
-      {
-        target = null;
-      }
-    }
-
-    return target;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.xsd.util.XSDSwitch#caseXSDIdentityConstraintDefinition(org.eclipse.xsd.XSDIdentityConstraintDefinition)
-   */
-  public Object caseXSDIdentityConstraintDefinition(XSDIdentityConstraintDefinition idConstraintDefinition)
-  {
-    Object target = null;
-
-    XSDIdentityConstraintDefinition referencedKey = idConstraintDefinition.getReferencedKey();
-
-    if (referencedKey != null)
-    {
-      target = referencedKey;
-    }
-
-    return target;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.xsd.util.XSDSwitch#caseXSDModelGroupDefinition(org.eclipse.xsd.XSDModelGroupDefinition)
-   */
-  public Object caseXSDModelGroupDefinition(XSDModelGroupDefinition modelGroupDefinition)
-  {
-    XSDConcreteComponent target = null;
-
-    if (modelGroupDefinition.isModelGroupDefinitionReference())
-    {
-      target = modelGroupDefinition.getResolvedModelGroupDefinition();
-    }
-
-    return target;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.xsd.util.XSDSwitch#caseXSDSchemaDirective(org.eclipse.xsd.XSDSchemaDirective)
-   */
-  public Object caseXSDSchemaDirective(XSDSchemaDirective directive)
-  {
-    XSDSchema schema = directive.getResolvedSchema();
-
-    return schema;
-  }
-
-  public Object caseXSDSimpleTypeDefinition(XSDSimpleTypeDefinition typeDefinition)
-  {
-    XSDConcreteComponent target = null;
-
-    // Simple types can be one of: atomic, list or union.
-
-    XSDVariety variety = typeDefinition.getVariety();
-    int varietyType = variety.getValue();
-
-    switch (varietyType)
-    {
-      case XSDVariety.ATOMIC:
-        {
-          target = typeDefinition.getBaseTypeDefinition();
-        }
-        break;
-      case XSDVariety.LIST:
-        {
-          target = typeDefinition.getItemTypeDefinition();
-        }
-        break;
-      case XSDVariety.UNION:
-        {
-          List memberTypes = typeDefinition.getMemberTypeDefinitions();
-          if (memberTypes != null && memberTypes.size() > 0)
-          {
-            // ISSUE: What if there are more than one type?
-            // This could be a case for multiple hyperlinks at the same
-            // location.
-            target = (XSDConcreteComponent) memberTypes.get(0);
-          }
-        }
-        break;
-    }
-
-    // Avoid navigating to built in data types.
-
-    if (isFromSchemaForSchema(target))
-    {
-      target = null;
-    }
-
-    return target;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.xsd.util.XSDSwitch#caseXSDTypeDefinition(org.eclipse.xsd.XSDTypeDefinition)
-   */
-  public Object caseXSDTypeDefinition(XSDTypeDefinition typeDefinition)
-  {
-    XSDConcreteComponent target = null;
-
-    XSDTypeDefinition baseType = typeDefinition.getBaseType();
-
-    if (baseType != null)
-    {
-      target = baseType;
-    }
-
-    // Avoid navigating to built in data types.
-
-    if (isFromSchemaForSchema(target))
-    {
-      target = null;
-    }
-
-    return target;
-  }
-
-  /**
-   * Detects if a given schema component is from the schema for schema (built in
-   * data types). Used to avoid navigating to this type of components as they
-   * don't have an accessible physical location.
-   * 
-   * @param component the component to check.
-   * @return true if the component is from the schema for schema namespace,
-   *         false otherwise.
-   */
-  public boolean isFromSchemaForSchema(XSDConcreteComponent component)
-  {
-    if (component == null)
-    {
-      return false;
-    }
-
-    XSDSchema schema = component.getSchema();
-
-    if (schema != null && schema.equals(schema.getSchemaForSchema()))
-    {
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Locates the target component - for example the element declaration pointed
-   * to by an element reference, etc.
-   * 
-   * @param component the current component.
-   * @param attributeName the attribute name if the cursor/mouse is over an
-   *        attribute. This is used to provide fine grained navigation for
-   *        components with more than one "active" attribute.
-   * @return the referenced XSD concrete component or null if none is found.
-   */
-  public XSDConcreteComponent locate(XSDConcreteComponent component, String attributeName)
-  {
-    this.attributeName = attributeName;
-
-    return (XSDConcreteComponent) doSwitch(component);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDMultiPageEditorContributor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDMultiPageEditorContributor.java
deleted file mode 100644
index 5d62af8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDMultiPageEditorContributor.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.GEFActionConstants;
-import org.eclipse.gef.ui.actions.ZoomComboContributionItem;
-import org.eclipse.gef.ui.actions.ZoomInRetargetAction;
-import org.eclipse.gef.ui.actions.ZoomOutRetargetAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorActionBarContributor;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.RetargetAction;
-import org.eclipse.ui.part.MultiPageEditorActionBarContributor;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.ITextEditorActionConstants;
-import org.eclipse.wst.sse.ui.internal.ISourceViewerActionBarContributor;
-import org.eclipse.wst.xsd.ui.internal.actions.IXSDToolbarAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.CaptureScreenAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction;
-
-/**
- * Manages the installation/deinstallation of global actions for multi-page
- * editors. Responsible for the redirection of global actions to the active
- * editor. Multi-page contributor replaces the contributors for the individual
- * editors in the multi-page editor.
- */
-public class XSDMultiPageEditorContributor extends MultiPageEditorActionBarContributor
-{
-  private IEditorPart activeEditorPart;
-  private InternalXSDMultiPageEditor xsdEditor;
-  protected ITextEditor textEditor;
-  protected IEditorActionBarContributor sourceViewerActionContributor = null;
-  protected List fPartListeners= new ArrayList();
-  ZoomInRetargetAction zoomInRetargetAction;
-  ZoomOutRetargetAction zoomOutRetargetAction;
-  Action captureScreenAction;
-  ZoomComboContributionItem zoomComboContributionItem;
-  /**
-   * Creates a multi-page contributor.
-   */
-  public XSDMultiPageEditorContributor()
-  {
-    super();
-    sourceViewerActionContributor = new SourcePageActionContributor();
-    zoomInRetargetAction = new ZoomInRetargetAction();
-    zoomInRetargetAction.setImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/etool16/zoomplus.gif"));
-    zoomOutRetargetAction = new ZoomOutRetargetAction();
-    zoomOutRetargetAction.setImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/etool16/zoomminus.gif"));
-    captureScreenAction = new CaptureScreenAction();
-    fPartListeners.add(zoomInRetargetAction);
-    fPartListeners.add(zoomOutRetargetAction);
-  }
-
-  /**
-   * Returns the action registed with the given text editor.
-   * 
-   * @return IAction or null if editor is null.
-   */
-  protected IAction getAction(ITextEditor editor, String actionID)
-  {
-    return (editor == null ? null : editor.getAction(actionID));
-  }
-
-  /*
-   * (non-JavaDoc) Method declared in
-   * AbstractMultiPageEditorActionBarContributor.
-   */
-
-  public void setActivePage(IEditorPart part)
-  {
-    if (activeEditorPart == part)
-      return;
-
-    activeEditorPart = part;
-
-    IActionBars actionBars = getActionBars();
-    boolean isSource = false;
-    
-    if (activeEditorPart != null && activeEditorPart instanceof ITextEditor)
-    {
-      isSource = true;
-      zoomInRetargetAction.setEnabled(false);
-      zoomOutRetargetAction.setEnabled(false);
-      captureScreenAction.setEnabled(false);
-      activateSourcePage(activeEditorPart, true);
-    }
-    else
-    {
-      activateSourcePage(xsdEditor, false);
-      if (part instanceof InternalXSDMultiPageEditor)
-      {
-        xsdEditor = (InternalXSDMultiPageEditor) part;
-      }
-      if (xsdEditor != null)
-      {    	  
-        // cs: here's we ensure the UNDO and REDO actions are available when 
-        // the design view is active
-        IWorkbenchPartSite site = xsdEditor.getSite();
-        if (site instanceof IEditorSite) 
-        {
-          ITextEditor textEditor = xsdEditor.getTextEditor();
-          IActionBars siteActionBars = ((IEditorSite) site).getActionBars();
-          siteActionBars.setGlobalActionHandler(ITextEditorActionConstants.UNDO, getAction(textEditor, ITextEditorActionConstants.UNDO));
-          siteActionBars.setGlobalActionHandler(ITextEditorActionConstants.REDO, getAction(textEditor, ITextEditorActionConstants.REDO));
-          siteActionBars.updateActionBars();    					
-        }
-			
-        Object adapter = xsdEditor.getAdapter(ActionRegistry.class);
-        if (adapter instanceof ActionRegistry)
-        {
-          ActionRegistry registry = (ActionRegistry) adapter;
-          actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), registry.getAction(DeleteAction.ID));
-          actionBars.setGlobalActionHandler(GEFActionConstants.ZOOM_IN, registry.getAction(GEFActionConstants.ZOOM_IN));
-          actionBars.setGlobalActionHandler(GEFActionConstants.ZOOM_OUT, registry.getAction(GEFActionConstants.ZOOM_OUT));
-          actionBars.setGlobalActionHandler(ActionFactory.PRINT.getId(), registry.getAction(ActionFactory.PRINT.getId()));
-          actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), registry.getAction(ActionFactory.SELECT_ALL.getId()));
-          zoomInRetargetAction.setEnabled(true);
-          zoomOutRetargetAction.setEnabled(true);
-          captureScreenAction.setEnabled(true);
-        }
-      }
-    }
-
-    if (actionBars != null) {
-      // update menu bar and tool bar
-      actionBars.updateActionBars();
-    }
-    
-    if (zoomComboContributionItem != null)
-    {
-      zoomComboContributionItem.setVisible(!isSource);
-      zoomComboContributionItem.update();
-      // Bug 254772 - parent contribution manager should not be null.  We added this item already.
-      // Force the ToolBarManager to update/redraw the items
-      zoomComboContributionItem.getParent().update(true);
-    }
-  }
-  
-  protected void activateSourcePage(IEditorPart activeEditor, boolean state)
-  {
-    if (sourceViewerActionContributor != null && sourceViewerActionContributor instanceof ISourceViewerActionBarContributor)
-    {
-      sourceViewerActionContributor.setActiveEditor(activeEditor);
-      ((ISourceViewerActionBarContributor) sourceViewerActionContributor).setViewerSpecificContributionsEnabled(state);
-    }
-  }
-
-  public void setActiveEditor(IEditorPart part)
-  {
-    IEditorPart activeNestedEditor = null;
-    if (part instanceof MultiPageEditorPart)
-    {
-      activeNestedEditor = part;
-    }
-    setActivePage(activeNestedEditor);
-    
-    if (part instanceof InternalXSDMultiPageEditor)
-    {
-      xsdEditor = (InternalXSDMultiPageEditor) part;
-
-      textEditor = xsdEditor.getTextEditor();
-      if (textEditor != null)
-      {      
-//        updateActions();  
-        getActionBars().updateActionBars();
-      }
-    }
-    
-    List list = XSDEditorPlugin.getPlugin().getXSDEditorConfiguration().getToolbarActions();
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      ((IXSDToolbarAction)i.next()).setEditorPart(activeNestedEditor);
-    }
-    
-    super.setActiveEditor(part);
-  }
-
-  public void contributeToMenu(IMenuManager manager)
-  {
-    IMenuManager menu = new MenuManager(Messages._UI_MENU_XSD_EDITOR);
-    manager.prependToGroup(IWorkbenchActionConstants.MB_ADDITIONS, menu);
-
-    // Add extension menu actions
-    List list = XSDEditorPlugin.getPlugin().getXSDEditorConfiguration().getToolbarActions();
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      menu.add((IXSDToolbarAction)i.next());
-    }
-
-    menu.add(zoomInRetargetAction);
-    menu.add(zoomOutRetargetAction);
-    menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-    menu.add(captureScreenAction);
-
-    menu.updateAll(true);
-  }
-
-  public void contributeToToolBar(IToolBarManager manager)
-  {
-    manager.add(new Separator());
-    // Add extension toolbar actions
-    List list = XSDEditorPlugin.getPlugin().getXSDEditorConfiguration().getToolbarActions();
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      manager.add((IXSDToolbarAction)i.next());
-    }
-
-    manager.add(new Separator());
-    String[] zoomStrings = new String[] { ZoomManager.FIT_ALL, ZoomManager.FIT_HEIGHT, ZoomManager.FIT_WIDTH };
-    zoomComboContributionItem = new ZoomComboContributionItem(getPage(), zoomStrings);
-    manager.add(zoomComboContributionItem);
-    manager.add(captureScreenAction);
-  }
-  
-  
-  public void init(IActionBars bars, IWorkbenchPage page)
-  {
-    Iterator e = fPartListeners.iterator();
-    while (e.hasNext())
-    {
-      page.addPartListener((RetargetAction) e.next());
-    }
-    
-    initSourceViewerActionContributor(bars);
-    
-    super.init(bars, page);
-  }
-
-  
-  protected void initSourceViewerActionContributor(IActionBars actionBars) {
-    if (sourceViewerActionContributor != null)
-      sourceViewerActionContributor.init(actionBars, getPage());
-  }
-  
-  public void dispose()
-  {
-    fPartListeners = null;
-    if (sourceViewerActionContributor != null)
-      sourceViewerActionContributor.dispose();
-    super.dispose();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDSelectionMapper.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDSelectionMapper.java
deleted file mode 100644
index e527599..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDSelectionMapper.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-public class XSDSelectionMapper implements ISelectionMapper
-{
-  public ISelection mapSelection(ISelection selection)
-  {
-    List list = new ArrayList();
-    if (selection instanceof IStructuredSelection)
-    {  
-      IStructuredSelection structuredSelection = (IStructuredSelection)selection;
-      for (Iterator i = structuredSelection.iterator(); i.hasNext(); )
-      {
-        Object o = i.next();
-        if (o instanceof Adapter)
-        {
-          list.add(((Adapter)o).getTarget());
-        }  
-        else
-        {
-          list.add(o);
-        }  
-      }  
-    }
-    return new StructuredSelection(list);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDSubstitutionGroupEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDSubstitutionGroupEditManager.java
deleted file mode 100644
index 8bf2506..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDSubstitutionGroupEditManager.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDElementCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDSubstitutionGroupEditManager extends XSDElementReferenceEditManager
-{
-
-  public XSDSubstitutionGroupEditManager(IFile currentFile, XSDSchema[] schemas)
-  {
-    super(currentFile, schemas);
-  }
-
-  public void modifyComponentReference(Object referencingObject, ComponentSpecification component)
-  {
-    XSDElementDeclaration concreteComponent = null;
-    if (referencingObject instanceof Adapter)
-    {
-      Adapter adapter = (Adapter)referencingObject;
-      if (adapter.getTarget() instanceof XSDElementDeclaration)
-      {
-        concreteComponent = (XSDElementDeclaration)adapter.getTarget();
-      }
-    }
-    else if (referencingObject instanceof XSDConcreteComponent)
-    {
-      concreteComponent = (XSDElementDeclaration) referencingObject;
-    }
-    if (concreteComponent != null)
-    {
-        if (component.isNew())
-        {  
-          XSDElementDeclaration elementDec = null;
-          if (component.getMetaName() == IXSDSearchConstants.ELEMENT_META_NAME)
-          {  
-            AddXSDElementCommand command = new AddXSDElementCommand(Messages._UI_ACTION_ADD_ELEMENT, concreteComponent.getSchema());
-            command.setNameToAdd(component.getName());
-            command.execute();
-            elementDec = (XSDElementDeclaration) command.getAddedComponent();
-          }
-          if (elementDec != null)
-          {
-            Command command = new UpdateAttributeValueCommand(concreteComponent.getElement(), XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE, elementDec.getQName(concreteComponent.getSchema()), org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_SUBSTITUTION_GROUP);
-            command.execute();
-          }  
-        }  
-        else
-        {
-          Command command = new UpdateAttributeValueCommand(concreteComponent.getElement(), XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE, ((XSDElementDeclaration)component.getObject()).getQName(concreteComponent.getSchema()), org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_SUBSTITUTION_GROUP);
-          command.execute();
-        }
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
deleted file mode 100644
index 0035915..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTabbedPropertySheetPage.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Eugene Ostroukhov, eugene@genuitec.com - [203291] XSD Editor Source State
- *                                              not updated in Outline/Graph
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeUseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDParticleAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelAdapter;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.w3c.dom.Element;
-
-public class XSDTabbedPropertySheetPage extends TabbedPropertySheetPage implements IADTObjectListener
-{
-  XSDBaseAdapter oldSelection;
-  XSDModelAdapter xsdModelAdapter;
-  public XSDTabbedPropertySheetPage(ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor)
-  {
-    super(tabbedPropertySheetPageContributor);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-
-      Object selected = ((StructuredSelection)selection).getFirstElement();
-      if (selected instanceof XSDBaseAdapter)
-      {
-        XSDBaseAdapter adapter = (XSDBaseAdapter)selected;
-        if (oldSelection != null)
-        {
-          oldSelection.unregisterListener(this);
-          if (oldSelection instanceof XSDElementDeclarationAdapter)
-          {
-            XSDElementDeclaration elem = (XSDElementDeclaration)((XSDElementDeclarationAdapter)oldSelection).getTarget();
-            if (elem.getContainer() != null)
-            {
-              Adapter adap = XSDAdapterFactory.getInstance().adapt(elem.getContainer());
-              if (adap instanceof XSDParticleAdapter)
-              {
-                XSDParticleAdapter particleAdapter = (XSDParticleAdapter)adap;
-                particleAdapter.unregisterListener(this);
-              }
-            }
-            if (elem.isElementDeclarationReference())
-            {
-              XSDElementDeclarationAdapter resolvedElementAdapter = (XSDElementDeclarationAdapter)XSDAdapterFactory.getInstance().adapt(elem.getResolvedElementDeclaration());
-              resolvedElementAdapter.unregisterListener(this);
-            }
-          }
-        }
-        if (adapter instanceof XSDElementDeclarationAdapter)
-        {
-          XSDElementDeclaration elem = (XSDElementDeclaration)((XSDElementDeclarationAdapter)adapter).getTarget();
-          Adapter adap = XSDAdapterFactory.getInstance().adapt(elem.getContainer());
-          if (adap instanceof XSDParticleAdapter)
-          {
-            XSDParticleAdapter particleAdapter = (XSDParticleAdapter)adap;
-            particleAdapter.registerListener(this);
-          }
-          if (elem.isElementDeclarationReference())
-          {
-            XSDElementDeclarationAdapter resolvedElementAdapter = (XSDElementDeclarationAdapter)XSDAdapterFactory.getInstance().adapt(elem.getResolvedElementDeclaration());
-            resolvedElementAdapter.registerListener(this);
-          }
-        }
-        else if (adapter instanceof XSDAttributeUseAdapter)
-        {
-          XSDAttributeUseAdapter attributeUse = (XSDAttributeUseAdapter) adapter;
-          XSDAttributeUse xsdAttrUse = (XSDAttributeUse) attributeUse.getTarget();
-          adapter = (XSDBaseAdapter) XSDAdapterFactory.getInstance().adapt(xsdAttrUse.getAttributeDeclaration());
-        }
-        adapter.registerListener(this);
-        oldSelection = adapter;
-        Object model = adapter.getTarget();
-
-        if (xsdModelAdapter != null && xsdModelAdapter.getModelReconcileAdapter() != null)
-        {
-          xsdModelAdapter.getModelReconcileAdapter().removeListener(internalNodeAdapter);
-        }
-        
-        Element element = ((XSDConcreteComponent)adapter.getTarget()).getElement();
-        if (element != null) {
-          xsdModelAdapter = XSDModelAdapter.lookupOrCreateModelAdapter(element.getOwnerDocument());
-        }
-        if (xsdModelAdapter != null && xsdModelAdapter.getModelReconcileAdapter() != null)
-        {
-          xsdModelAdapter.getModelReconcileAdapter().addListener(internalNodeAdapter);
-        }
-        
-        if (model instanceof XSDConcreteComponent)
-        {
-          selection = new StructuredSelection(model);
-        }
-        super.selectionChanged(part, selection);
-        return;
-      }
-      super.selectionChanged(part, selection);
-  }
-  
-  public void propertyChanged(Object object, String property)
-  {
-    if (getCurrentTab() != null)
-    {
-      refresh();
-    }
-  }
-  
-  public void dispose()
-  {
-    if (xsdModelAdapter != null && xsdModelAdapter.getModelReconcileAdapter() != null)
-    {
-      xsdModelAdapter.getModelReconcileAdapter().removeListener(internalNodeAdapter);
-      xsdModelAdapter = null;
-    }
-    super.dispose();
-  }
-
-  protected INodeAdapter internalNodeAdapter = new InternalNodeAdapter();
-  class InternalNodeAdapter implements INodeAdapter
-  {
-    public boolean isAdapterForType(Object type)
-    {
-      return false;
-    }
-
-    public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-    {
-      refresh();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTypeReferenceEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTypeReferenceEditManager.java
deleted file mode 100644
index 9e1e13b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/XSDTypeReferenceEditManager.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentDescriptionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager2;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDComplexTypeDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDSimpleTypeDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateTypeReferenceAndManageDirectivesCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateTypeReferenceCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.dialogs.NewTypeDialog;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-
-public class XSDTypeReferenceEditManager implements ComponentReferenceEditManager, ComponentReferenceEditManager2
-{  
-  protected IFile currentFile;
-  protected XSDSchema[] schemas;
-  private static ComponentSpecification result[];
-  private IADTObject referencer;
-  
-  public XSDTypeReferenceEditManager(IFile currentFile, XSDSchema[] schemas)
-  {
-    this.currentFile = currentFile;
-    this.schemas = schemas;
-  }
-  
-  public void addToHistory(ComponentSpecification component)
-  {
-    // TODO (cs) implement me!    
-  }
-  
-  public IADTObject getReferencer()
-  {
-    return referencer;
-  }
-  
-  public void setReferencer(IADTObject referencer)
-  {
-    this.referencer = referencer;
-  }
-
-  public IComponentDialog getBrowseDialog()
-  {
-    //XSDSetExistingTypeDialog dialog = new XSDSetExistingTypeDialog(currentFile, schemas);
-    //return dialog;
-    XSDSearchListDialogDelegate dialogDelegate = new XSDSearchListDialogDelegate(XSDSearchListDialogDelegate.TYPE_META_NAME, currentFile, schemas);
-    return dialogDelegate;
-  }
-
-  public IComponentDescriptionProvider getComponentDescriptionProvider()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public ComponentSpecification[] getHistory()
-  {
-    // TODO (cs) implement this properly - should this history be global or local to each editor?
-    // This is something we should play around with ourselves to see what feels right.
-    //
-    List list = new ArrayList();
-    ComponentSpecification result[] = new ComponentSpecification[list.size()];
-    list.toArray(result);
-    return result;
-  }
-
-  public IComponentDialog getNewDialog()
-  {
-    NewTypeDialog result = null;
-    if (schemas.length > 0) 
-    {
-      result = new NewTypeDialog(schemas[0]);
-    }
-    else 
-    {
-      result = new NewTypeDialog();
-    }
-    if (referencer instanceof IField)
-    {
-      IField field = (IField)referencer;
-      if (XSDConstants.ATTRIBUTE_ELEMENT_TAG.equals(field.getKind()))
-      {
-        result.allowComplexType(false);
-      }
-      String fieldName = field.getName();
-      if (fieldName != null)
-      {  
-        fieldName = fieldName.trim();
-        if (fieldName.length() > 0)
-        {  
-          result.setDefaultName(NLS.bind(Messages._UI_VALUE_NEW_TYPE, fieldName));
-        }  
-      }  
-    }
-    return result;
-  }
-
-  public ComponentSpecification[] getQuickPicks()
-  {
-    if (result != null)
-      return result;
-
-    // TODO (cs) implement this properly - we should be providing a list of the 
-    // most 'common' built in schema types here
-    // I believe Trung will be working on a perference page to give us this list
-    // for now let's hard code some values
-    //
-    List list = new ArrayList();
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "boolean", null)); //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "date", null)); //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "dateTime", null));     //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "double", null)); //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "float", null));  //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "hexBinary", null)); //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "int", null));     //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string", null)); //$NON-NLS-1$
-    list.add(new ComponentSpecification(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "time", null));        //$NON-NLS-1$
-    result = new ComponentSpecification[list.size()];
-    list.toArray(result);
-    return result;
-  }
-  
-
-  public void modifyComponentReference(Object referencingObject, ComponentSpecification component)
-  {
-    XSDConcreteComponent concreteComponent = null;
-    if (referencingObject instanceof Adapter)
-    {
-      Adapter adpater = (Adapter)referencingObject;
-      if (adpater.getTarget() instanceof XSDConcreteComponent)
-      {
-        concreteComponent = (XSDConcreteComponent)adpater.getTarget();
-      }
-    }
-    else if (referencingObject instanceof XSDConcreteComponent)
-    {
-      concreteComponent = (XSDConcreteComponent) referencingObject;
-    }
-    
-    if (concreteComponent != null)
-    {
-      if (component.isNew())
-      {  
-        XSDTypeDefinition td = null;
-        if (component.getName() == null // This means we set to anonymous type
-        		&& concreteComponent instanceof XSDElementDeclaration)
-        {
-          XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-          XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) concreteComponent;
-          // TODO (cs) we should use actions here so that UNDO/REDO can work nicely
-          // with the proper undo descriptions
-          if (component.getMetaName() == IXSDSearchConstants.COMPLEX_TYPE_META_NAME)
-          {
-            XSDComplexTypeDefinition complexType = factory.createXSDComplexTypeDefinition();            
-	  	      elementDeclaration.setAnonymousTypeDefinition(complexType);
-          }
-          else
-          {
-        	  XSDSimpleTypeDefinition simpleType = factory.createXSDSimpleTypeDefinition();
-        	  simpleType.setBaseTypeDefinition(
-        	    elementDeclaration.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string") ); //$NON-NLS-1$
-  	  	    elementDeclaration.setAnonymousTypeDefinition(simpleType);
-          }
-		      elementDeclaration.getElement().removeAttribute("type"); //TODO use external literal string
-        }
-        else if (component.getMetaName() == IXSDSearchConstants.COMPLEX_TYPE_META_NAME)
-        {  
-          AddXSDComplexTypeDefinitionCommand command = new AddXSDComplexTypeDefinitionCommand(Messages._UI_ACTION_ADD_COMPLEX_TYPE, concreteComponent.getSchema());
-          command.setNameToAdd(component.getName());
-          command.execute();
-          td = command.getCreatedComplexType();
-        }
-        else
-        {
-          AddXSDSimpleTypeDefinitionCommand command = new AddXSDSimpleTypeDefinitionCommand(Messages._UI_ACTION_ADD_SIMPLE_TYPE, concreteComponent.getSchema());
-          command.setNameToAdd(component.getName());
-          command.execute();
-          td = command.getCreatedSimpleType();
-        }  
-        if (td != null)
-        {
-          Command command = new UpdateTypeReferenceCommand(concreteComponent, td);
-          command.setLabel(Messages._UI_ACTION_SET_TYPE);
-          command.execute();
-        }
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }  
-      else
-      {  
-        Command command = new UpdateTypeReferenceAndManageDirectivesCommand(concreteComponent, component.getName(), component.getQualifier(), component.getFile());
-        command.setLabel(Messages._UI_ACTION_SET_TYPE);
-        command.execute();
-      }  
-    }  
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/Dot.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/Dot.gif
deleted file mode 100644
index 210bb24..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/Dot.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GenerateDtd.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GenerateDtd.gif
deleted file mode 100644
index ac58c1e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GenerateDtd.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GenerateJava.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GenerateJava.gif
deleted file mode 100644
index 2375c65..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GenerateJava.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GraphViewElementRef.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GraphViewElementRef.gif
deleted file mode 100644
index d535dac..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/GraphViewElementRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/NewXSD.png b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/NewXSD.png
deleted file mode 100644
index 0c4caf1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/NewXSD.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/RegexWizardArrow.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/RegexWizardArrow.gif
deleted file mode 100644
index 3d550a3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/RegexWizardArrow.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/TriangleToolBar.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/TriangleToolBar.gif
deleted file mode 100644
index bd37eb5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/TriangleToolBar.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/ValidateXSD.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/ValidateXSD.gif
deleted file mode 100644
index 2b347ac..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/ValidateXSD.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAll.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAll.gif
deleted file mode 100644
index 6d74e80..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAll.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAnnotate.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAnnotate.gif
deleted file mode 100644
index d2108c0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAnnotate.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAny.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAny.gif
deleted file mode 100644
index a39f93c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAny.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAnyAttribute.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAnyAttribute.gif
deleted file mode 100644
index 5280cc2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAnyAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAppInfo.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAppInfo.gif
deleted file mode 100644
index 2da001e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAppInfo.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttribute.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeGroup.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeGroup.gif
deleted file mode 100644
index 648462f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeGroup.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeGroupRef.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeGroupRef.gif
deleted file mode 100644
index a89fa8f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeRef.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeRef.gif
deleted file mode 100644
index 8365af2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDAttributeRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDChoice.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDChoice.gif
deleted file mode 100644
index 89ba825..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDChoice.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDComplexContent.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDComplexContent.gif
deleted file mode 100644
index 41c68dd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDComplexContent.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDComplexType.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDComplexType.gif
deleted file mode 100644
index 007f852..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDComplexType.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDDateAndTimeTypes.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDDateAndTimeTypes.gif
deleted file mode 100644
index 4fc84e4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDDateAndTimeTypes.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDDoc.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDDoc.gif
deleted file mode 100644
index d349a05..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDDoc.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDElement.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDElement.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDElementRef.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDElementRef.gif
deleted file mode 100644
index 749acfc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDElementRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDExtension.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDExtension.gif
deleted file mode 100644
index 0cfb807..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDExtension.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDField.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDField.gif
deleted file mode 100644
index 378e43e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDField.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDFile.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDFile.gif
deleted file mode 100644
index 3900f1b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDFile.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGlobalAttribute.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGlobalAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGlobalAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGlobalElement.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGlobalElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGlobalElement.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGroup.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGroup.gif
deleted file mode 100644
index 555ef53..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGroup.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGroupRef.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGroupRef.gif
deleted file mode 100644
index 34a7fb3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDImport.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDImport.gif
deleted file mode 100644
index 9e44ce5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDImport.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDInclude.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDInclude.gif
deleted file mode 100644
index b26c527..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDInclude.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDKey.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDKey.gif
deleted file mode 100644
index 04032a9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDKey.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDKeyRef.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDKeyRef.gif
deleted file mode 100644
index ee5829d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDKeyRef.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDNotation.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDNotation.gif
deleted file mode 100644
index ce9df98..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDNotation.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDNumberTypes.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDNumberTypes.gif
deleted file mode 100644
index 7134210..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDNumberTypes.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDRedefine.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDRedefine.gif
deleted file mode 100644
index 56964c1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDRedefine.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSelector.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSelector.gif
deleted file mode 100644
index 2399a58..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSelector.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSequence.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSequence.gif
deleted file mode 100644
index 8bf3f97..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSequence.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleContent.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleContent.gif
deleted file mode 100644
index 7ef38df..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleContent.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleEnum.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleEnum.gif
deleted file mode 100644
index 11d7958..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleEnum.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleList.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleList.gif
deleted file mode 100644
index d08e78f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleList.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimplePattern.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimplePattern.gif
deleted file mode 100644
index a113cf4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimplePattern.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleRestrict.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleRestrict.gif
deleted file mode 100644
index 38bc12e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleRestrict.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleType.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleType.gif
deleted file mode 100644
index 75f33c2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleType.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleTypeForEditPart.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleTypeForEditPart.gif
deleted file mode 100644
index 9aefeb2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleTypeForEditPart.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleUnion.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleUnion.gif
deleted file mode 100644
index 292adaf..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDSimpleUnion.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDUnique.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDUnique.gif
deleted file mode 100644
index 5a8a650..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/XSDUnique.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/appinfo_browse.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/appinfo_browse.gif
deleted file mode 100644
index 85f9baa..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/appinfo_browse.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/appinfo_category.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/appinfo_category.gif
deleted file mode 100644
index 9e665d5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/appinfo_category.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/back.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/back.gif
deleted file mode 100644
index 24d1a27..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/back.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/browsebutton.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/browsebutton.gif
deleted file mode 100644
index 13dae59..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/browsebutton.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/error_st_obj.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/error_st_obj.gif
deleted file mode 100644
index 0bc6068..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/error_st_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/forward.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/forward.gif
deleted file mode 100644
index eab699e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/forward.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/generate_xml.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/generate_xml.gif
deleted file mode 100644
index f2e3635..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/generate_xml.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/quickassist.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/quickassist.gif
deleted file mode 100644
index 94ae2a0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/quickassist.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/regx_wiz.png b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/regx_wiz.png
deleted file mode 100644
index 2b1477a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/regx_wiz.png
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/reloadgrammar.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/reloadgrammar.gif
deleted file mode 100644
index c705db0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/reloadgrammar.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/sort.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/sort.gif
deleted file mode 100644
index 3c65dc4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/sort.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/xmlcatalog_obj.gif b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/xmlcatalog_obj.gif
deleted file mode 100644
index a61441f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/icons/xmlcatalog_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/messages.properties b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/messages.properties
deleted file mode 100644
index 7d29711..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/messages.properties
+++ /dev/null
@@ -1,147 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-UI_LABEL_BASE_TYPE = Base Type:
-UI_LABEL_DERIVED_BY = Derived By:
-
-UI_LABEL_INHERIT_FROM = Inherit From:
-UI_LABEL_INHERIT_BY = Inherit By:
-
-UI_LABEL_DOCUMENTATION = Documentation
-UI_LABEL_APP_INFO = App Info
-
-UI_LABEL_SET_TYPE = Set Type
-UI_LABEL_TYPE = Type:
-
-UI_LABEL_NAME = Name:
-
-UI_LABEL_KIND = Kind:
-
-UI_LABEL_MINOCCURS = Minimum Occurrence:
-UI_LABEL_MAXOCCURS = Maximum Occurrence:
-
-UI_PAGE_HEADING_REFERENCE = Reference
-UI_LABEL_READ_ONLY = read-only
-
-UI_NO_TYPE = No Type
-
-UI_LABEL_COMPONENTS				= Components:
-
-! Additional Categories
-_UI_GRAPH_TYPES                = Types
-_UI_GRAPH_ELEMENTS             = Elements
-_UI_GRAPH_ATTRIBUTES           = Attributes
-_UI_GRAPH_ATTRIBUTE_GROUPS     = Attribute Groups
-_UI_GRAPH_NOTATIONS            = Notations
-_UI_GRAPH_IDENTITY_CONSTRAINTS = Identity Constraints
-_UI_GRAPH_ANNOTATIONS          = Annotations
-_UI_GRAPH_DIRECTIVES           = Directives
-_UI_GRAPH_GROUPS               = Groups
-_UI_GRAPH_REDEFINE_SCHEMA      = Redefine Schema
-_UI_GRAPH_REDEFINE_TYPES       = Types
-_UI_GRAPH_REDEFINE_ATTRIBUTE_GROUPS  = Attribute Groups
-_UI_GRAPH_REDEFINE_GROUPS      = Groups
-
-_UI_LABEL_NO_LOCATION_SPECIFIED  = No Location Specified
-_UI_ACTION_SET_MULTIPLICITY		 = Set Multiplicity
-_UI_LABEL_ABSENT               = absent
-_UI_GRAPH_UNKNOWN_OBJECT       = Unknown object
-_UI_GRAPH_XSDSCHEMA_NO_NAMESPACE = (no target namespace specified)
-_UI_GRAPH_XSDSCHEMA            = Schema
-_UI_MENU_XSD_EDITOR                 = &XSD
-_UI_LABEL_SET_TYPE				    = Set Type
-
-!
-! Preference Page
-!
-_UI_TEXT_INDENT_LABEL                 = Indentation
-_UI_TEXT_INDENT_SPACES_LABEL          = &Number of spaces: 
-_UI_TEXT_XSD_NAMESPACE_PREFIX         = Creating files
-_UI_XML_TEXT_EDITOR_PREFS_LINK		  = XML Schema editing preferences. Note that some preferences may be set on the XML <a>{0}</a> preference page.
-_UI_XML_VALIDATOR_PREFS_LINK		  = Note that some preferences may be set on the XML <a>{0}</a> preference page.
-_UI_TEXT_XSD_DEFAULT_PREFIX           = XML schema language constructs &prefix:
-_UI_QUALIFY_XSD                       = &Qualify XML schema language constructs
-_UI_TEXT_XSD_DEFAULT_TARGET_NAMESPACE = Default &target namespace:
-_UI_VALIDATING_FILES                  = Validating files
-_UI_TEXT_HONOUR_ALL_SCHEMA_LOCATIONS  = Honour all schema locations
-_UI_FULL_CONFORMANCE                  = &Check full XML Schema conformance
-_UI_TEXT_ENABLE_AUTO_IMPORT_CLEANUP   = &Automatically remove unused XSD imports and XML Namespace entries
-_UI_TEXT_ENABLE_AUTO_OPEN_SCHEMA_DIALOG = &Prompt for schema location when adding a directive
-
-_ERROR_LABEL_INVALID_PREFIX     = IWAX1004E Invalid prefix. A prefix must not be empty or contain any space.
-
-_UI_NO_TYPE_DEFINED=(no type defined)
-_UI_ACTION_UPDATE_NAME=Update Name
-_UI_ACTION_UPDATE_ELEMENT_REFERENCE=Update Element reference
-_UI_ACTION_UPDATE_ATTRIBUTE_REFERENCE=Update Attribute reference
-_UI_ACTION_ADD_FIELD=Add Field
-_UI_ACTION_ADD_ELEMENT=Add Element
-_UI_ACTION_INSERT_ELEMENT=Insert Element
-_UI_ACTION_BEFORE=&Before
-_UI_ACTION_AFTER=&After
-_UI_ACTION_ADD_INCLUDE=Add Include
-_UI_ACTION_ADD_IMPORT=Add Import
-_UI_ACTION_ADD_REDEFINE=Add Redefine
-_UI_ACTION_ADD_ELEMENT_REF=Add Element Ref
-_UI_ACTION_ADD_COMPLEX_TYPE=Add Complex Type
-_UI_ACTION_ADD_SIMPLE_TYPE=Add Simple Type
-_UI_ACTION_SET_TYPE=Set Type
-_UI_ACTION_ADD_ATTRIBUTE=Add Attribute
-_UI_ACTION_INSERT_ATTRIBUTE=Insert Attribute
-_UI_ACTION_ADD_ATTRIBUTE_REF=Add Attribute Ref
-_UI_ACTION_NEW=New...
-_UI_ACTION_BROWSE=Browse...
-_UI_ACTION_DRAG_DROP_ELEMENT=Reorder Elements
-_UI_ACTION_DRAG_DROP_ATTRIBUTE=Reorder Attributes
-_UI_ACTION_REDEFINE_COMPLEX_TYPE=Redefine Complex Type
-_UI_ACTION_REDEFINE_SIMPLE_TYPE=Redefine Simple Type
-_UI_ACTION_REDEFINE_ATTRIBUTE_GROUP=Redefine Attribute Group
-_UI_ACTION_REDEFINE_MODEL_GROUP=Redefine Model Group
-
-_UI_LABEL_OPTIONAL=Optional
-_UI_LABEL_ZERO_OR_MORE=Zero or more
-_UI_LABEL_ONE_OR_MORE=One or more
-_UI_LABEL_LOCAL_TYPE=local type
-_UI_LABEL_REQUIRED=Required
-_UI_LABEL_ARRAY=array
-
-_UI_LABEL_SET_COMMON_BUILT_IN_TYPES=Set common Built-In types
-_UI_LABEL_SELECT_TYPES_FILTER_OUT=Select the types that you do not want to filter out: 
-_UI_LABEL_NAME_SEARCH_FILTER_TEXT=Name (? = any character, * = any string):
-_UI_LABEL_SET_ELEMENT_REFERENCE=Set element reference
-_UI_LABEL_SET_ATTRIBUTE_REFERENCE=Set attribute reference
-_UI_LABEL_REDEFINE_COMPONENT=Redefine component
-
-_UI_LABEL_NEW_TYPE=New Type
-_UI_VALUE_NEW_TYPE={0}Type
-_UI_LABEL_NEW_ELEMENT=New Element
-_UI_LABEL_NEW_ATTRIBUTE=New Attribute
-_UI_LABEL_COMPLEX_TYPE=Complex Type
-_UI_LABEL_TARGET_NAMESPACE=Target Namespace: 
-_UI_LABEL_NO_NAMESPACE=No Namespace
-_UI_LABEL_ELEMENTS_COLON=Elements:
-_UI_LABEL_ATTRIBUTES_COLON=Attributes:
-_UI_LABEL_SIMPLE_TYPE=Simple Type
-_UI_LABEL_TYPES_COLON=Types:
-
-_UI_LABEL_SOURCE=Source
-
-_UI_LABEL_ELEMENTFORMDEFAULT=Prefix qualification of local elements:
-_UI_LABEL_ATTRIBUTEFORMDEFAULT=Prefix qualification of attributes:
-_UI_LABEL_CREATE_ANON_TYPE=Create as local anonymous type
-
-_UI_LABEL_ATTRIBUTES_PROCESSCONTENTS=Process Contents:
-_UI_LABEL_ATTRIBUTES_NAMESPACE=Namespace:
-
-_UI_IMAGE_COMPLEX_TYPE=icons/XSDComplexType.gif
-_UI_IMAGE_SIMPLE_TYPE=icons/XSDSimpleType.gif
-_UI_IMAGE_MODEL_GROUP=icons/XSDGroup.gif
-_UI_IMAGE_ATTRIBUTE_GROUP=icons/XSDAttributeGroup.gif
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/IXSDTypesFilter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/IXSDTypesFilter.java
deleted file mode 100644
index 4e3c62a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/IXSDTypesFilter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor.search;
-
-public interface IXSDTypesFilter {	
-	/**
-	 * Give me an Object o, if I know it and it should be filtered out, I will 
-	 * return true. Otherwise I'll return false, even if I don't know the object 
-	 * @param o
-	 * @return
-	 */
-	public boolean shouldFilterOut(Object o);
-	
-	public void turnOn();
-	public void turnOff();
-	public boolean isOn();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDAttributeSearchListProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDAttributeSearchListProvider.java
deleted file mode 100644
index e74fa12..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDAttributeSearchListProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor.search;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDAttributeSearchListProvider extends XSDSearchListProvider
-{
-
-  public XSDAttributeSearchListProvider(IFile currentFile, XSDSchema[] schemas)
-  {
-    super(currentFile, schemas);
-  }
-
-  public void populateComponentList(IComponentList list, SearchScope scope, IProgressMonitor pm)
-  {
-    // now we traverse the types already defined within the visible schemas
-    // we do this in addition to the component search since this should execute
-    // very quickly and there's a good chance the user wants to select a time that's 
-    // already imported/included
-    // TODO (cs) ensure we don't add duplicates when we proceed to use the search list
-    //
-    List visitedSchemas = new ArrayList();
-    for (int i = 0; i < schemas.length; i++)
-    {
-      XSDSchema schema = schemas[i];
-      ComponentCollectingXSDVisitor visitor = new ComponentCollectingXSDVisitor(list, IXSDSearchConstants.ATTRIBUTE_META_NAME);
-      visitor.visitSchema(schema, true);
-      visitedSchemas.addAll(visitor.getVisitedSchemas());
-    }
-    // finally we call the search API's to do a potentially slow search
-    if (scope != null)
-    {
-      populateComponentListUsingSearch(list, scope, pm, createFileMap(visitedSchemas));
-    }
-  }
-
-  private void populateComponentListUsingSearch(IComponentList list, SearchScope scope, IProgressMonitor pm, HashMap files)
-  {
-    SearchEngine searchEngine = new SearchEngine();
-    InternalSearchRequestor requestor = new InternalSearchRequestor(list, files);
-    findMatches(searchEngine, requestor, scope, IXSDSearchConstants.ATTRIBUTE_META_NAME);
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDComponentDescriptionProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDComponentDescriptionProvider.java
deleted file mode 100644
index 1ecd327..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDComponentDescriptionProvider.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.common.core.search.SearchMatch;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentDescriptionProvider;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class XSDComponentDescriptionProvider extends LabelProvider implements IComponentDescriptionProvider
-{
-  public boolean isApplicable(Object component)
-  {
-    // TODO (cs) if this provider is used in a multi language context
-    // we'll need to provide some logic here
-    return true;
-  }
-
-  private static final Image SIMPLE_TYPE_IMAGE =  XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif");
-  private static final Image COMPLEX_TYPE_IMAGE = XSDEditorPlugin.getXSDImage("icons/XSDComplexType.gif");
-  private static final Image ELEMENT_IMAGE = XSDEditorPlugin.getXSDImage("icons/XSDElement.gif");
-  private static final Image ATTRIBUTE_IMAGE = XSDEditorPlugin.getXSDImage("icons/XSDAttribute.gif");
-  //private final static Image BUILT_IN_TYPE)IMAGE = 
-    
-  public String getQualifier(Object component)
-  {
-    String result = null;
-    if (component instanceof ComponentSpecification)
-    {
-      result = ((ComponentSpecification)component).getQualifier();
-    }  
-    else if (component instanceof XSDNamedComponent)
-    {
-      result = ((XSDNamedComponent)component).getTargetNamespace(); 
-    }  
-    else if (component instanceof SearchMatch)
-    {
-      QualifiedName qualifiedName = getQualifiedNameForSearchMatch((SearchMatch)component);
-      if (qualifiedName != null)
-      {  
-        result = qualifiedName.getNamespace();
-      }    
-    }  
-    return result;
-  }
-  
-  // TODO... this will be much easier with Hiroshi's proposed SearchMatch changes
-  //
-  private QualifiedName getQualifiedNameForSearchMatch(SearchMatch match)
-  {
-    QualifiedName qualifiedName = null;
-    Object o = match.map.get("name");
-    if (o != null && o instanceof QualifiedName)
-    {  
-      qualifiedName = (QualifiedName)o;
-    }      
-    return qualifiedName;
-  }
-
-  public String getName(Object component)
-  {
-    String result = null;
-    if (component instanceof ComponentSpecification)
-    {
-      result = ((ComponentSpecification)component).getName();
-    }  
-    else if (component instanceof XSDNamedComponent)
-    {
-      result = ((XSDNamedComponent)component).getName(); 
-    }  
-    else if (component instanceof SearchMatch)
-    {
-      QualifiedName qualifiedName = getQualifiedNameForSearchMatch((SearchMatch)component);
-      if (qualifiedName != null)
-      {  
-        result = qualifiedName.getLocalName();
-      }    
-    }      
-    return result;
-  }
-
-  public IFile getFile(Object component)
-  {
-    IFile result = null;
-    if (component instanceof ComponentSpecification)
-    {
-      result = ((ComponentSpecification)component).getFile();
-    }  
-    else if (component instanceof SearchMatch)
-    {
-      result = ((SearchMatch)component).getFile();
-    }  
-    else if (component instanceof XSDConcreteComponent)
-    {
-      XSDConcreteComponent concreteComponent = (XSDConcreteComponent)component;
-      XSDSchema schema = concreteComponent.getSchema();
-      if (schema != null)
-      {
-        // TODO (cs) revisit and test more
-        //
-        String location = schema.getSchemaLocation();
-        String platformResource = "platform:/resource";
-        if (location != null && location.startsWith(platformResource))
-        {
-          Path path = new Path(location.substring(platformResource.length()));
-          result = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-        }  
-      }  
-    }
-    return result;
-  }
-
-  public ILabelProvider getLabelProvider()
-  {
-    return this;
-  }
-  
-  public String getText(Object element)
-  {
-    String result = "";
-    String name = getName(element);
-    if (name != null)
-    {
-      result += name;
-      /*
-      String qualifier = getQualifier(element);
-      if (qualifier != null)
-      {
-        result += " - " + qualifier;
-      }  
-      IFile file = getFile(element);
-      if (file != null)
-      {
-        result += "  (" + file.getProject().getName() + ")";
-      }*/ 
-    }
-    return result;
-  } 
-  
-  public Image getImage(Object component)
-  {
-    Image result = null; 
-    if (component instanceof SearchMatch)
-    {
-      SearchMatch searchMatch = (SearchMatch)component;
-      QualifiedName qualifiedName = (QualifiedName)searchMatch.map.get("metaName");
-      if ( qualifiedName != null ){
-    	  if ( qualifiedName.equals(IXSDSearchConstants.SIMPLE_TYPE_META_NAME))
-    		  result = SIMPLE_TYPE_IMAGE;
-    	  else if ( qualifiedName.equals(IXSDSearchConstants.COMPLEX_TYPE_META_NAME))
-    		  result = COMPLEX_TYPE_IMAGE;
-    	  else if ( qualifiedName.equals(IXSDSearchConstants.ELEMENT_META_NAME))
-    		  result = ELEMENT_IMAGE;
-    	  else if ( qualifiedName.equals(IXSDSearchConstants.ATTRIBUTE_META_NAME))
-    	    result = ATTRIBUTE_IMAGE;
-      }
-    }      
-    else if (component instanceof XSDComplexTypeDefinition)
-      result = COMPLEX_TYPE_IMAGE;      
-    else if (component instanceof XSDSimpleTypeDefinition)
-      result = SIMPLE_TYPE_IMAGE;
-    else if (component instanceof XSDElementDeclaration)
-      result = ELEMENT_IMAGE;
-    else if (component instanceof XSDAttributeDeclaration)
-      result = ATTRIBUTE_IMAGE;
-    return result;
-  }
-
-  public Image getFileIcon(Object component) {
-	return XSDEditorPlugin.getXSDImage("icons/XSDFile.gif");
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDElementsSearchListProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDElementsSearchListProvider.java
deleted file mode 100644
index a94042b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDElementsSearchListProvider.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor.search;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDElementsSearchListProvider extends XSDSearchListProvider
-{
-  public XSDElementsSearchListProvider(IFile currentFile, XSDSchema[] schemas)
-  {
-    super(currentFile, schemas);
-  }
-
-  public void populateComponentList(IComponentList list, SearchScope scope, IProgressMonitor pm)
-  {
-    // now we traverse the types already defined within the visible schemas
-    // we do this in addition to the component search since this should execute
-    // very quickly and there's a good chance the user wants to select a time that's 
-    // already imported/included
-    // TODO (cs) ensure we don't add duplicates when we proceed to use the search list
-    //
-    List visitedSchemas = new ArrayList();
-    for (int i = 0; i < schemas.length; i++)
-    {
-      XSDSchema schema = schemas[i];
-      ComponentCollectingXSDVisitor visitor = new ComponentCollectingXSDVisitor(list, IXSDSearchConstants.ELEMENT_META_NAME);
-      visitor.visitSchema(schema, true);
-      visitedSchemas.addAll(visitor.getVisitedSchemas());
-    }
-    // finally we call the search API's to do a potentially slow search
-    if (scope != null)
-    {
-      populateComponentListUsingSearch(list, scope, pm, createFileMap(visitedSchemas));
-    }
-  }
-
-  private void populateComponentListUsingSearch(IComponentList list, SearchScope scope, IProgressMonitor pm, HashMap files)
-  {
-    SearchEngine searchEngine = new SearchEngine();
-    InternalSearchRequestor requestor = new InternalSearchRequestor(list, files);
-    findMatches(searchEngine, requestor, scope, IXSDSearchConstants.ELEMENT_META_NAME);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListDialogDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListDialogDelegate.java
deleted file mode 100644
index 7f62dab..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListDialogDelegate.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSearchListDialogConfiguration;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ScopedComponentSearchListDialog;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDSearchListDialogDelegate implements IComponentDialog
-{
-  public final static QualifiedName TYPE_META_NAME = new QualifiedName(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "type"); //$NON-NLS-1$
-  public final static QualifiedName ELEMENT_META_NAME = new QualifiedName(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "element"); //$NON-NLS-1$
-  public final static QualifiedName ATTRIBUTE_META_NAME = new QualifiedName(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "attribute"); //$NON-NLS-1$
-  // protected Object setObject;
-  protected ComponentSpecification selection;
-  protected IFile currentFile;
-  protected XSDSchema[] schemas;
-  protected QualifiedName metaName;
-  protected boolean showComplexTypes = true;
-
-  public XSDSearchListDialogDelegate(QualifiedName metaName, IFile currentFile, XSDSchema[] schemas)
-  {
-    super();
-    this.metaName = metaName;
-    this.currentFile = currentFile;
-    this.schemas = schemas;
-  }
-
-  public ComponentSpecification getSelectedComponent()
-  {
-    return selection;
-  }
-
-  public void setInitialSelection(ComponentSpecification componentSpecification)
-  {
-    // TODO Auto-generated method stub   
-  }
-  
-  /** 
-   * Whether to show complex types in the Dialog's List, has no effect if the
-   * dialog populates list of elements instead of type
-   * @param value
-   */
-  public void showComplexTypes(boolean value)
-  {
-    showComplexTypes = value;
-  }
-  
-  public int createAndOpen()
-  {
-    Shell shell = XSDEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getShell();
-    int returnValue = Window.CANCEL;
-    ScopedComponentSearchListDialog dialog = null;
-    
-    // TODO (cs) lot's of code is common to both these blocks.  Can we re-org it a bit
-    // so it's easier to see the difference between how we config for an element vs type?
-    if ( metaName == ELEMENT_META_NAME)
-    {
-    	XSDComponentDescriptionProvider descriptionProvider = new XSDComponentDescriptionProvider();
-    	final XSDElementsSearchListProvider searchListProvider = new XSDElementsSearchListProvider(currentFile, schemas);
-    	ComponentSearchListDialogConfiguration configuration = new ComponentSearchListDialogConfiguration();
-    	
-        configuration.setDescriptionProvider(descriptionProvider);
-        configuration.setSearchListProvider(searchListProvider);
-        configuration.setFilterLabelText(Messages._UI_LABEL_NAME_SEARCH_FILTER_TEXT);
-        configuration.setListLabelText(Messages._UI_LABEL_ELEMENTS_COLON);
-//        configuration.setNewComponentHandler(new NewElementButtonHandler());
-        //TODO externalize string
-        dialog = new ScopedComponentSearchListDialog(shell, Messages._UI_LABEL_SET_ELEMENT_REFERENCE, configuration);     
-    }
-    else if ( metaName == ATTRIBUTE_META_NAME)
-    {
-      XSDComponentDescriptionProvider descriptionProvider = new XSDComponentDescriptionProvider();
-      final XSDAttributeSearchListProvider searchListProvider = new XSDAttributeSearchListProvider(currentFile, schemas);
-      ComponentSearchListDialogConfiguration configuration = new ComponentSearchListDialogConfiguration();
-      
-        configuration.setDescriptionProvider(descriptionProvider);
-        configuration.setSearchListProvider(searchListProvider);
-        configuration.setFilterLabelText(Messages._UI_LABEL_NAME_SEARCH_FILTER_TEXT);
-        configuration.setListLabelText(Messages._UI_LABEL_ATTRIBUTES_COLON);
-        dialog = new ScopedComponentSearchListDialog(shell, Messages._UI_LABEL_SET_ATTRIBUTE_REFERENCE, configuration);     
-    }
-    else if (metaName == TYPE_META_NAME)
-    {
-      XSDComponentDescriptionProvider descriptionProvider = new XSDComponentDescriptionProvider();
-      final XSDTypesSearchListProvider searchListProvider = new XSDTypesSearchListProvider(currentFile, schemas);
-      if (!showComplexTypes)
-        searchListProvider.showComplexTypes(false);
-     
-      ComponentSearchListDialogConfiguration configuration = new ComponentSearchListDialogConfiguration();
-      configuration.setDescriptionProvider(descriptionProvider);
-      configuration.setSearchListProvider(searchListProvider);
-//      configuration.setNewComponentHandler(new NewTypeButtonHandler());
-      configuration.setFilterLabelText(Messages._UI_LABEL_NAME_SEARCH_FILTER_TEXT);
-      configuration.setListLabelText(Messages._UI_LABEL_TYPES_COLON);
-      dialog = new ScopedComponentSearchListDialog(shell, Messages._UI_LABEL_SET_TYPE, configuration); //$NON-NLS-1$
-    }
-    
-    if (dialog != null)
-    {
-      dialog.setCurrentResource(currentFile);      
-      dialog.setBlockOnOpen(true);
-      dialog.create();
-      returnValue = dialog.open();
-      if (returnValue == Window.OK)
-      {
-        selection = dialog.getSelectedComponent();
-      }
-    }
-    return returnValue;
-  }
-
-//  private IEditorPart getActiveEditor()
-//  {
-//    IWorkbench workbench = PlatformUI.getWorkbench();
-//    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-//    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-//    return editorPart;
-//  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListProvider.java
deleted file mode 100644
index 6f53f91..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDSearchListProvider.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor.search;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.SearchMatch;
-import org.eclipse.wst.common.core.search.SearchParticipant;
-import org.eclipse.wst.common.core.search.SearchPlugin;
-import org.eclipse.wst.common.core.search.SearchRequestor;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentSearchListProvider;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentDeclarationPattern;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-
-public abstract class XSDSearchListProvider implements IComponentSearchListProvider
-{
-  protected XSDSchema[] schemas;
-  protected IFile currentFile;
-  // TODO (cs) remove these and use proper search scopes!
-  //
-  public static final int ENCLOSING_PROJECT_SCOPE = 0;
-  public static final int ENTIRE_WORKSPACE_SCOPE = 1;
-
-  public XSDSearchListProvider(IFile currentFile, XSDSchema[] schemas)
-  {
-    this.schemas = schemas;
-    this.currentFile = currentFile;
-    
-    try
-    {
-      IProject[] refs = currentFile.getProject().getReferencedProjects();
-            
-      for (int i=0; i < refs.length; i++)
-      {
-        System.out.println("dep " + refs[i].getName());
-      }  
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    } 
-    
-  }
-   
-  
-  class ComponentCollectingXSDVisitor
-  {
-    protected List visitedSchemas = new ArrayList();
-    IComponentList list;
-    QualifiedName searchKind;
-    
-    ComponentCollectingXSDVisitor(IComponentList list, QualifiedName searchKind)
-    {
-      this.list = list;
-      this.searchKind = searchKind;
-    }
-
-    public void visitSchema(final XSDSchema schema, boolean visitImportedSchema)
-    {
-      visitedSchemas.add(schema);
-      for (Iterator contents = schema.getContents().iterator(); contents.hasNext();)
-      {
-        XSDSchemaContent content = (XSDSchemaContent) contents.next();
-        if (content instanceof XSDSchemaDirective)
-        {
-          final XSDSchemaDirective schemaDirective = (XSDSchemaDirective) content;
-          XSDSchema extSchema = schemaDirective.getResolvedSchema();
-          if (extSchema == null && schemaDirective instanceof XSDImport && visitImportedSchema) 
-          {
-            // Force the import declaration to resolve. The work must be done in the UI thread
-            // because there are UI components listening to changes in the schema content.
-            
-            UIJob loadImportJob = new UIJob(XSDEditorPlugin.getResourceString("_UI_LABEL_LOADING_XML_SCHEMA")) //$NON-NLS-1$ 
-            {
-              public IStatus runInUIThread(IProgressMonitor monitor) 
-              {
-                // The schema model will load the import when trying to resolve any component 
-                // in the imported schema's namespace.
-
-                XSDImport xsdImport = (XSDImport)schemaDirective;
-                String importNamespace = xsdImport.getNamespace();
-                schema.resolveAttributeDeclaration(importNamespace, ""); //$NON-NLS-1$
-                return Status.OK_STATUS;
-              }
-            };
-            loadImportJob.setSystem(true);
-            loadImportJob.schedule();
-            try 
-            {
-              loadImportJob.join();
-            }
-            catch (InterruptedException e) 
-            {
-              // Nothing to do about it.
-            }
-            extSchema = schemaDirective.getResolvedSchema();
-          }
-          
-          if (extSchema != null && !visitedSchemas.contains(extSchema))
-          {
-            if (schemaDirective instanceof XSDImport && visitImportedSchema)
-            {
-              visitSchema(extSchema, false);
-            }
-            else if (schemaDirective instanceof XSDInclude || schemaDirective instanceof XSDRedefine)
-            {
-            	visitSchema(extSchema, false);
-            }
-          }
-        }
-        else if (content instanceof XSDElementDeclaration && searchKind == IXSDSearchConstants.ELEMENT_META_NAME)
-        {
-          list.add(content);
-        }
-        else if (content instanceof XSDAttributeDeclaration && searchKind == IXSDSearchConstants.ATTRIBUTE_META_NAME)
-        {
-          list.add(content);
-        }
-        else if (content instanceof XSDSimpleTypeDefinition && searchKind == IXSDSearchConstants.SIMPLE_TYPE_META_NAME)
-        {
-          // in this case we only want to show simple types
-          list.add(content);               
-        }
-        else if (content instanceof XSDTypeDefinition && searchKind == IXSDSearchConstants.TYPE_META_NAME)
-        {     
-          // in this case we want to show all types
-          list.add(content);
-        }        
-      }
-    }
-
-    public List getVisitedSchemas()
-    {
-      return visitedSchemas;
-    }
-  }
-   
-  
-  class InternalSearchRequestor extends SearchRequestor
-  {
-    IComponentList componentList;
-    HashMap files;
-
-    InternalSearchRequestor(IComponentList componentList, HashMap files)
-    {
-      this.componentList = componentList;
-      this.files = files;
-    }
-
-    public void acceptSearchMatch(SearchMatch match) throws CoreException
-    {
-      // we filter out the matches from the current file since we assume the
-      // info derived from our schema models is more update to date
-      // (in the event that we haven't saved our latest modifications)
-      //
-      if (files.get(match.getFile()) == null)
-      {  
-        // TODO... this ugly qualified name stashing will go away soon
-        //
-        QualifiedName qualifiedName = null;
-        Object o = match.map.get("name");
-        if (o != null && o instanceof QualifiedName)
-        {  
-          qualifiedName = (QualifiedName)o;
-        } 
-        if (qualifiedName != null && qualifiedName.getLocalName() != null)
-        {  
-          componentList.add(match);
-        }
-      }  
-    }
-  }  
-
-  protected void findMatches(SearchEngine searchEngine, SearchRequestor requestor, SearchScope scope, QualifiedName metaName)
-  {
-    try
-    {
-      XMLComponentDeclarationPattern pattern = new XMLComponentDeclarationPattern(new QualifiedName("*", "*"), metaName, SearchPattern.R_PATTERN_MATCH);
-      // TODO (cs) revist this... we shouldn't be needing to hard-code partipant id's
-      // All we're really doing here is trying to avoid finding matches in
-      // wsdl's since we don't  ever want to import/include a wsdl from a schema! 
-      // Maybe we should just scope out any file types that aren't xsd's using a 
-      // custom SearchScope?
-      //
-      SearchParticipant particpant = SearchPlugin.getDefault().getSearchParticipant("org.eclipse.wst.xsd.search.XSDSearchParticipant");
-      Assert.isNotNull(particpant);
-      SearchParticipant[] participants = {particpant};
-      searchEngine.search(pattern, requestor, participants, scope, null, new NullProgressMonitor());
-    }
-    catch (CoreException e)
-    {
-      e.printStackTrace();
-    }
-  }
-  
-  
-  protected HashMap createFileMap(List visitedSchemas)
-  {
-    HashMap fileMap = new HashMap();
-    for (Iterator i = visitedSchemas.iterator(); i.hasNext(); )
-    {
-      XSDSchema theSchema = (XSDSchema)i.next();
-      String location = theSchema.getSchemaLocation();       
-      IFile file = computeFile(location);
-      if (file != null)
-      {
-        fileMap.put(file, Boolean.TRUE);
-      }       
-    }   
-    return fileMap;
-  }
-  
-  private IFile computeFile(String baseLocation)
-  {
-    IFile file = null;
-    if (baseLocation != null)
-    {
-      String fileScheme = "file:"; //$NON-NLS-1$
-      String platformResourceScheme = "platform:/resource";
-      if (baseLocation.startsWith(fileScheme))
-      {
-        baseLocation = baseLocation.substring(fileScheme.length());
-        baseLocation = removeLeading(baseLocation, "/");
-        IPath path = new Path(baseLocation);
-        file = ResourcesPlugin.getWorkspace().getRoot().getFileForLocation(path);
-      }
-      else if (baseLocation.startsWith(platformResourceScheme))
-      {
-        baseLocation = baseLocation.substring(platformResourceScheme.length());
-        baseLocation = removeLeading(baseLocation, "/");
-        IPath path = new Path(baseLocation);
-        file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-      }    
-    }
-    return file;    
-  }  
-  
-  private String removeLeading(String path, String pattern)
-  {
-    while (path.startsWith(pattern))
-    {
-      path = path.substring(pattern.length());
-    }  
-    return path;
-  }    
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDTypesSearchListProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDTypesSearchListProvider.java
deleted file mode 100644
index 9d80fae..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/editor/search/XSDTypesSearchListProvider.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.editor.search;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-public class XSDTypesSearchListProvider extends XSDSearchListProvider
-{
-  protected IXSDTypesFilter builtInFilter;
-  /**
-   * Determines if we should use the filter This us used to turn the filter on
-   * and off
-   */
-  protected boolean supportFilter = true;
-  private boolean showComplexTypes = true;
-
-  public XSDTypesSearchListProvider(IFile currentFile, XSDSchema[] schemas)
-  {
-    super(currentFile, schemas);
-  }
-
-  public void populateComponentList(IComponentList list, SearchScope scope, IProgressMonitor pm)
-  {
-    // first we add the 'built in' types
-    //
-    XSDSchema schemaForSchema = XSDSchemaImpl.getSchemaForSchema(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    for (Iterator i = schemaForSchema.getSimpleTypeIdMap().values().iterator(); i.hasNext();)
-    {
-      XSDTypeDefinition td = (XSDTypeDefinition) i.next();
-      if (builtInFilter == null || !builtInFilter.shouldFilterOut(td))
-      {
-        list.add(td);
-      }
-    }
-    // now we traverse the types already defined within the visible schemas
-    // we do this in addition to the component search since this should execute
-    // very quickly and there's a good chance the user wants to select a time
-    // that's
-    // already imported/included
-    // TODO (cs) ensure we don't add duplicates when we proceed to use the
-    // search list
-    //
-    List visitedSchemas = new ArrayList();
-    for (int i = 0; i < schemas.length; i++)
-    {
-      XSDSchema schema = schemas[i];
-      QualifiedName kind = showComplexTypes ? IXSDSearchConstants.TYPE_META_NAME : IXSDSearchConstants.SIMPLE_TYPE_META_NAME;
-      ComponentCollectingXSDVisitor visitor = new ComponentCollectingXSDVisitor(list, kind);
-      visitor.visitSchema(schema, true);
-      visitedSchemas.addAll(visitor.getVisitedSchemas());
-    }
-    // finally we call the search API's to do a potentially slow search
-    //   
-    if (scope != null)
-    {
-      populateComponentListUsingSearch(list, scope, pm, createFileMap(visitedSchemas));
-    }
-  }
-
-  private void populateComponentListUsingSearch(IComponentList list, SearchScope scope, IProgressMonitor pm, HashMap files)
-  {
-    SearchEngine searchEngine = new SearchEngine();
-    InternalSearchRequestor requestor = new InternalSearchRequestor(list, files);
-    if (showComplexTypes)
-    {
-      findMatches(searchEngine, requestor, scope, IXSDSearchConstants.COMPLEX_TYPE_META_NAME);
-    }
-    findMatches(searchEngine, requestor, scope, IXSDSearchConstants.SIMPLE_TYPE_META_NAME);
-  }
-
-
-  public void _populateComponentListQuick(IComponentList list, IProgressMonitor pm)
-  {
-  }
-
-  public void turnBuiltInFilterOn(boolean option)
-  {
-    supportFilter = option;
-  }
-
-  public void setBuiltInFilter(IXSDTypesFilter filter)
-  {
-    this.builtInFilter = filter;
-  }
-
-  public void showComplexTypes(boolean show)
-  {
-    showComplexTypes = show;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/navigation/DesignViewNavigationLocation.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/navigation/DesignViewNavigationLocation.java
deleted file mode 100644
index 6f256a1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/navigation/DesignViewNavigationLocation.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.navigation;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.INavigationLocation;
-import org.eclipse.ui.NavigationLocation;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDVisitor;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewGraphicalViewer;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import com.ibm.icu.util.StringTokenizer;
-
-/**
- * This class exists to support navigation in a context where there is no text 
- * editor page.  In these cases we can't rely on the TextSelectionNavigationLocations
- * so we this class which is designed to work with just the design view.
- */
-public class DesignViewNavigationLocation extends NavigationLocation
-{
-  protected Path path;
-
-  private static final String PATH_TAG = "path"; //$NON-NLS-1$
-  
-  public DesignViewNavigationLocation(IEditorPart part)
-  {
-    super(part);
-    this.path = new Path();
-  }
-  
-  public DesignViewNavigationLocation(IEditorPart part, XSDConcreteComponent component)
-  {
-    super(part);   
-    this.path = Path.computePath(component);  
-  }
-
-  public boolean mergeInto(INavigationLocation currentLocation)
-  {
-    boolean result = false;
-    if (currentLocation instanceof DesignViewNavigationLocation)
-    {
-      DesignViewNavigationLocation loc = (DesignViewNavigationLocation) currentLocation;
-      result = loc.path.toString().equals(path.toString());
-    }
-    else
-    {
-    }
-    return result;
-  }
-
-  public void restoreLocation()
-  {
-    XSDSchema schema = (XSDSchema) getEditorPart().getAdapter(XSDSchema.class);
-    Object viewer = getEditorPart().getAdapter(GraphicalViewer.class);
-    if (viewer instanceof DesignViewGraphicalViewer)
-    {
-      DesignViewGraphicalViewer graphicalViewer = (DesignViewGraphicalViewer) viewer;
-      XSDConcreteComponent component = Path.computeComponent(schema, path);
-      if (component != null)
-      {
-        Adapter adapter = XSDAdapterFactory.getInstance().adapt(component);
-        if (adapter instanceof IADTObject)
-        {
-          graphicalViewer.setInput((IADTObject)adapter);
-        }
-      }
-      else if (path.segments.isEmpty())
-      {
-        Adapter adapter = XSDAdapterFactory.getInstance().adapt(schema);
-        if (adapter instanceof IADTObject)
-        {
-          graphicalViewer.setInput((IADTObject)adapter);
-        }
-      }
-    }   
-  }
-
-  public void restoreState(IMemento memento)
-  {
-    String string = memento.getString(PATH_TAG);
-    path = Path.createPath(string);
-  }
-
-  public void saveState(IMemento memento)
-  {
-    memento.putString(PATH_TAG, path.toString());
-  }
-
-  public void update()
-  {
-    // TODO (cs) not sure what needs to be done here
-  }
-  static class PathSegment
-  {
-    final static int ELEMENT = 1;
-    final static int TYPE = 2;
-    final static int MODEL_GROUP = 3;
-    final static int ATTRIBUTE_GROUP = 4;
-    final static int REDEFINE = 5;
-    int kind;
-    String name;
-
-    PathSegment()
-    {
-    }
-
-    PathSegment(int kind, String name)
-    {
-      this.kind = kind;
-      this.name = name;
-    }
-  }
-  protected static class Path
-  {
-    private static final String REDEFINE_TOKEN = "redefine"; //$NON-NLS-1$
-    private static final String MODEL_GROUP_TOKEN = "modelGroup"; //$NON-NLS-1$
-    private static final String ATTRIBUTE_GROUP_TOKEN = "attributeGroup"; //$NON-NLS-1$
-    private static final String TYPE_TOKEN = "type"; //$NON-NLS-1$
-    private static final String ELEMENT_TOKEN = "element"; //$NON-NLS-1$
-
-    List segments = new ArrayList();
-
-    public static XSDConcreteComponent computeComponent(XSDSchema schema, Path path)
-    {
-      PathResolvingXSDVisitor visitor = new PathResolvingXSDVisitor(path);
-      visitor.visitSchema(schema);
-      if (visitor.isDone())
-      {
-        return visitor.result;
-      }
-      return null;
-    }
-
-    static Path createPath(String pathString)
-    {
-      Path path = new Path();
-      PathSegment segment = null;
-      for (StringTokenizer st = new StringTokenizer(pathString, "/"); st.hasMoreTokens();)
-      {
-        String token = st.nextToken();
-        int kind = -1;
-        if (token.startsWith(ELEMENT_TOKEN))
-        {
-          kind = PathSegment.ELEMENT;
-        }
-        else if (token.startsWith(TYPE_TOKEN))
-        {
-          kind = PathSegment.TYPE;
-        }
-        else if (token.startsWith(ATTRIBUTE_GROUP_TOKEN))
-        {
-        	kind = PathSegment.ATTRIBUTE_GROUP;
-        }
-        else if (token.startsWith(MODEL_GROUP_TOKEN))
-        {
-        	kind = PathSegment.MODEL_GROUP;
-        }
-        else if (token.startsWith(REDEFINE_TOKEN))
-        {
-        	kind = PathSegment.REDEFINE;
-        }
-        if (kind != -1)
-        {
-          segment = new PathSegment();
-          segment.kind = kind;
-          path.segments.add(segment);
-          String namePattern = "[@name='";
-          int startIndex = token.indexOf(namePattern);
-          if (startIndex != -1)
-          {
-            startIndex += namePattern.length();
-            int endIndex = token.indexOf("']");
-            if (endIndex != -1)
-            {
-              segment.name = token.substring(startIndex, endIndex);
-            }
-          }
-        }
-      }
-      return path;
-    }
-
-    public static Path computePath(XSDConcreteComponent component)
-    {
-      Path path = new Path();
-      for (EObject c = component; c != null; c = c.eContainer())
-      {
-        if (c instanceof XSDConcreteComponent)
-        {
-          PathSegment segment = computePathSegment((XSDConcreteComponent) c);
-          if (segment != null)
-          {
-            path.segments.add(0, segment);
-          }
-        }
-      }
-      return path;
-    }
-
-    static PathSegment computePathSegment(XSDConcreteComponent component)
-    {
-    	PathSegment pathSegment = null;
-    	if (component instanceof XSDElementDeclaration)
-    	{
-    		XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) component;
-    		pathSegment = new PathSegment(PathSegment.ELEMENT, elementDeclaration.getResolvedElementDeclaration().getName());
-    	}
-    	else if (component instanceof XSDTypeDefinition)
-    	{
-    		XSDTypeDefinition typeDefinition = (XSDTypeDefinition) component;
-    		pathSegment = new PathSegment(PathSegment.TYPE, typeDefinition.getName());
-    	}
-    	else if (component instanceof XSDModelGroupDefinition)
-    	{
-    		XSDModelGroupDefinition modelGroupDefinition = (XSDModelGroupDefinition) component;
-    		pathSegment = new PathSegment(PathSegment.MODEL_GROUP, modelGroupDefinition.getName());
-    	}
-    	else if (component instanceof XSDAttributeGroupDefinition)
-    	{
-    		XSDAttributeGroupDefinition attributeGroupDefinition = (XSDAttributeGroupDefinition) component;
-    		pathSegment = new PathSegment(PathSegment.ATTRIBUTE_GROUP, attributeGroupDefinition.getResolvedAttributeGroupDefinition().getName());
-    	}
-    	else if (component instanceof XSDRedefine)
-    	{
-    		XSDRedefine redefine = (XSDRedefine) component;
-    		pathSegment = new PathSegment(PathSegment.REDEFINE, redefine.getSchemaLocation());
-    	}
-    	return pathSegment;
-    }
-
-    public String toString()
-    {
-      StringBuffer b = new StringBuffer();
-      for (Iterator i = segments.iterator(); i.hasNext();)
-      {
-        PathSegment segment = (PathSegment) i.next();
-        String kind = "";
-        if (segment.kind == PathSegment.ELEMENT)
-        {
-          kind = ELEMENT_TOKEN;
-        }
-        else if (segment.kind == PathSegment.TYPE)
-        {
-          kind = TYPE_TOKEN;
-        }
-        else if (segment.kind == PathSegment.MODEL_GROUP)
-        {
-        	kind = MODEL_GROUP_TOKEN;
-        }
-        else if (segment.kind == PathSegment.ATTRIBUTE_GROUP)
-        {
-        	kind = ATTRIBUTE_GROUP_TOKEN;
-        }
-        else if (segment.kind == PathSegment.REDEFINE)
-        {
-        	kind = REDEFINE_TOKEN;
-        }
-        b.append(kind);
-        if (segment.name != null)
-        {
-          b.append("[@name='" + segment.name + "']");
-        }
-        if (i.hasNext())
-        {
-          b.append("/");
-        }
-      }
-      return b.toString();
-    }
-  }
-  
-  
-  static class PathResolvingXSDVisitor extends XSDVisitor
-  {
-    Path path;
-    int index = -1;
-    PathSegment segment;
-    XSDConcreteComponent result = null;
-
-    PathResolvingXSDVisitor(Path path)
-    {
-      this.path = path;
-      incrementSegment();
-    }
-
-    boolean isDone()
-    {
-      return index >= path.segments.size();
-    }
-
-    void incrementSegment()
-    {
-      index++;
-      if (index < path.segments.size())
-      {
-        segment = (PathSegment) path.segments.get(index);
-      }
-      else
-      {
-        segment = null;
-      }
-    }
-
-    public void visitSchema(XSDSchema schema)
-    {
-      if (segment != null)
-      {
-        if (segment.kind == PathSegment.ELEMENT)
-        {
-          XSDElementDeclaration elementDeclaration = schema.resolveElementDeclaration(segment.name);
-          if (elementDeclaration != null)
-          {
-            visitElementDeclaration(elementDeclaration);
-          }
-        }
-        else if (segment.kind == PathSegment.TYPE)
-        {
-          XSDTypeDefinition typeDefinition = schema.resolveTypeDefinition(segment.name);
-          if (typeDefinition != null)
-          {
-            visitTypeDefinition(typeDefinition);
-          }
-        }
-        else if (segment.kind == PathSegment.MODEL_GROUP)
-        {
-        	XSDModelGroupDefinition modelGroupDefinition = schema.resolveModelGroupDefinition(segment.name);
-        	if (modelGroupDefinition != null)
-        	{
-        		visitModelGroupDefinition(modelGroupDefinition);
-        	}
-        }
-        else if (segment.kind == PathSegment.ATTRIBUTE_GROUP)
-        {
-        	XSDAttributeGroupDefinition attributeGroupDefinition = schema.resolveAttributeGroupDefinition(segment.name);
-        	if (attributeGroupDefinition != null)
-        	{
-        		visitAttributeGroupDefinition(attributeGroupDefinition);
-        	}
-        }
-        else if (segment.kind == PathSegment.REDEFINE)
-        {
-        	Iterator iterator = schema.getContents().iterator();
-        	while (iterator.hasNext())
-        	{
-        		Object object = iterator.next();
-        		if (object instanceof XSDRedefine)
-        		{        			
-        			XSDRedefine redefine = (XSDRedefine)object;
-        			visitRedefine(redefine);
-        		}
-        	}
-        }
-      }
-    }
-
-    public void visitElementDeclaration(XSDElementDeclaration element)
-    {
-      if (segment != null)
-      {
-        String name = element.getResolvedElementDeclaration().getName();
-        if (segment.kind == PathSegment.ELEMENT && isMatch(segment.name, name))
-        {
-          result = element;
-          incrementSegment();
-          if (!isDone())
-          {
-            super.visitElementDeclaration(element);
-          }
-        }
-      }
-    }
-
-    public void visitTypeDefinition(XSDTypeDefinition type)
-    {
-      if (segment != null)
-      {
-        String name = type.getName();
-        if (segment.kind == PathSegment.TYPE && isMatch(segment.name, name))
-        {
-          result = type;
-          incrementSegment();
-          if (!isDone())
-          {
-            super.visitTypeDefinition(type);
-          }
-        }
-      }
-    }
-    
-    public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroup)
-    {
-    	if (segment != null)
-    	{
-    		String name = modelGroup.getName();
-    		if (segment.kind == PathSegment.MODEL_GROUP && isMatch(segment.name, name))
-    		{
-    			result = modelGroup;
-    			incrementSegment();
-    			if (!isDone())
-    			{
-    				super.visitModelGroupDefinition(modelGroup);
-    			}
-    		}
-    	}
-    }
-
-    public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-    {
-    	if (segment != null)
-    	{
-    		String name = attributeGroup.getName();
-    		if (segment.kind == PathSegment.ATTRIBUTE_GROUP && isMatch(segment.name, name))
-    		{
-    			result = attributeGroup;
-    			incrementSegment();
-    			if (!isDone())
-    			{
-    				super.visitAttributeGroupDefinition(attributeGroup);
-    			}
-    		}
-    	}
-    }
-    
-    public void visitRedefine(XSDRedefine redefine)
-    {
-    	if (segment != null)
-    	{
-    		String name = redefine.getSchemaLocation();
-    		if (segment.kind == PathSegment.REDEFINE && isMatch(segment.name, name))
-    		{
-    			result = redefine;
-    			incrementSegment();
-    			if (!isDone())
-    			{
-    				visitSchema(redefine.getSchema());
-    			}
-    		}
-    	}
-    	
-    }
-    protected boolean isMatch(String name1, String name2)
-    {
-      return name1 != null ? name1.equals(name2) : name1 == name2;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/navigation/MultiPageEditorTextSelectionNavigationLocation.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/navigation/MultiPageEditorTextSelectionNavigationLocation.java
deleted file mode 100644
index e0f6594..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/navigation/MultiPageEditorTextSelectionNavigationLocation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.navigation;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.texteditor.TextSelectionNavigationLocation;
-
-/**
- * The platform's navigation history plumbing doesn't like multipage text
- * editors very much and tends to ignore text locations.  To fix this
- * problem we need to override the getEditPart() method of the super class
- * in order to return the actual TextEditor of our multi-page editor
- */
-public class MultiPageEditorTextSelectionNavigationLocation extends TextSelectionNavigationLocation
-{
-  public MultiPageEditorTextSelectionNavigationLocation(ITextEditor part, boolean initialize)
-  {
-    super(part, initialize);
-  }
-
-  protected IEditorPart getEditorPart()
-  {
-    IEditorPart part = super.getEditorPart();
-    if (part != null)
-      return (ITextEditor) part.getAdapter(ITextEditor.class);
-    return null;
-  }
-
-  public String getText()
-  {
-    // ISSUE: how to get title?
-    // IEditorPart part = getEditorPart();
-    // if (part instanceof WSDLTextEditor) {
-    // return ((WSDLTextEditor) part).getWSDLEditor().getTitle();
-    // }
-    // else {
-    // return super.getText();
-    // }
-    return super.getText();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/SchemaPrefixChangeHandler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/SchemaPrefixChangeHandler.java
deleted file mode 100644
index 3ce74a8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/SchemaPrefixChangeHandler.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.nsedit;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-
-public class SchemaPrefixChangeHandler
-{
-  String newPrefix;
-  XSDSchema xsdSchema;
-  String namespace;
-
-  public SchemaPrefixChangeHandler(XSDSchema xsdSchema, String newPrefix)
-  {
-    this.xsdSchema = xsdSchema;
-    this.newPrefix= newPrefix;
-    namespace = XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001; 
-  }
-
-  public SchemaPrefixChangeHandler(XSDSchema xsdSchema, String newPrefix, String namespace)
-  {
-    this.xsdSchema = xsdSchema;
-    this.newPrefix= newPrefix;
-    this.namespace = namespace;
-  }
-  
-  public void resolve()
-  {
-    XSDSchemaPrefixRenamer xsdSchemaPrefixRenamer = new XSDSchemaPrefixRenamer();
-    xsdSchemaPrefixRenamer.visitSchema(xsdSchema);
-  }
-
-  public String getNewQName(XSDTypeDefinition comp, String value, String newXSDPrefix)
-  {
-    String qName = null;
-    if (value != null)
-    {
-      qName = newXSDPrefix;
-      if (qName != null && qName.length() > 0)
-      {
-        qName += ":" + value;
-      }
-      else
-      {
-        qName = value; 
-      }
-    }
-    else
-    {
-      qName = value;
-    }
-    
-    return qName;
-  }
-
-  
-  class XSDSchemaPrefixRenamer extends XSDVisitor
-  {
-    public XSDSchemaPrefixRenamer()
-    {
-      super();
-    }
-    
-    public void visitElementDeclaration(XSDElementDeclaration element)
-    {
-      super.visitElementDeclaration(element);
-      XSDTypeDefinition type = element.getType();
-      if (type != null)
-      {
-        String ns = type.getTargetNamespace();
-        if (ns == null) ns = "";
-        if (ns.equals(namespace))        
-        {
-          Element domElement = element.getElement();
-          if (domElement != null && domElement instanceof IDOMNode)
-          {
-            Attr typeAttr = domElement.getAttributeNode(XSDConstants.TYPE_ATTRIBUTE);
-            if (typeAttr != null)
-            {
-              element.getElement().setAttribute(XSDConstants.TYPE_ATTRIBUTE, getNewQName(type, type.getName(), newPrefix));            
-            }
-          }
-        }
-      }
-    }
-    
-    public void visitSimpleTypeDefinition(XSDSimpleTypeDefinition simpleType)
-    {
-      super.visitSimpleTypeDefinition(simpleType);
-      XSDTypeDefinition baseType = simpleType.getBaseTypeDefinition();
-      
-      if (baseType != null)
-      {
-        String ns = baseType.getTargetNamespace();
-        if (ns == null) ns = "";
-        if (ns.equals(namespace))
-        {
-          XSDDOMHelper domHelper = new XSDDOMHelper();
-          Element derivedBy = domHelper.getDerivedByElement(simpleType.getElement());
-          if (derivedBy != null && derivedBy instanceof IDOMNode)
-          {
-            Attr typeAttr = derivedBy.getAttributeNode(XSDConstants.BASE_ATTRIBUTE);
-            if (typeAttr != null)
-            {
-              derivedBy.setAttribute(XSDConstants.BASE_ATTRIBUTE, getNewQName(baseType, baseType.getName(), newPrefix));
-            }
-          }
-        }
-      }
-      
-      XSDSimpleTypeDefinition itemType = simpleType.getItemTypeDefinition();
-      if (itemType != null)
-      {
-        String ns = itemType.getTargetNamespace();
-        if (ns == null) ns = "";
-        if (ns.equals(namespace))
-        {
-          XSDDOMHelper domHelper = new XSDDOMHelper();
-          Node listNode = domHelper.getChildNode(simpleType.getElement(), XSDConstants.LIST_ELEMENT_TAG);
-          if (listNode != null && listNode instanceof Element)
-          {
-            Element listElement = (Element)listNode;          
-            if (listElement instanceof IDOMNode)
-            {
-              Attr typeAttr = listElement.getAttributeNode(XSDConstants.ITEMTYPE_ATTRIBUTE);
-              if (typeAttr != null)
-              {
-                listElement.setAttribute(XSDConstants.ITEMTYPE_ATTRIBUTE, getNewQName(itemType, itemType.getName(), newPrefix));
-              }
-            }
-          }
-        }
-      }
-      
-      List memberTypes = simpleType.getMemberTypeDefinitions();
-      if (memberTypes.size() > 0)
-      {
-        XSDDOMHelper domHelper = new XSDDOMHelper();
-        Node unionNode = domHelper.getChildNode(simpleType.getElement(), XSDConstants.UNION_ELEMENT_TAG);
-        if (unionNode != null && unionNode instanceof Element)
-        {
-          Element unionElement = (Element)unionNode;          
-          if (unionElement instanceof IDOMNode)
-          {
-            StringBuffer sb = new StringBuffer("");
-            for (Iterator i = memberTypes.iterator(); i.hasNext(); )
-            {
-              XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition)i.next();
-              String ns = st.getTargetNamespace();
-              if (ns == null) ns = "";
-              if (ns.equals(namespace))
-              {
-                sb.append(getNewQName(st, st.getName(), newPrefix));                
-              }
-              else
-              {
-                sb.append(st.getQName(xsdSchema));
-              }
-              if (i.hasNext())
-              {
-                sb.append(" ");
-              }
-            }
-            unionElement.setAttribute(XSDConstants.MEMBERTYPES_ATTRIBUTE, sb.toString());
-          }
-        }
-      }
-    }
-
-    public void visitAttributeDeclaration(XSDAttributeDeclaration attr)
-    {
-      super.visitAttributeDeclaration(attr);
-      XSDTypeDefinition type = attr.getType();
-      if (type != null)
-      {
-        String ns = type.getTargetNamespace();
-        if (ns == null) ns = "";
-        if (ns.equals(namespace))
-        {
-          Element domElement = attr.getElement();
-          if (domElement != null && domElement instanceof IDOMNode)
-          {
-            Attr typeAttr = domElement.getAttributeNode(XSDConstants.TYPE_ATTRIBUTE);
-            if (typeAttr != null)
-            {
-              attr.getElement().setAttribute(XSDConstants.TYPE_ATTRIBUTE, getNewQName(type, type.getName(), newPrefix));            
-            }
-          }
-        }
-      }
-    }
-  }    
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/TargetNamespaceChangeHandler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/TargetNamespaceChangeHandler.java
deleted file mode 100644
index d26c9df..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/TargetNamespaceChangeHandler.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.nsedit;
-
-import java.util.Iterator;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class TargetNamespaceChangeHandler
-{
-  String newNS;
-  String oldNS;
-  XSDSchema xsdSchema;
-
-  public TargetNamespaceChangeHandler(XSDSchema xsdSchema, String oldNS, String newNS)
-  {
-    this.xsdSchema = xsdSchema;
-    this.oldNS= oldNS;
-    this.newNS= newNS;
-  }
-  
-  public void resolve()
-  {
-    ElementReferenceRenamer elementReferenceRenamer = new ElementReferenceRenamer();
-    elementReferenceRenamer.visitSchema(xsdSchema);
-    AttributeReferenceRenamer attributeReferenceRenamer = new AttributeReferenceRenamer();
-    attributeReferenceRenamer.visitSchema(xsdSchema);
-  }
-
-  class ElementReferenceRenamer extends XSDVisitor
-  {
-    public ElementReferenceRenamer()
-    {
-      super();
-    }
-    
-    public void visitElementDeclaration(XSDElementDeclaration element)
-    {
-      super.visitElementDeclaration(element);
-      if (element.isElementDeclarationReference())
-      {
-      	if (element.getResolvedElementDeclaration().getTargetNamespace() != null)
-      	{
-      	  if (element.getResolvedElementDeclaration().getTargetNamespace().equals(oldNS))
-          {
-            // set the resolved element's declaration to new ns
-            // this is defect 237518 - target namespace rename creates a new namespace
-            element.getResolvedElementDeclaration().setTargetNamespace(newNS);
-          }
-        }
-        else
-        {
-        	if (oldNS == null || (oldNS != null && oldNS.equals("")))
-        	{
-						element.getResolvedElementDeclaration().setTargetNamespace(newNS);
-        	}
-        }
-      }
-    }
-  }
-  
-  // Similar to defect 237518 but for attributes
-  class AttributeReferenceRenamer extends XSDVisitor
-  {
-    public AttributeReferenceRenamer()
-    {
-      super();
-    }
-    
-    public void visitComplexTypeDefinition(XSDComplexTypeDefinition type)
-    {
-      super.visitComplexTypeDefinition(type);
-      if (type.getAttributeContents() != null)
-      {
-        for (Iterator iter = type.getAttributeContents().iterator(); iter.hasNext(); )
-        {
-          XSDAttributeGroupContent attrGroupContent = (XSDAttributeGroupContent) iter.next();
-          if (attrGroupContent instanceof XSDAttributeUse)
-          {
-            XSDAttributeUse attrUse = (XSDAttributeUse) attrGroupContent;
-            XSDAttributeDeclaration attrDecl = attrUse.getContent();
-            
-            if (attrDecl != null && attrDecl.isAttributeDeclarationReference())
-            {
-							if (attrDecl.getResolvedAttributeDeclaration().getTargetNamespace() != null)
-							{
-                if (attrDecl.getResolvedAttributeDeclaration().getTargetNamespace().equals(oldNS))
-                {
-                  attrDecl.getResolvedAttributeDeclaration().setTargetNamespace(newNS);
-                }
-              }
-              else
-              {
-								if (oldNS == null || (oldNS != null && oldNS.equals("")))
-								{
-									attrDecl.getResolvedAttributeDeclaration().setTargetNamespace(newNS);
-								}
-              }
-            }
-          }
-        }
-      }
-    }
-  
-    public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-    {
-      super.visitAttributeGroupDefinition(attributeGroup);
-      EList list = attributeGroup.getAttributeUses();
-      if (list != null)
-      {
-        for (Iterator iter = list.iterator(); iter.hasNext(); )
-        {
-          XSDAttributeUse attrUse = (XSDAttributeUse)iter.next();
-          XSDAttributeDeclaration attrDecl = attrUse.getContent();
-
-          if (attrDecl != null && attrDecl.isAttributeDeclarationReference())
-          {
-						if (attrDecl.getResolvedAttributeDeclaration().getTargetNamespace() != null)
-						{
-              if (attrDecl.getResolvedAttributeDeclaration().getTargetNamespace().equals(oldNS))
-              {
-                attrDecl.getResolvedAttributeDeclaration().setTargetNamespace(newNS);
-              }
-            }
-            else
-            {
-							if (oldNS == null || (oldNS != null && oldNS.equals("")))
-							{
-								attrDecl.getResolvedAttributeDeclaration().setTargetNamespace(newNS);
-							}
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/XSDVisitor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/XSDVisitor.java
deleted file mode 100644
index 115511a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/nsedit/XSDVisitor.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.nsedit;
-
-import java.util.Iterator;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupContent;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDIdentityConstraintDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNotationDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-
-public class XSDVisitor
-{
-  public XSDVisitor()
-  {
-  }
-  
-  protected XSDSchema schema;
-  
-  public void visitSchema(XSDSchema schema)
-  {
-    this.schema = schema;
-    for (Iterator iterator = schema.getAttributeDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeDeclaration attr = (XSDAttributeDeclaration) iterator.next();
-      visitAttributeDeclaration(attr);
-    }
-    for (Iterator iterator = schema.getTypeDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDTypeDefinition type = (XSDTypeDefinition) iterator.next();
-      visitTypeDefinition(type);
-    }
-    for (Iterator iterator = schema.getElementDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDElementDeclaration element = (XSDElementDeclaration) iterator.next();
-      visitElementDeclaration(element);
-    }
-    for (Iterator iterator = schema.getIdentityConstraintDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDIdentityConstraintDefinition identityConstraint = (XSDIdentityConstraintDefinition) iterator.next();
-      visitIdentityConstraintDefinition(identityConstraint);
-    }
-    for (Iterator iterator = schema.getModelGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDModelGroupDefinition modelGroup = (XSDModelGroupDefinition) iterator.next();
-      visitModelGroupDefinition(modelGroup);
-    }
-    for (Iterator iterator = schema.getAttributeGroupDefinitions().iterator(); iterator.hasNext();)
-    {
-      XSDAttributeGroupDefinition attributeGroup = (XSDAttributeGroupDefinition) iterator.next();
-      visitAttributeGroupDefinition(attributeGroup);
-    }
-    for (Iterator iterator = schema.getNotationDeclarations().iterator(); iterator.hasNext();)
-    {
-      XSDNotationDeclaration element = (XSDNotationDeclaration) iterator.next();
-      visitNotationDeclaration(element);
-    }
-    
-  }
-  
-  public void visitAttributeDeclaration(XSDAttributeDeclaration attr)
-  {
-  }
-  
-  public void visitTypeDefinition(XSDTypeDefinition type)
-  {
-    if (type instanceof XSDSimpleTypeDefinition)
-    {
-      visitSimpleTypeDefinition((XSDSimpleTypeDefinition)type);
-    }
-    else if (type instanceof XSDComplexTypeDefinition)
-    {
-      visitComplexTypeDefinition((XSDComplexTypeDefinition)type);
-    }
-  }
-  
-  public void visitElementDeclaration(XSDElementDeclaration element)
-  {
-    if (element.isElementDeclarationReference())
-    {
-    }
-    else if (element.getAnonymousTypeDefinition() != null)
-    {
-      visitTypeDefinition(element.getAnonymousTypeDefinition());
-    }
-  }
-  
-  public void visitIdentityConstraintDefinition(XSDIdentityConstraintDefinition identityConstraint)
-  {
-  }
-  
-  public void visitModelGroupDefinition(XSDModelGroupDefinition modelGroupDef)
-  {
-    if (!modelGroupDef.isModelGroupDefinitionReference())
-    {
-      if (modelGroupDef.getModelGroup() != null)
-      {
-        visitModelGroup(modelGroupDef.getModelGroup());
-      }
-    }
-  }
-  
-  public void visitAttributeGroupDefinition(XSDAttributeGroupDefinition attributeGroup)
-  {
-    if (attributeGroup.getAttributeUses() != null)
-    {
-      for (Iterator iter = attributeGroup.getAttributeUses().iterator(); iter.hasNext(); )
-      {
-        XSDAttributeUse attrUse = (XSDAttributeUse)iter.next();
-        visitAttributeDeclaration(attrUse.getContent());
-      }
-    }
-  }
-  
-  public void visitNotationDeclaration(XSDNotationDeclaration notation)
-  {
-  }
-  
-  public void visitSimpleTypeDefinition(XSDSimpleTypeDefinition type)
-  {
-  }
-  
-  public void visitComplexTypeDefinition(XSDComplexTypeDefinition type)
-  {
-    XSDComplexTypeContent complexContent = type.getContent();
-    if (complexContent != null)
-    {
-      if (complexContent instanceof XSDSimpleTypeDefinition)
-      {
-        visitSimpleTypeDefinition((XSDSimpleTypeDefinition)complexContent);
-      }
-      else if (complexContent instanceof XSDParticle)
-      {
-        visitParticle((XSDParticle) complexContent);
-      }
-    }
-    
-    if (type.getAttributeContents() != null)
-    {
-      for (Iterator iter = type.getAttributeContents().iterator(); iter.hasNext(); )
-      {
-        XSDAttributeGroupContent attrGroupContent = (XSDAttributeGroupContent)iter.next();
-        if (attrGroupContent instanceof XSDAttributeUse)
-        {
-          XSDAttributeUse attrUse = (XSDAttributeUse)attrGroupContent;
-          visitAttributeDeclaration(attrUse.getContent());
-        }
-        else if (attrGroupContent instanceof XSDAttributeGroupDefinition)
-        {
-          visitAttributeGroupDefinition((XSDAttributeGroupDefinition)attrGroupContent);
-        }
-      }
-    }
-  }
-  
-  public void visitParticle(XSDParticle particle)
-  {
-    visitParticleContent(particle.getContent());
-  }
-  
-  public void visitParticleContent(XSDParticleContent particleContent)
-  {
-    if (particleContent instanceof XSDModelGroupDefinition)
-    {
-      visitModelGroupDefinition((XSDModelGroupDefinition) particleContent);
-    }
-    else if (particleContent instanceof XSDModelGroup)
-    {
-      visitModelGroup((XSDModelGroup)particleContent);
-    }
-    else if (particleContent instanceof XSDElementDeclaration)
-    {
-      visitElementDeclaration((XSDElementDeclaration)particleContent);
-    }
-    else if (particleContent instanceof XSDWildcard)
-    {
-      visitWildcard((XSDWildcard)particleContent);
-    }
-  }
-  
-  public void visitModelGroup(XSDModelGroup modelGroup)
-  {
-    if (modelGroup.getContents() != null)
-    {
-      for (Iterator iterator = modelGroup.getContents().iterator(); iterator.hasNext();)
-      {
-        XSDParticle particle = (XSDParticle) iterator.next();
-        visitParticle(particle);
-      }
-    }
-  }
-  
-  public void visitWildcard(XSDWildcard wildcard)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDEditorPreferencePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDEditorPreferencePage.java
deleted file mode 100644
index e56ffe8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDEditorPreferencePage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.preferences;
-
-
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorContextIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-
-public class XSDEditorPreferencePage extends AbstractPreferencePage
-{
-  private static final String XML_EDITOR_PREFERENCE_PAGE_ID = "org.eclipse.wst.sse.ui.preferences.xml.source"; //$NON-NLS-1$
-
-  private Button removeUnusedImports;
-
-  private Button automaticallyOpenSchemaLocationDialog;
-
-  protected Control createContents(Composite parent)
-  {
-    final Composite composite = super.createComposite(parent, 1);
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-    helpSystem.setHelp(parent, XSDEditorContextIds.XSDP_EDITOR_PREFERENCE_PAGE);
-
-    new PreferenceLinkArea(composite, SWT.WRAP | SWT.MULTI, XML_EDITOR_PREFERENCE_PAGE_ID, Messages._UI_XML_TEXT_EDITOR_PREFS_LINK,
-      (IWorkbenchPreferenceContainer)getContainer(), null).getControl().setLayoutData(GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).create());
-    new Label(composite, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().create());
-
-    createContentsForImportCleanup(composite);
-
-    setSize(composite);
-    loadPreferences();
-
-    return composite;
-  }
-
-  private boolean getRemoveImportSetting()
-  {
-    return removeUnusedImports.getSelection();
-  }
-
-  private boolean getAutomaticallyOpenSchemaLocationDialogSetting()
-  {
-    return automaticallyOpenSchemaLocationDialog.getSelection();
-  }
-
-  protected void initializeValues()
-  {
-    IPreferenceStore store = getPreferenceStore();
-    removeUnusedImports.setSelection(store.getBoolean(XSDEditorPlugin.CONST_XSD_IMPORT_CLEANUP));
-    automaticallyOpenSchemaLocationDialog.setSelection(store.getBoolean(XSDEditorPlugin.CONST_XSD_AUTO_OPEN_SCHEMA_LOCATION_DIALOG));
-  }
-
-  protected void performDefaults()
-  {
-    IPreferenceStore preferenceStore = getPreferenceStore();
-    removeUnusedImports.setSelection(preferenceStore.getDefaultBoolean(XSDEditorPlugin.CONST_XSD_IMPORT_CLEANUP));
-    automaticallyOpenSchemaLocationDialog.setSelection(preferenceStore.getDefaultBoolean(XSDEditorPlugin.CONST_XSD_AUTO_OPEN_SCHEMA_LOCATION_DIALOG));
-    super.performDefaults();
-  }
-
-  protected void storeValues()
-  {
-    saveValuesForImportsCleanup();
-  }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void saveValuesForImportsCleanup()
-  {
-    IPreferenceStore store = getPreferenceStore();
-
-    store.setValue(XSDEditorPlugin.CONST_XSD_IMPORT_CLEANUP, getRemoveImportSetting());
-    store.setValue(XSDEditorPlugin.CONST_XSD_AUTO_OPEN_SCHEMA_LOCATION_DIALOG, getAutomaticallyOpenSchemaLocationDialogSetting());
-  }
-
-  /** 
-   * The indent is stored in the preference store associated with the XML Schema Model
-   */
-  public IPreferenceStore getPreferenceStore()
-  {
-    return XSDEditorPlugin.getPlugin().getPreferenceStore();
-  }
-
-  private void createContentsForImportCleanup(Composite parent)
-  {
-    Group unusedImportGroup = createGroup(parent, 1);
-    unusedImportGroup.setText(Messages._UI_GRAPH_DIRECTIVES);
-
-    //GridData
-    GridData data = new GridData(SWT.FILL);
-    data.verticalAlignment = SWT.CENTER;
-    data.horizontalAlignment = SWT.FILL;
-
-    if (removeUnusedImports == null)
-    {
-      removeUnusedImports = new Button(unusedImportGroup, SWT.CHECK | SWT.LEFT);
-      removeUnusedImports.setText(Messages._UI_TEXT_ENABLE_AUTO_IMPORT_CLEANUP);
-      removeUnusedImports.setLayoutData(data);
-
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(removeUnusedImports, XSDEditorCSHelpIds.XMLSCHEMAFILES_PREFERENCES__IMPORT_CLEANUP);
-
-      automaticallyOpenSchemaLocationDialog = new Button(unusedImportGroup, SWT.CHECK | SWT.LEFT);
-      automaticallyOpenSchemaLocationDialog.setText(Messages._UI_TEXT_ENABLE_AUTO_OPEN_SCHEMA_DIALOG);
-      automaticallyOpenSchemaLocationDialog.setLayoutData(GridDataFactory.copyData(data));
-    }
-  }
-
-  protected void doSavePreferenceStore()
-  {
-    XSDEditorPlugin.getDefault().savePluginPreferences(); // model
-  }
-
-  public boolean performOk()
-  {
-    boolean result = super.performOk();
-
-    doSavePreferenceStore();
-
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDPreferencePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDPreferencePage.java
deleted file mode 100644
index b378410..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDPreferencePage.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
-David Carver, Standards for Technology in Automotive Retail, bug 1147033     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.preferences;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorContextIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-
-public class XSDPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener 
-{
-  Text indentTextField;
-  String indentString;
-  Text schemaNsPrefixField;
-  Text defaultTargetNamespaceText;
-  Button qualifyXSDLanguage;
-
-  /**
-   * Creates preference page controls on demand.
-   *   @param parent  the parent for the preference page
-   */
-  protected Control createContents(final Composite parent)
-  {
-    WorkbenchHelp.setHelp(parent, XSDEditorContextIds.XSDP_PREFERENCE_PAGE);
-
-    Group group = createGroup(parent, 2);   
-    group.setText(Messages._UI_TEXT_XSD_NAMESPACE_PREFIX);
-
-    qualifyXSDLanguage = ViewUtility.createCheckBox(group, Messages._UI_QUALIFY_XSD);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(qualifyXSDLanguage,
-    		XSDEditorCSHelpIds.XMLSCHEMAFILES_PREFERENCES__QUALIFY_XMLSCHEMA_LANGUAGE_CONSTRUCTS); 
-    ViewUtility.createLabel(group, " ");
-
-    createLabel(group, Messages._UI_TEXT_XSD_DEFAULT_PREFIX);
-    schemaNsPrefixField = createTextField(group);
-    schemaNsPrefixField.addKeyListener(new KeyAdapter()
-    {
-      public void keyPressed(KeyEvent e)
-      {
-        setValid(true);
-      }      
-    });
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(schemaNsPrefixField,
-    		XSDEditorCSHelpIds.XMLSCHEMAFILES_PREFERENCES__XML_SCHEMA_LANGUAGE_CONSTRUCTS_PREFIX); 
-    
-    createLabel(group, Messages._UI_TEXT_XSD_DEFAULT_TARGET_NAMESPACE);
-    defaultTargetNamespaceText = createTextField(group);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(defaultTargetNamespaceText,
-    		XSDEditorCSHelpIds.XMLSCHEMAFILES_PREFERENCES__DEFAULT_TARGETNAMESPACE); 
-    
-    
-    initializeValues();
-
-    applyDialogFont(parent);
-
-    return new Composite(parent, SWT.NULL);
-  }
-
-  private Group createGroup(Composite parent, int numColumns) 
-  {
-    Group group = new Group(parent, SWT.NULL);
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    group.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    group.setLayoutData(data);
-    
-    return group;
-  }
-
-  private Text createTextField(Composite parent) 
-  {
-     Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
-     GridData data = new GridData();
-     data.verticalAlignment = GridData.FILL;
-     data.horizontalAlignment = GridData.FILL;
-     data.grabExcessHorizontalSpace = true;
-     text.setLayoutData(data);
-
-     return text;
-  }
-
-  private Label createLabel(Composite parent, String text) 
-  {
-    Label label = new Label(parent, SWT.LEFT);
-    label.setText(text);
-    
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.CENTER;
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-    
-    return label;
-  }
-  
-  /**
-   * Does anything necessary because the default button has been pressed.
-   */
-  protected void performDefaults() 
-  {
-    super.performDefaults();
-    initializeDefaults();
-    checkValues();
-  }
-
-  /**
-   * Do anything necessary because the OK button has been pressed.
-   *  @return whether it is okay to close the preference page
-   */
-  public boolean performOk() 
-  {
-    if (checkValues())
-    {
-      storeValues();    
-      return true;
-    }
-    return false;
-  }
-
-  protected void performApply()
-  {
-    if (checkValues())
-    {
-      storeValues();    
-    }
-  }
-
-  /**
-   * Handles events generated by controls on this page.
-   *   @param e  the event to handle
-   */
-  public void handleEvent(Event e) 
-  {
-  }
-
-  /**
-   * @see IWorkbenchPreferencePage
-   */
-  public void init(IWorkbench workbench)
-  { 
-  }
-
-  /** 
-   * The indent is stored in the preference store associated with the XML Schema Model
-   */
-  public IPreferenceStore getPreferenceStore()
-  {
-    return XSDEditorPlugin.getPlugin().getPreferenceStore();
-  }
-
-  /**
-   * Initializes states of the controls using default values
-   * in the preference store.
-   */
-  private void initializeDefaults() 
-  {
-    schemaNsPrefixField.setText(getPreferenceStore().getDefaultString(XSDEditorPlugin.CONST_XSD_DEFAULT_PREFIX_TEXT));
-    qualifyXSDLanguage.setSelection(getPreferenceStore().getDefaultBoolean(XSDEditorPlugin.CONST_XSD_LANGUAGE_QUALIFY));
-    defaultTargetNamespaceText.setText(getPreferenceStore().getString(XSDEditorPlugin.CONST_DEFAULT_TARGET_NAMESPACE));
-  }
-
-  /**
-   * Initializes states of the controls from the preference store.
-   */
-  private void initializeValues() 
-  {
-    IPreferenceStore store = getPreferenceStore();
-    schemaNsPrefixField.setText(store.getString(XSDEditorPlugin.CONST_XSD_DEFAULT_PREFIX_TEXT));
-    qualifyXSDLanguage.setSelection(store.getBoolean(XSDEditorPlugin.CONST_XSD_LANGUAGE_QUALIFY));
-    defaultTargetNamespaceText.setText(store.getString(XSDEditorPlugin.CONST_DEFAULT_TARGET_NAMESPACE));
-  }
-
-  /**
-   * Stores the values of the controls back to the preference store.
-   */
-  private void storeValues() 
-  {
-    IPreferenceStore store = getPreferenceStore();
-
-    store.setValue(XSDEditorPlugin.CONST_XSD_DEFAULT_PREFIX_TEXT, getXMLSchemaPrefix());
-    store.setValue(XSDEditorPlugin.CONST_XSD_LANGUAGE_QUALIFY, getQualify());
-    store.setValue(XSDEditorPlugin.CONST_DEFAULT_TARGET_NAMESPACE, getXMLSchemaTargetNamespace());
-      
-    XSDEditorPlugin.getPlugin().savePluginPreferences();
-  }
-
-  public String getXMLSchemaPrefix()
-  {
-    String prefix = schemaNsPrefixField.getText();
-    if (prefix == null || prefix.equals("")) 
-    {
-      return "xsd";
-    }
-    return prefix;
-  }
-
-  public boolean getQualify()
-  {
-    return qualifyXSDLanguage.getSelection();
-  }
-  
-  /**
-   * Get the xml schema default target namespace
-   */
-  public String getXMLSchemaTargetNamespace()
-  {
-  	String targetNamespace = defaultTargetNamespaceText.getText();
-    if (targetNamespace == null || targetNamespace.equals("")) 
-    {
-      return XSDEditorPlugin.DEFAULT_TARGET_NAMESPACE;
-    }
-    return targetNamespace;
-  }
-  
-  public boolean checkValues()
-  {
-// KCPort TODO    String errorMessage = ValidateHelper.checkXMLName(schemaNsPrefixField.getText());
-	 String errorMessage = null;
-
-    if (errorMessage == null || errorMessage.length() == 0)
-    {
-      setErrorMessage(null);
-      setValid(true);
-      return true;
-    }
-    else
-    {
-      setErrorMessage(Messages._ERROR_LABEL_INVALID_PREFIX);
-      setValid(false);
-      return false;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDValidatorPreferencePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDValidatorPreferencePage.java
deleted file mode 100644
index 957ae11..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/preferences/XSDValidatorPreferencePage.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.preferences;
-
-
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.PreferenceLinkArea;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.ui.preferences.IWorkbenchPreferenceContainer;
-import org.eclipse.wst.sse.ui.internal.preferences.ui.AbstractPreferencePage;
-import org.eclipse.wst.xsd.core.internal.XSDCorePlugin;
-import org.eclipse.wst.xsd.core.internal.preferences.XSDCorePreferenceNames;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorContextIds;
-
-
-public class XSDValidatorPreferencePage extends AbstractPreferencePage
-{
-  private static final String XML_VALIDATOR_PREFERENCE_PAGE_ID = "org.eclipse.wst.sse.ui.preferences.xml.validation"; //$NON-NLS-1$
-
-  private Button fullSchemaConformance = null;
-
-  protected Control createContents(Composite parent)
-  {
-    final Composite composite = super.createComposite(parent, 1);
-    IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
-    helpSystem.setHelp(parent, XSDEditorContextIds.XSDP_VALIDATOR_PREFERENCE_PAGE);
-
-    new PreferenceLinkArea(composite, SWT.WRAP | SWT.MULTI, XML_VALIDATOR_PREFERENCE_PAGE_ID, Messages._UI_XML_VALIDATOR_PREFS_LINK,
-      (IWorkbenchPreferenceContainer)getContainer(), null).getControl().setLayoutData(GridDataFactory.fillDefaults().hint(150, SWT.DEFAULT).create());
-    new Label(composite, SWT.NONE).setLayoutData(GridDataFactory.swtDefaults().create());
-
-    createContentsForValidatingGroup(composite);
-
-    setSize(composite);
-    loadPreferences();
-
-    return composite;
-  }
-
-  private void createContentsForValidatingGroup(Composite parent)
-  {
-    Group validatingGroup = createGroup(parent, 1);
-    validatingGroup.setText(Messages._UI_VALIDATING_FILES);
-
-    GridData data = new GridData(SWT.FILL);
-    data.verticalAlignment = SWT.CENTER;
-    data.horizontalAlignment = SWT.FILL;
-
-    if (fullSchemaConformance == null)
-    {
-      fullSchemaConformance = new Button(validatingGroup, SWT.CHECK | SWT.LEFT);
-      fullSchemaConformance.setLayoutData(GridDataFactory.copyData(data));
-      fullSchemaConformance.setText(Messages._UI_FULL_CONFORMANCE);
-    }
-  }
-
-  protected void performDefaults()
-  {
-    fullSchemaConformance.setSelection(getModelPreferences().getDefaultBoolean(XSDCorePreferenceNames.FULL_SCHEMA_CONFORMANCE));
-    super.performDefaults();
-  }
-
-  protected void initializeValues()
-  {
-    initializeValuesForValidatingGroup();
-    super.initializeValues();
-  }
-
-  protected void initializeValuesForValidatingGroup()
-  {
-    fullSchemaConformance.setSelection(getModelPreferences().getBoolean(XSDCorePreferenceNames.FULL_SCHEMA_CONFORMANCE));
-  }
-
-  protected Preferences getModelPreferences()
-  {
-    return XSDCorePlugin.getDefault().getPluginPreferences();
-  }
-
-  protected void storeValuesForValidatingGroup()
-  {
-    if (fullSchemaConformance != null)
-    {
-      boolean fullSchemaConformanceSelected = fullSchemaConformance.getSelection();
-      getModelPreferences().setValue(XSDCorePreferenceNames.FULL_SCHEMA_CONFORMANCE, fullSchemaConformanceSelected);
-    }
-  }
-
-  protected void storeValues()
-  {
-    storeValuesForValidatingGroup();
-  }
-
-  protected void doSavePreferenceStore()
-  {
-    XSDCorePlugin.getDefault().savePluginPreferences(); // model
-  }
-
-  public boolean performOk()
-  {
-    boolean result = super.performOk();
-
-    doSavePreferenceStore();
-
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelAdapter.java
deleted file mode 100644
index e4ea98f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelAdapter.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.text;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.IProgressService;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.util.ModelReconcileAdapter;
-import org.eclipse.wst.xsd.ui.internal.util.XSDSchemaLocationResolverAdapterFactory;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDResourceImpl;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class XSDModelAdapter implements INodeAdapter
-{
-  protected ResourceSet resourceSet;
-  protected XSDSchema schema;
-  private ModelReconcileAdapter modelReconcileAdapter;
-
-  public XSDSchema getSchema()
-  {
-    return schema;
-  }
-
-  public void setSchema(XSDSchema schema)
-  {
-    this.schema = schema;
-  }
-  
-  public void clear()
-  {
-	if (schema != null) {
-		Document doc = schema.getDocument();
-		if (doc instanceof IDOMDocument) {
-			IDOMDocument domDocument = (IDOMDocument)doc;
-			domDocument.getModel().removeModelStateListener(getModelReconcileAdapter());
-			domDocument.removeAdapter(getModelReconcileAdapter());
-			domDocument.removeAdapter(this);		
-		}
-	    schema = null;
-	}
-    resourceSet = null;
-  }
-
-  public boolean isAdapterForType(Object type)
-  {
-    return type == XSDModelAdapter.class;
-  }
-
-  public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-  {
-  }
-  
-  public ModelReconcileAdapter getModelReconcileAdapter()
-  {
-    return modelReconcileAdapter;
-  }
-
-  public XSDSchema createSchema(Document document)
-  {    
-    try
-    {
-      // (cs) note that we always want to ensure that a 
-      // schema model object get's returned
-      schema = XSDFactory.eINSTANCE.createXSDSchema();
-      resourceSet = XSDSchemaImpl.createResourceSet();
-      resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory());                
-
-      IDOMNode domNode = (IDOMNode)document;
-      String baseLocation = domNode.getModel().getBaseLocation();           
-
-      // TODO... gotta pester SSE folks to provide 'useful' baseLocations
-      // 
-      URI uri = getURI(baseLocation);
-
-      Resource resource = new XSDResourceImpl();
-      resource.setURI(uri);
-      schema = XSDFactory.eINSTANCE.createXSDSchema(); 
-      resource.getContents().add(schema);
-      resourceSet.getResources().add(resource);     
-
-      schema.setDocument(document);
-      final Element element = document.getDocumentElement();
-      if (element != null)
-      {  
-        // Force the loading of the "meta" schema for schema instance instance.
-        //
-        String schemaForSchemaNamespace = element.getNamespaceURI();
-        XSDSchemaImpl.getSchemaForSchema(schemaForSchemaNamespace);            
-      }
-        
-      IRunnableWithProgress setElementOperation = new IRunnableWithProgress()
-      {
-        public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
-        {
-          // Use the animated flavour as we don't know beforehand how many ticks we need.
-          // The task name will be displayed by the code in XSDResourceImpl.
-          
-          monitor.beginTask("", IProgressMonitor.UNKNOWN); //$NON-NLS-1$
-          Map loadOptions = resourceSet.getLoadOptions();
-          loadOptions.put(XSDResourceImpl.XSD_PROGRESS_MONITOR, monitor);
-          
-          schema.setElement(element);
-          
-          loadOptions.remove(XSDResourceImpl.XSD_PROGRESS_MONITOR);
-        }
-      };
-
-      IProgressService progressService = PlatformUI.getWorkbench().getProgressService();
-      try
-      {
-        progressService.busyCursorWhile(setElementOperation);
-      }
-      catch (InvocationTargetException e)
-      {
-        e.printStackTrace();
-      }
-      catch (InterruptedException e)
-      {
-        e.printStackTrace();
-      }       
-        
-      // attach an adapter to keep the XSD model and DOM in sync
-      //
-      modelReconcileAdapter = new XSDModelReconcileAdapter(document, schema);
-      domNode.getModel().addModelStateListener(modelReconcileAdapter);
-    }
-    catch (Exception ex)
-    {
-      ex.printStackTrace();
-    }
-    return schema;    
-  }
-  
-  /**
-   * @deprecated
-   */
-  public XSDSchema createSchema(Element element)
-  {     
-    return createSchema(element.getOwnerDocument());
-  }
-
-  public XSDSchema resetSchema(Document document)
-  {
-    // The document has changed so the schema should be updated as well.
-    try
-    {
-      IDOMNode domNode = (IDOMNode)document;
-      schema.setDocument(document);
-      schema.setElement(document.getDocumentElement());
-
-      resourceSet = schema.eResource().getResourceSet();
-      
-      String baseLocation = domNode.getModel().getBaseLocation();           
-      URI uri = getURI(baseLocation);
-      schema.eResource().setURI(uri);
-
-      modelReconcileAdapter = new XSDModelReconcileAdapter(document, schema);
-      domNode.getModel().addModelStateListener(modelReconcileAdapter);
-    }
-    catch (Exception ex)
-    {
-    }
-    return schema;
-  }  
-
-  public static XSDModelAdapter lookupOrCreateModelAdapter(Document document)
-  {
-    XSDModelAdapter adapter = null;
-    if (document instanceof INodeNotifier)
-    {
-      INodeNotifier notifier = (INodeNotifier)document;
-      adapter = (XSDModelAdapter)notifier.getAdapterFor(XSDModelAdapter.class);
-      if (adapter == null)
-      {
-        adapter = new XSDModelAdapter();
-        notifier.addAdapter(adapter);
-      } 
-    }   
-    return adapter;
-  }
-  
-  public static XSDSchema lookupOrCreateSchema(final Document document)
-  {    
-    XSDSchema result = null;    
-    XSDModelAdapter adapter = lookupOrCreateModelAdapter(document);      
-    if (adapter.getSchema() == null)
-    {  
-      
-      adapter.createSchema(document); 
-    }   
-    result = adapter.getSchema();    
-    return result;    
-  }
-  
-  private URI getURI(String baseLocation)
-  {
-    URI uri = null;
-    if (baseLocation.startsWith("/"))
-    {
-      uri = URI.createPlatformResourceURI(baseLocation);
-    }
-    else if (baseLocation.startsWith("http"))
-    {
-      uri = URI.createURI(baseLocation);
-    }
-    else
-    {
-      uri = URI.createFileURI(baseLocation);
-    }
-    return uri;
-  }
-}
-
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelDelayedReconciler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelDelayedReconciler.java
deleted file mode 100644
index 02b7b6d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelDelayedReconciler.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.text;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.xsd.ui.internal.editor.InternalXSDMultiPageEditor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-
-
-/**
- * Provides  delayed reconciliation between the SSE DOM and the XSD EMF model. 
- * Changes in the DOM are queued and processed by a UI job. When a new request 
- * comes in, the current run is cancelled, the new request is added to the queue, 
- * then the job is re-scheduled.
- */
-public class XSDModelDelayedReconciler
-{
-  /**
-   * The model reconciler job.
-   */
-  private ReconcilerJob reconcilerJob;
-
-  /**
-   * The time in milliseconds to delay updating the EMF model.
-   */
-  private static final int DELAY = 300;
-
-  /**
-   * The elements to reconcile.
-   */
-  private List elementsToReconcile = new ArrayList();
-
-  /**
-   * Determines if the delayed reconciler should kick in.
-   */
-  public boolean shouldDelay(XSDSchema schema)
-  {
-    boolean shouldDelay = false;
-
-    // The delayed reconciler should not be used when the editor is in graphical editing mode.
-
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-    IEditorPart editorPart = workbenchPage != null ? workbenchPage.getActiveEditor() : null;
-    if (editorPart != null && editorPart instanceof InternalXSDMultiPageEditor)
-    {
-      InternalXSDMultiPageEditor xsdEditor = (InternalXSDMultiPageEditor)editorPart;
-      shouldDelay = xsdEditor.isSourcePageActive();
-    }
-
-    return shouldDelay;
-  }
-
-  /**
-   * Updates the XSD EMF component corresponding to the DOM element.
-   * 
-   * @param element the changed element.
-   * @param schema the containing schema.
-   */
-  public void elementChanged(Element element, XSDSchema schema)
-  {
-    synchronized (elementsToReconcile)
-    {
-      // The number of elements should be small so a linear search should be fine.
-
-      if (!elementsToReconcile.contains(element))
-      {
-        elementsToReconcile.add(element);
-      }
-
-      if (reconcilerJob == null)
-      {
-        reconcilerJob = new ReconcilerJob(schema);
-      }
-      
-      reconcilerJob.schedule(DELAY);
-    }
-  }
-
-  /**
-   * A UI job used to reconcile the XSD EMF model with the associated SSE DOM.
-   */
-  class ReconcilerJob extends UIJob
-  {
-    /**
-     * The target schema.
-     */
-    private XSDSchema schema;
-
-    /**
-     * The number of times allowed to wake up and do nothing.
-     */
-    private static final int MAX_INACTIVE_COUNT = 10;
-
-    /**
-     * The job will terminate once this counter reaches MAX_INACTIVE_COUNT. 
-     */
-    private int timesAwakeAndIdle = 0;
-
-    /**
-     * Constructs the reconciler job and configures some of its properties.
-     */
-    public ReconcilerJob(XSDSchema schema)
-    {
-      super("Reconciling the XSD EMF model"); //$NON-NLS-1$
-      setSystem(true);
-      setPriority(Job.LONG);
-      this.schema = schema;
-    }
-
-    public IStatus runInUIThread(IProgressMonitor monitor)
-    {
-      if (monitor.isCanceled())
-      {
-        return Status.CANCEL_STATUS;
-      }
-
-      Element[] elements = null;
-      
-      synchronized (elementsToReconcile)
-      {
-        if (!elementsToReconcile.isEmpty())
-        {
-          elements = new Element[elementsToReconcile.size()];
-          elementsToReconcile.toArray(elements);
-          elementsToReconcile.clear();
-        }
-        else
-        {
-          if (shouldTerminate())
-          {
-            reconcilerJob = null;
-            return Status.CANCEL_STATUS;
-          }
-        }
-      }
-
-      reconcile(elements);
-
-      schedule(DELAY);
-
-      return Status.OK_STATUS;
-    }
-
-    private void reconcile(Element[] modifiedElements)
-    {
-      if (modifiedElements != null)
-      {
-        for (int index = 0; index < modifiedElements.length; index++)
-        {
-          Element modifiedElement = modifiedElements[index];
-
-          reconcile(modifiedElement);
-        }
-      }
-    }
-
-    private void reconcile(Element modifiedElement)
-    {
-      if (modifiedElement != null)
-      {
-        XSDConcreteComponent concreteComponent = schema.getCorrespondingComponent(modifiedElement);
-        concreteComponent.elementChanged(modifiedElement);
-      }
-    }
-    
-    private boolean shouldTerminate()
-    {
-      return timesAwakeAndIdle++ == MAX_INACTIVE_COUNT;
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelQueryExtension.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelQueryExtension.java
deleted file mode 100644
index c111aad..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelQueryExtension.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.text;
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.extension.ModelQueryExtension;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeFilter;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-public class XSDModelQueryExtension extends ModelQueryExtension
-{
-  public XSDModelQueryExtension()
-  {
-  }
-
-  public String[] getAttributeValues(Element e, String namespace, String name)
-  {
-    List list = new ArrayList();
-    String currentElementName = e.getLocalName();
-    Node parentNode = e.getParentNode();
-    String parentName = parentNode != null ? parentNode.getLocalName() : "";
-    if (checkName(name, "type"))
-    {
-      if (checkName(currentElementName, "attribute"))
-      {
-        list = getTypesHelper(e).getBuiltInTypeNamesList2();
-        list.addAll(getTypesHelper(e).getUserSimpleTypeNamesList());
-      }
-      else if (checkName(currentElementName, "element"))
-      {
-        list = getTypesHelper(e).getBuiltInTypeNamesList2();
-        list.addAll(getTypesHelper(e).getUserSimpleTypeNamesList());
-        list.addAll(getTypesHelper(e).getUserComplexTypeNamesList());
-      }
-    }
-    else if (checkName(name, "minOccurs"))
-    {
-      list.add("0");
-    }
-    else if (checkName(name, "itemType"))
-    {
-      if (checkName(currentElementName, "list"))
-      {
-        if (checkName(parentName, "simpleType"))
-        {
-          list = getTypesHelper(e).getBuiltInTypeNamesList();
-          list.addAll(getTypesHelper(e).getUserSimpleTypeNamesList());
-        }
-      }
-    }
-    else if (checkName(name, "memberTypes"))
-    {
-      if (checkName(currentElementName, "union"))
-      {
-        if (checkName(parentName, "simpleType"))
-        {
-          list = getTypesHelper(e).getBuiltInTypeNamesList();
-          list.addAll(getTypesHelper(e).getUserSimpleTypeNamesList());
-        }
-      }
-    }
-    else if (checkName(name, "base"))
-    {
-      if (checkName(currentElementName, "restriction"))
-      {
-        if (checkName(parentName, "simpleType"))
-        {
-          list = getTypesHelper(e).getBuiltInTypeNamesList();
-          list.addAll(getTypesHelper(e).getUserSimpleTypeNamesList());
-        }
-        else if (checkName(parentName, "simpleContent"))
-        {
-          list = getTypesHelper(e).getBuiltInTypeNamesList();
-          list.addAll(getTypesHelper(e).getUserComplexTypeNamesList());
-        }
-        else if (checkName(parentName, "complexContent"))
-        {
-          list = getTypesHelper(e).getBuiltInTypeNamesList();
-          list.addAll(getTypesHelper(e).getUserComplexTypeNamesList());
-        }
-      }
-      else if (checkName(currentElementName, "extension"))
-      {
-        if (checkName(parentName, "simpleContent"))
-        {
-          list = getTypesHelper(e).getBuiltInTypeNamesList();
-          list.addAll(getTypesHelper(e).getUserComplexTypeNamesList());
-        }
-        else if (checkName(parentName, "complexContent"))
-        {
-          list = getTypesHelper(e).getBuiltInTypeNamesList();
-          list.addAll(getTypesHelper(e).getUserComplexTypeNamesList());
-        }
-      }
-    }
-    else if (checkName(name, "ref"))
-    {
-      if (checkName(currentElementName, "element"))
-      {
-        list = getTypesHelper(e).getGlobalElements();
-      }
-      else if (checkName(currentElementName, "attribute"))
-      {
-        list = getTypesHelper(e).getGlobalAttributes();
-      }
-      else if (checkName(currentElementName, "attributeGroup"))
-      {
-        list = getTypesHelper(e).getGlobalAttributeGroups();
-      }
-      else if (checkName(currentElementName, "group"))
-      {
-        list = getTypesHelper(e).getModelGroups();
-      }
-    }
-    else if (checkName(name, "substitutionGroup"))
-    {
-      if (checkName(currentElementName, "element"))
-      {
-        list = getTypesHelper(e).getGlobalElements();
-      }
-    }
-    String[] result = new String[list.size()];
-    list.toArray(result);
-    return result;
-  }
-
-  public boolean isApplicableChildElement(Node parentNode, String namespace, String name)
-  {
-    if (XSDConstants.APPINFO_ELEMENT_TAG.equals(parentNode.getNodeName()) &&
-        XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(namespace))
-    {
-        return false;
-    }
-   
-    // we assume that other nodes don't want schema nodes as extension elements
-    // TODO... cs: we really need to define custimizations for filtering based on parent/child
-    // namespace pairs to accurately handle this    
-    String parentElementNamespaceURI = parentNode.getNamespaceURI();
-    if (!XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(parentElementNamespaceURI) &&
-        XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(namespace))
-    {
-       return false;   
-    }
-    
-    if (!XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(namespace))
-    {  
-      NodeFilter filter = XSDEditorPlugin.getPlugin().getNodeCustomizationRegistry().getNodeFilter(namespace);
-      if (filter != null)
-      {
-        return filter.isApplicableContext(parentNode, Node.ELEMENT_NODE, namespace, name);
-      }     
-    }
-     
-    return true;
-  }
-
-  protected XSDSchema lookupOrCreateSchema(Document document)
-  {
-    return XSDModelAdapter.lookupOrCreateSchema(document);
-  }
-
-  /**
-   * @deprecated
-   */
-  protected XSDSchema lookupOrCreateSchemaForElement(Element element)
-  {
-    return lookupOrCreateSchema(element.getOwnerDocument());
-  }
-
-  protected TypesHelper getTypesHelper(Element element)
-  {
-    XSDSchema schema = lookupOrCreateSchema(element.getOwnerDocument());
-    return new TypesHelper(schema);
-  }
-
-  protected boolean checkName(String localName, String token)
-  {
-    if (localName != null && localName.trim().equals(token))
-    {
-      return true;
-    }
-    return false;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelReconcileAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelReconcileAdapter.java
deleted file mode 100644
index 44b0626..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/text/XSDModelReconcileAdapter.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - Initial API and implementation
- *     Eugene Ostroukhov, eugene@genuitec.com - [203291] XSD Editor Source State
- *                                              not updated in Outline/Graph
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.text;
-
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xsd.ui.internal.util.ModelReconcileAdapter;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class XSDModelReconcileAdapter extends ModelReconcileAdapter
-{
-  protected XSDSchema schema;
-  protected XSDModelDelayedReconciler delayedReconciler;
-  
-  public XSDModelReconcileAdapter(Document document, XSDSchema schema)
-  {
-    super(document);
-    this.schema = schema;
-    this.delayedReconciler = new XSDModelDelayedReconciler();
-  }
-  
-  protected void handleNodeChanged(Node node)
-  {
-    // Make sure that the node is in the XSD Schema namespace. We don't need to 
-    // reconcile the model for other nodes like text or nodes in other namespaces
-    // like the ones normally occurring in annotations.
-    
-    try
-    {
-      if (!shouldReconcileModelFor(node))
-      {
-        return;
-      }
-    }
-    catch (Exception e)
-    {
-    }
-
-    if (node instanceof Element)
-    {  
-		Element element = (Element) node;
-		if (delayedReconciler.shouldDelay(schema))
-		{
-			delayedReconciler.elementChanged(element, schema);
-		}
-		else
-		{
-	        XSDConcreteComponent concreteComponent = schema.getCorrespondingComponent(node);
-			concreteComponent.elementChanged(element);
-		}
-	}
-    else if (node instanceof Document)
-    {
-      // The document changed so we may need to fix up the 
-      // definition's root element
-      Document document = (Document)node;    
-      Element schemaElement = document.getDocumentElement();
-      if (schemaElement != null && schemaElement != schema.getElement())
-      {   
-        // here we handle the case where a new 'schema' element was added
-        //(e.g. the file was totally blank and then we type in the root element)        
-        //
-        if (schemaElement.getLocalName().equals(XSDConstants.SCHEMA_ELEMENT_TAG))         
-        {  
-          //System.out.println("****** Setting new schema");
-          schema.setElement(schemaElement);
-        }
-      }      
-      else if (schemaElement != null)
-      {       
-        // handle the case where the definition element's content has changed
-        // TODO (cs) do we really need to handle this case?
-        schema.elementChanged(schemaElement);
-      }      
-      else if (schemaElement == null)
-      {
-        // if there's no root element clear out the schema
-        //
-        
-        // https://bugs.eclipse.org/bugs/show_bug.cgi?id=203291
-        // Add try-catch to work-around problem at 
-        // XSDConcreteComponentImpl.forceNiceRemoveChild(XSDConcreteComponentImpl.java:1696)
-        // otherwise the statements below don't get run
-        try
-        {
-          schema.getContents().clear();
-        }
-        catch (NullPointerException e)
-        {
-          // workaround
-        }
-
-        // TODO (cs) I'm not sure why the above isn't enough
-        // to clear out all of the component lists
-        // for now I've just added a few more lines to do additional clearing
-        //
-        // See comment above for https://bugs.eclipse.org/bugs/show_bug.cgi?id=203291
-        try { schema.getIncorporatedVersions().clear(); } catch (Exception e) { }
-        try { schema.getElementDeclarations().clear(); } catch (Exception e) {}
-        try { schema.getTypeDefinitions().clear(); } catch (Exception e) {}
-        try { schema.getAttributeDeclarations().clear(); } catch (Exception e) {}
-        try { schema.getModelGroupDefinitions().clear(); } catch (Exception e) {}
-        try { schema.getAttributeGroupDefinitions().clear(); } catch (Exception e) {}     
-        try { schema.setTargetNamespace(null); } catch (Exception e) {}
-        try { schema.reset(); } catch (Exception e) {}
-
-        schema.setElement(null);
-      }      
-    } 
-  }
-
-  /**
-   * Checks if a change to the given node should trigger a model update.
-   * 
-   * @param changedNode
-   *          the DOM node to test.
-   * @return true if the change to the given node should trigger a model update.
-   */
-  protected boolean shouldReconcileModelFor(Node changedNode)
-  {
-    // No need to reconcile if the node is in a different namespace as it is the
-    // case for nodes deeply nested in appinfo or documentation elements.
-
-    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=203291
-    if (changedNode instanceof Document)
-    {
-      return true;
-    }
-
-    String nodeNamespace = changedNode.getNamespaceURI();
-    String schemaNamespace = schema.getSchemaForSchemaNamespace();
-    // If the document node changes, then the nodeNamespace is null
-    // so we do want to reconcile.  This change is needed for
-    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=148842 and
-    // read only file support.
-    if (!schemaNamespace.equals(nodeNamespace) && nodeNamespace != null)
-    {
-      return false;
-    }
-
-    // When a child node is added to an appinfo or documentation element
-    // No need to reconcile if the node is the first child of appinfo or documentation
-    // elements.
-
-    Node parentNode = changedNode.getParentNode();
-
-    if (parentNode != null)
-    {
-      String nodeName = changedNode.getLocalName();
-
-      if (XSDConstants.APPINFO_ELEMENT_TAG.equals(nodeName) || XSDConstants.DOCUMENTATION_ELEMENT_TAG.equals(nodeName))
-      {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty)
-  {
-    if (!isDirty)
-    {
-      // TODO need a way to tell the views to stop refreshing (temporarily)
-      //
-      /*
-      schema.reset();
-      
-      // For some reason type references don't get fixed up when an import is removed
-      // even if we call schema.reset() explictly.  To work around this  we iterate thru
-      // the type references and recompute them incase a schema did infact change
-      //
-      for (Iterator i = schema.getElementDeclarations().iterator(); i.hasNext(); )
-      {  
-        XSDElementDeclarationImpl ed = (XSDElementDeclarationImpl)i.next();
-        //ed.elementAttributesChanged(ed.getElement());
-        XSDTypeDefinition td = ed.getTypeDefinition();
-        td = ed.resolveTypeDefinition(td.getSchema().getTargetNamespace(), td.getName());        
-        ed.setTypeDefinition(td);
-      }*/  
-    }
-  }  
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/DocumentAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/DocumentAdapter.java
deleted file mode 100644
index 03133c5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/DocumentAdapter.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-abstract class DocumentAdapter implements INodeAdapter
-{
-  Document document;
-
-  public DocumentAdapter(Document document)
-  {
-    this.document = document;
-    ((INodeNotifier) document).addAdapter(this);
-    adaptChildElements(document);
-  }
-
-  private void adaptChildElements(Node parentNode)
-  {
-    for (Node child = parentNode.getFirstChild(); child != null; child = child.getNextSibling())
-    {
-      if (child.getNodeType() == Node.ELEMENT_NODE)
-      {
-        adapt((Element) child);
-      }
-    }    
-  }
-  
-  public void adapt(Element element)
-  {
-    if (((INodeNotifier) element).getExistingAdapter(this) == null)
-    {
-      ((INodeNotifier) element).addAdapter(this);
-      adaptChildElements(element);  
-    }
-  }
-
-  public boolean isAdapterForType(Object type)
-  {
-    return type == this;
-  }
-
-  abstract public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index);
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/ModelReconcileAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/ModelReconcileAdapter.java
deleted file mode 100644
index 9f85677..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/ModelReconcileAdapter.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.wst.sse.core.internal.provisional.IModelStateListener;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-public abstract class ModelReconcileAdapter extends DocumentAdapter implements IModelStateListener
-{
-  protected boolean handlingNotifyChanged = false;
-  protected List listeners = new ArrayList();
-  
-  public ModelReconcileAdapter(Document document)
-  {
-    super(document);
-  }
-  
-  public void addListener(INodeAdapter listener)
-  {
-    if (!listeners.contains(listener))
-    {
-      listeners.add(listener);
-    }  
-  }
-  
-  public void removeListener(INodeAdapter listener)
-  {
-    listeners.remove(listener);
-  }  
-  
-  protected void notifyListeners(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-  {
-    List list = new ArrayList(listeners);
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      INodeAdapter adapter = (INodeAdapter)i.next();
-      adapter.notifyChanged(notifier, eventType, changedFeature, oldValue, newValue, pos);
-    }  
-  }
-      
-  public void notifyChanged(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index)
-  {
-    if (!handlingNotifyChanged)
-    {
-      handlingNotifyChanged = true;
-      try
-      {
-        handleNotifyChange(notifier, eventType, feature, oldValue, newValue, index);
-        notifyListeners(notifier, eventType, feature, oldValue, newValue, index);
-      }
-      catch (Exception e)
-      {
-//        XSDEditorPlugin.getPlugin().getMsgLogger().write(e);
-      }
-      finally
-      {
-        handlingNotifyChanged = false;
-      }
-    }
-  }
-  
-  protected void handleNodeChanged(Node node)
-  {    
-  }
-  
-  public void handleNotifyChange(INodeNotifier notifier, int eventType, Object feature, Object oldValue, Object newValue, int index)
-  {
-    Node node = (Node)notifier;
-    switch (eventType)
-    {
-      case INodeNotifier.ADD:
-      {
-        if (newValue instanceof Element)
-        {
-          Element element = (Element)newValue;
-          adapt(element);
-        }  
-        break;
-      }
-      case INodeNotifier.REMOVE:
-      {
-        break;
-      }
-      case INodeNotifier.CHANGE:
-      case INodeNotifier.STRUCTURE_CHANGED:
-      { 
-        handleNodeChanged(node);
-        break;
-      }  
-      case INodeNotifier.CONTENT_CHANGED:
-      {
-        // If the only thing changed was the content of a text node
-        // then we don't want to reconcile.
-        
-        if (feature instanceof Text)
-        {
-          break;
-        }
-        
-        handleNodeChanged(node);
-        break;
-      }             
-    }
-  }
-
-  public void modelAboutToBeChanged(IStructuredModel model)
-  {
-  }
-
-  public void modelAboutToBeReinitialized(IStructuredModel structuredModel)
-  {
-  }
-
-  public void modelChanged(IStructuredModel model)
-  {
-  }
-
-  public void modelDirtyStateChanged(IStructuredModel model, boolean isDirty)
-  {
-  }
-
-  public void modelReinitialized(IStructuredModel structuredModel)
-  {
-  }
-
-  public void modelResourceDeleted(IStructuredModel model)
-  {
-  }
-
-  public void modelResourceMoved(IStructuredModel oldModel, IStructuredModel newModel)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/SelectionAdapter.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/SelectionAdapter.java
deleted file mode 100644
index 730784b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/SelectionAdapter.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-
-public abstract class SelectionAdapter implements ISelectionProvider
-{
-  protected List listenerList = new ArrayList();
-  protected ISelection selection = new StructuredSelection();
-  protected ISelectionProvider eventSource;
-
-  public void setEventSource(ISelectionProvider eventSource)
-  {
-    this.eventSource = eventSource;
-  }
-
-  public void addSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.add(listener);
-  }
-
-  public void removeSelectionChangedListener(ISelectionChangedListener listener) 
-  {
-    listenerList.remove(listener);
-  }                    
-
-  public ISelection getSelection() 
-  {
-    return selection;
-  }    
-  
-  /**
-   * This method should be specialized to return the correct object that corresponds to the 'other' model
-   */
-  abstract protected Object getObjectForOtherModel(Object object);
-
-    
-  public void setSelection(ISelection modelSelection)  
-  { 
-    List otherModelObjectList = new ArrayList();
-    if (modelSelection instanceof IStructuredSelection)
-    {
-      for (Iterator i = ((IStructuredSelection)modelSelection).iterator(); i.hasNext(); )
-      {
-        Object modelObject = i.next(); 
-        Object otherModelObject = getObjectForOtherModel(modelObject);       
-        if (otherModelObject != null)
-        { 
-          otherModelObjectList.add(otherModelObject);
-        }
-      }
-    }                
-      
-    StructuredSelection nodeSelection = new StructuredSelection(otherModelObjectList);
-    selection = nodeSelection;
-    SelectionChangedEvent event = new SelectionChangedEvent(eventSource != null ? eventSource : this, nodeSelection);
-
-    for (Iterator i = listenerList.iterator(); i.hasNext(); )
-    {
-      ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-      listener.selectionChanged(event);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/TypesHelper.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/TypesHelper.java
deleted file mode 100644
index 4536f9c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/TypesHelper.java
+++ /dev/null
@@ -1,404 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaContent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.impl.XSDImportImpl;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class TypesHelper
-{
-  XSDSchema xsdSchema;
-  Vector list = new Vector();
-
-  public TypesHelper(XSDSchema xsdSchema)
-  {
-    this.xsdSchema = xsdSchema;
-  }
-
-  private void updateExternalImportGlobals()
-  {
-    if (xsdSchema != null)
-    {
-      Iterator contents = xsdSchema.getContents().iterator();
-      while (contents.hasNext())
-      {
-        XSDSchemaContent content = (XSDSchemaContent) contents.next();
-        if (content instanceof XSDImportImpl)
-        {
-          XSDImportImpl anImport = (XSDImportImpl) content;
-          try
-          {
-            if (anImport.getSchemaLocation() != null)
-            {
-              anImport.importSchema();
-            }
-          }
-          catch (Exception e)
-          {
-            
-          }
-        }
-      }
-    }
-  }
-
-
-  // TODO This method and it's very similar getBuiltInTypeNamesList2 should 
-  // be reviewed and combined if possible. Both seem to be used from 
-  // XSDModelQueryExtension for content assist purposes.
-  
-  public java.util.List getBuiltInTypeNamesList()
-  {
-    List items = new ArrayList();
-    if (xsdSchema != null)
-    {
-      String prefix = xsdSchema.getSchemaForSchemaQNamePrefix();
-      if (xsdSchema != null)
-      {
-        XSDSchema schemaForSchema = XSDSchemaImpl.getSchemaForSchema(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-        for (Iterator i = schemaForSchema.getSimpleTypeIdMap().values().iterator(); i.hasNext();)
-        {
-          XSDTypeDefinition td = (XSDTypeDefinition) i.next();  
-          String localName = td.getName(); 
-          String prefixedName = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName; 
-          items.add(prefixedName);        
-        }
-      }
-    }
-    return items;
-  }
-
-  // issue (cs) do we still need this?  it can likely be remove now
-  // was used for content assist but I don't think we really need it
-  public java.util.List getBuiltInTypeNamesList2()
-  {
-    List result = new ArrayList();
-    if (xsdSchema != null)
-    {
-      List prefixes = getPrefixesForNamespace(xsdSchema.getSchemaForSchemaNamespace());
-      XSDSchema schemaForSchema = XSDSchemaImpl.getSchemaForSchema(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-      for (Iterator i = schemaForSchema.getSimpleTypeIdMap().values().iterator(); i.hasNext();)
-      {
-        XSDTypeDefinition td = (XSDTypeDefinition) i.next();  
-        String localName = td.getName();
-        String prefix = prefixes.size() > 0 ? (String)prefixes.get(0) : null;
-        String prefixedName = (prefix != null && prefix.length() > 0) ? prefix + ":" + localName : localName; 
-        result.add(prefixedName);        
-      }
-    }
-    return result;
-  }
-
-  public java.util.List getUserSimpleTypeNamesList()
-  {
-    Vector items = new Vector();
-    if (xsdSchema != null)
-    {
-      updateExternalImportGlobals();
-      Iterator i = xsdSchema.getTypeDefinitions().iterator();
-      while (i.hasNext())
-      {
-        XSDTypeDefinition typeDefinition = (XSDTypeDefinition) i.next();
-        if (typeDefinition instanceof XSDSimpleTypeDefinition)
-        {
-          items.addAll(getPrefixedNames(typeDefinition.getTargetNamespace(), typeDefinition.getName()));
-        }
-      }
-      items = (Vector) sortList(items);
-    }
-    return items;
-  }
-
-  public java.util.List getUserComplexTypeNamesList()
-  {
-    Vector items = new Vector();
-    if (xsdSchema != null)
-    {
-      updateExternalImportGlobals();
-      Iterator i = xsdSchema.getTypeDefinitions().iterator();
-      while (i.hasNext())
-      {
-        XSDTypeDefinition typeDefinition = (XSDTypeDefinition) i.next();
-        if (typeDefinition instanceof XSDComplexTypeDefinition)
-        {
-			    items.addAll(getPrefixedNames(typeDefinition.getTargetNamespace(), typeDefinition.getName()));         
-        }
-      }
-      items = (Vector) sortList(items);
-    }
-    return items;
-  }
-  
-  public java.util.List getUserSimpleTypes()
-  {
-    Vector items = new Vector();
-    if (xsdSchema != null)
-    {
-      updateExternalImportGlobals();
-      Iterator i = xsdSchema.getTypeDefinitions().iterator();
-      while (i.hasNext())
-      {
-        XSDTypeDefinition typeDefinition = (XSDTypeDefinition) i.next();
-        if (typeDefinition instanceof XSDSimpleTypeDefinition)
-        {
-          items.add(typeDefinition);
-          //items.add(typeDefinition.getQName(xsdSchema));
-        }
-      }
-      // We need to add the anyType
-//      items.add(getPrefix(xsdSchema.getSchemaForSchemaNamespace(), true) + "anyType");
-      
-      //      items = addExternalImportedUserSimpleTypes(items);
-      //items = (Vector) sortList(items);
-    }
-    return items;
-  }
-
-  public String getPrefix(String ns, boolean withColon)
-  {
-    String key = "";
-
-    if (xsdSchema != null)
-    {
-      Map map = xsdSchema.getQNamePrefixToNamespaceMap();
-      Iterator iter = map.keySet().iterator();
-      while (iter.hasNext())
-      {
-        Object keyObj = iter.next();
-        Object value = map.get(keyObj);
-        if (value != null && value.toString().equals(ns))
-        {
-          if (keyObj != null)
-          {
-            key = keyObj.toString();
-          }
-          else
-          {
-            key = "";
-          }
-          break;
-        }
-      }
-      if (!key.equals(""))
-      {
-        if (withColon)
-        {
-          key = key + ":";
-        }
-      }
-    }
-    return key;
-  }
-
-  public java.util.List getGlobalElements()
-  {
-    Vector items = new Vector();
-    if (xsdSchema != null)
-    {
-      updateExternalImportGlobals();
-      if (xsdSchema.getElementDeclarations() != null)
-      {
-        Iterator i = xsdSchema.getElementDeclarations().iterator();
-        while (i.hasNext())
-        {
-          XSDElementDeclaration elementDeclaration = (XSDElementDeclaration) i.next();
-          String name = elementDeclaration.getQName(xsdSchema);
-          if (name != null)
-          {
-            items.add(name);
-          }
-        }
-      }
-      //      items = addExternalImportedGlobalElements(items);
-      items = (Vector) sortList(items);
-    }
-    return items;
-  }
-
-  public java.util.List getGlobalAttributes()
-  {
-    Vector items = new Vector();
-    if (xsdSchema != null)
-    {
-      updateExternalImportGlobals();
-      if (xsdSchema.getAttributeDeclarations() != null)
-      {
-        Iterator i = xsdSchema.getAttributeDeclarations().iterator();
-        while (i.hasNext())
-        {
-          XSDAttributeDeclaration attributeDeclaration = (XSDAttributeDeclaration) i.next();
-          if (attributeDeclaration.getTargetNamespace() == null || (attributeDeclaration.getTargetNamespace() != null && !attributeDeclaration.getTargetNamespace().equals(XSDConstants.SCHEMA_INSTANCE_URI_2001)))
-          {
-            String name = attributeDeclaration.getQName(xsdSchema);
-            if (name != null)
-            {
-              items.add(name);
-            }
-          }
-        }
-      }
-      //      items = addExternalImportedAttributes(items);
-      items = (Vector) sortList(items);
-    }
-    return items;
-  }
-
-  public java.util.List getGlobalAttributeGroups()
-  {
-    Vector items = new Vector();
-    if (xsdSchema != null)
-    {
-      updateExternalImportGlobals();
-      if (xsdSchema.getAttributeGroupDefinitions() != null)
-      {
-        Iterator i = xsdSchema.getAttributeGroupDefinitions().iterator();
-        while (i.hasNext())
-        {
-          XSDAttributeGroupDefinition attributeGroupDefinition = (XSDAttributeGroupDefinition) i.next();
-          String name = attributeGroupDefinition.getQName(xsdSchema);
-          if (name != null)
-          {
-            items.add(name);
-          }
-        }
-      }
-      //      items = addExternalImportedAttributeGroups(items);
-      items = (Vector) sortList(items);
-    }
-    return items;
-  }
-
-  public java.util.List getModelGroups()
-  {
-    Vector items = new Vector();
-    if (xsdSchema != null)
-    {
-      updateExternalImportGlobals();
-      if (xsdSchema.getModelGroupDefinitions() != null)
-      {
-        Iterator i = xsdSchema.getModelGroupDefinitions().iterator();
-        while (i.hasNext())
-        {
-          XSDModelGroupDefinition modelGroupDefinition = (XSDModelGroupDefinition) i.next();
-          String name = modelGroupDefinition.getQName(xsdSchema);
-          if (name != null)
-          {
-            items.add(name);
-          }
-        }
-      }
-      //      items = addExternalImportedGroups(items);
-      items = (Vector) sortList(items);
-    }
-    return items;
-  }
-
-  // issue (cs) ssems like a rather goofy util method?
-  public static java.util.List sortList(java.util.List types)
-  {
-    try
-    {
-      java.util.Collections.sort(types); // performance?  n*log(n)
-    }
-    catch (Exception e)
-    {
-//      XSDEditorPlugin.getPlugin().getMsgLogger().write("Sort failed");
-    }
-    return types;
-  }
-
-  // issue (cs) do we still need this?
-  public void updateMapAfterDelete(XSDImport deletedNode)
-  {
-    String ns = deletedNode.getNamespace();
-    if (ns != null)
-    {
-      String prefix = getPrefix(ns, false);
-      if (prefix != null)
-      {
-        prefix = prefix.trim();
-      }
-      String xmlnsAttr = (prefix == "") ? "xmlns" : "xmlns:" + prefix;
-
-      if (prefix == "")
-      {
-        prefix = null;
-      }
-
-      if (xsdSchema != null)
-      {
-        Map map = xsdSchema.getQNamePrefixToNamespaceMap();
-        map.remove(prefix);
-        Element schemaElement = xsdSchema.getElement();
-        schemaElement.removeAttribute(xmlnsAttr);
-      }
-    }
-  }
-
-  public List getPrefixedNames(String namespace, String localName)
-  {
-    List list = new ArrayList();
-    if (namespace == null)
-    {
-      namespace = "";    			
-    }
-    if (xsdSchema != null && localName != null)
-    {
-      List prefixes = getPrefixesForNamespace(namespace);
-      for (Iterator i = prefixes.iterator(); i.hasNext(); )
-      {
-      	String prefix = (String)i.next();
-      	if (prefix == null) prefix = "";
-        String prefixedName = prefix.length() > 0 ? prefix + ":" + localName : localName;
-        list.add(prefixedName);               
-      }
-      if (prefixes.size() == 0)
-      {
-        list.add(localName);
-      }
-    }
-    return list;
-  }
-  
-  protected List getPrefixesForNamespace(String namespace)
-  {
-    List list = new ArrayList();
-    Map map = xsdSchema.getQNamePrefixToNamespaceMap();
-    for (Iterator iter = map.keySet().iterator(); iter.hasNext();)
-    {
-      String prefix = (String) iter.next();
-      Object value = map.get(prefix);
-      if (value != null && value.toString().equals(namespace))
-      {
-       list.add(prefix);
-      }
-    }
-    return list;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/ViewUtility.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/ViewUtility.java
deleted file mode 100644
index cd5ac33..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/ViewUtility.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-// issue (cs) can we get rid of this class?
-// I've stripped it down a whole lot... but it'd be great to get rid of it
-//
-public class ViewUtility
-{
-  private static Font font;
-
-  private static Font getFont()
-  {
-    if (font == null)
-    {              
-      font = new Font(Display.getCurrent(), "ms sans serif", 8, SWT.NORMAL);  
-    }
-    return font;
-  }
-
-  public static void setComposite(Composite comp)
-  {
-    // deprecated.  Remove later
-  }
-  public static Composite createComposite(Composite parent, int numColumns)
-  {
-    Composite composite = new Composite(parent, SWT.NONE);
-
-    composite.setFont(getFont());
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    composite.setLayoutData(data);
-    return composite;
-  }
-
-  public static Composite createComposite(Composite parent, int numColumns, boolean horizontalFill)
-  {
-    if (!horizontalFill)
-    {
-      createComposite(parent, numColumns);
-    }
-
-    Composite composite = new Composite(parent, SWT.NONE);
-
-    composite.setFont(getFont());
-
-    GridLayout layout = new GridLayout();
-    layout.numColumns = numColumns;
-    composite.setLayout(layout);
-
-    GridData data = new GridData();
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    composite.setLayoutData(data);
-
-    return composite;
-  }
-
-  public static Label createHorizontalFiller(Composite parent, int horizontalSpan) 
-  {
-    Label label = new Label(parent, SWT.LEFT);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.horizontalSpan = horizontalSpan;
-    label.setLayoutData(data);
-    return label;
-  }
-
-  /**
-   * Helper method for creating labels.
-   */
-  public static Label createLabel(Composite parent, String text) 
-  {
-    Label label = new Label(parent, SWT.LEFT);
-    label.setText(text);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    label.setLayoutData(data);
-    return label;
-  }
-
-	public Label createLabel(Composite parent, int style, String text)
-	{
-		Label label = new Label(parent, style);
-//		setColor(label);
-		label.setText(text);
-
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		label.setLayoutData(data);
-		return label;
-	}
-  
-  public static Label createLabel(Composite parent, String text, int alignment)
-  {
-    Label label = new Label(parent, SWT.LEFT);
-    label.setText(text);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = alignment;
-    label.setLayoutData(data);
-    return label;
-  }
-
- 
-
-
-  /**
-   * Create radio button
-   */
-  public static Button createRadioButton(Composite parent, String label)
-  {
-    Button button = new Button(parent, SWT.RADIO);
-    button.setText(label);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-
-    return button;
-  }
-
-  /**
-   * Helper method for creating check box
-   */
-  public static Button createCheckBox(Composite parent, String label) 
-  {
-    Button button = new Button(parent, SWT.CHECK);
-    button.setText(label);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    button.setLayoutData(data);
-    return button;
-  }
-
-  public static Combo createComboBox(Composite parent)
-  {
-    return createComboBox(parent, true);
-  }
-
-  public static Combo createComboBox(Composite parent, boolean isReadOnly)
-  {
-    int style = isReadOnly == true ? SWT.READ_ONLY : SWT.DROP_DOWN;
-
-    Combo combo = new Combo(parent, style);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    combo.setLayoutData(data);
-    return combo;
-  }
-
-
-  public static Text createTextField(Composite parent, int width)
-  {
-    Text text = new Text(parent, SWT.SINGLE | SWT.BORDER);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = width;
-    text.setLayoutData(data);
-
-    return text;
-  }
-
-  /**
-   * <code>createWrappedMultiTextField</code> creates a wrapped multitext field
-   *
-   * @param parent a <code>Composite</code> value
-   * @param width an <code>int</code> value
-   * @param numLines an <code>int</code> value representing number of characters in height
-   * @param verticalFill a <code>boolean</code> value
-   * @return a <code>Text</code> value
-   */
-  public static Text createWrappedMultiTextField(Composite parent, int width, int numLines, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }      
-    data.widthHint = width;
-    FontData[] fontData = getFont().getFontData();
-    // hack for now where on Windows, only 1 fontdata exists
-    data.heightHint = numLines * fontData[0].getHeight();
-    text.setLayoutData(data);
-
-    return text;
-  }
-
-  public static Text createMultiTextField(Composite parent, int width, int height, boolean verticalFill)
-  {
-    Text text = new Text(parent, SWT.MULTI | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
-
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    if (verticalFill)
-    {
-      data.verticalAlignment = GridData.FILL;
-      data.grabExcessVerticalSpace = true;
-    }      
-    data.widthHint = width;
-    data.heightHint = height;
-    text.setLayoutData(data);
-
-    return text;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDDOMHelper.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDDOMHelper.java
deleted file mode 100644
index cb8c84c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDDOMHelper.java
+++ /dev/null
@@ -1,477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import java.util.ArrayList;
-
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-// issue (cs) remove this class!!
-public class XSDDOMHelper
-{
-
-  private static String XMLSchemaURI = "http://www.w3.org/2001/XMLSchema";
-
-  /**
-   * Constructor for XSDDOMHelper.
-   */
-  public XSDDOMHelper()
-  {
-    super();
-  }
-
-  public Node getChildNode(Element parent, String childName)
-  {
-/*    NodeList nodeList = parent.getElementsByTagNameNS(XMLSchemaURI, childName);
-    if (nodeList.getLength() > 0)
-      return nodeList.item(0);
-    return null;
-*/
-    NodeList list = null;
-    if (parent != null)
-    {
-      list = parent.getChildNodes();
-    }
-
-    if (list != null)
-    {
-      // Performance issue perhaps?
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        if (list.item(i) instanceof Element)
-        {
-          if (list.item(i).getLocalName().equals(childName))
-          {
-            return list.item(i);
-          }
-        }
-      }
-    }
-    return null;
-  }
-
-
-
-
-  public void changeDerivedByType(Element element, String derivedByType, String type)
-  {
-    Document doc = element.getOwnerDocument();
-
-    String prefix = element.getPrefix();
-    prefix = prefix == null ? "" : prefix + ":";
-
-    Element derivedByElement = getDerivedByElement(element);
-    
-    if (derivedByElement != null && derivedByElement.getLocalName().equals(derivedByType))
-    {
-    	return; // it's already the derived by type
-    }
-    Element newNode;
-  	if (derivedByType.equals("restriction"))
-  	{
-    	newNode = doc.createElementNS(XSDDOMHelper.XMLSchemaURI, prefix + XSDConstants.RESTRICTION_ELEMENT_TAG);
-    }
-    else
-    {
-    	newNode = doc.createElementNS(XSDDOMHelper.XMLSchemaURI, prefix + XSDConstants.EXTENSION_ELEMENT_TAG);
-    }
-	
-    newNode.setAttribute("base", type);
-
-    if (derivedByElement != null)
-    {
-      if (derivedByElement.hasChildNodes())
-      {        
-        NodeList nodes = derivedByElement.getChildNodes();
-        // use clones so we don't have a refresh problem
-        for (int i = 0; i < nodes.getLength(); i++)
-        {
-          Node node = nodes.item(i);       
-          newNode.appendChild(node.cloneNode(true));
-        }
-      }
-	  element.replaceChild(newNode, derivedByElement);
-    }
-    else 
-	{
-		Element parent = (Element) element.getParentNode();				// get back to complexType
-        NodeList nodes = parent.getChildNodes();
-		ArrayList nodeSaveList = new ArrayList();
-		
-		// save children. (nodes turns out to be the same object as parent;
-		// deleting them from parent will delete them from nodes.)
-        for (int i = 0; i < nodes.getLength(); i++)			
-        {
-          Node node = nodes.item(i);      
-		  nodeSaveList.add(node);
-        }
-
-        // remove children so we can surround them by complexContent
-        for (int i = 0; i < nodeSaveList.size(); i++)			
-        {
-          Node node = (Node) nodeSaveList.get(i);      
-          parent.removeChild(node);
-        }
-		
-		// build a complexContent element
-		Element complexContent = doc.createElementNS(XSDDOMHelper.XMLSchemaURI, prefix + XSDConstants.COMPLEXCONTENT_ELEMENT_TAG);
-		parent.appendChild(complexContent);					// insert into complexType
-		complexContent.appendChild(newNode);				// insert derivation type
-        for (int i = 0; i < nodeSaveList.size(); i++)			// insert children previously of complexType
-        {
-          Node node = (Node) nodeSaveList.get(i);       
-          newNode.appendChild(node.cloneNode(true));
-        }
-		
-		parent.appendChild(complexContent);
-		formatChild(complexContent);
-    }
-  }
-
-  
-  /**
-   * Get the derived by node given the complexContent or simpleContent node
-   */
-  public Element getDerivedByElement(Element element)
-  {
-    Node restrictionChild = getChildNode(element, "restriction");
-    Node extensionChild = getChildNode(element, "extension");
-    if (restrictionChild != null)
-    {
-      if (restrictionChild instanceof Element)
-      {
-        return (Element)restrictionChild;
-      }
-    }
-    
-    if (extensionChild != null)
-    {
-      if (extensionChild instanceof Element)
-      {
-        return (Element)extensionChild;
-      }
-    }
-    return null;
-  }
-  
-  
-  public Element getDerivedByElementFromSimpleType(Element element)
-  {
-    Node atomic = getChildNode(element, "restriction");
-    Node list = getChildNode(element, "list");
-    Node union = getChildNode(element, "union");
-    if (atomic instanceof Element)
-	  {
-	    return (Element)atomic;
-	  }
-    if (list instanceof Element)
-	  {
-	    return (Element)list;
-	  }
-    if (union instanceof Element)
-	  {
-	    return (Element)union;
-	  }
-    return null;
-  }
-
-  /**
-   * Get the derived by node given the ComplexType node
-   * Returns the first one, if say, the INVALID schema has more than one
-   */
-  public Element getDerivedByElementFromComplexType(Element element)
-  {
-    NodeList nl = element.getChildNodes();
-    int j = 0;
-    for (j = 0; j < nl.getLength(); j++)
-    {
-      Node aNode = nl.item(j);
-      if (inputEquals(aNode, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-      {
-        break; 
-      }
-      else if (inputEquals(aNode, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-      {
-        break;
-      }
-    }
-    Element derivedByNode = getDerivedByElement((Element)nl.item(j));
-    return derivedByNode;
-  }
-
-  /**
-   * Get the content model given the ComplexType node
-   * Returns the first one, if say, the INVALID schema has more than one
-   */
-  public Element getContentModelFromParent(Element element)
-  {
-    NodeList nl = element.getChildNodes();
-    int j = 0;
-    boolean modelExists = false;
-    int length = nl.getLength();
-    for (j = 0; j < length; j++)
-    {
-      Node aNode = nl.item(j);
-      if (inputEquals(aNode, XSDConstants.COMPLEXCONTENT_ELEMENT_TAG, false))
-      {
-        modelExists = true;
-        break; 
-      }
-      else if (inputEquals(aNode, XSDConstants.SIMPLECONTENT_ELEMENT_TAG, false))
-      {
-        modelExists = true;
-        break;
-      }
-      else if (inputEquals(aNode, XSDConstants.SEQUENCE_ELEMENT_TAG, false))
-      {
-        modelExists = true;
-        break;
-      }
-      else if (inputEquals(aNode, XSDConstants.CHOICE_ELEMENT_TAG, false))
-      {
-        modelExists = true;
-        break;
-      }
-      else if (inputEquals(aNode, XSDConstants.ALL_ELEMENT_TAG, false))
-      {
-        modelExists = true;
-        break;
-      }
-    }
-    if (!modelExists)
-    {
-      return null;
-    }
-
-    Element derivedByNode = (Element)nl.item(j);
-    return derivedByNode;
-  }
-
-  /**
-   * 
-   */
-  public void changeContentModel(Element complexTypeElement, String contentModel, Element sequenceChoiceOrAllElement)
-  {
-    Document doc = complexTypeElement.getOwnerDocument();
-
-    String prefix = complexTypeElement.getPrefix();
-    prefix = prefix == null ? "" : prefix + ":";
-    
-    Element contentModelElement = getContentModelFromParent(complexTypeElement);
-
-    if (contentModelElement.getLocalName().equals(contentModel))
-    {
-      return; // it's already the content model 
-    }
-    Element newNode;
-    newNode = doc.createElementNS(XSDDOMHelper.XMLSchemaURI, prefix + contentModel);
-
-    if (contentModelElement.hasChildNodes())
-    {        
-      NodeList nodes = contentModelElement.getChildNodes();
-      // use clones so we don't have a refresh problem
-      for (int i = 0; i < nodes.getLength(); i++)
-      {
-        Node node = nodes.item(i);
-        if (node instanceof Element)
-        {
-          if (node.getLocalName().equals(XSDConstants.ANNOTATION_ELEMENT_TAG))
-          {
-            if (!(XSDDOMHelper.inputEquals(contentModelElement, XSDConstants.SEQUENCE_ELEMENT_TAG, false) ||
-                XSDDOMHelper.inputEquals(contentModelElement, XSDConstants.CHOICE_ELEMENT_TAG, false) ||
-                XSDDOMHelper.inputEquals(contentModelElement, XSDConstants.ALL_ELEMENT_TAG, false)))
-            {
-              newNode.appendChild(node.cloneNode(true));
-            }
-          }
-          else if (node.getLocalName().equals(XSDConstants.RESTRICTION_ELEMENT_TAG) ||
-                    node.getLocalName().equals(XSDConstants.EXTENSION_ELEMENT_TAG))
-          {
-            newNode.appendChild(node.cloneNode(true));
-            if (sequenceChoiceOrAllElement != null)
-            {
-              node.appendChild(sequenceChoiceOrAllElement);
-            }
-          }
-          else
-          {
-            removeNodeAndWhitespace(node);
-          }
-        }
-        else
-        {
-          newNode.appendChild(node.cloneNode(true)); 
-        }
-      }
-    }
-    complexTypeElement.replaceChild(newNode, contentModelElement);
-  }
-
-  public Element cloneElement(Element parent, Element sourceNode)
-  {
-    Document doc = parent.getOwnerDocument();
-    String prefix = parent.getPrefix();
-    prefix = prefix == null ? "" : prefix + ":";
-    
-    Element newNode = doc.createElementNS(XSDDOMHelper.XMLSchemaURI, prefix + sourceNode.getLocalName());
-
-    if (sourceNode.hasChildNodes())
-    {        
-      NodeList nodes = sourceNode.getChildNodes();
-      // use clones so we don't have a refresh problem
-      for (int i = 0; i < nodes.getLength(); i++)
-      {
-        Node node = nodes.item(i);
-        newNode.appendChild(node.cloneNode(true));
-      }
-    }
-    return newNode;
-//    parent.replaceChild(newNode, sourceNode);
-  }
-
-  public static boolean hasOnlyWhitespace(Node node)
-  {
-    NodeList list = node.getChildNodes();
-    int length = list.getLength();
-    boolean hasOnlyWhitespace = true;
-    for (int i = 0; i < length; i++)
-    {
-      Node child = list.item(i);
-      if (child.getNodeType() != Node.TEXT_NODE)
-      {
-        hasOnlyWhitespace = false;
-        break;
-      }
-      else
-      {
-        String value = child.getNodeValue();
-        String trimmedValue = value.trim();
-        if (trimmedValue.length() != 0)
-        {
-          hasOnlyWhitespace = false;
-        }
-      }
-    }  
-    
-    return hasOnlyWhitespace;
-  }
-
-  public static void removeNodeAndWhitespace(Node node)
-  {
-    Node parentNode = node.getParentNode();
-    
-    Node nextElement = getNextElementNode(node);
-    Node previousElement = getPreviousElementNode(node);
-
-    Node nextSibling = node.getNextSibling();
-    if (nextSibling instanceof Text)
-    {
-      parentNode.removeChild(nextSibling);
-    }
-
-    if (parentNode != null)
-    {
-		  parentNode.removeChild(node);
-    }
-
-    if (nextElement != null)
-    {
-			formatChild(nextElement);
-    }
-
-		if (previousElement != null)
-		{
-			formatChild(previousElement);
-		}
-  }
-
-	public static void formatChild(Node child)
-	{
-    if (child instanceof IDOMNode)
-    {
-      IDOMModel model = ((IDOMNode)child).getModel();
-      try
-      {
-        // tell the model that we are about to make a big model change
-        model.aboutToChangeModel();
-        
-	      IStructuredFormatProcessor formatProcessor = new FormatProcessorXML();
-		    formatProcessor.formatNode(child);
-      }
-      finally
-      {
-        // tell the model that we are done with the big model change
-        model.changedModel(); 
-      }
-    }
-  }
-  
-
-  private static Node getNextElementNode(Node node)
-  {
-    Node next = node.getNextSibling();
-    
-    while (!(next instanceof Element) && next != null)
-    {
-      next = next.getNextSibling();
-    }
-    if (next instanceof Text)
-    {
-    	return null;
-    }
-    return next;
-  }
-
-	private static Node getPreviousElementNode(Node node)
-	{
-		Node previous = node.getPreviousSibling();
-    
-		while (!(previous instanceof Element) && previous != null)
-		{
-			previous = previous.getPreviousSibling();
-		}
-    if (previous instanceof Text)
-    {
-      return null;
-    }
-    return previous;
-	}
-
- 
-
-  // issue (cs) what's this method supposed to do?
-  // bizzare name
-  public static boolean inputEquals(Object input, String tagname, boolean isRef)
-  {
-    if (input instanceof Element)
-    {
-      Element element = (Element) input;
-      if (element.getLocalName().equals(tagname))
-      {
-        boolean refPresent = element.hasAttribute("ref");
-
-        return refPresent == isRef;
-      }
-    }
-    return false;
-  }
-
- 
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
deleted file mode 100644
index af3d91b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDSchemaLocationResolverAdapterFactory.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-
-public class XSDSchemaLocationResolverAdapterFactory extends AdapterFactoryImpl
-{
-    protected XSDSchemaLocationResolverImpl schemaLocator = new XSDSchemaLocationResolverImpl();
-
-    public boolean isFactoryForType(Object type)
-    {
-      return type == XSDSchemaLocationResolver.class;
-    }
-
-    public Adapter adaptNew(Notifier target, Object type)
-    {
-      return schemaLocator;
-    }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDSchemaLocationResolverImpl.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDSchemaLocationResolverImpl.java
deleted file mode 100644
index cd985b5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/util/XSDSchemaLocationResolverImpl.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.util;
-
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaLocationResolver;
-import org.eclipse.xsd.util.XSDSchemaLocator;
-
-public class XSDSchemaLocationResolverImpl extends AdapterImpl implements XSDSchemaLocationResolver
-{
-    public String resolveSchemaLocation(XSDSchema xsdSchema, String namespaceURI, String schemaLocationURI)
-    {
-      String baseLocation = xsdSchema.getSchemaLocation();      
-      String result = URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, schemaLocationURI);
-      if (result == null) {
-      	result = namespaceURI;
-      }
-      if (result == null) {
-      	result = "";
-      }
-
-      return result;
-    }
-
-    public boolean isAdatperForType(Object type)
-    {
-      return type == XSDSchemaLocator.class;
-    }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/utils/OpenOnSelectionHelper.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/utils/OpenOnSelectionHelper.java
deleted file mode 100644
index be1aa78..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/utils/OpenOnSelectionHelper.java
+++ /dev/null
@@ -1,369 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.utils;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.sse.core.internal.provisional.IndexedRegion;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.editor.InternalXSDMultiPageEditor;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDIdentityConstraintDefinition;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-
-// issue (cs) can we remove this?
-//
-public class OpenOnSelectionHelper
-{
-  
-  protected StructuredTextEditor textEditor;
-  protected XSDSchema xsdSchema;
-
- 
-  public OpenOnSelectionHelper(StructuredTextEditor textEditor, XSDSchema xsdSchema)
-  {
-  	this.textEditor = textEditor;
-  	this.xsdSchema = xsdSchema;
-  }
-  
-
-  boolean lastResult;
-  
-  public static void openXSDEditor(XSDSchema schema)
-  {
-    IEditorInput editorInput = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorInput();
-    
-    OpenInNewEditor.openXSDEditor(editorInput, schema, schema);    
-   
-  }
-  
-  public static void openXSDEditor(String schemaLocation)
-  {
-    IPath schemaPath = new Path(schemaLocation);
-		final IFile schemaFile = ResourcesPlugin.getWorkspace().getRoot().getFile(schemaPath);
-	
-		Display.getDefault().asyncExec(new Runnable()
-		{
-			/**
-			 * @see java.lang.Runnable#run()
-			 */
-			public void run()
-			{
-				final IWorkbenchWindow workbenchWindow = XSDEditorPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow();
-				if (workbenchWindow != null)
-				{
-					try
-					{
-					  workbenchWindow.getActivePage().openEditor(new FileEditorInput(schemaFile), XSDEditorPlugin.EDITOR_ID);
-					}
-					catch (PartInitException initEx)
-					{
-					  initEx.printStackTrace();
-					}
-					catch(Exception e)
-					{
-					  e.printStackTrace();
-					}
-				}          
-			}
-		});
-  }
-  
-  protected boolean revealObject(final XSDConcreteComponent component)
-  {
-    if (component.getRootContainer().equals(xsdSchema))
-    {
-      Node element = component.getElement();
-      if (element instanceof IndexedRegion)
-      {
-        IndexedRegion indexNode = (IndexedRegion) element;
-        textEditor.getTextViewer().setRangeIndication(indexNode.getStartOffset(), indexNode.getEndOffset() - indexNode.getStartOffset(), true);
-        return true;
-      }
-      return false;
-    }
-    else
-    {
-      lastResult = false;
-      if (component.getSchema() != null)
-      {
-				String schemaLocation = URIHelper.removePlatformResourceProtocol(component.getSchema().getSchemaLocation());
-        IPath schemaPath = new Path(schemaLocation);
-				final IFile schemaFile = ResourcesPlugin.getWorkspace().getRoot().getFile(schemaPath);
-        Display.getDefault().syncExec(new Runnable()
-        {
-	        /**
-	         * @see java.lang.Runnable#run()
-	         */
-	        public void run()
-	        {
-		        final IWorkbenchWindow workbenchWindow = XSDEditorPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow();
-		        if (workbenchWindow != null)
-		        {
-							try
-							{
-								IEditorPart editorPart = workbenchWindow.getActivePage().openEditor(new FileEditorInput(schemaFile), XSDEditorPlugin.PLUGIN_ID);
-								if (editorPart instanceof InternalXSDMultiPageEditor)
-								{
-									((InternalXSDMultiPageEditor)editorPart).openOnGlobalReference(component);
-									lastResult = true;
-								}
-							}
-							catch (PartInitException initEx)
-							{
-							}
-						}          
-					}
-				});
-      }
-      return lastResult;
-    }
-  }
-  
-  public XSDNamedComponent openOnGlobalReference(XSDConcreteComponent comp)
-  {
-    XSDSchema schema = xsdSchema;
-    String name = null;
-    if (comp instanceof XSDNamedComponent)
-    {
-      name = ((XSDNamedComponent) comp).getName();
-    }
-    if (name == null)
-    {
-      // For Anonymous types, just show the element
-      if (comp instanceof XSDTypeDefinition)
-      {
-        XSDTypeDefinition type = (XSDTypeDefinition) comp;
-        comp = type.getContainer();
-        if (comp instanceof XSDNamedComponent)
-        {
-          name = ((XSDNamedComponent) comp).getName();
-        }
-      }
-    }
-    
-    if (schema == null || name == null)
-    {
-      return null;
-    }
-
-    List objects = null;    
-    if (comp instanceof XSDElementDeclaration)
-    {
-      objects = schema.getElementDeclarations();
-    }
-    else if (comp instanceof XSDTypeDefinition)
-    {
-      objects = schema.getTypeDefinitions();
-    }
-    else if (comp instanceof XSDAttributeGroupDefinition)
-    {
-      objects = schema.getAttributeGroupDefinitions();
-    }
-    else if (comp instanceof XSDIdentityConstraintDefinition)
-    {
-      objects = schema.getIdentityConstraintDefinitions();
-    }
-    else if (comp instanceof XSDModelGroupDefinition)
-    {
-      objects = schema.getModelGroupDefinitions();
-    }
-    else if (comp instanceof XSDAttributeDeclaration)
-    {
-      objects = schema.getAttributeDeclarations();
-    }
-
-    if (objects != null)
-    {
-      for (Iterator iter = objects.iterator(); iter.hasNext();)
-      {
-        XSDNamedComponent namedComp = (XSDNamedComponent) iter.next();
-        
-        if (namedComp.getName().equals(name))
-        {
-          revealObject(namedComp);
-          return namedComp;
-        }
-      }
-    }
-    return null;
-  }
-  
-  public boolean openOnSelection()
-  {
-    List selectedNodes = null;
-    ISelection selection = textEditor.getSelectionProvider().getSelection();
-    if (selection instanceof IStructuredSelection) {
-      selectedNodes = ((IStructuredSelection) selection).toList();
-    }
-
-    if (selectedNodes != null && !selectedNodes.isEmpty())
-    {
-      for (Iterator i = selectedNodes.iterator(); i.hasNext();)
-      {
-        Object obj = i.next();
-        if (xsdSchema != null)
-        {
-          XSDConcreteComponent xsdComp = xsdSchema.getCorrespondingComponent((Node)obj);
-          XSDConcreteComponent objectToReveal = null;
-
-          if (xsdComp instanceof XSDElementDeclaration)
-          {
-            XSDElementDeclaration elementDecl = (XSDElementDeclaration) xsdComp;
-            if (elementDecl.isElementDeclarationReference())
-            {
-              objectToReveal = elementDecl.getResolvedElementDeclaration();
-            }
-            else
-            {
-              XSDConcreteComponent typeDef = null;
-              if (elementDecl.getAnonymousTypeDefinition() == null)
-              {
-                typeDef = elementDecl.getTypeDefinition();
-              }
-              
-              XSDConcreteComponent subGroupAffiliation = elementDecl.getSubstitutionGroupAffiliation();
-              
-              if (typeDef != null && subGroupAffiliation != null)
-              {
-                // we have 2 things we can navigate to, if the cursor is anywhere on the substitution attribute
-                // then jump to that, otherwise just go to the typeDef.
-                if (obj instanceof Attr && ((Attr)obj).getLocalName().equals(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE))
-                {
-                  objectToReveal = subGroupAffiliation;
-                }
-                else
-                {
-                  // try to reveal the type now.  On success, then we return true.
-                  // if we fail, set the substitution group as the object to reveal as a backup plan.
-                  if (revealObject(typeDef))
-                  {
-                    return true;
-                  }
-                  else
-                  {
-                    objectToReveal = subGroupAffiliation;
-                  }
-                }
-              }
-              else
-              {
-                // one or more of these is null.  If the typeDef is non-null, use it.  Otherwise
-                // try and use the substitution group
-                objectToReveal = typeDef != null ? typeDef : subGroupAffiliation;
-              }
-            }
-          }
-          else if (xsdComp instanceof XSDModelGroupDefinition)
-          {
-            XSDModelGroupDefinition elementDecl = (XSDModelGroupDefinition) xsdComp;
-            if (elementDecl.isModelGroupDefinitionReference())
-            {
-              objectToReveal = elementDecl.getResolvedModelGroupDefinition();
-            }
-          }
-          else if (xsdComp instanceof XSDAttributeDeclaration)
-          {
-            XSDAttributeDeclaration attrDecl = (XSDAttributeDeclaration) xsdComp;
-            if (attrDecl.isAttributeDeclarationReference())
-            {
-              objectToReveal = attrDecl.getResolvedAttributeDeclaration();
-            }
-            else if (attrDecl.getAnonymousTypeDefinition() == null)
-            {
-              objectToReveal = attrDecl.getTypeDefinition();
-            }              
-          }
-          else if (xsdComp instanceof XSDAttributeGroupDefinition)
-          {
-            XSDAttributeGroupDefinition attrGroupDef = (XSDAttributeGroupDefinition) xsdComp;
-            if (attrGroupDef.isAttributeGroupDefinitionReference())
-            {
-              objectToReveal = attrGroupDef.getResolvedAttributeGroupDefinition();
-            }
-          }
-          else if (xsdComp instanceof XSDIdentityConstraintDefinition)
-          {
-            XSDIdentityConstraintDefinition idConstraintDef = (XSDIdentityConstraintDefinition) xsdComp;
-            if (idConstraintDef.getReferencedKey() != null)
-            {
-              objectToReveal = idConstraintDef.getReferencedKey();
-            }
-          }
-          else if (xsdComp instanceof XSDSimpleTypeDefinition)
-          {
-            XSDSimpleTypeDefinition typeDef = (XSDSimpleTypeDefinition) xsdComp;
-            objectToReveal = typeDef.getItemTypeDefinition();
-            if (objectToReveal == null)
-            {
-              // if itemType attribute is not set, then check for memberType
-              List memberTypes = typeDef.getMemberTypeDefinitions();
-              if (memberTypes != null && memberTypes.size() > 0)
-              {
-                objectToReveal = (XSDConcreteComponent)memberTypes.get(0);
-              }              
-            }
-          }
-          else if (xsdComp instanceof XSDTypeDefinition)
-          {
-            XSDTypeDefinition typeDef = (XSDTypeDefinition) xsdComp;
-            objectToReveal = typeDef.getBaseType();
-          }
-          else if (xsdComp instanceof XSDSchemaDirective)
-          {
-          	XSDSchemaDirective directive = (XSDSchemaDirective) xsdComp;
-//						String schemaLocation = URIHelper.removePlatformResourceProtocol(directive.getResolvedSchema().getSchemaLocation());
-//						openXSDEditor(schemaLocation);
-//						return false;
-            objectToReveal = directive.getResolvedSchema();						          	          	
-          }
-
-          // now reveal the object if this isn't null
-          if (objectToReveal != null)
-          {
-            return revealObject(objectToReveal);
-          }
-        }
-      }
-    }
-    return false;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/validation/DelegatingSourceValidatorForXSD.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/validation/DelegatingSourceValidatorForXSD.java
deleted file mode 100644
index b90cce8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/validation/DelegatingSourceValidatorForXSD.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.validation;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.validation.ValidationFramework;
-import org.eclipse.wst.validation.Validator;
-import org.eclipse.wst.validation.internal.provisional.core.IValidator;
-import org.eclipse.wst.xml.ui.internal.validation.DelegatingSourceValidator;
-
-/**
- * This performs the as-you-type validation for schema files
- *
- */
-public class DelegatingSourceValidatorForXSD extends DelegatingSourceValidator {                                                
-  private final static String Id = "org.eclipse.wst.xsd.core.xsd";
-
-  private Validator _validator;
-  
-  public DelegatingSourceValidatorForXSD() { 
-  }
-  
-  private Validator getValidator(){
-	  if (_validator == null)_validator = ValidationFramework.getDefault().getValidator(Id);
-	  return _validator;
-  }
-  
-  protected IValidator getDelegateValidator() {
-	  Validator v = getValidator();
-	  if (v == null)return null;
-	  return v.asIValidator();
-  }
-  
-	protected boolean isDelegateValidatorEnabled(IFile file) {
-		Validator v = getValidator();
-		if (v == null)return false;
-		if (!v.shouldValidate(file, false, false))return false;
-		return v.isBuildValidation() || v.isManualValidation();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/EnumerationsDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/EnumerationsDialog.java
deleted file mode 100644
index 1af19fa..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/EnumerationsDialog.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.widgets;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-
-
-/**
- * Dialog to help define a list of enumerations
- * for a join. This might be replaced once we know how to
- * initiate a drag tracker
- */
-
-public class EnumerationsDialog extends org.eclipse.jface.dialogs.Dialog
-{
-  public EnumerationsDialog(Shell shell)
-  {
-    super(shell);
-  }
-
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-    shell.setText(XSDEditorPlugin.getXSDString("_UI_ENUMERATIONS_DIALOG_TITLE"));
-  }
-
-  protected void buttonPressed(int buttonId)
-  {
-    if (buttonId == Window.OK)
-    {
-      text = textField.getText();
-      delimiter = delimiterField.getText();
-      isPreserve = preserveWhitespace.getSelection();
-    }
-    super.buttonPressed(buttonId);
-  }
-
-  private String text, delimiter;
-  private boolean isPreserve;
-  public String getText() { return text; }
-  public String getDelimiter() { return delimiter; }
-  public boolean isPreserveWhitespace() { return isPreserve; }
-
-  private Text textField;
-  private Button preserveWhitespace;
-  private Combo delimiterField;
-  //
-  // Create the controls
-  //
-  public Control createDialogArea(Composite parent)
-  {
-    Control[] tabOrder = new Control[3];
-  	int tabIndex = 0;
-    Composite client = (Composite)super.createDialogArea(parent);
-    GridLayout layout = (GridLayout)client.getLayout();
-    layout.numColumns = 2;
-    client.setLayout(layout); 
-
-    textField = ViewUtility.createWrappedMultiTextField(client, 400, 20, true);
-    GridData gd = (GridData) textField.getLayoutData();
-    gd.horizontalSpan = 2;
-    tabOrder[tabIndex++] = textField;
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(textField, XSDEditorCSHelpIds.ADD_ENUMERATIONS__NO_NAME);
-
-    ViewUtility.createLabel(client, XSDEditorPlugin.getXSDString("_UI_LABEL_DELIMITER_CHAR"));
-    delimiterField = ViewUtility.createComboBox(client, false);
-    gd = (GridData) delimiterField.getLayoutData();
-    gd.grabExcessHorizontalSpace = false;
-    gd.horizontalAlignment = GridData.BEGINNING;
-    gd.widthHint = 30;
-    tabOrder[tabIndex++] = delimiterField;
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(delimiterField, XSDEditorCSHelpIds.ADD_ENUMERATIONS__DELIMITER_CHARS);
-
-    // add default delimiters
-    delimiterField.add(":");
-    delimiterField.add(",");
-    delimiterField.add(" ");
-    // set the current one to be ','
-    delimiterField.setText(",");
-
-    preserveWhitespace = ViewUtility.createCheckBox(client, XSDEditorPlugin.getXSDString("_UI_LABEL_PRESERVE_WHITESPACE"));
-    gd = (GridData) preserveWhitespace.getLayoutData();
-    gd.horizontalSpan = 2;
-    tabOrder[tabIndex++] = preserveWhitespace;
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(preserveWhitespace, XSDEditorCSHelpIds.ADD_ENUMERATIONS__PRESERVE_LEAD_AND_TRAIL_WHITESPACES);
-    
-    client.setTabList(tabOrder);
-
-    return client;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/TypeSection.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/TypeSection.java
deleted file mode 100644
index ee29fee..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/TypeSection.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.widgets;
-
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.help.WorkbenchHelp;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorContextIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-import org.eclipse.xsd.XSDSchema;
-
-public class TypeSection
-{
-  /**
-   * Constructor for TypeSection.
-   * @param parent
-   */
-  public TypeSection(Composite parent)
-  {
-  }
-
-  protected Button  simpleType;
-  protected Button  userSimpleType;
-  protected Button  userComplexType;
-  protected Button  noneRadio;
-  protected Combo   typeList;
-  protected Combo   derivedByCombo;
-  protected boolean showUserComplexType = true;
-  protected boolean showUserSimpleType  = true;
-  protected boolean showNone            = false;
-  protected boolean showDerivedBy       = false;
-  protected String  derivedByChoices[]  = { "restriction", "extension" };
-  public final int  NONE                = 1;
-  public final int  BUILT_IN            = 2;
-  public final int  SIMPLE              = 3;
-  public final int  COMPLEX             = 4;
-
-  String            sectionTitle        = XSDEditorPlugin.getXSDString("_UI_LABEL_TYPE_INFORMATION");
-  String            currentObjectUuid   = "";
-
-  /*
-   * @see FlatPageSection#createClient(Composite, WidgetFactory)
-   */
-  public Composite createClient(Composite parent)
-  {
-    Composite client = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout(1, true);
-    gl.verticalSpacing = 0;
-    client.setLayout(gl);
-
-    if (showNone)
-    {
-      noneRadio = ViewUtility.createRadioButton(client, XSDEditorPlugin.getXSDString("_UI_RADIO_NONE"));
-      WorkbenchHelp.setHelp(noneRadio, XSDEditorContextIds.XSDE_TYPE_HELPER_NONE);
-    }
-
-    simpleType = ViewUtility.createRadioButton(client, XSDEditorPlugin.getXSDString("_UI_RADIO_BUILT_IN_SIMPLE_TYPE"));
-    WorkbenchHelp.setHelp(simpleType, XSDEditorContextIds.XSDE_TYPE_HELPER_BUILT_IN);
-
-    if (showUserSimpleType)
-    {
-      userSimpleType = ViewUtility.createRadioButton(client, XSDEditorPlugin.getXSDString("_UI_RADIO_USER_DEFINED_SIMPLE_TYPE"));
-      WorkbenchHelp.setHelp(userSimpleType, XSDEditorContextIds.XSDE_TYPE_HELPER_USER_DEFINED_SIMPLE);
-    }
-
-    if (showUserComplexType)
-    {
-      userComplexType = ViewUtility.createRadioButton(client, XSDEditorPlugin.getXSDString("_UI_RADIO_USER_DEFINED_COMPLEX_TYPE"));
-      WorkbenchHelp.setHelp(userComplexType, XSDEditorContextIds.XSDE_TYPE_HELPER_USER_DEFINED_COMPLEX);
-    }
-
-    //	  typeList = utility.createComboBox(client);
-    //	  WorkbenchHelp.setHelp(typeList, XSDEditorContextIds.XSDE_TYPE_HELPER_TYPE);
-    //    utility.createHeadingLabel(client, "Type",null);
-
-    if (showDerivedBy)
-    {
-      Composite derivedByComposite = ViewUtility.createComposite(client, 2);
-      ViewUtility.createLabel(derivedByComposite, XSDEditorPlugin.getXSDString("_UI_LABEL_DERIVED_BY"));
-      derivedByCombo = ViewUtility.createComboBox(derivedByComposite);
-      populateDerivedByCombo();
-      WorkbenchHelp.setHelp(derivedByCombo, XSDEditorContextIds.XSDE_SIMPLE_CONTENT_DERIVED);
-      derivedByCombo.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_DERIVED_BY"));
-    }
-    // Set the default selection
-    if (showNone)
-    {
-      //		noneRadio.setSelection(true);
-      //		typeList.setEnabled(false);
-    }
-    else
-    {
-      simpleType.setSelection(true);
-    }
-    return client;
-  }
-
-  public void setIsDerivedBy(boolean derive)
-  {
-    if (derive)
-    {
-      sectionTitle = XSDEditorPlugin.getXSDString("_UI_LABEL_BASE_TYPE");
-    }
-    else
-    {
-      sectionTitle = XSDEditorPlugin.getXSDString("_UI_LABEL_TYPE_INFORMATION");
-    }
-    //	setHeaderText(sectionTitle);
-  }
-
-  /**
-   * Set to true if called by Complex Type & Simple Type
-   */
-  public void setShowDerivedBy(boolean derive)
-  {
-    showDerivedBy = derive;
-  }
-
-  /**
-   * Gets the derivedByField
-   * @return Returns a Button
-   */
-  public Combo getDerivedByCombo()
-  {
-    return derivedByCombo;
-  }
-
-  /**
-   * Gets the noneRadio.
-   * @return Returns a Button
-   */
-  public Button getNoneRadio()
-  {
-    return noneRadio;
-  }
-
-  /**
-   * Gets the simpleType.
-   * @return Returns a Button
-   */
-  public Button getSimpleType()
-  {
-    return simpleType;
-  }
-
-  /**
-   * Gets the userComplexType.
-   * @return Returns a Button
-   */
-  public Button getUserComplexType()
-  {
-    return userComplexType;
-  }
-
-  /**
-   * Gets the userSimpleType.
-   * @return Returns a Button
-   */
-  public Button getUserSimpleType()
-  {
-    return userSimpleType;
-  }
-
-  /**
-   * Gets the typeList.
-   * @return Returns a CCombo
-   */
-  public Combo getTypeList()
-  {
-    return typeList;
-  }
-
-  /**
-   * Populate combo box with built-in simple types
-   */
-  public void populateBuiltInType(XSDSchema xsdSchema)
-  {
-    getTypeList().removeAll();
-    List items = getBuiltInTypeNamesList(xsdSchema);
-    for (int i = 0; i < items.size(); i++)
-    {
-      getTypeList().add(items.get(i).toString());
-    }
-  }
-
-  public java.util.List getBuiltInTypeNamesList(XSDSchema xsdSchema)
-  {
-    TypesHelper helper = new TypesHelper(xsdSchema);
-    return helper.getBuiltInTypeNamesList();
-  }
-
-  /**
-   * Populate combo box with user defined complex types
-   */
-  public void populateUserComplexType(XSDSchema xsdSchema, boolean showAnonymous)
-  {
-    getTypeList().removeAll();
-    if (showAnonymous)
-    {
-      getTypeList().add(XSDEditorPlugin.getXSDString("_UI_ANONYMOUS"));
-    }
-
-    List items = getUserComplexTypeNamesList(xsdSchema);
-    for (int i = 0; i < items.size(); i++)
-    {
-      getTypeList().add(items.get(i).toString());
-    }
-  }
-
-  public java.util.List getUserComplexTypeNamesList(XSDSchema xsdSchema)
-  {
-    TypesHelper helper = new TypesHelper(xsdSchema);
-    return helper.getUserComplexTypeNamesList();
-  }
-
-  public void populateUserSimpleType(XSDSchema xsdSchema, boolean showAnonymous)
-  {
-    getTypeList().removeAll();
-    if (showAnonymous)
-    {
-      getTypeList().add(XSDEditorPlugin.getXSDString("_UI_ANONYMOUS"));
-    }
-    List items = getUserSimpleTypeNamesList(xsdSchema);
-    for (int i = 0; i < items.size(); i++)
-    {
-      getTypeList().add(items.get(i).toString());
-    }
-  }
-
-  /**
-   * Populate combo box with user defined simple types
-   */
-  public void populateUserSimpleType(XSDSchema xsdSchema)
-  {
-    getTypeList().removeAll();
-    List items = getUserSimpleTypeNamesList(xsdSchema);
-    for (int i = 0; i < items.size(); i++)
-    {
-      getTypeList().add(items.get(i).toString());
-    }
-  }
-
-  public java.util.List getUserSimpleTypeNamesList(XSDSchema xsdSchema)
-  {
-    TypesHelper helper = new TypesHelper(xsdSchema);
-    return helper.getUserSimpleTypeNamesList();
-  }
-
-  public String getPrefix(String ns, XSDSchema xsdSchema)
-  {
-    TypesHelper helper = new TypesHelper(xsdSchema);
-    String key = helper.getPrefix(ns, true);
-    return key;
-  }
-
-  /**
-   * Populate combo box with derived by choices
-   */
-  protected void populateDerivedByCombo()
-  {
-    for (int i = 0; i < derivedByChoices.length; i++)
-    {
-      getDerivedByCombo().add(derivedByChoices[i]);
-    }
-  }
-
-  /**
-   * Gets the showUserComplexType.
-   * @return Returns a boolean
-   */
-  public boolean getShowUserComplexType()
-  {
-    return showUserComplexType;
-  }
-
-  /**
-   * Gets the showUserSimpleType.
-   * @return Returns a boolean
-   */
-  public boolean getShowUserSimpleType()
-  {
-    return showUserSimpleType;
-  }
-
-  /**
-   * Gets the showNone.
-   * @return Returns a boolean
-   */
-  public boolean getShowNone()
-  {
-    return showNone;
-  }
-
-  /**
-   * Sets the showUserComplexType.
-   * @param showUserComplexType The showUserComplexType to set
-   */
-  public void setShowUserComplexType(boolean showUserComplexType)
-  {
-    this.showUserComplexType = showUserComplexType;
-  }
-
-  /**
-   * Sets the showUserSimpleType.
-   * @param showUserSimpleType The showUserSimpleType to set
-   */
-  public void setShowUserSimpleType(boolean showUserSimpleType)
-  {
-    this.showUserSimpleType = showUserSimpleType;
-  }
-
-  /**
-   * Sets the showNone
-   * @param showUserSimpleType The showNone to set
-   */
-  public void setShowNone(boolean showNone)
-  {
-    this.showNone = showNone;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/XSDEditSchemaInfoDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/XSDEditSchemaInfoDialog.java
deleted file mode 100644
index abd0167..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/widgets/XSDEditSchemaInfoDialog.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.widgets;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.ui.internal.dialogs.EditSchemaInfoDialog;
-import org.eclipse.wst.xml.ui.internal.nsedit.CommonEditNamespacesTargetFieldDialog;
-
-public class XSDEditSchemaInfoDialog extends EditSchemaInfoDialog implements SelectionListener {
-	String targetNamespace;
-	CommonEditNamespacesTargetFieldDialog editNamespacesControl;
-  /**
-   * @deprecated - These have been moved to the Advanced Properties Tab 
-   */
-  Combo elementFormCombo, attributeFormCombo;
-  /**
-   * @deprecated 
-   */
-  String elementFormQualified = "", attributeFormQualified = ""; //$NON-NLS-1$ //$NON-NLS-2$
-  
-	public XSDEditSchemaInfoDialog(Shell parentShell, IPath resourceLocation, String targetNamespace) {
-		super(parentShell, resourceLocation);
-		this.targetNamespace = targetNamespace;
-	}
-	
-	// this is copy of ....
-    protected Control __internalCreateDialogArea(Composite parent) {
-        // create a composite with standard margins and spacing
-        Composite composite = new Composite(parent, SWT.NONE);
-        GridLayout layout = new GridLayout();
-        layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-        layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-        layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-        layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-        composite.setLayout(layout);
-        composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-        return composite;
-    }	
-	
-	protected Control createDialogArea(Composite parent) {
-		Composite dialogArea = (Composite) __internalCreateDialogArea(parent);
-		editNamespacesControl = new CommonEditNamespacesTargetFieldDialog(dialogArea, resourceLocation); //$NON-NLS-1$
-		if (targetNamespace != null)
-		{	
-			editNamespacesControl.setTargetNamespace(targetNamespace);
-		}
-		editNamespacesControl.setNamespaceInfoList(namespaceInfoList);
-		editNamespacesControl.updateErrorMessage(namespaceInfoList);
-
-    applyDialogFont(parent);
-		return dialogArea;
-	}	
-	
-	public String getTargetNamespace() {
-		return editNamespacesControl.getTargetNamespace();
-	}
-  
-  /**
-   * @deprecated 
-   */
-  public void setIsElementQualified(String state)
-  {
-    elementFormCombo.setText(state);
-    elementFormQualified = state;
-  }
-  
-  /**
-   * @deprecated 
-   */
-  public void setIsAttributeQualified(String state)
-  {
-    attributeFormCombo.setText(state);
-    attributeFormQualified = state;
-  }
-  
-  /**
-   * @deprecated 
-   */
-  public String getElementFormQualified()
-  {
-    return elementFormQualified;
-  }
-  
-  /**
-   * @deprecated 
-   */
-  public String getAttributeFormQualified()
-  {
-    return attributeFormQualified;
-  }
-  
-  /**
-   * @deprecated 
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-   
-  }
-  
-  /**
-   * @deprecated 
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == attributeFormCombo)
-    {
-      attributeFormQualified = attributeFormCombo.getText();
-    }
-    else if (e.widget == elementFormCombo)
-    {
-      elementFormQualified = elementFormCombo.getText();
-    }
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/NewXSDWizard.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/NewXSDWizard.java
deleted file mode 100644
index 41cd29d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/NewXSDWizard.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.wizards;
-
-import java.io.ByteArrayInputStream;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorDescriptor;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-
-public class NewXSDWizard extends Wizard implements INewWizard {
-	private XSDNewFilePage newFilePage;
-	private IStructuredSelection selection;
-	private IWorkbench workbench;
-
-	public NewXSDWizard() {
-	}
-
-	public void init(IWorkbench aWorkbench, IStructuredSelection aSelection) {
-		this.selection = aSelection;
-		this.workbench = aWorkbench;
-
-		this.setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/NewXSD.png"));
-		this.setWindowTitle(XSDEditorPlugin.getXSDString("_UI_WIZARD_CREATE_XSD_MODEL_TITLE"));
-	}
-
-	public void addPages() {
-		newFilePage = new XSDNewFilePage(selection);
-		addPage(newFilePage);
-	}
-
-	public boolean performFinish() {
-		IFile file = newFilePage.createNewFile();
-
-		//
-		// Get the xsd schema name from the full path name
-		// e.g. f:/b2b/po.xsd => schema name = po
-		//
-		IPath iPath = file.getFullPath().removeFileExtension();
-		// String schemaName = iPath.lastSegment();
-		String schemaName = iPath.lastSegment();
-		String schemaPrefix = "tns";
-		String prefixForSchemaNamespace = "";
-		String schemaNamespaceAttribute = "xmlns";
-		if (XSDEditorPlugin.getPlugin().isQualifyXMLSchemaLanguage()) {
-			// Added this if check before disallowing blank prefixes in the
-			// preferences...
-			// Can take this out. See also XSDEditor
-			if (XSDEditorPlugin.getPlugin().getXMLSchemaPrefix().trim().length() > 0) {
-				prefixForSchemaNamespace = XSDEditorPlugin.getPlugin().getXMLSchemaPrefix() + ":";
-				schemaNamespaceAttribute += ":" + XSDEditorPlugin.getPlugin().getXMLSchemaPrefix();
-			}
-		}
-
-		Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-		String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-		if (charSet == null || charSet.trim().equals("")) {
-			charSet = "UTF-8";
-		}
-
-		String newContents = "<?xml version=\"1.0\" encoding=\"" + charSet + "\"?>\n";
-
-		String defaultTargetURI = XSDEditorPlugin.getPlugin().getXMLSchemaTargetNamespace();
-		newContents += "<" + prefixForSchemaNamespace + "schema " + schemaNamespaceAttribute + "=\"http://www.w3.org/2001/XMLSchema\" targetNamespace=\"" + defaultTargetURI + schemaName + "\" xmlns:" + schemaPrefix + "=\"" + defaultTargetURI + schemaName + "\" elementFormDefault=\"qualified\">\n</" + prefixForSchemaNamespace + "schema>";
-
-		try {
-			byte[] bytes = newContents.getBytes(charSet);
-			ByteArrayInputStream inputStream = new ByteArrayInputStream(bytes);
-
-			file.setContents(inputStream, true, false, null);
-			inputStream.close();
-		}
-		catch (Exception e) {
-			// XSDEditorPlugin.getPlugin().getMsgLogger().write("Error writing
-			// default content:\n" + newContents);
-			// XSDEditorPlugin.getPlugin().getMsgLogger().write(e);
-		}
-
-		if (file != null) {
-			revealSelection(new StructuredSelection(file));
-		}
-
-		openEditor(file);
-
-		return true;
-	}
-
-	private void revealSelection(final ISelection selection) {
-		if (selection != null) {
-			IWorkbench workbench2;
-			if (workbench == null)
-			{
-			  workbench2 = XSDEditorPlugin.getPlugin().getWorkbench();
-			}
-			else
-			{
-			  workbench2 = workbench;
-			}
-			final IWorkbenchWindow workbenchWindow = workbench2.getActiveWorkbenchWindow();
-			final IWorkbenchPart focusPart = workbenchWindow.getActivePage().getActivePart();
-			if (focusPart instanceof ISetSelectionTarget) {
-				Display.getCurrent().asyncExec(new Runnable() {
-					public void run() {
-						((ISetSelectionTarget) focusPart).selectReveal(selection);
-					}
-				});
-			}
-		}
-	}
-
-	public void openEditor(final IFile iFile) {
-		if (iFile != null) {
-			IWorkbench workbench2;
-			if (workbench == null)
-			{
-			  workbench2 = XSDEditorPlugin.getPlugin().getWorkbench();
-			}
-			else
-			{
-			  workbench2 = workbench;
-			}
-			final IWorkbenchWindow workbenchWindow = workbench2.getActiveWorkbenchWindow();
-
-			Display.getDefault().asyncExec(new Runnable() {
-				public void run() {
-					try {
-						String editorId = null;
-						IEditorDescriptor editor = PlatformUI.getWorkbench().getEditorRegistry().getDefaultEditor(iFile.getLocation().toOSString(), iFile.getContentDescription().getContentType());
-						if (editor != null) {
-							editorId = editor.getId();
-						}
-						workbenchWindow.getActivePage().openEditor(new FileEditorInput(iFile), editorId);
-						
-					}
-					catch (PartInitException ex) {
-					}
-					catch (CoreException ex) {
-					}
-				}
-			});
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexCompositionPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexCompositionPage.java
deleted file mode 100644
index 1a1712d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexCompositionPage.java
+++ /dev/null
@@ -1,947 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-// Based on version 1.12 of original xsdeditor
-package org.eclipse.wst.xsd.ui.internal.wizards;
-
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-import org.eclipse.xsd.XSDPatternFacet;
-
-
-
-/*
--other regex features (eg case sensitivity, ^ or $, |, etc etc)
--smarter model
--better keyboard navigation
--update list of tokens 
-*/
-
-public class RegexCompositionPage extends WizardPage
-{
-  private static final boolean debug = false;
-
-  /* The text representation of our pattern. */
-  private StyledText value; 
-
-  /* The StyleRange used to color code the current parse error. */
-  private StyleRange currentError;
-
-  /* The regex terms we can form tokens from. */
-  private Combo terms;
-
-  /* The checkbox for activating auto-escape mode. */  
-  private Button escapeCheckbox;
-  
-  /* On/off status of auto-escape mode. */ 
-  private boolean autoEscapeStatus;
-
-  /* The Add Token button. */
-  private Button add;
-
-
-  // The following controls are used in the occurrence selection group
-
-  private Text repeatValue;
-
-  private Text rangeMinValue;
-  private Text rangeMaxValue;
-  private Label rangeToLabel;  
-
-  private Button singleRadio;
-  private Button starRadio;
-  private Button plusRadio;
-  private Button optionalRadio; 
-  private Button repeatRadio;
-  private Button rangeRadio;
-
-  
-  // The following variables used as part of the model. 
-
-  /* Our pattern. */
-  private XSDPatternFacet pattern;
-
-  /* Model used to store the current token. */
-  private RegexNode node;    
-
-  /* The flags passed to the new RegularExpression object.  Default value includes:
-      X = XMLSchema mode    */
-  private String regexFlags = "X";
-      
-
-  /* Is the current regex token valid? */
-  private boolean isValidToken;
-
-  /* The label used to indicate the value's caret position when it looses focus. */
-  private Label caretLabel;
-
-  /* The pixel offsets needed to align the label icon with the caret location.
-     These are dependent on the icon used. */
-  private static final int CARET_LABEL_X_OFFSET = -3;
-  private static final int CARET_LABEL_Y_OFFSET = 19;
-
-  
-  /* Enumerated constants for specifying the type of an error message. */
-  private static final int TOKEN = 0;
-  private static final int SELECTION = 1;
-  private static final int PARSE = 2;
-  
-  private static final int NUM_ERROR_MESSAGE_TYPES = 3;
-  
-  /* The current error message for each type of error.  A value of null indicates no message. 
-     The array is indexed according to the above constants.
-  */
-  private String[] currentErrorMessages;
-
-
-  public RegexCompositionPage(XSDPatternFacet pattern)
-  {
-    super(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_COMPOSITION_PAGE_TITLE"));
-    this.pattern = pattern;
-
-    setTitle(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_COMPOSITION_PAGE_TITLE"));
-    setDescription(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_COMPOSITION_PAGE_DESCRIPTION"));
-  }
-
-  public void createControl(Composite parent)
-  {
-    // Set up our model and validator
-    node = new RegexNode();
-        
-    isValidToken = true;
-
-    currentErrorMessages = new String[NUM_ERROR_MESSAGE_TYPES];
-
-    // The main composite
-    Composite composite= new Composite(parent, SWT.NONE);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, XSDEditorCSHelpIds.REGEX_WIZARD_PAGE);
-    composite.setLayout(new GridLayout());
-
-
-    // The composite for the token combo box, label, and auto-escape checkbox
-    Composite tokenComposite = new Composite (composite, SWT.NONE);
-    GridLayout tokenCompositeLayout = new GridLayout();
-    tokenCompositeLayout.numColumns = 3;
-    tokenCompositeLayout.marginWidth = 0;
-    tokenComposite.setLayout(tokenCompositeLayout);
-
-
-    new Label(tokenComposite, SWT.LEFT).setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TOKEN_LABEL"));
-    
-    terms = new Combo(tokenComposite, SWT.DROP_DOWN);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(terms, XSDEditorCSHelpIds.REGEX_TOKEN_CONTENTS);
-    for (int i = 0; i < RegexNode.getNumRegexTerms(); i++)
-    {
-      terms.add(RegexNode.getRegexTermText(i));
-    }
-    terms.addListener(SWT.Modify, new ComboListener());
-    terms.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_TERMS"));
-
-    escapeCheckbox = new Button(tokenComposite, SWT.CHECK);
-    escapeCheckbox.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_AUTO_ESCAPE_CHECKBOX_LABEL"));
-    escapeCheckbox.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_AUTO_ESCAPE_CHECKBOX")); 
-    escapeCheckbox.addSelectionListener(new CheckboxListener());
-    autoEscapeStatus = false;
-
-
-    // Set up the composites pertaining to the selection of occurrence quantifiers
-
-    Group occurrenceSelectionArea = new Group(composite, SWT.NONE);
-    occurrenceSelectionArea.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_OCCURENCE_LABEL"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(occurrenceSelectionArea, XSDEditorCSHelpIds.REGEX_WIZARD_PAGE);
-    GridLayout selectionAreaLayout = new GridLayout();
-    selectionAreaLayout.numColumns = 2;
-    occurrenceSelectionArea.setLayout(selectionAreaLayout);
-
-    occurrenceSelectionArea.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    // Listener used for all of the text fields
-    TextListener textListener = new TextListener();
-    
-
-    // Add the radio buttons
-    RadioSelectListener radioSelectListener = new RadioSelectListener();
-
-    singleRadio = addOccurenceRadioButton(RegexNode.SINGLE, occurrenceSelectionArea, radioSelectListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(singleRadio, XSDEditorCSHelpIds.REGEX_JUST_ONCE);
-    ViewUtility.createHorizontalFiller(occurrenceSelectionArea, 1);
-
-    starRadio = addOccurenceRadioButton(RegexNode.STAR, occurrenceSelectionArea, radioSelectListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(starRadio, XSDEditorCSHelpIds.REGEX_ZERO_OR_MORE);
-    ViewUtility.createHorizontalFiller(occurrenceSelectionArea, 1);
-
-    plusRadio = addOccurenceRadioButton(RegexNode.PLUS, occurrenceSelectionArea, radioSelectListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(plusRadio, XSDEditorCSHelpIds.REGEX_ONE_OR_MORE);
-    ViewUtility.createHorizontalFiller(occurrenceSelectionArea, 1);
-
-    optionalRadio = addOccurenceRadioButton(RegexNode.OPTIONAL, occurrenceSelectionArea, radioSelectListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(optionalRadio, XSDEditorCSHelpIds.REGEX_OPTIONAL);
-    ViewUtility.createHorizontalFiller(occurrenceSelectionArea, 1);
-
-    repeatRadio = addOccurenceRadioButton(RegexNode.REPEAT, occurrenceSelectionArea, radioSelectListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(repeatRadio, XSDEditorCSHelpIds.REGEX_REPEAT_RADIO);
-    
-    repeatValue = new Text(occurrenceSelectionArea, SWT.SINGLE | SWT.BORDER);
-    repeatValue.addListener(SWT.Modify, textListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(repeatValue, XSDEditorCSHelpIds.REGEX_REPEAT_FIELD);
-    repeatValue.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_REPEAT"));
-    repeatValue.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    setEnabledStatus(RegexNode.REPEAT, false);
-    
-    rangeRadio = addOccurenceRadioButton(RegexNode.RANGE, occurrenceSelectionArea, radioSelectListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(rangeRadio, XSDEditorCSHelpIds.REGEX_RANGE_RADIO);
-
-    // Add text fields and labels for specifying the range    
-    Composite rangeWidgets = new Composite(occurrenceSelectionArea, SWT.NONE);
-    GridLayout gridLayout = new GridLayout(3, false);
-    gridLayout.marginHeight = 0;
-    gridLayout.marginWidth = 0;
-    rangeWidgets.setLayout(gridLayout);
-    rangeWidgets.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    
-    rangeMinValue = new Text(rangeWidgets, SWT.SINGLE | SWT.BORDER);
-    rangeMinValue.addListener(SWT.Modify, textListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(rangeMinValue, XSDEditorCSHelpIds.REGEX_RANGE_MINIMUM_FIELD);
-    rangeMinValue.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_MIN"));
-    rangeMinValue.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    
-    rangeToLabel = new Label(rangeWidgets, SWT.NONE);
-    rangeToLabel.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TO_LABEL"));
-    
-    rangeMaxValue = new Text(rangeWidgets, SWT.SINGLE | SWT.BORDER);
-    rangeMaxValue.addListener(SWT.Modify, textListener);
-    rangeMaxValue.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_MAX"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(rangeMaxValue, XSDEditorCSHelpIds.REGEX_RANGE_MAXIMUM_FIELD);
-    rangeMaxValue.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    setEnabledStatus(RegexNode.RANGE, false);
-    
-    singleRadio.setSelection(true);
-    
-    // The add button
-    add = new Button(composite, SWT.PUSH);
-    add.addSelectionListener(new ButtonSelectListener());
-    add.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_ADD_BUTTON_LABEL"));
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(add, XSDEditorCSHelpIds.REGEX_ADD_BUTTON);
-    add.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_ADD_BUTTON"));
-
-    
-    Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-    separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    
-    // Our main text box
-
-    Label valueLabel= new Label(composite, SWT.LEFT);
-    valueLabel.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_CURRENT_REGEX_LABEL"));
-    
-    value = new StyledText(composite, SWT.SINGLE | SWT.BORDER);
-    value.addListener(SWT.Modify, textListener);
-    value.addListener(SWT.Selection, textListener);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(value, XSDEditorCSHelpIds.REGEX_CURRENT_VALUE);
-    value.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_CURRENT_REGEX"));
-    value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    value.setFocus();
-
-    // StyleRange used for highlighting parse errors
-    currentError = new StyleRange();
-    currentError.length = 1;
-    currentError.foreground = parent.getDisplay().getSystemColor(SWT.COLOR_RED);
-
-    // The caret label
-    caretLabel = new Label(composite, SWT.LEFT);
-    caretLabel.setImage(XSDEditorPlugin.getXSDImage("icons/RegexWizardArrow.gif"));
-    caretLabel.setToolTipText(XSDEditorPlugin.getXSDString("_UI_TOOLTIP_REGEX_WIZARD_CARET_LABEL"));
-    setShowCaretLabel(true);
-
-    value.addFocusListener(new TextFocusListener());
-
-    terms.select(0);
-
-
-    setControl(composite);
-  }
-
-
-  public void setVisible(boolean visible)
-  {
-    super.setVisible(visible);
-
-    value.setText(pattern.getLexicalValue());
-    value.setCaretOffset(value.getCharCount());
-  }
-
-  public void dispose()
-  {
-    super.dispose();
-  }
-
-
-  /**
-   * Sets the visible status of caretLabel to status.  If status is true, then we also update the position
-   * of caretLabel in one of two ways.  If there is no active selection in value, we set caretLabel's
-   * position to correspond with the position of the actual caret.  Alternatively, if there is an active selection
-   * in value, we set caretLabel's position to the beginning of the selection.
-   *
-   * @param The new visibility status of caretLabel.
-   */
-  private void setShowCaretLabel(boolean status)
-  {
-    if (status)
-    {
-  
-      int offset;
-      
-      if (value.getSelectionText().equals(""))
-      {
-        offset = value.getCaretOffset();
-      }
-      else
-      {
-        offset = value.getSelection().x;
-      }
-  
-      Point p = value.getLocationAtOffset(offset);
-      
-      p.x += value.getLocation().x;
-      p.y = value.getLocation().y;
-      
-      // Place the label under value, and make sure it is aligned with the caret.
-      // The offsets are dependent on the icon used.
-      p.x += CARET_LABEL_X_OFFSET;
-      p.y += CARET_LABEL_Y_OFFSET;
-  
-      if (debug)
-      {
-        System.out.println("POINT: " + p); //$NON-NLS-1$
-      }
-      
-      caretLabel.setLocation(p);
-      caretLabel.setVisible(true);
-    }
-    else
-    {
-      caretLabel.setVisible(false);
-    }
-  }
-
-
-  /**
-   * Adds a new radio button to Composite c with SelectionListener l.  The text of the button is the String associated with
-   * quantifier.
-   *
-   * @param quantifier The desired quantifier, as enumerated in RegexNode.
-   * @param c The Composite to add the buttons to (normally occurrenceRadioButtons).
-   * @param l The SelectionListener (normally radioSelectionListener).
-   * @return The newly created button.
-   */
-  private Button addOccurenceRadioButton(int quantifier, Composite c, SelectionListener l)
-  {
-    Button result = new Button(c, SWT.RADIO);
-    result.setText(RegexNode.getQuantifierText(quantifier));
-    result.addSelectionListener(l);
-    return result;
-  }
-
-
-  /**
-   * Validates the regex in value.  If the regex is valid, clears the Wizard's error message.  If it's not valid,
-   *  sets the Wizard's error message accordingly.
-   *
-   * @return Whether the regex is valid.
-   */
-  private boolean validateRegex()
-  {
-
-    boolean isValid;
-    try
-    {
-      // We validate the regex by checking whether we get a ParseException.
-      // By default, we assume that it's valid unless we determine otherwise.
-      isValid = true;
-      displayRegexErrorMessage(null);
-      value.setStyleRange(null);
-
-      Pattern.compile(value.getText());
-    }
-    catch (PatternSyntaxException pe)
-    {
-      isValid = false;
-      displayRegexErrorMessage(pe.getMessage());
-
-      // An off-by-one bug in the xerces regex parser will sometimes return a location for the parseError that
-      //  is off the end of the string.  If this is the case, then we want to highlight the last character.
-      if (pe.getIndex() >= value.getText().length())
-      {
-        currentError.start = value.getText().length() - 1;
-      }
-      else
-      {
-        currentError.start = pe.getIndex();
-      }
-
-      if (debug)
-      {
-        System.out.println("Parse Error location: " + pe.getIndex());  //$NON-NLS-1$
-        System.out.println("currentError.start: " + currentError.start); //$NON-NLS-1$
-      }
-
-      value.setStyleRange(currentError);
-
-    }
-
-    // Another bug in the xerces parser will sometimes throw a RuntimeException instead of a ParseException.
-    //  When we get a RuntimeException, we aren't provided with the additional information we need to highlight
-    //  the parse error.  So, we merely report that there is an error.
-    catch (RuntimeException re)
-    {
-      displayRegexErrorMessage("");
-      value.setStyleRange(null);
-      isValid = false;
-    }
-    
-    setPageComplete(isValid);    
-    return isValid;
-  }
-
-  
-  /**
-   * Manages the display of error messages.
-   * Sets the error message for type to errorMessage.  If errorMessage != null, then we set the Wizard's error message
-   * to errorMessage.  If errorMessage == null, then we check whether we have a pending message of another type.
-   * If we do, then it is displayed as the Wizard's error message.  If we don't, then the Wizard's error message field
-   * is cleared.
-   *
-   * @param errorMessage The text of the new error message.  A value of null indicates that the error message should
-   *  be cleared.
-   * @param type The error type, one of PARSE, TOKEN, or SELECTION.
-   */ 
-  private void displayErrorMessage(String errorMessage, int type)
-  {
-    String messageToDisplay = null;
-
-
-    currentErrorMessages[type] = errorMessage;
-
-    messageToDisplay = errorMessage;
-
-    for (int i = 0; i < NUM_ERROR_MESSAGE_TYPES; i++)
-    {
-      if (messageToDisplay != null)
-      {
-        break;
-      }
-      messageToDisplay = currentErrorMessages[i];
-    }
-
-    setErrorMessage(messageToDisplay);
-  }
-
-
-  /**
-   * Sets the Wizard's error message to message, preceded by a standard prefix.
-   *
-   * @param message The new error message (or null to clear it).
-   */
-  private void displayRegexErrorMessage (String errorMessage)
-  {
-    if (errorMessage == null)
-    {
-      displayErrorMessage(null, PARSE);
-    }
-    else
-    {
-    	if (errorMessage.trim().equals("")) // when there is no error message available.
-    	{
-        displayErrorMessage(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_REGEX_ERROR"),
-                           PARSE);
-      }
-      else
-      {
-        displayErrorMessage(errorMessage, PARSE);
-      }
-    }
-  }
-
-
-  /**
-   * Updates the token status.  Sets isValidToken to status && the status of the other error type.
-   * If status is true, we clear the wizard's error message for this type; if it is false, we set it to errorMessage.
-   *
-   * @param status The new isValidToken value.
-   * @param errorMessage The new error message.
-   * @param type The type of the error (either TOKEN or SELECTION).
-   */
-  private void setTokenStatus (boolean status, String errorMessage, int type)
-  {
-    boolean otherTypeStatus =     (type == TOKEN) ? 
-                                  currentErrorMessages[SELECTION] == null :
-                                  currentErrorMessages[TOKEN] == null;
-    
-    isValidToken = status && otherTypeStatus;
-    add.setEnabled(isValidToken);
-
-    if (status)
-    {
-      displayErrorMessage(null, type);
-    }
-    else
-    {
-    	if (errorMessage != null && errorMessage.trim().equals("")) // when there is no error message available.
-    	{
-        displayErrorMessage(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_TOKEN_ERROR"),
-                           type);
-      }
-      else
-      {
-        displayErrorMessage(errorMessage, type);
-      }
-    }
-  }
-
-  
-  /**
-   * Updates the token status.  Sets isValidToken to status && the status of the other error type.
-   * Also clears the wizard's error message for this type.
-   * Usually used to set isValidToken to true.
-   *
-   * @param status The new isValidToken value.
-   * @param type The type of the error (either TOKEN or SELECTION).
-   */
-  private void setTokenStatus(boolean status, int type)
-  {
-    setTokenStatus(status, null, type);
-  }
-
-
-
-  /**
-   * Sets the enabled status of the text fields and labels associated with the specified quantifier.
-   * If status is true, then fields and labels associated with other quantifiers are disabled.
-   * @param quantifier The quantifier whose elements' enabled status we wish to change
-   *   (as enumerated in RegexNode).
-   * @param status The new status of the elements.  If true, then all elements associated with other buttons
-   *               are disabled.
-   */    
-  private void setEnabledStatus(int quantifier, boolean status)
-  {
-    switch (quantifier)
-    {
-    
-    case RegexNode.REPEAT:
-      repeatValue.setEnabled(status);
-      if (status)
-      {
-        rangeMinValue.setEnabled(false);
-        rangeMaxValue.setEnabled(false);
-        rangeToLabel.setEnabled(false);
-      }
-      break;
-
-    case RegexNode.RANGE:
-      rangeMinValue.setEnabled(status);
-      rangeMaxValue.setEnabled(status);
-      rangeToLabel.setEnabled(status);
-      if (status)
-      {
-        repeatValue.setEnabled(false);
-      }
-      break;
-
-    }
-  }
-
-  /**
-   * Checks to see if there is a selection in value.  If there is not, we set the Wizard's error message accordingly.
-   * If there is, we update the contents of node.  If "Current Selection" is not the current token, then
-   * we clear the Selection error message.
-   */
-  private void updateCurrentSelectionStatus()
-  {
-    if (terms.getSelectionIndex() == RegexNode.SELECTION)
-    {
-      String selection = value.getSelectionText();
-      if (selection.equals(""))
-      {
-        setTokenStatus(false, XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_SELECTION_ERROR"), SELECTION);
-      }
-      else
-      {
-        setTokenStatus(true, SELECTION);
-        node.setContents(selection);
-        node.setHasParens(true);
-      }
-    }
-    else
-    {
-      setTokenStatus(true, SELECTION);
-    }
-  }
-
-  /**
-   * Updates the enabled status of the auto-escape checkbox.  If status is true, we enable the checkbox, and
-   * set its selection status and node's auto-escape status to the value of autoEscapeStatus.  If status is
-   * false, then we disable and deselect the checkbox, and set node's status to false.
-   *
-   * @param status The new enabled status.
-   */
-  private void setEscapeCheckboxEnabledStatus(boolean status)
-  {
-    if (status)
-    {
-      escapeCheckbox.setEnabled(true);
-      escapeCheckbox.setSelection(autoEscapeStatus);
-      node.setAutoEscapeStatus(autoEscapeStatus);
-    }
-    else
-    {
-      escapeCheckbox.setEnabled(false);
-      escapeCheckbox.setSelection(false);
-      node.setAutoEscapeStatus(false);
-    }
-  }
-
-
-  /**
-   * Returns the current regex flags.
-   */
-  String getFlags()
-  {
-    return regexFlags;
-  }
-
-  /**
-   * Returns the current XSDPattern model.
-   */
-  XSDPatternFacet getPattern()
-  {
-    return pattern;
-  }
-
-
-  /**
-   * Returns a string consisting of the values of min, max, and repeat stored in node.
-   * Used for debugging purposes only.
-   */  
-  private String getAllFieldValues()
-  {
-      String result = "";
-      result += "Min: " + node.getMin() + "\n";
-      result += "Max: " + node.getMax() + "\n";
-      result += "Repeat: " + node.getRepeat() + "\n";
-      result += "\n";
-      return result;
-  }
-  
-
-  /* Listener for the add button. */
-  class ButtonSelectListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-    }
-
-    // Precondition: isValidToken == true  
-    public void widgetSelected(SelectionEvent e)
-    {
-      if (!isValidToken) // should never happen
-      {
-        return;
-      }
-
-      // Whether there is anything selected in value.
-      boolean isActiveSelection = value.getSelectionCount() != 0;
-      
-      value.insert(node.toString());
-
-      if (terms.getSelectionIndex() == RegexNode.SELECTION)
-      {
-        updateCurrentSelectionStatus();
-      }
-
-      // If nothing is selected, then we need to advance the caret location.
-      if (!isActiveSelection)
-      {
-        value.setCaretOffset(value.getCaretOffset() + node.toString().length());
-      }
-
-      value.setFocus();
-
-    }
-
-  }
- 
-
-  /* Listener for the terms combo box. */
-  class ComboListener implements Listener
-  {
-    public void handleEvent(Event e)
-    {
-      
-      updateCurrentSelectionStatus();
-
-      // If the user has typed in a token
-      if (terms.getSelectionIndex() == -1)
-      {
-        setEscapeCheckboxEnabledStatus(true);
-        node.setContents(terms.getText());
-        node.setHasParens(true);
-        
-
-        if (debug)
-        {
-          System.out.println(terms.getText());
-        }
-
-      }
-      else if (terms.getSelectionIndex() == RegexNode.SELECTION)
-      {
-        setEscapeCheckboxEnabledStatus(false);
-      }
-      else
-      {
-        node.setContents(RegexNode.getRegexTermValue(terms.getSelectionIndex()));
-        node.setHasParens(false);
-        setEscapeCheckboxEnabledStatus(false);
-      }
-    }
-  }
-
-
-  /* Listener for enabling/disabling caretLabel. */
-  class TextFocusListener implements FocusListener
-  {
-    public void focusGained(FocusEvent e)
-    {
-      setShowCaretLabel(false);
-    }
-    public void focusLost(FocusEvent e)
-    {
-      setShowCaretLabel(true);
-    }
-  }
-
-
-
-  /* Listener for the text fields. */
-  class TextListener implements Listener
-  {
-    public void handleEvent (Event e)
-    {
-
-      if (debug)
-      {
-        System.out.println("Inside TextListener handler");  //$NON-NLS-1$
-        System.out.println(e);
-        System.out.println(getAllFieldValues());
-      }
-
-
-      if ( (e.widget == value) && (e.type == SWT.Modify) )
-      {
-        pattern.setLexicalValue(value.getText());
-        validateRegex();
-      }
-
-      else if (e.widget == value && e.type == SWT.Selection)
-      {
-        if (terms.getSelectionIndex() == RegexNode.SELECTION)
-        {
-          updateCurrentSelectionStatus();
-        }
-      }
-
-      else if (e.widget == rangeMinValue)
-      {
-        boolean isValid = node.setMin(rangeMinValue.getText());
-
-        if (isValid)
-        {
-          setTokenStatus(true, null, TOKEN);
-        }
-        else
-        {
-          setTokenStatus(false,  XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_MIN_ERROR_SUFFIX"), TOKEN);
-        }
-      }
-
-      else if (e.widget == rangeMaxValue)
-      {
-        boolean isValid = node.setMax(rangeMaxValue.getText());
-
-        if (node.getMin() == RegexNode.EMPTY)
-        {
-          setTokenStatus(false, XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_MISSING_MIN_ERROR_SUFFIX"), TOKEN);
-        }
-        else if (isValid)
-        {
-          setTokenStatus(true, null, TOKEN);
-        }
-        else
-        {
-          setTokenStatus(false, XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_MAX_ERROR_SUFFIX"), TOKEN);
-        }
-      }
-
-      else  // (e.widget == repeatValue)
-      {
-        boolean isValid = node.setRepeat(repeatValue.getText());
-        if (isValid)
-        {
-          setTokenStatus(true, null, TOKEN);
-        }
-        else
-        {
-          setTokenStatus(false, XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_REPEAT_ERROR_SUFFIX"), TOKEN);
-        }
-      }
-    }
-  }
-
-  /* Listener for the auto-escape checkbox. */
-  class CheckboxListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-    }
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      boolean newStatus = !autoEscapeStatus;
-      node.setAutoEscapeStatus(newStatus);
-      autoEscapeStatus = newStatus;
-      
-      if (debug)
-      {
-        System.out.println("AutoEscape Status: " + node.getAutoEscapeStatus());  //$NON-NLS-1$ 
-      }
-    }
-
-  }
-
-
-  /* Listener for the radio buttons. */
-  class RadioSelectListener implements SelectionListener
-  {
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-    }
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      if (debug)
-      {
-        System.out.println(getAllFieldValues());
-      }
-
-
-      int currentQuantifier = getQuantifier(e);
-
-      node.setQuantifier(currentQuantifier);
-
-      switch (currentQuantifier)
-      {
-      case RegexNode.SINGLE:                     
-      case RegexNode.STAR:
-      case RegexNode.PLUS:
-      case RegexNode.OPTIONAL:
-        setEnabledStatus(RegexNode.REPEAT, false);
-        setEnabledStatus(RegexNode.RANGE, false);
-        setTokenStatus(true, TOKEN);
-        break; 
-
-      case RegexNode.REPEAT:
-        setEnabledStatus(RegexNode.REPEAT, true);
-        setTokenStatus(node.hasValidRepeat(), XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_REPEAT_ERROR_SUFFIX"), TOKEN);
-        repeatValue.setFocus();
-        break;
-
-      case RegexNode.RANGE:
-        setEnabledStatus(RegexNode.RANGE, true);
-        String error = (node.hasValidMin()) ? 
-                            XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_MAX_ERROR_SUFFIX") : 
-                            XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_INVALID_MIN_ERROR_SUFFIX");
-
-        setTokenStatus( node.hasValidMin() && node.hasValidMax(), error, TOKEN);
-        rangeMinValue.setFocus();
-        break;
-      }
-    }
-
-    private int getQuantifier(SelectionEvent e)
-    {
-
-      if (e.widget == singleRadio)
-      {
-        return RegexNode.SINGLE;
-      }
-      
-      else if (e.widget == starRadio)
-      {
-        return RegexNode.STAR;
-      }
-      
-      else if (e.widget == plusRadio)
-      {
-        return RegexNode.PLUS;
-      }
-      
-      else if (e.widget == optionalRadio)
-      {
-        return RegexNode.OPTIONAL;
-      }
-      
-      else if (e.widget == repeatRadio)
-      {
-        return RegexNode.REPEAT;
-      }
-      
-      else if (e.widget == rangeRadio)
-      {
-        return RegexNode.RANGE;
-      }
-      
-      else // can't get here
-      { 
-        return RegexNode.EMPTY;
-      }
-    } 
-  }
-  
-  public String getValue()
-  {
-    return value.getText();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexNode.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexNode.java
deleted file mode 100644
index 64bbebc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexNode.java
+++ /dev/null
@@ -1,421 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.wizards;
-
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-
-class RegexNode
-{
-  private String contents;
-  private int min;
-  private int max;
-  private int repeat;
-  private int quantifier;
-  private boolean hasParens;
-  private boolean autoEscapeStatus;
-
-  
-  /* Quantifiers. */
-  public static final int SINGLE = 0;    
-  public static final int STAR = 1;
-  public static final int PLUS = 2;
-  public static final int OPTIONAL = 3;
-  public static final int REPEAT = 4; 
-  public static final int RANGE = 5;
-
-  /* Regex quantifiers.  First column is the on-screen textual representation, second column is the 
-   on-screen regex representation.  The two are concatenated together to form the on-screen
-   representation.
-   Indexing of this array must correspond to the values of the quantifier constants above.
-  */
-  private static final String[][] regexQuantifiers =
-  { 
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_QUANTIFIER_SINGLE"),   ""  },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_QUANTIFIER_STAR"),     "*" },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_QUANTIFIER_PLUS"),     "+" },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_QUANTIFIER_OPTIONAL"), "?" },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_QUANTIFIER_REPEAT"),   ""  },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_QUANTIFIER_RANGE"),    ""  },
-  };
-
-
-  /* Regex tokens.  First column is the on-screen representation, second column is the regex representation. 
-     More tokens can be added, but it is assumed that "Current Selection" is the last element in the array.
-     If this is not the case, then the value of the SELECTION constant below will need to be changed 
-     accordingly.
-     Also note that because these are java Strings, backslashes must be escaped (this is only relevant to the
-     second column of the array).
-   */
-  private static final String[][] regexTerms =
-  { 
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TERM_ANY_CHAR"),   "."     },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TERM_ALPHANUMERIC_CHAR"),   "\\w"     },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TERM_WHITESPACE"), "\\s"   },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TERM_DIGIT"),      "\\d"   },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TERM_UPPER"),      "[A-Z]" },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TERM_LOWER"),      "[a-z]" },
-    { XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TERM_SELECTION"),  ""      },
-  };
-
-  /* Token enumerated constants. */
-
-  // SELECTION must correspond to the index in regexTerms of "Current Selection".  This is assumed to be
-  //  the last element.
-  public static final int SELECTION = regexTerms.length - 1;
-
-  public static final int EMPTY = -1;
-
-  /* 
-  The metacharacters recognized by XML Schema.
-  Note that the double backslash ("\\") actually represents an escaped single backslash character ("\").
-  */ 
-  private static final String metacharacters = ".\\?*+{}()[]";
-
-
-  public static String getRegexTermText(int i)
-  {
-    if (i == SELECTION)
-    {
-      return regexTerms[i][0];
-    }
-    else
-    {
-      return regexTerms[i][0] + " ( " + regexTerms[i][1] + " )";
-    }
-  }
-
-  public static String getRegexTermValue(int i)
-  {
-    if (i == SELECTION) // shouldn't happen
-    {
-      return "";
-    }
-    else
-    {
-      return regexTerms[i][1];
-    }
-  }
-
-  public static int getNumRegexTerms()
-  {
-    return regexTerms.length;
-  }
-
-  public static String getQuantifierText(int i)
-  {
-    String result = regexQuantifiers[i][0];
-    
-    if (!regexQuantifiers[i][1].equals(""))
-    {
-      result += " ( ";
-      result += regexQuantifiers[i][1];
-      result += " )";
-    }
-
-    return result;
-  }
-
-  public RegexNode()
-  {
-    this.contents = "";
-    this.quantifier = SINGLE;
-    this.min = EMPTY;
-    this.max = EMPTY;
-    this.repeat = EMPTY;
-    this.hasParens = false;
-
-  }
-
-  
-  public String getContents()
-  {
-    return contents;
-  }
-  
-  public void setContents(String contents)
-  {
-    this.contents = contents;
-  }
-
-
-  public int getQuantifier()
-  {
-    return quantifier;
-  }
-
-  public void setQuantifier(int quantifier)
-  {
-    this.quantifier = quantifier;
-  }
-
-
-  public int getMin()
-  {
-    return min;
-  }
-
-  public void setMin(int min)
-  {
-    this.min = min;
-  }
-
-  /**
-   * Sets this.min to the integer representation of min iff min is a valid value (i.e. greater than 0).
-   * Sets this.min to EMPTY if it is not.
-   *
-   * @param min The new min value
-   * @returns Whether min was a valid value
-   */  
-  public boolean setMin(String min)
-  {
-    this.min = convertToInt(min);
-
-    // min > max is an invalid case, unless max is EMPTY (since EMPTY == -1).
-    if ( (this.max != EMPTY) && (this.min > this.max) )
-    {
-      return false;
-    }
-    
-    return (this.min >= 0);
-  }
-
-  
-  public int getMax()
-  {
-    return max;
-  }
-  
-  public void setMax(int max)
-  {
-    this.max = max;
-  }
-
-  /**
-   * Sets this.max to the integer representation of max iff max is a valid value (i.e. greater than 0).
-   * Sets this.max to EMPTY if it is not.
-   *
-   * @param max The new max value
-   * @returns Whether max was a valid value, or (whether max == the empty string && min has a valid value)
-   */ 
-  public boolean setMax(String max)
-  {
-    this.max = convertToInt(max);
-
-    // The empty string is a valid max value iff min has a valid value.
-    // This is due to the fact that {n,} means "at least n times" in regex parlance.
-    if (max.equals("") && this.min != EMPTY)
-    {
-      return true;
-    }
-    
-    else if (this.max < this.min)
-    {
-      return false;
-    }
-    
-    else
-    {
-      return (this.max >= 0);
-    }
-  }
-
-
- 
-  public int getRepeat()
-  {
-    return repeat;
-  }
-
-  public void setRepeat(int repeat)
-  {
-    this.repeat = repeat;
-  }
-
-  /**
-   * Sets this.repeat to the integer representation of repeat iff repeat is a valid value (i.e. greater than 0).
-   * Sets this.repeat to EMPTY if it is not.
-   *
-   * @param repeat The new repeat value
-   * @returns Whether repeat was a valid value
-   */
-  public boolean setRepeat(String repeat)
-  {
-    this.repeat = convertToInt(repeat);
-    return (this.repeat >= 0);
-  }
-
-
-
-  /**
-   * Returns the integer representation of s.  If s is less than zero, or if s is not an int
-   * (i.e. if Integer.parseInt would throw a NumberFormatException), then returns EMPTY.
-   *
-   * @param s The String to convert.
-   * @returns The integer representation of s.
-   */
-  private int convertToInt(String s)
-  {
-    int result;
-    try
-    {
-      result = Integer.parseInt(s);
-      if (result < 0)
-      {
-        result = EMPTY;
-      }
-    }
-    catch (NumberFormatException e)
-    {
-      result = EMPTY;
-    }
-
-    return result;
-  }
-
-
-  public boolean getHasParens()
-  {
-    return hasParens;
-  }
-
-  public void setHasParens(boolean status)
-  {
-    this.hasParens = status;
-  }
-
-  public boolean getAutoEscapeStatus()
-  {
-    return autoEscapeStatus;
-  }
-
-  public void setAutoEscapeStatus(boolean status)
-  {
-    this.autoEscapeStatus = status;
-  }
-
-  /**
-   * Returns an escaped version of s.  In other words, each occurrence of a metacharacter ( .\?*+{}()[] )
-   * is replaced by that character preceded by a backslash.
-   *
-   * @param s The String to escape.
-   * @returns An escaped version of s.
-   */
-  private String addEscapeCharacters(String s)
-  {
-    StringBuffer result = new StringBuffer("");
-
-    for (int i = 0; i < s.length(); i++)
-    {
-      char currentChar = s.charAt(i);
-
-      if (isMetachar(currentChar))
-      {
-        result.append("\\"); // Note that this is an escaped backslash, not a double backslash.
-      }
-      result.append(currentChar);
-
-    }
-
-    return result.toString();
-  }
-
-  /**
-   * Checks whether c is a metacharacter as defined in the static variable metacharacters.
-   *
-   * @param c The character to check.
-   * @returns Whether c is a metacharacter.
-   */
-  private boolean isMetachar(char c)
-  {
-    return metacharacters.indexOf(c) != -1;
-  }
-  
-
-  public boolean hasValidMin()
-  {
-    return (min != EMPTY);
-  }
-
-  public boolean hasValidMax()
-  {
-    return(max != EMPTY);
-  }
-
-  public boolean hasValidRepeat()
-  {
-    return(repeat != EMPTY);
-  }
-
-  public String toString()
-  {
-    String result = "";
-    
-    if (hasParens)
-    {
-      result += "(";
-    }
-    
-    if (autoEscapeStatus)
-    {
-       result += addEscapeCharacters(contents);
-    }
-    else 
-    {
-      result += contents;
-    }
-
-
-    if (hasParens)
-    {
-      result += ")";
-    }
-    
-    switch (quantifier)
-    {
-      case STAR:
-        result += "*";
-        break;
-      
-      case PLUS:
-        result += "+";
-        break;
-      
-      case OPTIONAL:
-        result += "?";
-        break;
-      
-      case REPEAT:
-        result += "{" + repeat + "}";
-        break;
-      
-      case RANGE:
-        result += "{" + min + ",";
-        if (max == EMPTY)
-        {
-          result += "";
-        }
-        else
-        {
-          result += max;
-        }       
-        result += "}";
-        break;
-      
-      // SINGLE is a fall through           
-
-    }
-    return result;
-
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexTestingPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexTestingPage.java
deleted file mode 100644
index 488c6ea..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexTestingPage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-// Based on version 1.6 of original xsdeditor
-package org.eclipse.wst.xsd.ui.internal.wizards;
-
-import java.util.regex.Pattern;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.TextProcessor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-
-
-public class RegexTestingPage extends WizardPage
-{
-  /* Validator from xerces package. */
-//  private RegularExpression validator;
-  
-  /* Displays the status of the match. */
-  private Label matchLabel;
-
-
-  /* The regex. */
-  private Text value;
-  
-  /* The string the user is trying to match against the regex. */
-  private StyledText testString;
-
-  public RegexTestingPage()
-  {
-    super(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TESTING_PAGE_TITLE"));
-
-    setTitle(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TESTING_PAGE_TITLE"));
-    setDescription(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TESTING_PAGE_DESCRIPTION"));
-  }
-
-
-  public void createControl(Composite parent)
-  {
-    Composite composite = ViewUtility.createComposite(parent, 1);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(composite, XSDEditorCSHelpIds.REGEX_TEST_PAGE);
-
-    matchLabel = new Label(composite, SWT.WRAP);
-    matchLabel.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TESTING_PAGE_DESCRIPTION"));
-    FontData[] fontData = matchLabel.getFont().getFontData();
-    GridData dataF = new GridData();
-    dataF.widthHint = 400;
-    dataF.heightHint = 6 * fontData[0].getHeight();
-    matchLabel.setLayoutData(dataF);
-    
-    Composite controls = new Composite(composite, SWT.NONE);
-    GridLayout controlsLayout = new GridLayout();
-    controlsLayout.numColumns = 2;
-    controls.setLayout(controlsLayout);
-    controls.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    new Label(controls, SWT.LEFT).setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_REGEX_LABEL"));
-    value = new Text(controls, SWT.BORDER | SWT.READ_ONLY);
-    value.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-
-    new Label(controls, SWT.LEFT).setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_SAMPLE_TEXT"));
-    testString = new StyledText(controls, SWT.SINGLE | SWT.BORDER);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(testString, XSDEditorCSHelpIds.REGEX_SAMPLE_TEXT);
-    testString.addListener(SWT.Modify, new TestStringListener());
-    testString.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    
-    controls.pack();
-    
-    Label separator = new Label(composite, SWT.SEPARATOR | SWT.HORIZONTAL);
-    GC gc = new GC(separator);
-    Point pointSize = gc.stringExtent(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TESTING_PAGE_DESCRIPTION"));
-    GridData gd = new GridData();
-    gd.widthHint = pointSize.x / 2 + gc.getAdvanceWidth('M')*11;
-    gd.horizontalAlignment= GridData.FILL;
-    separator.setLayoutData(gd);
-    
-    composite.pack();
-
-    setControl(composite);
-  }
-
-
-  private String getPatternValue()
-  {
-    return ( (RegexCompositionPage)getPreviousPage() ).getPattern().getLexicalValue();
-  }
-
-  private String getFlags()
-  {
-    return ( (RegexCompositionPage)getPreviousPage() ).getFlags();
-  }
-
-  public void setVisible(boolean visible)
-  {
-    super.setVisible(visible);
-
-    getFlags();
-    value.setText(TextProcessor.process(getPatternValue()));
-    updateMatchStatus();
-    testString.setFocus();
-  }
-
-  class TestStringListener implements Listener
-  {
-    public void handleEvent(Event e)
-    {
-      updateMatchStatus();
-    }
-  }
-
-  private void updateMatchStatus()
-  {
-    if (Pattern.matches(getPatternValue(), testString.getText()))
-    {
-//      matchLabel.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_MATCHES"));
-      setMessage(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_MATCHES"), 1);
-    }
-    else
-    {
-      setMessage(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_DOES_NOT_MATCH"), 2);
-//      matchLabel.setText(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_DOES_NOT_MATCH"));
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexWizard.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexWizard.java
deleted file mode 100644
index d341f66..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/RegexWizard.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.wizards;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDPatternFacet;
-import org.eclipse.xsd.impl.XSDFactoryImpl;
-
-
-public class RegexWizard extends Wizard 
-{
-  private RegexCompositionPage compositionPage;
-  private RegexTestingPage testingPage;
-
-  /* The original, unchanged pattern. */  
-  private XSDPatternFacet originalPattern;
-  
-  /* A copy of the original pattern that is passed into the wizard. */
-  private XSDPatternFacet modifiedPattern;
-
-  String pattern;
-
-  public RegexWizard(String expr)
-  {
-    super();
-    setWindowTitle(XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_TITLE"));
-    setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/regx_wiz.png"));
-
-    XSDFactoryImpl factory = new XSDFactoryImpl();
-    modifiedPattern = factory.createXSDPatternFacet();
-    modifiedPattern.setLexicalValue(expr);
-
-    originalPattern = factory.createXSDPatternFacet();
-    originalPattern.setLexicalValue(expr);
-
-    compositionPage = new RegexCompositionPage(modifiedPattern);
-    addPage(compositionPage);
-
-    testingPage = new RegexTestingPage();
-    addPage(testingPage);
-  }
-
-  public String getPattern()
-  {
-    return pattern;
-  }
-  
-  public boolean canFinish()
-  {
-    return (compositionPage.getValue().length() > 0);
-  }
-
-  public boolean performFinish()
-  {
-    pattern = modifiedPattern.getLexicalValue();
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDLocationChoicePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDLocationChoicePage.java
deleted file mode 100644
index f709f10..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDLocationChoicePage.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.wizards;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-
-
-public class XSDLocationChoicePage extends WizardPage 
-{
-  protected Button radioButton1;
-  protected Button radioButton2;
-    
-  public XSDLocationChoicePage()
-  {
-    super("XSDLocationChoicePage");
-
-    this.setTitle(XSDEditorPlugin.getXSDString("_UI_WIZARD_INCLUDE_FILE_TITLE"));
-    this.setDescription(XSDEditorPlugin.getXSDString("_UI_WIZARD_INCLUDE_FILE_DESC"));
-  }
-    
-  public boolean isPageComplete()
-  {
-    return true;
-  }
-    
-  public void createControl(Composite parent)
-  {
-    Composite base = new Composite(parent, SWT.NONE);
-    base.setLayout(new GridLayout());
-      
-    ViewUtility.createLabel(base, XSDEditorPlugin.getXSDString("_UI_LABEL_INCLUDE_URL_FILE"));
-    Composite radioButtonsGroup = ViewUtility.createComposite(base, 1, true);
-
-    radioButton1 = ViewUtility.createRadioButton(radioButtonsGroup, 
-                                                 XSDEditorPlugin.getXSDString("_UI_RADIO_FILE"));
-      
-    radioButton2 = ViewUtility.createRadioButton(radioButtonsGroup,
-                                                 XSDEditorPlugin.getXSDString("_UI_RADIO_URL"));
-
-    radioButton1.setSelection(true);
-
-    setControl(base);
-  }
-
-  // actions on finish
-  public boolean performFinish()
-  {
-    return true;
-  }
-
-  public boolean isURL()
-  {
-    return radioButton2.getSelection();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDNewFilePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDNewFilePage.java
deleted file mode 100644
index f1c1e0b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDNewFilePage.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.wizards;
- 
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-
-public class XSDNewFilePage extends WizardNewFileCreationPage
-{
-  public XSDNewFilePage(IStructuredSelection selection) 
-  {
-    super(XSDEditorPlugin.getXSDString("_UI_CREATEXSD"), selection);
-    setTitle(XSDEditorPlugin.getXSDString("_UI_NEW_XML_SCHEMA_TITLE"));
-    setDescription(XSDEditorPlugin.getXSDString("_UI_CREATE_A_NEW_XML_SCHEMA_DESC"));
-  }
-
-  public void createControl(Composite parent) 
-  {
-    // inherit default container and name specification widgets
-    super.createControl(parent);
-
-    this.setFileName(computeDefaultFileName());
-
-    setPageComplete(validatePage());
-  }
-
-  protected boolean validatePage()
-  {
-    Path newName = new Path(getFileName());
-    String fullFileName = getFileName();
-    String extension = newName.getFileExtension();
-    if (extension == null || !extension.equalsIgnoreCase("xsd")) 
-    {
-      setErrorMessage(XSDEditorPlugin.getXSDString("_ERROR_FILENAME_MUST_END_XSD"));
-      return false;
-    }
-    else 
-    {
-      setErrorMessage(null);
-    }
-
-    // check for file should be case insensitive
-    String sameName = existsFileAnyCase(fullFileName);
-    if (sameName != null) 
-    {
-      setErrorMessage(XSDEditorPlugin.getPlugin().getString("_ERROR_FILE_ALREADY_EXISTS", sameName)); //$NON-NLS-1$
-      return false;
-    }
-
-    return super.validatePage();
-  }
-
-  public String defaultName = "NewXMLSchema"; //$NON-NLS-1$
-  public String defaultFileExtension = ".xsd"; //$NON-NLS-1$
-  public String[] filterExtensions = { "*.xsd"}; //$NON-NLS-1$
-
-  protected String computeDefaultFileName()
-  {
-    int count = 0;
-    String fileName = defaultName + defaultFileExtension;
-    IPath containerFullPath = getContainerFullPath();
-    if (containerFullPath != null)
-    {
-      while (true)
-      {
-        IPath path = containerFullPath.append(fileName);
-        if (ResourcesPlugin.getWorkspace().getRoot().exists(path))
-        {
-          count++;
-          fileName = defaultName + count + defaultFileExtension;
-        }
-        else
-        {
-          break;
-        }
-      }
-    }
-    return fileName;
-  }
-
-  // returns true if file of specified name exists in any case for selected container
-  protected String existsFileAnyCase(String fileName)
-  {
-    if ( (getContainerFullPath() != null) && (getContainerFullPath().isEmpty() == false)
-        && (fileName.compareTo("") != 0))
-    {
-      //look through all resources at the specified container - compare in upper case
-      IResource parent = ResourcesPlugin.getWorkspace().getRoot().findMember(getContainerFullPath());
-      if (parent instanceof IContainer)
-      {
-        IContainer container = (IContainer) parent;
-        try
-        {
-          IResource[] members = container.members();
-          String enteredFileUpper = fileName.toUpperCase();
-          for (int i=0; i<members.length; i++)
-          {
-            String resourceUpperName = members[i].getName().toUpperCase();
-            if (resourceUpperName.equals(enteredFileUpper))
-            {  
-              return members[i].getName();    
-            }
-          }
-        }
-        catch (CoreException e)
-        {
-        }
-      }
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDSelectIncludeFileWizard.java b/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDSelectIncludeFileWizard.java
deleted file mode 100644
index 40c1bef..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt-xsd/org/eclipse/wst/xsd/ui/internal/wizards/XSDSelectIncludeFileWizard.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.viewers.SelectSingleFilePage;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDParser;
-
-
-/**
- * Extend the base wizard to select a file from the project or outside the workbench
- * and add error handling
- */
-public class XSDSelectIncludeFileWizard extends Wizard implements INewWizard
-{
-  boolean isInclude;
-  XSDSchema mainSchema;
-  XSDSchema externalSchema;
-
-  XSDLocationChoicePage choicePage;
-  XSDSelectSingleFilePage filePage;
-  XSDURLPage urlPage;
-
-  IFile resultFile;
-  String resultURL;
-  String namespace = "";
-
-  public XSDSelectIncludeFileWizard(XSDSchema mainSchema, boolean isInclude,
-                                    String title, String desc, 
-                                    ViewerFilter filter,
-                                    IStructuredSelection selection)
-  {
-    super();
-    setWindowTitle(title);
-    setDefaultPageImageDescriptor(ImageDescriptor.createFromFile(XSDEditorPlugin.class, "icons/NewXSD.png"));
-
-    setNeedsProgressMonitor(true);
-
-    // Choice Page
-    choicePage = new XSDLocationChoicePage();
-
-    // Select File Page
-    filePage = new XSDSelectSingleFilePage(PlatformUI.getWorkbench(),  selection, true);
-    filePage.setTitle(title);
-    filePage.setDescription(desc);
-    filePage.addFilter(filter);
-
-    // URL Page
-    urlPage = new XSDURLPage();
-    urlPage.setTitle(title);
-    urlPage.setDescription(XSDEditorPlugin.getXSDString("_UI_FILEDIALOG_SELECT_XML_URL"));
-    
-    this.mainSchema = mainSchema;
-    this.isInclude = isInclude;
-  }
-
-  public void init(IWorkbench aWorkbench, IStructuredSelection aSelection)
-  { 
-  }
-
-  public void addPages()
-  {
-    addPage(choicePage);
-    addPage(filePage);
-    addPage(urlPage);
-  }
-
-  public IWizardPage getNextPage(IWizardPage currentPage)
-  {
-    WizardPage nextPage = null;
-
-    if (currentPage == choicePage)
-    {
-      if (choicePage.isURL()) 
-      {
-        nextPage = urlPage;
-      }
-      else
-      {
-        nextPage = filePage;
-      }
-    }
-    return nextPage;
-  }
-
-  public boolean canFinish()
-  {
-    if (!choicePage.isURL())
-    {
-      return filePage.isPageComplete(); 
-    }
-    return true;
-  }
-
-  public boolean performFinish()
-  { 
-    if (choicePage.isURL())
-    {
-      try 
-      {
-        getContainer().run(false, true, urlPage.getRunnable());
-        resultURL = urlPage.getURL();
-      }
-      catch (Exception e)
-      {
-        return false;
-      }
-      return true;
-    }
-    else
-    {  
-      resultFile = filePage.getFile();
-    }
-    return true;
-  }
-
-  /**
-   * Get the MOF object that represents the external file
-   */
-  public XSDSchema getExternalSchema()
-  {
-    return externalSchema;
-  }
-
-  public IFile getResultFile()
-  {
-    return resultFile;
-  }
-
-  public String getURL()
-  {
-    return resultURL;
-  }
-  
-  public String getNamespace()
-  {
-  	return namespace;
-  }
-
-  /**
-   * Create a MOF model for the imported file
-   */
-  protected String doLoadExternalModel(IProgressMonitor monitor, String xsdModelFile, String xsdFileName)
-  { 
-    String errorMessage = null;
-    String currentNameSpace = mainSchema.getTargetNamespace();
-
-    monitor.beginTask("Loading XML Schema", 100);
-    monitor.worked(50);
-
-    XSDParser parser = new XSDParser();
-    parser.parse(xsdModelFile);
-
-    externalSchema = parser.getSchema();
-    if (externalSchema != null)
-    {
-      String extNamespace = externalSchema.getTargetNamespace();
-      namespace = extNamespace;
-     
-      if (externalSchema.getDiagnostics() != null &&
-          externalSchema.getDiagnostics().size() > 0)
-      {
-        errorMessage = XSDEditorPlugin.getPlugin().getString("_UI_INCORRECT_XML_SCHEMA", xsdFileName);
-      }  
-      else
-      {
-        if (isInclude) 
-        {  
-          // Check the namespace to make sure they are the same as current file
-          if (extNamespace != null)
-          {
-            if (currentNameSpace != null && !extNamespace.equals(currentNameSpace))
-            {
-              errorMessage = XSDEditorPlugin.getPlugin().getString("_UI_DIFFERENT_NAME_SPACE", xsdFileName);
-            }
-          }
-        }
-        else
-        {  
-          // Check the namespace to make sure they are different from the current file
-          if (extNamespace != null)
-          {
-            if (currentNameSpace != null && extNamespace.equals(currentNameSpace))
-            {
-              errorMessage = XSDEditorPlugin.getPlugin().getString("_UI_SAME_NAME_SPACE", xsdFileName);
-            }
-          }
-        }
-      }
-    }
-    else
-    {
-      errorMessage = XSDEditorPlugin.getPlugin().getString("_UI_INCORRECT_XML_SCHEMA", xsdFileName);
-    }
-
-    monitor.subTask("Finish Loading");
-    monitor.worked(80);
-
-    return errorMessage;
-  }
-
- 
-  /**
-   * URL page
-   */
-  class XSDURLPage extends WizardPage
-  { 
-    Text urlField;
-    String saveString;
-
-    public XSDURLPage()
-    {
-      super("URLPage");
-    }
-
-    public void createControl(Composite parent)
-    {
-      Composite client = ViewUtility.createComposite(parent,2);
-      ViewUtility.setComposite(client);
-
-      ViewUtility.createLabel(client, XSDEditorPlugin.getXSDString("_UI_LABEL_URL"));
-      ViewUtility.createLabel(client, "");
-
-      urlField = ViewUtility.createTextField(client, 50);
-      saveString = "http://";
-      urlField.setText(saveString);
-
-      setControl(client);
-    }
-
-    public String getURL()
-    {
-      return urlField.getText();
-    }
-
-    private boolean openExternalSchema(IProgressMonitor monitor)
-    {
-      String text = urlField.getText();
-//      if (text.equals(saveString)) 
-//      {
-//        return false;
-//      }
-//      saveString = text;
-
-      if (text.equals(""))
-      {
-        setErrorMessage(XSDEditorPlugin.getXSDString("_UI_SPECIFY_URL"));
-        return false;
-      }
-
-      if ( !text.startsWith("http://") )
-      {
-        setErrorMessage(XSDEditorPlugin.getXSDString("_UI_URL_START_WITH"));
-        return false;
-      }
-
-      setErrorMessage(null);
-      String errorMessage = doLoadExternalModel(monitor, text, text);
-      if (errorMessage != null) 
-      {
-        setErrorMessage(errorMessage); 
-        return false;
-      }
-      else
-      {
-        return true;
-      }
-    }
-
-    public IRunnableWithProgress getRunnable()
-    {
-      return new IRunnableWithProgress()
-      {
-        public void run(IProgressMonitor monitor)   
-          throws InvocationTargetException, InterruptedException
-        {
-          if (monitor == null)
-          {
-            monitor= new NullProgressMonitor();
-          }
-          monitor.beginTask("", 6);
-        
-          boolean ok = openExternalSchema(monitor);
-
-          if (!ok) 
-          { 
-            throw new InvocationTargetException(new java.lang.Error());
-          }
-
-          monitor.done();
-        }
-      };
-    }
-  }
-
-  /**
-   * Select XML Schema File
-   */
-  class XSDSelectSingleFilePage extends SelectSingleFilePage
-  {
-    public XSDSelectSingleFilePage(IWorkbench workbench, IStructuredSelection selection, boolean isFileMandatory)
-    {          
-      super(workbench,selection,isFileMandatory);
-    }
-
-    private boolean openExternalSchema()
-    {
-      // Get the fully-qualified file name
-      IFile iFile = getFile();
-      if (iFile == null) 
-        return false;
-
-      setErrorMessage(null);
-
-      String xsdModelFile = iFile.getLocationURI().toString();
-      String xsdFileName = iFile.getName();
-      String errorMessage = doLoadExternalModel(new NullProgressMonitor(), xsdModelFile, xsdFileName);
-
-      if (errorMessage != null) 
-      {
-        setErrorMessage(errorMessage);
-        return false;
-      }
-      else
-      {
-        return true;
-      }
-    }
-
-    public boolean isPageComplete()
-    {  
-      if (choicePage.isURL()) 
-      {
-        return true;
-      }
-
-      if (super.isPageComplete()) 
-      {
-        return openExternalSchema();
-      }
-      return super.isPageComplete();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/AddFieldAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/AddFieldAction.java
deleted file mode 100644
index d411240..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/AddFieldAction.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.common.commands.BaseCommand;
-
-
-public class AddFieldAction extends BaseSelectionAction
-{   
-  public static String ID = "AddFieldAction";  //$NON-NLS-1$
-  
-  public AddFieldAction(IWorkbenchPart part)
-  {
-    super(part);
-    setId(ID);
-    setText(Messages._UI_ACTION_ADD_FIELD);  
-  }
-  
-  public void run()
-  {
-    if (getSelectedObjects().size() > 0)
-    {
-      Object o = getSelectedObjects().get(0);
-      IComplexType type = null;
-      
-      if (o instanceof IComplexType)
-      {  
-        type = (IComplexType)o; 
-      }
-      else if (o instanceof IField)
-      {
-        IField field = (IField)o;
-        type = field.getContainerType();
-      }
-      if (type != null)
-      {
-        Command command = type.getAddNewFieldCommand(""); //$NON-NLS-1$
-        if (command != null)
-        {  
-          getCommandStack().execute(command);
-          Adapter adapter = XSDAdapterFactory.getInstance().adapt(((BaseCommand)command).getAddedComponent());
-          selectAddedComponent(adapter);
-        }
-        else
-        {
-           //TODO ... pop up a command not implemented message
-        }
-      }
-    }  
-  }
-  
-  protected void doEdit(Object obj, IWorkbenchPart part)
-  {
-    if (obj instanceof BaseFieldEditPart)
-    {
-      BaseFieldEditPart editPart = (BaseFieldEditPart)obj;
-      editPart.doEditName(!(part instanceof ContentOutline));
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/BaseDirectEditAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/BaseDirectEditAction.java
deleted file mode 100644
index 70141be..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/BaseDirectEditAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.ui.actions.DirectEditAction;
-import org.eclipse.gef.ui.parts.AbstractEditPartViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-
-
-public class BaseDirectEditAction extends DirectEditAction {
-	protected ISelectionProvider provider;
-	
-	/**
-	 * Same as {@link #DirectEditAction(IWorkbenchPart)}.
-	 * @param editor the editor
-	 */
-	public BaseDirectEditAction(IEditorPart editor) {
-		super((IWorkbenchPart)editor);
-	}
-
-	/**
-	 * Constructs a DirectEditAction using the specified part.
-	 * @param part the workbench part
-	 */
-	public BaseDirectEditAction(IWorkbenchPart part) {
-		super(part);
-	}
-	
-	  /* (non-Javadoc)
-	   * @see org.eclipse.gef.ui.actions.SelectionAction#getSelection()
-	   */
-	  protected ISelection getSelection()
-	  {
-	    // always get selection from selection provider first
-		  if (provider!=null) {
-			  Object selection = provider.getSelection();
-			  if (selection instanceof StructuredSelection) {
-				  Object object = ((StructuredSelection) selection).getFirstElement();
-				  if (object instanceof XSDBaseAdapter) {
-					  // We need to return an EditPart as the selection.
-					  IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-					  Object graphicalViewer = editor.getAdapter(GraphicalViewer.class);
-					  if (graphicalViewer instanceof AbstractEditPartViewer) {
-						  AbstractEditPartViewer viewer = (AbstractEditPartViewer) graphicalViewer;
-						  EditPart editPart = (EditPart)viewer.getEditPartRegistry().get(object);
-						  return new StructuredSelection(editPart);
-					  }
-				  }
-			  }
-	    }
-	    
-	    return super.getSelection();
-	  }
-	
-	  protected boolean calculateEnabled() {
-		  Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-		  if (selection instanceof XSDBaseAdapter) {
-			  return  !((XSDBaseAdapter) selection).isReadOnly();
-		  }
-		  
-		  return true;
-	  }
-	  
-	  /* (non-Javadoc)
-	   * @see org.eclipse.gef.ui.actions.SelectionAction#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider)
-	   */
-	  public void setSelectionProvider(ISelectionProvider provider)
-	  {
-	    super.setSelectionProvider(provider);
-	    this.provider = provider;
-	  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/BaseSelectionAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/BaseSelectionAction.java
deleted file mode 100644
index e52ea3a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/BaseSelectionAction.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.ui.actions.SelectionAction;
-import org.eclipse.gef.ui.parts.AbstractEditPartViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-
-public abstract class BaseSelectionAction extends SelectionAction
-{
-  public static final String SEPARATOR_ID = "org.eclipse.jface.action.Separator"; //$NON-NLS-1$
-  public static final String SUBMENU_START_ID = "SUBMENU_START_ID: "; //$NON-NLS-1$
-  public static final String SUBMENU_END_ID = "SUBMENU_END_ID: "; //$NON-NLS-1$
-
-  protected ISelectionProvider provider;
-  protected boolean doDirectEdit = true;
-  
-  public BaseSelectionAction(IWorkbenchPart part)
-  {
-    super(part);
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.gef.ui.actions.SelectionAction#getSelection()
-   */
-  protected ISelection getSelection()
-  {
-    // always get selection from selection provider first
-    if (provider!=null)
-      return provider.getSelection();
-    
-    return super.getSelection();
-  }
-  /* (non-Javadoc)
-   * @see org.eclipse.gef.ui.actions.SelectionAction#setSelectionProvider(org.eclipse.jface.viewers.ISelectionProvider)
-   */
-  public void setSelectionProvider(ISelectionProvider provider)
-  {
-    super.setSelectionProvider(provider);
-    this.provider = provider;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction#calculateEnabled()
-   */
-  protected boolean calculateEnabled()
-  {
-    if (getSelectedObjects().size() > 0)
-    {
-      Object o = getSelectedObjects().get(0);
-      if (o instanceof IComplexType)
-      {
-        return !((IComplexType)o).isReadOnly();
-      }
-      else if (o instanceof IField)
-      {
-        return !((IField)o).isReadOnly();
-      }
-      else if (o instanceof IGraphElement)
-      {
-    	return !((IGraphElement)o).isReadOnly();
-      }
-    }
-    return true;
-  }
-  
-  protected void selectAddedComponent(final Adapter adapter)
-  {
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        if (adapter != null)
-        {
-          provider.setSelection(new StructuredSelection(adapter));
-          if (doDirectEdit)
-            activateDirectEdit();
-        }
-      }
-    };
-    Display.getCurrent().asyncExec(runnable);
-  }
-
-  protected void activateDirectEdit()
-  {
-    if (getWorkbenchPart() instanceof IEditorPart)
-    {
-      try
-      {
-        IEditorPart owningEditor = (IEditorPart)getWorkbenchPart();
-        IWorkbench workbench = PlatformUI.getWorkbench();
-        IWorkbenchPart part = workbench.getActiveWorkbenchWindow().getActivePage().getActivePart();
-        Object object = owningEditor.getAdapter(GraphicalViewer.class);
-        if (object instanceof AbstractEditPartViewer)
-        {
-          AbstractEditPartViewer viewer = (AbstractEditPartViewer)object;
-          Object obj = viewer.getSelectedEditParts().get(0);
-          doEdit(obj, part);
-        }
-      }
-      catch (Exception e)
-      {
-        
-      }
-    }        
-  }
-  
-  protected void doEdit(Object obj, IWorkbenchPart part)
-  {
-    
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/CaptureScreenAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/CaptureScreenAction.java
deleted file mode 100644
index c0d0430..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/CaptureScreenAction.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LayoutManager;
-import org.eclipse.draw2d.SWTGraphics;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.design.layouts.FillLayout;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class CaptureScreenAction extends Action
-{
-
-  private static String LAST_SCREEN_CAPTURE_PATH = System.getProperty("user.home"); //$NON-NLS-1$
-  private static String LAST_SCREEN_CAPTURE_FILE_NAME = Messages._UI_ACTION_CAPTURE_SCREEN_DEFAULT_FILE_NAME;
-  private static String LAST_SCREEN_CAPTURE_FILE_EXTENSION = ".jpg"; //$NON-NLS-1$
-
-  public CaptureScreenAction()
-  {
-    setText(Messages._UI_CAPTURE_SCREEN_ACTION_TEXT);
-    setToolTipText(Messages._UI_CAPTURE_SCREEN_ACTION_TOOLTIPTEXT);
-    setImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/etool16/capturescreen.gif")); //$NON-NLS-1$
-    setDisabledImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/dtool16/capturescreen.gif")); //$NON-NLS-1$
-    setAccelerator(SWT.CTRL | SWT.SHIFT | 'X'); //$NON-NLS-1$
-  }
-
-  public void run()
-  {
-    ImageExporter imageExporter = new ImageExporter();
-    imageExporter.save(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor(), (GraphicalViewer) PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getAdapter(GraphicalViewer.class));
-  }
-
-  public class ImageExporter
-  {
-    private static final String FILE_FORMATS = "*.jpeg;*.jfif;*.jpg;*.jpe;*.png;*.bmp;*.ico"; //$NON-NLS-1$
-  	private static final String FILE_SEPARATOR = "file.separator"; //$NON-NLS-1$
-
-	  public boolean save(IEditorPart editorPart, GraphicalViewer viewer, String saveFilePath, int format)
-    {
-      Assert.isNotNull(editorPart, "null editorPart passed to ImageExporter.save"); //$NON-NLS-1$
-      Assert.isNotNull(viewer, "null viewer passed to ImageExporter.save"); //$NON-NLS-1$
-      Assert.isNotNull(saveFilePath, "null saveFilePath passed to ImageExporter.save"); //$NON-NLS-1$
-
-      if (format != SWT.IMAGE_BMP && format != SWT.IMAGE_JPEG && format != SWT.IMAGE_ICO && format != SWT.IMAGE_PNG)
-        throw new IllegalArgumentException(Messages._UI_ACTION_CAPTURE_SCREEN_FORMAT_NOT_SUPPORTED);
-
-      try
-      {
-        saveEditorContentsAsImage(editorPart, viewer, saveFilePath, format);
-      }
-      catch (Exception ex)
-      {
-        MessageDialog.openError(editorPart.getEditorSite().getShell(), Messages._UI_ACTION_CAPTURE_SCREEN_ERROR_TITLE, Messages._UI_ACTION_CAPTURE_SCREEN_ERROR_DESCRIPTION);
-        return false;
-      }
-
-      return true;
-    }
-
-    public boolean save(IEditorPart editorPart, GraphicalViewer viewer)
-    {
-      Assert.isNotNull(editorPart, "null editorPart passed to ImageExporter.save"); //$NON-NLS-1$
-      Assert.isNotNull(viewer, "null viewer passed to ImageExporter.save"); //$NON-NLS-1$
-
-      String saveFilePath = getSaveFilePath(editorPart, viewer);
-      if (saveFilePath == null)
-        return false;
-
-      File file = new File(saveFilePath);
-      if (file.exists() && file.isFile())
-      {
-        if (!MessageDialog.openQuestion(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), Messages._UI_ACTION_CAPTURE_SCREEN_OVERWRITE_CONFIRMATION_QUESTION, Messages._UI_ACTION_CAPTURE_SCREEN_OVERWRITE_CONFIRMATION.replace("{0}", saveFilePath))) //$NON-NLS-1$
-        {
-          return false;
-        }
-      }
-
-      int format = -1;
-      String saveFilePathLowerCase = saveFilePath.toLowerCase(); 
-      if (saveFilePathLowerCase.endsWith(".jpeg") || saveFilePathLowerCase.endsWith(".jpg") || saveFilePathLowerCase.endsWith(".jpe") || saveFilePathLowerCase.endsWith(".jfif")) //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-    	format = SWT.IMAGE_JPEG;
-      else if (saveFilePathLowerCase.endsWith(".bmp")) //$NON-NLS-1$
-        format = SWT.IMAGE_BMP;
-      else if (saveFilePathLowerCase.endsWith(".ico")) //$NON-NLS-1$
-        format = SWT.IMAGE_ICO;
-      else if (saveFilePathLowerCase.endsWith(".png")) //$NON-NLS-1$
-        format = SWT.IMAGE_PNG;
-      else if (saveFilePathLowerCase.endsWith(".gif")) //$NON-NLS-1$
-        format = SWT.IMAGE_GIF;
-
-      if(format != -1) {
-    	  return save(editorPart, viewer, saveFilePath, format);
-      } else {
-    	  return false;
-      }
-
-    }
-
-    private String getSaveFilePath(IEditorPart editorPart, GraphicalViewer viewer)
-    {
-      String filePath;
-
-      FileDialog fileDialog = new FileDialog(editorPart.getEditorSite().getShell(), SWT.SAVE);
-
-      String[] filterExtensions = new String[] {FILE_FORMATS}; //$NON-NLS-1$
-
-      fileDialog.setFileName(obtainNextFileName());
-      fileDialog.setFilterExtensions(filterExtensions);
-      fileDialog.setFilterNames(new String[] {FILE_FORMATS});
-      fileDialog.setText(Messages._UI_ACTION_CAPTURE_SCREEN_FILE_SAVE_DIALOG_TITLE);
-      
-      filePath = fileDialog.open();
-
-      if (filePath != null)
-      {
-	      LAST_SCREEN_CAPTURE_PATH = fileDialog.getFilterPath();
-	      String fileName = fileDialog.getFileName();
-	      if (fileName.indexOf('.') > 0) {
-		      LAST_SCREEN_CAPTURE_FILE_NAME = fileName.substring(0, fileName.indexOf('.'));
-		      LAST_SCREEN_CAPTURE_FILE_EXTENSION = fileName.substring(fileName.indexOf('.'));
-	      }
-	      else
-	      {
-		      LAST_SCREEN_CAPTURE_FILE_NAME = fileName;
-		      LAST_SCREEN_CAPTURE_FILE_EXTENSION = ""; //$NON-NLS-1$
-	      }
-      }
-      return filePath;
-    }
-
-    private void saveEditorContentsAsImage(IEditorPart editorPart, GraphicalViewer viewer, String saveFilePath, int format)
-    {
-      /*
-       * 1. First get the figure whose visuals we want to save as image. So we
-       * would like to save the rooteditpart which actually hosts all the
-       * printable layers.
-       * 
-       * NOTE: ScalableRootEditPart manages layers and is registered
-       * graphicalviewer's editpartregistry with the key LayerManager.ID ...
-       * well that is because ScalableRootEditPart manages all layers that are
-       * hosted on a FigureCanvas. Many layers exist for doing different things
-       */
-      ScalableRootEditPart rootEditPart = (ScalableRootEditPart) viewer.getEditPartRegistry().get(LayerManager.ID);
-      IFigure rootFigure = ((LayerManager) rootEditPart).getLayer(LayerConstants.PRINTABLE_LAYERS);// rootEditPart.getFigure();
-    
-      Rectangle rootFigureBounds = new Rectangle(new Point(0,0),rootFigure.getPreferredSize());
-      List rootEditPartChildren = rootEditPart.getChildren();
-      Iterator rootEditPartChildrenIterator = rootEditPartChildren.iterator();
-      while(rootEditPartChildrenIterator.hasNext()) {
-    	  Object object = rootEditPartChildrenIterator.next();
-    	  if(object instanceof AbstractGraphicalEditPart) {
-    		  AbstractGraphicalEditPart childAbstractGraphicalEditPart = (AbstractGraphicalEditPart)object;
-    		  List grandChildren = childAbstractGraphicalEditPart.getChildren();
-    		  Iterator grandChildrenIterator = grandChildren.iterator();
-    		  while(grandChildrenIterator.hasNext()) {
-    			  AbstractGraphicalEditPart grandChildAbstractGraphicalEditPart = (AbstractGraphicalEditPart)grandChildrenIterator.next();
-    			  IFigure figure = grandChildAbstractGraphicalEditPart.getFigure();
-    			  LayoutManager layoutManager = figure.getLayoutManager();
-    			  if(layoutManager instanceof FillLayout) {
-    				  rootFigureBounds = rootFigure.getBounds();
-    			  }
-    		  }
-    	  }
-      }
-
-      /*
-       * 2. Now we want to get the GC associated with the control on which all
-       * figures are painted by SWTGraphics. For that first get the SWT Control
-       * associated with the viewer on which the rooteditpart is set as contents
-       */
-      Control figureCanvas = viewer.getControl();
-      GC figureCanvasGC = new GC(figureCanvas);
-
-      /*
-       * 3. Create a new Graphics for an Image onto which we want to paint
-       * rootFigure
-       */
-      Image img = new Image(null, rootFigureBounds.width, rootFigureBounds.height);
-      GC imageGC = new GC(img);
-      imageGC.setBackground(figureCanvasGC.getBackground());
-      imageGC.setForeground(figureCanvasGC.getForeground());
-      imageGC.setFont(figureCanvasGC.getFont());
-      imageGC.setLineStyle(figureCanvasGC.getLineStyle());
-      imageGC.setLineWidth(figureCanvasGC.getLineWidth());
-      imageGC.setXORMode(figureCanvasGC.getXORMode());
-      Graphics imgGraphics = new SWTGraphics(imageGC);
-
-      /* 4. Draw rootFigure onto image. After that image will be ready for save */
-      rootFigure.paint(imgGraphics);
-
-      /* 5. Save image */
-      ImageData[] imgData = new ImageData[1];
-      imgData[0] = img.getImageData();
-
-      ImageLoader imgLoader = new ImageLoader();
-      imgLoader.data = imgData;
-      imgLoader.save(saveFilePath, format);
-
-      /* release OS resources */
-      figureCanvasGC.dispose();
-      imageGC.dispose();
-      img.dispose();
-
-    }
-
-    String obtainNextFileName()
-    {
-
-      int aux = LAST_SCREEN_CAPTURE_FILE_NAME.length() - 1;
-      while (Character.isDigit(LAST_SCREEN_CAPTURE_FILE_NAME.charAt(aux)))
-      {
-        aux--;
-      }
-
-      String nonNumeratedfileName = LAST_SCREEN_CAPTURE_FILE_NAME.substring(0, aux + 1);
-      String filePath = LAST_SCREEN_CAPTURE_PATH + System.getProperty(FILE_SEPARATOR) + nonNumeratedfileName + LAST_SCREEN_CAPTURE_FILE_EXTENSION; //$NON-NLS-1$
-
-      int counter = 1;
-      File file = new File(filePath);
-      while (file.exists())
-      {
-        filePath = LAST_SCREEN_CAPTURE_PATH + System.getProperty(FILE_SEPARATOR) + nonNumeratedfileName + counter++ + LAST_SCREEN_CAPTURE_FILE_EXTENSION; //$NON-NLS-1$
-        file = new File(filePath);
-      }
-
-      return filePath;
-    }
-
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java
deleted file mode 100644
index 9a634c1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DeleteAction.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewGraphicalViewer;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class DeleteAction extends BaseSelectionAction
-{
-  public final static String ID = "org.eclipse.wst.xsd.ui.internal.editor.DeleteAction";  //$NON-NLS-1$
-  public DeleteAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_DELETE);
-    setId(ID);
-    setImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/delete_obj.gif") ); //$NON-NLS-1$
-  }
-  
-  public void run()
-  {
-    for (Iterator i = ((IStructuredSelection) getSelection()).iterator(); i.hasNext(); )
-    {
-      Object selection = i.next();
-      Command command = null;
-      boolean doSetInput = false;
-      boolean doSetModelAsInput = false;
-      IADTObject topLevelContainer = null;
-      IModel model = null;
-      
-      if (selection instanceof IGraphElement)
-      {
-        IGraphElement xsdObj = (IGraphElement)selection;
- 
-        if (xsdObj instanceof XSDBaseAdapter)
-        {
-          XSDBaseAdapter baseAdapter = (XSDBaseAdapter)xsdObj;
-          
-          // Do not delete selected item if it is read-only, or if the item selected
-          // is null and the read only check cannot be completed
-          if (baseAdapter == null || baseAdapter.isReadOnly())
-          {
-            continue;
-          }
-          
-          topLevelContainer = xsdObj.getTopContainer();
-          if (topLevelContainer == selection)
-          {
-            doSetInput = true;
-            doSetModelAsInput = true;
-          }
-          command = xsdObj.getDeleteCommand();
-          model = xsdObj.getModel();         
-        }
-      }
-      
-      if (command != null)
-      {
-        IWorkbench workbench = PlatformUI.getWorkbench();
-        if (workbench != null)
-        {
-          IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-          if (workbenchWindow != null && workbenchWindow.getActivePage() != null)
-          {
-            IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-            if (editorPart != null)
-            {
-              Object viewer = editorPart.getAdapter(GraphicalViewer.class);
-              if (viewer instanceof DesignViewGraphicalViewer)
-              { 
-                Object input = ((DesignViewGraphicalViewer)viewer).getInput();
-                if (input != selection)
-                {
-                  // Bug 86218 : Don't switch to top level view if the object we're deleting
-                  // is not the input to the viewer
-                  doSetInput = false;
-                }
-              }
-            }
-          }
-        }
-        command.execute();
-        if (doSetInput)
-        {
-          if (model != null && doSetModelAsInput)
-            provider.setSelection(new StructuredSelection(model));   
-          else if (topLevelContainer != null && !doSetModelAsInput)
-            provider.setSelection(new StructuredSelection(topLevelContainer));
-        }
-      }  
-    }
-    
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DesignSelectAll.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DesignSelectAll.java
deleted file mode 100644
index 61da6b4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/DesignSelectAll.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.CommonMultiPageEditor;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.CategoryEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.XSDSchemaEditPart;
-
-public class DesignSelectAll extends BaseSelectionAction
-{
-  private GraphicalViewer graphicalViewer;
-  private List selected;
-
-  public DesignSelectAll(IWorkbenchPart part)
-  {
-    super(part);
-    setId(ActionFactory.SELECT_ALL.getId());
-    setText(Messages._UI_ACTION_SELECT_ALL);
-  }
-
-  public void run()
-  {
-    super.run();
-
-    IWorkbenchPart part = getWorkbenchPart();
-    selected = new ArrayList();
-    if (part instanceof CommonMultiPageEditor)
-    {
-      graphicalViewer = (GraphicalViewer) ((CommonMultiPageEditor) part).getAdapter(GraphicalViewer.class);
-      if (graphicalViewer != null)
-      {
-        EditPart editPart = graphicalViewer.getContents();
-        doSelectChildren(editPart);
-
-        graphicalViewer.setSelection(new StructuredSelection(selected));
-      }
-    }
-  }
-
-  private void doSelectChildren(EditPart editPart)
-  {
-    List list = editPart.getChildren();
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      Object o = i.next();
-      if (o instanceof GraphicalEditPart)
-      {
-        if (!(o instanceof XSDSchemaEditPart) && !(o instanceof CategoryEditPart))
-        {
-          selected.add(o);
-        }
-        doSelectChildren((GraphicalEditPart) o);
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/SetInputToGraphView.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/SetInputToGraphView.java
deleted file mode 100644
index c5f9301..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/SetInputToGraphView.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewGraphicalViewer;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootContentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-
-public class SetInputToGraphView extends BaseSelectionAction
-{
-  public static String ID = "SetAsFocus"; //$NON-NLS-1$
-  protected IEditorPart editorPart;
-  protected Object input;
-
-  public SetInputToGraphView(IWorkbenchPart part)
-  {
-    this(part, null);
-  }
-  
-  public SetInputToGraphView(IWorkbenchPart part, Object input)
-  {
-    super(part);
-    this.input = input;
-    setId(ID);
-    setText(Messages._UI_ACTION_SET_AS_FOCUS);
-    if (part instanceof IEditorPart)
-    {
-      editorPart = (IEditorPart)part;
-    }      
-  }
-  
-  protected boolean calculateEnabled()
-  {
-    return true;
-  }
-
-  public void run()
-  {    
-    Object selection = input;   
-    if (selection == null)
-    {  
-      selection = ((IStructuredSelection) getSelection()).getFirstElement();
-    }  
-    Object adapter = getWorkbenchPart().getAdapter(GraphicalViewer.class);
-
-    if (selection instanceof IADTObject)
-    {
-      IADTObject obj = (IADTObject) selection;
-      if (adapter instanceof DesignViewGraphicalViewer)
-      {
-        DesignViewGraphicalViewer graphicalViewer = (DesignViewGraphicalViewer) adapter;  
-        EditPart editPart = graphicalViewer.getInputEditPart();
-        if (editPart instanceof RootContentEditPart)
-        {
-          graphicalViewer.setInputAndMarkLocation(obj);
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/ShowPropertiesViewAction.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/ShowPropertiesViewAction.java
deleted file mode 100644
index e3d232f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/actions/ShowPropertiesViewAction.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.actions;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-
-/**
- * Show the properties view in the current perspective.
- */
-public class ShowPropertiesViewAction extends BaseSelectionAction
-{
-	public static final String ID = "org.eclipse.wst.xsd.ui.internal.adt.actions.ShowPropertiesViewAction"; //$NON-NLS-1$
-	public static final String PROPERTIES_VIEW_ID = "org.eclipse.ui.views.PropertySheet"; //$NON-NLS-1$
-	
-  protected static ImageDescriptor enabledImage, disabledImage;
-
-	public ShowPropertiesViewAction(IWorkbenchPart part)
-  {
-		super(part);
-		setId(ID);
-		setText(Messages._UI_ACTION_SHOW_PROPERTIES);
-		setToolTipText(getText());
-    setImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/elcl16/showproperties_obj.gif") ); //$NON-NLS-1$
-	  setDisabledImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/dlcl16/showproperties_obj.gif") ); //$NON-NLS-1$
-	}
-  
-  protected boolean calculateEnabled()
-  {
-    return true;
-  }
-  
-  public void run()
-  {
-    try
-    {
-      getWorkbenchPart().getSite().getPage().showView(PROPERTIES_VIEW_ID);
-    }
-    catch (PartInitException pie)
-    {
-
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/ADTFloatingToolbar.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/ADTFloatingToolbar.java
deleted file mode 100644
index 190bc05..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/ADTFloatingToolbar.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.ui.parts.GraphicalViewerImpl;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Canvas;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.ADTFloatingToolbarEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-
-public class ADTFloatingToolbar extends GraphicalViewerImpl
-{
-  protected IModel model;
-  protected boolean isDrilledDown;
-  protected ADTFloatingToolbarEditPart editPart;
-
-  public ADTFloatingToolbar(IModel model)
-  {
-    this.model = model;
-  }
-
-  public void setModel(IModel model)
-  {
-    this.model = model;
-    editPart = (ADTFloatingToolbarEditPart)getEditPartFactory().createEditPart(null, new ADTFloatingToolbarModel(model));
-    if (editPart == null)
-    {
-      editPart = new ADTFloatingToolbarEditPart(model);
-    }
-    editPart.setModel(model);
-    setContents(editPart);
-  }
-
-  public Control createControl(Composite composite)
-  {
-    Canvas canvas = new Canvas(composite, SWT.NONE);
-    canvas.setBackground(ColorConstants.white);
-    setControl(canvas);
-    return getControl();
-  }
-
-  public void refresh(boolean isDrilledDown)
-  {
-    this.isDrilledDown = isDrilledDown;
-    editPart.setIsDrilledDown(isDrilledDown);
-    getContents().refresh();
-  }
-  
-  public class ADTFloatingToolbarModel
-  {
-    IModel model;
-    public ADTFloatingToolbarModel(IModel model)
-    {
-      this.model = model;
-    }
-    
-    public IModel getModel()
-    {
-      return model;
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/BaseGraphicalViewerKeyHandler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/BaseGraphicalViewerKeyHandler.java
deleted file mode 100644
index dfc4e82..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/BaseGraphicalViewerKeyHandler.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-
-/**
- * This key handler is designed to be re-used by both the WSDL and XSD editor
- */
-public class BaseGraphicalViewerKeyHandler extends GraphicalViewerKeyHandler
-{
-  public BaseGraphicalViewerKeyHandler(GraphicalViewer viewer)
-  {
-    super(viewer);
-  }
-
-  public boolean keyPressed(KeyEvent event)
-  {
-    int direction = -1;
-    boolean isAltDown = (event.stateMask & SWT.ALT) != 0;
-    boolean isCtrlDown = (event.stateMask & SWT.CTRL) != 0;
-    switch (event.keyCode)
-    {
-      case SWT.ARROW_LEFT : {
-        direction = PositionConstants.WEST;
-        break;
-      }
-      case SWT.ARROW_RIGHT : {
-        direction = PositionConstants.EAST;
-        break;
-      }
-      case SWT.ARROW_UP : {
-        direction = isAltDown ? KeyBoardAccessibilityEditPolicy.OUT_TO_PARENT : PositionConstants.NORTH;
-        break;
-      }
-      case SWT.ARROW_DOWN : {
-    	 direction = isAltDown ? KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD : PositionConstants.SOUTH;       
-        break;
-      }
-    }
-    
-    if (direction != -1)
-    {
-      GraphicalEditPart focusEditPart = getFocusEditPart();
-      KeyBoardAccessibilityEditPolicy policy = (KeyBoardAccessibilityEditPolicy)focusEditPart.getEditPolicy(KeyBoardAccessibilityEditPolicy.KEY);
-      
-      if (policy != null)          
-      {
-        EditPart target = policy.getRelativeEditPart(focusEditPart, direction);
-        if (target != null)
-        {
-        	if(isCtrlDown) {
-
-        		IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        			 Object keyboardDrag = editor.getAdapter(IKeyboardDrag.class);
-        			 if (keyboardDrag instanceof IKeyboardDrag) {
-        				 ((IKeyboardDrag) keyboardDrag).performKeyboardDrag(focusEditPart, direction);
-        				 return true;
-        		 }
-        	}
-        	else {
-                navigateTo(target, event);
-                return true;
-        	}
-        }          
-      }         
-    }
-    
-    switch (event.keyCode)
-    {
-      case SWT.PAGE_DOWN :
-      {  
-        if (scrollPage(event, PositionConstants.SOUTH))
-          return true;
-      }  
-      case SWT.PAGE_UP :
-      {  
-        if (scrollPage(event, PositionConstants.NORTH))
-          return true;
-      }
-      case SWT.F3 :
-      case SWT.CR :
-      {
-        IWorkbench workbench = PlatformUI.getWorkbench();
-        IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-        IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-        ActionRegistry registry = (ActionRegistry) editorPart.getAdapter(ActionRegistry.class);
-        if (registry != null)
-        {
-          IAction action = registry.getAction(OpenInNewEditor.ID);
-          if (action != null)
-          action.run();
-        }
-      }
-      /*
-      case SWT.F5 :
-      {
-        IEditorPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-        if (part != null)
-        {
-          EditorModeManager manager = (EditorModeManager)part.getAdapter(EditorModeManager.class);
-          EditorMode[] modes = manager.getModes();
-          EditorMode mode = manager.getCurrentMode();
-          List list = Arrays.asList(modes);
-          int index = list.indexOf(mode);
-          int nextIndex = index + 1;
-          if (nextIndex < modes.length)
-          {
-            mode = (EditorMode)list.get(nextIndex);
-          }  
-          else
-          {
-            mode = (EditorMode)list.get(0);            
-          }
-          if (mode != manager.getCurrentMode())
-          {  
-            manager.setCurrentMode(mode);
-          }  
-        }  
-        return true;
-      }*/      
-    }
-    return super.keyPressed(event);
-  }
-
-  private boolean scrollPage(KeyEvent event, int direction)
-  {
-    if (!(getViewer().getControl() instanceof FigureCanvas))
-      return false;
-    FigureCanvas figCanvas = (FigureCanvas) getViewer().getControl();
-    Point loc = figCanvas.getViewport().getViewLocation();
-    Rectangle area = figCanvas.getViewport().getClientArea(Rectangle.SINGLETON).scale(.8);
-    if (direction == PositionConstants.NORTH)
-    {
-      figCanvas.scrollToY(loc.y - area.height);
-    }
-    else
-    {
-      figCanvas.scrollToY(loc.y + area.height);
-    }
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewContextMenuProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewContextMenuProvider.java
deleted file mode 100644
index af85cb2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewContextMenuProvider.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-import org.eclipse.gef.ContextMenuProvider;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ContextMenuParticipant;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.EditorModeManager;
-
-
-public class DesignViewContextMenuProvider extends ContextMenuProvider
-{
-  IEditorPart editor;  
-  ISelectionProvider selectionProvider;
-
-  /**
-   * Constructor for GraphContextMenuProvider.
-   * 
-   * @param selectionProvider
-   * @param editor
-   */
-  public DesignViewContextMenuProvider(IEditorPart editor, EditPartViewer viewer, ISelectionProvider selectionProvider)
-  {
-    super(viewer);
-    this.editor = editor;
-    this.selectionProvider = selectionProvider;
-  }
-
-  /**
-   * @see org.eclipse.gef.ui.parts.ContextMenuProvider#buildContextMenu(org.eclipse.jface.action.IMenuManager,
-   *      org.eclipse.gef.EditPartViewer)
-   */
-  public void buildContextMenu(IMenuManager menu)
-  {
-    IMenuManager currentMenu = menu;
-    
-    EditorModeManager manager = (EditorModeManager)editor.getAdapter(EditorModeManager.class);
-    ContextMenuParticipant contextMenuParticipant = manager != null ? manager.getCurrentMode().getContextMenuParticipant() : null;
-    
-    menu.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
-    ActionRegistry registry = getEditorActionRegistry();
-    ISelection selection = selectionProvider.getSelection();
-    
-    if (selection != null)
-    {
-      Object selectedObject = ((StructuredSelection) selection).getFirstElement();
-      
-      // Convert editparts to model objects as selections 
-      if (selectedObject instanceof EditPart)
-      {
-        selectedObject = ((EditPart)selectedObject).getModel();
-      }
-
-      if (selectedObject instanceof IActionProvider)
-      {
-        IActionProvider actionProvider = (IActionProvider) selectedObject;
-
-        String[] actions = actionProvider.getActions(null);
-        for (int i = 0; i < actions.length; i++)
-        {
-          String id = actions[i];
-          if (contextMenuParticipant == null || contextMenuParticipant.isApplicable(selectedObject, id))
-          {
-            if (id.startsWith(BaseSelectionAction.SUBMENU_START_ID))
-            {
-              String text = id.substring(BaseSelectionAction.SUBMENU_START_ID.length());
-              IMenuManager subMenu = new MenuManager(text);
-              currentMenu.add(subMenu);
-              currentMenu = subMenu;
-            }
-            else if (id.startsWith(BaseSelectionAction.SUBMENU_END_ID))
-            {
-              currentMenu = getParentMenu(menu, currentMenu);
-            }
-            else if (id.equals(BaseSelectionAction.SEPARATOR_ID))
-            {
-              currentMenu.add(new Separator());
-            }
-            else
-            {
-              IAction action = registry.getAction(id);
-              if (action != null)
-              { 
-                action.isEnabled();
-                currentMenu.add(action);
-              }
-            }
-          }
-        }
-        menu.add(new Separator());       
-        menu.add(new Separator("refactoring-slot"));  //$NON-NLS-1$
-        menu.add(new Separator());       
-        menu.add(new Separator("search-slot"));        //$NON-NLS-1$
-        menu.add(new Separator());
-        menu.add(new Separator("endDesignMenu-slot"));  // $NON-NLS-1$
-        menu.add(new Separator());
-      }
-    }    
-    menu.add(new Separator());
-  }
-
-  protected IMenuManager getParentMenu(IMenuManager root, IMenuManager child) {
-    IMenuManager parent = null;
-    
-    IContributionItem[] kids = root.getItems();
-    int index = 0;
-    while (index < kids.length && parent == null) {
-      IContributionItem item = kids[index];
-      if (item.equals(child)) {
-        parent = root;
-      }
-      else {
-        if (item instanceof IMenuManager) {
-          parent = getParentMenu((IMenuManager) item, child);
-        }
-      }
-      index++;
-    }
-    
-    return parent;
-  }
-
-  protected ActionRegistry getEditorActionRegistry()
-  {
-    return (ActionRegistry) editor.getAdapter(ActionRegistry.class);
-  }
-  protected CommandStack commandStack;
-
-  protected CommandStack getCommandStack()
-  {
-    if (commandStack == null)
-      commandStack = getViewer().getEditDomain().getCommandStack();
-    return commandStack;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewGraphicalViewer.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewGraphicalViewer.java
deleted file mode 100644
index 381415c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewGraphicalViewer.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.INavigationHistory;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adapters.RedefineCategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDRedefineAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.IHolderEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootContentEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.StructureEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IModelProxy;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.CommonSelectionManager;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ADTContentOutlinePage;
-
-public class DesignViewGraphicalViewer extends ScrollingGraphicalViewer implements ISelectionChangedListener
-{
-  protected ADTSelectionChangedListener internalSelectionProvider = new ADTSelectionChangedListener();
-  protected InputChangeManager inputChangeManager = new InputChangeManager();
-  private IEditorPart editorPart;
-
-  public DesignViewGraphicalViewer(IEditorPart editor, CommonSelectionManager manager)
-  {
-    super();
-    this.editorPart = editor;
-    setContextMenu(new DesignViewContextMenuProvider(editor, this, this));
-    editor.getEditorSite().registerContextMenu("org.eclipse.wst.xsd.ui.popup.graph", getContextMenu(), internalSelectionProvider, false); //$NON-NLS-1$
-    
-    // make the internalSelectionProvider listen to graph view selection changes
-    addSelectionChangedListener(internalSelectionProvider);    
-    internalSelectionProvider.addSelectionChangedListener(manager);
-    manager.addSelectionChangedListener(this);  
-    
-    setKeyHandler(new BaseGraphicalViewerKeyHandler(this));    
-  }
-  
-  
-  // this method is called when something changes in the selection manager
-  // (e.g. a selection occured from another view)
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    Object selectedObject = null;
-    ISelection eventSelection = event.getSelection();
-    if (eventSelection instanceof StructuredSelection)
-    {
-    	selectedObject = ((StructuredSelection) eventSelection).getFirstElement(); 
-    }    
-    // TODO (cs) It seems like there's way more selection going on than there
-    // should
-    // be!! There's at least 2 selections getting fired when something is
-    // selected in the
-    // outline view. Are we listening to too many things?
-    //
-    // if (event.getSource() instanceof ADTContentOutlinePage)
-    if (selectedObject != null)
-    {
-    if (event.getSource() != internalSelectionProvider)
-    {
-      if (selectedObject instanceof IStructure)
-      {
-        if (((getInput() instanceof IModel) && (event.getSource() instanceof ADTContentOutlinePage)) ||
-            (!(getInput() instanceof IModel)))
-        {
-          if ((selectedObject instanceof IGraphElement) && ((IGraphElement)selectedObject).isFocusAllowed()) 
-          {
-            if (!(event.getSource() instanceof org.eclipse.jface.viewers.IPostSelectionProvider))            
-            {
-              setInputAndMarkLocation((IStructure)selectedObject);
-            }
-          }
-        }
-      }
-      else if (selectedObject instanceof IGraphElement)
-      {
-        if (((IGraphElement)selectedObject).isFocusAllowed() && ((event.getSource() instanceof ADTContentOutlinePage)))
-        {
-          setInputAndMarkLocation((IADTObject)selectedObject);              
-        }
-        else if (!((IGraphElement)selectedObject).isFocusAllowed())
-        {
-          // We encountered an object that is not a valid input to the graph viewer
-          // Now find the top container that can be a valid input
-          IADTObject obj = ((IGraphElement)selectedObject).getTopContainer();
-          if (event.getSource() instanceof ADTContentOutlinePage)
-          {
-            // In this case, if the selection is originated from the outline, we should 
-            // change the inputs
-            if (obj != null && getInput() != obj)  // Don't change inputs if the obj is already the input
-              setInputAndMarkLocation(obj);
-          }
-          else if (event.getSource() instanceof CommonSelectionManager)
-          {
-            // In this case, if the selection is originated from some action, ie. adding
-            // a new element, we should change the input only if the current input is the model
-            // otherwise, inputs will change unexpectedly!!
-            if (getInput() instanceof IModel) 
-            {
-              if (obj != null)
-                setInput (obj);
-            }
-          }
-          else if (event.getSource() instanceof org.eclipse.jface.viewers.IPostSelectionProvider )
-          {
-            // In this case, if the selection is originated from the source viewer
-            // we should change the input regardless.  Test is for multiple levels
-            // of anonymous types
-            if (obj != null)
-              setInput (obj);
-          }
-          else
-          {
-            if (obj != null && getInput() instanceof IModel)
-              setInputAndMarkLocation(obj);
-          }
-        }
-        if (selectedObject instanceof IField) 
-        {
-          IField field = (IField)selectedObject;
-          if ( (!field.isGlobal() && getInput() instanceof IModel) ||
-               (!field.isGlobal() && !(event.getSource() instanceof CommonSelectionManager)))
-          {
-            IADTObject obj = ((IGraphElement)selectedObject).getTopContainer();
-            if (obj != null)
-              setInputAndMarkLocation(obj);
-          }
-          else if (field.isGlobal() && !(getInput() instanceof IModel))
-          {
-            if (event.getSource() instanceof org.eclipse.jface.viewers.IPostSelectionProvider )
-              setInput(field);
-            else
-              setInputAndMarkLocation(field);
-          }
-        }
-      }
-      else if (selectedObject instanceof IField)
-      {
-        IField field = (IField)selectedObject;
-        if ( (field.isGlobal() && (getInput() instanceof IModel) && (event.getSource() instanceof ADTContentOutlinePage)) ||
-            ( (field.isGlobal() && !(getInput() instanceof IModel))))
-        {  
-          setInputAndMarkLocation(field);
-        }
-      }
-      else if (selectedObject instanceof IModelProxy)
-      {
-        IModelProxy adapter = (IModelProxy)selectedObject;        
-        if (selectedObject instanceof RedefineCategoryAdapter)
-        {
-        	RedefineCategoryAdapter selectionAdapter = (RedefineCategoryAdapter)selectedObject;
-        	XSDRedefineAdapter selectionParentAdapter = selectionAdapter.getXsdRedefineAdapter(); 
-        	setInputAndMarkLocation(selectionParentAdapter);
-        }
-        else if (getInput() != adapter.getModel())
-           setInput(adapter.getModel());
-      }
-      else if (selectedObject instanceof IModel)
-      {
-        if (getInput() != selectedObject)
-          setInput((IModel)selectedObject);
-      }
-      
-      EditPart editPart = getEditPart(getRootEditPart(), selectedObject);
-      if (editPart != null)
-      {
-        setSelection(new StructuredSelection(editPart));
-        setFocus(editPart);
-      }
-    }
-    }
-  }
-  
-  /*
-   * We need to convert from edit part selections to model object selections
-   */
-  class ADTSelectionChangedListener implements ISelectionProvider, ISelectionChangedListener
-  {
-    protected List listenerList = new ArrayList();
-    protected ISelection selection = new StructuredSelection();
-
-    public void addSelectionChangedListener(ISelectionChangedListener listener)
-    {
-      listenerList.add(listener);
-    }
-
-    public void removeSelectionChangedListener(ISelectionChangedListener listener)
-    {
-      listenerList.remove(listener);
-    }
-
-    public ISelection getSelection()
-    {
-      return selection;
-    }
-
-    protected void notifyListeners(SelectionChangedEvent event)
-    {
-      for (Iterator i = listenerList.iterator(); i.hasNext();)
-      {
-        ISelectionChangedListener listener = (ISelectionChangedListener) i.next();
-        listener.selectionChanged(event);
-      }
-    }
-
-    public StructuredSelection convertSelectionFromEditPartToModel(ISelection editPartSelection)
-    {
-      List selectedModelObjectList = new ArrayList();
-      if (editPartSelection instanceof IStructuredSelection)
-      {
-        for (Iterator i = ((IStructuredSelection) editPartSelection).iterator(); i.hasNext();)
-        {
-          Object obj = i.next();
-          Object model = null;
-          if (obj instanceof EditPart)
-          {
-            EditPart editPart = (EditPart) obj;
-            model = editPart.getModel();
-          }
-          if (model != null)
-          {
-            selectedModelObjectList.add(model);
-          }
-        }
-      }
-      return new StructuredSelection(selectedModelObjectList);
-    }
-
-    public void setSelection(ISelection selection)
-    {
-      this.selection = selection;
-    }
-
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-      ISelection newSelection = convertSelectionFromEditPartToModel(event.getSelection());
-      this.selection = newSelection;
-      SelectionChangedEvent newEvent = new SelectionChangedEvent(this, newSelection);
-      notifyListeners(newEvent);
-    }
-  }
-  
-  protected EditPart getEditPart(EditPart parent, Object object)
-  {
-    EditPart result = null;
-    for (Iterator i = parent.getChildren().iterator(); i.hasNext(); )
-    {
-      EditPart editPart = (EditPart)i.next();
-      if (editPart.getModel() == object && !(editPart instanceof IHolderEditPart) && !(editPart instanceof RootContentEditPart))
-      {  
-        result = editPart;
-        break;
-      }
-    }             
-  
-    if (result == null)
-    { 
-      for (Iterator i = parent.getChildren().iterator(); i.hasNext(); )
-      {
-        EditPart editPart = getEditPart((EditPart)i.next(), object);
-        if (editPart != null)
-        {
-          // First check to see if there is a selection
-          ISelection currentSelection = getSelection();
-          
-          // If there is a selection then we will try to select 
-          // the target edit part that is one of its children
-          // This is handy when you add an element to a structured edit part
-          // then you want to select the element immediately and put it in
-          // direct edit mode
-          if (currentSelection != null)
-          {
-            if (currentSelection instanceof StructuredSelection)
-            {
-              EditPart targetStructureEditPart = (EditPart)((StructuredSelection)currentSelection).getFirstElement();
-              if (targetStructureEditPart != null)
-              {
-                while (targetStructureEditPart != null)
-                {
-                  if (targetStructureEditPart instanceof StructureEditPart)
-                  {
-                    break;
-                  }
-                  targetStructureEditPart = targetStructureEditPart.getParent();
-                }
-              }
-              EditPart potentialEditPartToSelect = editPart;
-              
-              while (potentialEditPartToSelect != null)
-              {
-                if (potentialEditPartToSelect instanceof StructureEditPart)
-                {
-                  break;
-                }
-                potentialEditPartToSelect = potentialEditPartToSelect.getParent();
-              }
-              
-              // If we found a potential edit part to select then return it
-              // OR, if there is no target found, then we should just return
-              // the edit part we found
-              if (potentialEditPartToSelect == targetStructureEditPart || potentialEditPartToSelect == null || targetStructureEditPart == null)
-              {
-                result = editPart;
-                break;
-              }
-            }
-          }
-          else // Otherwise just find the first one and return
-          {
-            result = editPart;
-            break;
-          }
-        }
-      }            
-    }
-  
-    return result;
-  }
-  
-  public void setInputAndMarkLocation(IADTObject object)
-  {
-    IADTObject oldInput = getInput();
-    INavigationHistory navigationHistory = null;
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    if(workbench != null)
-    {
-    	IWorkbenchWindow activeWorkbenchWindow = workbench.getActiveWorkbenchWindow();
-    	if(activeWorkbenchWindow != null)
-    	{
-    		IWorkbenchPage activePage = activeWorkbenchWindow.getActivePage();
-    		if(activePage != null)
-    		{
-    			navigationHistory = activePage.getNavigationHistory();
-    		}
-    	}
-    }
-
-    setInput(object);
-
-    if (editorPart != null && oldInput != object)
-    {
-      navigationHistory.markLocation(editorPart);
-    }
-  }
-  
-  public void setInput(IADTObject object)
-  {
-    RootContentEditPart rootContentEditPart = (RootContentEditPart)getRootEditPart().getContents();
-    rootContentEditPart.setModel(object);
-    rootContentEditPart.refresh();
-
-    if (object != null)
-    {  
-      inputChangeManager.setSelection(new StructuredSelection(object));
-    }
-    // Select the editpart when it is set as input
-    EditPart editPart = getEditPart(rootContentEditPart, object);
-    if (editPart != null)
-      select(editPart);
-  }
-  
-  public IADTObject getInput()
-  {
-    RootContentEditPart rootContentEditPart = (RootContentEditPart)getRootEditPart().getContents();    
-    return (IADTObject)rootContentEditPart.getModel();
-  }
-  
-  public EditPart getInputEditPart()
-  {
-    return getRootEditPart().getContents();    
-  }
-  
-  public void addInputChangdListener(ISelectionChangedListener listener)
-  {
-    inputChangeManager.addSelectionChangedListener(listener);
-  }
-  
-  public void removeInputChangdListener(ISelectionChangedListener listener)
-  {
-    inputChangeManager.removeSelectionChangedListener(listener);    
-  }  
-  
-  
-  private class InputChangeManager implements ISelectionProvider
-  {
-    List listeners = new ArrayList();
-       
-    public void addSelectionChangedListener(ISelectionChangedListener listener)
-    {
-      if (!listeners.contains(listener))
-      {  
-        listeners.add(listener);
-      }        
-    }
-
-    public ISelection getSelection()
-    {   
-      // no one should be calling this method     
-      return null;
-    }
-
-    public void removeSelectionChangedListener(ISelectionChangedListener listener)
-    {
-      listeners.remove(listener);      
-    }
-
-    public void setSelection(ISelection selection)
-    { 
-      notifyListeners(selection);
-    }
-
-    void notifyListeners(ISelection selection)
-    {
-      List list = new ArrayList(listeners);
-      for (Iterator i = list.iterator(); i.hasNext(); )
-      {
-        ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-        listener.selectionChanged(new SelectionChangedEvent(this, selection));
-      }  
-    }       
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewerGraphicConstants.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewerGraphicConstants.java
deleted file mode 100644
index 434e0d7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/DesignViewerGraphicConstants.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.widgets.Display;
-
-public interface DesignViewerGraphicConstants
-{
-  public static final String SCALED_HANDLE_LAYER = "Scaled Handle Layer"; //$NON-NLS-1$   
-  public final static Font  smallFont = new Font(Display.getCurrent(), "Tahoma", 6, SWT.NONE); //$NON-NLS-1$
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/FlatCCombo.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/FlatCCombo.java
deleted file mode 100644
index 116d515..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/FlatCCombo.java
+++ /dev/null
@@ -1,1490 +0,0 @@
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-/*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.accessibility.ACC;
-import org.eclipse.swt.accessibility.AccessibleAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlAdapter;
-import org.eclipse.swt.accessibility.AccessibleControlEvent;
-import org.eclipse.swt.accessibility.AccessibleEvent;
-import org.eclipse.swt.accessibility.AccessibleTextAdapter;
-import org.eclipse.swt.accessibility.AccessibleTextEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Layout;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.TypedListener;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-/**
- * The CCombo class represents a selectable user interface object
- * that combines a text field and a list and issues notification
- * when an item is selected from the list.
- * <p>
- * Note that although this class is a subclass of <code>Composite</code>,
- * it does not make sense to add children to it, or set a layout on it.
- * </p>
- * <dl>
- * <dt><b>Styles:</b>
- * <dd>BORDER, READ_ONLY, FLAT</dd>
- * <dt><b>Events:</b>
- * <dd>Selection</dd>
- * </dl>
- */
-public final class FlatCCombo extends Composite {
-
-  Text text;
-  List list;
-  int visibleItemCount = 5;
-  Shell popup;
-  Label arrow;
-  boolean hasFocus;
-  Listener listener, filter;
-  Color foreground, background;
-  Font font;
-  
-/**
- * Constructs a new instance of this class given its parent
- * and a style value describing its behavior and appearance.
- * <p>
- * The style value is either one of the style constants defined in
- * class <code>SWT</code> which is applicable to instances of this
- * class, or must be built by <em>bitwise OR</em>'ing together 
- * (that is, using the <code>int</code> "|" operator) two or more
- * of those <code>SWT</code> style constants. The class description
- * lists the style constants that are applicable to the class.
- * Style bits are also inherited from superclasses.
- * </p>
- *
- * @param parent a widget which will be the parent of the new instance (cannot be null)
- * @param style the style of widget to construct
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the parent is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
- * </ul>
- *
- * @see SWT#BORDER
- * @see SWT#READ_ONLY
- * @see SWT#FLAT
- * @see org.eclipse.swt.widgets.Widget#getStyle()
- */
-public FlatCCombo (Composite parent, int style) {
-  super (parent, style = checkStyle (style));
-  
-  int textStyle = SWT.SINGLE;
-  if ((style & SWT.READ_ONLY) != 0) textStyle |= SWT.READ_ONLY;
-  if ((style & SWT.FLAT) != 0) textStyle |= SWT.FLAT;
-  text = new Text (this, textStyle);
-  int arrowStyle = SWT.ARROW | SWT.DOWN;
-  if ((style & SWT.FLAT) != 0) arrowStyle |= SWT.FLAT;
-  arrow = new Label(this, SWT.FLAT);
-  arrow.setImage(XSDEditorPlugin.getXSDImage("icons/TriangleToolBar.gif")); //$NON-NLS-1$
-
-  listener = new Listener () {
-    public void handleEvent (Event event) {
-      if (popup == event.widget) {
-        popupEvent (event);
-        return;
-      }
-      if (text == event.widget) {
-        textEvent (event);
-        return;
-      }
-      if (list == event.widget) {
-        listEvent (event);
-        return;
-      }
-      if (arrow == event.widget) {
-        arrowEvent (event);
-        return;
-      }
-      if (FlatCCombo.this == event.widget) {
-        comboEvent (event);
-        return;
-      }
-      if (getShell () == event.widget) {
-        handleFocus (SWT.FocusOut);
-      }
-    }
-  };
-  filter = new Listener() {
-    public void handleEvent(Event event) {
-      Shell shell = ((Control)event.widget).getShell ();
-      if (shell == FlatCCombo.this.getShell ()) {
-        handleFocus (SWT.FocusOut);
-      }
-    }
-  };
-  
-  int [] comboEvents = {SWT.Dispose, SWT.Move, SWT.Resize};
-  for (int i=0; i<comboEvents.length; i++) this.addListener (comboEvents [i], listener);
-  
-  int [] textEvents = {SWT.KeyDown, SWT.KeyUp, SWT.MenuDetect, SWT.Modify, SWT.MouseDown, SWT.MouseUp, SWT.Traverse, SWT.FocusIn};
-  for (int i=0; i<textEvents.length; i++) text.addListener (textEvents [i], listener);
-  
-  int [] arrowEvents = {SWT.MouseDown, SWT.Selection, SWT.FocusIn};
-  for (int i=0; i<arrowEvents.length; i++) arrow.addListener (arrowEvents [i], listener);
-  
-  createPopup(null, -1);
-  initAccessible();
-}
-static int checkStyle (int style) {
-  int mask = SWT.BORDER | SWT.READ_ONLY | SWT.FLAT | SWT.LEFT_TO_RIGHT | SWT.RIGHT_TO_LEFT;
-  return style & mask;
-}
-/**
- * Adds the argument to the end of the receiver's list.
- *
- * @param string the new item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see #add(String,int)
- */
-public void add (String string) {
-  checkWidget();
-  if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  list.add (string);
-}
-/**
- * Adds the argument to the receiver's list at the given
- * zero-relative index.
- * <p>
- * Note: To add an item at the end of the list, use the
- * result of calling <code>getItemCount()</code> as the
- * index or use <code>add(String)</code>.
- * </p>
- *
- * @param string the new item
- * @param index the index for the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see #add(String)
- */
-public void add (String string, int index) {
-  checkWidget();
-  if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  list.add (string, index);
-}
-/**
- * Adds the listener to the collection of listeners who will
- * be notified when the receiver's text is modified, by sending
- * it one of the messages defined in the <code>ModifyListener</code>
- * interface.
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see ModifyListener
- * @see #removeModifyListener
- */
-public void addModifyListener (ModifyListener listener) {
-  checkWidget();
-  if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  TypedListener typedListener = new TypedListener (listener);
-  addListener (SWT.Modify, typedListener);
-}
-/**
- * Adds the listener to the collection of listeners who will
- * be notified when the receiver's selection changes, by sending
- * it one of the messages defined in the <code>SelectionListener</code>
- * interface.
- * <p>
- * <code>widgetSelected</code> is called when the combo's list selection changes.
- * <code>widgetDefaultSelected</code> is typically called when ENTER is pressed the combo's text area.
- * </p>
- *
- * @param listener the listener which should be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see SelectionListener
- * @see #removeSelectionListener
- * @see org.eclipse.swt.events.SelectionEvent
- */
-public void addSelectionListener(SelectionListener listener) {
-  checkWidget();
-  if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  TypedListener typedListener = new TypedListener (listener);
-  addListener (SWT.Selection,typedListener);
-  addListener (SWT.DefaultSelection,typedListener);
-}
-void arrowEvent (Event event) {
-  switch (event.type) {
-    case SWT.FocusIn: {
-      handleFocus (SWT.FocusIn);
-      break;
-    }
-    case SWT.Selection: {
-      dropDown (!isDropped ());
-      break;
-    }
-    case SWT.MouseDown: {
-      dropDown (!isDropped ());
-      break;
-    }
-  }
-}
-/**
- * Sets the selection in the receiver's text field to an empty
- * selection starting just before the first character. If the
- * text field is editable, this has the effect of placing the
- * i-beam at the start of the text.
- * <p>
- * Note: To clear the selected items in the receiver's list, 
- * use <code>deselectAll()</code>.
- * </p>
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see #deselectAll
- */
-public void clearSelection () {
-  checkWidget ();
-  text.clearSelection ();
-  list.deselectAll ();
-}
-void comboEvent (Event event) {
-  switch (event.type) {
-    case SWT.Dispose:
-      if (popup != null && !popup.isDisposed ()) {
-        list.removeListener (SWT.Dispose, listener);
-        popup.dispose ();
-      }
-      Shell shell = getShell ();
-      shell.removeListener (SWT.Deactivate, listener);
-      Display display = getDisplay ();
-      display.removeFilter (SWT.FocusIn, filter);
-      popup = null;  
-      text = null;  
-      list = null;  
-      arrow = null;
-      break;
-    case SWT.Move:
-      dropDown (false);
-      break;
-    case SWT.Resize:
-      internalLayout (false);
-      break;
-  }
-}
-
-public Point computeSize (int wHint, int hHint, boolean changed) {
-  checkWidget ();
-  int width = 0, height = 0;
-  String[] items = list.getItems ();
-  int textWidth = 0;
-  GC gc = new GC (text);
-  int spacer = gc.stringExtent (" ").x; //$NON-NLS-1$
-  for (int i = 0; i < items.length; i++) {
-    textWidth = Math.max (gc.stringExtent (items[i]).x, textWidth);
-  }
-  gc.dispose();
-  Point textSize = text.computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);
-  // Point arrowSize = arrow.computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);
-  Point arrowSize = new Point(16, 16);
-  Point listSize = list.computeSize (SWT.DEFAULT, SWT.DEFAULT, changed);
-  int borderWidth = getBorderWidth ();
-  
-  height = Math.max (textSize.y, arrowSize.y);
-  width = Math.max (textWidth + 2*spacer + arrowSize.x + 2*borderWidth, listSize.x);
-  if (wHint != SWT.DEFAULT) width = wHint;
-  if (hHint != SWT.DEFAULT) height = hHint;
-  return new Point (width + 2*borderWidth, height + 2*borderWidth);
-}
-void createPopup(String[] items, int selectionIndex) {    
-    // create shell and list
-    popup = new Shell (getShell (), SWT.NO_TRIM | SWT.ON_TOP);
-    int style = getStyle ();
-    int listStyle = SWT.SINGLE | SWT.V_SCROLL;
-    if ((style & SWT.FLAT) != 0) listStyle |= SWT.FLAT;
-    if ((style & SWT.RIGHT_TO_LEFT) != 0) listStyle |= SWT.RIGHT_TO_LEFT;
-    if ((style & SWT.LEFT_TO_RIGHT) != 0) listStyle |= SWT.LEFT_TO_RIGHT;
-    list = new List (popup, listStyle);
-    if (font != null) list.setFont (font);
-    if (foreground != null) list.setForeground (foreground);
-    if (background != null) list.setBackground (background);
-    
-    int [] popupEvents = {SWT.Close, SWT.Paint, SWT.Deactivate};
-    for (int i=0; i<popupEvents.length; i++) popup.addListener (popupEvents [i], listener);
-    int [] listEvents = {SWT.MouseUp, SWT.Selection, SWT.Traverse, SWT.KeyDown, SWT.KeyUp, SWT.FocusIn, SWT.Dispose};
-    for (int i=0; i<listEvents.length; i++) list.addListener (listEvents [i], listener);
-    
-    if (items != null) list.setItems (items);
-    if (selectionIndex != -1) list.setSelection (selectionIndex);
-}
-/**
- * Deselects the item at the given zero-relative index in the receiver's 
- * list.  If the item at the index was already deselected, it remains
- * deselected. Indices that are out of range are ignored.
- *
- * @param index the index of the item to deselect
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void deselect (int index) {
-  checkWidget ();
-  list.deselect (index);
-}
-/**
- * Deselects all selected items in the receiver's list.
- * <p>
- * Note: To clear the selection in the receiver's text field,
- * use <code>clearSelection()</code>.
- * </p>
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see #clearSelection
- */
-public void deselectAll () {
-  checkWidget ();
-  list.deselectAll ();
-}
-void dropDown (boolean drop) {
-  if (drop == isDropped ()) return;
-  if (!drop) {
-    popup.setVisible (false);
-    if (!isDisposed ()&& arrow.isFocusControl()) {
-      text.setFocus();
-    }
-    return;
-  }
-
-  if (getShell() != popup.getParent ()) {
-    String[] items = list.getItems ();
-    int selectionIndex = list.getSelectionIndex ();
-    list.removeListener (SWT.Dispose, listener);
-    popup.dispose();
-    popup = null;
-    list = null;
-    createPopup (items, selectionIndex);
-  }
-  
-  Point size = getSize ();
-  int itemCount = list.getItemCount ();
-  itemCount = (itemCount == 0) ? visibleItemCount : Math.min(visibleItemCount, itemCount);
-  int itemHeight = list.getItemHeight () * itemCount;
-  Point listSize = list.computeSize (SWT.DEFAULT, itemHeight, false);
-  list.setBounds (1, 1, Math.max (size.x - 2, listSize.x), listSize.y);
-  
-  int index = list.getSelectionIndex ();
-  if (index != -1) list.setTopIndex (index);
-  Display display = getDisplay ();
-  Rectangle listRect = list.getBounds ();
-  Rectangle parentRect = display.map (getParent (), null, getBounds ());
-  Point comboSize = getSize ();
-  Rectangle displayRect = getMonitor ().getClientArea ();
-  int width = Math.max (comboSize.x, listRect.width + 2);
-  int height = listRect.height + 2;
-  int x = parentRect.x;
-  int y = parentRect.y + comboSize.y;
-  if (y + height > displayRect.y + displayRect.height) y = parentRect.y - height;
-  if (x + width > displayRect.x + displayRect.width) x = displayRect.x + displayRect.width - listRect.width;
-  popup.setBounds (x, y, width, height);
-  popup.setVisible (true);
-  list.setFocus ();
-}
-/*
- * Return the lowercase of the first non-'&' character following
- * an '&' character in the given string. If there are no '&'
- * characters in the given string, return '\0'.
- */
-char _findMnemonic (String string) {
-  if (string == null) return '\0';
-  int index = 0;
-  int length = string.length ();
-  do {
-    while (index < length && string.charAt (index) != '&') index++;
-    if (++index >= length) return '\0';
-    if (string.charAt (index) != '&') return Character.toLowerCase (string.charAt (index));
-    index++;
-  } while (index < length);
-  return '\0';
-}
-/* 
- * Return the Label immediately preceding the receiver in the z-order, 
- * or null if none. 
- */
-Label getAssociatedLabel () {
-  Control[] siblings = getParent ().getChildren ();
-  for (int i = 0; i < siblings.length; i++) {
-    if (siblings [i] == this) {
-      if (i > 0 && siblings [i-1] instanceof Label) {
-        return (Label) siblings [i-1];
-      }
-    }
-  }
-  return null;
-}
-public Control [] getChildren () {
-  return super.getChildren();
-}
-/**
- * Gets the editable state.
- *
- * @return whether or not the receiver is editable
- * 
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @since 3.0
- */
-public boolean getEditable () {
-  checkWidget ();
-  return text.getEditable();
-}
-/**
- * Returns the item at the given, zero-relative index in the
- * receiver's list. Throws an exception if the index is out
- * of range.
- *
- * @param index the index of the item to return
- * @return the item at the given index
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public String getItem (int index) {
-  checkWidget();
-  return list.getItem (index);
-}
-/**
- * Returns the number of items contained in the receiver's list.
- *
- * @return the number of items
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int getItemCount () {
-  checkWidget ();
-  return list.getItemCount ();
-}
-/**
- * Returns the height of the area which would be used to
- * display <em>one</em> of the items in the receiver's list.
- *
- * @return the height of one item
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int getItemHeight () {
-  checkWidget ();
-  return list.getItemHeight ();
-}
-/**
- * Returns an array of <code>String</code>s which are the items
- * in the receiver's list. 
- * <p>
- * Note: This is not the actual structure used by the receiver
- * to maintain its list of items, so modifying the array will
- * not affect the receiver. 
- * </p>
- *
- * @return the items in the receiver's list
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public String [] getItems () {
-  checkWidget ();
-  return list.getItems ();
-}
-public Menu getMenu() {
-  return text.getMenu();
-}
-/**
- * Returns a <code>Point</code> whose x coordinate is the start
- * of the selection in the receiver's text field, and whose y
- * coordinate is the end of the selection. The returned values
- * are zero-relative. An "empty" selection as indicated by
- * the the x and y coordinates having the same value.
- *
- * @return a point representing the selection start and end
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public Point getSelection () {
-  checkWidget ();
-  return text.getSelection ();
-}
-/**
- * Returns the zero-relative index of the item which is currently
- * selected in the receiver's list, or -1 if no item is selected.
- *
- * @return the index of the selected item
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int getSelectionIndex () {
-  checkWidget ();
-  return list.getSelectionIndex ();
-}
-public int getStyle () {
-  int style = super.getStyle ();
-  style &= ~SWT.READ_ONLY;
-  if (!text.getEditable()) style |= SWT.READ_ONLY; 
-  return style;
-}
-/**
- * Returns a string containing a copy of the contents of the
- * receiver's text field.
- *
- * @return the receiver's text
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public String getText () {
-  checkWidget ();
-  return text.getText ();
-}
-/**
- * Returns the height of the receivers's text field.
- *
- * @return the text height
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int getTextHeight () {
-  checkWidget ();
-  return text.getLineHeight ();
-}
-/**
- * Returns the maximum number of characters that the receiver's
- * text field is capable of holding. If this has not been changed
- * by <code>setTextLimit()</code>, it will be the constant
- * <code>Combo.LIMIT</code>.
- * 
- * @return the text limit
- * 
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int getTextLimit () {
-  checkWidget ();
-  return text.getTextLimit ();
-}
-/**
- * Gets the number of items that are visible in the drop
- * down portion of the receiver's list.
- *
- * @return the number of items that are visible
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @since 3.0
- */
-public int getVisibleItemCount () {
-  checkWidget ();
-  return visibleItemCount;
-}
-void handleFocus (int type) {
-  if (isDisposed ()) return;
-  switch (type) {
-    case SWT.FocusIn: {
-      if (hasFocus) return;
-      if (getEditable ()) text.selectAll ();
-      hasFocus = true;
-      Shell shell = getShell ();
-      shell.removeListener (SWT.Deactivate, listener);
-      shell.addListener (SWT.Deactivate, listener);
-      Display display = getDisplay ();
-      display.removeFilter (SWT.FocusIn, filter);
-      display.addFilter (SWT.FocusIn, filter);
-      Event e = new Event ();
-      notifyListeners (SWT.FocusIn, e);
-      break;
-    }
-    case SWT.FocusOut: {
-      if (!hasFocus) return;
-      Control focusControl = getDisplay ().getFocusControl ();
-      if (focusControl == arrow || focusControl == list || focusControl == text) return;
-      hasFocus = false;
-      Shell shell = getShell ();
-      shell.removeListener(SWT.Deactivate, listener);
-      Display display = getDisplay ();
-      display.removeFilter (SWT.FocusIn, filter);
-      Event e = new Event ();
-      notifyListeners (SWT.FocusOut, e);
-      break;
-    }
-  }
-}
-/**
- * Searches the receiver's list starting at the first item
- * (index 0) until an item is found that is equal to the 
- * argument, and returns the index of that item. If no item
- * is found, returns -1.
- *
- * @param string the search item
- * @return the index of the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int indexOf (String string) {
-  checkWidget ();
-  if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  return list.indexOf (string);
-}
-/**
- * Searches the receiver's list starting at the given, 
- * zero-relative index until an item is found that is equal
- * to the argument, and returns the index of that item. If
- * no item is found or the starting index is out of range,
- * returns -1.
- *
- * @param string the search item
- * @param start the zero-relative index at which to begin the search
- * @return the index of the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public int indexOf (String string, int start) {
-  checkWidget ();
-  if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  return list.indexOf (string, start);
-}
-
-void initAccessible() {
-  AccessibleAdapter accessibleAdapter = new AccessibleAdapter () {
-    public void getName (AccessibleEvent e) {
-      String name = null;
-      Label label = getAssociatedLabel ();
-      if (label != null) {
-        name = stripMnemonic (label.getText());
-      }
-      e.result = name;
-    }
-    public void getKeyboardShortcut(AccessibleEvent e) {
-      String shortcut = null;
-      Label label = getAssociatedLabel ();
-      if (label != null) {
-        String text = label.getText ();
-        if (text != null) {
-          char mnemonic = _findMnemonic (text);
-          if (mnemonic != '\0') {
-            shortcut = "Alt+"+mnemonic; //$NON-NLS-1$
-          }
-        }
-      }
-      e.result = shortcut;
-    }
-    public void getHelp (AccessibleEvent e) {
-      e.result = getToolTipText ();
-    }
-  };
-  getAccessible ().addAccessibleListener (accessibleAdapter);
-  text.getAccessible ().addAccessibleListener (accessibleAdapter);
-  list.getAccessible ().addAccessibleListener (accessibleAdapter);
-  
-  arrow.getAccessible ().addAccessibleListener (new AccessibleAdapter() {
-    public void getName (AccessibleEvent e) {
-      e.result = isDropped () ? SWT.getMessage ("SWT_Close") : SWT.getMessage ("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-    public void getKeyboardShortcut (AccessibleEvent e) {
-      e.result = "Alt+Down Arrow"; //$NON-NLS-1$
-    }
-    public void getHelp (AccessibleEvent e) {
-      e.result = getToolTipText ();
-    }
-  });
-
-  getAccessible().addAccessibleTextListener (new AccessibleTextAdapter() {
-    public void getCaretOffset (AccessibleTextEvent e) {
-      e.offset = text.getCaretPosition ();
-    }
-    public void getSelectionRange(AccessibleTextEvent e) {
-      Point sel = text.getSelection();
-      e.offset = sel.x;
-      e.length = sel.y - sel.x;
-    }
-  });
-  
-  getAccessible().addAccessibleControlListener (new AccessibleControlAdapter() {
-    public void getChildAtPoint (AccessibleControlEvent e) {
-      Point testPoint = toControl (e.x, e.y);
-      if (getBounds ().contains (testPoint)) {
-        e.childID = ACC.CHILDID_SELF;
-      }
-    }
-    
-    public void getLocation (AccessibleControlEvent e) {
-      Rectangle location = getBounds ();
-      Point pt = toDisplay (location.x, location.y);
-      e.x = pt.x;
-      e.y = pt.y;
-      e.width = location.width;
-      e.height = location.height;
-    }
-    
-    public void getChildCount (AccessibleControlEvent e) {
-      e.detail = 0;
-    }
-    
-    public void getRole (AccessibleControlEvent e) {
-      e.detail = ACC.ROLE_COMBOBOX;
-    }
-    
-    public void getState (AccessibleControlEvent e) {
-      e.detail = ACC.STATE_NORMAL;
-    }
-
-    public void getValue (AccessibleControlEvent e) {
-      e.result = getText ();
-    }
-  });
-
-  text.getAccessible ().addAccessibleControlListener (new AccessibleControlAdapter () {
-    public void getRole (AccessibleControlEvent e) {
-      e.detail = text.getEditable () ? ACC.ROLE_TEXT : ACC.ROLE_LABEL;
-    }
-  });
-
-  arrow.getAccessible ().addAccessibleControlListener (new AccessibleControlAdapter() {
-    public void getDefaultAction (AccessibleControlEvent e) {
-      e.result = isDropped () ? SWT.getMessage ("SWT_Close") : SWT.getMessage ("SWT_Open"); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  });
-}
-boolean isDropped () {
-  return popup.getVisible ();
-}
-public boolean isFocusControl () {
-  checkWidget();
-  if (text.isFocusControl () || arrow.isFocusControl () || list.isFocusControl () || popup.isFocusControl ()) {
-    return true;
-  } 
-  return super.isFocusControl ();
-}
-void internalLayout (boolean changed) {
-  if (isDropped ()) dropDown (false);
-  Rectangle rect = getClientArea ();
-  int width = rect.width;
-  int height = rect.height;
-  // Point arrowSize = arrow.computeSize (SWT.DEFAULT, height, changed);
-  // text.setBounds (0, 0, width - arrowSize.x, height);
-  text.setBounds (0, 0, width - 16, height);
-  // arrow.setBounds (width - arrowSize.x, 0, arrowSize.x, arrowSize.y);
-  arrow.setBounds (width - 16, 0, 16, 16);
-}
-void listEvent (Event event) {
-  switch (event.type) {
-    case SWT.Dispose:
-      if (getShell () != popup.getParent ()) {
-        String[] items = list.getItems ();
-        int selectionIndex = list.getSelectionIndex ();
-        popup = null;
-        list = null;
-        createPopup (items, selectionIndex);
-      }
-      break;
-    case SWT.FocusIn: {
-      handleFocus (SWT.FocusIn);
-      break;
-    }
-    case SWT.MouseUp: {
-      if (event.button != 1) return;
-      dropDown (false);
-      break;
-    }
-    case SWT.Selection: {
-      int index = list.getSelectionIndex ();
-      if (index == -1) return;
-      text.setText (list.getItem (index));
-      text.selectAll ();
-      list.setSelection (index);
-      Event e = new Event ();
-      e.time = event.time;
-      e.stateMask = event.stateMask;
-      e.doit = event.doit;
-      notifyListeners (SWT.Selection, e);
-      event.doit = e.doit;
-      break;
-    }
-    case SWT.Traverse: {
-      switch (event.detail) {
-        case SWT.TRAVERSE_RETURN:
-        case SWT.TRAVERSE_ESCAPE:
-        case SWT.TRAVERSE_ARROW_PREVIOUS:
-        case SWT.TRAVERSE_ARROW_NEXT:
-          event.doit = false;
-          break;
-      }
-      Event e = new Event ();
-      e.time = event.time;
-      e.detail = event.detail;
-      e.doit = event.doit;
-      e.character = event.character;
-      e.keyCode = event.keyCode;
-      notifyListeners (SWT.Traverse, e);
-      event.doit = e.doit;
-      event.detail = e.detail;
-      break;
-    }
-    case SWT.KeyUp: {   
-      Event e = new Event ();
-      e.time = event.time;
-      e.character = event.character;
-      e.keyCode = event.keyCode;
-      e.stateMask = event.stateMask;
-      notifyListeners (SWT.KeyUp, e);
-      break;
-    }
-    case SWT.KeyDown: {
-      if (event.character == SWT.ESC) { 
-        // Escape key cancels popup list
-        dropDown (false);
-      }
-      if ((event.stateMask & SWT.ALT) != 0 && (event.keyCode == SWT.ARROW_UP || event.keyCode == SWT.ARROW_DOWN)) {
-        dropDown (false);
-      }
-      if (event.character == SWT.CR) {
-        // Enter causes default selection
-        dropDown (false);
-        Event e = new Event ();
-        e.time = event.time;
-        e.stateMask = event.stateMask;
-        notifyListeners (SWT.DefaultSelection, e);
-      }
-      // At this point the widget may have been disposed.
-      // If so, do not continue.
-      if (isDisposed ()) break;
-      Event e = new Event();
-      e.time = event.time;
-      e.character = event.character;
-      e.keyCode = event.keyCode;
-      e.stateMask = event.stateMask;
-      notifyListeners(SWT.KeyDown, e);
-      break;
-      
-    }
-  }
-}
-
-void popupEvent(Event event) {
-  switch (event.type) {
-    case SWT.Paint:
-      // draw black rectangle around list
-      Rectangle listRect = list.getBounds();
-      Color black = getDisplay().getSystemColor(SWT.COLOR_BLACK);
-      event.gc.setForeground(black);
-      event.gc.drawRectangle(0, 0, listRect.width + 1, listRect.height + 1);
-      break;
-    case SWT.Close:
-      event.doit = false;
-      dropDown (false);
-      break;
-    case SWT.Deactivate:
-      dropDown (false);
-      break;
-  }
-}
-public void redraw () {
-  super.redraw();
-  text.redraw();
-  arrow.redraw();
-  if (popup.isVisible()) list.redraw();
-}
-public void redraw (int x, int y, int width, int height, boolean all) {
-  super.redraw(x, y, width, height, true);
-}
-
-/**
- * Removes the item from the receiver's list at the given
- * zero-relative index.
- *
- * @param index the index for the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void remove (int index) {
-  checkWidget();
-  list.remove (index);
-}
-/**
- * Removes the items from the receiver's list which are
- * between the given zero-relative start and end 
- * indices (inclusive).
- *
- * @param start the start of the range
- * @param end the end of the range
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_RANGE - if either the start or end are not between 0 and the number of elements in the list minus 1 (inclusive)</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void remove (int start, int end) {
-  checkWidget();
-  list.remove (start, end);
-}
-/**
- * Searches the receiver's list starting at the first item
- * until an item is found that is equal to the argument, 
- * and removes that item from the list.
- *
- * @param string the item to remove
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void remove (String string) {
-  checkWidget();
-  if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  list.remove (string);
-}
-/**
- * Removes all of the items from the receiver's list and clear the
- * contents of receiver's text field.
- * <p>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void removeAll () {
-  checkWidget();
-  text.setText (""); //$NON-NLS-1$
-  list.removeAll ();
-}
-/**
- * Removes the listener from the collection of listeners who will
- * be notified when the receiver's text is modified.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see ModifyListener
- * @see #addModifyListener
- */
-public void removeModifyListener (ModifyListener listener) {
-  checkWidget();
-  if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  removeListener(SWT.Modify, listener); 
-}
-/**
- * Removes the listener from the collection of listeners who will
- * be notified when the receiver's selection changes.
- *
- * @param listener the listener which should no longer be notified
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the listener is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- *
- * @see SelectionListener
- * @see #addSelectionListener
- */
-public void removeSelectionListener (SelectionListener listener) {
-  checkWidget();
-  if (listener == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  removeListener(SWT.Selection, listener);
-  removeListener(SWT.DefaultSelection,listener);  
-}
-/**
- * Selects the item at the given zero-relative index in the receiver's 
- * list.  If the item at the index was already selected, it remains
- * selected. Indices that are out of range are ignored.
- *
- * @param index the index of the item to select
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void select (int index) {
-  checkWidget();
-  if (index == -1) {
-    list.deselectAll ();
-    text.setText (""); //$NON-NLS-1$
-    return;
-  }
-  if (0 <= index && index < list.getItemCount()) {
-    if (index != getSelectionIndex()) {
-      text.setText (list.getItem (index));
-      text.selectAll ();
-      list.select (index);
-      list.showSelection ();
-    }
-  }
-}
-public void setBackground (Color color) {
-  super.setBackground(color);
-  background = color;
-  if (text != null) text.setBackground(color);
-  if (list != null) list.setBackground(color);
-  if (arrow != null) arrow.setBackground(color);
-}
-/**
- * Sets the editable state.
- *
- * @param editable the new editable state
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void setEditable (boolean editable) {
-  checkWidget ();
-  text.setEditable(editable);
-}
-public void setEnabled (boolean enabled) {
-  super.setEnabled(enabled);
-  if (popup != null) popup.setVisible (false);
-  if (text != null) text.setEnabled(enabled);
-  if (arrow != null) arrow.setEnabled(enabled);
-}
-public boolean setFocus () {
-  checkWidget();
-  return text.setFocus ();
-}
-public void setFont (Font font) {
-  super.setFont (font);
-  this.font = font;
-  text.setFont (font);
-  list.setFont (font);
-  internalLayout (true);
-}
-public void setForeground (Color color) {
-  super.setForeground(color);
-  foreground = color;
-  if (text != null) text.setForeground(color);
-  if (list != null) list.setForeground(color);
-  if (arrow != null) arrow.setForeground(color);
-}
-/**
- * Sets the text of the item in the receiver's list at the given
- * zero-relative index to the string argument. This is equivalent
- * to <code>remove</code>'ing the old item at the index, and then
- * <code>add</code>'ing the new item at that index.
- *
- * @param index the index for the item
- * @param string the new text for the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setItem (int index, String string) {
-  checkWidget();
-  list.setItem (index, string);
-}
-/**
- * Sets the receiver's list to be the given array of items.
- *
- * @param items the array of items
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the items array is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if an item in the items array is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setItems (String [] items) {
-  checkWidget ();
-  list.setItems (items);
-  if (!text.getEditable ()) text.setText (""); //$NON-NLS-1$
-}
-/**
- * Sets the layout which is associated with the receiver to be
- * the argument which may be null.
- * <p>
- * Note: No Layout can be set on this Control because it already
- * manages the size and position of its children.
- * </p>
- *
- * @param layout the receiver's new layout or null
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setLayout (Layout layout) {
-  checkWidget ();
-  return;
-}
-public void setMenu(Menu menu) {
-  text.setMenu(menu);
-}
-/**
- * Sets the selection in the receiver's text field to the
- * range specified by the argument whose x coordinate is the
- * start of the selection and whose y coordinate is the end
- * of the selection. 
- *
- * @param selection a point representing the new selection start and end
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the point is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setSelection (Point selection) {
-  checkWidget();
-  if (selection == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  text.setSelection (selection.x, selection.y);
-}
-
-/**
- * Sets the contents of the receiver's text field to the
- * given string.
- * <p>
- * Note: The text field in a <code>Combo</code> is typically
- * only capable of displaying a single line of text. Thus,
- * setting the text to a string containing line breaks or
- * other special characters will probably cause it to 
- * display incorrectly.
- * </p>
- *
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setText (String string) {
-  checkWidget();
-  if (string == null) SWT.error (SWT.ERROR_NULL_ARGUMENT);
-  int index = list.indexOf (string);
-  if (index == -1) {
-    list.deselectAll ();
-    text.setText (string);
-    return;
-  }
-  text.setText (string);
-  text.selectAll ();
-  list.setSelection (index);
-  list.showSelection ();
-}
-/**
- * Sets the maximum number of characters that the receiver's
- * text field is capable of holding to be the argument.
- *
- * @param limit new text limit
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_CANNOT_BE_ZERO - if the limit is zero</li>
- * </ul>
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- */
-public void setTextLimit (int limit) {
-  checkWidget();
-  text.setTextLimit (limit);
-}
-
-public void setToolTipText (String string) {
-  checkWidget();
-  super.setToolTipText(string);
-  arrow.setToolTipText (string);
-  text.setToolTipText (string);   
-}
-
-public void setVisible (boolean visible) {
-  super.setVisible(visible);
-  if (!visible) popup.setVisible(false);
-}
-/**
- * Sets the number of items that are visible in the drop
- * down portion of the receiver's list.
- *
- * @param count the new number of items to be visible
- *
- * @exception org.eclipse.swt.SWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * 
- * @since 3.0
- */
-public void setVisibleItemCount (int count) {
-  checkWidget ();
-  if (count < 0) return;
-  visibleItemCount = count;
-}
-String stripMnemonic (String string) {
-  int index = 0;
-  int length = string.length ();
-  do {
-    while ((index < length) && (string.charAt (index) != '&')) index++;
-    if (++index >= length) return string;
-    if (string.charAt (index) != '&') {
-      return string.substring(0, index-1) + string.substring(index, length);
-    }
-    index++;
-  } while (index < length);
-  return string;
-}
-void textEvent (Event event) {
-  switch (event.type) {
-    case SWT.FocusIn: {
-      handleFocus (SWT.FocusIn);
-      break;
-    }
-    case SWT.KeyDown: {
-      if (event.character == SWT.CR) {
-        dropDown (false);
-        Event e = new Event ();
-        e.time = event.time;
-        e.stateMask = event.stateMask;
-        notifyListeners (SWT.DefaultSelection, e);
-      }
-      //At this point the widget may have been disposed.
-      // If so, do not continue.
-      if (isDisposed ()) break;
-      
-      if (event.keyCode == SWT.ARROW_UP || event.keyCode == SWT.ARROW_DOWN) {
-        event.doit = false;
-        if ((event.stateMask & SWT.ALT) != 0) {
-          boolean dropped = isDropped ();
-          text.selectAll ();
-          if (!dropped) setFocus ();
-          dropDown (!dropped);
-          break;
-        }
-
-        int oldIndex = getSelectionIndex ();
-        if (event.keyCode == SWT.ARROW_UP) {
-          select (Math.max (oldIndex - 1, 0));
-        } else {
-          select (Math.min (oldIndex + 1, getItemCount () - 1));
-        }
-        if (oldIndex != getSelectionIndex ()) {
-          Event e = new Event();
-          e.time = event.time;
-          e.stateMask = event.stateMask;
-          notifyListeners (SWT.Selection, e);
-        }
-        //At this point the widget may have been disposed.
-        // If so, do not continue.
-        if (isDisposed ()) break;
-      }
-      
-      // Further work : Need to add support for incremental search in 
-      // pop up list as characters typed in text widget
-            
-      Event e = new Event ();
-      e.time = event.time;
-      e.character = event.character;
-      e.keyCode = event.keyCode;
-      e.stateMask = event.stateMask;
-      notifyListeners (SWT.KeyDown, e);
-      break;
-    }
-    case SWT.KeyUp: {
-      Event e = new Event ();
-      e.time = event.time;
-      e.character = event.character;
-      e.keyCode = event.keyCode;
-      e.stateMask = event.stateMask;
-      notifyListeners (SWT.KeyUp, e);
-      break;
-    }
-    case SWT.MenuDetect: {
-      Event e = new Event ();
-      e.time = event.time;
-      notifyListeners (SWT.MenuDetect, e);
-      break;
-    }
-    case SWT.Modify: {
-      list.deselectAll ();
-      Event e = new Event ();
-      e.time = event.time;
-      notifyListeners (SWT.Modify, e);
-      break;
-    }
-    case SWT.MouseDown: {
-      if (event.button != 1) return;
-      if (text.getEditable ()) return;
-      boolean dropped = isDropped ();
-      text.selectAll ();
-      if (!dropped) setFocus ();
-      dropDown (!dropped);
-      break;
-    }
-    case SWT.MouseUp: {
-      if (event.button != 1) return;
-      if (text.getEditable ()) return;
-      text.selectAll ();
-      break;
-    }
-    case SWT.Traverse: {    
-      switch (event.detail) {
-        case SWT.TRAVERSE_RETURN:
-        case SWT.TRAVERSE_ARROW_PREVIOUS:
-        case SWT.TRAVERSE_ARROW_NEXT:
-          // The enter causes default selection and
-          // the arrow keys are used to manipulate the list contents so
-          // do not use them for traversal.
-          event.doit = false;
-          break;
-      }
-      
-      Event e = new Event ();
-      e.time = event.time;
-      e.detail = event.detail;
-      e.doit = event.doit;
-      e.character = event.character;
-      e.keyCode = event.keyCode;
-      notifyListeners (SWT.Traverse, e);
-      event.doit = e.doit;
-      event.detail = e.detail;
-      break;
-    }
-  }
-}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/IAnnotationProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/IAnnotationProvider.java
deleted file mode 100644
index 226d435..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/IAnnotationProvider.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-public interface IAnnotationProvider
-{
-  String getNameAnnotationString();
-  String getNameAnnotationToolTipString();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/IKeyboardDrag.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/IKeyboardDrag.java
deleted file mode 100644
index fe06920..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/IKeyboardDrag.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-import org.eclipse.gef.GraphicalEditPart;
-
-public interface IKeyboardDrag {
-
-	public void performKeyboardDrag (GraphicalEditPart source, int direction);
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/ImageOverlayDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/ImageOverlayDescriptor.java
deleted file mode 100644
index 0f2a674..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/ImageOverlayDescriptor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design;
-
-import org.eclipse.jface.resource.CompositeImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.ImageData;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class ImageOverlayDescriptor extends CompositeImageDescriptor
-{
-  protected Image baseImage;
-  protected Image extensionOverlay, disabledExtensionOverlay;
-  protected Point imageSize;
-  protected boolean isReadOnly;
-  
-  public ImageOverlayDescriptor(Image baseImage, boolean isReadOnly)
-  {
-    super();
-    this.baseImage = baseImage;
-    this.isReadOnly = isReadOnly;
-    imageSize = new Point(baseImage.getBounds().width, baseImage.getBounds().height);
-    extensionOverlay = XSDEditorPlugin.getPlugin().getIcon("ovr16/extnsn_ovr.gif");  //$NON-NLS-1$ 
-    disabledExtensionOverlay = XSDEditorPlugin.getPlugin().getIcon("ovr16/extnsndis_ovr.gif");  //$NON-NLS-1$
-  }
-
-  public Image getImage()
-  {
-    return createImage();
-  }
-  
-  protected void drawCompositeImage(int width, int height)
-  {
-    drawImage(baseImage.getImageData(), 0, 0);
-    ImageData extensionImageData;
-    if (isReadOnly)
-    {
-      extensionImageData = disabledExtensionOverlay.getImageData();
-    }
-    else
-    {
-      extensionImageData = extensionOverlay.getImageData();
-    }
-    drawImage (extensionImageData, imageSize.x - extensionImageData.width, 0);  // Top Right corner
-  }
-
-  protected Point getSize()
-  {
-    return imageSize;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ADTComboBoxCellEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ADTComboBoxCellEditor.java
deleted file mode 100644
index ec6683f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ADTComboBoxCellEditor.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import java.text.MessageFormat;
-
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.FocusAdapter;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TypedListener;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-
-/*
- * This wraps the ComboBoxCellEditor.
- * We need to apply and deactivate the combo on a single click (not on a double click like
- * the ComboBoxCellEditor).
- */
-public class ADTComboBoxCellEditor extends ComboBoxCellEditor
-{
-  private static final int adtDefaultStyle = SWT.NONE;
-
-  /**
-   * Used to determine if the value should be applied to the cell.
-   */
-  private boolean continueApply;
-  private boolean isTraversing = false;
-  private Object selectedValue;
-  private ComponentReferenceEditManager componentReferenceEditManager;
-  
-  // This prevents the cell editor from being deactivated while handling the New or Browse selection.
-  private boolean isHandlingSelection = false;
-
-  /**
-   * Creates a new cell editor with a combo containing the given list of choices
-   * and parented under the given control. The cell editor value is the
-   * zero-based index of the selected item. Initially, the cell editor has no
-   * cell validator and the first item in the list is selected.
-   * 
-   * @param parent
-   *          the parent control
-   * @param items
-   *          the list of strings for the combo box
-   */
-  public ADTComboBoxCellEditor(Composite parent, String[] items, ComponentReferenceEditManager editManager)
-  {
-    super(parent, items, adtDefaultStyle | SWT.READ_ONLY);
-    setItems(items);
-    componentReferenceEditManager = editManager;
-  }
-
-  private void removeListeners(CCombo comboBox, int event)
-  {
-    Listener [] listeners = comboBox.getListeners(event);
-    int length = listeners.length;
-    for (int i = 0; i < length; i++)
-    {
-      Listener l = listeners[i];
-      if (l instanceof TypedListener)
-      {
-        TypedListener typedListener = (TypedListener)l;
-        String className = typedListener.getEventListener().getClass().getCanonicalName();
-        // It's possible that there are other typed listeners added to the CCombo.
-        // Currently there are none, but as an extra check, I want to ensure 
-        // I'm removing the ones added from the inherited class.
-        // I've tested this and I know it removes the following:
-        // org.eclipse.jface.viewers.ComboBoxCellEditor$2
-        // org.eclipse.jface.viewers.ComboBoxCellEditor$4
-        // which are indeed the ones I'm customizing
-        if (className != null && className.contains("org.eclipse.jface.viewers.ComboBoxCellEditor"))
-        {
-          comboBox.removeListener(event, l);
-        }
-      }
-    }
-  }
-  
-  /*
-   * (non-Javadoc) Method declared on CellEditor.
-   */
-  protected Control createControl(Composite parent)
-  {
-    CCombo comboBox = (CCombo)super.createControl(parent);
-
-    comboBox.setFont(parent.getFont());
-
-    // Need to remove the listeners added from ComboBoxCellEditor
-    removeListeners(comboBox, SWT.Selection);
-    removeListeners(comboBox, SWT.DefaultSelection);
-    removeListeners(comboBox, SWT.FocusIn);
-    removeListeners(comboBox, SWT.FocusOut);
-    
-    // Now add our custom listeners
-    comboBox.addSelectionListener(new SelectionAdapter()
-    {
-      public void widgetDefaultSelected(SelectionEvent event)
-      {
-        // Want the same behaviour since hitting return on Browse or New should launch the dialogs,
-        // and not immediately apply the value
-//      applyEditorValueAndDeactivate();
-        widgetSelected(event);
-      }
-
-      public void widgetSelected(SelectionEvent event)
-      {
-        continueApply = true;
-        CCombo comboBox = getCCombo();
-        isHandlingSelection = true;
-        Object newValue = null;
-
-        try
-        {
-          int selection = comboBox.getSelectionIndex();
-          if (isTraversing)
-          {
-            isTraversing = false;
-            return;
-          }
-
-          String[] items = getItems();
-          String stringSelection = items[selection];
-
-          if (stringSelection.equals(Messages._UI_ACTION_BROWSE))
-          {
-            continueApply = true;
-            newValue = invokeDialog(componentReferenceEditManager.getBrowseDialog());
-          }
-          else if (stringSelection.equals(Messages._UI_ACTION_NEW))
-          {
-            continueApply = true;
-            newValue = invokeDialog(componentReferenceEditManager.getNewDialog());
-          }
-        }
-        finally
-        {
-          isHandlingSelection = false;
-        }
-
-        if (continueApply)
-        {
-          if (newValue == null)
-          {
-            int index = comboBox.getSelectionIndex();
-            if (index != -1)
-            {
-              selectedValue = comboBox.getItem(index);
-            }
-          }
-          else
-          {
-            selectedValue = newValue;
-          }
-
-          applyEditorValueAndDeactivate();
-          focusLost();
-        }
-      }
-    });
-
-    comboBox.addTraverseListener(new TraverseListener()
-    {
-      public void keyTraversed(TraverseEvent e)
-      {
-        if (e.detail == SWT.TRAVERSE_ARROW_NEXT || e.detail == SWT.TRAVERSE_ARROW_PREVIOUS)
-        {
-          isTraversing = true;
-        }
-      }
-    });
-
-    comboBox.addFocusListener(new FocusAdapter()
-    {
-      public void focusLost(FocusEvent e)
-      {
-        if (!isHandlingSelection)
-          ADTComboBoxCellEditor.this.focusLost();
-      }
-    });
-    return comboBox;
-  }
-
-  private Object invokeDialog(IComponentDialog dialog)
-  {
-    Object newValue = null;
-
-    if (dialog == null)
-    {
-      return null;
-    }
-
-    //dialog.setInitialComponent(setObject);
-    if (dialog.createAndOpen() == Window.OK)
-    {
-      newValue = dialog.getSelectedComponent();
-    }
-    else
-    {
-      continueApply = false;
-      focusLost();
-    }
-
-    return newValue;
-  }
-
-  public Object getSelectedValue()
-  {
-    return selectedValue;
-  }
-
-  protected CCombo getCCombo()
-  {
-    return (CCombo)getControl();
-  }
-  
-///////// ComboBox cell editor  
-
-  void applyEditorValueAndDeactivate()
-  {
-    // must set the selection before getting value
-    CCombo comboBox = getCCombo();
-    String[] items = getItems();
-
-    int selection = comboBox.getSelectionIndex();
-    Object newValue = doGetValue();
-    markDirty();
-    boolean isValid = isCorrect(newValue);
-    setValueValid(isValid);
-
-    if (!isValid)
-    {
-      // Only format if the 'index' is valid
-      if (items.length > 0 && selection >= 0 && selection < items.length)
-      {
-        // try to insert the current value into the error message.
-        setErrorMessage(MessageFormat.format(getErrorMessage(), new Object[] { items[selection] }));
-      }
-      else
-      {
-        // Since we don't have a valid index, assume we're using an
-        // 'edit'
-        // combo so format using its text value
-        setErrorMessage(MessageFormat.format(getErrorMessage(), new Object[] { comboBox.getText() }));
-      }
-    }
-
-    fireApplyEditorValue();
-    deactivate();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/AttributeReferenceDirectEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/AttributeReferenceDirectEditManager.java
deleted file mode 100644
index 2b5e272..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/AttributeReferenceDirectEditManager.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDAttributeReferenceEditManager;
-
-public class AttributeReferenceDirectEditManager extends ReferenceDirectEditManager
-{
-  public AttributeReferenceDirectEditManager(IField parameter, AbstractGraphicalEditPart source, Label label)
-  {
-    super(parameter, source, label);
-  }
-
-  protected ComponentReferenceEditManager getComponentReferenceEditManager()
-  {
-    ComponentReferenceEditManager result = null;
-    IEditorPart editor = getActiveEditor();
-    if (editor != null)
-    {
-      result = (ComponentReferenceEditManager)editor.getAdapter(XSDAttributeReferenceEditManager.class);
-    }  
-    return result;
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ComboBoxCellEditorManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ComboBoxCellEditorManager.java
deleted file mode 100644
index c840f21..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ComboBoxCellEditorManager.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ComboBoxCellEditor;
-import org.eclipse.jface.viewers.ICellEditorListener;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-
-public abstract class ComboBoxCellEditorManager extends DirectEditManager// implements
-                                                                          // DirectEditPolicyDelegate
-{
-  protected Label label;
-
-  public ComboBoxCellEditorManager(GraphicalEditPart source, Label label)
-  {
-    super(source, ComboBoxCellEditor.class, new InternalCellEditorLocator(label));
-    this.label = label;
-  }
-
-  protected void initCellEditor()
-  {
-    String initialLabelText = label.getText();
-
-    CCombo combo = (CCombo) getCellEditor().getControl();
-    combo.setFont(label.getFont());
-    combo.setForeground(label.getForegroundColor());
-    combo.setBackground(label.getBackgroundColor());
-    combo.setVisibleItemCount(20);
-
-    /*
-     * combo.addKeyListener(new KeyAdapter() { // hook key pressed - see PR
-     * 14201 public void keyPressed(KeyEvent keyEvent) { if (keyEvent.character ==
-     * 'z') { getCellEditor().applyEditorValue(); } } });
-     */
-    ICellEditorListener cellEditorListener = new ICellEditorListener()
-    {
-      public void cancelEditor()
-      {
-      }
-
-      public void applyEditorValue()
-      {
-      }
-
-      public void editorValueChanged(boolean old, boolean newState)
-      {
-      }
-    };
-    getCellEditor().addListener(cellEditorListener);
-
-    String[] item = combo.getItems();
-    for (int i = 0; i < item.length; i++)
-    {
-      if (item[i].equals(initialLabelText))
-      {
-        getCellEditor().setValue(new Integer(i));
-        break;
-      }
-    }
-  }
-
-  // hack... for some reason the ComboBoxCellEditor does't fire an
-  // editorValueChanged to set the dirty flag
-  // unless we overide this method to return true, the manager is not notified
-  // of changes made in the cell editor
-  protected boolean isDirty()
-  {
-    return true;
-  }
-
-  protected CellEditor createCellEditorOn(Composite composite)
-  {
-    boolean isLabelTextInList = false;
-    List list = computeComboContent();
-    for (Iterator i = list.iterator(); i.hasNext();)
-    {
-      String string = (String) i.next();
-      if (string.equals(label.getText()))
-      {
-        isLabelTextInList = true;
-        break;
-      }
-    }
-
-    if (!isLabelTextInList)
-    {
-      list.add(label.getText());
-    }
-
-    List sortedList = computeSortedList(list);
-    String[] stringArray = new String[sortedList.size()];
-    for (int i = 0; i < stringArray.length; i++)
-    {
-      stringArray[i] = (String) sortedList.get(i);
-    }
-    return createCellEditor(composite, stringArray);
-  }
-  
-  protected CellEditor createCellEditor(Composite composite, String[] stringArray)
-  {
-    return new ComboBoxCellEditor(composite, stringArray);    
-  }
-
-  protected List computeSortedList(List list)
-  {
-    return list;
-  }
-
-  protected abstract List computeComboContent();
-
-  protected abstract void performModify(Object value);
-
-  public static class InternalCellEditorLocator implements CellEditorLocator
-  {
-    protected Label label;
-
-    public InternalCellEditorLocator(Label label)
-    {
-      this.label = label;
-    }
-
-    public void relocate(CellEditor celleditor)
-    {
-      CCombo combo = (CCombo) celleditor.getControl();
-
-      // TODO: We're pulling a fast one here..... This is assuming we're using a
-      // CCombo as our widget
-      // Our eventual 'Combo' may not even use CCombo so this will most likely
-      // get replaced.
-      // int dropDownButtonSizeX = 16;
-
-      Rectangle labelParentBounds = label.getBounds().getCopy();
-      label.translateToAbsolute(labelParentBounds);
-
-      int x = labelParentBounds.x;
-      int y = labelParentBounds.y;
-      int widthK = labelParentBounds.width;
-      int height = labelParentBounds.height;
-      combo.setBounds(x, y + 1, widthK, height - 2);
-    }
-  }
-
-  // implements DirectEditPolicyDelegate
-  // 
-  public void performEdit(CellEditor cellEditor)
-  {
-    ADTComboBoxCellEditor comboCellEditor = (ADTComboBoxCellEditor) cellEditor;
-    CCombo combo = (CCombo) getCellEditor().getControl();
-    int index = combo.getSelectionIndex();
-    if (index != -1)
-    {
-      Object value = combo.getItem(index);
-      if (comboCellEditor.getSelectedValue() != null)
-      {
-        value = comboCellEditor.getSelectedValue();
-      }
-
-      performModify(value);
-    }
-    else
-    {
-      String typedValue = combo.getText();
-      if (combo.indexOf(typedValue) != -1)
-      {
-        performModify(typedValue);
-      }
-      else
-      {
-        String closeMatch = getCloseMatch(typedValue, combo.getItems());
-        if (closeMatch != null)
-        {
-          performModify(closeMatch);
-        }
-        else
-        {
-          Display.getCurrent().beep();
-        }
-      }
-    }
-  }
-
-  protected String getCloseMatch(String value, String[] items)
-  {
-    int matchIndex = -1;
-
-    for (int i = 0; i < items.length; i++)
-    {
-      String item = items[i];
-      String a = getLocalName(value);
-      String b = getLocalName(item);
-      if (a.equalsIgnoreCase(b))
-      {
-        matchIndex = i;
-        break;
-      }
-    }
-    return matchIndex != -1 ? items[matchIndex] : null;
-  }
-
-  protected String getLocalName(String string)
-  {
-    int index = string.indexOf(":"); //$NON-NLS-1$
-    return (index != -1) ? string.substring(index + 1) : string;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ElementReferenceDirectEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ElementReferenceDirectEditManager.java
deleted file mode 100644
index 54117a2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ElementReferenceDirectEditManager.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDElementReferenceEditManager;
-
-public class ElementReferenceDirectEditManager extends ReferenceDirectEditManager
-{
-  public ElementReferenceDirectEditManager(IField parameter, AbstractGraphicalEditPart source, Label label)
-  {
-    super(parameter, source, label);
-  }
-  
-  protected ComponentReferenceEditManager getComponentReferenceEditManager()
-  {
-    ComponentReferenceEditManager result = null;
-    IEditorPart editor = getActiveEditor();
-    if (editor != null)
-    {
-      result = (ComponentReferenceEditManager)editor.getAdapter(XSDElementReferenceEditManager.class);
-    }  
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/LabelCellEditorLocator.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/LabelCellEditorLocator.java
deleted file mode 100644
index 0b34f8e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/LabelCellEditorLocator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.INamedEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFieldFigure;
-
-public class LabelCellEditorLocator implements CellEditorLocator
-{
-  protected INamedEditPart namedEditPart;
-  protected Point cursorLocation;
-
-  public LabelCellEditorLocator(INamedEditPart namedEditPart, Point cursorLocation)
-  {
-    this.namedEditPart = namedEditPart;
-    this.cursorLocation = cursorLocation;
-  }
-
-  public void relocate(CellEditor celleditor)
-  {
-    Text text = (Text) celleditor.getControl();
-
-    Label label = namedEditPart.getNameLabelFigure();
-    if (text.getBounds().x <= 0)
-    {
-      int widthToRemove = 0;
-      // HACK 
-      if (namedEditPart instanceof BaseFieldEditPart)
-      {
-        BaseFieldEditPart field = (BaseFieldEditPart)namedEditPart;
-        IFieldFigure fieldFigure = field.getFieldFigure();     
-        widthToRemove = fieldFigure.getTypeLabel().getBounds().width;       
-        //TODO: !! perhaps the IFieldFigure should just have a method to compute this?
-        //Label typeAnnotationLabel = ((FieldFigure) field.getFigure()).getTypeAnnotationLabel();
-        //Label nameAnnotationLabel = ((FieldFigure) field.getFigure()).getNameAnnotationLabel();
-        //widthToRemove = typeLabel.getBounds().width + typeAnnotationLabel.getBounds().width + nameAnnotationLabel.getBounds().width;
-      }
-     
-      Rectangle boundingRect = label.getTextBounds();
-
-      // Reduce the width by the amount we shifted along the x-axis
-      int delta = Math.abs(boundingRect.x - label.getParent().getBounds().x);
-
-      label.getParent().translateToAbsolute(boundingRect);
-      org.eclipse.swt.graphics.Rectangle trim = text.computeTrim(0, 0, 0, 0);
-      boundingRect.translate(trim.x, trim.y);
-      boundingRect.height = boundingRect.height - trim.y;
-
-      boundingRect.width = label.getParent().getBounds().width - delta - widthToRemove;
-      text.setBounds(boundingRect.x, boundingRect.y, boundingRect.width, boundingRect.height);
-
-      // Translate point
-      if (cursorLocation != null) {
-    	  Point translatedPoint = new Point(cursorLocation.x - boundingRect.x, cursorLocation.y - boundingRect.y);
-
-    	  // Calculate text offset corresponding to the translated point
-    	  text.setSelection(0, 0);
-    	  int xCaret = text.getCaretLocation().x;
-    	  int offset = text.getCaretPosition();
-    	  while (xCaret < translatedPoint.x)
-    	  {
-    		  text.setSelection(offset + 1, offset + 1);
-    		  xCaret = text.getCaretLocation().x;
-    		  int newOffset = text.getCaretPosition();
-    		  if (newOffset == offset)
-    		  {
-    			  break;
-    		  }
-    		  offset++;
-    	  }
-    	  text.setSelection(offset, offset);
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/LabelEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/LabelEditManager.java
deleted file mode 100644
index 884341a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/LabelEditManager.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.tools.CellEditorLocator;
-import org.eclipse.gef.tools.DirectEditManager;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.part.CellEditorActionHandler;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.INamedEditPart;
-
-public class LabelEditManager extends DirectEditManager {
-
-	private IActionBars actionBars;
-	private CellEditorActionHandler actionHandler;
-	private IAction copy, cut, paste, undo, redo, find, selectAll, delete;
-	private Font scaledFont;
-
-	public LabelEditManager(GraphicalEditPart source, CellEditorLocator locator) {
-		super(source, null, locator);
-	}
-
-	/**
-	 * @see org.eclipse.gef.tools.DirectEditManager#bringDown()
-	 */
-	protected void bringDown() {
-		if (actionHandler != null) {
-			actionHandler.dispose();
-			actionHandler = null;
-		}
-		if (actionBars != null) {
-			restoreSavedActions(actionBars);
-			actionBars.updateActionBars();
-			actionBars = null;
-		}
-
-		Font disposeFont = scaledFont;
-		scaledFont = null;
-		super.bringDown();
-		if (disposeFont != null)
-			disposeFont.dispose();
-	}
-	
-	public void showFeedback() {
-//    super.showFeedback();
-		getEditPart().showSourceFeedback(getDirectEditRequest());
-	}
-
-	protected CellEditor createCellEditorOn(Composite composite) {
-		return new TextCellEditor(composite, SWT.SINGLE | SWT.WRAP);
-	}
-
-	protected void initCellEditor() {
-		Text text = (Text)getCellEditor().getControl();
-		Label label = ((INamedEditPart) getEditPart()).getNameLabelFigure();
-    
-		if (label != null) {
-			scaledFont = label.getFont();
-			
-			Color color = label.getBackgroundColor();
-			text.setBackground(color);
-			
-			String initialLabelText = label.getText();
-			getCellEditor().setValue(initialLabelText);
-		}
-		else {
-			scaledFont = label.getParent().getFont();
-			text.setBackground(label.getParent().getBackgroundColor());
-		}
-		
-		FontData data = scaledFont.getFontData()[0];
-		Dimension fontSize = new Dimension(0, data.getHeight());
-		label.getParent().translateToAbsolute(fontSize);
-		data.setHeight(fontSize.height);
-		scaledFont = new Font(null, data);
-		
-		text.setFont(scaledFont);
-//		text.selectAll();
-
-		// Hook the cell editor's copy/paste actions to the actionBars so that they can
-		// be invoked via keyboard shortcuts.
-		actionBars = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage()
-				.getActiveEditor().getEditorSite().getActionBars();
-		saveCurrentActions(actionBars);
-		actionHandler = new CellEditorActionHandler(actionBars);
-		actionHandler.addCellEditor(getCellEditor());
-		actionBars.updateActionBars();
-	}
-
-	private void restoreSavedActions(IActionBars actionBars){
-		actionBars.setGlobalActionHandler(ActionFactory.COPY.getId(), copy);
-		actionBars.setGlobalActionHandler(ActionFactory.PASTE.getId(), paste);
-		// https://bugs.eclipse.org/bugs/show_bug.cgi?id=252509
-		// Delete action (key) doesn't always work.  The saved action could be the 
-		// CellEditorActionHandler's DeleteActionHandler...due to timing issues.
-		// We'll only restore the delete action if it is indeed the one for the Design view.
-		// We should update the other actions too, but currently, none are applicable.
-		if (delete instanceof BaseSelectionAction)
-		{
-      actionBars.setGlobalActionHandler(ActionFactory.DELETE.getId(), delete);
-		}
-		actionBars.setGlobalActionHandler(ActionFactory.SELECT_ALL.getId(), selectAll);
-		actionBars.setGlobalActionHandler(ActionFactory.CUT.getId(), cut);
-		actionBars.setGlobalActionHandler(ActionFactory.FIND.getId(), find);
-		actionBars.setGlobalActionHandler(ActionFactory.UNDO.getId(), undo);
-		actionBars.setGlobalActionHandler(ActionFactory.REDO.getId(), redo);
-	}
-
-	private void saveCurrentActions(IActionBars actionBars) {
-		copy = actionBars.getGlobalActionHandler(ActionFactory.COPY.getId());
-		paste = actionBars.getGlobalActionHandler(ActionFactory.PASTE.getId());
-    IAction currentDeleteAction = actionBars.getGlobalActionHandler(ActionFactory.DELETE.getId());
-    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=252509
-    // Delete action (key) doesn't always work.  The saved action could be the 
-    // CellEditorActionHandler's DeleteActionHandler...due to timing issues.
-    // We'll only restore the delete action if it is indeed the one for the Design view.
-    // We should update the other actions too, but currently, none are applicable.
-    if (currentDeleteAction instanceof BaseSelectionAction)
-    {
-      delete = currentDeleteAction;
-    }
-		selectAll = actionBars.getGlobalActionHandler(ActionFactory.SELECT_ALL.getId());
-		cut = actionBars.getGlobalActionHandler(ActionFactory.CUT.getId());
-		find = actionBars.getGlobalActionHandler(ActionFactory.FIND.getId());
-		undo = actionBars.getGlobalActionHandler(ActionFactory.UNDO.getId());
-		redo = actionBars.getGlobalActionHandler(ActionFactory.REDO.getId());
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ReferenceDirectEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ReferenceDirectEditManager.java
deleted file mode 100644
index c98cbc2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/ReferenceDirectEditManager.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-
-public abstract class ReferenceDirectEditManager extends ComboBoxCellEditorManager
-{
-  protected AbstractGraphicalEditPart editPart;
-  protected IField setObject;
-
-  public ReferenceDirectEditManager(IField parameter, AbstractGraphicalEditPart source, Label label)
-  {
-    super(source, label);
-    editPart = source;
-    setObject = parameter;
-  }
-
-  protected CellEditor createCellEditorOn(Composite composite)
-  {
-    return super.createCellEditorOn(composite);
-  }
-
-  protected List computeComboContent()
-  {
-    List list = new ArrayList();
-    ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
-    if (editManager != null)
-    {
-       list.add(Messages._UI_ACTION_BROWSE);
-       list.add(Messages._UI_ACTION_NEW);
-       ComponentSpecification[] quickPicks = editManager.getQuickPicks();
-       if (quickPicks != null)
-       {
-         for (int i=0; i < quickPicks.length; i++)
-         {
-           ComponentSpecification componentSpecification = quickPicks[i];
-           list.add(componentSpecification.getName());
-         }  
-       }
-       ComponentSpecification[] history = editManager.getHistory();
-       if (history != null)
-       {
-         for (int i=0; i < history.length; i++)
-         {
-           ComponentSpecification componentSpecification = history[i];
-           list.add(componentSpecification.getName());
-         }  
-       }
-    } 
-    return list; 
-  }
-
-  protected ComponentSpecification getComponentSpecificationForValue(String value)
-  {
-    ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
-    if (editManager != null)
-    {  
-      ComponentSpecification[] quickPicks = editManager.getQuickPicks();
-      if (quickPicks != null)
-      {
-        for (int i=0; i < quickPicks.length; i++)
-        {
-          ComponentSpecification componentSpecification = quickPicks[i];
-          if (value.equals(componentSpecification.getName()))
-          {
-            return componentSpecification;
-          }                
-        }  
-      }
-      ComponentSpecification[] history = editManager.getHistory();
-      if (history != null)
-      {
-        for (int i=0; i < history.length; i++)
-        {
-          ComponentSpecification componentSpecification = history[i];
-          if (value.equals(componentSpecification.getName()))
-          {  
-            return componentSpecification;
-          }
-        }  
-      }
-    }
-    return null;
-  }
-  
-  public void performModify(Object value)
-  {
-    ComponentReferenceEditManager editManager = getComponentReferenceEditManager();
-    if (editManager == null)
-    {
-      return;
-    }
-    
-    // our crude combo box can only work with 'String' objects
-    // if we get a String back we need to do some clever mapping to get the ComponentSpecification 
-    //    
-    if (value instanceof String)
-    {
-      value = getComponentSpecificationForValue((String)value);     
-    }  
-    // we assume the selected value is always of the form of a ComponentSpecification
-    // 
-    if (value instanceof ComponentSpecification)      
-    {
-      // we need to perform an asyncExec here since the 'host' editpart may be
-      // removed as a side effect of performing the action           
-      DelayedSetReferenceRunnable runnable = new DelayedSetReferenceRunnable(editManager, setObject, (ComponentSpecification)value);
-      //runnable.run();
-      Display.getCurrent().asyncExec(runnable);
-    }
-  }
-
-  protected List computeSortedList(List list)
-  {
-    // return TypesHelper.sortList(list);
-    return list;
-  }
-  
-  protected CellEditor createCellEditor(Composite composite, String[] stringArray)
-  {
-    ADTComboBoxCellEditor cellEditor = new ADTComboBoxCellEditor(composite, stringArray, getComponentReferenceEditManager());
-    //((ADTComboBoxCellEditor) cellEditor).setObjectToModify(setObject);
-    return cellEditor;
-  }
-
-  protected abstract ComponentReferenceEditManager getComponentReferenceEditManager();
-  
-  protected IEditorPart getActiveEditor()
-  {
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-    return editorPart;
-  }    
-  
-  protected class DelayedSetReferenceRunnable implements Runnable
-  {
-    protected ComponentReferenceEditManager componentReferenceEditManager;
-    protected ComponentSpecification newValue;
-    protected IField field;
-
-    public DelayedSetReferenceRunnable(ComponentReferenceEditManager componentReferenceEditManager,
-        IField setObject, ComponentSpecification selectedValue)
-    {
-      this.componentReferenceEditManager = componentReferenceEditManager;
-      newValue = selectedValue;
-      field = setObject;
-    }
-
-    public void run()
-    {
-      componentReferenceEditManager.modifyComponentReference(field, newValue);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/TypeReferenceDirectEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/TypeReferenceDirectEditManager.java
deleted file mode 100644
index dbebae1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/directedit/TypeReferenceDirectEditManager.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.directedit;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager2;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDTypeReferenceEditManager;
-
-public class TypeReferenceDirectEditManager extends ReferenceDirectEditManager //ComboBoxCellEditorManager
-{
-  public TypeReferenceDirectEditManager(IField parameter, AbstractGraphicalEditPart source, Label label)
-  {
-    super(parameter, source, label);
-  }
-
-  protected ComponentReferenceEditManager getComponentReferenceEditManager()
-  {
-    ComponentReferenceEditManager result = null;
-    IEditorPart editor = getActiveEditor();
-    if (editor != null)
-    {
-        result = (ComponentReferenceEditManager)editor.getAdapter(XSDTypeReferenceEditManager.class);
-        if (result instanceof ComponentReferenceEditManager2)
-        {
-          ComponentReferenceEditManager2 manager = (ComponentReferenceEditManager2)result;
-          manager.setReferencer(setObject);
-        }
-    }  
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTEditPartFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTEditPartFactory.java
deleted file mode 100644
index 2642604..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTEditPartFactory.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.wst.xsd.ui.internal.adt.design.ADTFloatingToolbar.ADTFloatingToolbarModel;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.AbstractModelCollection;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Compartment;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.FocusTypeColumn;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.RootHolder;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-
-public class ADTEditPartFactory implements EditPartFactory
-{
-  public EditPart createEditPart(EditPart context, Object model)
-  {
-    EditPart child = doCreateEditPart(context, model);
-    checkChild(child, model);
-    return child;
-  }
-  
-  protected EditPart doCreateEditPart(EditPart context, Object model)
-  {
-    EditPart child = null;
-    if (model instanceof Compartment)
-    {
-      child = new CompartmentEditPart();
-    }
-    else if (model instanceof RootHolder)
-    {
-      child = new RootHolderEditPart();
-    }
-    else if (model instanceof ADTFloatingToolbarModel)
-    {
-      child = new ADTFloatingToolbarEditPart(((ADTFloatingToolbarModel)model).getModel());
-    }
-    else if (model instanceof AbstractModelCollection)
-    {
-      child = new ColumnEditPart();
-      if (model instanceof FocusTypeColumn)
-      {
-        ColumnEditPart columnEditPart = (ColumnEditPart)child;
-        columnEditPart.setSpacing(60);
-        columnEditPart.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
-      }  
-    }
-    else if (model instanceof IComplexType)
-    {
-      child = new ComplexTypeEditPart();
-    }
-    else if (model instanceof IStructure)
-    {
-      child = new StructureEditPart();
-    }  
-    else if (model instanceof IField)
-    {
-      if (context instanceof CompartmentEditPart)
-      {  
-        child = new FieldEditPart();
-      }
-      else
-      {
-        child = new TopLevelFieldEditPart();
-      }  
-    }
-    else if (model instanceof IModel)
-    {
-      child = new RootContentEditPart();
-    }
-    return child;   
-  }
-
-  /**
-   * Subclasses can override and not check for null
-   * 
-   * @param child
-   * @param model
-   */
-  protected void checkChild(EditPart child, Object model)
-  {
-    if (child == null)
-    {
-      // Thread.dumpStack();
-    }
-    Assert.isNotNull(child);
-    child.setModel(model);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTFloatingToolbarEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTFloatingToolbarEditPart.java
deleted file mode 100644
index 46b8be9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ADTFloatingToolbarEditPart.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.awt.event.KeyEvent;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FocusEvent;
-import org.eclipse.draw2d.FocusListener;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.KeyListener;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.draw2d.MouseMotionListener;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.design.figures.CenteredIconFigure;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class ADTFloatingToolbarEditPart extends BaseEditPart
-{
-  protected IModel model;
-  protected boolean isDrilledDown;
-  protected ADTToolbarButton backToSchema;
-  
-  public ADTFloatingToolbarEditPart(IModel model)
-  {
-    this.model = model;
-  }
-
-  protected IFigure createFigure()
-  {
-    Figure figure = new Figure();
-    ToolbarLayout tb = new ToolbarLayout(true);
-    tb.setStretchMinorAxis(false);
-    tb.setSpacing(3);
-    figure.setLayoutManager(tb);
-    
-    backToSchema = new ADTToolbarButton(XSDEditorPlugin.getPlugin().getIcon("elcl16/schemaview_co.gif"));
-    backToSchema.setToolTipText(Messages._UI_HOVER_BACK_TO_SCHEMA);
-    backToSchema.setBackgroundColor(ColorConstants.white);
-    backToSchema.setFocusTraversable(true);    
-    figure.add(backToSchema);
-    figure.setBounds(new Rectangle(0,0,24,24));    
-    addToToolbar(figure);
-    return figure;
-  }
-  
-  protected void addToToolbar(IFigure figure)
-  {
-    
-  }
-  
-  public void setIsDrilledDown(boolean isDrilledDown)
-  {
-    this.isDrilledDown = isDrilledDown;
-  }
-  
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    backToSchema.isEnabled = isDrilledDown;
-    if (isDrilledDown)
-    {
-      backToSchema.image = XSDEditorPlugin.getPlugin().getIcon("elcl16/schemaview_co.gif");
-    }
-    else
-    {
-      backToSchema.image = XSDEditorPlugin.getPlugin().getIcon("dlcl16/schemaview_co.gif");
-    }
-    backToSchema.refresh();
-  }
-  
-  protected void doAction(MouseEvent me)
-  {
-    IEditorPart editorPart = getActionEditorPart();
- 
-    if (backToSchema.getBounds().contains(me.getLocation()))
-    {
-      SetInputToGraphView action = new SetInputToGraphView(editorPart, model);
-      action.run();
-    }
-  }
-  
-  protected void doAction(org.eclipse.draw2d.KeyEvent ke)
-  {
-	  IEditorPart editorPart = getActionEditorPart(); 
-	  SetInputToGraphView action = new SetInputToGraphView(editorPart, model);
-	  action.run();    
-  }
-  
-  private IEditorPart getActionEditorPart()
-  {
-	  IWorkbench workbench = PlatformUI.getWorkbench();
-	  IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-	  IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-	  return editorPart;
-  }
-  
-  
-  protected class ADTToolbarButton extends CenteredIconFigure
-  {
-    protected MouseListener mouseListener;
-    protected org.eclipse.draw2d.KeyListener keyListener;    
-    protected FocusListener focusListener;
-    public boolean isEnabled;
-    
-    public ADTToolbarButton(Image img)
-    {
-      super();
-      this.image = img;
-
-      mouseListener = new MouseListener.Stub()
-      {
-        public void mousePressed(org.eclipse.draw2d.MouseEvent me)
-        {
-          if (isEnabled)
-          {
-        	  addFeedback();
-          }
-        }
-
-        public void mouseReleased(org.eclipse.draw2d.MouseEvent me)
-        {
-          if (isEnabled)
-          {
-            removeFeedback();
-            doAction(me);
-          }
-        }
-      };
-      addMouseListener(mouseListener);
-      addMouseMotionListener(new MouseMotionListener.Stub()
-      {
-        public void mouseExited(MouseEvent me)
-        {
-          removeFeedback();
-        }
-      });
-      
-      keyListener = new KeyListener.Stub()
-      {
-    	  public void keyPressed(org.eclipse.draw2d.KeyEvent ke)
-    	  {
-    		  boolean isValidKey = (ke.keycode == KeyEvent.VK_SPACE);
-    		  isValidKey = isValidKey || (ke.character == SWT.CR || ke.character == SWT.LF);
-    		  if (isEnabled && isValidKey)
-    		  {
-    			  addFeedback();
-    		  }
-    	  }
-
-    	  public void keyReleased(org.eclipse.draw2d.KeyEvent ke)
-    	  {
-    		  boolean isValidKey = (ke.keycode == KeyEvent.VK_SPACE);
-    		  isValidKey = isValidKey || (ke.character == SWT.CR || ke.character == SWT.LF);
-    		  if (isEnabled && isValidKey)
-    		  {
-    			  removeFeedback();
-    			  doAction(ke);
-    		  }            
-    	  }
-      };
-      addKeyListener(keyListener);    
-      
-      focusListener = new FocusListener(){
-
-		public void focusGained(FocusEvent fe) {
-			setMode(CenteredIconFigure.HOVER);
-			refresh();
-		}
-
-		public void focusLost(FocusEvent fe) {
-			setMode(CenteredIconFigure.NORMAL);
-			refresh();
-		}
-	};
-	
-	addFocusListener(focusListener);
-    }
-
-    public void addFeedback()
-    {
-      setMode(CenteredIconFigure.SELECTED);
-      refresh();
-    }
-
-    public void removeFeedback()
-    {
-      setMode(CenteredIconFigure.NORMAL);
-      refresh();
-    }
-
-    public Rectangle getBounds()
-    {
-      Rectangle r = super.getBounds();
-      org.eclipse.swt.graphics.Rectangle rect = image.getBounds();
-      return new Rectangle(r.x, r.y, rect.width + 8, rect.height + 8);
-    }
-
-    public Dimension getPreferredSize(int hint, int hint2)
-    {
-      org.eclipse.swt.graphics.Rectangle rect = image.getBounds();
-      return new Dimension(rect.width + 8, rect.height + 8);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BackToSchemaEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BackToSchemaEditPart.java
deleted file mode 100644
index f79ed6c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BackToSchemaEditPart.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IFeedbackHandler;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ADTMultiPageEditor;
-import org.eclipse.wst.xsd.ui.internal.design.figures.CenteredIconFigure;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class BackToSchemaEditPart extends BaseEditPart implements IFeedbackHandler
-{
-  protected MultiPageEditorPart multipageEditor;
-  protected ADTDirectEditPolicy adtDirectEditPolicy = new ADTDirectEditPolicy();
-  protected boolean isEnabled;
-  protected CenteredIconFigure backToSchema;
-  protected MouseListener mouseListener;
-
-  public BackToSchemaEditPart(ADTMultiPageEditor multipageEditor)
-  {
-    super();
-    this.multipageEditor = multipageEditor;
-  }
-
-  protected IFigure createFigure()
-  {
-    backToSchema = new CenteredIconFigure();
-    backToSchema.setBackgroundColor(ColorConstants.white);
-    backToSchema.image = XSDEditorPlugin.getPlugin().getIcon("elcl16/schemaview_co.gif");
-    // TODO, look at why the editpolicy doesn't work
-    mouseListener = new MouseListener()
-    {
-      public void mouseDoubleClicked(org.eclipse.draw2d.MouseEvent me)
-      {
-
-      }
-
-      public void mousePressed(org.eclipse.draw2d.MouseEvent me)
-      {
-        if (isEnabled)
-        {
-          addFeedback();
-        }
-      }
-
-      public void mouseReleased(org.eclipse.draw2d.MouseEvent me)
-      {
-        if (isEnabled)
-        {
-          removeFeedback();
-          SetInputToGraphView action = new SetInputToGraphView(multipageEditor, getModel());
-          action.run();
-        }
-      }
-    };
-    backToSchema.addMouseListener(mouseListener);
-    return backToSchema;
-  }
-  
-  
-  public void setEnabled(boolean isEnabled)
-  {
-    this.isEnabled = isEnabled;
-    refreshVisuals();
-  }
-
-  protected void createEditPolicies()
-  {
-    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
-  }
-
-  public void performRequest(Request request)
-  {
-    if (request.getType() == RequestConstants.REQ_DIRECT_EDIT || request.getType() == RequestConstants.REQ_OPEN)
-    {
-      SetInputToGraphView action = new SetInputToGraphView(multipageEditor, getModel());
-      action.run();
-    }
-  }
-
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    CenteredIconFigure figure = (CenteredIconFigure) getFigure();
-    if (isEnabled)
-    {
-      backToSchema.image = XSDEditorPlugin.getPlugin().getIcon("elcl16/schemaview_co.gif");
-    }
-    else
-    {
-      backToSchema.image = XSDEditorPlugin.getPlugin().getIcon("dlcl16/schemaview_co.gif");
-    }
-    figure.refresh();
-  }
-
-  public void addFeedback()
-  {
-    CenteredIconFigure figure = (CenteredIconFigure) getFigure();
-    figure.setMode(CenteredIconFigure.SELECTED);
-    figure.refresh();
-  }
-
-  public void removeFeedback()
-  {
-    CenteredIconFigure figure = (CenteredIconFigure) getFigure();
-    figure.setMode(CenteredIconFigure.NORMAL);
-    figure.refresh();
-  }
-  
-  public void deactivate()
-  {
-    backToSchema.removeMouseListener(mouseListener);
-    super.deactivate();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseEditPart.java
deleted file mode 100644
index 9528daf..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseEditPart.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.editparts.ZoomListener;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IActionProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IFeedbackHandler;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFigureFactory;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.CommonMultiPageEditor;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-
-public abstract class BaseEditPart extends AbstractGraphicalEditPart implements IActionProvider, IADTObjectListener, IFeedbackHandler
-{
-  protected static final String[] EMPTY_ACTION_ARRAY = {};
-  protected boolean isSelected = false;
-  protected boolean hasFocus = false;
-  protected static boolean isHighContrast = Display.getDefault().getHighContrast();
-  
-  public IFigureFactory getFigureFactory()
-  {
-    EditPartFactory factory = getViewer().getEditPartFactory();
-    Assert.isTrue(factory instanceof IFigureFactory, "EditPartFactory must be an instanceof of IFigureFactory");     //$NON-NLS-1$
-    return (IFigureFactory)factory; 
-  }
-  
-  public String[] getActions(Object object)
-  {
-    Object model = getModel();
-    if (model instanceof IActionProvider)
-    {
-      return ((IActionProvider)model).getActions(object);
-    }  
-    return EMPTY_ACTION_ARRAY;
-  }
-  
-  protected void addActionsToList(List list, IAction[] actions)
-  {
-    for (int i = 0; i < actions.length; i++)
-    {
-      list.add(actions[i]);
-    }  
-  }
-  
-  public void activate()
-  {
-    super.activate();
-    Object model = getModel();
-    if (model instanceof IADTObject)
-    {
-      IADTObject object = (IADTObject)model;
-      object.registerListener(this);
-    }
-    
-    if (getZoomManager() != null)
-      getZoomManager().addZoomListener(zoomListener);
-
-  }
-  
-  public void deactivate()
-  {
-    try
-    {
-    Object model = getModel();
-    if (model instanceof IADTObject)
-    {
-      IADTObject object = (IADTObject)model;
-      object.unregisterListener(this);
-    }   
-    
-    if (getZoomManager() != null)
-      getZoomManager().removeZoomListener(zoomListener);    
-    }
-    finally
-    {
-      super.deactivate();
-    }  
-  }  
-  
-  public void propertyChanged(Object object, String property)
-  {
-    refresh();
-  }
-  
-  public void refresh() {
-    
-    boolean doUpdateDesign = doUpdateDesign();
-    if (doUpdateDesign)
-    {
-      super.refresh();
-      for (Iterator i = getChildren().iterator(); i.hasNext();)
-      {
-        Object obj = i.next();
-        if (obj instanceof BaseEditPart)
-        {
-          ((BaseEditPart) obj).refresh();
-        }
-        else if (obj instanceof AbstractGraphicalEditPart)
-        {
-          ((AbstractGraphicalEditPart) obj).refresh();
-        }
-      }
-    }
-  }
-
-  public void addFeedback()
-  {
-    isSelected = true;
-    refreshVisuals();
-  }
-
-  public void removeFeedback()
-  {
-    isSelected = false;
-    refreshVisuals();
-  }
-  
-  public ZoomManager getZoomManager()
-  {
-    return ((ScalableRootEditPart)getRoot()).getZoomManager();
-  }
-  
-  public Rectangle getZoomedBounds(Rectangle r)
-  {
-    double factor = getZoomManager().getZoom();
-    int x = (int)Math.round(r.x * factor);
-    int y = (int)Math.round(r.y * factor);
-    int width = (int)Math.round(r.width * factor);
-    int height = (int)Math.round(r.height * factor);
-
-    return new Rectangle(x, y, width, height);
-  }
-  
-  private ZoomListener zoomListener = new ZoomListener()
-  {
-    public void zoomChanged(double zoom)
-    {
-      handleZoomChanged();
-    }
-  };
-
-  protected void handleZoomChanged()
-  {
-    refreshVisuals();
-  }
-
-  public IEditorPart getEditorPart()
-  {
-    IEditorPart editorPart = null;
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    if (workbench != null)
-    {
-      IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-      if (workbenchWindow != null)
-      {
-        if (workbenchWindow.getActivePage() != null)
-        {
-          editorPart = workbenchWindow.getActivePage().getActiveEditor();
-        }
-      }
-    }
-//    Assert.isNotNull(editorPart);
-    return editorPart;
-  }
-  
-  protected void createEditPolicies()
-  {
-    installEditPolicy(KeyBoardAccessibilityEditPolicy.KEY, new KeyBoardAccessibilityEditPolicy()
-    {      
-      public EditPart getRelativeEditPart(EditPart editPart, int direction)
-      {
-        return doGetRelativeEditPart(editPart, direction);  
-      }           
-    });        
-  }
-  
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {   
-    return null;      
-  }
-  
-  protected boolean isFileReadOnly()
-  {
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    if (workbench != null)
-    {
-      IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-      if (workbenchWindow != null)
-      {
-        IWorkbenchPage page = workbenchWindow.getActivePage();
-        if (page != null)
-        {
-          IEditorPart editor = page.getActiveEditor();
-          if (editor != null)
-          {
-            IEditorInput editorInput = editor.getEditorInput();
-            if (!(editorInput instanceof IFileEditorInput || editorInput instanceof FileStoreEditorInput))
-            {
-              return true;
-            }
-          }
-        }
-      }
-    }
-    return false;
-  }
-  
-  // For https://bugs.eclipse.org/bugs/show_bug.cgi?id=218281
-  // Don't want to refresh the design when changes are made in the source view.
-  protected boolean doUpdateDesign()
-  {
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    if (workbench != null)
-    {
-      IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-      if (workbenchWindow != null)
-      {
-        IWorkbenchPage page = workbenchWindow.getActivePage();
-        if (page != null)
-        {
-          IEditorPart editorPart = page.getActiveEditor();
-          if (editorPart instanceof CommonMultiPageEditor)
-          {
-            CommonMultiPageEditor editor = (CommonMultiPageEditor) editorPart;
-            GraphicalViewer viewer = (GraphicalViewer)editor.getAdapter(GraphicalViewer.class);
-            // Need to ensure this is the same editor we are working with since the active editor may not be 
-            // the current, eg. at startup, there can be another XSD Editor open on the source page, so we could end
-            // up not populating the design view initally
-            if (getViewer() == viewer)
-            {
-              // If source page is active, don't update the design
-              return !editor.isSourcePageActive();
-            }
-          }
-        }
-      }
-    }
-    return true;
-  }
-  
-  /**
-   * Try to get the italic font for the current font
-   * @param font
-   * @return
-   */
-  protected Font getItalicFont(Font font)
-  {
-    if (font != null && !font.isDisposed())
-    {
-      FontData[] fd = font.getFontData();
-      if (fd.length > 0)
-      {
-        fd[0].setStyle(fd[0].getStyle() | SWT.ITALIC);
-        return new Font(font.getDevice(), fd);
-      }
-    }
-    return font;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseFieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseFieldEditPart.java
deleted file mode 100644
index f691042..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseFieldEditPart.java
+++ /dev/null
@@ -1,518 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.DragTracker;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.ComboBoxCellEditorManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.ElementReferenceDirectEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.LabelCellEditorLocator;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.LabelEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.TypeReferenceDirectEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.FocusTypeColumn;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.IADTUpdateCommand;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IFieldFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.ConnectableEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.TargetConnectionSpacingFigureEditPart;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.model.TargetConnectionSpaceFiller;
-import org.eclipse.wst.xsd.ui.internal.design.editpolicies.GraphNodeDragTracker;
-import org.eclipse.xsd.XSDNamedComponent;
-
-public class BaseFieldEditPart extends BaseTypeConnectingEditPart implements INamedEditPart, IAutoDirectEdit
-{
-  protected TypeReferenceConnection connectionFigure;
-  protected ADTDirectEditPolicy adtDirectEditPolicy = new ADTDirectEditPolicy();
-  protected TypeReferenceConnection connectionFeedbackFigure;
-  
-  protected IFigure createFigure()
-  {          
-    IFieldFigure figure = getFigureFactory().createFieldFigure(getModel());    
-    figure.setForegroundColor(ColorConstants.black);
-    return figure;
-  }
-  
-  public IFieldFigure getFieldFigure()
-  {
-    return (IFieldFigure)figure;
-  }
- 
-  
-  protected boolean shouldDrawConnection()
-  {
-    boolean result = false;
-    
-    // For now we only want to produce outbound lines from a Field to a Type
-    // when the field in contained in the 'focus' edit part    
-    for (EditPart parent = getParent(); parent != null; parent = parent.getParent())
-    {  
-      if (parent.getModel() instanceof FocusTypeColumn)
-      {        
-        result = true;
-        break;
-      }  
-    }    
-    return result;
-  }
-  
-  private EditPart getTargetEditPart(IType type)
-  {
-    ColumnEditPart columnEditPart = null;
-    for (EditPart editPart = this; editPart != null; editPart = editPart.getParent())
-    {
-      if (editPart instanceof ColumnEditPart)
-      {
-        columnEditPart = (ColumnEditPart)editPart;
-        break;
-      }  
-    }     
-    if (columnEditPart != null)
-    {
-      // get the next column
-      EditPart parent = columnEditPart.getParent();
-      List columns = parent.getChildren();
-      int index = columns.indexOf(columnEditPart);
-      if (index + 1 < columns.size())
-      {  
-        EditPart nextColumn = (EditPart)columns.get(index + 1);
-        for (Iterator i = nextColumn.getChildren().iterator(); i.hasNext(); )
-        {
-          EditPart child = (EditPart)i.next();
-          if (child.getModel() == type)
-          {
-            return child;
-          }  
-        }  
-      }  
-    }
-    return null;
-  }
-  
-  private EditPart getTargetConnectionEditPart()
-  {
-    EditPart result = null; 
-    IField field = (IField)getModel();
-    IType type = field.getType();
-    if (type != null)
-    {      
-      result = getTargetEP(type); //getTargetEditPart(type);
-    }
-    return result;
-  }
-  
-  /**
-   * Do not override
-   * @param type
-   * @return
-   */
-  protected EditPart getTargetEP(IType type)
-  {
-    return getTargetEditPart(type);
-  }
-  
-  public TypeReferenceConnection createConnectionFigure()
-  {
-    connectionFigure = null;   
-    AbstractGraphicalEditPart referenceTypePart = (AbstractGraphicalEditPart)getTargetConnectionEditPart();
-    if (referenceTypePart != null)
-    {
-      connectionFigure = new TypeReferenceConnection();
-
-      if (getFigure().getParent() == referenceTypePart.getFigure())
-      {
-        connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(getFigure(), CenteredConnectionAnchor.LEFT, 1)); 
-      }
-      else
-      {
-        connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(getFigure(), CenteredConnectionAnchor.RIGHT, 5));
-      }
-      int targetAnchorYOffset = 8;
-
-      connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(referenceTypePart.getFigure(), CenteredConnectionAnchor.HEADER_LEFT, 0, targetAnchorYOffset)); 
-      connectionFigure.setHighlight(false);
-    }
-
-    return connectionFigure;
-  }
-
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
-  }
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-    EditPart result = null;        
-    if (direction == PositionConstants.EAST)
-    {    
-      result = getTargetConnectionEditPart();
-    }
-    else if (direction == PositionConstants.WEST)
-    {
-      for (Iterator iter = getParent().getChildren().iterator(); iter.hasNext(); )
-      {
-        Object child = iter.next();
-        if (child instanceof SectionEditPart)
-        {
-          SectionEditPart groups = (SectionEditPart) child;
-          for (Iterator i = groups.getChildren().iterator(); i.hasNext(); )
-          {
-            Object groupChild = i.next();
-            EditPart connectable = getParentConnectableEditPart((EditPart)groupChild);
-            if (connectable != null)
-            {
-              result = connectable;
-            }
-          }
-        }
-      }
-      if (result == null)
-      {
-        result = this;
-      }
-    }
-    else
-    {
-      result = super.doGetRelativeEditPart(editPart, direction);
-      if (result == null)
-      {  
-        result = ((BaseEditPart)getParent()).doGetRelativeEditPart(editPart, direction);
-      }  
-    }  
-    return result;      
-  }
-  
-  protected ConnectableEditPart getParentConnectableEditPart(EditPart connectable)
-  {
-    if (connectable instanceof TargetConnectionSpacingFigureEditPart)
-    {
-      TargetConnectionSpaceFiller space = (TargetConnectionSpaceFiller) ((TargetConnectionSpacingFigureEditPart)connectable).getModel();
-      if (space.getAdapter() == this.getModel())
-      {
-        return (ConnectableEditPart)connectable;
-      }
-    }
-    
-    for (Iterator i = connectable.getChildren().iterator(); i.hasNext(); )
-    {
-      Object child = i.next();
-      if (child instanceof ConnectableEditPart)
-      {
-        ConnectableEditPart r = getParentConnectableEditPart((EditPart)child);
-        if (r != null) return r;
-      }
-      else if (child instanceof TargetConnectionSpacingFigureEditPart)
-      {
-        TargetConnectionSpaceFiller space = (TargetConnectionSpaceFiller) ((TargetConnectionSpacingFigureEditPart)child).getModel();
-        if (space.getAdapter() == this.getModel() && connectable instanceof ConnectableEditPart)
-        {
-          return (ConnectableEditPart)connectable;
-        }
-      }
-    }
-    return null;
-  }
- 
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    IFieldFigure figure = getFieldFigure();
-    IField field = (IField) getModel();
-    
-    figure.getNameLabel().setText(field.getName());
-    figure.getTypeLabel().setText(field.getTypeName());
-    figure.refreshVisuals(getModel());
-
-    figure.recomputeLayout();
-
-    ((GraphicalEditPart)getRoot()).getFigure().invalidateTree();
-  }
-
-  public DragTracker getDragTracker(Request request)
-  {
-    return new GraphNodeDragTracker(this);
-  }
-  
-  /*
-  public IAction[] getActions(Object object)
-  {
-    // when a FieldEditPart is selected it provides it's own actions
-    // as well as those of it's parent 'type' edit part
-    List list = new ArrayList();
-    EditPart compartment = getParent();
-    if (compartment != null)
-    {  
-      EditPart type = compartment.getParent();
-      if (type != null && type instanceof IActionProvider)
-      {
-        IActionProvider provider = (IActionProvider)type;
-        addActionsToList(list, provider.getActions(object));
-      }
-    }
-    addActionsToList(list, super.getActions(object));
-    IAction[] result = new IAction[list.size()];
-    list.toArray(result);
-    return result;
-  }*/
-  
-  public Label getNameLabelFigure()
-  {
-    return getFieldFigure().getNameLabel();
-  }
-
-  public void performDirectEdit(Point cursorLocation)
-  {
-    
-  }
-  
-  public void performRequest(Request request)
-  {  
-    if (((IADTObject)getModel()).isReadOnly() || isFileReadOnly())
-    {
-      return;
-    }
-    if (request.getType() == RequestConstants.REQ_DIRECT_EDIT||
-        request.getType() == RequestConstants.REQ_OPEN)
-    {
-      IFieldFigure fieldFigure = getFieldFigure();
-      Object model = getModel();
-      if (request instanceof LocationRequest)
-      {
-        LocationRequest locationRequest = (LocationRequest)request;
-        Point p = locationRequest.getLocation();
-       
-        if (hitTest(fieldFigure.getTypeLabel(), p))
-        {
-          TypeReferenceDirectEditManager manager = new TypeReferenceDirectEditManager((IField)model, this, fieldFigure.getTypeLabel());
-          TypeUpdateCommand typeUpdateCommand = new TypeUpdateCommand();
-          typeUpdateCommand.setDelegate(manager);
-          adtDirectEditPolicy.setUpdateCommand(typeUpdateCommand);
-          manager.show();
-        }
-        else if (hitTest(fieldFigure.getNameLabel(), p))
-        {
-        	directEditNameField();
-        }
-      }
-      else {
-    	  directEditNameField();
-      }
-    }
-  }
-  
-  protected void directEditNameField()
-  {
-    if (isFileReadOnly()) return;
-	  Object model = getModel();
-	  IFieldFigure fieldFigure = getFieldFigure();
-  	if ( model instanceof IField) 
-    {
-      IField field = (IField) model;
-      if (field.isReference())
-      {
-        ElementReferenceDirectEditManager manager = new ElementReferenceDirectEditManager((IField) model, this, fieldFigure.getNameLabel());
-        ReferenceUpdateCommand elementUpdateCommand = new ReferenceUpdateCommand();
-        elementUpdateCommand.setDelegate(manager);
-        adtDirectEditPolicy.setUpdateCommand(elementUpdateCommand);
-        manager.show();
-      }
-      else
-      {
-        LabelEditManager manager = new LabelEditManager(this, new LabelCellEditorLocator(this, null));
-        NameUpdateCommandWrapper wrapper = new NameUpdateCommandWrapper();
-        adtDirectEditPolicy.setUpdateCommand(wrapper);
-        manager.show();
-      }
-  	}
-  }
-  
-  public void doEditName(boolean addFromDesign)
-  {
-    if (!addFromDesign) return;
-    
-//    removeFeedback();
-
-    Runnable runnable = new Runnable()
-    {
-      public void run()
-      {
-        Object object = ((XSDBaseAdapter)getModel()).getTarget();
-        if (object instanceof XSDNamedComponent)
-        {
-          Point p = getNameLabelFigure().getLocation();
-          LabelEditManager manager = new LabelEditManager(BaseFieldEditPart.this, new LabelCellEditorLocator(BaseFieldEditPart.this, p));
-          NameUpdateCommandWrapper wrapper = new NameUpdateCommandWrapper();
-          adtDirectEditPolicy.setUpdateCommand(wrapper);
-          manager.show();
-        }
-      }
-    };
-    Display.getCurrent().asyncExec(runnable);
-
-  }
-  
-  protected class NameUpdateCommandWrapper extends Command implements IADTUpdateCommand
-  {
-    Command command;
-    protected DirectEditRequest request;
-    
-    public NameUpdateCommandWrapper()
-    {
-      super(Messages._UI_ACTION_UPDATE_NAME);
-    }
-
-    public void setRequest(DirectEditRequest request)
-    {
-      this.request = request;
-    }
-    
-    public void execute()
-    {
-      IField field = (IField)getModel();
-      Object newValue = request.getCellEditor().getValue();
-      if (newValue instanceof String)
-      {
-        command = field.getUpdateNameCommand((String)newValue);
-      }
-      if (command != null)
-        command.execute();
-    }
-  }
-  
-  class TypeUpdateCommand extends Command implements IADTUpdateCommand
-  {
-    protected ComboBoxCellEditorManager delegate;
-    protected DirectEditRequest request;
-    
-    public TypeUpdateCommand()
-    {
-      super(Messages._UI_ACTION_UPDATE_TYPE);
-    }
-
-    public void setDelegate(ComboBoxCellEditorManager delegate)
-    {                                           
-      this.delegate = delegate;
-    }
-    
-    public void setRequest(DirectEditRequest request)
-    {
-      this.request = request;
-    }
-    
-    public void execute()
-    {
-      if (delegate != null)
-      {
-        delegate.performEdit(request.getCellEditor());
-      }
-    }
-
-    public boolean canExecute()
-    {
-      IField field = (IField)getModel();
-      Object newValue = ((CCombo)request.getCellEditor().getControl()).getText();
-      if (newValue instanceof String)
-      {
-        return !newValue.equals(field.getTypeName());
-      }
-      return true;
-    }
-  }
-  
-  protected class ReferenceUpdateCommand extends Command implements IADTUpdateCommand
-  {
-	    protected ComboBoxCellEditorManager delegate;
-	    protected DirectEditRequest request;
-	    
-	    public ReferenceUpdateCommand()
-	    {
-	      super(Messages._UI_ACTION_UPDATE_ELEMENT_REFERENCE);
-	    }
-
-	    public void setDelegate(ComboBoxCellEditorManager delegate)
-	    {
-	      this.delegate = delegate;
-	    }
-
-	    public void setRequest(DirectEditRequest request)
-	    {
-	      this.request = request;
-	    }
-
-	    public void execute()
-	    {
-	      if (delegate != null)
-	      {
-	        delegate.performEdit(request.getCellEditor());
-	      }
-	    }
-
-	    public boolean canExecute()
-	    {
-	      return true;
-	    }
-  }
-
-
-  public void addFeedback()
-  {
-    // Put back connection figure so it won't get overlayed by other non highlighted connections
-    if (connectionFigure != null && !isSelected)
-    {
-      connectionFeedbackFigure = new TypeReferenceConnection();
-      connectionFeedbackFigure.setSourceAnchor(connectionFigure.getSourceAnchor());
-      connectionFeedbackFigure.setTargetAnchor(connectionFigure.getTargetAnchor());
-      connectionFeedbackFigure.setHighlight(true);
-      getLayer(LayerConstants.FEEDBACK_LAYER).add(connectionFeedbackFigure);
-    }
-     super.addFeedback();
-     getFieldFigure().addSelectionFeedback();
-  }
-  
-  public void removeFeedback()
-  {
-    if (connectionFeedbackFigure != null)
-    {
-      connectionFeedbackFigure.setHighlight(false);
-      getLayer(LayerConstants.FEEDBACK_LAYER).remove(connectionFeedbackFigure);
-    }
-    connectionFeedbackFigure = null;
-    super.removeFeedback();
-    getFieldFigure().removeSelectionFeedback();
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseTypeConnectingEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseTypeConnectingEditPart.java
deleted file mode 100644
index eebb8e6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BaseTypeConnectingEditPart.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.Iterator;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IFeedbackHandler;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.IADTUpdateCommand;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-
-/**
- * This class provides some base function to enable drawing connections to a referenced type
- *
- */
-public abstract class BaseTypeConnectingEditPart extends BaseEditPart implements IFeedbackHandler, IConnectionContainer
-{
-  private TypeReferenceConnection connectionFigure;  
-  
-  public void activate()
-  {
-    super.activate();         
-  }
-  
-  public void deactivate()
-  {
-    deactivateConnection();
-    super.deactivate();
-  }
-  
-  public void refreshConnections()
-  {
-    deactivateConnection();     
-    activateConnection();
-  }
-
-  protected void activateConnection()
-  {    
-    // If appropriate, create our connectionFigure and add it to the appropriate layer
-    if (connectionFigure == null && shouldDrawConnection())
-    {
-      //System.out.println("activateeConnection()-pre:" + getClass().getName());           
-      connectionFigure = createConnectionFigure();
-      if (connectionFigure != null)
-      {  
-        // Add our editpolicy as a listener on the connection, so it can stay in synch
-        //connectionFigure.addPropertyChangeListener((AttributeSelectionFeedbackPolicy) getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE));
-        //connectionFigure.addMouseListener(this);
-        getLayer(LayerConstants.CONNECTION_LAYER).add(connectionFigure);
-      }  
-    }
-  }
-  
-  protected void deactivateConnection()
-  {
-    // if we have a connection, remove it
-    if (connectionFigure != null)
-    {
-      getLayer(LayerConstants.CONNECTION_LAYER).remove(connectionFigure);
-      // Remove our editpolicy listener(s)
-      //connectionFigure.removePropertyChangeListener((AttributeSelectionFeedbackPolicy) getEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE));
-      //connectionFigure.removeMouseListener(this);
-      connectionFigure = null;
-    }
-  }  
-  
-  protected boolean shouldDrawConnection()
-  {
-    return true;
-  }
-  
-  public abstract TypeReferenceConnection createConnectionFigure();
-  
-  public void addFeedback()
-  {
-    if (connectionFigure != null)
-    {
-      connectionFigure.setHighlight(true);
-    }
-    super.addFeedback();
-  }
-  
-  public void removeFeedback()
-  {
-    if (connectionFigure != null)
-    {
-      connectionFigure.setHighlight(false);
-    }
-    super.removeFeedback();
-  }
-  
-  protected class NameUpdateCommandWrapper extends Command implements IADTUpdateCommand
-  {
-    Command command;
-    protected DirectEditRequest request;
-    
-    public NameUpdateCommandWrapper()
-    {
-      super(Messages._UI_ACTION_UPDATE_NAME);
-    }
-
-    public void setRequest(DirectEditRequest request)
-    {
-      this.request = request;
-    }
-    
-    public void execute()
-    {
-      IType iType = (IType)getModel();
-      Object newValue = request.getCellEditor().getValue();
-      if (newValue instanceof String)
-      {
-        command = iType.getUpdateNameCommand((String)newValue);
-      }
-      if (command != null)
-        command.execute();
-    }
-  }
-
-  public boolean hitTest(IFigure target, Point location)
-  {
-    Rectangle b = target.getBounds().getCopy();
-    target.translateToAbsolute(b);  
-    return b.contains(location);
-  }   
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-    EditPart result = null;        
-    if (direction == PositionConstants.WEST)
-    {    
-      result = getConnectionEditPart(PositionConstants.WEST);
-    }
-    else if (direction == PositionConstants.EAST)
-    {
-      result = getConnectionEditPart(PositionConstants.EAST);
-    }
-    return result;            
-  }        
-  
-  private EditPart getConnectionEditPart(int direction)
-  {
-    // find the first connection that targets this editPart
-    // navigate backward along the connection (to the left) to find the source edit part
-    EditPart result = null;
-    for (Iterator i = getLayer(LayerConstants.CONNECTION_LAYER).getChildren().iterator(); i.hasNext(); )
-    {
-      Figure figure = (Figure)i.next();
-      if (figure instanceof TypeReferenceConnection)
-      {
-        TypeReferenceConnection typeReferenceConnection = (TypeReferenceConnection)figure;
-        ConnectionAnchor thisAnchor = null;
-        if (direction == PositionConstants.EAST)
-        {
-          thisAnchor = typeReferenceConnection.getSourceAnchor();
-        }
-        else if (direction == PositionConstants.WEST)
-        {
-          thisAnchor = typeReferenceConnection.getTargetAnchor();
-        }
-        if (thisAnchor != null && thisAnchor.getOwner() == getFigure())
-        {
-          ConnectionAnchor outAnchor = null;
-          if (direction == PositionConstants.EAST)
-          {
-            outAnchor = typeReferenceConnection.getTargetAnchor();
-          }
-          else if (direction == PositionConstants.WEST)
-          {
-            outAnchor = typeReferenceConnection.getSourceAnchor();
-          }
-          
-          if (outAnchor != null)
-          {
-            IFigure sourceFigure = outAnchor.getOwner();          
-            EditPart part = null;
-            while (part == null && sourceFigure != null) 
-            {
-              part = (EditPart)getViewer().getVisualPartMap().get(sourceFigure);
-              sourceFigure = sourceFigure.getParent();
-            }          
-            result = part;
-            break;
-          }
-        }  
-      }                
-    }    
-    return result;
-  }      
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BoxEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BoxEditPart.java
deleted file mode 100644
index 89a85de..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/BoxEditPart.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.List;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.LineBorder;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Compartment;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.SimpleDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.BoxFigure;
-
-public abstract class BoxEditPart extends BaseTypeConnectingEditPart //IFeedbackHandler
-{  
-  protected List compartmentList = null;
-  protected SimpleDirectEditPolicy simpleDirectEditPolicy = new SimpleDirectEditPolicy();
-
-  protected Compartment[] getCompartments()
-  {
-    return null;
-  }
-  
-  protected IFigure createFigure()
-  {
-    BoxFigure figure = new BoxFigure();
-    LineBorder boxLineBorder = new LineBorder(1);
-    figure.setBorder(boxLineBorder);    
-    ToolbarLayout toolbarLayout = new ToolbarLayout();
-    toolbarLayout.setStretchMinorAxis(true);
-    figure.setLayoutManager(toolbarLayout);
-    // we should organize ITreeElement and integrate it with the facade
-    if (getModel() instanceof ITreeElement)
-    {
-      figure.getNameLabel().setIcon(((ITreeElement)getModel()).getImage());
-    }
-    return figure;
-  }
-  
-  public IFigure getContentPane()
-  {
-    return ((BoxFigure)getFigure()).getContentPane();
-  }
-    
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
-    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, simpleDirectEditPolicy);
-  }
-  
-   
-  public void addFeedback()
-  {
-    BoxFigure boxFigure = (BoxFigure)figure;
-    LineBorder boxFigureLineBorder = (LineBorder)boxFigure.getBorder();
-    boxFigureLineBorder.setWidth(2);
-    boxFigureLineBorder.setColor(ColorConstants.darkBlue);  
-    boxFigure.getHeadingFigure().setSelected(true);
-    figure.repaint();
-    super.addFeedback();
-  }
-  
-  public void removeFeedback()
-  {
-    BoxFigure boxFigure = (BoxFigure)figure;
-    LineBorder boxFigureLineBorder = (LineBorder)boxFigure.getBorder();
-    boxFigureLineBorder.setWidth(1);
-    boxFigureLineBorder.setColor(ColorConstants.black);
-    boxFigure.getHeadingFigure().setSelected(false);
-    figure.repaint();
-    super.removeFeedback();    
-  }
-  
-  protected ActionRegistry getEditorActionRegistry(IEditorPart editor)
-  {
-    return (ActionRegistry) editor.getAdapter(ActionRegistry.class);
-  }
-}  
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CenteredConnectionAnchor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CenteredConnectionAnchor.java
deleted file mode 100644
index 0c93b9d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CenteredConnectionAnchor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import org.eclipse.draw2d.AbstractConnectionAnchor;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.wst.xsd.ui.internal.design.figures.CenteredIconFigure;
-
-public class CenteredConnectionAnchor extends AbstractConnectionAnchor
-{
-  public static final int TOP = 0;
-  public static final int BOTTOM = 1;
-  public static final int LEFT = 2;
-  public static final int RIGHT = 3;
-
-  public static final int HEADER_LEFT = 4;
-  public static final int HEADER_RIGHT = 5;
-
-  private int location;
-  private int inset;
-  private int offset = 0;
-  private CenteredConnectionAnchor other;
-
-  public CenteredConnectionAnchor(IFigure owner, int location, int inset)
-  {
-    super(owner);
-    this.location = location;
-    this.inset = inset;
-  }
-
-  public CenteredConnectionAnchor(IFigure owner, int location, int inset, int offset)
-  {
-    this(owner, location, inset);
-    this.offset = offset;
-  }
-
-  public Point getLocation(Point reference)
-  {
-    Rectangle r = getOwner().getBounds();
-    int x, y;
-    switch (location)
-    {
-    case TOP:
-      x = r.right() - r.width / 2 + offset;
-      y = r.y + inset;
-      break;
-    case BOTTOM:
-      x = r.right() - r.width / 2 + offset;
-      y = r.bottom() - inset;
-      break;
-    case LEFT:
-      x = r.x + inset;
-      y = r.bottom() - r.height / 2 + offset;
-      break;
-    case RIGHT:
-      x = r.right() - inset;
-      y = r.bottom() - r.height / 2 + offset;
-      break;
-    case HEADER_LEFT:
-      x = r.x + inset;
-      y = r.y + offset;
-      break;
-    case HEADER_RIGHT:
-      x = r.right() - inset;
-      y = r.y + offset;
-      break;
-
-    default:
-      x = r.right() - r.width / 2;
-      y = r.bottom() - r.height / 2;
-    }
-    Point p = new Point(x, y);
-
-    if (!(getOwner() instanceof CenteredIconFigure))
-    {
-      getOwner().translateToAbsolute(p);
-    }
-    else
-    {
-      getOwner().translateToAbsolute(p);
-    }
-    
-    if (other != null)
-    {
-      // if within only one pixel of being vertical, we straighten up the line
-      Point p2 = other.getLocation(null);
-      if (Math.abs(p2.x - p.x) <= 1)
-      {
-        p.x = p2.x;
-      }  
-    }  
-    return p;
-  }
-
-  public Point getReferencePoint()
-  {
-    return getLocation(null);
-  }
-
-  public void setOther(CenteredConnectionAnchor other)
-  {
-    this.other = other;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ColumnEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ColumnEditPart.java
deleted file mode 100644
index 8eb4090..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ColumnEditPart.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.gef.EditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.AbstractModelCollection;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.ReferencedTypeColumn;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-
-public class ColumnEditPart extends BaseEditPart
-{         
-  protected int spacing = 20;  
-  protected int minorAlignment = -1;
-  protected boolean isHorizontal = false;
-  
-  public ColumnEditPart()
-  {    
-  }
-
-  public ColumnEditPart(boolean isHorizontal)
-  {
-    this.isHorizontal = isHorizontal;
-  }
-  
-  protected IFigure createFigure()
-  {
-    Figure figure = new Figure();
-    ToolbarLayout layout = new ToolbarLayout(isHorizontal);
-   
-    if (minorAlignment != -1)
-    {  
-      layout.setMinorAlignment(minorAlignment);
-    }  
-    layout.setStretchMinorAxis(false);
-    layout.setSpacing(spacing);
-    figure.setLayoutManager(layout);
-    return figure;
-  }
-  
-  public void setSpacing(int spacing)
-  {
-    this.spacing = spacing;
-    if (figure != null)
-    {  
-      ((ToolbarLayout)figure.getLayoutManager()).setSpacing(spacing);
-    }  
-  }
-  
-  public IComplexType getComplexType()
-  {
-    return (IComplexType)getModel();   
-  }
-
-  protected void createEditPolicies()
-  {
-    // TODO Auto-generated method stub
-  }
-  
-  protected List getModelChildren()
-  { 
-    AbstractModelCollection collection = (AbstractModelCollection)getModel();
-    return collection.getChildren();
-  }
-
-  public int getMinorAlignment()
-  {
-    return minorAlignment;
-  }
-
-  public void setMinorAlignment(int minorAlignment)
-  {
-    this.minorAlignment = minorAlignment;
-  }
-  
-  protected void refreshChildren()
-  {
-    super.refreshChildren();
-    if (getModel() instanceof ReferencedTypeColumn)
-    {
-      if (getParent().getChildren().size() > 0) 
-      {        
-        EditPart editPart = (EditPart)getParent().getChildren().get(0);
-        refreshConnections(editPart);
-      }  
-    }      
-    else
-    {
-      refreshConnections(this);      
-    }  
-  }
-  
-  
-  public void refreshConnections(EditPart parent)
-  {
-    for (Iterator i = parent.getChildren().iterator(); i.hasNext(); )
-    {
-      EditPart editPart = (EditPart)i.next();      
-      if (editPart instanceof BaseTypeConnectingEditPart)
-      {
-        BaseTypeConnectingEditPart connectingEditPart = (BaseTypeConnectingEditPart)editPart;
-        connectingEditPart.refreshConnections();
-      }  
-      refreshConnections(editPart);
-    }
-  }
-  
-  public boolean isSelectable()
-  {
-    return false;
-  }
-}
-
-
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CompartmentEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CompartmentEditPart.java
deleted file mode 100644
index 15f56e8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/CompartmentEditPart.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Annotation;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Compartment;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.ICompartmentFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-
-// TODO (cs) common-up with BoxEditPart (?)
-public class CompartmentEditPart extends BaseEditPart // implements
-                                                      // IFeedbackHandler
-{
-  protected Annotation annotation = new Annotation();
-
-  protected IFigure createFigure()
-  {
-    ICompartmentFigure figure = getFigureFactory().createCompartmentFigure(getModel());
-    return figure;
-  }
-
-  public IFigure getContentPane()
-  {
-    return getCompartmentFigure().getContentPane();
-  }
-  
-  public boolean hasContent()
-  {
-    // since the annotation always takes up 1 child, here's a convenience method to figure out if
-    return getChildren().size() > 1;
-  }
-
-  List getChildrenSansAnnotation()
-  {
-    List children = new ArrayList();
-    children.addAll(getChildren());
-    for (Iterator i = children.iterator(); i.hasNext(); )
-    {
-      EditPart child = (EditPart)i.next();
-      if (child.getModel() == annotation)
-      {
-        i.remove();
-        break;
-      }  
-    }  
-    return children;
-  }
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-    EditPart result = null;   
-    
-    // we compute the children sans the annotation EditPart
-    // since the annotation EditPart confuses our up/down key handling
-    List children = getChildrenSansAnnotation();
-    if (children.contains(editPart))
-    {  
-      if (direction == KeyBoardAccessibilityEditPolicy.OUT_TO_PARENT)
-      {
-        Compartment compartment = (Compartment)getModel();
-        for (EditPart parent = editPart.getParent(); parent != null; parent = parent.getParent())
-        {            
-          if (parent.getModel() == compartment.getOwner())
-          {
-            result = parent;
-            break;
-          }  
-        }  
-      }        
-      else if (direction == PositionConstants.SOUTH)
-      {    
-        int size = children.size();
-        if (size > 0)
-        {                        
-          if (children.get(size - 1) == editPart)
-          {  
-            CompartmentEditPart nextCompartment = (CompartmentEditPart)EditPartNavigationHandlerUtil.getNextSibling(CompartmentEditPart.this);
-            if (nextCompartment != null && nextCompartment.getChildrenSansAnnotation().size() > 0)
-            {            
-              result = EditPartNavigationHandlerUtil.getFirstChild(nextCompartment);
-            }
-            else
-            {
-              result = editPart;
-            }
-          }
-        }
-        if (result == null) result = EditPartNavigationHandlerUtil.getNextSibling(editPart);
-      }
-      else if (direction == PositionConstants.NORTH)
-      {
-        if (EditPartNavigationHandlerUtil.getFirstChild(CompartmentEditPart.this) == editPart)
-        {  
-          EditPart prevCompartment = EditPartNavigationHandlerUtil.getPrevSibling(CompartmentEditPart.this);
-          if (prevCompartment instanceof CompartmentEditPart)
-          {
-            List prevCompListChildren = ((CompartmentEditPart)prevCompartment).getChildrenSansAnnotation();
-            int size = prevCompListChildren.size();
-            if (size > 0)
-            {  
-              result = (EditPart)prevCompartment.getChildren().get(size - 1);
-            }  
-          }              
-        }
-        if (result == null) result = EditPartNavigationHandlerUtil.getPrevSibling(editPart);
-      }
-    }
-    return result;      
-  }
- 
-  protected void addChildVisual(EditPart childEditPart, int index)
-  {
-    Object model = childEditPart.getModel();
-
-    IFigure child = ((GraphicalEditPart) childEditPart).getFigure();
-
-    if (model instanceof IField)
-    {
-      getCompartmentFigure().getContentPane().add(child, index);
-      return;
-    }
-    else if (model instanceof Annotation)
-    {
-      getCompartmentFigure().getAnnotationPane().add(child);
-      return;
-    }
-    super.addChildVisual(childEditPart, index);
-  }
-
-  protected void removeChildVisual(EditPart childEditPart)
-  {
-    Object model = childEditPart.getModel();
-    IFigure child = ((GraphicalEditPart) childEditPart).getFigure();
-
-    if (model instanceof IField)
-    {
-      getCompartmentFigure().getContentPane().remove(child);
-      return;
-    }
-    else if (model instanceof Annotation)
-    {
-      getCompartmentFigure().getAnnotationPane().remove(child);
-      return;
-    }
-    super.removeChildVisual(childEditPart);
-  }
-
-  protected Compartment getCompartment()
-  {
-    return (Compartment) getModel();
-  }
-
-  protected List getModelChildren()
-  {
-    List children = getCompartment().getChildren();
-    children.add(annotation);
-    return children;
-  }
-  
-  public void setModel(Object model)
-  {
-    super.setModel(model);
-    annotation.setCompartment(getCompartment());
-  }
-
-  protected void refreshChildren()
-  {
-    super.refreshChildren();
-    // ((AbstractGraphicalEditPart)getParent()).getContentPane().invalidate();
-  }
-
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-  }
-
-  public void addFeedback()
-  {
-    // getFigure().setBackgroundColor(ColorConstants.blue);
-    // ((CompartmentFigure)getFigure()).setBorderColor(ColorConstants.black);
-    getFigure().repaint();
-  }
-
-  public void removeFeedback()
-  {
-    // getFigure().setBackgroundColor(ColorConstants.lightBlue);
-    // ((CompartmentFigure)getFigure()).setBorderColor(ColorConstants.lightGray);
-    getFigure().repaint();
-  }
-  
-  public ICompartmentFigure getCompartmentFigure()
-  {
-    return (ICompartmentFigure)figure;
-  }
-
-  public void addNotify()
-  {  
-    super.addNotify();
-    getCompartmentFigure().editPartAttached(this);   
-  }   
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ComplexTypeEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ComplexTypeEditPart.java
deleted file mode 100644
index 0eceb08..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/ComplexTypeEditPart.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.Iterator;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.ManhattanConnectionRouter;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.FocusTypeColumn;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-
-public class ComplexTypeEditPart extends StructureEditPart
-{
-  private Font italicFont;
-
-  protected boolean shouldDrawConnection()
-  {
-    if (getParent().getModel() instanceof FocusTypeColumn)
-    {  
-      IComplexType complexType = (IComplexType)getModel();
-      return complexType.getSuperType() != null;
-    } 
-    return false;
-  }
-  
-  
-  private EditPart getTargetEditPart(IType type)
-  {
-    ColumnEditPart columnEditPart = null;
-    for (EditPart editPart = this; editPart != null; editPart = editPart.getParent())
-    {
-      if (editPart instanceof ColumnEditPart)
-      {
-        columnEditPart = (ColumnEditPart)editPart;
-        break;
-      }  
-    }     
-    if (columnEditPart != null)
-    {
-      for (Iterator i = columnEditPart.getChildren().iterator(); i.hasNext(); )
-      {
-        EditPart child = (EditPart)i.next();
-        if (child.getModel() == type)
-        {
-          return child;
-        }         
-      }  
-    }
-    return null;
-  }
-  
-  public TypeReferenceConnection createConnectionFigure()
-  {
-    connectionFigure = null;
-    IComplexType complexType = (IComplexType)getModel();
-    IType type = complexType.getSuperType();
-    if (type != null)
-    {      
-      AbstractGraphicalEditPart referenceTypePart = (AbstractGraphicalEditPart)getTargetEditPart(type);
-      if (referenceTypePart != null)
-      {
-        connectionFigure = new TypeReferenceConnection(true);
-        // draw a line out from the top         
-        connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(getFigure(), CenteredConnectionAnchor.TOP, 1));
-        
-        // TODO (cs) need to draw the target anchor to look like a UML inheritance relationship
-        // adding a label to the connection would help to
-        connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(referenceTypePart.getFigure(), CenteredConnectionAnchor.BOTTOM, 0, 0));
-        connectionFigure.setConnectionRouter(new ManhattanConnectionRouter());
-        ((CenteredConnectionAnchor)connectionFigure.getSourceAnchor()).setOther((CenteredConnectionAnchor)connectionFigure.getTargetAnchor());
-        connectionFigure.setHighlight(false);
-      }
-    }    
-    return connectionFigure;
-  }
-
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    Label label = getNameLabelFigure();
-    IComplexType complexType = (IComplexType)getModel();
-    if (complexType.isAbstract())
-    {
-      if (italicFont == null)
-      {
-        Font font = label.getFont();
-        italicFont = getItalicFont(font);
-      }
-      if (italicFont != null)
-      {
-        label.setFont(italicFont);
-      }
-    }
-    else
-    {
-      label.setFont(label.getParent().getFont());
-    }
-  }
-  
-  public void deactivate()
-  {
-    if (italicFont != null)
-    {
-      italicFont.dispose();
-      italicFont = null;
-    }
-    super.deactivate();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/EditPartNavigationHandlerUtil.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/EditPartNavigationHandlerUtil.java
deleted file mode 100644
index c234b65..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/EditPartNavigationHandlerUtil.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-import java.util.List;
-import org.eclipse.gef.EditPart;
-
-
-public class EditPartNavigationHandlerUtil
-{  
-  public static EditPart getFirstChild(EditPart editPart)
-  {      
-    EditPart result = null;
-    if (editPart.getChildren().size() > 0)
-    {
-      result = (EditPart)editPart.getChildren().get(0);
-    }      
-    return result;
-  }
-  
-  public static EditPart getLastChild(EditPart editPart)
-  {      
-    EditPart result = null;
-    int size = editPart.getChildren().size();
-    if (size > 0)
-    {
-      result = (EditPart)editPart.getChildren().get(size - 1);
-    }      
-    return result;
-  }  
-  
-  public static EditPart getNextSibling(EditPart editPart)
-  {    
-    EditPart result = null;    
-    EditPart parent = editPart.getParent();
-    if (parent != null)
-    {  
-      List children = parent.getChildren();
-      int index = children.indexOf(editPart);
-      if (index + 1 < children.size())
-      {
-        result = (EditPart)children.get(index + 1);
-      }
-    }
-    return result;
-  }
-  
-  public static EditPart getPrevSibling(EditPart editPart)
-  {    
-    EditPart result = null;
-    EditPart parent = editPart.getParent();
-    if (parent != null)
-    {  
-      List children = parent.getChildren();
-      int index = children.indexOf(editPart);
-      if (index - 1 >= 0)
-      {
-        // if this is the first child
-        //        
-        result = (EditPart)children.get(index - 1);
-      } 
-    }
-    return result;
-  }     
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/FieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/FieldEditPart.java
deleted file mode 100644
index f17dd39..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/FieldEditPart.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-
-public class FieldEditPart extends BaseFieldEditPart
-{
-  public void addNotify()
-  {
-    super.addNotify();
-    getFieldFigure().editPartAttached(this);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IAutoDirectEdit.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IAutoDirectEdit.java
deleted file mode 100644
index bcd3186..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IAutoDirectEdit.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-/**
- * Edit parts that can be direct editable
- *  
- */
-public interface IAutoDirectEdit
-{
-  public void doEditName(boolean addFromDesign);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IConnectionContainer.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IConnectionContainer.java
deleted file mode 100644
index 1761253..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IConnectionContainer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-public interface IConnectionContainer
-{
-  public void refreshConnections();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IHolderEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IHolderEditPart.java
deleted file mode 100644
index 7f7a5ae..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/IHolderEditPart.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-public interface IHolderEditPart
-{
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/INamedEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/INamedEditPart.java
deleted file mode 100644
index b186c28..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/INamedEditPart.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-
-public interface INamedEditPart
-{
-  public Label getNameLabelFigure();
-
-  public void performDirectEdit(Point cursorLocation);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootContentEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootContentEditPart.java
deleted file mode 100644
index 5f3cd8d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootContentEditPart.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.Panel;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IGraphElement;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.RootHolder;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-
-public class RootContentEditPart extends BaseEditPart
-{
-  List collections = null;
-  Figure contentPane;
-  
-  protected IFigure createFigure()
-  {    
-    Panel panel = new Panel();    
-    panel.setBorder(new MarginBorder(60));
-   
-    ToolbarLayout panelLayout = new ToolbarLayout(false);
-    panelLayout.setStretchMinorAxis(true);
-    panel.setLayoutManager(panelLayout);
-    
-    contentPane = new Figure();
-    panel.add(contentPane);
-    
-    ToolbarLayout tb = new ToolbarLayout(false);
-    tb.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
-    tb.setStretchMinorAxis(true);
-    tb.setSpacing(40);
-    contentPane.setLayoutManager(tb);
-    
-    return panel;
-  }
-  
-  public IFigure getContentPane()
-  {
-    return contentPane;
-  }
-  
-  
-  public IComplexType getSelectedComplexType()
-  {
-    IComplexType result = null;
-    IModel model = (IModel)getModel();
-    List types = model.getTypes();
-    if (types.size() > 0)
-    {
-      if (types.get(0) instanceof IComplexType) 
-        result = (IComplexType)types.get(0);
-    }  
-    return result;
-  }
-
-  protected void createEditPolicies()
-  {
-    // TODO Auto-generated method stub
-  }
-  
-  protected List getModelChildren()
-  { 
-    collections = new ArrayList();
-    if (getModel() != null)
-    {
-      Object obj = getModel();
-      IADTObject focusObject = null;
-      if (obj instanceof IStructure)
-      {
-        if (obj instanceof IGraphElement)
-        {
-          if (((IGraphElement)obj).isFocusAllowed())
-            focusObject = (IStructure)obj;          
-        }
-      }
-      else if (obj instanceof IField)
-      {
-        focusObject = (IField)obj;
-      }  
-      else if (obj instanceof IModel)
-      {
-        focusObject = (IModel)obj;
-        collections.add(focusObject);
-        return collections;
-      }
-      else if (obj instanceof IType)
-      {
-        if (obj instanceof IGraphElement)
-        {
-          if (((IGraphElement)obj).isFocusAllowed())
-          {
-            focusObject = (IType)obj;
-          }
-        }
-      }
-      else if (obj instanceof IGraphElement)
-      {
-        if (((IGraphElement)obj).isFocusAllowed())
-        {
-          focusObject = (IADTObject)obj;
-          collections.add(focusObject);
-          return collections;
-        }
-      }
-      if (focusObject != null)
-      {
-        RootHolder holder = new RootHolder(focusObject);
-        collections.add(holder);
-        return collections;
-      }
-    }
-    return collections;
-  }
-    
-  
-  /**
-   * @deprecated Don't call this method.  Use DesignViewGraphicalViewer.setInput() instead.
-   */
-  public void setInput(Object component)
-  {
-    setModel(component);
-    refresh();
-  }
-  
-  /**
-   * @deprecated Don't call this method.  Use DesignViewGraphicalViewer.getInput() instead.
-   */
-  public Object getInput()
-  {
-    return getModel();
-  }
-  
-  public void refresh()
-  {
-    super.refresh();
-    /*
-    // once we're done refreshing we can assume all of the child editparts
-    // now we iteratre thru the list again and tell the children to update
-    // their connections
-    for (Iterator i = getChildren().iterator(); i.hasNext(); )
-    {
-      Object obj = i.next();
-      if (obj instanceof IConnectionContainer)
-      {
-        ((IConnectionContainer)obj).refreshConnections();
-      }
-    }*/
-    
-    for(Iterator i = getChildren().iterator(); i.hasNext(); )
-    {
-      Object obj = i.next();
-      if (obj instanceof AbstractGraphicalEditPart)
-      {
-        ((AbstractGraphicalEditPart)obj).refresh();
-      }
-    }
-
-  }
-  
-  // https://bugs.eclipse.org/bugs/show_bug.cgi?id=252589
-  public void activate()
-  {
-    super.activate();
-    Object model = getModel();
-    // The schema adapter doesn't have to notify the RootContentEditPart of it changes
-    if (model instanceof IADTObject)
-    {
-      IADTObject object = (IADTObject)model;
-      object.unregisterListener(this);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootEditPart.java
deleted file mode 100644
index fd87581..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootEditPart.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.beans.PropertyChangeEvent;
-import java.beans.PropertyChangeListener;
-import org.eclipse.draw2d.BendpointConnectionRouter;
-import org.eclipse.draw2d.ConnectionLayer;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Layer;
-import org.eclipse.draw2d.LayeredPane;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.LayerConstants;
-import org.eclipse.gef.editparts.ScalableRootEditPart;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewerGraphicConstants;
-
-public class RootEditPart extends ScalableRootEditPart implements org.eclipse.gef.RootEditPart
-{    
-  public void activate()
-  {
-    super.activate();
-    // Set up Connection layer with a router, if it doesn't already have one
-    ConnectionLayer connectionLayer = (ConnectionLayer) getLayer(LayerConstants.CONNECTION_LAYER);
-    if (connectionLayer != null)
-    {  
-      connectionLayer.setConnectionRouter(new BendpointConnectionRouter());
-    }
-
-    Figure figure = (Figure)getLayer(LayerConstants.FEEDBACK_LAYER);       
-    if (figure != null)
-    {      
-      if (getViewer() instanceof ScrollingGraphicalViewer)
-      {  
-        //ScrollingGraphicalViewer sgv = (ScrollingGraphicalViewer)getViewer();
-        //IndexFigure indexFigure = new IndexFigure(sgv);
-        //figure.add(indexFigure);
-        //getViewer().addPropertyChangeListener(indexFigure);
-      }  
-    }           
-    refresh();
-  }
-  
-  protected LayeredPane createPrintableLayers() 
-  {
-    LayeredPane pane = super.createPrintableLayers();    
-    Layer layer = new ScaledHandleLayer();
-    layer.setPreferredSize(new Dimension(5, 5));
-    pane.add(layer, DesignViewerGraphicConstants.SCALED_HANDLE_LAYER);    
-    return pane;
-  }  
-  
-  
-  class ScaledHandleLayer extends Layer
-  {
-    ScaledHandleLayer() 
-    {
-      setEnabled(true);
-    }
-    /**
-     * @see org.eclipse.draw2d.Figure#getPreferredSize(int, int)
-     */
-    public Dimension getPreferredSize(int wHint, int hHint) 
-    {
-      Rectangle rect = new Rectangle();
-      for (int i = 0; i < getChildren().size(); i++)
-        rect.union(((IFigure)getChildren().get(i)).getBounds());
-      return rect.getSize();
-    }
-  }  
-  
-  class IndexFigure extends RectangleFigure implements PropertyChangeListener
-  {
-    EditPart editPart;
-    ScrollingGraphicalViewer sgv;
-    public IndexFigure(ScrollingGraphicalViewer sgv)
-    {
-      this.sgv = sgv;      
-      ((FigureCanvas)sgv.getControl()).getViewport().getHorizontalRangeModel().addPropertyChangeListener(this);
-      ((FigureCanvas)sgv.getControl()).getViewport().getVerticalRangeModel().addPropertyChangeListener(this);
-      Rectangle bounds = new Rectangle(0, 0, 40, 40);
-      translateToAbsolute(bounds);      
-      setBounds(bounds);       
-    }
-    public void propertyChange(PropertyChangeEvent evt)
-    {
-      System.out.println("scroll-change");
-      Rectangle bounds = new Rectangle(0, 0, 40, 40);
-      Point p = ((FigureCanvas)sgv.getControl()).getViewport().getViewLocation();
-      bounds.translate(p);
-      setBounds(bounds); 
-    }
-    
-    public Rectangle getBounds()
-    {
-      Point p = ((FigureCanvas)sgv.getControl()).getViewport().getViewLocation();
-      bounds.translate(p);      
-      return super.getBounds().getCopy().translate(p);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootHolderEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootHolderEditPart.java
deleted file mode 100644
index a4ad059..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/RootHolderEditPart.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Panel;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.FocusTypeColumn;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.ReferencedTypeColumn;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.RootHolder;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-
-public class RootHolderEditPart extends BaseEditPart implements IHolderEditPart
-{
-  protected Panel panel;
-  
-  public RootHolderEditPart()
-  {
-  }
-
-  protected IFigure createFigure()
-  {
-    panel = new Panel();    
-    ToolbarLayout layout = new ToolbarLayout(true);
-    layout.setStretchMinorAxis(false);
-    layout.setSpacing(100);
-    panel.setLayoutManager(layout);    
-
-    return panel;
-  }
-
-  protected List getModelChildren()
-  {
-    List collections = new ArrayList();
-    RootHolder holder = (RootHolder)getModel();
-    IADTObject focusObject = holder.getModel();
-    collections.add(new FocusTypeColumn(focusObject));
-    collections.add(new ReferencedTypeColumn(focusObject));
-    return collections;
-  }
-
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-  }
-
-  public boolean isSelectable()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/SectionEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/SectionEditPart.java
deleted file mode 100644
index a25af47..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/SectionEditPart.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IComplexType;
-
-public class SectionEditPart extends BaseEditPart
-{
-  protected IComplexType complexType;
-  
-  protected IFigure createFigure()
-  {
-    Figure fig = new Figure();
-    fig.setLayoutManager(new ToolbarLayout());
-    return fig;
-  }
-
-  protected void createEditPolicies()
-  {
-
-  }
-  
-  public boolean isSelectable()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/StructureEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/StructureEditPart.java
deleted file mode 100644
index d3f079f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/StructureEditPart.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.requests.LocationRequest;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDComplexTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.Compartment;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.KeyBoardAccessibilityEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.figures.IStructureFigure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.wst.xsd.ui.internal.common.actions.OpenInNewEditor;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.SpaceFillerForFieldEditPart;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDSchema;
-
-public class StructureEditPart extends BaseTypeConnectingEditPart implements INamedEditPart
-{  
-  protected List compartmentList = null;
-  protected ADTDirectEditPolicy adtDirectEditPolicy = new ADTDirectEditPolicy();
-  protected TypeReferenceConnection connectionFigure;
-  protected TypeReferenceConnection connectionFeedbackFigure;
-
-  /**
-   * TODO cs... I'm sure this has something to do with the way we wanted to rework compartment creation
-   * I suppose we could have subclasses override this method instead of getModelChildren()
-   * 
-   * @deprecated
-   */
-  protected Compartment[] getCompartments()
-  {
-    return null;
-  }
-  
-  protected IFigure createFigure()
-  {
-    IStructureFigure figure = getFigureFactory().createStructureFigure(getModel());
-    return figure;
-  }
-  
-  public IStructureFigure getStructureFigure()
-  {
-    return (IStructureFigure)getFigure();
-  }
-  
-  public IFigure getContentPane()
-  {
-    return getStructureFigure().getContentPane();
-  }
-  
-  
-  public EditPart doGetRelativeEditPart(EditPart editPart, int direction)
-  {
-    EditPart result = null;               
-    if (direction == KeyBoardAccessibilityEditPolicy.IN_TO_FIRST_CHILD)
-    {          
-      for (Iterator i = getChildren().iterator(); i.hasNext();)
-      {            
-        CompartmentEditPart compartment = (CompartmentEditPart)i.next();
-        if (compartment.hasContent())
-        {
-          for (Iterator contentChildren = compartment.getChildren().iterator(); contentChildren.hasNext(); )
-          {
-            Object child = contentChildren.next();
-            if (child instanceof SectionEditPart)
-            {
-              SectionEditPart part = (SectionEditPart) child;
-              result = (EditPart)part.getChildren().get(0);
-              return result;
-            }
-            else if (child instanceof BaseFieldEditPart && (!(child instanceof SpaceFillerForFieldEditPart)))
-            {
-              result = (EditPart)child;
-              return result;
-            }
-          }
-        }  
-      }  
-    }    
-    else
-    {
-      return super.doGetRelativeEditPart(editPart, direction);
-    }  
-    return result;           
-  }
-  
-  protected void createEditPolicies()
-  {        
-    super.createEditPolicies();  
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
-    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
-  }
-  
-  protected IStructure getStructure()
-  {
-    return (IStructure)getModel();
-  }
-  
-  protected List getModelChildren()
-  {
-    if (compartmentList == null)
-    {
-      compartmentList = new ArrayList();
-      
-      // TODO.. this needs to be moved to the xsd specific version of this class 
-      compartmentList.add(new Compartment(getStructure(), "attribute")); //$NON-NLS-1$
-      compartmentList.add(new Compartment(getStructure(), "element"));    //$NON-NLS-1$
-    }  
-    return compartmentList;
-  }
-  
-  protected void refreshChildren()
-  {   
-    super.refreshChildren();
-    //getFigure().invalidateTree();    
-  }
-  
-  protected void refreshVisuals()
-  {
-    super.refreshVisuals();
-    getStructureFigure().refreshVisuals(getModel());
-  }
-  
-  public void addFeedback()
-  {
-    getStructureFigure().addSelectionFeedback();
-    super.addFeedback();
-  }
-  
-  public void removeFeedback()
-  {
-    getStructureFigure().removeSelectionFeedback();
-    super.removeFeedback();    
-  }
-
-  public Label getNameLabelFigure()
-  {
-    return getStructureFigure().getNameLabel();
-  }
-
-  public void performDirectEdit(Point cursorLocation)
-  {
-    
-  }
-
-  public void performRequest(Request request)
-  {  
-    if (request.getType() == RequestConstants.REQ_DIRECT_EDIT)
-    {
-      if (request instanceof LocationRequest)
-      {
-     // uncomment for direct edit of name (add else)
-//        LocationRequest locationRequest = (LocationRequest)request;
-//        Point p = locationRequest.getLocation();
-//        if (hitTest(getNameLabelFigure(), p))
-//        {
-//          LabelEditManager manager = new LabelEditManager(this, new LabelCellEditorLocator(this, p));
-//          NameUpdateCommandWrapper wrapper = new NameUpdateCommandWrapper();
-//          adtDirectEditPolicy.setUpdateCommand(wrapper);
-//          manager.show();
-//        }
-      }
-    }
-    else if (request.getType() == RequestConstants.REQ_OPEN)
-    {
-      Object model = getModel();
-      if (request instanceof LocationRequest)
-      {
-        LocationRequest locationRequest = (LocationRequest)request;
-        Point p = locationRequest.getLocation();
-         
-        if (getStructureFigure().hitTestHeader(p))
-        {          
-          // TODO: !!! This should be moved to the adt-xsd package
-          // 
-          if (model instanceof XSDComplexTypeDefinitionAdapter)     
-          {
-            XSDComplexTypeDefinitionAdapter adapter = (XSDComplexTypeDefinitionAdapter)model;
-            XSDComplexTypeDefinition ct = (XSDComplexTypeDefinition)adapter.getTarget();
-            IWorkbench workbench = PlatformUI.getWorkbench();
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-            IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-            Object schema = editorPart.getAdapter(XSDSchema.class);
-            ActionRegistry registry = getEditorActionRegistry(editorPart);
-            if (registry != null)
-            {
-              if (schema == ct.getSchema())
-              {
-                IAction action = registry.getAction(SetInputToGraphView.ID);
-                action.run();
-              }
-              else
-              {
-                IAction action = registry.getAction(OpenInNewEditor.ID);
-                action.run();
-              }
-            }
-          }          
-        }
-      }
-    }
-  }
-  
-  protected ActionRegistry getEditorActionRegistry(IEditorPart editor)
-  {
-    return (ActionRegistry) editor.getAdapter(ActionRegistry.class);
-  }
-  
-  protected boolean shouldDrawConnection()
-  {
-    return false;
-  }
-  
-  public TypeReferenceConnection createConnectionFigure()
-  {
-    return null;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/TopLevelFieldEditPart.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/TopLevelFieldEditPart.java
deleted file mode 100644
index 06c2db2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/TopLevelFieldEditPart.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-import org.eclipse.gef.RequestConstants;
-import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTDirectEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies.ADTSelectionFeedbackEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-import org.eclipse.wst.xsd.ui.internal.adt.typeviz.design.figures.BoxFigure;
-
-public class TopLevelFieldEditPart extends BoxEditPart implements INamedEditPart
-{
-  protected ADTDirectEditPolicy adtDirectEditPolicy = new ADTDirectEditPolicy();
-  private Font italicFont;
-  
-  protected boolean shouldDrawConnection()
-  {
-    IField field = (IField)getModel();
-    IType type = field.getType();
-    return (type != null);
-  }
-  
-  public TypeReferenceConnection createConnectionFigure()
-  {
-    TypeReferenceConnection connectionFigure = null;
-    IField field = (IField)getModel();
-    IType type = field.getType();
-    if (type != null)
-    {      
-      AbstractGraphicalEditPart referenceTypePart = (AbstractGraphicalEditPart)getViewer().getEditPartRegistry().get(type);
-      if (referenceTypePart != null)
-      {
-        connectionFigure = new TypeReferenceConnection();   
-        connectionFigure.setSourceAnchor(new CenteredConnectionAnchor(getFigure(), CenteredConnectionAnchor.RIGHT, 0));
-        int targetAnchorYOffset = 12;        
-        connectionFigure.setTargetAnchor(new CenteredConnectionAnchor(referenceTypePart.getFigure(), CenteredConnectionAnchor.HEADER_LEFT, 0, targetAnchorYOffset)); 
-        connectionFigure.setHighlight(false);
-      }
-    }    
-    return connectionFigure;
-  }  
-  
-  protected void createEditPolicies()
-  {
-    super.createEditPolicies();
-    installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, adtDirectEditPolicy);
-    installEditPolicy(EditPolicy.SELECTION_FEEDBACK_ROLE, new ADTSelectionFeedbackEditPolicy());
-  }
-
-  protected void refreshVisuals()
-  {
-    IField field = (IField)getModel();
-    BoxFigure boxFigure = (BoxFigure)getFigure();
-    Label label = boxFigure.getNameLabel();
-    label.setText(field.getName());
-    if (field.isAbstract())
-    {
-      if (italicFont == null)
-      {
-        Font font = label.getFont();
-        italicFont = getItalicFont(font);
-      }
-      if (italicFont != null)
-      {
-        label.setFont(italicFont);
-      }
-    }
-    else
-    {
-      label.setFont(label.getParent().getFont());
-    }
-    super.refreshVisuals();
-  }
-  
-  public void deactivate()
-  {
-    if (italicFont != null)
-    {
-      italicFont.dispose();
-      italicFont = null;
-    }
-    super.deactivate();
-  }
-  
-  public Label getNameLabelFigure()
-  {
-    BoxFigure boxFigure = (BoxFigure)getFigure();
-    return boxFigure.getNameLabel();
-  }
-
-  public void performDirectEdit(Point cursorLocation)
-  {
-   
-  }
-  
-  public void performRequest(Request request)
-  {  
-    if (request.getType() == RequestConstants.REQ_DIRECT_EDIT||
-        request.getType() == RequestConstants.REQ_OPEN)
-    {
-//      if (request instanceof LocationRequest)
-//      {
-//        LocationRequest locationRequest = (LocationRequest)request;
-//        Point p = locationRequest.getLocation();
-//       
-//        if (hitTest(getNameLabelFigure(), p))
-//        {
-//          LabelEditManager manager = new LabelEditManager(this, new LabelCellEditorLocator(this, p));
-//          NameUpdateCommandWrapper wrapper = new NameUpdateCommandWrapper();
-//          adtDirectEditPolicy.setUpdateCommand(wrapper);
-//          manager.show();
-//        }
-//      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/TypeReferenceConnection.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/TypeReferenceConnection.java
deleted file mode 100644
index 0d7da4a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/TypeReferenceConnection.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.ManhattanConnectionRouter;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Display;
-
-public class TypeReferenceConnection extends PolylineConnection
-{
-  protected boolean highlight = false;
-  protected static final Color activeConnection = ColorConstants.black;
-  protected static final Color inactiveConnection = new Color(null, 198, 195, 198);
-
-  /**
-   * Default constructor
-   */
-  public TypeReferenceConnection()
-  {
-    super();
-    setTargetDecoration(new PolygonDecoration());
-  }
-  
-  public TypeReferenceConnection(boolean fill)
-  {
-    super();
-    PolygonDecoration dec = new PolygonDecoration()
-    {
-      protected void fillShape(Graphics g)
-      {
-        try
-        {
-          g.pushState();
-          g.setBackgroundColor(ColorConstants.white);
-          super.fillShape(g);
-        }
-        finally
-        {
-          g.popState();
-        }
-      }
-      
-    };
-    dec.setFill(fill);
-    dec.setTemplate(PolygonDecoration.TRIANGLE_TIP);
-    dec.setScale(14,6);
-    setTargetDecoration(dec);
-  }
-  
-
-  public void setConnectionRouter(ConnectionRouter cr)
-  {
-    if (cr != null && getConnectionRouter() != null && !(getConnectionRouter() instanceof ManhattanConnectionRouter))
-      super.setConnectionRouter(cr);
-  }
-
-  /**
-   * @return Returns the current highlight status.
-   */
-  public boolean isHighlighted()
-  {
-    return highlight;
-  }
-
-  /**
-   * @param highlight
-   *          The highlight to set.
-   */
-  public void setHighlight(boolean highlight)
-  {
-    this.highlight = highlight;
-    // Update our connection to use the correct colouring
-    boolean highContrast = false;
-    try
-    {
-      highContrast = Display.getDefault().getHighContrast();
-    }
-    catch (Exception e)
-    {
-    }
-    if (highContrast)
-    {
-      setForegroundColor(highlight ? Display.getDefault().getSystemColor(SWT.COLOR_WIDGET_FOREGROUND) : ColorConstants.lightGray);
-    }
-    else
-    {
-      setForegroundColor(highlight ? activeConnection : inactiveConnection);
-    }
-    setOpaque(highlight);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/AbstractModelCollection.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/AbstractModelCollection.java
deleted file mode 100644
index dbeb88e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/AbstractModelCollection.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-
-public abstract class AbstractModelCollection implements IADTObject
-{
-  protected IADTObject model;
-  protected String kind;
-  
-  public AbstractModelCollection(IADTObject model, String kind)
-  {
-    this.model = model;
-    this.kind = kind;
-  }
-
-  public Object getModel()
-  {
-    return model;
-  }
-
-  public void setModel(IADTObject model)
-  {
-    this.model = model;
-  }
-
-  public String getKind()
-  {
-    return kind;
-  }
-
-  public void setKind(String kind)
-  {
-    this.kind = kind;
-  }
-  
-  public abstract List getChildren();
-
-  public void registerListener(IADTObjectListener listener)
-  {
-    model.registerListener(listener);
-  }
-
-  public void unregisterListener(IADTObjectListener listener)
-  {
-    model.unregisterListener(listener);
-  }
-  
-  public boolean isReadOnly()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/Annotation.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/Annotation.java
deleted file mode 100644
index 1f67a7f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/Annotation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-
-public class Annotation
-{
-  Compartment compartment;
-  public Annotation()
-  {
-    super();
-  }
-  
-  public void setCompartment(Compartment compartment)
-  {
-    this.compartment = compartment;
-  }
-  
-  public Compartment getCompartment()
-  {
-    return compartment;
-  }
-  
-  public IStructure getOwner()
-  {
-    return compartment.getOwner();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/Compartment.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/Compartment.java
deleted file mode 100644
index 628cd4f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/Compartment.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-
-public class Compartment implements IADTObject
-{
-  String kind;
-  IStructure owner;
-
-  public Compartment(IStructure owner, String kind)
-  {
-    this.kind = kind;
-    this.owner = owner;
-  }
-
-  public List getChildren()
-  {
-    List list = new ArrayList();
-    for (Iterator i = owner.getFields().iterator(); i.hasNext();)
-    {
-      IField field = (IField) i.next();
-      if (kind == null || kind.equals(field.getKind()))
-      {
-        list.add(field);
-      }
-    }
-    return list;
-  }
-
-  public String getKind()
-  {
-    return kind;
-  }
-  
-  public IStructure getOwner()
-  {
-    return owner;
-  }
-
-  public void registerListener(IADTObjectListener listener)
-  {
-    // really we want to listen to the owner
-    owner.registerListener(listener);
-  }
-
-  public void unregisterListener(IADTObjectListener listener)
-  {
-    // really we want to listen to the owner
-    owner.unregisterListener(listener);
-  }
-
-  public boolean isReadOnly()
-  {
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/FocusTypeColumn.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/FocusTypeColumn.java
deleted file mode 100644
index 60a6fc1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/FocusTypeColumn.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-
-public class FocusTypeColumn extends AbstractModelCollection
-{
-  protected boolean isFocusObject = false;
-  
-  public FocusTypeColumn(IADTObject model)
-  {
-    super(model, "FocusTypeColumn"); //$NON-NLS-1$  
-  }
-
-  public FocusTypeColumn(IADTObject model, boolean isFocusObject)
-  {
-    super(model, "FocusTypeColumn"); //$NON-NLS-1$
-    this.isFocusObject = isFocusObject;
-  }
-
-  public List getChildren()
-  {
-    List result = new ArrayList();  
-    if (model instanceof IType)
-    {
-      IType type = (IType)model;
-      if (type.getSuperType() != null)
-      {  
-        result.add(type.getSuperType());
-      }
-      result.add(type);
-    }  
-    else if (model instanceof IField ||
-             model instanceof IStructure)
-    {   
-      result.add(model);
-    }       
-    return result;       
-  }
-  
-  public boolean isFocusObject()
-  {
-    return isFocusObject;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IActionProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IActionProvider.java
deleted file mode 100644
index d8443fa..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IActionProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-
-
-public interface IActionProvider
-{
-  public String[] getActions(Object object);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IFeedbackHandler.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IFeedbackHandler.java
deleted file mode 100644
index 18e860b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IFeedbackHandler.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-public interface IFeedbackHandler
-{
-  public void addFeedback();
-  public void removeFeedback();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IGraphElement.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IGraphElement.java
deleted file mode 100644
index 9b2f5cb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IGraphElement.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.gef.commands.Command;
-
-public interface IGraphElement
-{
-  boolean isFocusAllowed();
-  IADTObject getTopContainer();
-  Command getDeleteCommand();
-  IModel getModel();
-  boolean isReadOnly();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IModelProxy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IModelProxy.java
deleted file mode 100644
index f263c38..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/IModelProxy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-
-public interface IModelProxy
-{
-  IModel getModel();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/ReferencedTypeColumn.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/ReferencedTypeColumn.java
deleted file mode 100644
index 95f8970..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/ReferencedTypeColumn.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IField;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IStructure;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IType;
-
-public class ReferencedTypeColumn extends AbstractModelCollection
-{
-  List listenerList = new ArrayList();
-  InternalListener internalListener = new InternalListener();
-  
-  // todo... really this this model object should listen
-  // to the parent of the IType
-  //
-  public ReferencedTypeColumn(IADTObject model)
-  {
-    super(model, "ReferencedTypeColumn"); //$NON-NLS-1$
-    model.registerListener(internalListener);
-    internalListener.recomputeSubListeners();
-  }
-
-  public List getChildren()
-  {
-    List result = new ArrayList();  
-    if (model instanceof IStructure)
-    {
-      IStructure structure = (IStructure)model;
-      for (Iterator i = structure.getFields().iterator(); i.hasNext(); )
-      {
-        IField field = (IField)i.next();
-        IType type = field.getType();
-        if (type != null)  // && type.isComplexType())
-        {
-          if (!result.contains(type))
-          {
-            if (type instanceof IGraphElement)
-            {
-              if (((IGraphElement)type).isFocusAllowed())
-                result.add(type);
-            }
-          }  
-        }  
-      }        
-    }  
-    else if (model instanceof IField)
-    {
-      IField field = (IField)model;
-      IType type = field.getType();
-      if (type != null) //  && type.isComplexType())
-      {
-        if (type instanceof IGraphElement)
-        {
-          if (((IGraphElement)type).isFocusAllowed())
-            result.add(type);        
-        }
-      }
-    }  
-    return result;
-  }  
-  
-  public void registerListener(IADTObjectListener listener)
-  {
-    listenerList.add(listener);
-  }
-
-  public void unregisterListener(IADTObjectListener listener)
-  {
-    listenerList.remove(listener);
-  }   
-  
-  protected void notifyListeners(Object changedObject, String property)
-  {
-    List clonedListenerList = new ArrayList();
-    clonedListenerList.addAll(listenerList);
-    for (Iterator i = clonedListenerList.iterator(); i.hasNext(); )
-    {
-      IADTObjectListener listener = (IADTObjectListener)i.next();
-      listener.propertyChanged(this, null);
-    } 
-  }   
-  
-  protected class InternalListener implements IADTObjectListener
-  {
-    List fields = new ArrayList();
-
-    void recomputeSubListeners()
-    {
-      if (model instanceof IStructure)
-      {  
-        // remove old ones
-        for (Iterator i = fields.iterator(); i.hasNext();)
-        {
-          IField field = (IField) i.next();
-          field.unregisterListener(this);
-        }
-        // add new ones
-        fields.clear();
-        IStructure complexType = (IStructure) model;
-        for (Iterator i = complexType.getFields().iterator(); i.hasNext();)
-        {
-          IField field = (IField) i.next();
-          fields.add(field);
-          field.registerListener(this);
-        }
-      }
-    }
-
-    public void propertyChanged(Object object, String property)
-    {
-      if (object == model)
-      {
-        // we need to update the fields we're listening too
-        // since these may have changed
-        recomputeSubListeners();
-      }
-      else if (object instanceof IField)
-      {
-      }  
-      notifyListeners(object, property);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/RootHolder.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/RootHolder.java
deleted file mode 100644
index ca7b3a6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editparts/model/RootHolder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 22007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-
-public class RootHolder
-{
-  IADTObject model;
-
-  public RootHolder(IADTObject model)
-  {
-    this.model = model;
-  }
-
-  public IADTObject getModel()
-  {
-    return model;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/ADTDirectEditPolicy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/ADTDirectEditPolicy.java
deleted file mode 100644
index b7f22b3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/ADTDirectEditPolicy.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-import org.eclipse.wst.xsd.ui.internal.adt.design.directedit.ComboBoxCellEditorManager;
-
-public class ADTDirectEditPolicy extends DirectEditPolicy
-{
-  protected ComboBoxCellEditorManager delegate;
-  protected IADTUpdateCommand command;
-
-  public ADTDirectEditPolicy()
-  {
-    super();
-  }
-
-  
-  public void setUpdateCommand(IADTUpdateCommand command)
-  {
-    this.command = command;
-  }
-  
-  protected void showCurrentEditValue(DirectEditRequest request) 
-  {      
-    getHostFigure().getUpdateManager().performUpdate();
-  }
-
-  protected Command getDirectEditCommand(DirectEditRequest request)
-  {
-    command.setRequest(request);
-    return (Command)command; 
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/ADTSelectionFeedbackEditPolicy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/ADTSelectionFeedbackEditPolicy.java
deleted file mode 100644
index 0747165..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/ADTSelectionFeedbackEditPolicy.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies;
-
-import org.eclipse.gef.editpolicies.SelectionEditPolicy;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IFeedbackHandler;
-
-public class ADTSelectionFeedbackEditPolicy extends SelectionEditPolicy
-{
-
-  public ADTSelectionFeedbackEditPolicy()
-  {
-    super();
-  }
-
-  protected void hideSelection()
-  {
-    if (getHost() instanceof IFeedbackHandler)
-    {
-      ((IFeedbackHandler) getHost()).removeFeedback();
-    }
-  }
-
-  protected void showSelection()
-  {
-    if (getHost() instanceof IFeedbackHandler)
-    {
-      ((IFeedbackHandler) getHost()).addFeedback();
-    }
-  }
-  
-  protected void showFocus()
-  {
-    super.showFocus();
-    getHost().setFocus(true);
-  }
-  
-  protected void hideFocus()
-  {
-    super.hideFocus();
-    getHost().setFocus(false);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/DirectEditPolicyDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/DirectEditPolicyDelegate.java
deleted file mode 100644
index 151b493..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/DirectEditPolicyDelegate.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies;
-   
-import org.eclipse.jface.viewers.CellEditor;
-
-public interface DirectEditPolicyDelegate
-{       
-  public void performEdit(CellEditor cellEditor);  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/IADTUpdateCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/IADTUpdateCommand.java
deleted file mode 100644
index a4c4eb5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/IADTUpdateCommand.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies;
-
-import org.eclipse.gef.requests.DirectEditRequest;
-
-public interface IADTUpdateCommand
-{
-  void setRequest(DirectEditRequest request);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/KeyBoardAccessibilityEditPolicy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/KeyBoardAccessibilityEditPolicy.java
deleted file mode 100644
index dd0ee63..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/KeyBoardAccessibilityEditPolicy.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.editpolicies.GraphicalEditPolicy;
-
-public class KeyBoardAccessibilityEditPolicy extends GraphicalEditPolicy
-{
-  public static String KEY = "KeyBoardAccessibilityEditPolicy";
-  
-  public static int OUT_TO_PARENT = PositionConstants.ALWAYS_LEFT;
-  public static int IN_TO_FIRST_CHILD = PositionConstants.ALWAYS_RIGHT;
-  
-  public EditPart getRelativeEditPart(EditPart editPart, int direction)
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/SimpleDirectEditPolicy.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/SimpleDirectEditPolicy.java
deleted file mode 100644
index 4e38e39..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/editpolicies/SimpleDirectEditPolicy.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.editpolicies;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.editpolicies.DirectEditPolicy;
-import org.eclipse.gef.requests.DirectEditRequest;
-                                   
-public class SimpleDirectEditPolicy extends DirectEditPolicy 
-{
-  protected DirectEditPolicyDelegate delegate;
-
-  public void setDelegate(DirectEditPolicyDelegate delegate)
-  {                                           
-    this.delegate = delegate;
-  }
-
-  protected org.eclipse.gef.commands.Command getDirectEditCommand(final DirectEditRequest request) 
-  { 
-  	return new Command() //AbstractCommand()
-    {
-      public void execute()
-      {                       
-        if (delegate != null)
-        {
-          delegate.performEdit(request.getCellEditor());
-        }  
-      }     
-  
-      public void redo()
-      {
-      }  
-  
-      public void undo()
-      {
-      }     
-  
-      public boolean canExecute()
-      {
-        return true;
-      }
-    };
-  }
-  
-  protected void showCurrentEditValue(DirectEditRequest request) 
-  {      
-  	//hack to prevent async layout from placing the cell editor twice.
-  	getHostFigure().getUpdateManager().performUpdate();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IADTFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IADTFigure.java
deleted file mode 100644
index 284a260..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IADTFigure.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-
-public interface IADTFigure extends IFigure
-{
-  void editPartAttached(EditPart owner); 
-  void addSelectionFeedback();
-  void removeSelectionFeedback();
-  void refreshVisuals(Object model);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/ICompartmentFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/ICompartmentFigure.java
deleted file mode 100644
index 3e25def..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/ICompartmentFigure.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.figures;
-
-import org.eclipse.draw2d.IFigure;
-
-public interface ICompartmentFigure extends IADTFigure
-{
-  IFigure getContentPane();
-  IFigure getAnnotationPane();  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IFieldFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IFieldFigure.java
deleted file mode 100644
index efabeb0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IFieldFigure.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.figures;
-
-import org.eclipse.draw2d.Label;
-
-
-public interface IFieldFigure extends IADTFigure
-{
-  Label getTypeLabel();
-  Label getNameLabel();
-  Label getNameAnnotationLabel();
-  Label getTypeAnnotationLabel();
-  void recomputeLayout();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IFigureFactory.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IFigureFactory.java
deleted file mode 100644
index d6efe61..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IFigureFactory.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.figures;
-
-public interface IFigureFactory
-{
-  IFieldFigure createFieldFigure(Object model);
-  IStructureFigure createStructureFigure(Object model);
-  ICompartmentFigure createCompartmentFigure(Object model);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IStructureFigure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IStructureFigure.java
deleted file mode 100644
index 5a96af2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/design/figures/IStructureFigure.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.design.figures;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.geometry.Point;
-
-public interface IStructureFigure extends IADTFigure
-{
-  IFigure getContentPane();
-  Label getNameLabel();
-  boolean hitTestHeader(Point point);  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/ComponentReferenceEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/ComponentReferenceEditManager.java
deleted file mode 100644
index 46ac99a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/ComponentReferenceEditManager.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.edit;
-
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentDescriptionProvider;
-
-public interface ComponentReferenceEditManager
-{
-  public IComponentDialog getBrowseDialog();
-  public IComponentDialog getNewDialog();
-  public void modifyComponentReference(Object referencingObject, ComponentSpecification referencedComponent);
-  public IComponentDescriptionProvider getComponentDescriptionProvider();
-  
-  public ComponentSpecification[] getQuickPicks();
-  public ComponentSpecification[] getHistory();
-  public void addToHistory(ComponentSpecification component);  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/ComponentReferenceEditManager2.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/ComponentReferenceEditManager2.java
deleted file mode 100644
index c01312d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/ComponentReferenceEditManager2.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.edit;
-
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-
-public interface ComponentReferenceEditManager2 extends ComponentReferenceEditManager
-{
-  void setReferencer(IADTObject field);
-  IADTObject getReferencer();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/IComponentDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/IComponentDialog.java
deleted file mode 100644
index 4194f9b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/edit/IComponentDialog.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.edit;
-
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-
-public interface IComponentDialog  {
-  
-	/*
-	 * Set the Object being set
-	 */
-	public void setInitialSelection(ComponentSpecification componentSpecification);
-	
-	/*
-	 * Return the Object which should be used as the type.
-	 */
-	public ComponentSpecification getSelectedComponent();
-	
-	/*
-	 * Used to open the Dialog
-	 */
-	public int createAndOpen();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTExternalResourceVariant.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTExternalResourceVariant.java
deleted file mode 100644
index 19f5aaf..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTExternalResourceVariant.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.SocketTimeoutException;
-import java.net.URL;
-import java.net.URLConnection;
-
-import org.eclipse.core.resources.IEncodedStorage;
-import org.eclipse.core.resources.IResourceStatus;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.PlatformObject;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentTypeManager;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class ADTExternalResourceVariant extends PlatformObject
-{
-  private IStorage storage;
-  private String urlString;
-
-  public static String getCharset(String name, InputStream stream) throws IOException
-  {
-    IContentDescription description = getContentDescription(name, stream);
-    return description == null ? null : description.getCharset();
-  }
-
-  public static IContentDescription getContentDescription(String name, InputStream stream) throws IOException
-  {
-    IContentTypeManager contentTypeManager = Platform.getContentTypeManager();
-    try
-    {
-      return contentTypeManager.getDescriptionFor(stream, name, IContentDescription.ALL);
-    }
-    finally
-    {
-      if (stream != null)
-      {
-        try
-        {
-          stream.close();
-        }
-        catch (IOException e)
-        {
-
-        }
-      }
-    }
-  }
-
-  public ADTExternalResourceVariant(String urlString)
-  {
-    this.urlString = urlString;
-  }
-
-  class XSDResourceVariantStorage implements IEncodedStorage
-  {
-
-    protected File getFile()
-    {
-      return new File(urlString);
-    }
-
-    public InputStream getContents() throws CoreException
-    {
-      try
-      {
-          URL url = new URL(urlString);
-          URLConnection urlConnection = url.openConnection();
-          return urlConnection.getInputStream();
-      }
-      catch (SocketTimeoutException toException)
-      {
-        // handle
-      }
-      catch (IOException e)
-      {
-
-      }
-      return new ByteArrayInputStream(new byte[0]);
-    }
-
-    public IPath getFullPath()
-    {
-      return new Path(urlString);
-    }
-
-    public String getName()
-    {
-      return getFullPath().toFile().getName();
-    }
-
-    public boolean isReadOnly()
-    {
-      return true;
-    }
-
-    public Object getAdapter(Class adapter)
-    {
-      return ADTExternalResourceVariant.this.getAdapter(adapter);
-    }
-
-    public String getCharset() throws CoreException
-    {
-      InputStream contents = getContents();
-      try
-      {
-        String charSet = ADTExternalResourceVariant.getCharset(getName(), contents);
-        return charSet;
-      }
-      catch (IOException e)
-      {
-        throw new CoreException(new Status(IStatus.ERROR, XSDEditorPlugin.PLUGIN_ID, IResourceStatus.FAILED_DESCRIBING_CONTENTS, NLS.bind("", new String[] { getFullPath().toString() }), e));
-      }
-      finally
-      {
-        try
-        {
-          contents.close();
-        }
-        catch (IOException ioException)
-        {
-
-        }
-      }
-    }
-  }
-
-  public IStorage getStorage()
-  {
-    if (storage == null)
-    {
-      storage = new XSDResourceVariantStorage();
-    }
-    return storage;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTFileStoreEditorInput.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTFileStoreEditorInput.java
deleted file mode 100644
index d9fc877..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTFileStoreEditorInput.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDSchema;
-
-public class ADTFileStoreEditorInput extends FileStoreEditorInput implements IADTEditorInput
-{
-  private XSDSchema schema;
-  private String editorName;
-
-  public ADTFileStoreEditorInput(IFileStore fileStore, XSDSchema xsdSchema)
-  {
-    super(fileStore);
-    this.schema = xsdSchema;
-  }
-
-  public XSDSchema getSchema()
-  {
-    return schema;
-  }
-
-  public void setEditorName(String name)
-  {
-    editorName = name;
-  }
-
-  public String getName()
-  {
-    if (editorName != null)
-    {
-      return editorName;
-    }
-    return super.getName();
-  }
-
-  public String getToolTipText()
-  {
-    if (schema != null)
-    {
-      String ns = schema.getTargetNamespace();
-      if (ns != null && ns.length() > 0)
-        return Messages._UI_LABEL_TARGET_NAMESPACE + ns;
-      else
-        return Messages._UI_LABEL_NO_NAMESPACE;
-    }
-    return super.getToolTipText();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTMultiPageEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTMultiPageEditor.java
deleted file mode 100644
index 34ff17a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTMultiPageEditor.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gef.GraphicalViewer;
-import org.eclipse.gef.SelectionManager;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.SetInputToGraphView;
-import org.eclipse.wst.xsd.ui.internal.adt.design.ADTFloatingToolbar;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewGraphicalViewer;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.ADTEditPartFactory;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ADTContentOutlinePage;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ADTLabelProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ExtensibleContentOutlinePage;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public abstract class ADTMultiPageEditor extends CommonMultiPageEditor
-{
-  protected IModel model;
-  private int currentPage = -1;
-  protected Button tableOfContentsButton;
-  protected ADTFloatingToolbar floatingToolbar;
-  
-  /**
-   * Creates a multi-page editor example.
-   */
-  public ADTMultiPageEditor()
-  {
-    super();
-  }
-
-  
-  private class InternalLayout extends StackLayout
-  {
-    public InternalLayout()
-    {
-      super();  
-    }
-    
-    protected void layout(Composite composite, boolean flushCache)
-    {
-      Control children[] = composite.getChildren();
-      Rectangle rect = composite.getClientArea();
-      rect.x += marginWidth;
-      rect.y += marginHeight;
-      rect.width -= 2 * marginWidth;
-      rect.height -= 2 * marginHeight;
-      
-      for (int i = 0; i < children.length; i++) 
-      {
-        if (i == 0)  // For the back to schema button 
-        { 
-          org.eclipse.draw2d.geometry.Rectangle r = ((GraphicalEditPart)floatingToolbar.getContents()).getFigure().getBounds();
-          children[i].setBounds(rect.x + 10, rect.y + 10, r.width, Math.max(24, r.height));
-        }
-        else if (i == 1 && modeCombo != null) // For the drop down toolbar
-        {
-          children[i].setBounds(rect.x + rect.width - 90 - maxLength, rect.y + 10, maxLength + 60, 26);
-        }
-        else // For the main graph viewer
-        {
-          children[i].setBounds(rect);          
-        }
-      }       
-    }               
-  }
-  
-  protected Composite createGraphPageComposite()
-  {    
-    Composite parent = new Composite(getContainer(), SWT.FLAT);
-    parent.setBackground(ColorConstants.white);
-    
-    parent.setLayout(new InternalLayout());
-
-    floatingToolbar = new ADTFloatingToolbar(getModel());
-    floatingToolbar.createControl(parent);
-    floatingToolbar.getControl().setVisible(true);
-    EditPartFactory editPartFactory = getEditorModeManager().getCurrentMode().getEditPartFactory();
-    floatingToolbar.setEditPartFactory(editPartFactory);
-    
-    createViewModeToolbar(parent);
-    
-    return parent;
-  }
-  
-  protected void createGraphPage()
-  {
-    super.createGraphPage(); 
-//    toolbarViewer.getControl().moveAbove(graphicalViewer.getControl());
-//    graphicalViewer.getControl().moveBelow(toolbarViewer.getControl());
-  }
-  
-  public String getContributorId()
-  {
-    return "org.eclipse.wst.xsd.ui.internal.editor"; //$NON-NLS-1$
-  }
-  
-  public IContentOutlinePage getContentOutlinePage()
-  {
-    if (fOutlinePage == null || fOutlinePage.getControl() == null || fOutlinePage.getControl().isDisposed())
-    {
-      final ProductCustomizationProvider productCustomizationProvider = (ProductCustomizationProvider)getAdapter(ProductCustomizationProvider.class);
-      ExtensibleContentOutlinePage outlinePage = null;
-      if (productCustomizationProvider != null)
-      {
-        outlinePage = productCustomizationProvider.getProductContentOutlinePage();
-      }
-      
-      if (outlinePage == null)
-      {
-        outlinePage = new ADTContentOutlinePage();
-      }
-      outlinePage.setEditor(this);
-      ITreeContentProvider provider = (ITreeContentProvider)getEditorModeManager().getCurrentMode().getOutlineProvider();
-      outlinePage.setContentProvider(provider);
-      ADTLabelProvider adtLabelProvider = new ADTLabelProvider();
-      outlinePage.setLabelProvider(adtLabelProvider);
-      outlinePage.setModel(getModel());
-      fOutlinePage = outlinePage;
-    }
-    return fOutlinePage;
-  }
-
-  /**
-   * Creates the pages of the multi-page editor.
-   */
-  protected void createPages()
-  {
-    selectionProvider = getSelectionManager();
-    
-    createGraphPage();
-    createSourcePage();
-    
-    getEditorSite().setSelectionProvider(selectionProvider);
-
-    model = buildModel();  // (IFileEditorInput)getEditorInput());
-    
-    initializeGraphicalViewer();
-    floatingToolbar.setModel(model);
-    
-    int pageIndexToShow = getDefaultPageTypeIndex();
-    setActivePage(pageIndexToShow);
-  }
-
-  protected int getDefaultPageTypeIndex() {
-    int pageIndex = SOURCE_PAGE_INDEX;
-    if (XSDEditorPlugin.getPlugin().getDefaultPage().equals(XSDEditorPlugin.DESIGN_PAGE)) {
-        pageIndex = DESIGN_PAGE_INDEX;
-    }
-
-    return pageIndex;
-  }
-  
-  /**
-   * @see org.eclipse.ui.IWorkbenchPart#setFocus()
-   */
-  public void setFocus()
-  {
-    super.setFocus();
-    if (getActivePage() == DESIGN_PAGE_INDEX)
-    {
-      if (graphicalViewer != null && graphicalViewer.getControl() != null)
-      {
-        List selected = graphicalViewer.getSelectedEditParts();
-        if (selected.size() > 0)
-        {
-          graphicalViewer.setFocus((EditPart)selected.get(0));
-        }
-        graphicalViewer.getControl().setFocus();
-        
-      }
-    }
-    else
-    {
-      graphicalViewer.setFocus(null);
-    }
-  }
-
-  protected void pageChange(int newPageIndex)
-  {
-    currentPage = newPageIndex;
-    super.pageChange(newPageIndex);
-    
-    if (newPageIndex == DESIGN_PAGE_INDEX)
-    {
-      ISelection selection = graphicalViewer.getSelectionManager().getSelection();
-      Object model = null;
-      if (selection instanceof StructuredSelection)
-      {
-        StructuredSelection structuredSelection = (StructuredSelection)selection;
-        // While in the source view, selection could have changed.
-        // Will try to select the first item when switching back to the design view.
-        // We currently do not multi-select figures if multiple elements are selected in the source view.
-        // For example, if multiple global elements are selected, the graph view will be in the details view
-        // of the first one.
-        Object elem = structuredSelection.getFirstElement();
-        if (elem instanceof EditPart)
-          model = ((EditPart)elem).getModel();
-      }
-      // Refresh the design page upon page change
-      graphicalViewer.getContents().refresh();
-      // Need to use the adapter, since after refresh, the old edit part will have been replaced
-      // Maintain previous selection:
-      if (model != null)
-      {
-        getSelectionManager().setSelection(new StructuredSelection(model));
-      }
-    }
-    setFocus();
-  }
-  
-  private boolean isTableOfContentsApplicable(Object graphViewInput)
-  {
-    return !(graphViewInput instanceof IModel);
-  }
-
-  protected ScrollingGraphicalViewer getGraphicalViewer()
-  {
-    DesignViewGraphicalViewer viewer = new DesignViewGraphicalViewer(this, getSelectionManager());
-    viewer.addInputChangdListener(new ISelectionChangedListener()
-    {
-      public void selectionChanged(SelectionChangedEvent event)
-      {        
-        IStructuredSelection input = (IStructuredSelection)event.getSelection();
-        floatingToolbar.refresh(isTableOfContentsApplicable(input.getFirstElement()));
-      }      
-    });
-    // Workaround bug 227687 An edit part's focus state is not updated properly
-    // Once this is bug is fixed, we can remove custom selection manager
-    viewer.setSelectionManager(new CustomSelectionManager());
-    return viewer;
-  }
-
-  // Workaround bug 227687 An edit part's focus state is not updated properly
-  // Once this is bug is fixed, we can remove this class
-  private class CustomSelectionManager extends SelectionManager
-  {
-    public void appendSelection(EditPart editpart)
-    {
-      if (editpart != getFocus())
-        getViewer().setFocus(editpart);
-      super.appendSelection(editpart);
-    }
-  }
-  
-  abstract public IModel buildModel();  // (IFileEditorInput editorInput);
-  
-  protected void createActions()
-  {
-    ActionRegistry registry = getActionRegistry();
-    
-    BaseSelectionAction action = new SetInputToGraphView(this);
-    action.setSelectionProvider(getSelectionManager());
-    registry.registerAction(action);
-  }
-
-
-  public IModel getModel()
-  {
-    return model;
-  }
-
-  public Object getAdapter(Class type)
-  {
-    if (type == ZoomManager.class)
-      return graphicalViewer.getProperty(ZoomManager.class.toString());
-    
-    if (type == GraphicalViewer.class)
-      return graphicalViewer;
-    if (type == EditPart.class && graphicalViewer != null)
-      return graphicalViewer.getRootEditPart();
-    if (type == IFigure.class && graphicalViewer != null)
-      return ((GraphicalEditPart) graphicalViewer.getRootEditPart()).getFigure();
-
-    if (type == IContentOutlinePage.class)
-    {
-      return getContentOutlinePage();
-    }
-
-    return super.getAdapter(type);
-  }
-
-  protected EditPartFactory getEditPartFactory() {
-    return new ADTEditPartFactory();
-  }
-
-  protected void initializeGraphicalViewer()
-  {
-    graphicalViewer.setContents(model);
-  }
-  
-  public void dispose()
-  {
-    if (currentPage == SOURCE_PAGE_INDEX)
-    {
-      XSDEditorPlugin.getPlugin().setSourcePageAsDefault();
-    }
-    else
-    {
-      XSDEditorPlugin.getPlugin().setDesignPageAsDefault();
-    }
-    floatingToolbar = null;
-    super.dispose();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTReadOnlyFileEditorInput.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTReadOnlyFileEditorInput.java
deleted file mode 100644
index b5fd8d2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ADTReadOnlyFileEditorInput.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.IPersistableElement;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.model.IWorkbenchAdapter;
-import org.eclipse.wst.common.uriresolver.internal.URI;
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * 
- * Used for any read-only files, ie. HTTP files.
- *
- */
-public class ADTReadOnlyFileEditorInput implements IStorageEditorInput, IADTEditorInput
-{
-  protected String urlString;
-  protected IStorage storage;
-  protected ADTExternalResourceVariant variant;
-  protected XSDSchema xsdSchema;
-  protected String editorName;
-  protected String editorID = "";
-
-  public ADTReadOnlyFileEditorInput(String urlString)
-  {
-    this.urlString = urlString;
-    variant = new ADTExternalResourceVariant(urlString);
-  }
-
-  /*
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  public boolean equals(Object o)
-  {
-    if (o == this)
-      return true;
-
-    if (o instanceof ADTReadOnlyFileEditorInput)
-    {
-      ADTReadOnlyFileEditorInput input = (ADTReadOnlyFileEditorInput) o;
-      
-      return urlString.equals(input.getUrlString()) && input.getEditorID().equals(editorID);
-    }
-
-    return false;
-  }
-
-  public String getUrlString()
-  {
-    return urlString;
-  }
-  
-  public IStorage getStorage() throws CoreException
-  {
-    storage = variant.getStorage();
-    return storage;
-  }
-
-  public boolean exists()
-  {
-    return false;
-  }
-
-  public ImageDescriptor getImageDescriptor()
-  {
-    return null;
-  }
-
-  public String getName()
-  {
-    if (editorName == null)
-    {
-      URI uri = URI.createURI(urlString);
-      return uri.lastSegment();
-    }
-    return editorName;
-  }
-
-  public IPersistableElement getPersistable()
-  {
-    // http files cannot persist
-    return null;
-  }
-
-  public String getToolTipText()
-  {
-    return urlString;
-  }
-
-  public Object getAdapter(Class adapter)
-  {
-    if (adapter == IWorkbenchAdapter.class)
-      return this;
-    if (adapter == IStorage.class)
-      return storage;
-    return null;
-  }
-  
-  public void setSchema(XSDSchema xsdSchema)
-  {
-    this.xsdSchema = xsdSchema;
-  }
-
-  public XSDSchema getSchema()
-  {
-    return xsdSchema;
-  }
-
-  public void setEditorName(String name)
-  {
-    editorName = name;
-  }
-
-  public void setEditorID(String editorID)
-  {
-    this.editorID = editorID;
-  }
-  
-  public String getEditorID()
-  {
-    return editorID;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
deleted file mode 100644
index 148cc02..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonMultiPageEditor.java
+++ /dev/null
@@ -1,942 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import java.text.Collator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.EventObject;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.gef.DefaultEditDomain;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.gef.EditPartViewer;
-import org.eclipse.gef.MouseWheelHandler;
-import org.eclipse.gef.MouseWheelZoomHandler;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CommandStackListener;
-import org.eclipse.gef.editparts.LayerManager;
-import org.eclipse.gef.editparts.ZoomManager;
-import org.eclipse.gef.ui.actions.ActionRegistry;
-import org.eclipse.gef.ui.actions.UpdateAction;
-import org.eclipse.gef.ui.actions.ZoomInAction;
-import org.eclipse.gef.ui.actions.ZoomOutAction;
-import org.eclipse.gef.ui.parts.ScrollingGraphicalViewer;
-import org.eclipse.gef.ui.parts.SelectionSynchronizer;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IPartService;
-import org.eclipse.ui.IPropertyListener;
-import org.eclipse.ui.IWindowListener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.MultiPageEditorSite;
-import org.eclipse.ui.texteditor.ITextEditor;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.wst.sse.ui.StructuredTextEditor;
-import org.eclipse.wst.xml.core.internal.provisional.contenttype.ContentTypeIdForXML;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewerGraphicConstants;
-import org.eclipse.wst.xsd.ui.internal.adt.design.FlatCCombo;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.RootEditPart;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public abstract class CommonMultiPageEditor extends MultiPageEditorPart implements IResourceChangeListener, CommandStackListener, ITabbedPropertySheetPageContributor, IPropertyListener, IEditorModeListener
-{
-  public static int SOURCE_PAGE_INDEX = 1, DESIGN_PAGE_INDEX = 0;  
-  
-  protected IContentOutlinePage fOutlinePage;
-  protected DefaultEditDomain editDomain;
-  protected SelectionSynchronizer synchronizer;
-  protected ActionRegistry actionRegistry;
-  protected StructuredTextEditor structuredTextEditor;
-  protected CommonSelectionManager selectionProvider;
-  protected ScrollingGraphicalViewer graphicalViewer;
-  protected EditorModeManager editorModeManager;
-  protected FlatCCombo modeCombo;
-  private EditorModeAndCustomizedName[] editorModeAndCustomizedNames;
-  protected Composite toolbar;
-  protected ModeComboListener modeComboListener;
-  protected int maxLength = 0;
-  protected CommonActivationListener fActivationListener;
-  
-  public CommonMultiPageEditor()
-  {
-    super();
-    editDomain = new DefaultEditDomain(this)
-    {
-      public void mouseDown(MouseEvent mouseEvent, EditPartViewer viewer)
-      {
-        boolean eatTheEvent = false;      
-        LayerManager manager = (LayerManager)viewer.getEditPartRegistry().get(LayerManager.ID);     
-        IFigure layer = manager.getLayer(DesignViewerGraphicConstants.SCALED_HANDLE_LAYER);
-        if (layer != null)
-        {  
-          Point p = new Point(mouseEvent.x, mouseEvent.y);
-          layer.translateToRelative(p);
-          IFigure figure = layer.findFigureAt(p);     
-          if (figure != null && figure != layer)
-          {
-            // we eat this selection event!
-            eatTheEvent = true;
-          } 
-        }
-        if (!eatTheEvent)
-        {
-          super.mouseDown(mouseEvent, viewer);
-        }  
-      }      
-    };
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor#getContributorId()
-   */
-  public abstract String getContributorId();
-  
-  
-  /**
-   * 
-   */
-  protected abstract void createActions();
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.part.MultiPageEditorPart#createPages()
-   */
-  protected void createPages()
-  {
-
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.IProgressMonitor)
-   */
-  public void doSave(IProgressMonitor monitor)
-  {
-//    getEditor(1).doSave(monitor); 
-    structuredTextEditor.doSave(monitor);
-    getCommandStack().markSaveLocation();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.part.EditorPart#doSaveAs()
-   */
-  public void doSaveAs()
-  {
-    IEditorPart editor = getEditor(1);
-//    editor.doSaveAs();
-    structuredTextEditor.doSaveAs();
-    setInput(structuredTextEditor.getEditorInput());
-    setPartName(editor.getTitle());
-    getCommandStack().markSaveLocation();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()
-   */
-  public boolean isSaveAsAllowed()
-  {
-    return true;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.core.resources.IResourceChangeListener#resourceChanged(org.eclipse.core.resources.IResourceChangeEvent)
-   * 
-   * Closes all project files on project close.
-   */
-  public void resourceChanged(final IResourceChangeEvent event)
-  {
-    if (event.getType() == IResourceChangeEvent.PRE_CLOSE)
-    {
-      Display.getDefault().asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          IWorkbenchPage[] pages = getSite().getWorkbenchWindow().getPages();
-          for (int i = 0; i < pages.length; i++)
-          {
-            if (((FileEditorInput) structuredTextEditor.getEditorInput()).getFile().getProject().equals(event.getResource()))
-            {
-              IEditorPart editorPart = pages[i].findEditor(structuredTextEditor.getEditorInput());
-              pages[i].closeEditor(editorPart, true);
-            }
-          }
-        }
-      });
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.gef.commands.CommandStackListener#commandStackChanged(java.util.EventObject)
-   */
-  public void commandStackChanged(EventObject event)
-  {
-    firePropertyChange(PROP_DIRTY);
-  }
-  
-  /**
-   * Indicates that a property has changed.
-   * 
-   * @param source
-   *          the object whose property has changed
-   * @param propId
-   *          the id of the property which has changed; property ids are
-   *          generally defined as constants on the source class
-   */
-  public void propertyChanged(Object source, int propId)
-  {
-    switch (propId)
-    {
-      // had to implement input changed "listener" so that
-      // strucutedText could tell it containing editor that
-      // the input has change, when a 'resource moved' event is
-      // found.
-      case IEditorPart.PROP_INPUT :
-      case IEditorPart.PROP_DIRTY : {
-        if (source == structuredTextEditor)
-        {
-          if (structuredTextEditor.getEditorInput() != getEditorInput())
-          {
-            setInput(structuredTextEditor.getEditorInput());
-            // title should always change when input changes.
-            // create runnable for following post call
-            Runnable runnable = new Runnable()
-            {
-              public void run()
-              {
-                _firePropertyChange(IWorkbenchPart.PROP_TITLE);
-              }
-            };
-            // Update is just to post things on the display queue
-            // (thread). We have to do this to get the dirty
-            // property to get updated after other things on the
-            // queue are executed.
-            postOnDisplayQue(runnable);
-          }
-        }
-        break;
-      }
-      case IWorkbenchPart.PROP_TITLE : {
-        // update the input if the title is changed
-        if (source == structuredTextEditor)
-        {
-          if (structuredTextEditor.getEditorInput() != getEditorInput())
-          {
-            setInput(structuredTextEditor.getEditorInput());
-          }
-        }
-        break;
-      }
-      default : {
-        // propagate changes. Is this needed? Answer: Yes.
-        if (source == structuredTextEditor)
-        {
-          firePropertyChange(propId);
-        }
-        break;
-      }
-    }
-  }
-  
-  // Should override to set the input to the design viewer for a new document change
-  // ie. when doing a saveAs
-  protected void setInputToGraphicalViewer(IDocument newInput)
-  {
-  }
-
-  protected void setInput(IEditorInput input)
-  {
-    super.setInput(input);
-    if (graphicalViewer != null)
-    {
-      setInputToGraphicalViewer(getDocument());
-    }
-  }
-
-  protected IDocument getDocument()
-  {
-    IDocument document = null;
-    if (structuredTextEditor != null)
-    {
-      document = structuredTextEditor.getDocumentProvider().getDocument(structuredTextEditor.getEditorInput());
-    }
-    return document;
-  }
-
-  /**
-   * @return
-   */
-  protected SelectionSynchronizer getSelectionSynchronizer()
-  {
-    if (synchronizer == null)
-      synchronizer = new SelectionSynchronizer();
-    return synchronizer;
-  }
-
-  public CommonSelectionManager getSelectionManager()
-  {
-    if (selectionProvider == null)
-    {
-      selectionProvider = new CommonSelectionManager(this);
-    }
-    return selectionProvider;
-  }
-  
-  /*
-   * This method is just to make firePropertyChanged accessbible from some
-   * (anonomous) inner classes.
-   */
-  protected void _firePropertyChange(int property)
-  {
-    super.firePropertyChange(property);
-  }
-  
-  /**
-   * Posts the update code "behind" the running operation.
-   */
-  protected void postOnDisplayQue(Runnable runnable)
-  {
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    IWorkbenchWindow[] windows = workbench.getWorkbenchWindows();
-    if (windows != null && windows.length > 0)
-    {
-      Display display = windows[0].getShell().getDisplay();
-      display.asyncExec(runnable);
-    }
-    else
-      runnable.run();
-  }
-
-  /**
-   * The <code>MultiPageEditorPart</code> implementation of this
-   * <code>IWorkbenchPart</code> method disposes all nested editors.
-   * Subclasses may extend.
-   */
-  public void dispose()
-  {
-    getCommandStack().removeCommandStackListener(this);
-    ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
-    actionRegistry.dispose();
-    
-    if (structuredTextEditor != null) {
-      structuredTextEditor.removePropertyListener(this);
-    }
-    structuredTextEditor = null;
-    editDomain = null;
-    fOutlinePage = null;
-    synchronizer = null;
-    actionRegistry = null;
-    selectionProvider = null;
-    graphicalViewer = null;
-    if (modeCombo != null && !modeCombo.isDisposed())
-    {
-      modeCombo.removeSelectionListener(modeComboListener);
-      modeComboListener = null;
-    }
-    
-    if (fActivationListener != null) {
-      fActivationListener.dispose();
-      fActivationListener = null;
-    }
-   
-    super.dispose();
-  }
-
-  protected CommandStack getCommandStack()
-  {
-    return editDomain.getCommandStack();
-  }
-
-  /*
-   * (non-Javadoc) Method declared on IEditorPart
-   */
-  public void gotoMarker(IMarker marker)
-  {
-    setActivePage(SOURCE_PAGE_INDEX);
-    IDE.gotoMarker(structuredTextEditor, marker);
-  }
-
-  /**
-   * The <code>MultiPageEditorExample</code> implementation of this method
-   * checks that the input is an instance of <code>IFileEditorInput</code>.
-   */
-  public void init(IEditorSite site, IEditorInput editorInput) throws PartInitException
-  {
-    super.init(site, editorInput);
-    
-    getCommandStack().addCommandStackListener(this);
-    
-    initializeActionRegistry();
-    
-    String title = null;
-    if (getEditorInput() != null) {
-      title = getEditorInput().getName();
-    }
-    setPartName(title);
-    
-    fActivationListener = new CommonActivationListener(site.getWorkbenchWindow().getPartService());
-  }
-
-  protected void initializeActionRegistry()
-  {
-    createActions();
-  }
-  
-  protected ActionRegistry getActionRegistry()
-  {
-    if (actionRegistry == null)
-      actionRegistry = new ActionRegistry();
-    return actionRegistry;
-  }
-
-  public Object getAdapter(Class type)
-  {
-    if (type == CommandStack.class)
-      return getCommandStack();
-    if (type == ActionRegistry.class)
-      return getActionRegistry();
-    if (type == EditorModeManager.class)
-      return getEditorModeManager();
-    if (type == IGotoMarker.class) {
-      return new IGotoMarker() {
-        public void gotoMarker(IMarker marker) {
-          CommonMultiPageEditor.this.gotoMarker(marker);
-        }
-      };
-    }
-    if (type == ITextEditor.class)
-      return getTextEditor();
-    
-    return super.getAdapter(type);
-  }
-  
-  protected DefaultEditDomain getEditDomain()
-  {
-    return editDomain;
-  }
-
-  /**
-   * From GEF GraphicalEditor A convenience method for updating a set of actions
-   * defined by the given List of action IDs. The actions are found by looking
-   * up the ID in the {@link #getActionRegistry() action registry}. If the
-   * corresponding action is an {@link UpdateAction}, it will have its
-   * <code>update()</code> method called.
-   * 
-   * @param actionIds
-   *          the list of IDs to update
-   */
-  protected void updateActions(List actionIds)
-  {
-    ActionRegistry registry = getActionRegistry();
-    Iterator iter = actionIds.iterator();
-    while (iter.hasNext())
-    {
-      IAction action = registry.getAction(iter.next());
-      if (action instanceof UpdateAction)
-        ((UpdateAction) action).update();
-    }
-  }
-
-  public StructuredTextEditor getTextEditor()
-  {
-    return structuredTextEditor;
-  }
-
-  protected Composite createGraphPageComposite()
-  {
-    Composite parent = new Composite(getContainer(), SWT.NONE);    
-    parent.setLayout(new FillLayout());
-    return parent;
-  }
-  
-  protected void createGraphPage()
-  {
-    Composite parent = createGraphPageComposite();
-    
-    graphicalViewer = getGraphicalViewer();
-    graphicalViewer.createControl(parent);
-        
-    getEditDomain().addViewer(graphicalViewer);
-    
-    configureGraphicalViewer();
-    hookGraphicalViewer();    
-    int index = addPage(parent);
-    setPageText(index, Messages._UI_LABEL_DESIGN);
-  }
-
-	/**
-	 * @see org.eclipse.ui.part.MultiPageEditorPart#createSite(org.eclipse.ui.IEditorPart)
-	 */
-	protected IEditorSite createSite(IEditorPart editor) {
-		IEditorSite site = null;
-		if (editor == structuredTextEditor) {
-			site = new MultiPageEditorSite(this, editor) {
-				public String getId() {
-					// sets this id so nested editor is considered xml source
-					// page
-					return ContentTypeIdForXML.ContentTypeID_XML + ".source"; //$NON-NLS-1$;
-				}
-			};
-		}
-		else {
-			site = super.createSite(editor);
-		}
-		return site;
-	}
-  
-  protected void createSourcePage()
-  {
-    structuredTextEditor = new StructuredTextEditor();
-    try
-    {
-      int index = addPage(structuredTextEditor, getEditorInput());
-      setPageText(index, Messages._UI_LABEL_SOURCE);
-      structuredTextEditor.update();
-      structuredTextEditor.setEditorPart(this);
-      structuredTextEditor.addPropertyListener(this);
-      firePropertyChange(PROP_TITLE);
-    }
-    catch (PartInitException e)
-    {
-      ErrorDialog.openError(getSite().getShell(), "Error creating nested text editor", null, e.getStatus()); //$NON-NLS-1$
-    }
-  }
-  
-  protected void configureGraphicalViewer()
-  {
-    graphicalViewer.getControl().setBackground(ColorConstants.listBackground);
-
-    // Set the root edit part
-    // ScalableFreeformRootEditPart root = new ScalableFreeformRootEditPart();
-    RootEditPart root = new RootEditPart();
-    ZoomManager zoomManager = root.getZoomManager();
-    
-    List zoomLevelContributions = new ArrayList(3);
-    zoomLevelContributions.add(ZoomManager.FIT_ALL);
-    zoomLevelContributions.add(ZoomManager.FIT_WIDTH);
-    zoomLevelContributions.add(ZoomManager.FIT_HEIGHT);
-    zoomManager.setZoomLevelContributions(zoomLevelContributions);
-
-    double[] zoomLevels = {.10, .25, .5, .75, 1.0, 1.25, 1.5, 2.0, 2.5, 3, 4, 5};
-    zoomManager.setZoomLevels(zoomLevels);
-
-    IAction zoomIn = new ZoomInAction(zoomManager);
-    IAction zoomOut = new ZoomOutAction(zoomManager);
-    getActionRegistry().registerAction(zoomIn);
-    getActionRegistry().registerAction(zoomOut);
-
-    getSite().getKeyBindingService().registerAction(zoomIn);
-    getSite().getKeyBindingService().registerAction(zoomOut);
-
-    //ConnectionLayer connectionLayer = (ConnectionLayer) root.getLayer(LayerConstants.CONNECTION_LAYER);
-    //connectionLayer.setConnectionRouter(new BendpointConnectionRouter());
-
-    //connectionLayer.setConnectionRouter(new ShortestPathConnectionRouter(connectionLayer));
-    // connectionLayer.setVisible(false);
-
-    // Zoom
-    zoomManager.setZoom(1.0);
-    // Scroll-wheel Zoom
-    graphicalViewer.setProperty(MouseWheelHandler.KeyGenerator.getKey(SWT.CTRL), MouseWheelZoomHandler.SINGLETON);
-    graphicalViewer.setRootEditPart(root);
-    graphicalViewer.setEditPartFactory(getEditPartFactory());
-  }
-  
-  protected void hookGraphicalViewer()
-  {
-    getSelectionSynchronizer().addViewer(graphicalViewer);
-  }
-  
-  protected abstract ScrollingGraphicalViewer getGraphicalViewer();
-  protected abstract EditPartFactory getEditPartFactory();
-  protected abstract void initializeGraphicalViewer();
-
-  protected EditorModeManager getEditorModeManager()
-  {
-    if (editorModeManager == null)
-    {
-      editorModeManager = createEditorModeManager();
-      editorModeManager.addListener(this);
-      editorModeManager.init();
-    }  
-    return editorModeManager;
-  }
-  
-  protected abstract EditorModeManager createEditorModeManager();
-  
-  
-  private String getEditModeName(EditorMode editorMode, ProductCustomizationProvider productCustomizationProvider)
-  {
-    String result = editorMode.getDisplayName();
-    if (productCustomizationProvider != null)
-    {
-      String customizedName = productCustomizationProvider.getEditorModeDisplayName(editorMode.getId());
-      if (customizedName != null)
-      {
-        result = customizedName;
-      }  
-    } 
-    return result;
-  }
-  
-  class EditorModeAndCustomizedName
-  {
-    EditorMode mode;
-    String name;
-  }
-  
-  protected void createViewModeToolbar(Composite parent)
-  {
-    EditorModeManager manager = (EditorModeManager)getAdapter(EditorModeManager.class);
-    final ProductCustomizationProvider productCustomizationProvider = (ProductCustomizationProvider)getAdapter(ProductCustomizationProvider.class);
-    EditorMode [] modeList = manager.getModes();
-    
-    int modeListLength = modeList.length;
-    boolean showToolBar = modeListLength > 1;
-   
-    if (showToolBar)
-    {
-      toolbar = new Composite(parent, SWT.FLAT | SWT.DRAW_TRANSPARENT);
-      toolbar.setBackground(ColorConstants.listBackground);
-      toolbar.addPaintListener(new PaintListener() {
-
-        public void paintControl(PaintEvent e)
-        {
-          Rectangle clientArea = toolbar.getClientArea(); 
-          e.gc.setForeground(ColorConstants.lightGray);
-          e.gc.drawRectangle(clientArea.x, clientArea.y, clientArea.width - 1, clientArea.height - 1);
-        }
-      });
-      
-      GridLayout gridLayout = new GridLayout(3, false);
-      toolbar.setLayout(gridLayout);
-
-      Label label = new Label(toolbar, SWT.FLAT | SWT.HORIZONTAL);
-      label.setBackground(ColorConstants.listBackground);
-      label.setText(Messages._UI_LABEL_VIEW);
-      label.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
-
-      modeCombo = new FlatCCombo(toolbar, SWT.FLAT);
-      modeCombo.setEditable(false);
-      modeCombo.setText(getEditModeName(manager.getCurrentMode(), productCustomizationProvider)); 
-      GC gc = new GC(modeCombo);
-      int textWidth = 0;
-      maxLength = 0;
-      
-      // populate combo with modes
-      editorModeAndCustomizedNames = new EditorModeAndCustomizedName[modeListLength];      
-      for (int i = 0; i < modeListLength; i++)
-      {  
-        EditorModeAndCustomizedName entry = new EditorModeAndCustomizedName();
-        editorModeAndCustomizedNames[i] = entry;
-        entry.name = getEditModeName(modeList[i], productCustomizationProvider);
-        entry.mode = modeList[i];
-      }        
-      Arrays.sort(editorModeAndCustomizedNames, new Comparator()
-      {
-        public int compare(Object arg0, Object arg1)
-        {
-          EditorModeAndCustomizedName a = (EditorModeAndCustomizedName)arg0;
-          EditorModeAndCustomizedName b = (EditorModeAndCustomizedName)arg1;        
-          return Collator.getInstance().compare(a.name, b.name);
-        }
-      });
-      for (int i = 0; i < editorModeAndCustomizedNames.length; i++ )
-      {
-        EditorModeAndCustomizedName entry = editorModeAndCustomizedNames[i];
-        modeCombo.add(entry.name);
-        maxLength = Math.max (gc.stringExtent(entry.name).x, maxLength);
-        int approxWidthOfStrings = Math.max (gc.stringExtent(entry.name).x, textWidth);
-        if (approxWidthOfStrings > maxLength)
-          maxLength = approxWidthOfStrings;
-      }
-      
-      maxLength += gc.stringExtent(Messages._UI_LABEL_VIEW).x; 
-      gc.dispose();
-      
-      modeComboListener = new ModeComboListener();
-      modeCombo.addSelectionListener(modeComboListener);
-      modeCombo.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_END));
-      modeCombo.setBackground(toolbar.getBackground());
-
-      ImageHyperlink hyperlink = new ImageHyperlink(toolbar, SWT.FLAT);
-      hyperlink.setBackground(ColorConstants.white);
-      // https://bugs.eclipse.org/bugs/show_bug.cgi?id=154457
-      Image image = XSDEditorPlugin.getDefault().getIconImage("etool16/help_contents");
-      hyperlink.setImage(image);
-      hyperlink.setToolTipText(Messages._UI_HOVER_VIEW_MODE_DESCRIPTION);
-      hyperlink.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_CENTER));
-      hyperlink.addMouseListener(new MouseAdapter()
-      {
-        public void mouseDown(MouseEvent e)
-        {
-          if (productCustomizationProvider != null)
-          {
-            productCustomizationProvider.handleAction("showEditorModeHelp");
-          }
-        }
-      });      
-    }
-  }
-  
-  
-  protected class ModeComboListener implements SelectionListener
-  {
-    public ModeComboListener()
-    {
-    }
-    
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-    }
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      if (e.widget == modeCombo)
-      {        
-        EditorModeManager manager = (EditorModeManager)getAdapter(EditorModeManager.class);
-        EditorMode [] modeList = manager.getModes();
-        if (modeList.length >= 1)
-        {
-          EditorModeAndCustomizedName entry = editorModeAndCustomizedNames[modeCombo.getSelectionIndex()];
-          if (manager.getCurrentMode() != entry.mode)
-          {  
-            manager.setCurrentMode(entry.mode);
-            storeCurrentModePreference(entry.mode.getId());
-            ProductCustomizationProvider productCustomizationProvider = (ProductCustomizationProvider) getAdapter(ProductCustomizationProvider.class);
-            if (productCustomizationProvider != null)
-            {
-              productCustomizationProvider.handleAction("editorModeChanged");
-            }
-          }
-        }  
-      }
-    }
-  }
-  
-  protected void storeCurrentModePreference(String id)
-  {
-    // Don't do anything as default.  Allow extenders to implement.
-  }
-  
-  
-  protected class CommonActivationListener implements IPartListener, IWindowListener
-  {
-
-    /** Cache of the active workbench part. */
-    private IWorkbenchPart fActivePart;
-    /** Indicates whether activation handling is currently be done. */
-    private boolean fIsHandlingActivation = false;
-    /**
-     * The part service.
-     * 
-     * @since 3.1
-     */
-    private IPartService fPartService;
-
-    /**
-     * Creates this activation listener.
-     * 
-     * @param partService
-     *          the part service on which to add the part listener
-     * @since 3.1
-     */
-    public CommonActivationListener(IPartService partService)
-    {
-      fPartService = partService;
-      fPartService.addPartListener(this);
-      PlatformUI.getWorkbench().addWindowListener(this);
-    }
-
-    /**
-     * Disposes this activation listener.
-     * 
-     * @since 3.1
-     */
-    public void dispose()
-    {
-      fPartService.removePartListener(this);
-      PlatformUI.getWorkbench().removeWindowListener(this);
-      fPartService = null;
-    }
-
-    /*
-     * @see IPartListener#partActivated(org.eclipse.ui.IWorkbenchPart)
-     */
-    public void partActivated(IWorkbenchPart part)
-    {
-      fActivePart = part;
-      handleActivation();
-    }
-
-    /*
-     * @see IPartListener#partBroughtToTop(org.eclipse.ui.IWorkbenchPart)
-     */
-    public void partBroughtToTop(IWorkbenchPart part)
-    {
-      // do nothing
-    }
-
-    /*
-     * @see IPartListener#partClosed(org.eclipse.ui.IWorkbenchPart)
-     */
-    public void partClosed(IWorkbenchPart part)
-    {
-      // do nothing
-    }
-
-    /*
-     * @see IPartListener#partDeactivated(org.eclipse.ui.IWorkbenchPart)
-     */
-    public void partDeactivated(IWorkbenchPart part)
-    {
-      fActivePart = null;
-    }
-
-    /*
-     * @see IPartListener#partOpened(org.eclipse.ui.IWorkbenchPart)
-     */
-    public void partOpened(IWorkbenchPart part)
-    {
-    	if (CommonMultiPageEditor.this.equals(part))
-    	{
-    		doPostEditorOpenTasks();
-    	}
-    }
-
-    /**
-     * Handles the activation triggering a element state check in the editor.
-     */
-    void handleActivation()
-    {
-      if (fIsHandlingActivation || (getTextEditor() == null))
-      {
-        return;
-      }
-
-      if (fActivePart == CommonMultiPageEditor.this)
-      {
-        fIsHandlingActivation = true;
-        try
-        {
-          getTextEditor().safelySanityCheckState(getEditorInput());
-        }
-        finally
-        {
-          fIsHandlingActivation = false;
-        }
-      }
-    }
-
-    /*
-     * @see org.eclipse.ui.IWindowListener#windowActivated(org.eclipse.ui.IWorkbenchWindow)
-     * @since 3.1
-     */
-    public void windowActivated(IWorkbenchWindow window)
-    {
-      if (window == getEditorSite().getWorkbenchWindow())
-      {
-        /*
-         * Workaround for problem described in
-         * http://dev.eclipse.org/bugs/show_bug.cgi?id=11731 Will be removed
-         * when SWT has solved the problem.
-         */
-        window.getShell().getDisplay().asyncExec(new Runnable()
-        {
-          public void run()
-          {
-            handleActivation();
-          }
-        });
-      }
-    }
-
-    /*
-     * @see org.eclipse.ui.IWindowListener#windowDeactivated(org.eclipse.ui.IWorkbenchWindow)
-     * @since 3.1
-     */
-    public void windowDeactivated(IWorkbenchWindow window)
-    {
-      // do nothing
-    }
-
-    /*
-     * @see org.eclipse.ui.IWindowListener#windowClosed(org.eclipse.ui.IWorkbenchWindow)
-     * @since 3.1
-     */
-    public void windowClosed(IWorkbenchWindow window)
-    {
-      // do nothing
-    }
-
-    /*
-     * @see org.eclipse.ui.IWindowListener#windowOpened(org.eclipse.ui.IWorkbenchWindow)
-     * @since 3.1
-     */
-    public void windowOpened(IWorkbenchWindow window)
-    {
-      // do nothing
-    }
-  }
-  
-  public boolean isSourcePageActive()
-  {
-    return getActivePage() == SOURCE_PAGE_INDEX;
-  }
-  
-  /**
-   * Invoked during IPartListener#partOpened. Derived classes can override
-   * to provide specialized behaviour.  
-   */
-  protected void doPostEditorOpenTasks() {
-	  // Nothing to do in the base class.
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonSelectionManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonSelectionManager.java
deleted file mode 100644
index 56ead67..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/CommonSelectionManager.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.part.MultiPageSelectionProvider;
-
-public class CommonSelectionManager extends MultiPageSelectionProvider implements ISelectionProvider, ISelectionChangedListener
-{
-
-  public CommonSelectionManager(MultiPageEditorPart multiPageEditor)
-  {
-    super(multiPageEditor);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-   */
-  public void addSelectionChangedListener(ISelectionChangedListener listener)
-  {
-    listenerList.add(listener);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-   */
-  public ISelection getSelection()
-  {
-    return currentSelection;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-   */
-  public void removeSelectionChangedListener(ISelectionChangedListener listener)
-  {
-    listenerList.remove(listener);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-   */
-  public void setSelection(ISelection selection)
-  {
-    setSelection(selection, this);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ISelectionChangedListener#selectionChanged(org.eclipse.jface.viewers.SelectionChangedEvent)
-   */
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    if (enableNotify)
-    {
-      setSelection(event.getSelection(), event.getSelectionProvider());
-    }
-  }
-
-  
-  protected List listenerList = new ArrayList();
-  protected ISelection currentSelection;
-  protected boolean enableNotify = true;
-
-  public boolean getEnableNotify()
-  {
-    return enableNotify;
-  }
-  
-  public void setSelection(ISelection selection, ISelectionProvider source)
-  {  
-    if (enableNotify)
-    {
-      currentSelection = selection;
-      enableNotify = false;
-      try
-      {
-        SelectionChangedEvent event = new SelectionChangedEvent(source, selection);
-        List copyOfListenerList = new ArrayList(listenerList);
-        for (Iterator i = copyOfListenerList.iterator(); i.hasNext(); )
-        {
-          ISelectionChangedListener listener = (ISelectionChangedListener)i.next();
-          listener.selectionChanged(event);
-        }
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-      finally
-      {
-        enableNotify = true;
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ContextMenuParticipant.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ContextMenuParticipant.java
deleted file mode 100644
index 09d424f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ContextMenuParticipant.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import org.eclipse.jface.action.IMenuManager;
-
-public class ContextMenuParticipant
-{  
-  public boolean isApplicable(Object object, String actionId)
-  {
-    return true;
-  }
-  
-  public void contributeActions(Object object, IMenuManager menu)
-  {    
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/EditorMode.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/EditorMode.java
deleted file mode 100644
index 56ef845..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/EditorMode.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.gef.EditPartFactory;
-import org.eclipse.jface.viewers.IContentProvider;
-
-public abstract class EditorMode implements IAdaptable
-{
-  public abstract String getId();
-  
-  public abstract String getDisplayName();
-  
-  public abstract EditPartFactory getEditPartFactory();
-  
-  // TODO (cs) this should return ITreeContentProvider
-  public abstract IContentProvider getOutlineProvider();
-  
-  public ContextMenuParticipant getContextMenuParticipant()
-  {
-    return null;
-  }
-  
-  public Object getAdapter(Class adapter)
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/EditorModeManager.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/EditorModeManager.java
deleted file mode 100644
index 92bef66..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/EditorModeManager.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-
-public class EditorModeManager implements IAdaptable
-{
-  private List modeList = new ArrayList();
-  private EditorMode currentMode = null;
-  private List listeners = new ArrayList();
-  private String extensionPointId;
-  private ProductCustomizationProvider productCustomizationProvider;
-  
-  public EditorModeManager(String extensionPointId)
-  {
-    this.extensionPointId = extensionPointId;
-  }
-  
-  public void init()
-  { 
-    readRegistry(extensionPointId);    
-    currentMode = getDefaultMode();
-  }
-  
-  protected EditorMode getDefaultMode()
-  {
-    return (EditorMode)modeList.get(0);    
-  }
-  
-  protected void addMode(EditorMode mode)
-  {
-    modeList.add(mode);
-  }
-  
-  public EditorMode getEditorMode(String editorModeId)
-  {
-    for (Iterator i = modeList.iterator(); i.hasNext(); )
-    {
-      EditorMode editorMode = (EditorMode)i.next();
-      if (editorModeId.equals(editorMode.getId()))
-      {
-        return editorMode;
-      }  
-    }  
-    return null;
-  }
-  
-  public void setCurrentMode(EditorMode mode)
-  {
-    if (modeList.contains(mode))
-    {
-      currentMode = mode;
-      List clonedList = new ArrayList();
-      clonedList.addAll(listeners);
-      for (Iterator i = clonedList.iterator(); i.hasNext(); )
-      {
-        IEditorModeListener listener = (IEditorModeListener)i.next();
-        listener.editorModeChanged(mode);
-      }  
-    }  
-  }
-  
-  public EditorMode getCurrentMode()
-  {
-    return currentMode;
-  }
-  
-  public EditorMode[] getModes()
-  {
-    EditorMode[] modes = new EditorMode[modeList.size()];
-    modeList.toArray(modes);
-    return modes;
-  }
-  
-  public void addListener(IEditorModeListener listener)
-  {
-    if (!listeners.contains(listener))
-    {  
-      listeners.add(listener);
-    }  
-  }
-  
-  public void removeListener(IEditorModeListener listener)
-  {
-    listeners.remove(listener);  
-  }  
-  
-  private void readRegistry(String id)
-  {    
-    IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(id);  
-    for (int i = 0; i < elements.length; i++)
-    {
-      IConfigurationElement element = elements[i];
-      String editorModeId = element.getAttribute("id"); //$NON-NLS-1$
-      if (editorModeId != null && 
-          productCustomizationProvider != null &&
-          !productCustomizationProvider.isEditorModeApplicable(editorModeId))
-      {
-        continue;
-      }  
-      try
-      {
-        EditorMode mode = (EditorMode)element.createExecutableExtension("class");
-        modeList.add(mode);        
-      }
-      catch (Exception e)
-      {        
-      }
-    }
-  }  
-  
-  public Object getAdapter(Class adapter)
-  {
-    return null;
-  }
-
-
-  public void setProductCustomizationProvider(ProductCustomizationProvider productCustomizationProvider)
-  {
-    this.productCustomizationProvider = productCustomizationProvider;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/IADTEditorInput.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/IADTEditorInput.java
deleted file mode 100644
index a364d66..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/IADTEditorInput.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.xsd.XSDSchema;
-
-public interface IADTEditorInput extends IEditorInput
-{
-  public XSDSchema getSchema();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/IEditorModeListener.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/IEditorModeListener.java
deleted file mode 100644
index 7e98bde..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/IEditorModeListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-public interface IEditorModeListener
-{
-  void editorModeChanged(EditorMode newEditorMode);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/Messages.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/Messages.java
deleted file mode 100644
index fce3ae6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/Messages.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS
-{
-  private static final String BUNDLE_NAME = "org.eclipse.wst.xsd.ui.internal.adt.editor.messages"; //$NON-NLS-1$
-
-  private Messages()
-  {
-  }
-
-  static
-  {
-    // initialize resource bundle
-    NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-  }
-  public static String _UI_ACTION_SHOW_PROPERTIES;
-  public static String _UI_ACTION_SET_AS_FOCUS;
-  public static String _UI_ACTION_DELETE;
-  public static String _UI_ACTION_ADD_FIELD;
-  public static String _UI_ACTION_BROWSE;
-  public static String _UI_ACTION_NEW;
-  public static String _UI_ACTION_UPDATE_NAME;
-  public static String _UI_ACTION_UPDATE_TYPE;
-  public static String _UI_ACTION_UPDATE_ELEMENT_REFERENCE;
-  public static String _UI_ACTION_SELECT_ALL;
-  public static String _UI_LABEL_DESIGN;
-  public static String _UI_LABEL_SOURCE;
-  public static String _UI_LABEL_VIEW;
-  public static String _UI_HOVER_VIEW_MODE_DESCRIPTION;
-  public static String _UI_ACTION_CAPTURE_SCREEN_OVERWRITE_CONFIRMATION_QUESTION;
-  public static String _UI_ACTION_CAPTURE_SCREEN_OVERWRITE_CONFIRMATION;
-  public static String _UI_ACTION_CAPTURE_SCREEN_ERROR_TITLE;
-  public static String _UI_ACTION_CAPTURE_SCREEN_ERROR_DESCRIPTION;
-  public static String _UI_ACTION_CAPTURE_SCREEN_FORMAT_NOT_SUPPORTED;
-  public static String _UI_CAPTURE_SCREEN_ACTION_TEXT;
-  public static String _UI_CAPTURE_SCREEN_ACTION_TOOLTIPTEXT;
-  public static String _UI_ACTION_CAPTURE_SCREEN_DEFAULT_FILE_NAME;
-  public static String _UI_ACTION_CAPTURE_SCREEN_FILE_SAVE_DIALOG_TITLE;
-  public static String _UI_HOVER_BACK_TO_SCHEMA;
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ProductCustomizationProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ProductCustomizationProvider.java
deleted file mode 100644
index bece060..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/ProductCustomizationProvider.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.editor;
-
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.NavigationLocation;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ExtensibleContentOutlinePage;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-public abstract class ProductCustomizationProvider
-{
-  public abstract boolean isEditorModeApplicable(String id);
-  public abstract String getEditorModeDisplayName(String id);
- 
-  public String getProductString(String id)
-  {
-    return "";
-  }
-  
-  public String getProductString(String id, Object[] args)
-  {
-    return "";
-  }
-  
-  public void handleAction(String actionId)
-  {    
-  }
-  
-  public NavigationLocation getNavigationLocation(IEditorPart part, XSDConcreteComponent component, BaseEditPart editPart)
-  {
-    return null;
-  }
-  
-  public ExtensibleContentOutlinePage getProductContentOutlinePage()
-  {
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/messages.properties b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/messages.properties
deleted file mode 100644
index ab33e73..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/editor/messages.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-_UI_ACTION_SHOW_PROPERTIES=Show properties
-_UI_ACTION_SET_AS_FOCUS=Set As Focus
-_UI_ACTION_UPDATE_NAME=Update Name
-_UI_ACTION_UPDATE_TYPE=Update type
-_UI_ACTION_UPDATE_ELEMENT_REFERENCE=Update element reference
-_UI_ACTION_DELETE=Delete
-_UI_ACTION_BROWSE=Browse...
-_UI_LABEL_DESIGN=Design
-_UI_LABEL_SOURCE=Source
-_UI_ACTION_NEW=New...
-_UI_ACTION_ADD_FIELD=Add Field
-_UI_LABEL_VIEW=View:
-_UI_HOVER_VIEW_MODE_DESCRIPTION=Change the view mode of the editor
-_UI_ACTION_CAPTURE_SCREEN_OVERWRITE_CONFIRMATION_QUESTION=Question
-_UI_ACTION_CAPTURE_SCREEN_OVERWRITE_CONFIRMATION=The file {0} already exists. Do you want to replace the existing file?
-_UI_ACTION_CAPTURE_SCREEN_ERROR_TITLE=Error
-_UI_ACTION_CAPTURE_SCREEN_ERROR_DESCRIPTION=Could not save editor contents
-_UI_ACTION_CAPTURE_SCREEN_FORMAT_NOT_SUPPORTED=Format not supported
-_UI_CAPTURE_SCREEN_ACTION_TEXT = &Export Diagram as Image...
-_UI_CAPTURE_SCREEN_ACTION_TOOLTIPTEXT = Export Diagram as Image
-_UI_ACTION_CAPTURE_SCREEN_DEFAULT_FILE_NAME = Diagram
-_UI_ACTION_CAPTURE_SCREEN_FILE_SAVE_DIALOG_TITLE=Export Diagram as Image
-_UI_HOVER_BACK_TO_SCHEMA=Show schema index view
-_UI_ACTION_SELECT_ALL=Select All
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IADTObject.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IADTObject.java
deleted file mode 100644
index bea4a83..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IADTObject.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.facade;
-
-public interface IADTObject
-{
-    public void registerListener(IADTObjectListener listener);
-    public void unregisterListener(IADTObjectListener listener);
-    boolean isReadOnly();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IADTObjectListener.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IADTObjectListener.java
deleted file mode 100644
index afc8efb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IADTObjectListener.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.facade;
-
-public interface IADTObjectListener
-{
-  public void propertyChanged(Object object, String property);  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IComplexType.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IComplexType.java
deleted file mode 100644
index c97adc4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IComplexType.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.facade;
-
-
-
-public interface IComplexType extends IType, IStructure
-{
-  boolean isAbstract();
-  Object getContentType();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IField.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IField.java
deleted file mode 100644
index 7e31d32..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IField.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.facade;
-
-import org.eclipse.gef.commands.Command;
-
-public interface IField extends IADTObject
-{
-  String getKind();
-  String getName();
-  String getTypeName();
-  String getTypeNameQualifier();
-  IModel getModel();
-  IType getType();
-  IComplexType getContainerType();
-  int getMinOccurs();
-  int getMaxOccurs();
-  boolean isGlobal();
-  boolean isReference();
-  boolean isAbstract();
-  
-  Command getUpdateMinOccursCommand(int minOccurs);
-  Command getUpdateMaxOccursCommand(int maxOccurs);
-  Command getUpdateTypeNameCommand(String typeName, String quailifier);
-  Command getUpdateNameCommand(String name); 
-  Command getDeleteCommand();  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IModel.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IModel.java
deleted file mode 100644
index 4e42451..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IModel.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.facade;
-
-import java.util.List;
-
-public interface IModel extends IADTObject
-{
-  List getTypes();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IStructure.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IStructure.java
deleted file mode 100644
index 0c0d16e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IStructure.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.facade;
-
-import java.util.List;
-import org.eclipse.gef.commands.Command;
-
-public interface IStructure extends IADTObject
-{
-  String getName();
-  List getFields();
-  IModel getModel();
-  Command getAddNewFieldCommand(String fieldKind);
-  Command getDeleteCommand();  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IType.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IType.java
deleted file mode 100644
index cfd1adc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/facade/IType.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.facade;
-
-import org.eclipse.gef.commands.Command;
-
-public interface IType extends IADTObject
-{ 
-  IType getSuperType();
-  String getName();
-  String getQualifier();
-  boolean isComplexType();
-  boolean isAnonymous();
-  
-  Command getUpdateNameCommand(String newName);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlinePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlinePage.java
deleted file mode 100644
index f1102d7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlinePage.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.outline;
-
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterImpl;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.MouseAdapter;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.part.MultiPageSelectionProvider;
-import org.eclipse.wst.xml.ui.internal.contentoutline.JFaceNodeLabelProvider;
-import org.eclipse.wst.xsd.ui.internal.adapters.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.RedefineCategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAttributeGroupDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDComplexTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDElementDeclarationAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDModelGroupDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDRedefineAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaDirectiveAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSimpleTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.design.DesignViewContextMenuProvider;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.model.IModelProxy;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IModel;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class ADTContentOutlinePage extends ExtensibleContentOutlinePage
-{
-  protected int level = 0;
-  protected MultiPageSelectionProvider selectionManager;
-  protected SelectionManagerSelectionChangeListener selectionManagerSelectionChangeListener = new SelectionManagerSelectionChangeListener();
-
-  public ADTContentOutlinePage()
-  {
-    super();
-  }
-
-  public void createControl(Composite parent)
-  {
-    super.createControl(parent);
-    getTreeViewer().setContentProvider(contentProvider);
-    getTreeViewer().setLabelProvider(labelProvider);
-    getTreeViewer().setInput(model);
-    getTreeViewer().addSelectionChangedListener(this);
-    MenuManager menuManager = new MenuManager("#popup");//$NON-NLS-1$
-    menuManager.setRemoveAllWhenShown(true);
-    Menu menu = menuManager.createContextMenu(getTreeViewer().getControl());
-    getTreeViewer().getControl().setMenu(menu);
-    setSelectionManager(editor.getSelectionManager());
-    
-    // Create menu...for now reuse graph's.  Note edit part viewer = null
-    DesignViewContextMenuProvider menuProvider = new DesignViewContextMenuProvider(editor, null, editor.getSelectionManager());
-    menuManager.addMenuListener(menuProvider);
-    getSite().registerContextMenu("org.eclipse.wst.xsd.ui.popup.outline", menuManager, editor.getSelectionManager()); //$NON-NLS-1$
-
-    // enable popupMenus extension
-    // getSite().registerContextMenu("org.eclipse.wst.xsdeditor.ui.popup.outline",
-    // menuManager, xsdEditor.getSelectionManager());
-
-    // drill down from outline view
-    getTreeViewer().getControl().addMouseListener(new MouseAdapter()
-    {
-      public void mouseDoubleClick(MouseEvent e)
-      {
-        ISelection iSelection = getTreeViewer().getSelection();
-        if (iSelection instanceof StructuredSelection)
-        {
-          StructuredSelection selection = (StructuredSelection) iSelection;
-          Object obj = selection.getFirstElement();
-          if (obj instanceof XSDConcreteComponent)
-          {
-            XSDConcreteComponent comp = (XSDConcreteComponent) obj;
-            if (comp.getContainer() instanceof XSDSchema)
-            {
-              // getXSDEditor().getGraphViewer().setInput(obj);
-            }
-          }
-        }
-
-      }
-    });
-  }
-
-  class XSDKeyListener extends KeyAdapter
-  {
-  }
-
-  public void dispose()
-  {
-    contentProvider.dispose();
-    super.dispose();
-  }
-
-  public void setExpandToLevel(int i)
-  {
-    level = i;
-  }
-
-  public void setInput(Object value)
-  {
-    getTreeViewer().setInput(value);
-    getTreeViewer().expandToLevel(level);
-  }
-
-  // public ISelection getSelection()
-  // {
-  // if (getTreeViewer() == null)
-  // return StructuredSelection.EMPTY;
-  // return getTreeViewer().getSelection();
-  // }
-  public void setSelectionManager(MultiPageSelectionProvider newSelectionManager)
-  {
-    // disconnect from old one
-    if (selectionManager != null)
-    {
-      selectionManager.removeSelectionChangedListener(selectionManagerSelectionChangeListener);
-    }
-    selectionManager = newSelectionManager;
-    // connect to new one
-    if (selectionManager != null)
-    {
-      selectionManager.addSelectionChangedListener(selectionManagerSelectionChangeListener);
-    }
-  }
-
-  protected class SelectionManagerSelectionChangeListener implements ISelectionChangedListener
-  {
-    public void selectionChanged(SelectionChangedEvent event)
-    {
-      updateStatusLine(getSite().getActionBars().getStatusLineManager(), event.getSelection());
-      if (event.getSelectionProvider() != ADTContentOutlinePage.this)  //getTreeViewer())
-      {
-        StructuredSelection selection = (StructuredSelection)event.getSelection();
-        StructuredSelection currentSelection = (StructuredSelection) getTreeViewer().getSelection();
-        
-        Object selectionFirstElement = selection.getFirstElement();
-        Object currentFirstElement = currentSelection.getFirstElement();
-       
-        // TODO: Hack to prevent losing a selection when the schema is selected in the
-        // source.  Fix is to prevent the source from firing off selection changes when
-        // the selection source is not the source view.
-        
-        if (selectionFirstElement instanceof IModel)
-        {          
-          if (!(currentFirstElement instanceof IModelProxy) || currentFirstElement instanceof RedefineCategoryAdapter)
-          {
-            getTreeViewer().setSelection(event.getSelection(), true);
-          }
-        }
-        else if (selectionFirstElement instanceof XSDSchemaDirectiveAdapter)
-        {
-        	if (!(currentFirstElement instanceof RedefineCategoryAdapter))
-        	{
-        		getTreeViewer().setSelection(event.getSelection(), true);
-        	}
-        }
-        else
-        {
-          IStructuredSelection structuredSelection = (IStructuredSelection) event.getSelection();
-          List list = structuredSelection.toList();
-          int selectionLength = list.size();
-          if (selectionLength > 0)
-          {
-            for (int i = 0; i < selectionLength; i++)
-            {
-              Object item = list.get(i);
-
-              if (item instanceof AdapterImpl)
-              {
-                Notifier target = ((AdapterImpl) item).getTarget();
-
-                if (!(target instanceof XSDConcreteComponent))
-                  continue;
-
-                XSDConcreteComponent xsdConcreteComponent = (XSDConcreteComponent) target;
-
-                // need to expand parent before child, thus a stack is required
-                Stack componentStack = new Stack();
-                while (xsdConcreteComponent != null)
-                {
-                  componentStack.push(xsdConcreteComponent);
-                  xsdConcreteComponent = xsdConcreteComponent.getContainer();
-                }
-
-                // At this point the stack must have the XSDSchemaAdapter and
-                // at least one component
-                if (componentStack.size() < 2)
-                  continue;
-
-                // Pop off the top node, since it is the XSDSchemaAdapter, which
-                // isn't
-                // used as part of finding the outline view hierarchy
-                componentStack.pop();
-
-                if (((XSDConcreteComponent) componentStack.peek()).eAdapters().size() <= 0)
-                  continue;
-
-                Object object = ((XSDConcreteComponent) componentStack.peek()).eAdapters().get(0);
-
-                // Find out which category the selected item is contained in
-                int categoryIndex = -1;
-                if (object instanceof XSDSchemaDirectiveAdapter)
-                {
-                  categoryIndex = CategoryAdapter.DIRECTIVES;
-                }
-                else if (object instanceof XSDElementDeclarationAdapter)
-                {
-                  categoryIndex = CategoryAdapter.ELEMENTS;
-                }
-                else if (object instanceof XSDAttributeDeclarationAdapter)
-                {
-                  categoryIndex = CategoryAdapter.ATTRIBUTES;
-                }
-                else if (object instanceof XSDAttributeGroupDefinitionAdapter)
-                {
-                  categoryIndex = CategoryAdapter.ATTRIBUTES;
-                }
-                else if (object instanceof XSDComplexTypeDefinitionAdapter || object instanceof XSDSimpleTypeDefinitionAdapter)
-                {
-                  categoryIndex = CategoryAdapter.TYPES;
-                }
-                else if (object instanceof XSDModelGroupDefinitionAdapter)
-                {
-                  categoryIndex = CategoryAdapter.GROUPS;
-                }
-
-                // Expand the category
-                if (categoryIndex == -1)
-                  continue;
-                CategoryAdapter category = ((XSDSchemaAdapter) model).getCategory(categoryIndex);
-                treeViewer.setExpandedState(category, true);
-
-                // Do not expand current node of interest, just its parents
-                while (componentStack.size() > 1)
-                {
-                  object = componentStack.pop();
-                  if (object instanceof XSDConcreteComponent)
-                  {
-                    XSDConcreteComponent component = (XSDConcreteComponent) object;
-                    if (component.eAdapters().size() > 0)
-                    {
-                      // expand
-                      getTreeViewer().setExpandedState(component.eAdapters().get(0), true);
-                    }
-                  }
-                }
-              }
-            }
-          }
-          // Bug 251474 - We will restrict selection to only one item
-          if (selectionLength == 1)
-          {
-            getTreeViewer().setSelection(event.getSelection(), true);
-          }
-          else
-          {
-            getTreeViewer().setSelection(new StructuredSelection(structuredSelection.getFirstElement()), true);
-          }
-        }
-      }
-    }
-  }
-  
-  protected void updateStatusLine(IStatusLineManager mgr, ISelection selection)
-  {
-    String text = null;
-    Image image = null;
-    ILabelProvider statusLineLabelProvider = new StatusLineLabelProvider(getTreeViewer());
-    if (statusLineLabelProvider != null && selection instanceof IStructuredSelection && !selection.isEmpty())
-    {
-      Object firstElement = ((IStructuredSelection) selection).getFirstElement();
-      if (firstElement instanceof XSDRedefineAdapter)
-    	  return;
-      text = statusLineLabelProvider.getText(firstElement);
-      image = statusLineLabelProvider.getImage(firstElement);
-    }
-    if (image == null)
-    {
-      mgr.setMessage(text);
-    }
-    else
-    {
-      mgr.setMessage(image, text);
-    }
-  }
-  
-  protected class StatusLineLabelProvider extends JFaceNodeLabelProvider
-  {
-    TreeViewer treeViewer = null;
-
-    public StatusLineLabelProvider(TreeViewer viewer)
-    {
-      treeViewer = viewer;
-    }
-
-    public String getText(Object element)
-    {
-      if (element == null)
-        return null;
-
-      StringBuffer s = new StringBuffer();
-      s.append(labelProvider.getText(element));
-      return s.toString();
-    }
-
-    public Image getImage(Object element)
-    {
-      return labelProvider.getImage(element);
-    }
-  }
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlineProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlineProvider.java
deleted file mode 100644
index ac6e76f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlineProvider.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.outline;
-
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener;
-
-public class ADTContentOutlineProvider implements ITreeContentProvider, IADTObjectListener
-{
-  protected Viewer viewer = null;
-  protected Object oldInput, newInput;
-  protected ADTContentOutlineRefreshJob refreshJob;
-
-  public ADTContentOutlineProvider()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-   */
-  public Object[] getChildren(Object parentElement)
-  {
-    if (parentElement instanceof ITreeElement)
-    {
-      Object[] children = ((ITreeElement) parentElement).getChildren();
-      if (children != null)
-      {
-        int length = children.length;
-        for (int i = 0; i < length; i++)
-        {
-          Object child = children[i];
-          if (child instanceof IADTObject)
-          {
-            ((IADTObject) child).registerListener(this);
-          }
-        }
-      }
-      return children;
-    }
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-   */
-  public Object getParent(Object element)
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-   */
-  public boolean hasChildren(Object element)
-  {
-    if (element instanceof ITreeElement)
-    {
-      return ((ITreeElement) element).hasChildren();
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-   */
-  public Object[] getElements(Object inputElement)
-  {
-    return getChildren(inputElement);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-   */
-  public void dispose()
-  {
-    Object input = viewer.getInput();
-    if (input instanceof IADTObject)
-    {
-      removeListener((IADTObject) input);
-    }
-    if (refreshJob != null)
-    {
-      refreshJob.cancel();
-      refreshJob = null;
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-   */
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {
-    this.viewer = viewer;
-    this.oldInput = oldInput;
-    this.newInput = newInput;
-    if (refreshJob != null)
-    {
-      refreshJob.cancel();
-    }
-    refreshJob = new ADTContentOutlineRefreshJob(viewer);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObjectListener#propertyChanged(java.lang.Object, java.lang.String)
-   */
-  public void propertyChanged(Object object, String property)
-  {
-    refreshJob.refresh((IADTObject)object);
-  }
-
-  /**
-   * @param model
-   */
-  private void removeListener(IADTObject model)
-  {
-    model.unregisterListener(this);
-    Object[] children = null;
-    
-    if (model instanceof ITreeElement)
-    {
-      children = ((ITreeElement) model).getChildren();
-    }
-    
-    if (children != null)
-    {
-      int length = children.length;
-      for (int i = 0; i < length; i++)
-      {
-        Object child = children[i];
-        if (child instanceof IADTObject && model != child)
-        {
-          removeListener((IADTObject) child);
-        }
-      }
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlineRefreshJob.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlineRefreshJob.java
deleted file mode 100644
index bf04cf4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTContentOutlineRefreshJob.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.outline;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.adapters.CategoryAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.facade.IADTObject;
-
-
-/**
- * This job holds a queue of updates (affected nodes) for the XSD editor's
- * outline view. When a new request comes in, the current run is cancelled, 
- * the new request is added to the queue, then the job is re-scheduled.
- * This class is loosely based on RefreshStructureJob.
- */
-class ADTContentOutlineRefreshJob extends Job
-{
-  /**
-   * The delay time in milliseconds.
-   */
-  private static final long UPDATE_DELAY = 300;
-
-  private final List nodesToRefresh = new ArrayList(5);
-
-  private final TreeViewer viewer;
-
-  public ADTContentOutlineRefreshJob(Viewer viewer)
-  {
-    super("Refreshing XSD outline"); //$NON-NLS-1$
-    setPriority(Job.LONG);
-    setSystem(true);
-    this.viewer = (TreeViewer)viewer;
-  }
-
-  private synchronized void addRefreshRequest(IADTObject adtObject)
-  {
-    if (nodesToRefresh.contains(adtObject))
-    {
-      return;
-    }
-
-    nodesToRefresh.add(adtObject);
-  }
-
-  protected void canceling()
-  {
-    nodesToRefresh.clear();
-    super.canceling();
-  }
-
-  private void doRefresh(final IADTObject adtObject)
-  {
-    final Display display = PlatformUI.getWorkbench().getDisplay();
-    display.asyncExec(new Runnable()
-      {
-        public void run()
-        {
-          boolean isValidViewer = viewer != null && !viewer.getControl().isDisposed();
-          if (isValidViewer)
-          {
-            viewer.refresh(adtObject);
-
-            // Needlessly revealing the category nodes causes a lot of UI flicker.
-            
-            if (!(adtObject instanceof CategoryAdapter))
-            {
-              viewer.reveal(adtObject);
-            }
-          }
-        }
-      });
-  }
-
-  private synchronized IADTObject[] getNodesToRefresh()
-  {
-    IADTObject[] toRefresh = new IADTObject [nodesToRefresh.size()];
-    nodesToRefresh.toArray(toRefresh);
-    nodesToRefresh.clear();
-
-    return toRefresh;
-  }
-
-  public void refresh(IADTObject adtObject)
-  {
-    if (adtObject == null)
-    {
-      return;
-    }
-
-    addRefreshRequest(adtObject);
-
-    schedule(UPDATE_DELAY);
-  }
-
-  protected IStatus run(IProgressMonitor monitor)
-  {
-    IStatus status = Status.OK_STATUS;
-    try
-    {
-      performRefreshes(monitor);
-    }
-    finally
-    {
-      monitor.done();
-    }
-    return status;
-  }
-
-  private void performRefreshes(IProgressMonitor monitor)
-  {
-    IADTObject[] nodes = getNodesToRefresh();
-
-    for (int index = 0; index < nodes.length; index++)
-    {
-      if (monitor.isCanceled())
-      {
-        throw new OperationCanceledException();
-      }
-      IADTObject node = nodes[index];
-      doRefresh(node);
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTLabelProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTLabelProvider.java
deleted file mode 100644
index 14a6d4d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ADTLabelProvider.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.outline;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.graphics.Image;
-
-public class ADTLabelProvider implements ILabelProvider
-{
-
-  public ADTLabelProvider()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-   */
-  public Image getImage(Object element)
-  {
-    if (element instanceof ITreeElement)
-    {
-      return ((ITreeElement)element).getImage();
-    }
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-   */
-  public String getText(Object element)
-  {
-    if (element instanceof ITreeElement)
-    {
-      return ((ITreeElement)element).getText();
-    }
-    return ""; //$NON-NLS-1$
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.IBaseLabelProvider#addListener(org.eclipse.jface.viewers.ILabelProviderListener)
-   */
-  public void addListener(ILabelProviderListener listener)
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.IBaseLabelProvider#dispose()
-   */
-  public void dispose()
-  {
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.IBaseLabelProvider#isLabelProperty(java.lang.Object, java.lang.String)
-   */
-  public boolean isLabelProperty(Object element, String property)
-  {
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.jface.viewers.IBaseLabelProvider#removeListener(org.eclipse.jface.viewers.ILabelProviderListener)
-   */
-  public void removeListener(ILabelProviderListener listener)
-  {
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ExtensibleContentOutlinePage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ExtensibleContentOutlinePage.java
deleted file mode 100644
index 4e19a56..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ExtensibleContentOutlinePage.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.outline;
-
-import org.eclipse.core.runtime.ListenerList;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.util.SafeRunnable;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.part.IPageSite;
-import org.eclipse.ui.part.Page;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ADTMultiPageEditor;
-
-public class ExtensibleContentOutlinePage extends Page implements IContentOutlinePage, ISelectionChangedListener
-{
-  protected ListenerList selectionChangedListeners = new ListenerList();
-  protected TreeViewer treeViewer;
-  protected Object model;
-  protected ITreeContentProvider contentProvider;
-  protected ILabelProvider labelProvider;
-  protected ADTMultiPageEditor editor;
-
-  protected ExtensibleContentOutlinePage()
-  {
-    super();
-  }
-
-  public void createControl(Composite parent)
-  {
-    treeViewer = new TreeViewer(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL);
-    treeViewer.addSelectionChangedListener(this);
-  }
-
-  public void setEditor(ADTMultiPageEditor editor)
-  {
-    this.editor = editor;
-  }
-  
-  public void setModel(Object newModel)
-  {
-    model = newModel;
-  }
-
-  public void setContentProvider(ITreeContentProvider contentProvider)
-  {
-    this.contentProvider = contentProvider;
-  }
-
-  public void setLabelProvider(ILabelProvider labelProvider)
-  {
-    this.labelProvider = labelProvider;
-  }
-
-  public void setFocus()
-  {
-    treeViewer.getControl().setFocus();
-  }
-
-  public void setSelection(ISelection selection)
-  {
-    if (treeViewer != null)
-    {
-      treeViewer.setSelection(selection);
-    }
-  }
-
-  public void addSelectionChangedListener(ISelectionChangedListener listener)
-  {
-    selectionChangedListeners.add(listener);
-  }
-
-  protected void fireSelectionChanged(ISelection selection)
-  {
-    // create an event
-    final SelectionChangedEvent event = new SelectionChangedEvent(this, selection);
-
-    // fire the event
-    Object[] listeners = selectionChangedListeners.getListeners();
-    for (int i = 0; i < listeners.length; ++i)
-    {
-      final ISelectionChangedListener l = (ISelectionChangedListener) listeners[i];
-      Platform.run(new SafeRunnable()
-      {
-        public void run()
-        {
-          l.selectionChanged(event);
-        }
-      });
-    }
-  }
-
-  public Control getControl()
-  {
-    if (treeViewer == null)
-    {
-      return null;
-    }
-    return treeViewer.getControl();
-  }
-
-  public ISelection getSelection()
-  {
-    if (treeViewer == null)
-    {
-      return StructuredSelection.EMPTY;
-    }
-    return treeViewer.getSelection();
-  }
-
-  public TreeViewer getTreeViewer()
-  {
-    return treeViewer;
-  }
-
-  public void init(IPageSite pageSite)
-  {
-    super.init(pageSite);
-    pageSite.setSelectionProvider(this);
-  }
-
-  public void removeSelectionChangedListener(ISelectionChangedListener listener)
-  {
-    selectionChangedListeners.remove(listener);
-  }
-
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    fireSelectionChanged(event.getSelection());
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ITreeElement.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ITreeElement.java
deleted file mode 100644
index a660d9a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/outline/ITreeElement.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.outline;
-
-import org.eclipse.swt.graphics.Image;
-
-public interface ITreeElement
-{
-  public final static ITreeElement[] EMPTY_LIST = {};
-  ITreeElement[] getChildren();
-  ITreeElement getParent();
-  boolean hasChildren();
-  String getText();
-  Image getImage();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/properties/ADTTabbedPropertySheetPage.java b/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/properties/ADTTabbedPropertySheetPage.java
deleted file mode 100644
index 5c1343f4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-adt/org/eclipse/wst/xsd/ui/internal/adt/properties/ADTTabbedPropertySheetPage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.adt.properties;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-
-/**
- * @deprecated.  Extenders should specialize...ie. XSDTabbedPropertySheetPage
- */
-public class ADTTabbedPropertySheetPage extends TabbedPropertySheetPage
-{
-  public ADTTabbedPropertySheetPage(ITabbedPropertySheetPageContributor tabbedPropertySheetPageContributor)
-  {
-    super(tabbedPropertySheetPageContributor);
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.ui.ISelectionListener#selectionChanged(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-
-//      Object selected = ((StructuredSelection)selection).getFirstElement();
-//      if (selected instanceof EditPart)
-//      {
-//        Object model = ((EditPart)selected).getModel();
-//        selection = new StructuredSelection(model);
-//      }
-      super.selectionChanged(part, selection);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAnyAttributeAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAnyAttributeAction.java
deleted file mode 100644
index 07785fc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAnyAttributeAction.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDAnyAttributeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-
-public class AddXSDAnyAttributeAction extends XSDBaseAction
-{
-  public static String ID = "org.eclipse.wst.xsd.ui.AddXSDAnyAttributeAction"; //$NON-NLS-1$
-  protected XSDComplexTypeDefinition xsdComplexTypeDefinition;
-  
-  public AddXSDAnyAttributeAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_ADD_ANY_ATTRIBUTE);
-    setId(ID);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-    }
-    AddXSDAnyAttributeCommand command = null;
-    if (selection instanceof XSDComplexTypeDefinition)
-    {
-      command = new AddXSDAnyAttributeCommand(Messages._UI_ACTION_ADD_ANY_ATTRIBUTE, (XSDComplexTypeDefinition) selection);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDAttributeGroupDefinition)
-    {
-      command = new AddXSDAnyAttributeCommand(Messages._UI_ACTION_ADD_ANY_ATTRIBUTE, (XSDAttributeGroupDefinition)selection);
-      getCommandStack().execute(command);
-    }
-    
-    if (command != null)
-    {
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-  }
-
-
-  protected boolean calculateEnabled()
-  {
-    boolean rc = super.calculateEnabled();
-    if (rc)
-    {
-      Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-      if (selection instanceof XSDBaseAdapter)
-      {
-        selection = ((XSDBaseAdapter) selection).getTarget();
-      }
-      if (selection instanceof XSDComplexTypeDefinition)
-      {
-        return ((XSDComplexTypeDefinition)selection).getAttributeWildcardContent() == null;
-      }
-      else if (selection instanceof XSDAttributeGroupDefinition)
-      {
-        return ((XSDAttributeGroupDefinition)selection).getAttributeWildcardContent() == null;
-      }
-      
-    }
-    return rc;
-  }
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAnyElementAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAnyElementAction.java
deleted file mode 100644
index d50a53b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAnyElementAction.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDAnyElementCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-
-public class AddXSDAnyElementAction extends XSDBaseAction
-{
-  public static String ID = "org.eclipse.wst.xsd.ui.AddXSDAnyElementAction"; //$NON-NLS-1$
-
-  public AddXSDAnyElementAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_ADD_ANY_ELEMENT);
-    setId(ID);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-    }
-
-    XSDModelGroup modelGroup = getModelGroup(selection);
-
-    AddXSDAnyElementCommand command = new AddXSDAnyElementCommand(getText(), modelGroup);
-    if (selection instanceof XSDComplexTypeDefinition)
-    {
-      command.setComplexType((XSDComplexTypeDefinition)selection);
-    }
-    command.setDoCreateModelGroupForComplexType(modelGroup == null);
-    getCommandStack().execute(command);
-    addedComponent = command.getAddedComponent();
-    Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-    selectAddedComponent(adapter);
-  }
-
-  private XSDModelGroup getModelGroup(Object selection)
-  {
-    if (selection instanceof XSDModelGroup)
-    {
-      return (XSDModelGroup) selection;
-    }
-    else if (selection instanceof XSDComplexTypeDefinition)
-    {
-      XSDComplexTypeContent content = ((XSDComplexTypeDefinition)selection).getContent();
-      if (content instanceof XSDParticle)
-      {
-        XSDParticleContent particleContent = ((XSDParticle)content).getContent();
-        if (particleContent instanceof XSDModelGroup)
-        {
-          return (XSDModelGroup)particleContent;
-        }
-      }
-    }
-    return null;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAttributeDeclarationAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAttributeDeclarationAction.java
deleted file mode 100644
index 7c113fe..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAttributeDeclarationAction.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDAttributeDeclarationCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDAttributeDeclarationAction extends XSDBaseAction
-{
-  public static String ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction.AddXSDAttributeAction"; //$NON-NLS-1$
-  public static String BEFORE_SELECTED_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction.BEFORE_SELECTED_ID"; //$NON-NLS-1$  
-  public static String AFTER_SELECTED_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction.AFTER_SELECTED_ID"; //$NON-NLS-1$  
-  public static String REF_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeReferenceAction"; //$NON-NLS-1$
-  boolean isReference = false;
-  
-  public AddXSDAttributeDeclarationAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_ADD_ATTRIBUTE);
-    setId(ID);
-    isReference = false;
-  }
-  
-  public AddXSDAttributeDeclarationAction(IWorkbenchPart part, String id, String label, boolean isReference)
-  {
-    super(part);
-    setText(label);
-    setId(id);
-    this.isReference = isReference;
-    doDirectEdit = !isReference;
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-      if (selection instanceof XSDAttributeDeclaration)
-      {
-        selection = ((XSDAttributeDeclaration) selection).getContainer();
-      }
-    }
-    AddXSDAttributeDeclarationCommand command = null;
-    if (selection instanceof XSDComplexTypeDefinition)
-    {
-      command = new AddXSDAttributeDeclarationCommand(Messages._UI_ACTION_ADD_ATTRIBUTE, (XSDComplexTypeDefinition) selection);
-      command.setReference(isReference);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDAttributeUse)
-    {
-      XSDAttributeUse xsdAttributeUse = (XSDAttributeUse) selection;
-      XSDConcreteComponent parent = null;
-      XSDComplexTypeDefinition ct = null;
-      XSDAttributeGroupDefinition group = null;
-      for (parent = xsdAttributeUse.getContainer(); parent != null;)
-      {
-        if (parent instanceof XSDComplexTypeDefinition)
-        {
-          ct = (XSDComplexTypeDefinition) parent;
-          break;
-        }
-        else if (parent instanceof XSDAttributeGroupDefinition)
-        {
-          group = (XSDAttributeGroupDefinition)parent;
-          break;
-        }
-        parent = parent.getContainer();
-      }
-      if (ct != null)
-      {
-        XSDAttributeUse sel = (XSDAttributeUse) selection;
-        int index = ct.getAttributeContents().indexOf(sel);
-        command = new AddXSDAttributeDeclarationCommand(Messages._UI_ACTION_ADD_ATTRIBUTE, ct, getId(), index);
-        command.setReference(isReference);
-        getCommandStack().execute(command);
-      }
-      else if (group != null)
-      {
-        XSDAttributeUse sel = (XSDAttributeUse) selection;
-        int index = group.eContents().indexOf(sel);
-        command = new AddXSDAttributeDeclarationCommand(Messages._UI_ACTION_ADD_ATTRIBUTE, group, getId(), index);
-        command.setReference(isReference);
-        getCommandStack().execute(command);
-      }
-    }
-    else if (selection instanceof XSDAttributeGroupDefinition)
-    {
-      command = new AddXSDAttributeDeclarationCommand(Messages._UI_ACTION_ADD_ATTRIBUTE, (XSDAttributeGroupDefinition)selection);
-      command.setReference(isReference);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDSchema)
-    {
-      command = new AddXSDAttributeDeclarationCommand(Messages._UI_ACTION_ADD_ATTRIBUTE, (XSDSchema)selection);
-      getCommandStack().execute(command);
-    }
-    
-    if (command != null)
-    {
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAttributeGroupDefinitionAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAttributeGroupDefinitionAction.java
deleted file mode 100644
index f30a3e7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDAttributeGroupDefinitionAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDAttributeGroupDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDAttributeGroupDefinitionAction extends XSDBaseAction
-{
-  public static String ID = "AddXSDAttributeGroupDefinitionAction"; //$NON-NLS-1$
-  public static String REF_ID = "AddXSDAttributeGroupDefinitionRefAction"; //$NON-NLS-1$
-
-  public AddXSDAttributeGroupDefinitionAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_ADD_ATTRIBUTE_GROUP);
-    setId(ID);
-  }
-  
-  public AddXSDAttributeGroupDefinitionAction(IWorkbenchPart part, String id)
-  {
-    super(part);
-    if (id.equals(REF_ID))
-    {
-      setText(Messages._UI_ACTION_ADD_ATTRIBUTE_GROUP_REF);
-    }
-    else
-    {
-      setText(Messages._UI_ACTION_ADD_ATTRIBUTE_GROUP_DEFINITION);
-    }   
-    setId(id);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-    }
-
-    AddXSDAttributeGroupDefinitionCommand command = null;
-    if (selection instanceof XSDComplexTypeDefinition)
-    {
-      command = new AddXSDAttributeGroupDefinitionCommand(Messages._UI_ACTION_ADD_ATTRIBUTE_GROUP_REF, (XSDComplexTypeDefinition) selection);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDSchema)
-    {
-      command = new AddXSDAttributeGroupDefinitionCommand(Messages._UI_ACTION_ADD_ATTRIBUTE_GROUP_DEFINITION, (XSDSchema) selection);
-      getCommandStack().execute(command);
-    }
-
-    if (command != null)
-    {
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDComplexTypeDefinitionAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDComplexTypeDefinitionAction.java
deleted file mode 100644
index c55f4ef..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDComplexTypeDefinitionAction.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDComplexTypeDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDComplexTypeDefinitionAction extends XSDBaseAction
-{
-  public static final String ID = "org.eclipse.wst.xsd.ui.internal.editor.AddXSDComplexTypeDefinitionAction"; //$NON-NLS-1$
-
-  public AddXSDComplexTypeDefinitionAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_ADD_COMPLEX_TYPE);
-    setId(ID);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-    }
-
-    if (selection instanceof XSDSchema)
-    {
-      AddXSDComplexTypeDefinitionCommand command = new AddXSDComplexTypeDefinitionCommand(Messages._UI_ACTION_ADD_COMPLEX_TYPE, (XSDSchema) selection);
-      getCommandStack().execute(command);
-      
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDElementAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDElementAction.java
deleted file mode 100644
index 68bd64a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDElementAction.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDElementCommand;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.impl.XSDModelGroupImpl;
-
-//revisit this and see if we can reuse AddFieldAction??
-
-public class AddXSDElementAction extends XSDBaseAction
-{
-  public static String ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction"; //$NON-NLS-1$
-  public static String BEFORE_SELECTED_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction.BEFORE_SELECTED_ID"; //$NON-NLS-1$
-  public static String AFTER_SELECTED_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction.AFTER_SELECTED_ID"; //$NON-NLS-1$
-  public static String REF_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementReferenceAction"; //$NON-NLS-1$
-  boolean isReference;
-  
-  public AddXSDElementAction(IWorkbenchPart part, String id, String label, boolean isReference)
-  {
-    super(part);
-    setText(label);
-    setId(id);
-    this.isReference = isReference;
-    doDirectEdit = !isReference;
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-    }
-    AddXSDElementCommand command = null;
-    if (selection instanceof XSDComplexTypeDefinition)
-    {
-      command = new AddXSDElementCommand(getText(), (XSDComplexTypeDefinition) selection);
-      command.setReference(isReference);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDModelGroupDefinition)
-    {
-      command = new AddXSDElementCommand(getText(), (XSDModelGroupDefinition) selection);
-      command.setReference(isReference);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDSchema)
-    {
-      command = new AddXSDElementCommand(getText(), (XSDSchema) selection);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDModelGroup)
-    {
-      XSDModelGroup modelGroup = (XSDModelGroup) selection;
-      XSDConcreteComponent component = modelGroup.getContainer();
-      XSDComplexTypeDefinition ct = null;
-      while (component != null)
-      {
-        if (component instanceof XSDComplexTypeDefinition)
-        {
-          ct = (XSDComplexTypeDefinition) component;
-          break;
-        }
-        component = component.getContainer();
-      }
-
-      if (ct != null)
-      {
-        command = new AddXSDElementCommand(getText(), (XSDModelGroup) selection, ct);
-      }
-      else
-      {
-        command = new AddXSDElementCommand(getText(), (XSDModelGroup) selection);
-      }
-      command.setReference(isReference);
-      getCommandStack().execute(command);
-    }
-    else if (selection instanceof XSDElementDeclaration || selection instanceof XSDAttributeUse)
-    {
-      XSDConcreteComponent xsdConcreteComponent = (XSDConcreteComponent) selection;
-      XSDConcreteComponent parent = null;
-      XSDComplexTypeDefinition ct = null;
-      XSDModelGroupDefinition group = null;
-      XSDModelGroupImpl ctGroup = null;
-
-      for (parent = xsdConcreteComponent.getContainer(); parent != null; )
-      {
-        if (parent instanceof XSDComplexTypeDefinition)
-        {
-          ct = (XSDComplexTypeDefinition)parent;
-          break;
-        }
-        else if (parent instanceof XSDModelGroupDefinition)
-        {
-          group = (XSDModelGroupDefinition)parent;
-          break;
-        }
-        else if (parent instanceof XSDModelGroupImpl)
-        {
-          ctGroup = (XSDModelGroupImpl) parent;
-          break;
-        }
-        parent = parent.getContainer();
-      }
-      if (ct != null)
-      {
-        command = new AddXSDElementCommand(getText(), ct);
-        command.setReference(isReference);
-        getCommandStack().execute(command);
-      }
-      else if (ctGroup != null)
-      {
-        XSDElementDeclaration sel = (XSDElementDeclaration) selection;
-        int index = ctGroup.getContents().indexOf(sel.eContainer());
-        command = new AddXSDElementCommand(getText(), ctGroup, getId(), index);
-        command.setReference(isReference);
-        getCommandStack().execute(command);
-      }
-      else if (group != null)
-      {
-        command = new AddXSDElementCommand(getText(), group);
-        command.setReference(isReference);
-        getCommandStack().execute(command);
-      }
-    }
-    
-    if (command != null)
-    {
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDEnumerationFacetAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDEnumerationFacetAction.java
deleted file mode 100644
index fe4c11f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDEnumerationFacetAction.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDComplexTypeDefinitionAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddEnumerationsCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class AddXSDEnumerationFacetAction extends XSDBaseAction
-{
-  public static String ID = "org.eclipse.wst.xsd.ui.AddXSDEnumerationFacetAction"; //$NON-NLS-1$
-  public static String BEFORE_SELECTED_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction.BEFORE_SELECTED_ID"; //$NON-NLS-1$
-  public static String AFTER_SELECTED_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction.AFTER_SELECTED_ID"; //$NON-NLS-1$
-  
-  public AddXSDEnumerationFacetAction(IWorkbenchPart part, String id, String label)
-  {
-    super(part);
-    setText(label);
-    setId(id);
-  }
-  
-  public AddXSDEnumerationFacetAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_ADD_ENUMERATION);
-    setId(ID);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-      int index = -1;
-      AddEnumerationsCommand command = null;
-      XSDSimpleTypeDefinition st = null;
-      if (selection instanceof XSDSimpleTypeDefinition)
-      {
-        st = (XSDSimpleTypeDefinition)selection;
-        command = new AddEnumerationsCommand(getText(), st);
-      }
-      else if (selection instanceof XSDEnumerationFacet)
-      {
-        st = ((XSDEnumerationFacet)selection).getSimpleTypeDefinition();
-        index = st.getFacetContents().indexOf(selection);
-        doDirectEdit = true;
-        command = new AddEnumerationsCommand(getText(), st, getId(), index);
-      }
-      else if (selection instanceof XSDComplexTypeDefinition)  // Support for Complex Type's simple Content with enumerations
-      {
-    	st = (XSDSimpleTypeDefinition) ((XSDComplexTypeDefinition)selection).getContent();
-        command = new AddEnumerationsCommand(getText(), st);
-      }
-      else // null
-      {
-        return;
-      }
-      
-      List enumList = st.getEnumerationFacets();
-      
-      String newName = XSDCommonUIUtils.createUniqueEnumerationValue("value", enumList); //$NON-NLS-1$
-
-      command.setValue(newName);
-      getCommandStack().execute(command);
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-  }
-  
-  protected boolean calculateEnabled() {
-		
-		boolean parentResult = super.calculateEnabled();
-		boolean endResult = true;
-		Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-		if (selection instanceof XSDComplexTypeDefinitionAdapter)
-		{
-			XSDComplexTypeDefinition definition = ((XSDComplexTypeDefinitionAdapter) selection).getXSDComplexTypeDefinition();
-			XSDTypeDefinition baseType = definition.getBaseType();
-			if (baseType instanceof XSDSimpleTypeDefinition)
-				endResult = false;
-		}
-		endResult = endResult & parentResult;
-		return endResult;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDModelGroupAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDModelGroupAction.java
deleted file mode 100644
index f4fb464..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDModelGroupAction.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDModelGroupCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-
-public class AddXSDModelGroupAction extends XSDBaseAction
-{
-  public static String SEQUENCE_ID = "AddXSDSequenceModelGroupAction"; //$NON-NLS-1$
-  public static String CHOICE_ID = "AddXSDChoiceModelGroupAction"; //$NON-NLS-1$
-  public static String ALL_ID = "AddXSDAllModelGroupAction"; //$NON-NLS-1$
-  XSDCompositor xsdCompositor;
-
-  public AddXSDModelGroupAction(IWorkbenchPart part, XSDCompositor compositor, String ID)
-  {
-    super(part);
-    setText(getLabel(compositor));
-    setId(ID);
-    this.xsdCompositor = compositor;
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-    if (selection instanceof XSDBaseAdapter)
-    {
-      XSDConcreteComponent xsdComponent = (XSDConcreteComponent) ((XSDBaseAdapter) selection).getTarget();
-      AddXSDModelGroupCommand command = null;
-      if (xsdComponent instanceof XSDElementDeclaration)
-      {
-        XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration) xsdComponent;
-
-        command = new AddXSDModelGroupCommand(getLabel(xsdCompositor), xsdElementDeclaration, xsdCompositor);
-        getCommandStack().execute(command);
-      }
-      else if (xsdComponent instanceof XSDModelGroup)
-      {
-        XSDModelGroup xsdModelGroup = (XSDModelGroup) xsdComponent;
-
-        command = new AddXSDModelGroupCommand(getLabel(xsdCompositor), xsdModelGroup, xsdCompositor);
-        getCommandStack().execute(command);
-      }
-      else if (xsdComponent instanceof XSDComplexTypeDefinition
-               || xsdComponent instanceof XSDModelGroupDefinition)
-      {
-        command = new AddXSDModelGroupCommand(getLabel(xsdCompositor), xsdComponent, xsdCompositor);
-        getCommandStack().execute(command);
-      }
-     
-      if (command != null)
-      {
-        Adapter adapter = XSDAdapterFactory.getInstance().adapt(command.getAddedComponent());
-        if (adapter != null)
-          provider.setSelection(new StructuredSelection(adapter));
-      }
-
-    }
-  }
-
-  private String getLabel(XSDCompositor compositor)
-  {
-    String result = XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_SEQUENCE"); //$NON-NLS-1$
-    if (compositor != null)
-    {
-      if (compositor == XSDCompositor.CHOICE_LITERAL)
-      {
-        result = XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_CHOICE"); //$NON-NLS-1$
-      }
-      else if (compositor == XSDCompositor.ALL_LITERAL)
-      {
-        result = XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_ALL");//$NON-NLS-1$
-      }
-    }
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDModelGroupDefinitionAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDModelGroupDefinitionAction.java
deleted file mode 100644
index d49a367..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDModelGroupDefinitionAction.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDModelGroupDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-public class AddXSDModelGroupDefinitionAction extends XSDBaseAction
-{
-  public static final String MODELGROUPDEFINITION_ID = "AddXSDModelGroupDefinitionAction"; //$NON-NLS-1$
-  public static final String MODELGROUPDEFINITIONREF_ID = "AddXSDModelGroupDefinitionRefAction"; //$NON-NLS-1$
-  boolean isReference;
-
-  public AddXSDModelGroupDefinitionAction(IWorkbenchPart part, boolean isReference)
-  {
-    super(part);
-    this.isReference = isReference;
-    if (isReference)
-    {
-      setText(Messages._UI_ACTION_ADD_GROUP_REF);
-      setId(MODELGROUPDEFINITION_ID);
-    }
-    else
-    {
-      setText(Messages._UI_ACTION_ADD_GROUP);
-      setId(MODELGROUPDEFINITIONREF_ID);
-    }
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-    XSDConcreteComponent xsdConcreteComponent = null;
-    if (selection instanceof XSDBaseAdapter)
-    {
-      xsdConcreteComponent = (XSDConcreteComponent) ((XSDBaseAdapter) selection).getTarget();
-    }
-    if (xsdConcreteComponent != null)
-    {
-      AddXSDModelGroupDefinitionCommand command = new AddXSDModelGroupDefinitionCommand(getText(), xsdConcreteComponent, isReference);
-      getCommandStack().execute(command);
-
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinableContentAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinableContentAction.java
deleted file mode 100644
index 6d9bcf7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinableContentAction.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSearchListDialog;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSearchListDialogConfiguration;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentDescriptionProvider;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentSearchListProvider;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddRedefinedComponentCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-
-
-public abstract class AddXSDRedefinableContentAction extends XSDBaseAction
-{
-  protected AddXSDRedefinableContentAction(IWorkbenchPart part, String ID, String text)
-  {
-    super(part);
-    setText(text);
-    setId(ID);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection)getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter)selection).getTarget();
-    }
-
-    if (selection instanceof XSDRedefine)
-    {
-      ComponentSearchListDialogConfiguration configuration = new ComponentSearchListDialogConfiguration();
-      configuration.setDescriptionProvider(new RedefineDescriptor());
-      configuration.setSearchListProvider(new RedefineSearchListProvider((XSDRedefine)selection, this));
-      ComponentSearchListDialog dialog = new ComponentSearchListDialog(Display.getDefault().getActiveShell(), Messages._UI_LABEL_REDEFINE_COMPONENT, configuration)
-      {
-        protected Control createDialogArea(Composite parent)
-        {
-          // Adjust the dialog's initial size.
-          
-          Composite mainComposite = (Composite)super.createDialogArea(parent);
-          GridData gridData = (GridData)mainComposite.getLayoutData();
-          gridData.heightHint = 500;
-          gridData.widthHint = 350;
-          return mainComposite;
-        }
-      };
-      dialog.create();
-      dialog.setBlockOnOpen(true);
-      int result = dialog.open();
-
-      if (result == Window.OK)
-      {
-        ComponentSpecification selectedComponent = dialog.getSelectedComponent();
-        buildRedefine((XSDRedefine)selection, selectedComponent);
-      }
-    }
-  }
-
-  protected abstract AddRedefinedComponentCommand getCommand(XSDRedefine redefine, XSDRedefinableComponent redefinableComponent);
-  
-  protected abstract void buildComponentsList(XSDRedefine xsdRedefine, Set redefinedComponentsNames, IComponentList componentList);
-  
-  protected void buildRedefine(XSDRedefine redefine, ComponentSpecification selectedComponent)
-  {
-    XSDRedefinableComponent redefinableComponent = (XSDRedefinableComponent)selectedComponent.getObject();
-    AddRedefinedComponentCommand command = getCommand(redefine, redefinableComponent);
-    getCommandStack().execute(command);
-    addedComponent = command.getAddedComponent();
-  }
-
-  class RedefineSearchListProvider implements IComponentSearchListProvider
-  {
-    XSDRedefine xsdRedefine;
-    AddXSDRedefinableContentAction action;    
-    
-    public RedefineSearchListProvider(XSDRedefine xsdRedefine, AddXSDRedefinableContentAction action)
-    {
-      this.xsdRedefine = xsdRedefine;
-      this.action = action;
-    }
-
-    // Should refactor this to have a separate subclass for each type of redefine.
-    public void populateComponentList(IComponentList list, SearchScope scope, IProgressMonitor pm)
-    {      
-      List currentRedefines = xsdRedefine.getContents();
-      Set redefinedComponentsNames = new HashSet(currentRedefines.size());
-      Iterator redefinesIterator = currentRedefines.iterator();
-      while (redefinesIterator.hasNext())
-      {
-        XSDRedefinableComponent component = (XSDRedefinableComponent)redefinesIterator.next();
-        String redefinedComponentName = component.getName();
-        redefinedComponentsNames.add(redefinedComponentName);
-      }
-      action.buildComponentsList(xsdRedefine, redefinedComponentsNames, list);      
-    }
-  }
-
-  class RedefineDescriptor implements IComponentDescriptionProvider
-  {
-    public IFile getFile(Object component)
-    {
-      if (component instanceof XSDNamedComponent)
-      {
-        String location = ((XSDNamedComponent)component).getSchema().getSchemaLocation();
-        String platformResource = "platform:/resource"; //$NON-NLS-1$
-        if (location != null && location.startsWith(platformResource))
-        {
-          Path path = new Path(location.substring(platformResource.length()));
-          return ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-        }
-      }
-      return null;
-    }
-
-    public Image getFileIcon(Object component)
-    {
-      return XSDEditorPlugin.getXSDImage("icons/XSDFile.gif"); //$NON-NLS-1$
-    }
-
-    public ILabelProvider getLabelProvider()
-    {
-      return new XSDRedefineComponentsLabelProvider();
-    }
-
-    public String getName(Object component)
-    {
-      if (component instanceof XSDNamedComponent)
-      {
-        return ((XSDNamedComponent)component).getName();
-      }
-      return "";
-    }
-
-    public String getQualifier(Object component)
-    {
-      if (component instanceof XSDNamedComponent)
-      {
-        return ((XSDNamedComponent)component).getTargetNamespace();
-      }
-      return "";
-    }
-
-    public boolean isApplicable(Object component)
-    {
-      return true;
-    }
-
-  }
-
-  protected abstract Image getRedefinedComponentImage();
-  
-  class XSDRedefineComponentsLabelProvider implements ILabelProvider
-  {
-
-    public Image getImage(Object element)
-    {
-      Image image = getRedefinedComponentImage();
-      return image;
-    }
-
-    public String getText(Object element)
-    {
-      if (element instanceof XSDNamedComponent)
-      {
-        return ((XSDNamedComponent)element).getName();
-      }
-      return "";
-    }
-
-    public void addListener(ILabelProviderListener listener)
-    {
-    }
-
-    public void dispose()
-    {
-    }
-
-    public boolean isLabelProperty(Object element, String property)
-    {
-      return false;
-    }
-
-    public void removeListener(ILabelProviderListener listener)
-    {
-    }
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedAttributeGroupAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedAttributeGroupAction.java
deleted file mode 100644
index 5f5b0e4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedAttributeGroupAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddRedefinedComponentCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.RedefineAttributeGroupCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-
-
-public class AddXSDRedefinedAttributeGroupAction extends AddXSDRedefinableContentAction
-{
-  public static final String ID = "org.eclipse.wst.xsd.ui.actions.RedefineAttributeGroup"; //$NON-NLS-1$
-
-  public AddXSDRedefinedAttributeGroupAction(IWorkbenchPart part)
-  {
-    super(part, ID, Messages._UI_ACTION_REDEFINE_ATTRIBUTE_GROUP);
-  }
-
-  protected AddRedefinedComponentCommand getCommand(XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    AddRedefinedComponentCommand command = new RedefineAttributeGroupCommand(
-      Messages._UI_ACTION_REDEFINE_ATTRIBUTE_GROUP,
-      redefine,
-      redefinableComponent);
-    return command;
-  }
-
-  protected void buildComponentsList(XSDRedefine xsdRedefine, Set redefinedComponentsNames, IComponentList componentList)
-  {
-    List attributeGroups = xsdRedefine.getIncorporatedSchema().getAttributeGroupDefinitions();
-    Iterator iterator = attributeGroups.iterator();
-    while (iterator.hasNext())
-    {
-      XSDAttributeGroupDefinition attributeGroupDefinition = (XSDAttributeGroupDefinition)iterator.next();
-      String attributeGroupDefinitionName = attributeGroupDefinition.getName();
-      if (!redefinedComponentsNames.contains(attributeGroupDefinitionName))
-      {
-        componentList.add(attributeGroupDefinition);
-      }
-    }
-  }
-  
-  protected Image getRedefinedComponentImage()
-  {
-    return XSDEditorPlugin.getXSDImage(Messages._UI_IMAGE_ATTRIBUTE_GROUP);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedComplexTypeAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedComplexTypeAction.java
deleted file mode 100644
index 901d5a6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedComplexTypeAction.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddRedefinedComponentCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.RedefineComplexTypeCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-
-public class AddXSDRedefinedComplexTypeAction extends AddXSDRedefinableContentAction
-{
-  public static final String ID = "org.eclipse.wst.xsd.ui.actions.RedefineComplexType"; //$NON-NLS-1$
-
-  public AddXSDRedefinedComplexTypeAction(IWorkbenchPart part)
-  {
-    super(part, ID, Messages._UI_ACTION_REDEFINE_COMPLEX_TYPE);
-  }
-
-  protected AddRedefinedComponentCommand getCommand(XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    AddRedefinedComponentCommand command = new RedefineComplexTypeCommand(
-      Messages._UI_ACTION_REDEFINE_COMPLEX_TYPE,
-      redefine,
-      redefinableComponent);
-    return command;
-  }
-
-  protected void buildComponentsList(XSDRedefine xsdRedefine, Set redefinedComponentsNames, IComponentList componentList)
-  {
-    List typeDefinitions = xsdRedefine.getIncorporatedSchema().getTypeDefinitions();
-    Iterator iterator = typeDefinitions.iterator();
-    while (iterator.hasNext())
-    {
-      XSDTypeDefinition typeDefinition = (XSDTypeDefinition)iterator.next();
-      String typeDefinitionName = typeDefinition.getName();
-      if (typeDefinition instanceof XSDComplexTypeDefinition && !redefinedComponentsNames.contains(typeDefinitionName))
-      {
-        componentList.add(typeDefinition);
-      }
-    }
-  }
-  
-  protected Image getRedefinedComponentImage()
-  {
-    return XSDEditorPlugin.getXSDImage(Messages._UI_IMAGE_COMPLEX_TYPE);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedModelGroupAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedModelGroupAction.java
deleted file mode 100644
index d3839a9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedModelGroupAction.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddRedefinedComponentCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.RedefineModelGroupCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-
-
-public class AddXSDRedefinedModelGroupAction extends AddXSDRedefinableContentAction
-{
-  public static final String ID = "org.eclipse.wst.xsd.ui.actions.RedefineModelGroup"; //$NON-NLS-1$
-
-  public AddXSDRedefinedModelGroupAction(IWorkbenchPart part)
-  {
-    super(part, ID, Messages._UI_ACTION_REDEFINE_MODEL_GROUP);
-  }
-
-  protected AddRedefinedComponentCommand getCommand(XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    AddRedefinedComponentCommand command = new RedefineModelGroupCommand(
-      Messages._UI_ACTION_REDEFINE_MODEL_GROUP,
-      redefine,
-      redefinableComponent);
-    return command;
-  }
-
-  protected void buildComponentsList(XSDRedefine xsdRedefine, Set redefinedComponentsNames, IComponentList componentList)
-  {
-    List modelGroupList = xsdRedefine.getIncorporatedSchema().getModelGroupDefinitions();
-    Iterator iterator = modelGroupList.iterator();
-    while (iterator.hasNext())
-    {
-      XSDModelGroupDefinition modelGroupDefinition = (XSDModelGroupDefinition)iterator.next();
-      String modelGroupDefinitionName = modelGroupDefinition.getName();
-      if (!redefinedComponentsNames.contains(modelGroupDefinitionName))
-      {
-        componentList.add(modelGroupDefinition);
-      }
-    }
-  }
-  
-  protected Image getRedefinedComponentImage()
-  {
-    return XSDEditorPlugin.getXSDImage(Messages._UI_IMAGE_MODEL_GROUP);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedSimpleTypeAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedSimpleTypeAction.java
deleted file mode 100644
index dd86050..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDRedefinedSimpleTypeAction.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.internal.search.dialogs.IComponentList;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddRedefinedComponentCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.RedefineSimpleTypeCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-
-public class AddXSDRedefinedSimpleTypeAction extends AddXSDRedefinableContentAction
-{
-  public static final String ID = "org.eclipse.wst.xsd.ui.actions.RedefineSimpleType"; //$NON-NLS-1$
-
-  public AddXSDRedefinedSimpleTypeAction(IWorkbenchPart part)
-  {
-    super(part, ID, Messages._UI_ACTION_REDEFINE_SIMPLE_TYPE);
-  }
-
-  public AddRedefinedComponentCommand getCommand(XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    AddRedefinedComponentCommand command = new RedefineSimpleTypeCommand(
-      Messages._UI_ACTION_REDEFINE_SIMPLE_TYPE,
-      redefine,
-      redefinableComponent);
-    return command;
-  }
-
-  protected void buildComponentsList(XSDRedefine xsdRedefine, Set redefinedComponentsNames, IComponentList componentList)
-  {
-    List typeDefinitions = xsdRedefine.getIncorporatedSchema().getTypeDefinitions();
-    Iterator iterator = typeDefinitions.iterator();
-    while (iterator.hasNext())
-    {
-      XSDTypeDefinition typeDefinition = (XSDTypeDefinition)iterator.next();
-      String typeDefinitionName = typeDefinition.getName();
-      if (typeDefinition instanceof XSDSimpleTypeDefinition && !redefinedComponentsNames.contains(typeDefinitionName))
-      {
-        componentList.add(typeDefinition);
-      }
-    }
-
-  }
-  
-  protected Image getRedefinedComponentImage()
-  {
-    return XSDEditorPlugin.getXSDImage(Messages._UI_IMAGE_SIMPLE_TYPE);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDSchemaDirectiveAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDSchemaDirectiveAction.java
deleted file mode 100644
index 0324f1c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDSchemaDirectiveAction.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaDirectiveAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDImportCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDIncludeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDRedefineCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.BaseCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesSchemaLocationUpdater;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDSchemaDirectiveAction extends XSDBaseAction
-{
-  public static String INCLUDE_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDIncludeAction"; //$NON-NLS-1$
-  public static String IMPORT_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDImportAction"; //$NON-NLS-1$
-  public static String REDEFINE_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDRedefineAction"; //$NON-NLS-1$
-  String label;
-  
-  public AddXSDSchemaDirectiveAction(IWorkbenchPart part, String ID, String label)
-  {
-    super(part);
-    setText(label);
-    setId(ID);
-    this.label = label;
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-    }
-
-    BaseCommand command = null;
-    if (selection instanceof XSDSchema)
-    {
-      if (INCLUDE_ID.equals(getId()))
-      {
-        command = new AddXSDIncludeCommand(label, (XSDSchema) selection);
-      }
-      else if (IMPORT_ID.equals(getId()))
-      {
-        command = new AddXSDImportCommand(label, (XSDSchema) selection);
-      }
-      else if (REDEFINE_ID.equals(getId()))
-      {
-        command = new AddXSDRedefineCommand(label, (XSDSchema) selection);
-      }
-      getCommandStack().execute(command);
-    }
-
-    if (command != null)
-    {
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(command.getAddedComponent());
-      if (adapter != null)
-      {
-    	  provider.setSelection(new StructuredSelection(adapter));
-        // Automatically open the schema location dialog if the preference is enabled
-        if(XSDEditorPlugin.getDefault().getAutomaticallyOpenSchemaLocationDialogSetting())
-        {
-          XSDSchemaDirectiveAdapter xsdSchemaDirectiveAdapter = null;
-          if(adapter instanceof XSDSchemaDirectiveAdapter)
-          {
-            xsdSchemaDirectiveAdapter = (XSDSchemaDirectiveAdapter)adapter;
-          }    	  
-          XSDDirectivesSchemaLocationUpdater.updateSchemaLocation((XSDSchema) selection, xsdSchemaDirectiveAdapter.getTarget(), 
-            		(command instanceof AddXSDIncludeCommand || command instanceof AddXSDRedefineCommand));
-        }
-        // The graphical view may deselect, so select again
-        provider.setSelection(new StructuredSelection(adapter));
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDSimpleTypeDefinitionAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDSimpleTypeDefinitionAction.java
deleted file mode 100644
index bc7cd73..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/AddXSDSimpleTypeDefinitionAction.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddXSDSimpleTypeDefinitionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDSimpleTypeDefinitionAction extends XSDBaseAction
-{
-  public static final String ID = "org.eclipse.wst.xsd.ui.internal.editor.AddXSDSimpleTypeDefinitionAction"; //$NON-NLS-1$
-
-  public AddXSDSimpleTypeDefinitionAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_ADD_SIMPLE_TYPE);
-    setId(ID);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-    }
-
-    if (selection instanceof XSDSchema)
-    {
-      AddXSDSimpleTypeDefinitionCommand command = new AddXSDSimpleTypeDefinitionCommand(Messages._UI_ACTION_ADD_SIMPLE_TYPE, (XSDSchema) selection);
-      getCommandStack().execute(command);
-      
-      addedComponent = command.getAddedComponent();
-      Adapter adapter = XSDAdapterFactory.getInstance().adapt(addedComponent);
-      selectAddedComponent(adapter);
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/DeleteXSDConcreteComponentAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/DeleteXSDConcreteComponentAction.java
deleted file mode 100644
index abfe49d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/DeleteXSDConcreteComponentAction.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * @deprecated Use org.eclipse.wst.xsd.ui.internal.adt.actions.DeleteAction
- *
- */
-public class DeleteXSDConcreteComponentAction extends XSDBaseAction
-{
-  public static final String DELETE_XSD_COMPONENT_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.DeleteXSDConcreteComponentAction";   //$NON-NLS-1$
-
-  public DeleteXSDConcreteComponentAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_DELETE);
-    setId(DELETE_XSD_COMPONENT_ID);
-    setImageDescriptor(XSDEditorPlugin.getImageDescriptor("icons/delete_obj.gif") ); //$NON-NLS-1$
-  }
-
-  public void run()
-  {
-    for (Iterator i = ((IStructuredSelection) getSelection()).iterator(); i.hasNext();)
-    {
-      Object selection = i.next();
-      boolean doReselect = false;
-      
-      if (selection instanceof XSDBaseAdapter)
-      {
-        selection = ((XSDBaseAdapter) selection).getTarget();
-      }
-
-      if (selection instanceof XSDConcreteComponent)
-      {
-        XSDConcreteComponent xsdComponent = (XSDConcreteComponent) selection;
-        XSDSchema model = xsdComponent.getSchema();
-        
-        doReselect = xsdComponent.eContainer() instanceof XSDSchema;
-        
-        DeleteCommand command = new DeleteCommand(getText(), xsdComponent);
-        getCommandStack().execute(command);
-        
-        if (model != null && doReselect)
-        {
-          Adapter adapter = XSDAdapterFactory.getInstance().adapt(model);
-          if (adapter != null)
-            provider.setSelection(new StructuredSelection(adapter));
-        }
-       }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/OpenInNewEditor.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/OpenInNewEditor.java
deleted file mode 100644
index 1efade0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/OpenInNewEditor.java
+++ /dev/null
@@ -1,546 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import java.net.URI;
-
-import org.eclipse.core.filesystem.EFS;
-import org.eclipse.core.filesystem.IFileStore;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorReference;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.ide.IDE;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDSchemaDirectiveAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ADTFileStoreEditorInput;
-import org.eclipse.wst.xsd.ui.internal.adt.editor.ADTReadOnlyFileEditorInput;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.InternalXSDMultiPageEditor;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDFileEditorInput;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDImportImpl;
-
-public class OpenInNewEditor extends BaseSelectionAction
-{
-  public static final String ID = "OpenInNewEditor"; //$NON-NLS-1$
-
-  public OpenInNewEditor(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_OPEN_IN_NEW_EDITOR); //$NON-NLS-1$
-    setId(ID);
-  }
-
-  protected boolean calculateEnabled()
-  {
-    return true;
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    IWorkbenchPage page = null;
-    IEditorInput editorInput = null;
-    if (workbenchWindow != null)
-    {
-      page = workbenchWindow.getActivePage();
-      IEditorPart activeEditor = page.getActiveEditor();
-      if (activeEditor != null)
-      {
-        editorInput = activeEditor.getEditorInput();
-      }
-      
-    }
-    
-    if (selection instanceof XSDBaseAdapter)
-    {
-      XSDBaseAdapter xsdAdapter = (XSDBaseAdapter) selection;
-      XSDConcreteComponent fComponent = (XSDConcreteComponent) xsdAdapter.getTarget();
-      XSDSchema schema = fComponent.getSchema();
-      
-      boolean isReference = false;
-      if (fComponent instanceof XSDFeature)
-      {
-        isReference = ((XSDFeature)fComponent).isFeatureReference();
-        fComponent = ((XSDFeature)fComponent).getResolvedFeature();
-      }
-
-      String schemaLocation = null;
-      IPath schemaPath = null;
-      IFile schemaFile = null;
-
-      // Special case any imports/includes
-      if (selection instanceof XSDSchemaDirectiveAdapter)
-      {
-        XSDSchemaDirective dir = (XSDSchemaDirective)((XSDSchemaDirectiveAdapter)selection).getTarget();
-        // force load of imported schema
-        if (dir instanceof XSDImportImpl)
-        {
-          ((XSDImportImpl)dir).importSchema();
-        }
-        if (dir.getResolvedSchema() != null)
-        {
-          schemaLocation = URIHelper.removePlatformResourceProtocol(dir.getResolvedSchema().getSchemaLocation());
-          schemaPath = new Path(schemaLocation);
-          schemaFile = ResourcesPlugin.getWorkspace().getRoot().getFile(schemaPath);
-          schema = dir.getResolvedSchema(); 
-          fComponent = dir.getResolvedSchema();
-        }
-      } // Handle any other external components
-      else if (fComponent.getSchema() != null && fComponent.eContainer() instanceof XSDSchema ||
-          fComponent.eContainer() instanceof XSDRedefine || isReference)
-      {
-        schemaLocation = URIHelper.removePlatformResourceProtocol(fComponent.getSchema().getSchemaLocation());
-        schemaPath = new Path(schemaLocation);
-        schemaFile = ResourcesPlugin.getWorkspace().getRoot().getFile(schemaPath);
-        
-        try
-        {
-          XSDSchema xsdSchema = (XSDSchema)getWorkbenchPart().getAdapter(XSDSchema.class);
-          if (fComponent.getSchema() == xsdSchema)
-          {
-            IEditorPart editorPart = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-            if (editorPart instanceof InternalXSDMultiPageEditor)
-            {
-              ((InternalXSDMultiPageEditor) editorPart).openOnGlobalReference(fComponent);
-            }
-            return;
-          }
-        }
-        catch (Exception e)
-        {
-          
-        }
-      }
-      
-      // If the schemaFile exists in the workspace
-      if (page != null && schemaFile != null && schemaFile.exists())
-      {
-        try
-        {
-          // Get the current editor's schema
-          XSDSchema xsdSchema = (XSDSchema)getWorkbenchPart().getAdapter(XSDSchema.class);
-          IEditorPart editorPart = null;
-          // This first check is to ensure that the schema is actually
-          // different than the current one we are editing against in the editor, and that we
-          // are in the same resource file....hence multiple schemas in the same file.
-          if (xsdSchema != null && fComponent.getRootContainer().eResource() == xsdSchema.eResource() && xsdSchema != schema)
-          {
-            String editorName = null;
-            XSDFileEditorInput xsdFileEditorInput = new XSDFileEditorInput(schemaFile, fComponent.getSchema());
-            // will use FileEditorInput's name if still null
-            // Try to use the same editor name as the current one
-            if (editorInput != null)
-            {
-              editorName = editorInput.getName();
-              xsdFileEditorInput.setEditorName(editorName);
-            }
-            editorPart = getExistingEditorForInlineSchema(page, schemaFile, schema);
-            if (editorPart == null)
-            {
-              editorPart = page.openEditor(xsdFileEditorInput, XSDEditorPlugin.EDITOR_ID, true, 0);
-            }
-          }
-          else
-          {
-            editorPart = page.openEditor(new FileEditorInput(schemaFile), XSDEditorPlugin.EDITOR_ID);
-          }
-          if (editorPart instanceof InternalXSDMultiPageEditor)
-          {
-            ((InternalXSDMultiPageEditor) editorPart).openOnGlobalReference(fComponent);
-          }
-        }
-        catch (Exception e)
-        {
-        }
-      }
-      else
-      {
-        // open the xsd externally
-        if (schemaLocation != null)
-          openExternalFiles(page, schemaLocation, fComponent);
-      }
-    }
-  }
-
-  public static void openXSDEditor(IEditorInput editorInput, XSDConcreteComponent xsdComponent)
-  {
-    openXSDEditor(editorInput, xsdComponent.getSchema(), xsdComponent);
-  }
-
-  public static void openXSDEditor(IEditorInput editorInput, XSDSchema schema, XSDConcreteComponent xsdComponent)
-  {
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    IWorkbenchPage page = null;
-    if (workbenchWindow != null)
-    {
-      page = workbenchWindow.getActivePage();
-    }
-
-    String resource = schema.getSchemaLocation();
-    
-    if (editorInput instanceof FileEditorInput && resource != null && !resource.startsWith("http"))
-    {
-      String schemaLocation = URIHelper.removePlatformResourceProtocol(resource);
-      openWorkspaceFile(page, schemaLocation, xsdComponent);
-    }
-    else
-    {
-      openExternalFiles(page, resource, xsdComponent);
-    }
-  }
-  
-  public static void openInlineSchema(IEditorInput editorInput, XSDConcreteComponent xsdComponent, XSDSchema schema, String editorName)
-  {
-    IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-    IWorkbenchPage page = null;
-    if (workbenchWindow != null)
-    {
-      page = workbenchWindow.getActivePage();
-    }
-
-    boolean isWorkspaceFile = false;
-    
-    String schemaLocation = schema.getSchemaLocation();
-    String workspaceFileLocation = URIHelper.removePlatformResourceProtocol(schemaLocation);
-    IPath workspaceFilePath = new Path(workspaceFileLocation);
-    IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(workspaceFilePath);
-    
-    if (page != null && file != null && file.exists())
-    {
-      isWorkspaceFile = true;  
-    }
-
-    if (isWorkspaceFile)
-    {
-      try
-      {
-        IEditorPart editorPart = null;
-        XSDFileEditorInput xsdFileEditorInput = new XSDFileEditorInput(file, schema);
-        xsdFileEditorInput.setEditorName(editorName);
-        IEditorReference[] refs = page.getEditorReferences();
-        int length = refs.length;
-        for (int i = 0; i < length; i++)
-        {
-          IEditorInput input = refs[i].getEditorInput();
-          if (input instanceof XSDFileEditorInput)
-          {
-            IFile aFile = ((XSDFileEditorInput) input).getFile();
-            if (aFile.getFullPath().equals(file.getFullPath()))
-            {
-              if (((XSDFileEditorInput) input).getSchema() == schema)
-              {
-                editorPart = refs[i].getEditor(true);
-                page.activate(refs[i].getPart(true));
-                break;
-              }
-            }
-          }
-        }
-        if (editorPart == null)
-        {
-          editorPart = page.openEditor(xsdFileEditorInput, XSDEditorPlugin.EDITOR_ID, true, 0); //$NON-NLS-1$
-        }
-        if (editorPart instanceof InternalXSDMultiPageEditor)
-        {
-          InternalXSDMultiPageEditor xsdEditor = (InternalXSDMultiPageEditor) editorPart;
-          xsdEditor.openOnGlobalReference(xsdComponent);
-        }
-      }
-      catch (PartInitException pie)
-      {
-      }
-    }
-    else
-    {
-      if (schemaLocation != null && !schemaLocation.startsWith("http"))
-      {
-        String fileLocation = null;
-        // This is to workaround the difference in URI resolution. On linux, the resolved location is
-        // platform:/resource/   On Windows, it's file://
-        // 
-       	if (java.io.File.separatorChar == '/')
-      	{
-          fileLocation = "/" + URIHelper.removePlatformResourceProtocol(schemaLocation);
-      	}
-    	  else // Windows
-      	{
-          fileLocation = URIHelper.removeProtocol(schemaLocation);
-      	}
-        IPath schemaPath = new Path(fileLocation);
-        IFileStore fileStore = EFS.getLocalFileSystem().getStore(schemaPath);
-        if (!fileStore.fetchInfo().isDirectory() && fileStore.fetchInfo().exists())
-        {
-          try
-          {
-            ADTFileStoreEditorInput xsdFileStoreEditorInput = new ADTFileStoreEditorInput(fileStore, schema);
-            xsdFileStoreEditorInput.setEditorName(editorName);
-
-            IEditorPart editorPart = null;
-            IEditorReference[] refs = page.getEditorReferences();
-            int length = refs.length;
-            for (int i = 0; i < length; i++)
-            {
-              IEditorInput input = refs[i].getEditorInput();
-              if (input instanceof ADTFileStoreEditorInput)
-              {
-                URI uri = ((ADTFileStoreEditorInput) input).getURI();
-                if (uri.equals(xsdFileStoreEditorInput.getURI()) && ((ADTFileStoreEditorInput) input).getSchema() == xsdFileStoreEditorInput.getSchema())
-                {
-                  editorPart = refs[i].getEditor(true);
-                  page.activate(refs[i].getPart(true));
-                  break;
-                }
-              }
-            }
-
-            if (page != null && editorPart == null)
-            {
-              editorPart = page.openEditor(xsdFileStoreEditorInput, XSDEditorPlugin.EDITOR_ID, true, 0); //$NON-NLS-1$
-            }
-            if (editorPart instanceof InternalXSDMultiPageEditor)
-            {
-              InternalXSDMultiPageEditor xsdEditor = (InternalXSDMultiPageEditor) editorPart;
-              xsdEditor.openOnGlobalReference(xsdComponent);
-            }
-          }
-          catch (PartInitException pie)
-          {
-
-          }
-        }
-      }
-      else
-      {
-        try
-        {
-          IEditorPart editorPart = null;
-          IEditorReference[] refs = page.getEditorReferences();
-          int length = refs.length;
-          // Need to find if an editor on that schema has already been opened
-          for (int i = 0; i < length; i++)
-          {
-            IEditorInput input = refs[i].getEditorInput();
-            if (input instanceof ADTReadOnlyFileEditorInput)
-            {
-              ADTReadOnlyFileEditorInput xsdFileStorageEditorInput = (ADTReadOnlyFileEditorInput) input;
-              if (xsdFileStorageEditorInput.getUrlString().equals(schemaLocation)
-                  && xsdFileStorageEditorInput.getEditorID().equals(XSDEditorPlugin.EDITOR_ID))
-              {
-                editorPart = refs[i].getEditor(true);
-                page.activate(refs[i].getPart(true));
-                break;
-              }
-            }
-          }
-          if (editorPart == null)
-          {
-            ADTReadOnlyFileEditorInput xsdFileStorageEditorInput = new ADTReadOnlyFileEditorInput(schemaLocation);
-            xsdFileStorageEditorInput.setSchema(schema);
-            xsdFileStorageEditorInput.setEditorName(editorName);
-            xsdFileStorageEditorInput.setEditorID(XSDEditorPlugin.EDITOR_ID);
-            editorPart = page.openEditor(xsdFileStorageEditorInput, XSDEditorPlugin.EDITOR_ID, true, 0);
-          }
-          if (editorPart instanceof InternalXSDMultiPageEditor)
-          {
-            InternalXSDMultiPageEditor xsdEditor = (InternalXSDMultiPageEditor) editorPart;
-            xsdEditor.openOnGlobalReference(xsdComponent);
-          }
-        }
-        catch (PartInitException pie)
-        {
-        }
-        
-      }
-      return;
-    }
-  }
-  
-  private IEditorPart getExistingEditorForInlineSchema(IWorkbenchPage page, IFile schemaFile, XSDSchema schema)
-  {
-    IEditorReference [] refs = page.getEditorReferences();
-    int length = refs.length;
-    IEditorPart editorPart = null;
-    try
-    {
-      for (int i = 0; i < length; i++)
-      {
-        IEditorInput input = refs[i].getEditorInput();
-        if (input instanceof XSDFileEditorInput)
-        {
-          IFile aFile = ((XSDFileEditorInput)input).getFile();
-          if (aFile.getFullPath().equals(schemaFile.getFullPath()))
-          {
-            if (((XSDFileEditorInput)input).getSchema() == schema)
-            {
-              editorPart = refs[i].getEditor(true);
-              page.activate(refs[i].getPart(true));
-              break;
-            }
-          }
-        }
-      }
-    }
-    catch (PartInitException e)
-    {
-    }
-    return editorPart;
-  }
-
-  public static void openWorkspaceFile(IWorkbenchPage page, String schemaLocation, XSDConcreteComponent xsdComponent)
-  {
-    IPath schemaPath = new Path(schemaLocation);
-    IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(schemaPath);
-    if (page != null && file != null && file.exists())
-    {
-      try
-      {
-        IEditorPart editorPart = IDE.openEditor(page, file, true);
-        if (editorPart instanceof InternalXSDMultiPageEditor)
-        {
-          InternalXSDMultiPageEditor xsdEditor = (InternalXSDMultiPageEditor) editorPart;
-          xsdEditor.openOnGlobalReference(xsdComponent);
-        }
-      }
-      catch (PartInitException pie)
-      {
-
-      }
-    }
-  }
-
-  public static void openExternalFiles(IWorkbenchPage page, String schemaLocation, XSDConcreteComponent fComponent)
-  {
-    if (schemaLocation == null) return;  // Assert not null
-  
-    IPath schemaPath = new Path(schemaLocation);
-//  Initially tried to use schemaPath.getDevice() to determine if it is an http reference.  However, on Linux, it is null.
-//  So as a result of bug 221421, we will just use the schemaLocation.
-    if (!schemaLocation.startsWith("http"))
-    {
-      schemaPath = new Path(URIHelper.removeProtocol(schemaLocation));
-    }
-    IFileStore fileStore = EFS.getLocalFileSystem().getStore(schemaPath);
-    URI schemaURI = URI.create(schemaLocation);
-    if (!fileStore.fetchInfo().isDirectory() && fileStore.fetchInfo().exists())
-    {
-      try
-      {
-        IEditorPart editorPart = null;
-        IEditorReference[] refs = page.getEditorReferences();
-        int length = refs.length;
-        // Need to find if an editor on that schema has already been opened
-        for (int i = 0; i < length; i++)
-        {
-          IEditorInput input = refs[i].getEditorInput();
-          if (input instanceof FileStoreEditorInput)
-          {
-            URI uri = ((FileStoreEditorInput) input).getURI();
-            if (uri.equals(schemaURI))
-            {
-              editorPart = refs[i].getEditor(true);
-              page.activate(refs[i].getPart(true));
-              break;
-            }
-          }
-        }
-        if (editorPart == null)
-        {
-          editorPart = IDE.openEditorOnFileStore(page, fileStore);
-        }
-        if (editorPart instanceof InternalXSDMultiPageEditor)
-        {
-          InternalXSDMultiPageEditor xsdEditor = (InternalXSDMultiPageEditor) editorPart;
-          xsdEditor.openOnGlobalReference(fComponent);
-        }
-      }
-      catch (PartInitException pie)
-      {
-      }
-    }
-    else
-    {
-      try
-      {
-        if (schemaLocation.startsWith("http"))
-        {
-          try
-          {
-            IEditorPart editorPart = null;
-            IEditorReference[] refs = page.getEditorReferences();
-            int length = refs.length;
-            // Need to find if an editor on that schema has already been opened
-            for (int i = 0; i < length; i++)
-            {
-              IEditorInput input = refs[i].getEditorInput();
-              if (input instanceof ADTReadOnlyFileEditorInput)
-              {
-                ADTReadOnlyFileEditorInput readOnlyEditorInput = (ADTReadOnlyFileEditorInput) input;
-                if (readOnlyEditorInput.getUrlString().equals(schemaLocation) &&
-                    XSDEditorPlugin.EDITOR_ID.equals(readOnlyEditorInput.getEditorID()))
-                {
-                  editorPart = refs[i].getEditor(true);
-                  page.activate(refs[i].getPart(true));
-                  break;
-                }
-              }
-            }
-            if (editorPart == null)
-            {
-              ADTReadOnlyFileEditorInput readOnlyStorageEditorInput = new ADTReadOnlyFileEditorInput(schemaLocation);
-              readOnlyStorageEditorInput.setEditorID(XSDEditorPlugin.EDITOR_ID);
-              editorPart = page.openEditor(readOnlyStorageEditorInput, XSDEditorPlugin.EDITOR_ID, true, 0); //$NON-NLS-1$
-            }
-            if (editorPart instanceof InternalXSDMultiPageEditor)
-            {
-              InternalXSDMultiPageEditor xsdEditor = (InternalXSDMultiPageEditor) editorPart;
-              xsdEditor.openOnGlobalReference(fComponent);
-            }
-          }
-          catch (PartInitException pie)
-          {
-          }
-
-        }
-        else
-        {
-          FileStoreEditorInput xsdFileStoreEditorInput = new FileStoreEditorInput(fileStore);        
-          page.openEditor(xsdFileStoreEditorInput, XSDEditorPlugin.EDITOR_ID, true, 0); //$NON-NLS-1$
-        }
-
-      }
-      catch (PartInitException e)
-      {
-        
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetBaseTypeAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetBaseTypeAction.java
deleted file mode 100644
index dbc3a45..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetBaseTypeAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDComplexTypeBaseTypeEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class SetBaseTypeAction extends XSDBaseAction
-{
-  public static String ID = "org.eclipse.wst.xsd.ui.internal.common.actions.setBaseType"; //$NON-NLS-1$
-
-  public SetBaseTypeAction(IWorkbenchPart part)
-  {
-    super(part);
-    setText(Messages._UI_ACTION_SET_BASE_TYPE + "..."); //$NON-NLS-1$
-    setId(ID);
-  }
-  
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      selection = ((XSDBaseAdapter) selection).getTarget();
-      
-      boolean complexType = selection instanceof XSDComplexTypeDefinition;
-      boolean simpleType = selection instanceof XSDSimpleTypeDefinition;
-      
-      if (complexType || simpleType)
-      {
-        
-        if (getWorkbenchPart() instanceof IEditorPart)
-        {
-          IEditorPart editor = (IEditorPart)getWorkbenchPart();
-
-          ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDComplexTypeBaseTypeEditManager.class);
-          ComponentSpecification newValue;
-          IComponentDialog dialog = null;
-          dialog = manager.getBrowseDialog();
-          if (dialog != null)
-          {
-        	if(simpleType)
-        	{
-        		((XSDSearchListDialogDelegate) dialog).showComplexTypes(false);
-        	}
-            if (dialog.createAndOpen() == Window.OK)
-            {
-              newValue = dialog.getSelectedComponent();
-              manager.modifyComponentReference(selection, newValue);
-            }
-          }
-        }
-      }
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetMultiplicityAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetMultiplicityAction.java
deleted file mode 100644
index a33996a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetMultiplicityAction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.SetMultiplicityCommand;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-
-public class SetMultiplicityAction extends XSDBaseAction
-{
-  public static String REQUIRED_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicity.REQUIRED_ID"; //$NON-NLS-1$
-  public static String ZERO_OR_ONE_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicity.ZERO_OR_ONE_ID"; //$NON-NLS-1$
-  public static String ZERO_OR_MORE_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicity.ZERO_OR_MORE_ID"; //$NON-NLS-1$
-  public static String ONE_OR_MORE_ID = "org.eclipse.wst.xsd.ui.internal.common.actions.SetMultiplicity.ONE_OR_MORE_ID"; //$NON-NLS-1$
-  
-  SetMultiplicityCommand command;
-  
-  public SetMultiplicityAction(IWorkbenchPart part, String label, String ID)
-  {
-    super(part);
-    setText(label);
-    setId(ID);
-    command = new SetMultiplicityCommand(label);
-  }
-  
-  public void setMaxOccurs(int i)
-  {
-    command.setMaxOccurs(i);
-  }
-
-  public void setMinOccurs(int i)
-  {
-    command.setMinOccurs(i);
-  }
-  
-  protected boolean calculateEnabled()
-  {
-    boolean state = super.calculateEnabled();
-    if (state)
-    {
-      XSDConcreteComponent xsdConcreteComponent = getXSDInput();
-      if (xsdConcreteComponent instanceof XSDElementDeclaration)
-      {
-        return !((XSDElementDeclaration)xsdConcreteComponent).isGlobal();
-      }
-      else if (xsdConcreteComponent instanceof XSDModelGroup)
-      {
-        return !(((XSDModelGroup)xsdConcreteComponent).eContainer() instanceof XSDModelGroupDefinition);
-      }
-    }
-    return state;
-  }
-  
-  private XSDConcreteComponent getXSDInput()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    XSDConcreteComponent xsdConcreteComponent = null;
-    if (selection instanceof XSDBaseAdapter)
-    {
-      xsdConcreteComponent = (XSDConcreteComponent)((XSDBaseAdapter) selection).getTarget();
-    }
-    return xsdConcreteComponent;
-  }
-
-  public void run()
-  {
-    XSDConcreteComponent xsdConcreteComponent = getXSDInput();
-    if (xsdConcreteComponent != null)
-    {
-      command.setXSDConcreteComponent(xsdConcreteComponent);
-      getCommandStack().execute(command);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetTypeAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetTypeAction.java
deleted file mode 100644
index 2083e4f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/SetTypeAction.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.commands.SetTypeCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDConcreteComponent;
-
-public class SetTypeAction extends XSDBaseAction
-{
-  public static final String SET_NEW_TYPE_ID = "SetTypeAction_AddType"; //$NON-NLS-1$
-  public static final String SELECT_EXISTING_TYPE_ID = "SetTypeAction_ExistingType"; //$NON-NLS-1$
-
-  SetTypeCommand command;
-
-  public SetTypeAction(String label, String ID, IWorkbenchPart part)
-  {
-    super(part);
-    setText(label);
-    setId(ID);
-  }
-
-  public void run()
-  {
-    Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-
-    if (selection instanceof XSDBaseAdapter)
-    {
-      Object target = ((XSDBaseAdapter) selection).getTarget();
-
-      if (target instanceof XSDConcreteComponent)
-      {
-        command = new SetTypeCommand(Messages._UI_ACTION_SET_TYPE, getId(), (XSDConcreteComponent) target);
-        command.setAdapter((XSDBaseAdapter) selection);
-        getCommandStack().execute(command);
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/XSDBaseAction.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/XSDBaseAction.java
deleted file mode 100644
index 472d960..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/actions/XSDBaseAction.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.actions;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.actions.BaseSelectionAction;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.BaseFieldEditPart;
-import org.eclipse.wst.xsd.ui.internal.adt.design.editparts.IAutoDirectEdit;
-import org.eclipse.wst.xsd.ui.internal.design.editparts.TopLevelComponentEditPart;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDBaseAction extends BaseSelectionAction
-{
-  XSDConcreteComponent addedComponent;
-
-  public XSDBaseAction(IWorkbenchPart part)
-  {
-    super(part);
-  }
-
-  protected boolean calculateEnabled()
-  {
-    if (getWorkbenchPart() instanceof IEditorPart)
-    {
-      IEditorPart owningEditor = (IEditorPart)getWorkbenchPart();
-      
-      Object selection = ((IStructuredSelection) getSelection()).getFirstElement();
-      if (selection instanceof XSDBaseAdapter)
-      {
-        selection = ((XSDBaseAdapter) selection).getTarget();
-      }
-      XSDSchema xsdSchema = null;
-      if (selection instanceof XSDConcreteComponent)
-      {
-        xsdSchema = ((XSDConcreteComponent)selection).getSchema();
-      }
-      
-      if (xsdSchema != null && xsdSchema == owningEditor.getAdapter(XSDSchema.class))
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  protected void doEdit(Object obj, IWorkbenchPart part)
-  {
-    if (obj instanceof TopLevelComponentEditPart)
-    {
-      TopLevelComponentEditPart editPart = (TopLevelComponentEditPart)obj;
-      if (addedComponent == ((XSDBaseAdapter)editPart.getModel()).getTarget())
-      {
-        editPart.setScroll(true);
-        editPart.addFeedback();
-        editPart.doEditName(!(part instanceof ContentOutline));
-      }
-    }
-    else if (obj instanceof BaseFieldEditPart)
-    {
-      BaseFieldEditPart editPart = (BaseFieldEditPart)obj;
-      editPart.doEditName(!(part instanceof ContentOutline));
-    }
-    else if (obj instanceof IAutoDirectEdit)
-    {
-      ((IAutoDirectEdit)obj).doEditName(!(part instanceof ContentOutline));
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddDocumentationCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddDocumentationCommand.java
deleted file mode 100644
index 4462ecc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddDocumentationCommand.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AddDocumentationCommand extends BaseCommand
-{
-  XSDAnnotation xsdAnnotation;
-  XSDConcreteComponent input;
-  String newValue, oldValue;
-  boolean documentationExists;
-  Element documentationElement;
-
-  public AddDocumentationCommand(String label, XSDAnnotation xsdAnnotation, XSDConcreteComponent input, String newValue, String oldValue)
-  {
-    super(label);
-    this.xsdAnnotation = xsdAnnotation;
-    this.input = input;
-    this.newValue = newValue;
-    this.oldValue = oldValue;
-  }
-
-  public void execute()
-  {
-    if (input instanceof XSDSchema)
-    {
-      ensureSchemaElement((XSDSchema)input);
-    }
-    
-    try
-    {
-      beginRecording(input.getElement());
-
-      xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation(input, true);
-      Element element = xsdAnnotation.getElement();
-
-      List documentationList = xsdAnnotation.getUserInformation();
-      documentationElement = null;
-      documentationExists = false;
-      if (documentationList.size() > 0)
-      {
-        documentationExists = true;
-        documentationElement = (Element) documentationList.get(0);
-      }
-
-      if (documentationElement == null)
-      {
-        documentationElement = xsdAnnotation.createUserInformation(null);
-        element.appendChild(documentationElement);
-        formatChild(documentationElement);
-        // Defect in model....I create it but the model object doesn't appear
-        // to be updated
-        xsdAnnotation.updateElement();
-        xsdAnnotation.setElement(element);
-      }
-
-      if (documentationElement.hasChildNodes())
-      {
-        if (documentationElement instanceof IDOMElement)
-        {
-          IDOMElement domElement = (IDOMElement) documentationElement;
-
-          Node firstChild = documentationElement.getFirstChild();
-          Node lastChild = documentationElement.getLastChild();
-          int start = 0;
-          int end = 0;
-
-          // IDOMModel model = domElement.getModel();
-          // IDOMDocument doc = model.getDocument();
-          IDOMNode first = null;
-          if (firstChild instanceof IDOMNode)
-          {
-            first = (IDOMNode) firstChild;
-            start = first.getStartOffset();
-          }
-          if (lastChild instanceof IDOMNode)
-          {
-            IDOMNode last = (IDOMNode) lastChild;
-            end = last.getEndOffset();
-          }
-
-          if (domElement != null)
-          {
-            oldValue = domElement.getModel().getStructuredDocument().get(start, end - start);
-            domElement.getModel().getStructuredDocument().replaceText(documentationElement, start, end - start, newValue);
-          }
-        }
-      }
-      else
-      {
-        if (newValue.length() > 0)
-        {
-          oldValue = ""; //$NON-NLS-1$
-          Node childNode = documentationElement.getOwnerDocument().createTextNode(newValue);
-          documentationElement.appendChild(childNode);
-        }
-      }
-    }
-    catch (Exception e)
-    {
-
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  public void undo()
-  {
-    super.undo();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddEnumerationsCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddEnumerationsCommand.java
deleted file mode 100644
index 6cb8fa7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddEnumerationsCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDEnumerationFacetAction;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-
-public class AddEnumerationsCommand extends BaseCommand
-{
-  XSDSimpleTypeDefinition simpleType;
-  String value;
-  // The index of the currently selected item.  If no item is selected, index will be less than 0
-  private int index = -1;  
-  // Determines where the element should be inserted based on the currently selected element.  If no
-  // element is selected, use the default behaviour of appending the element to the end
-  private String addEnumerationLocation;
-  
-  public AddEnumerationsCommand(String label, XSDSimpleTypeDefinition simpleType)
-  {
-    super(label);
-    this.simpleType = simpleType;
-  }
-
-  public AddEnumerationsCommand(String label, XSDSimpleTypeDefinition simpleType, String ID, int index)
-  {
-    super(label);
-    this.simpleType = simpleType;
-    this.index = index;
-    this.addEnumerationLocation = ID;
-  }
-
-  public void setValue(String value)
-  {
-    this.value = value; 
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(simpleType.getElement());
-      XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-      XSDEnumerationFacet enumerationFacet = factory.createXSDEnumerationFacet();
-      enumerationFacet.setLexicalValue(value);
-      
-      index = getInsertionIndex();
-      List facets = simpleType.getFacetContents();
-      if (index >=0 && index < facets.size())
-      {
-        facets.add(index, enumerationFacet);
-      }
-      else
-      {
-        facets.add(enumerationFacet);
-      }
-      formatChild(simpleType.getElement());
-      addedXSDConcreteComponent = enumerationFacet;
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-  protected int getInsertionIndex()
-  {
-    if (index < 0)
-      return -1;
-
-    if (addEnumerationLocation.equals(AddXSDEnumerationFacetAction.BEFORE_SELECTED_ID))
-    {
-      return index;
-    }
-    else if (addEnumerationLocation.equals(AddXSDEnumerationFacetAction.AFTER_SELECTED_ID))
-    {
-      index++;
-      return index;
-    }
-    else
-    {
-      return -1;
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensibilityElementCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensibilityElementCommand.java
deleted file mode 100644
index 6747f59..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensibilityElementCommand.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.SpecificationForExtensionsSchema;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AddExtensibilityElementCommand extends BaseCommand
-{
-  Element input, elementToAdd;
-  SpecificationForExtensionsSchema extensionSchemaSpec;
-
-  public AddExtensibilityElementCommand(String label, Element input, Element elementToAdd)
-  {
-    super(label);
-    this.input = input;
-    this.elementToAdd = elementToAdd;
-  }
-
-  public void execute()
-  {
-    super.execute();
-    try
-    {
-      beginRecording(input);
-      addElement();
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  public void undo()
-  {
-    super.undo();
-    // TODO
-  }
-
-  public void setSchemaProperties(SpecificationForExtensionsSchema appInfoSchemaSpec)
-  {
-    this.extensionSchemaSpec = appInfoSchemaSpec;
-  }
-
-  private void addElement()
-  {
-    if (input != null)
-    {
-      Document doc = input.getOwnerDocument();
-      String name = elementToAdd.getAttribute("name"); //$NON-NLS-1$
-      try
-      {
-        Element rootElement = doc.createElementNS(extensionSchemaSpec.getNamespaceURI(), name);
-        String prefix = input.getPrefix();
-        rootElement.setPrefix(prefix);
-        String xmlns = (prefix == null || prefix.equals("")) ? "xmlns" : "xmlns:" + prefix; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-        Attr nsURIAttribute = doc.createAttribute(xmlns);
-        nsURIAttribute.setValue(extensionSchemaSpec.getNamespaceURI());
-        rootElement.setAttributeNode(nsURIAttribute);
-        input.appendChild(rootElement);
-
-      }
-      catch (Exception e)
-      {
-
-      }
-
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionAttributeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionAttributeCommand.java
deleted file mode 100644
index 8ee0c52..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionAttributeCommand.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-public class AddExtensionAttributeCommand extends AddExtensionCommand
-{
-  private static DOMNamespaceInfoManager manager = new DOMNamespaceInfoManager();
-  private XSDAttributeDeclaration attribute;
-  private boolean appInfoAttributeAdded = false;
-  private String attributeQName;
-  private String namespacePrefix;
-
-  public AddExtensionAttributeCommand(String label, XSDConcreteComponent component,
-      XSDAttributeDeclaration attribute)
-  {
-    super(label);
-    this.component = component;
-    this.attribute = attribute;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(component.getElement());
-      super.execute();
-      namespacePrefix = handleNamespacePrefices();
-
-      attributeQName = namespacePrefix + ":" + attribute.getName(); //$NON-NLS-1$
-     
-      if (!(component.getElement().hasAttribute(attributeQName)))
-      {
-        appInfoAttributeAdded = true;
-        component.getElement().setAttribute(attributeQName, ""); //$NON-NLS-1$
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  public void undo()
-  {
-    super.undo();
-    if (appInfoAttributeAdded){
-      component.getElement().removeAttribute(attributeQName);
-    }
-  }
-
-  /** Create a namespace prefix if needed, other wise retrieve 
-   * a predefined namespace prefix
-   * @return   */
-  private String handleNamespacePrefices()
-  {
-    Element schemaElement = component.getSchema().getElement();
-    String prefix = null;
-    
-    // If target namespace of the attribute already exists
-    List namespacePrefices = manager.getNamespaceInfoList(schemaElement);
-    for (int i = 0; i < namespacePrefices.size(); i++){
-      NamespaceInfo info = (NamespaceInfo) namespacePrefices.get(i);
-      if ( info.uri.equals(attribute.getTargetNamespace())) {
-        prefix = info.prefix;
-      }
-    }
-    
-    // Create unquie namespace prefix
-    if ( prefix == null){
-      prefix = createUniquePrefix(component);
-    }
-
-    NamespaceInfo info = new NamespaceInfo(attribute.getTargetNamespace(), prefix, ""); //$NON-NLS-1$
-    List infoList = new ArrayList(1);
-    infoList.add(info);
-    manager.addNamespaceInfo(schemaElement, infoList, false);
-    return prefix;
-  }
-  
-  protected String createUniquePrefix(XSDConcreteComponent component)
-  {
-    String prefix = "p"; //$NON-NLS-1$
-    Map prefMapper = component.getSchema().getQNamePrefixToNamespaceMap();
-    if ( prefMapper.get(prefix) != null){
-      int i = 1;
-      while ( prefMapper.get(prefix + i) != null)
-        i++;
-      prefix += i;
-    }
-    return prefix;
-  }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionCommand.java
deleted file mode 100644
index 5672104..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.SpecificationForExtensionsSchema;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddExtensionCommand extends BaseCommand
-{
-  protected SpecificationForExtensionsSchema extensionsSchemaSpec;
-  protected XSDConcreteComponent component;
-
-  protected AddExtensionCommand(String label)
-  {
-    super(label);
-  }
-
-  public void setSchemaProperties(SpecificationForExtensionsSchema appInfoSchemaSpec)
-  {
-    this.extensionsSchemaSpec = appInfoSchemaSpec;
-  }
-  
-  public Object getNewObject()
-  {
-    return null;
-  }
-
-  public void execute()
-  {
-    if (component instanceof XSDSchema)
-    {
-      ensureSchemaElement((XSDSchema)component);
-    }
-    
-    super.execute();
-  }
-  
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionElementCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionElementCommand.java
deleted file mode 100644
index 2446901..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddExtensionElementCommand.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.List;
-import java.util.Map;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.SpecificationForExtensionsSchema;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AddExtensionElementCommand extends AddExtensionCommand
-{
-  XSDElementDeclaration element;
-  Element appInfo;
-  Element newElement;
-
-  public AddExtensionElementCommand(String label, XSDConcreteComponent input, XSDElementDeclaration element)
-  {
-    super(label);
-    this.component = input;
-    this.element = element;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(component.getElement());
-      super.execute();
-      addAnnotationSet(component.getSchema(), extensionsSchemaSpec);
-      formatChild(component.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  public void undo()
-  {
-    super.undo();
-    XSDAnnotation xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation(component, false);
-    xsdAnnotation.getElement().removeChild(appInfo);
-    List appInfos = xsdAnnotation.getApplicationInformation();
-    appInfos.remove(appInfo);
-    xsdAnnotation.updateElement();
-
-  }
-
-  public void setSchemaProperties(SpecificationForExtensionsSchema spec)
-  {
-    this.extensionsSchemaSpec = spec;
-  }
-
-  public void addAnnotationSet(XSDSchema xsdSchema, SpecificationForExtensionsSchema spec)
-  {
-    XSDAnnotation xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation(component, true);
-    addAnnotationSet(spec, xsdAnnotation);
-  }
-
-  private void addAnnotationSet(SpecificationForExtensionsSchema spec, XSDAnnotation xsdAnnotation)
-  {     
-    XSDSchema schema= xsdAnnotation.getSchema();
-    Element schemaElement = schema.getElement();
-
-    if (xsdAnnotation.getApplicationInformation().size() == 0)
-    {
-      appInfo = xsdAnnotation.createApplicationInformation(null);
-      xsdAnnotation.getElement().appendChild(appInfo);
-      List appInfos = xsdAnnotation.getApplicationInformation();
-      appInfos.add(appInfo);
-    }
-    else
-    {
-      // use the first appInfo
-      appInfo = (Element)xsdAnnotation.getApplicationInformation().get(0);
-    }
-
-    String prefix = addNamespaceDeclarationIfRequired(schemaElement, "p", spec.getNamespaceURI());
-
-    if (appInfo != null)
-    {
-      Document doc = appInfo.getOwnerDocument();
-     
-      newElement = doc.createElementNS(spec.getNamespaceURI(), element.getName());
-      newElement.setPrefix(prefix);   
-      appInfo.appendChild(newElement);
-
-      xsdAnnotation.updateElement();
-    }
-  }
-
-  public Object getNewObject()
-  {
-    return newElement;
-  }
-  
-  /**
-   * @deprecated
-   */
-  protected String createUniquePrefix(XSDConcreteComponent component)
-  {
-    String prefix = "p"; //$NON-NLS-1$
-    Map prefMapper = component.getSchema().getQNamePrefixToNamespaceMap();
-    if ( prefMapper.get(prefix) != null){
-      int i = 1;
-      while ( prefMapper.get(prefix + i) != null)
-        i++;
-      prefix += i;
-    }
-    return prefix;
-  }  
-  
-  // TODO... common this up with wsdl.ui
-  private String addNamespaceDeclarationIfRequired(Element schemaElement, String prefixHint, String namespace)
-  {
-    String prefix = null;      
-    NamespaceTable namespaceTable = new NamespaceTable(schemaElement.getOwnerDocument());
-    namespaceTable.addElement(schemaElement);
-    prefix = namespaceTable.getPrefixForURI(namespace);
-    if (prefix == null)
-    { 
-      String basePrefix = prefixHint;
-      prefix = basePrefix;
-      String xmlnsColon = "xmlns:"; //$NON-NLS-1$
-      String attributeName = xmlnsColon + prefix;
-      int count = 0;
-      while (schemaElement.hasAttribute(attributeName))
-      {
-        count++;
-        prefix = basePrefix + count;
-        attributeName = xmlnsColon + prefix;
-      }      
-      schemaElement.setAttribute(attributeName, namespace);  
-    }    
-    return prefix;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddRedefinedComponentCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddRedefinedComponentCommand.java
deleted file mode 100644
index 5d18022..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddRedefinedComponentCommand.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.w3c.dom.Element;
-
-
-/**
- * Base class for commands that add redefined components to a schema redefine. 
- */
-public abstract class AddRedefinedComponentCommand extends BaseCommand
-{
-  protected XSDRedefine redefine;
-
-  protected XSDRedefinableComponent redefinableComponent;
-
-  public AddRedefinedComponentCommand(String label, XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    super(label);
-    this.redefine = redefine;
-    this.redefinableComponent = redefinableComponent;
-  }
-
-  protected abstract void doExecute();
-
-  public void execute()
-  {
-    Element element = redefine.getElement();
-
-    try
-    {
-      beginRecording(element);
-      doExecute();
-      redefine.getContents().add(addedXSDConcreteComponent);
-      formatChild(addedXSDConcreteComponent.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAnyAttributeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAnyAttributeCommand.java
deleted file mode 100644
index 211cbc9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAnyAttributeCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDWildcard;
-
-public class AddXSDAnyAttributeCommand extends BaseCommand
-{
-  XSDComplexTypeDefinition xsdComplexTypeDefinition;
-  XSDAttributeGroupDefinition xsdAttributeGroupDefinition;
-  XSDConcreteComponent input;
-
-  public AddXSDAnyAttributeCommand(String label, XSDComplexTypeDefinition xsdComplexTypeDefinition)
-  {
-    super(label);
-    this.xsdComplexTypeDefinition = xsdComplexTypeDefinition;
-    this.input = xsdComplexTypeDefinition; 
-  }
-  
-  public AddXSDAnyAttributeCommand(String label, XSDAttributeGroupDefinition xsdAttributeGroupDefinition)
-  {
-    super(label);
-    this.xsdAttributeGroupDefinition = xsdAttributeGroupDefinition;
-    this.input = xsdAttributeGroupDefinition;
-  }
-  
-  public void execute()
-  {
-    try
-    {
-      beginRecording(input.getElement());
-
-      XSDWildcard anyAttribute = XSDFactory.eINSTANCE.createXSDWildcard();
-      if (xsdComplexTypeDefinition != null)
-      {
-        xsdComplexTypeDefinition.setAttributeWildcardContent(anyAttribute);
-        formatChild(xsdComplexTypeDefinition.getElement());
-      }
-      else if (xsdAttributeGroupDefinition != null)
-      {
-        xsdAttributeGroupDefinition.setAttributeWildcardContent(anyAttribute);
-        formatChild(xsdAttributeGroupDefinition.getElement());
-      }
-      addedXSDConcreteComponent = anyAttribute;
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAnyElementCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAnyElementCommand.java
deleted file mode 100644
index 1b88a58..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAnyElementCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-
-public class AddXSDAnyElementCommand extends BaseCommand
-{
-  XSDModelGroup parent;
-  XSDComplexTypeDefinition complexType;
-  boolean doCreateModelGroupForComplexType = false;
-
-  public AddXSDAnyElementCommand(String label, XSDModelGroup parent)
-  {
-    super(label);
-    this.parent = parent;
-  }
-  
-  public void setComplexType(XSDComplexTypeDefinition complexType)
-  {
-    this.complexType = complexType;
-  }
-  
-  public void setDoCreateModelGroupForComplexType(boolean doCreate)
-  {
-    this.doCreateModelGroupForComplexType = doCreate;
-  }
-  
-  private void createModelGroup()
-  {
-    XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-    XSDParticle particle = factory.createXSDParticle();
-    parent = factory.createXSDModelGroup();
-    parent.setCompositor(XSDCompositor.SEQUENCE_LITERAL);
-    particle.setContent(parent);
-    complexType.setContent(particle);
-  }
-
-  public void execute()
-  {
-    try
-    {
-      if (doCreateModelGroupForComplexType)
-      {
-        Assert.isNotNull(complexType);
-        beginRecording(complexType.getElement());
-        createModelGroup();
-      }
-      else
-      {
-        beginRecording(parent.getElement());
-      }
-      XSDWildcard wildCard = XSDFactory.eINSTANCE.createXSDWildcard();
-      XSDParticle particle = XSDFactory.eINSTANCE.createXSDParticle();
-      particle.setContent(wildCard);
-      parent.getContents().add(particle);
-      addedXSDConcreteComponent = wildCard;
-      formatChild(parent.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAttributeDeclarationCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAttributeDeclarationCommand.java
deleted file mode 100644
index 00df7e0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAttributeDeclarationCommand.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Text;
-
-public class AddXSDAttributeDeclarationCommand extends BaseCommand
-{
-  XSDComplexTypeDefinition xsdComplexTypeDefinition;
-  XSDModelGroup xsdModelGroup;
-  XSDConcreteComponent parent;
-  boolean isReference;
-  private String nameToAdd;
-  // The index of the currently selected item.  If no item is selected, index will be less than 0
-  private int index = -1;
-  // Determines where the attribute should be inserted based on the currently selected attribute.  If no
-  // attribute is selected, use the default behaviour of appending the attribute to the end
-  private String addAttributeLocation;  
-  
-  public AddXSDAttributeDeclarationCommand(String label, XSDComplexTypeDefinition xsdComplexTypeDefinition)
-  {
-    super(label);
-    this.xsdComplexTypeDefinition = xsdComplexTypeDefinition;
-  }
-  
-  public AddXSDAttributeDeclarationCommand(String label, XSDConcreteComponent parent)
-  {
-    super(label);
-    this.parent = parent;
-  }
-  
-  public AddXSDAttributeDeclarationCommand(String label, XSDConcreteComponent parent, String addAttributeLocation, int index)
-  {
-    super(label);
-    if (parent instanceof XSDComplexTypeDefinition)
-    {
-      this.xsdComplexTypeDefinition = (XSDComplexTypeDefinition) parent;
-    }
-    else
-    {
-      this.parent = parent;
-    }
-    this.addAttributeLocation = addAttributeLocation;
-    this.index = index;
-  }
-  
-  protected int getInsertionIndex()
-  {
-    if (index < 0)
-      return -1;
-
-    if (addAttributeLocation.equals(org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction.BEFORE_SELECTED_ID))
-    {
-      return index;
-    }
-    else if (addAttributeLocation.equals(org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDAttributeDeclarationAction.AFTER_SELECTED_ID))
-    {
-      index++;
-      return index;
-    }
-    else
-    {
-      return -1;
-    }
-  }
-  
-  public void execute()
-  {
-    XSDAttributeDeclaration attribute = XSDFactory.eINSTANCE.createXSDAttributeDeclaration();
-    try
-    {
-      if (parent == null)
-      {
-        beginRecording(xsdComplexTypeDefinition.getElement());
-        if (!isReference)
-        {
-          attribute.setName(getNewName(nameToAdd == null ? "NewAttribute" : nameToAdd)); //$NON-NLS-1$
-          attribute.setTypeDefinition(xsdComplexTypeDefinition.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition("string")); //$NON-NLS-1$
-        }
-        else
-        {
-          attribute.setResolvedAttributeDeclaration(setGlobalAttributeReference(xsdComplexTypeDefinition.getSchema()));
-        }
-        XSDAttributeUse attributeUse = XSDFactory.eINSTANCE.createXSDAttributeUse();
-        attributeUse.setAttributeDeclaration(attribute);
-        attributeUse.setContent(attribute);
-
-        if (xsdComplexTypeDefinition.getAttributeContents() != null)
-        {
-          index = getInsertionIndex();
-          if (index >= 0 && index < xsdComplexTypeDefinition.getAttributeContents().size())
-          {
-            xsdComplexTypeDefinition.getAttributeContents().add(index, attributeUse);
-          }
-          else
-          {
-            xsdComplexTypeDefinition.getAttributeContents().add(attributeUse);
-          }
-          formatChild(xsdComplexTypeDefinition.getElement());
-        }
-      }
-      else
-      {
-        beginRecording(parent.getElement());
-        if (parent instanceof XSDSchema)
-        {
-          XSDSchema xsdSchema = (XSDSchema) parent;
-          attribute = createGlobalXSDAttributeDeclaration(xsdSchema);
-        }
-        else if (parent instanceof XSDAttributeGroupDefinition)
-        {
-          if (!isReference)
-          {
-            attribute.setTypeDefinition(parent.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition("string")); //$NON-NLS-1$
-
-            List list = new ArrayList();
-            Iterator i = ((XSDAttributeGroupDefinition) parent).getResolvedAttributeGroupDefinition().getAttributeUses().iterator();
-            while (i.hasNext())
-            {
-              XSDAttributeUse use = (XSDAttributeUse) i.next();
-              list.add(use.getAttributeDeclaration());
-            }
-            attribute.setName(XSDCommonUIUtils.createUniqueElementName("NewAttribute", list)); //$NON-NLS-1$
-          }
-          else
-          {
-            attribute.setResolvedAttributeDeclaration(setGlobalAttributeReference(parent.getSchema()));
-          }
-
-          XSDAttributeUse attributeUse = XSDFactory.eINSTANCE.createXSDAttributeUse();
-          attributeUse.setAttributeDeclaration(attribute);
-          attributeUse.setContent(attribute);
-
-          index = getInsertionIndex();
-          if (index >= 0 && index < (((XSDAttributeGroupDefinition) parent).getResolvedAttributeGroupDefinition().getContents().size()))
-          {
-            ((XSDAttributeGroupDefinition) parent).getResolvedAttributeGroupDefinition().getContents().add(index, attributeUse);
-          }
-          else
-          {
-            ((XSDAttributeGroupDefinition) parent).getResolvedAttributeGroupDefinition().getContents().add(attributeUse);
-          }
-          formatChild(parent.getElement());
-        }
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-    addedXSDConcreteComponent = attribute;
-  }
-
-  ArrayList names;
-
-  public void setNameToAdd(String name)
-  {
-    nameToAdd = name;
-  }
-
-  protected String getNewName(String description)
-  {
-    ArrayList usedAttributeNames = new ArrayList();
-    usedAttributeNames.addAll(XSDCommonUIUtils.getAllAttributes(xsdComplexTypeDefinition));
-    usedAttributeNames.addAll(XSDCommonUIUtils.getInheritedAttributes(xsdComplexTypeDefinition));
-    return XSDCommonUIUtils.createUniqueElementName(description, usedAttributeNames); //$NON-NLS-1$
-  }
-  
-  public void setReference(boolean isReference)
-  {
-    this.isReference = isReference;
-  }
-  
-  protected XSDAttributeDeclaration createGlobalXSDAttributeDeclaration(XSDSchema xsdSchema)
-  {
-    ensureSchemaElement(xsdSchema);
-    XSDAttributeDeclaration attribute = XSDFactory.eINSTANCE.createXSDAttributeDeclaration();
-    attribute.setTypeDefinition(xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("string")); //$NON-NLS-1$
-    attribute.setName(XSDCommonUIUtils.createUniqueElementName(nameToAdd == null ? "NewAttribute" : nameToAdd, xsdSchema.getAttributeDeclarations())); //$NON-NLS-1$
-    Text textNode = xsdSchema.getDocument().createTextNode("\n"); //$NON-NLS-1$
-    xsdSchema.getElement().appendChild(textNode);
-    xsdSchema.getContents().add(attribute);
-    return attribute;
-  }
-
-  protected XSDAttributeDeclaration setGlobalAttributeReference(XSDSchema xsdSchema)
-  {
-    List list = xsdSchema.getAttributeDeclarations();
-    XSDAttributeDeclaration referencedAttribute = null;
-    boolean isUserDefined = false;
-    for (Iterator i = list.iterator(); i.hasNext(); )
-    {
-      Object obj = i.next();
-      if (obj instanceof XSDAttributeDeclaration)
-      {
-        XSDAttributeDeclaration attr = (XSDAttributeDeclaration) obj;
-        if (!XSDConstants.SCHEMA_INSTANCE_URI_2001.equals(attr.getTargetNamespace()))
-        {
-          referencedAttribute = attr;
-          isUserDefined = true;
-          break;
-        }
-      }
-    }
-    if (!isUserDefined)
-    {
-      referencedAttribute = createGlobalXSDAttributeDeclaration(xsdSchema);
-      Text textNode = xsdSchema.getDocument().createTextNode("\n"); //$NON-NLS-1$
-      xsdSchema.getElement().appendChild(textNode);
-      xsdSchema.getContents().add(referencedAttribute);
-    }
-
-    return referencedAttribute;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAttributeGroupDefinitionCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAttributeGroupDefinitionCommand.java
deleted file mode 100644
index 2ee575e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDAttributeGroupDefinitionCommand.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Text;
-
-public class AddXSDAttributeGroupDefinitionCommand extends BaseCommand
-{
-  XSDComplexTypeDefinition xsdComplexTypeDefinition;
-  XSDSchema xsdSchema;
-
-  public AddXSDAttributeGroupDefinitionCommand(String label, XSDComplexTypeDefinition xsdComplexTypeDefinition)
-  {
-    super(label);
-    this.xsdComplexTypeDefinition = xsdComplexTypeDefinition;
-  }
-
-  public AddXSDAttributeGroupDefinitionCommand(String label, XSDSchema xsdSchema)
-  {
-    super(label);
-    this.xsdSchema = xsdSchema;
-  }
-
-  public void execute()
-  {
-    XSDAttributeGroupDefinition attributeGroup = XSDFactory.eINSTANCE.createXSDAttributeGroupDefinition();
-    try
-    {
-      if (xsdSchema == null)
-      {
-        beginRecording(xsdComplexTypeDefinition.getElement());
-        attributeGroup.setName(getNewName("AttributeGroup")); //$NON-NLS-1$
-
-        List list = xsdComplexTypeDefinition.getSchema().getAttributeGroupDefinitions();
-        if (list.size() > 0)
-        {
-          attributeGroup.setResolvedAttributeGroupDefinition((XSDAttributeGroupDefinition) list.get(0));
-        }
-        else
-        {
-          attributeGroup.setName(null);
-          XSDAttributeGroupDefinition attributeGroup2 = XSDFactory.eINSTANCE.createXSDAttributeGroupDefinition();
-          attributeGroup2.setName(XSDCommonUIUtils.createUniqueElementName("NewAttributeGroup", xsdComplexTypeDefinition.getSchema().getAttributeGroupDefinitions())); //$NON-NLS-1$
-          xsdComplexTypeDefinition.getSchema().getContents().add(attributeGroup2);
-          attributeGroup.setResolvedAttributeGroupDefinition(attributeGroup2);
-        }
-
-        if (xsdComplexTypeDefinition.getAttributeContents() != null)
-        {
-          xsdComplexTypeDefinition.getAttributeContents().add(attributeGroup);
-        }
-        addedXSDConcreteComponent = attributeGroup;
-      }
-      else
-      {
-        ensureSchemaElement(xsdSchema);
-        // put this after, since we don't have a DOM node yet
-        beginRecording(xsdSchema.getElement());
-        attributeGroup.setName(XSDCommonUIUtils.createUniqueElementName("NewAttributeGroup", xsdSchema.getAttributeGroupDefinitions())); //$NON-NLS-1$
-        Text textNode = xsdSchema.getDocument().createTextNode("\n"); //$NON-NLS-1$
-        xsdSchema.getElement().appendChild(textNode);
-        xsdSchema.getContents().add(attributeGroup);
-        addedXSDConcreteComponent = attributeGroup;
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  ArrayList names;
-
-  protected String getNewName(String description)
-  {
-    String candidateName = "New" + description; //$NON-NLS-1$
-    XSDConcreteComponent parent = xsdComplexTypeDefinition;
-    names = new ArrayList();
-    int i = 1;
-    if (parent instanceof XSDComplexTypeDefinition)
-    {
-      XSDComplexTypeDefinition ct = (XSDComplexTypeDefinition) parent;
-      walkUpInheritance(ct);
-
-      boolean ready = false;
-      while (!ready)
-      {
-        ready = true;
-        for (Iterator iter = names.iterator(); iter.hasNext();)
-        {
-          String attrName = (String) iter.next();
-          if (candidateName.equals(attrName))
-          {
-            ready = false;
-            candidateName = "New" + description + String.valueOf(i); //$NON-NLS-1$
-            i++;
-          }
-        }
-      }
-    }
-    return candidateName;
-  }
-
-  private void walkUpInheritance(XSDComplexTypeDefinition ct)
-  {
-    updateNames(ct);
-    XSDTypeDefinition typeDef = ct.getBaseTypeDefinition();
-    if (ct != ct.getRootType())
-    {
-      if (typeDef instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition ct2 = (XSDComplexTypeDefinition) typeDef;
-        walkUpInheritance(ct2);
-      }
-    }
-  }
-
-  private void updateNames(XSDComplexTypeDefinition ct)
-  {
-    Iterator iter = ct.getAttributeContents().iterator();
-    while (iter.hasNext())
-    {
-      Object obj = iter.next();
-      if (obj instanceof XSDAttributeUse)
-      {
-        XSDAttributeUse use = (XSDAttributeUse) obj;
-        XSDAttributeDeclaration attr = use.getAttributeDeclaration();
-        String attrName = attr.getName();
-        if (attrName != null)
-        {
-          names.add(attrName);
-        }
-      }
-    }
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDComplexTypeDefinitionCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDComplexTypeDefinitionCommand.java
deleted file mode 100644
index fa636cc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDComplexTypeDefinitionCommand.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-import org.w3c.dom.Text;
-
-public final class AddXSDComplexTypeDefinitionCommand extends BaseCommand
-{
-  protected XSDConcreteComponent parent;
-  protected XSDComplexTypeDefinition createdComplexType;
-  private String nameToAdd;
-  
-  public AddXSDComplexTypeDefinitionCommand(String label, XSDConcreteComponent parent)
-  {
-    super(label);
-    this.parent = parent;
-  }
-  
-  public void setNameToAdd(String nameToAdd)
-  {
-    this.nameToAdd = nameToAdd;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.gef.commands.Command#execute()
-   */
-  public void execute()
-  {
-    try
-    {
-      beginRecording(parent.getElement());
-      XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-      XSDComplexTypeDefinition complexType = factory.createXSDComplexTypeDefinition();
-      addedXSDConcreteComponent = complexType;
-      String newName = getNewName(nameToAdd == null ? "NewComplexType" : nameToAdd, parent.getSchema()); //$NON-NLS-1$
-      complexType.setName(newName);
-      if (parent instanceof XSDSchema)
-      {
-        try
-        {
-          XSDSchema xsdSchema = (XSDSchema) parent;
-          ensureSchemaElement(xsdSchema);
-          Text textNode = xsdSchema.getDocument().createTextNode("\n"); //$NON-NLS-1$
-          xsdSchema.getElement().appendChild(textNode);
-          xsdSchema.getContents().add(complexType);
-        }
-        catch (Exception e)
-        {
-
-        }
-      }
-      else if (parent instanceof XSDElementDeclaration)
-      {
-        ((XSDElementDeclaration) parent).setAnonymousTypeDefinition(complexType);
-        formatChild(parent.getElement());
-      }
-      createdComplexType = complexType;
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  protected String getNewName(String description, XSDSchema schema)
-  {
-    String candidateName = description; //$NON-NLS-1$
-    int i = 1;
-
-    List list = schema.getTypeDefinitions();
-    List listOfNames = new ArrayList();
-    for (Iterator iter = list.iterator(); iter.hasNext();)
-    {
-      XSDTypeDefinition typeDef = (XSDTypeDefinition) iter.next();
-      String name = typeDef.getName();
-      if (name == null)
-        name = ""; //$NON-NLS-1$
-      if (typeDef.getTargetNamespace() == schema.getTargetNamespace())
-        listOfNames.add(name);
-    }
-
-    boolean flag = true;
-    while (flag)
-    {
-      if (!listOfNames.contains(candidateName))
-      {
-        flag = false;
-        break;
-      }
-      candidateName = description + String.valueOf(i); //$NON-NLS-1$
-      i++;
-    }
-
-    return candidateName;
-  }
-
-  public XSDComplexTypeDefinition getCreatedComplexType()
-  {
-    return createdComplexType;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDElementCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDElementCommand.java
deleted file mode 100644
index a1bdff6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDElementCommand.java
+++ /dev/null
@@ -1,388 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-import org.w3c.dom.Text;
-
-public class AddXSDElementCommand extends BaseCommand
-{
-  XSDComplexTypeDefinition xsdComplexTypeDefinition;
-  XSDModelGroupDefinition xsdModelGroupDefinition;
-  XSDModelGroup xsdModelGroup;
-  XSDSchema xsdSchema;
-  boolean isReference;
-  private String nameToAdd;
-  // The index of the currently selected item.  If no item is selected, index will be less than 0
-  private int index = -1;  
-  // Determines where the element should be inserted based on the currently selected element.  If no
-  // element is selected, use the default behaviour of appending the element to the end
-  private String addElementLocation; 
-  
-  public AddXSDElementCommand()
-  {
-    super();
-  }
-
-  public AddXSDElementCommand(String label, XSDComplexTypeDefinition xsdComplexTypeDefinition)
-  {
-    super(label);
-    this.xsdComplexTypeDefinition = xsdComplexTypeDefinition;
-    xsdModelGroup = getModelGroup(xsdComplexTypeDefinition);
-  }
-
-  public AddXSDElementCommand(String label, XSDModelGroupDefinition xsdModelGroupDefinition)
-  {
-    super(label);
-    this.xsdModelGroupDefinition = xsdModelGroupDefinition;
-    xsdModelGroup = getModelGroup(xsdModelGroupDefinition);
-  }
-  
-  public AddXSDElementCommand(String label, XSDModelGroup xsdModelGroup, XSDComplexTypeDefinition xsdComplexTypeDefinition)
-  {
-    super(label);
-    this.xsdModelGroup = xsdModelGroup;
-    this.xsdComplexTypeDefinition = xsdComplexTypeDefinition;
-  }
-
-  public AddXSDElementCommand(String label, XSDModelGroup xsdModelGroup)
-  {
-    super(label);
-    this.xsdModelGroup = xsdModelGroup;
-  }
-  
-  public AddXSDElementCommand(String label, XSDModelGroup xsdModelGroup, String ID, int index)
-  {
-    super(label);
-    this.xsdModelGroup = xsdModelGroup;
-    this.index = index;
-    this.addElementLocation = ID;
-  }
-
-  public AddXSDElementCommand(String label, XSDSchema xsdSchema)
-  {
-    super(label);
-    this.xsdSchema = xsdSchema;
-  }
-
-  public void setReference(boolean isReference)
-  {
-    this.isReference = isReference;
-  }
-  
-  public void setNameToAdd(String name)
-  {
-    nameToAdd = name;
-  }
-  
-  public void setAddElementLocation(String LocationType)
-  {
-    addElementLocation = LocationType;
-  }
-  
-  protected int getInsertionIndex()
-  {
-    if (index < 0)
-      return -1;
-
-    if (addElementLocation.equals(org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction.BEFORE_SELECTED_ID))
-    {
-      return index;
-    }
-    else if (addElementLocation.equals(org.eclipse.wst.xsd.ui.internal.common.actions.AddXSDElementAction.AFTER_SELECTED_ID))
-    {
-      index++;
-      return index;
-    }
-    else
-    {
-      return -1;
-    }
-  }
-  
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.gef.commands.Command#execute()
-   */
-  public void execute()
-  {
-    try
-    {
-      if (xsdSchema != null)
-      {
-        beginRecording(xsdSchema.getElement());
-        XSDElementDeclaration element = createGlobalXSDElementDeclaration();
-        Text textNode = xsdSchema.getDocument().createTextNode("\n"); //$NON-NLS-1$
-        xsdSchema.getElement().appendChild(textNode);
-        xsdSchema.getContents().add(element);
-        addedXSDConcreteComponent = element;
-      }
-      else if (xsdModelGroupDefinition != null)
-      {
-        beginRecording(xsdModelGroupDefinition.getElement());
-        if (xsdModelGroup == null)
-        {
-          XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-          XSDParticle particle = factory.createXSDParticle();
-          xsdModelGroup = factory.createXSDModelGroup();
-          xsdModelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);
-          particle.setContent(xsdModelGroup);
-          xsdModelGroupDefinition.setModelGroup(xsdModelGroup);
-        }
-        xsdSchema = xsdModelGroupDefinition.getSchema();
-        if (!isReference)
-        {
-          xsdModelGroup.getContents().add(createXSDElementDeclarationForModelGroupDefinitions());
-        }
-        else
-        {
-          xsdModelGroup.getContents().add(createXSDElementReference());
-        }
-        formatChild(xsdModelGroupDefinition.getElement());
-      }
-      else if (xsdModelGroup != null && (xsdComplexTypeDefinition == null || xsdModelGroupDefinition == null) )
-      {
-        xsdSchema = xsdModelGroup.getSchema();
-        beginRecording(xsdSchema.getElement());
-        if (!isReference)
-        {
-        	index = getInsertionIndex();
-        	if(index >= 0 && index < xsdModelGroup.getContents().size())
-        	{        		
-        		xsdModelGroup.getContents().add(index,createXSDElementDeclaration());
-        	}
-        	else
-        	{
-        		xsdModelGroup.getContents().add(createXSDElementDeclaration());
-        	}
-        }
-        else
-        {
-          xsdModelGroup.getContents().add(createXSDElementReference());
-        }
-        formatChild(xsdModelGroup.getElement());
-      }
-      else
-      {
-        xsdSchema = xsdComplexTypeDefinition.getSchema();
-        beginRecording(xsdSchema.getElement());
-        if (xsdModelGroup == null)
-        {
-          XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-          XSDParticle particle = factory.createXSDParticle();
-          xsdModelGroup = factory.createXSDModelGroup();
-          xsdModelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);
-          particle.setContent(xsdModelGroup);
-          xsdComplexTypeDefinition.setContent(particle);
-        }
-        if (!isReference)
-        {
-          xsdModelGroup.getContents().add(createXSDElementDeclarationForComplexType());
-        }
-        else
-        {
-          xsdModelGroup.getContents().add(createXSDElementReference());
-        }
-        formatChild(xsdComplexTypeDefinition.getElement());
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-  protected XSDParticle createXSDElementDeclaration()
-  {
-    XSDSimpleTypeDefinition type = xsdModelGroup.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition("string"); //$NON-NLS-1$
-
-    XSDElementDeclaration element = XSDFactory.eINSTANCE.createXSDElementDeclaration();
-
-    XSDConcreteComponent comp = xsdModelGroup.getContainer();
-    ArrayList usedAttributeNames = new ArrayList();
-    XSDCommonUIUtils.resetVisitedGroupsStack();
-    usedAttributeNames.addAll(XSDCommonUIUtils.getChildElements(xsdModelGroup));    
-    while (comp != null)
-    {
-      if (comp instanceof XSDModelGroupDefinition)
-      {
-        usedAttributeNames.addAll(XSDCommonUIUtils.getAllAttributes((XSDModelGroupDefinition)comp));
-        break;
-      }
-      else if (comp instanceof XSDComplexTypeDefinition)
-      {
-        usedAttributeNames.addAll(XSDCommonUIUtils.getAllAttributes((XSDComplexTypeDefinition)comp));
-        usedAttributeNames.addAll(XSDCommonUIUtils.getInheritedAttributes((XSDComplexTypeDefinition)comp));
-        break;
-      }
-      comp = comp.getContainer();
-    }
-    element.setName(XSDCommonUIUtils.createUniqueElementName(
-    		nameToAdd == null ? "NewElement" : nameToAdd , usedAttributeNames)); //$NON-NLS-1$
-    element.setTypeDefinition(type);
-
-    XSDParticle particle = XSDFactory.eINSTANCE.createXSDParticle();
-    particle.setContent(element);
-    addedXSDConcreteComponent = element;
-    return particle;
-  }
-
-  protected XSDParticle createXSDElementReference()
-  {
-    List list = xsdModelGroup.getSchema().getElementDeclarations();
-    XSDElementDeclaration referencedElement = null;
-    if (list.size() > 0)
-    {
-      referencedElement = (XSDElementDeclaration)list.get(0);
-    }
-    else
-    {
-      referencedElement = createGlobalXSDElementDeclaration();
-      Text textNode = xsdSchema.getDocument().createTextNode("\n"); //$NON-NLS-1$
-      xsdSchema.getElement().appendChild(textNode);
-      xsdSchema.getContents().add(referencedElement);
-    }
-
-    XSDElementDeclaration element = XSDFactory.eINSTANCE.createXSDElementDeclaration();
-    
-    element.setResolvedElementDeclaration(referencedElement);
-    XSDParticle particle = XSDFactory.eINSTANCE.createXSDParticle();
-    particle.setContent(element);
-    addedXSDConcreteComponent = element;
-    return particle;
-  }
-
-  protected XSDParticle createXSDElementDeclarationForComplexType()
-  {
-    XSDSimpleTypeDefinition type = xsdModelGroup.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition("string"); //$NON-NLS-1$
-
-    XSDElementDeclaration element = XSDFactory.eINSTANCE.createXSDElementDeclaration();
-
-    ArrayList usedAttributeNames = new ArrayList();
-    usedAttributeNames.addAll(XSDCommonUIUtils.getAllAttributes(xsdComplexTypeDefinition));
-    usedAttributeNames.addAll(XSDCommonUIUtils.getInheritedAttributes(xsdComplexTypeDefinition));
-    element.setName(XSDCommonUIUtils.createUniqueElementName(
-    		nameToAdd == null ? "NewElement" : nameToAdd , usedAttributeNames)); //$NON-NLS-1$
-    element.setTypeDefinition(type);
-
-    XSDParticle particle = XSDFactory.eINSTANCE.createXSDParticle();
-    particle.setContent(element);
-    addedXSDConcreteComponent = element;
-    return particle;
-  }
-  
-  protected XSDParticle createXSDElementDeclarationForModelGroupDefinitions()
-  {
-    XSDSimpleTypeDefinition type = xsdModelGroup.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition("string"); //$NON-NLS-1$
-
-    XSDElementDeclaration element = XSDFactory.eINSTANCE.createXSDElementDeclaration();
-
-    ArrayList usedAttributeNames = new ArrayList();
-    usedAttributeNames.addAll(XSDCommonUIUtils.getAllAttributes(xsdModelGroupDefinition));
-    element.setName(XSDCommonUIUtils.createUniqueElementName(
-        nameToAdd == null ? "NewElement" : nameToAdd , usedAttributeNames)); //$NON-NLS-1$
-    element.setTypeDefinition(type);
-
-    XSDParticle particle = XSDFactory.eINSTANCE.createXSDParticle();
-    particle.setContent(element);
-    addedXSDConcreteComponent = element;
-    return particle;
-  }
-
-  protected XSDElementDeclaration createGlobalXSDElementDeclaration()
-  {
-    ensureSchemaElement(xsdSchema);
-    XSDSimpleTypeDefinition type = xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("string"); //$NON-NLS-1$
-    XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-    XSDElementDeclaration element = factory.createXSDElementDeclaration();
-
-    element.setName(XSDCommonUIUtils.createUniqueElementName(
-    		nameToAdd == null ? "NewElement" : nameToAdd , xsdSchema.getElementDeclarations())); //$NON-NLS-1$
-    element.setTypeDefinition(type);
-
-    return element;
-  }
-  
-  public XSDModelGroup getModelGroup(XSDModelGroupDefinition modelGroupDef)
-  {
-    return modelGroupDef.getModelGroup();
-  }
-
-  //PORT
-  public XSDModelGroup getModelGroup(XSDComplexTypeDefinition cType)
-  {
-    XSDParticle particle = null;
-
-    XSDComplexTypeContent xsdComplexTypeContent = cType.getContent();
-    if (xsdComplexTypeContent instanceof XSDParticle)
-    {
-      particle = (XSDParticle)xsdComplexTypeContent;
-    }
-    
-    if (particle == null)
-    {
-      return null;
-    }
-    
-    Object particleContent = particle.getContent();
-    XSDModelGroup group = null;
-
-    if (particleContent instanceof XSDModelGroupDefinition)
-    {
-      group = ((XSDModelGroupDefinition) particleContent).getResolvedModelGroupDefinition().getModelGroup();
-    }
-    else if (particleContent instanceof XSDModelGroup)
-    {
-      group = (XSDModelGroup) particleContent;
-    }
-
-    if (group == null)
-    {
-      return null;
-    }
-
-//    if (group.getContents().isEmpty() || group.eResource() != cType.eResource())
-//    {
-//      if (cType.getBaseType() != null)
-//      {
-//        XSDComplexTypeContent content = cType.getContent();
-//        if (content instanceof XSDParticle)
-//        {
-//          group = (XSDModelGroup) ((XSDParticle) content).getContent();
-//        }
-//      }
-//    }
-
-    return group;
-  }
-  
-  public XSDConcreteComponent getAddedComponent()
-  {
-    return super.getAddedComponent();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDImportCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDImportCommand.java
deleted file mode 100644
index e91f872..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDImportCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDImportCommand extends AddXSDSchemaDirectiveCommand
-{
-  public AddXSDImportCommand(String label, XSDSchema schema)
-  {
-    super(label);
-    this.xsdSchema = schema;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      super.execute();
-      // Add this after if we don't have a DOM Node yet
-      beginRecording(xsdSchema.getElement());
-      XSDImport xsdImport = XSDFactory.eINSTANCE.createXSDImport();
-      xsdSchema.getContents().add(findNextPositionToInsert(), xsdImport);
-      addedXSDConcreteComponent = xsdImport;
-      formatChild(xsdSchema.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDIncludeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDIncludeCommand.java
deleted file mode 100644
index e69b309..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDIncludeCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDIncludeCommand extends AddXSDSchemaDirectiveCommand
-{
-  public AddXSDIncludeCommand(String label, XSDSchema schema)
-  {
-    super(label);
-    this.xsdSchema = schema;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      super.execute();
-      // Add this after if we don't have a DOM Node yet
-      beginRecording(xsdSchema.getElement());
-      XSDInclude xsdInclude = XSDFactory.eINSTANCE.createXSDInclude();
-      xsdInclude.setSchemaLocation(""); //$NON-NLS-1$
-      xsdSchema.getContents().add(findNextPositionToInsert(), xsdInclude);
-      addedXSDConcreteComponent = xsdInclude;
-      formatChild(xsdSchema.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDModelGroupCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDModelGroupCommand.java
deleted file mode 100644
index 5d14b27..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDModelGroupCommand.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-
-public class AddXSDModelGroupCommand extends BaseCommand
-{
-  XSDConcreteComponent parent;
-  XSDCompositor xsdCompositor;
-  XSDModelGroup newModelGroup;
-
-  public AddXSDModelGroupCommand(String label, XSDConcreteComponent parent, XSDCompositor xsdCompositor)
-  {
-    super(label);
-    this.parent = parent;
-    this.xsdCompositor = xsdCompositor;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(parent.getElement());
-      XSDConcreteComponent owner = getOwner();
-      if (owner != null)
-      {
-        XSDParticle particle = XSDFactory.eINSTANCE.createXSDParticle();
-        newModelGroup = createModelGroup();
-        particle.setContent(newModelGroup);
-
-        XSDComplexTypeDefinition ctd = (XSDComplexTypeDefinition) owner;
-        ctd.setContent(particle);
-      }
-      formatChild(parent.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-  public void undo()
-  {
-    super.undo();
-    
-    if (parent instanceof XSDModelGroup)
-    {
-      XSDModelGroup model = (XSDModelGroup) parent;
-      model.getContents().remove(newModelGroup.getContainer());
-    }
-  }
-  
-  private XSDConcreteComponent getOwner()
-  {
-    XSDConcreteComponent owner = null;
-    if (parent instanceof XSDElementDeclaration)
-    {
-      XSDElementDeclaration ed = (XSDElementDeclaration)parent;      
-      if (ed.getTypeDefinition() != null) 
-      {
-        if (ed.getAnonymousTypeDefinition() == null)
-        {
-          ed.setTypeDefinition(null);
-          XSDComplexTypeDefinition td = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-          ed.setAnonymousTypeDefinition(td);
-          owner = ed.getTypeDefinition();
-        }
-        else
-        {
-          XSDComplexTypeDefinition td = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-          ed.setAnonymousTypeDefinition(td);
-          owner = td;        
-        }
-      }        
-      else if (ed.getAnonymousTypeDefinition() == null)
-      {
-        XSDComplexTypeDefinition td = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-        ed.setAnonymousTypeDefinition(td);
-        owner = td;        
-      }
-      else if (ed.getAnonymousTypeDefinition() instanceof XSDComplexTypeDefinition)
-      {
-        owner = ed.getAnonymousTypeDefinition();
-      }
-      else if (ed.getAnonymousTypeDefinition() instanceof XSDSimpleTypeDefinition)
-      {
-        XSDComplexTypeDefinition td = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-        ed.setAnonymousTypeDefinition(td);
-        owner = td;        
-      }
-    }
-    else if (parent instanceof XSDModelGroup)
-    {
-      newModelGroup = createModelGroup();
-      ((XSDModelGroup) parent).getContents().add(newModelGroup.getContainer());
-    }
-    else if (parent instanceof XSDComplexTypeDefinition)
-    {
-      XSDComplexTypeDefinition ct = (XSDComplexTypeDefinition)parent;
-      owner = parent;
-      if (ct.getContent() instanceof XSDParticle)
-      {
-        XSDParticle particle = (XSDParticle)ct.getContent();
-        if (particle.getContent() instanceof XSDModelGroup)
-        {
-          owner = null;
-          newModelGroup = createModelGroup();
-          XSDModelGroup newParent = (XSDModelGroup)particle.getContent();
-          newParent.getContents().add(newModelGroup.getContainer());
-        }
-        
-      }
-    }
-    else if (parent instanceof XSDModelGroupDefinition)
-    {
-      XSDModelGroupDefinition modelGroupDefinition = (XSDModelGroupDefinition)parent;
-      owner = null;
-      newModelGroup = createModelGroup();
-      if (modelGroupDefinition.getModelGroup() != null)
-      {
-        XSDModelGroup newParent = modelGroupDefinition.getModelGroup();
-        newParent.getContents().add(newModelGroup.getContainer());
-      }
-      else
-      {
-        modelGroupDefinition.setModelGroup(newModelGroup);
-      }
-    }
-    return owner;
-  }
-  
-
-  protected boolean adopt(XSDConcreteComponent model)
-  {
-    return false;
-  }
-  
-  protected XSDModelGroup createModelGroup()
-  {
-    
-    XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-    XSDParticle particle = factory.createXSDParticle();
-    XSDModelGroup modelGroup = factory.createXSDModelGroup();
-    modelGroup.setCompositor(xsdCompositor);
-    particle.setContent(modelGroup);
-    addedXSDConcreteComponent = modelGroup;
-    return modelGroup;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDModelGroupDefinitionCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDModelGroupDefinitionCommand.java
deleted file mode 100644
index 7e782d8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDModelGroupDefinitionCommand.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.List;
-
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-import org.w3c.dom.Text;
-
-public class AddXSDModelGroupDefinitionCommand extends BaseCommand
-{
-  XSDConcreteComponent parent;
-  boolean isReference;
-
-  public AddXSDModelGroupDefinitionCommand(String label, XSDConcreteComponent parent, boolean isReference)
-  {
-    super(label);
-    this.parent = parent;
-    this.isReference = isReference;
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.gef.commands.Command#execute()
-   */
-  public void execute()
-  {
-    if (parent instanceof XSDSchema)
-    {
-      ensureSchemaElement((XSDSchema)parent);
-    }
-    try
-    {
-      beginRecording(parent.getElement());
-      if (!isReference)
-      {
-        XSDModelGroupDefinition def = createXSDModelGroupDefinition();
-        addedXSDConcreteComponent = def;
-      }
-      else
-      {
-        XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-        XSDModelGroupDefinition def = factory.createXSDModelGroupDefinition();
-        XSDParticle particle = XSDFactory.eINSTANCE.createXSDParticle();
-        particle.setContent(def);
-        List list = parent.getSchema().getModelGroupDefinitions();
-        int length = list.size();
-        if (length > 1)
-        {
-          for (int i = 0; i < length; i++)
-          {
-            XSDModelGroupDefinition gr = (XSDModelGroupDefinition) list.get(i);
-            if (gr.getModelGroup() != parent)
-            {
-              def.setResolvedModelGroupDefinition(gr);
-            }
-          }
-        }
-        else if (length <= 1)
-        {
-          XSDModelGroupDefinition newGroupDef = createXSDModelGroupDefinition();
-          def.setResolvedModelGroupDefinition(newGroupDef);
-        }
-
-        if (parent instanceof XSDModelGroup)
-        {
-          ((XSDModelGroup) parent).getContents().add(particle);
-        }
-        formatChild(def.getElement());
-        addedXSDConcreteComponent = def;
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  protected XSDModelGroupDefinition createXSDModelGroupDefinition()
-  {
-    XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-    XSDModelGroupDefinition def = factory.createXSDModelGroupDefinition();
-    List list = parent.getSchema().getModelGroupDefinitions();
-    String newName = XSDCommonUIUtils.createUniqueElementName("NewGroupDefinition", list); //$NON-NLS-1$
-    def.setName(newName);
-
-    XSDModelGroup modelGroup = createModelGroup();
-    def.setModelGroup(modelGroup);
-    Text textNode = parent.getSchema().getDocument().createTextNode("\n"); //$NON-NLS-1$
-    parent.getSchema().getElement().appendChild(textNode);
-    parent.getSchema().getContents().add(def);
-    formatChild(def.getElement());
-    return def;
-  }
-
-  protected XSDModelGroup createModelGroup()
-  {
-    XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-    XSDParticle particle = factory.createXSDParticle();
-    XSDModelGroup modelGroup = factory.createXSDModelGroup();
-    modelGroup.setCompositor(XSDCompositor.SEQUENCE_LITERAL);
-    particle.setContent(modelGroup);
-
-    return modelGroup;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDRedefineCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDRedefineCommand.java
deleted file mode 100644
index e2fd367..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDRedefineCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-
-public class AddXSDRedefineCommand extends AddXSDSchemaDirectiveCommand
-{
-  public AddXSDRedefineCommand(String label, XSDSchema schema)
-  {
-    super(label);
-    this.xsdSchema = schema;
-  }
-
-  public void execute()
-  {
-    super.execute();
-    try
-    {
-      // Add this after if we don't have a DOM Node yet
-      beginRecording(xsdSchema.getElement());
-      XSDRedefine xsdRedefine = XSDFactory.eINSTANCE.createXSDRedefine();
-      xsdRedefine.setSchemaLocation(""); //$NON-NLS-1$
-      xsdSchema.getContents().add(findNextPositionToInsert(), xsdRedefine);
-      addedXSDConcreteComponent = xsdRedefine;
-      formatChild(xsdSchema.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDSchemaDirectiveCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDSchemaDirectiveCommand.java
deleted file mode 100644
index a4f9008..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDSchemaDirectiveCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.Iterator;
-
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-
-public abstract class AddXSDSchemaDirectiveCommand extends BaseCommand
-{
-  protected XSDSchema xsdSchema;
-  
-  public AddXSDSchemaDirectiveCommand(String label)
-  {
-    super(label);
-  }
-
-  public void undo()
-  {
-    super.undo();
-  }
-
-  protected boolean adopt(XSDConcreteComponent model)
-  {
-    return false;
-  }
-  
-  protected int findNextPositionToInsert()
-  {
-    int index = 0;
-    for (Iterator i = xsdSchema.getContents().iterator(); i.hasNext(); )
-    {
-      Object o = i.next();
-      if (o instanceof XSDSchemaDirective)
-      {
-        index ++;
-      }
-      else
-      {
-        break;
-      }
-    }
-    return index;
-  }
-
-  public void execute()
-  {
-    ensureSchemaElement(xsdSchema);
- }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDSimpleTypeDefinitionCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDSimpleTypeDefinitionCommand.java
deleted file mode 100644
index 8cabbef..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/AddXSDSimpleTypeDefinitionCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Text;
-
-public final class AddXSDSimpleTypeDefinitionCommand extends BaseCommand
-{
-  XSDConcreteComponent parent;
-  XSDSimpleTypeDefinition createdSimpleType;
-  private String nameToAdd;
-  
-  public AddXSDSimpleTypeDefinitionCommand(String label, XSDConcreteComponent parent)
-  {
-    super(label);
-    this.parent = parent;
-  }
-
-  public void setNameToAdd(String nameToAdd)
-  {
-    this.nameToAdd = nameToAdd;
-  }
-  
-  public void execute()
-  {
-    if (parent instanceof XSDSchema)
-    {
-      ensureSchemaElement((XSDSchema)parent);
-    }
-    
-    try
-    {
-      beginRecording(parent.getElement());
-      XSDSimpleTypeDefinition typeDef = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-      typeDef.setBaseTypeDefinition(parent.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string")); //$NON-NLS-1$
-
-      if (parent instanceof XSDSchema)
-      {
-        typeDef.setName(XSDCommonUIUtils.createUniqueElementName(nameToAdd == null ? "NewSimpleType" : nameToAdd, ((XSDSchema) parent).getTypeDefinitions())); //$NON-NLS-1$
-        createdSimpleType = typeDef;
-        try
-        {
-          XSDSchema xsdSchema = (XSDSchema) parent;
-          Text textNode = xsdSchema.getDocument().createTextNode("\n"); //$NON-NLS-1$
-          xsdSchema.getElement().appendChild(textNode);
-          xsdSchema.getContents().add(typeDef);
-        }
-        catch (Exception e)
-        {
-
-        }
-      }
-      else if (parent instanceof XSDElementDeclaration)
-      {
-        ((XSDElementDeclaration) parent).setAnonymousTypeDefinition(typeDef);
-      }
-      else if (parent instanceof XSDAttributeDeclaration)
-      {
-        ((XSDAttributeDeclaration) parent).setAnonymousTypeDefinition(typeDef);
-      }
-      formatChild(createdSimpleType.getElement());
-
-      addedXSDConcreteComponent = createdSimpleType;
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  public XSDSimpleTypeDefinition getCreatedSimpleType()
-  {
-    return createdSimpleType;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/BaseCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/BaseCommand.java
deleted file mode 100644
index 7a2334e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/BaseCommand.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.Map;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Preferences;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.sse.core.internal.encoding.CommonEncodingPreferenceNames;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.ProcessingInstruction;
-import org.w3c.dom.Text;
-
-public class BaseCommand extends Command
-{
-  private static final String XML = "xml"; //$NON-NLS-1$
-
-  XSDConcreteComponent addedXSDConcreteComponent;
-
-  public BaseCommand()
-  {
-    super();
-  }
-
-  public BaseCommand(String label)
-  {
-    super(label);
-  }
-  
-  public XSDConcreteComponent getAddedComponent()
-  {
-    return addedXSDConcreteComponent;
-  }
-  
-  IDOMNode domNode;
-  protected void beginRecording(Object element) {
-    if (element instanceof IDOMNode)
-    {
-      domNode = (IDOMNode) element; 
-      domNode.getModel().beginRecording(this, getUndoDescription());
-    }
-  }
-  
-  protected void endRecording()
-  {
-    if (domNode != null)
-      domNode.getModel().endRecording(this);
-  }
-  
-  protected String getUndoDescription() {
-    return getLabel();
-  }
-
-  protected void formatChild(Element child)
-  {
-    if (child instanceof IDOMNode)
-    {
-      IDOMModel model = ((IDOMNode)child).getModel();
-      try
-      {
-        // tell the model that we are about to make a big model change
-        model.aboutToChangeModel();
-        
-        IStructuredFormatProcessor formatProcessor = new FormatProcessorXML();
-        formatProcessor.formatNode(child);
-      }
-      finally
-      {
-        // tell the model that we are done with the big model change
-        model.changedModel(); 
-      }
-    }
-  }
- 
-  protected static void ensureSchemaElement(XSDSchema schema)
-  {
-    Document document = schema.getDocument();
-    
-    Element schemaElement = document.getDocumentElement();
-
-    if (schemaElement == null)
-    {
-      String targetNamespace = getDefaultNamespace(schema);
-      schema.setTargetNamespace(targetNamespace);
-      Map qNamePrefixToNamespaceMap = schema.getQNamePrefixToNamespaceMap();
-      qNamePrefixToNamespaceMap.put("tns", targetNamespace);      
-      if (XSDEditorPlugin.getDefault().isQualifyXMLSchemaLanguage())
-      {
-        String prefix = XSDEditorPlugin.getDefault().getXMLSchemaPrefix();
-        schema.setSchemaForSchemaQNamePrefix(prefix);
-        qNamePrefixToNamespaceMap.put(prefix, XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);      
-      }
-      else
-      {
-        qNamePrefixToNamespaceMap.put(null, XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);      
-      }
-      
-      schema.updateElement();
-      ensureXMLDirective(document);
-    }
-  }
-
-  private static void ensureXMLDirective(Document document)
-  {
-    if (hasXMLDirective(document))
-    {
-      return;
-    }
-    
-    Node firstChild = document.getFirstChild();
-    ProcessingInstruction xmlDeclaration = getXMLDeclaration(document);
-    document.insertBefore(xmlDeclaration, firstChild);
-    Text textNode = document.createTextNode(System.getProperty("line.separator"));
-    document.insertBefore(textNode, firstChild);
-  }
-  
-  private static boolean hasXMLDirective(Document document)
-  {
-    Node firstChild = document.getFirstChild();
-   
-    if (firstChild == null)
-    {
-      return false;
-    }
-    
-    if (firstChild.getNodeType() != Node.PROCESSING_INSTRUCTION_NODE)
-    {
-      return false;
-    }
-    
-    ProcessingInstruction processingInstruction  = (ProcessingInstruction)firstChild;
-    
-    if (!XML.equals(processingInstruction.getTarget())) 
-    {
-      return false;
-    }
-    
-    return true;
-  }
-
-  private static ProcessingInstruction getXMLDeclaration(Document document)
-  {
-    Preferences preference = XMLCorePlugin.getDefault().getPluginPreferences();
-    String charSet = preference.getString(CommonEncodingPreferenceNames.OUTPUT_CODESET);
-    if (charSet == null || charSet.trim().equals(""))
-    {
-      charSet = "UTF-8";
-    }
-    ProcessingInstruction xmlDeclaration = document.createProcessingInstruction(XML, "version=\"1.0\" encoding=\"" + charSet + "\"");
-    return xmlDeclaration;
-  }
-  
-  private static String getDefaultNamespace(XSDSchema schema)
-  {
-    String namespace = XSDEditorPlugin.getDefault().getXMLSchemaTargetNamespace();
-
-    if (!namespace.endsWith("/"))
-    {
-      namespace = namespace.concat("/");
-    }
-
-    namespace += getFileName(schema) + "/";
-
-    return namespace;
-
-  }
-  
-  private static String getFileName(XSDSchema schema)
-  {
-    URI schemaURI = schema.eResource().getURI();
-    IPath filePath = new Path(schemaURI.toString());
-    return filePath.removeFileExtension().lastSegment().toString();
-  }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ChangeToLocalSimpleTypeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ChangeToLocalSimpleTypeCommand.java
deleted file mode 100644
index bf10d8b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ChangeToLocalSimpleTypeCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class ChangeToLocalSimpleTypeCommand extends BaseCommand
-{
-  XSDFeature parent;
-  XSDSimpleTypeDefinition anonymousSimpleType;
-  XSDSimpleTypeDefinition currentType;
-
-  public ChangeToLocalSimpleTypeCommand(String label, XSDFeature parent)
-  {
-    super(label);
-    this.parent = parent;
-
-//    if (parent instanceof XSDElementDeclaration)
-//    {
-//      XSDElementDeclaration element = (XSDElementDeclaration) parent;
-//      XSDTypeDefinition aType = element.getResolvedElementDeclaration().getTypeDefinition();
-//
-//      if (aType instanceof XSDSimpleTypeDefinition)
-//      {
-//        currentType = (XSDSimpleTypeDefinition) aType;
-//      }
-//    }
-  }
-
-  public void execute()
-  {
-//    anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-//    anonymousSimpleType.setBaseTypeDefinition(currentType);
-    try
-    {
-      beginRecording(parent.getElement());
-
-      if (parent instanceof XSDElementDeclaration)
-      {
-        ((XSDElementDeclaration) parent).setAnonymousTypeDefinition(anonymousSimpleType);
-      }
-      else if (parent instanceof XSDAttributeDeclaration)
-      {
-        ((XSDAttributeDeclaration) parent).setAnonymousTypeDefinition(anonymousSimpleType);
-      }
-      formatChild(parent.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }    
-  }
-  
-  public void setAnonymousSimpleType(XSDSimpleTypeDefinition anonymousSimpleType)
-  {
-    this.anonymousSimpleType = anonymousSimpleType;
-  }
-
-  public XSDSimpleTypeDefinition getAnonymousType()
-  {
-    if (anonymousSimpleType == null)
-    {
-      anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-      anonymousSimpleType.setBaseTypeDefinition(currentType);
-    }
-    return anonymousSimpleType;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/DeleteCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/DeleteCommand.java
deleted file mode 100644
index 13cbde9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/DeleteCommand.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDVisitor;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class DeleteCommand extends BaseCommand
-{
-  XSDConcreteComponent target;
-
-  public DeleteCommand(String label, XSDConcreteComponent target)
-  {
-    super(label);
-    this.target = target;
-  }
-  
-  public DeleteCommand(XSDConcreteComponent target)
-  {
-    super(Messages._UI_ACTION_DELETE);
-    this.target = target;
-  }
-
-  public void execute()
-  {
-    XSDVisitor visitor = new XSDVisitor()
-    {
-      public void visitElementDeclaration(org.eclipse.xsd.XSDElementDeclaration element)
-      {
-        if (element.getTypeDefinition() == target)
-        {
-          XSDSimpleTypeDefinition type = target.getSchema().getSchemaForSchema().resolveSimpleTypeDefinition("string"); //$NON-NLS-1$
-          element.setTypeDefinition(type);
-        }
-        super.visitElementDeclaration(element);
-      }
-    };
-
-    XSDConcreteComponent parent = target.getContainer();
-    XSDSchema schema = target.getSchema();
-
-    try
-    {
-      beginRecording(parent.getElement());
-      boolean doCleanup = false;
-      if (target instanceof XSDModelGroup || target instanceof XSDElementDeclaration || target instanceof XSDModelGroupDefinition)
-      {
-        doCleanup = true;
-        if (parent instanceof XSDParticle)
-        {
-          if (parent.getContainer() instanceof XSDModelGroup)
-          {
-            XSDModelGroup modelGroup = (XSDModelGroup) ((XSDParticle) parent).getContainer();
-
-            modelGroup.getContents().remove(parent);
-          }
-          else if (parent.getContainer() instanceof XSDComplexTypeDefinition)
-          {
-            XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) parent.getContainer();
-            complexType.setContent(null);
-          }
-        }
-        else if (parent instanceof XSDSchema)
-        {
-          visitor.visitSchema(target.getSchema());
-          ((XSDSchema) parent).getContents().remove(target);
-        }
-        else if (parent instanceof XSDRedefine)
-        {
-          ((XSDRedefine) parent).getContents().remove(target);
-        }      
-      }
-      else if (target instanceof XSDAttributeDeclaration)
-      {
-        doCleanup = true;
-        if (parent instanceof XSDAttributeUse)
-        {
-          EObject obj = parent.eContainer();
-          XSDComplexTypeDefinition complexType = null;
-          while (obj != null)
-          {
-            if (obj instanceof XSDComplexTypeDefinition)
-            {
-              complexType = (XSDComplexTypeDefinition) obj;
-              break;
-            }
-            obj = obj.eContainer();
-          }
-          if (complexType != null)
-          {
-            complexType.getAttributeContents().remove(parent);
-          }
-
-          if (parent.getContainer() instanceof XSDAttributeGroupDefinition)
-          {
-            XSDAttributeGroupDefinition attrGroup = (XSDAttributeGroupDefinition) parent.getContainer();
-
-            attrGroup.getContents().remove(parent);
-          }
-        }
-        else if (parent instanceof XSDSchema)
-        {
-          visitor.visitSchema(target.getSchema());
-          ((XSDSchema) parent).getContents().remove(target);
-        }
-      }
-      else if (target instanceof XSDAttributeGroupDefinition && parent instanceof XSDComplexTypeDefinition)
-      {
-        doCleanup = true;
-        ((XSDComplexTypeDefinition) parent).getAttributeContents().remove(target);
-      }
-      else if (target instanceof XSDEnumerationFacet)
-      {
-        XSDEnumerationFacet enumerationFacet = (XSDEnumerationFacet) target;
-        enumerationFacet.getSimpleTypeDefinition().getFacetContents().remove(enumerationFacet);
-      }
-      else if (target instanceof XSDWildcard)
-      {
-        if (parent instanceof XSDParticle)
-        {
-          if (parent.getContainer() instanceof XSDModelGroup)
-          {
-            XSDModelGroup modelGroup = (XSDModelGroup) ((XSDParticle) parent).getContainer();
-            modelGroup.getContents().remove(parent);
-          }
-        }
-        else if (parent instanceof XSDComplexTypeDefinition)
-        {
-          ((XSDComplexTypeDefinition) parent).setAttributeWildcardContent(null);
-        }
-        else if (parent instanceof XSDAttributeGroupDefinition)
-        {
-          ((XSDAttributeGroupDefinition) parent).setAttributeWildcardContent(null);
-        }
-      }
-      else if (target instanceof XSDTypeDefinition && parent instanceof XSDElementDeclaration)
-      {
-        doCleanup = true;
-        ((XSDElementDeclaration) parent).setTypeDefinition(target.resolveSimpleTypeDefinition(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, "string"));
-      }
-      else
-      {
-        if (parent instanceof XSDSchema)
-        {
-          doCleanup = true;
-          visitor.visitSchema(target.getSchema());
-          ((XSDSchema) parent).getContents().remove(target);
-        }
-        else if(parent instanceof XSDRedefine)
-        {
-          doCleanup = false;
-          EList contents = ((XSDRedefine)parent).getContents();           
-          contents.remove(target);
-        }
-      }
-
-      if (doCleanup)
-        XSDDirectivesManager.removeUnusedXSDImports(schema);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ExtensibleAddExtensionCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ExtensibleAddExtensionCommand.java
deleted file mode 100644
index 6ce4c73..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ExtensibleAddExtensionCommand.java
+++ /dev/null
@@ -1,214 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceTable;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class ExtensibleAddExtensionCommand extends AddExtensionCommand
-{
-  protected XSDElementDeclaration element;
-  protected Element appInfo;
-  protected Element newElement;
-
-  public ExtensibleAddExtensionCommand(String label)
-  {
-    super(label);
-  }
-
-  public XSDElementDeclaration getXSDElementDeclarationElement()
-  {
-    return element;
-  }
-  
-  public Element getNewElement()
-  {
-    return newElement;
-  }
-
-  public Element getAppInfo()
-  {
-    return appInfo;
-  }
-  
-  public XSDSchema getXSDSchema()
-  {
-    return component.getSchema();    
-  }
-
-  public void setInputs(XSDConcreteComponent input, XSDElementDeclaration element)
-  {
-    this.component = input;
-    this.element = element;
-  }
-  
-  public XSDAnnotation getXSDAnnotation()
-  {
-    if (component != null)
-    {
-      XSDAnnotation xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation(component, false);
-      return xsdAnnotation;
-    }
-    return null;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(component.getElement());
-      super.execute();
-      doPreprocessing();
-      addExtensionNode();
-      doCustomizedActions();
-      
-      formatChild(component.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-  protected void doPreprocessing()
-  {
-    
-  }
-  
-  protected void addExtensionNode()
-  {
-    XSDAnnotation xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation(component, true);
-    XSDSchema schema= xsdAnnotation.getSchema();
-    Element schemaElement = schema.getElement();
-
-    if (xsdAnnotation.getApplicationInformation().size() == 0)
-    {
-      appInfo = xsdAnnotation.createApplicationInformation(null);
-      xsdAnnotation.getElement().appendChild(appInfo);
-      List appInfos = xsdAnnotation.getApplicationInformation();
-      appInfos.add(appInfo);
-    }
-    else
-    {
-      // use the first appInfo
-      appInfo = (Element)xsdAnnotation.getApplicationInformation().get(0);
-    }
-
-    if (appInfo != null)
-    {
-      Document doc = appInfo.getOwnerDocument();
-      String prefix = addToNamespaceTable(schemaElement);
-      newElement = doc.createElementNS(extensionsSchemaSpec.getNamespaceURI(), element.getName());
-      newElement.setPrefix(prefix);   
-      appInfo.appendChild(newElement);
-
-      xsdAnnotation.updateElement();
-    }
-  }
-  
-  protected String addToNamespaceTable(Element schemaElement)
-  {
-    String prefix = addNamespaceDeclarationIfRequired(schemaElement, "p", extensionsSchemaSpec.getNamespaceURI());
-    return prefix;
-  }
-
-  
-  protected void doCustomizedActions()
-  {
-   
-  }
-
-  public void undo()
-  {
-    super.undo();
-  }
-
-  public Object getNewObject()
-  {
-    return newElement;
-  }
-  
-  // TODO... common this up with wsdl.ui
-  protected String addNamespaceDeclarationIfRequired(Element schemaElement, String prefixHint, String namespace)
-  {
-    String prefix = null;      
-    NamespaceTable namespaceTable = new NamespaceTable(schemaElement.getOwnerDocument());
-    namespaceTable.addElement(schemaElement);
-    prefix = namespaceTable.getPrefixForURI(namespace);
-    if (prefix == null)
-    { 
-      String basePrefix = prefixHint;
-      prefix = basePrefix;
-      String xmlnsColon = "xmlns:"; //$NON-NLS-1$
-      String attributeName = xmlnsColon + prefix;
-      int count = 0;
-      while (schemaElement.hasAttribute(attributeName))
-      {
-        count++;
-        prefix = basePrefix + count;
-        attributeName = xmlnsColon + prefix;
-      }      
-      schemaElement.setAttribute(attributeName, namespace);  
-    }    
-    return prefix;
-  }
-  
-  protected void addSchemaAttribute(Element schemaElement, String namespace, String attributeName, String attributeValue)
-  {
-    String prefix = null;
-    NamespaceTable namespaceTable = new NamespaceTable(schemaElement.getOwnerDocument());
-    namespaceTable.addElement(schemaElement);
-    prefix = namespaceTable.getPrefixForURI(namespace);
-    try
-    {
-      if (prefix != null)
-      {
-        if (schemaElement.getAttributeNode(prefix + ":" + attributeName) == null)
-          schemaElement.setAttribute(prefix + ":" + attributeName, attributeValue);  
-      }
-      else
-      {
-        if (schemaElement.getAttributeNode(attributeName) == null)
-          schemaElement.setAttribute(attributeName, attributeValue);
-      }
-    }
-    catch (Exception e)
-    {
-      
-    }
-  }
-
-  protected void addSourceAttributeToAppInfo(String namespace)
-  {
-    if (appInfo.getAttributeNode(XSDConstants.SOURCE_ATTRIBUTE) == null)
-      appInfo.setAttribute(XSDConstants.SOURCE_ATTRIBUTE, namespace);
-  }
-  
-  /**
-   * 
-   * @param element
-   * @param attributeName
-   * @param attributeValue
-   */
-  protected void addAttribute(Element element, String attributeName, String attributeValue)
-  {
-    element.setAttribute(attributeName, attributeValue);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ExtensibleRemoveExtensionNodeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ExtensibleRemoveExtensionNodeCommand.java
deleted file mode 100644
index cb5ff38..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/ExtensibleRemoveExtensionNodeCommand.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-public class ExtensibleRemoveExtensionNodeCommand extends BaseCommand
-{
-  protected Node node;
-  protected XSDConcreteComponent input;
-  
-  public ExtensibleRemoveExtensionNodeCommand(String label)
-  {
-    super(label);
-  }
-  
-  public void setNode(Node node)
-  {
-    this.node = node;
-  }
-
-  public XSDConcreteComponent getInput()
-  {
-    return input;
-  }
-
-  public void setInput(XSDConcreteComponent input)
-  {
-    this.input = input;
-  }
-
-  public void execute()
-  {
-    super.execute();
-    try
-    {
-      beginRecording(node);
-      
-      doPreprocessing();
-      
-      if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-      {
-        Attr attr = (Attr) node;
-        attr.getOwnerElement().removeAttributeNode(attr);
-      }
-      else if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        Node parent = node.getParentNode();
-        if (parent != null)
-        {
-          XSDDOMHelper.removeNodeAndWhitespace(node);
-          
-          if (XSDDOMHelper.hasOnlyWhitespace(parent))
-          {
-            if (XSDConstants.APPINFO_ELEMENT_TAG.equals(parent.getLocalName()))
-            {
-              XSDDOMHelper.removeNodeAndWhitespace(parent);
-            }
-          }
-        }
-      }
-      
-      doCustomizedActions();
-
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  protected void doPreprocessing()
-  {
-   
-  }
-
-  protected void doCustomizedActions()
-  {
-   
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineAttributeGroupCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineAttributeGroupCommand.java
deleted file mode 100644
index 3d473b4..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineAttributeGroupCommand.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-
-
-/**
- * Creates a redefined attribute group based on the input attribute group and adds it to the parent redefine.
- */
-public class RedefineAttributeGroupCommand extends AddRedefinedComponentCommand
-{
-  public RedefineAttributeGroupCommand(String label, XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    super(label, redefine, redefinableComponent);
-  }
-
-  protected void doExecute()
-  {
-    XSDAttributeGroupDefinition redefinedAttributeGroupDefinition = XSDFactory.eINSTANCE.createXSDAttributeGroupDefinition();
-    redefinedAttributeGroupDefinition.setName(redefinableComponent.getName());
-    addedXSDConcreteComponent = redefinedAttributeGroupDefinition;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineComplexTypeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineComplexTypeCommand.java
deleted file mode 100644
index 34dad50..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineComplexTypeCommand.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDDerivationMethod;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-
-
-/**
- * Creates a redefined complex type based on the input complex type and adds it to the parent redefine.
- */
-public class RedefineComplexTypeCommand extends AddRedefinedComponentCommand
-{
-  public RedefineComplexTypeCommand(String label, XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    super(label, redefine, redefinableComponent);
-  }
-
-  protected void doExecute()
-  {
-    XSDComplexTypeDefinition redefinedComplexTypeDefinition = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-    redefinedComplexTypeDefinition.setName(redefinableComponent.getName());
-    redefinedComplexTypeDefinition.setContent(XSDFactory.eINSTANCE.createXSDComplexTypeDefinition().getContent());
-    redefinedComplexTypeDefinition.setDerivationMethod(XSDDerivationMethod.EXTENSION_LITERAL);
-    redefinedComplexTypeDefinition.setBaseTypeDefinition((XSDComplexTypeDefinition)redefinableComponent);
-    addedXSDConcreteComponent = redefinedComplexTypeDefinition;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineModelGroupCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineModelGroupCommand.java
deleted file mode 100644
index 7366eeb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineModelGroupCommand.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-
-
-/**
- * Creates a redefined model group based on the input model group and adds it to the parent redefine.
- */
-public class RedefineModelGroupCommand extends AddRedefinedComponentCommand
-{
-
-  public RedefineModelGroupCommand(String label, XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    super(label, redefine, redefinableComponent);
-  }
-
-  protected void doExecute()
-  {
-    XSDModelGroupDefinition modelGroup = (XSDModelGroupDefinition) redefinableComponent;
-    XSDModelGroupDefinition redefinedModelGroupDefinition = (XSDModelGroupDefinition)modelGroup.cloneConcreteComponent(true, false);
-    addedXSDConcreteComponent = redefinedModelGroupDefinition;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineSimpleTypeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineSimpleTypeCommand.java
deleted file mode 100644
index 00765ae..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RedefineSimpleTypeCommand.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDRedefinableComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-
-/**
- * Creates a redefined simple type based on the input simple type and adds it to the parent redefine.
- */
-public class RedefineSimpleTypeCommand extends AddRedefinedComponentCommand
-{
-  public RedefineSimpleTypeCommand(String label, XSDRedefine redefine, XSDRedefinableComponent redefinableComponent)
-  {
-    super(label, redefine, redefinableComponent);
-  }
-
-  protected void doExecute()
-  {
-    XSDSimpleTypeDefinition redefinedSimpleTypeDefinition = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-    redefinedSimpleTypeDefinition.setName(redefinableComponent.getName());
-    redefinedSimpleTypeDefinition.setBaseTypeDefinition((XSDSimpleTypeDefinition)redefinableComponent);
-    addedXSDConcreteComponent = redefinedSimpleTypeDefinition;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionAttributerCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionAttributerCommand.java
deleted file mode 100644
index a173a43..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionAttributerCommand.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.gef.commands.Command;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-
-/**
- * @deprecated
- */
-public class RemoveExtensionAttributerCommand extends Command 
-{
-	Element hostElement;
-	Attr attr;
-	
-	public RemoveExtensionAttributerCommand(String label, Element hostElement, Attr attr)
-	{
-		super(label);
-		this.hostElement = hostElement;
-		this.attr = attr;
-	}
-	
-	public void execute()
-	{
-		super.execute();
-		hostElement.removeAttributeNode(attr);
-	}
-	
-	public void undo()
-	{
-		super.undo();
-		//TODO implement me
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionElementCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionElementCommand.java
deleted file mode 100644
index d33c756..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionElementCommand.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.xsd.XSDAnnotation;
-import org.w3c.dom.Node;
-
-/**
- * @deprecated
- */
-public class RemoveExtensionElementCommand extends Command
-{
-  XSDAnnotation xsdAnnotation;
-  Node appInfo;
-
-  public RemoveExtensionElementCommand(String label, XSDAnnotation xsdAnnotation, Node appInfo)
-  {
-    super(label);
-    this.xsdAnnotation = xsdAnnotation;
-    this.appInfo = appInfo;
-  }
-
-  public void execute()
-  {
-    super.execute();
-    xsdAnnotation.getApplicationInformation().remove(appInfo);
-    xsdAnnotation.getElement().removeChild(appInfo);
-    xsdAnnotation.updateElement();
-  }
-
-  public void undo()
-  {
-    super.undo();
-    xsdAnnotation.getApplicationInformation().add(appInfo);
-    xsdAnnotation.getElement().appendChild(appInfo);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionNodeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionNodeCommand.java
deleted file mode 100644
index e41166b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/RemoveExtensionNodeCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Node;
-
-public class RemoveExtensionNodeCommand extends BaseCommand
-{
-  Node node;
-  
-  public RemoveExtensionNodeCommand(String label, Node node)
-  {
-    super(label);
-    this.node = node;
-  }  
-
-  public void execute()
-  {
-    super.execute();
-    try
-    {
-      beginRecording(node);
-      if (node.getNodeType() == Node.ATTRIBUTE_NODE)
-      {
-        Attr attr = (Attr) node;
-        attr.getOwnerElement().removeAttributeNode(attr);
-      }
-      else if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        Node parent = node.getParentNode();
-        if (parent != null)
-        {
-          XSDDOMHelper.removeNodeAndWhitespace(node);
-          
-          if (XSDDOMHelper.hasOnlyWhitespace(parent))
-          {
-            if (XSDConstants.APPINFO_ELEMENT_TAG.equals(parent.getLocalName()))
-            {
-              XSDDOMHelper.removeNodeAndWhitespace(parent);
-            }
-          }
-        }
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}  
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetBaseTypeAndManagerDirectivesCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetBaseTypeAndManagerDirectivesCommand.java
deleted file mode 100644
index 1ec47ce..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetBaseTypeAndManagerDirectivesCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class SetBaseTypeAndManagerDirectivesCommand extends UpdateTypeReferenceAndManageDirectivesCommand
-{
-
-  public SetBaseTypeAndManagerDirectivesCommand(XSDConcreteComponent concreteComponent, String componentName, String componentNamespace, IFile file)
-  {
-    super(concreteComponent, componentName, componentNamespace, file);
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(concreteComponent.getElement());
-      XSDComponent td = computeComponent();
-      if (td != null && td instanceof XSDTypeDefinition)
-      {
-        SetBaseTypeCommand command = new SetBaseTypeCommand(concreteComponent, (XSDTypeDefinition) td);
-        command.execute();
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }
-    }
-    catch (Exception e)
-    {
-
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetBaseTypeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetBaseTypeCommand.java
deleted file mode 100644
index 7b74ec9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetBaseTypeCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDDerivationMethod;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-
-public class SetBaseTypeCommand extends BaseCommand
-{
-  XSDConcreteComponent concreteComponent;
-  XSDTypeDefinition baseType;
-  XSDBaseAdapter adapter;
-  
-
-  public SetBaseTypeCommand(XSDConcreteComponent concreteComponent, XSDTypeDefinition baseType)
-  {
-    super(Messages._UI_ACTION_SET_BASE_TYPE);
-    this.concreteComponent = concreteComponent;
-    this.baseType = baseType;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(concreteComponent.getElement());
-      if (concreteComponent instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) concreteComponent;        
-        XSDComplexTypeContent contentType = (baseType instanceof XSDComplexTypeDefinition) ? ((XSDComplexTypeDefinition)baseType).getContentType() : null;
-        
-        // Complex type simple content
-        if (baseType instanceof XSDSimpleTypeDefinition || (contentType != null &&  contentType instanceof XSDSimpleTypeDefinition))
-        {
-          if (!(complexType.getContent() instanceof XSDSimpleTypeDefinition))
-          {
-            XSDSimpleTypeDefinition simpleContent = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-            complexType.setContent(simpleContent);
-          }
-        }
-        // Complex type complex content
-        else if(baseType instanceof XSDComplexTypeDefinition)
-        {
-        	if(!(complexType.getContent() instanceof XSDComplexTypeDefinition))
-        	{
-        		XSDComplexTypeDefinition complexContent = XSDFactory.eINSTANCE.createXSDComplexTypeDefinition();
-        		complexType.setContent(complexContent.getContent());
-        	}
-        }        
-        complexType.setDerivationMethod(XSDDerivationMethod.EXTENSION_LITERAL);
-        complexType.setBaseTypeDefinition(baseType);
-        // vb This call should not be needed. The XSD Infoset model should reconcile itself properly.
-        complexType.updateElement(true);
-        formatChild(complexType.getElement());
-      }
-      else if (concreteComponent instanceof XSDSimpleTypeDefinition)
-      {
-        XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition) concreteComponent;
-        if (baseType instanceof XSDSimpleTypeDefinition)
-        {
-          XSDVariety variety = simpleType.getVariety();
-          if (variety.getValue() == XSDVariety.ATOMIC)
-          {
-            simpleType.setBaseTypeDefinition((XSDSimpleTypeDefinition) baseType);
-          }
-          else if (variety.getValue() == XSDVariety.UNION)
-          {
-            simpleType.getMemberTypeDefinitions().add(baseType);
-          }
-          else if (variety.getValue() == XSDVariety.LIST)
-          {
-            simpleType.setItemTypeDefinition((XSDSimpleTypeDefinition) baseType);
-          }
-        }
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetMultiplicityCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetMultiplicityCommand.java
deleted file mode 100644
index 1679fec..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetMultiplicityCommand.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-
-public class SetMultiplicityCommand extends BaseCommand
-{
-  XSDConcreteComponent parent;
-  int maxOccurs, minOccurs;
-
-  /**
-   * @param parent
-   */
-  public SetMultiplicityCommand(String label)
-  {
-    super(label);
-  }
-  
-  public void setMaxOccurs(int i)
-  {
-    maxOccurs=i;
-  }
-
-  public void setMinOccurs(int i)
-  {
-    minOccurs=i;    
-  }
-
-  public void setXSDConcreteComponent(XSDConcreteComponent parent)
-  {
-    this.parent = parent;
-  }
-  
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.xsd.ui.internal.commands.AbstractCommand#run()
-   */
-  public void execute()
-  {
-    try
-    {
-      beginRecording(parent.getElement());
-      if (parent instanceof XSDParticleContent)
-      {
-        XSDParticleContent xsdParticleContent = (XSDParticleContent) parent;
-        XSDParticle xsdParticle = (XSDParticle) xsdParticleContent.getContainer();
-        if (maxOccurs < 0)
-        {
-          maxOccurs = XSDParticle.UNBOUNDED;
-        }
-        xsdParticle.setMaxOccurs(maxOccurs);
-        xsdParticle.setMinOccurs(minOccurs);
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetTypeCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetTypeCommand.java
deleted file mode 100644
index da4cb49..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetTypeCommand.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.actions.SetTypeAction;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDTypeReferenceEditManager;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-
-public class SetTypeCommand extends BaseCommand
-{
-  XSDConcreteComponent parent;
-  private boolean continueApply;
-  XSDBaseAdapter adapter;
-  String action;
-
-  public SetTypeCommand(String label, String ID, XSDConcreteComponent parent)
-  {
-    super(label);
-    this.parent = parent;
-    this.action = ID;
-  }
-  
-  public void setAdapter(XSDBaseAdapter adapter)
-  {
-    this.adapter = adapter;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(parent.getElement());
-      ComponentReferenceEditManager componentReferenceEditManager = getComponentReferenceEditManager();
-      continueApply = true;
-      if (parent instanceof XSDElementDeclaration)
-      {
-        if (action.equals(SetTypeAction.SET_NEW_TYPE_ID))
-        {
-          ComponentSpecification newValue = (ComponentSpecification) invokeDialog(componentReferenceEditManager.getNewDialog());
-          if (continueApply)
-            componentReferenceEditManager.modifyComponentReference(adapter, newValue);
-        }
-        else
-        {
-          ComponentSpecification newValue = (ComponentSpecification) invokeDialog(componentReferenceEditManager.getBrowseDialog());
-          if (continueApply)
-            componentReferenceEditManager.modifyComponentReference(adapter, newValue);
-        }
-        formatChild(parent.getElement());
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  private Object invokeDialog(IComponentDialog dialog)
-  {
-    Object newValue = null;
-
-    if (dialog == null)
-    {
-      return null;
-    }
-
-    if (dialog.createAndOpen() == Window.OK)
-    {
-      newValue = dialog.getSelectedComponent();
-    }
-    else
-    {
-      continueApply = false;
-    }
-
-    return newValue;
-  }
-
-  protected ComponentReferenceEditManager getComponentReferenceEditManager()
-  {
-    ComponentReferenceEditManager result = null;
-    IEditorPart editor = getActiveEditor();
-    if (editor != null)
-    {
-      result = (ComponentReferenceEditManager)editor.getAdapter(XSDTypeReferenceEditManager.class);
-    }  
-    return result;
-  }
-  
-  private IEditorPart getActiveEditor()
-  {
-    IWorkbench workbench = PlatformUI.getWorkbench();
-    IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-    IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-    return editorPart;
-  }    
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetXSDFacetValueCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetXSDFacetValueCommand.java
deleted file mode 100644
index 45c6884..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/SetXSDFacetValueCommand.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDFacet;
-
-public class SetXSDFacetValueCommand extends BaseCommand
-{
-  protected XSDFacet facet;
-  protected String value;
-  
-  public SetXSDFacetValueCommand(String label, XSDFacet facet)
-  {
-    super(label);
-    this.facet = facet;
-  }
-  
-  public SetXSDFacetValueCommand(String label, XSDFacet facet, String value)
-  {
-    super(label);
-    this.facet = facet;
-    this.value = value;
-  }
-  
-  public void setValue(String value)
-  {
-    this.value = value; 
-  }
-  
-  public void execute()
-  {
-    try
-    {
-      beginRecording(facet.getElement());
-      facet.setLexicalValue(value);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeReferenceAndManagerDirectivesCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeReferenceAndManagerDirectivesCommand.java
deleted file mode 100644
index 7d38b4c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeReferenceAndManagerDirectivesCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class UpdateAttributeReferenceAndManagerDirectivesCommand extends UpdateComponentReferenceAndManageDirectivesCommand
-{
-
-  public UpdateAttributeReferenceAndManagerDirectivesCommand(XSDConcreteComponent concreteComponent, String componentName, String componentNamespace, IFile file)
-  {
-    super(concreteComponent, componentName, componentNamespace, file);
-  }
-
-  protected XSDComponent getDefinedComponent(XSDSchema schema, String componentName, String componentNamespace)
-  {
-    XSDAttributeDeclaration result = schema.resolveAttributeDeclaration(componentNamespace, componentName);
-    if (result.eContainer() == null)
-    {
-      result = null;
-    }
-    return result;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(concreteComponent.getElement());
-      XSDComponent componentDef = computeComponent();
-      if (componentDef != null)
-      {
-        UpdateAttributeReferenceCommand command = new UpdateAttributeReferenceCommand(org.eclipse.wst.xsd.ui.internal.editor.Messages._UI_ACTION_UPDATE_ATTRIBUTE_REFERENCE, (XSDAttributeDeclaration) concreteComponent,
-            (XSDAttributeDeclaration) componentDef);
-        command.execute();
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeReferenceCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeReferenceCommand.java
deleted file mode 100644
index 6af6375..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeReferenceCommand.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-
-public class UpdateAttributeReferenceCommand extends BaseCommand
-{
-  XSDAttributeDeclaration attribute, ref;
-
-  public UpdateAttributeReferenceCommand(String label, XSDAttributeDeclaration attribute, XSDAttributeDeclaration ref)
-  {
-    super(label);
-    this.attribute = attribute;
-    this.ref = ref;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(attribute.getElement());
-      attribute.setResolvedAttributeDeclaration(ref);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeValueCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeValueCommand.java
deleted file mode 100644
index cc443d3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateAttributeValueCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.w3c.dom.Element;
-
-/*
- * This command is used from the extension view to edit extension elements
- * and attributes which are implemented as DOM objects (not part of the EMF model)
- * 
- * (trung) also used in XSDComplexTypeAdvancedSection to change attribute of
- * specical attributes like block, restriction which is not part of EMF Model
- */
-public class UpdateAttributeValueCommand  extends BaseCommand
-{
-  protected Element element;
-  protected String attributeName;
-  protected String attributeValue;
-  
-  /** Whether the attribute should be deleted if value to 
-   *   be set is an empty String or null  */
-  protected boolean deleteIfValueEmpty = false;
-  
-  public UpdateAttributeValueCommand(Element element, String attributeName, String attributeValue, boolean deleteIfValueEmpty)
-  {
-    this.element = element;
-    this.attributeName = attributeName;
-    this.attributeValue = attributeValue;
-    this.deleteIfValueEmpty = deleteIfValueEmpty;
-  }
-
-  public UpdateAttributeValueCommand(Element element, String attributeName, String attributeValue, String label)
-  {
-    this(element, attributeName, attributeValue, false);
-    setLabel(NLS.bind(Messages._UI_ACTION_CHANGE, label));
-  }
-  
-  public UpdateAttributeValueCommand(Element element, String attributeName, String attributeValue)
-  {
-    this(element, attributeName, attributeValue, false);
-    setLabel(NLS.bind(Messages._UI_ACTION_CHANGE, attributeName));
-  }
-
-  public void setDeleteIfEmpty(boolean v)
-  {
-	  deleteIfValueEmpty = v;
-  }
-  
-  public void setAttributeName(String attributeName)
-  {
-    this.attributeName = attributeName;
-  }
-  
-  public void execute()
-  {
-    try
-    {
-      beginRecording(element);
-      if (deleteIfValueEmpty && 
-    		  (attributeValue == null || attributeValue.equals("") ) )
-      {
-    	element.removeAttribute(attributeName);
-      }
-      else
-      {
-        element.setAttribute(attributeName, attributeValue);
-      }
-      
-      doPostProcessing();
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-  protected void doPostProcessing()
-  {
-    
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateComplexTypeDerivationBy.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateComplexTypeDerivationBy.java
deleted file mode 100644
index facae6a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateComplexTypeDerivationBy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDDerivationMethod;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class UpdateComplexTypeDerivationBy extends BaseCommand
-{
-  private XSDComplexTypeDefinition complexType;
-  private String derivation;
-
-  public UpdateComplexTypeDerivationBy(XSDComplexTypeDefinition complexType, String derivation)
-  {
-    this.complexType = complexType;
-    this.derivation = derivation;
-    // TODO: use new Message bundle mechanism
-    setLabel(XSDEditorPlugin.getXSDString("_UI_DERIVEDBY_CHANGE"));
-  }
-
-  public void execute()
-  {
-    super.execute();
-    try
-    {
-      beginRecording(complexType.getElement());
-      XSDTypeDefinition originalBaseType = complexType.getBaseType();
-      if (derivation.equals(XSDConstants.EXTENSION_ELEMENT_TAG))
-      {
-        complexType.setDerivationMethod(XSDDerivationMethod.EXTENSION_LITERAL);
-      }
-      else if (derivation.equals(XSDConstants.RESTRICTION_ELEMENT_TAG))
-      {
-        complexType.setDerivationMethod(XSDDerivationMethod.RESTRICTION_LITERAL);
-      }
-      complexType.setBaseTypeDefinition(originalBaseType);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateComponentReferenceAndManageDirectivesCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateComponentReferenceAndManageDirectivesCommand.java
deleted file mode 100644
index 9a23f36..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateComponentReferenceAndManageDirectivesCommand.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.util.XSDResourceImpl;
-public abstract class UpdateComponentReferenceAndManageDirectivesCommand extends BaseCommand
-{
-  protected XSDConcreteComponent concreteComponent;
-  protected String componentName;
-  protected String componentNamespace;
-  protected IFile file;
-
-  public UpdateComponentReferenceAndManageDirectivesCommand(XSDConcreteComponent concreteComponent, String componentName, String componentNamespace, IFile file)
-  {
-    this.concreteComponent = concreteComponent;
-    this.componentName = componentName;
-    this.componentNamespace = componentNamespace;
-    this.file = file;
-  }
-
-  protected XSDComponent computeComponent()
-  {
-    XSDComponent result = null;
-    XSDSchema schema = concreteComponent.getSchema();
-    XSDSchemaDirective directive = null;
-
-    // lets see if the element is already visible to our schema
-    result = getDefinedComponent(schema, componentName, componentNamespace);
-    if (result == null)
-    {
-      // TODO (cs) we need to provide a separate command to do this part
-      //
-      // apparently the element is not yet visible, we need to add
-      // includes/imports to get to it
-      if (componentNamespace != null && componentNamespace.equals(schema.getTargetNamespace()))
-      {
-        // we need to add an include
-        // if the component's namespace is not null and matches the schema's
-        // target namespace
-        directive = XSDFactory.eINSTANCE.createXSDInclude();
-      }
-      else if (componentNamespace == null)
-      {
-        // we need to add an include
-        // if the component's namespace is null, then we can just add it
-        // only if the current namespace is not null
-        directive = XSDFactory.eINSTANCE.createXSDInclude();
-
-        // we have to ensure the schema for schema prefix is NOT null
-        if (schema.getSchemaForSchemaQNamePrefix() == null)
-        {
-          String targetNS = schema.getTargetNamespace();
-          if (targetNS == null)
-            targetNS = "";
-          // this will just update the schema for schema prefix to be, say, xsd
-          UpdateNamespaceInformationCommand command = new UpdateNamespaceInformationCommand("", schema, "", targetNS);
-          command.execute();
-        }
-      }
-      else
-      {
-        // we need to add an import
-        XSDImport xsdImport = XSDFactory.eINSTANCE.createXSDImport();
-        xsdImport.setNamespace(componentNamespace);
-        directive = xsdImport;
-      }
-
-      String location = computeNiceLocation(schema.getSchemaLocation(), file);
-      directive.setSchemaLocation(location);
-      // TODO (cs) we should at the directive 'next' in the list of directives
-      // for now I'm just adding as the first thing in the schema :-(
-      //
-      schema.getContents().add(0, directive);
-      XSDSchema resolvedSchema = directive.getResolvedSchema();
-      if (resolvedSchema == null)
-      {
-        String platformLocation = "platform:/resource" + file.getFullPath();
-        Resource resource = concreteComponent.eResource().getResourceSet().createResource(URI.createURI(platformLocation));
-        if (resource instanceof XSDResourceImpl)
-        {
-          try
-          {
-            resource.load(null);
-            XSDResourceImpl resourceImpl = (XSDResourceImpl) resource;
-            resolvedSchema = resourceImpl.getSchema();
-            if (resolvedSchema != null)
-            {
-              directive.setResolvedSchema(resolvedSchema);
-            }
-          }
-          catch (Exception e)
-          {
-          }
-        }
-      }
-      if (resolvedSchema != null)
-      {
-        result = getDefinedComponent(resolvedSchema, componentName, componentNamespace);
-      }
-      else
-      {
-        // TODO (cs) consider setting some error state so that the client can
-        // provide a pop-dialog error
-        // we should also remove the import/include so save from cluttering
-        // the file with bogus directives
-      }
-    }
-
-    return result;
-  }
-  
-  private final static String PLATFORM_RESOURCE_PREFIX = "platform:/resource";
-  private String computeNiceLocation(String baseLocation, IFile file)
-  {     
-    if (baseLocation.startsWith(PLATFORM_RESOURCE_PREFIX))
-    {
-      URI baseURI = URI.createURI(baseLocation);
-      URI fileURI = URI.createPlatformResourceURI(file.getFullPath().toString());
-      URI relative = fileURI.deresolve(baseURI, false, true, true);      
-      return relative.toString();
-    }
-    else
-    {
-      URI baseURI = URI.createURI(baseLocation);          
-      URI fileURI = URI.createFileURI(file.getLocation().toOSString());
-      URI relative = fileURI.deresolve(baseURI, false, true, true);     
-      return relative.toString();    
-    } 
-  }
-
-  protected abstract XSDComponent getDefinedComponent(XSDSchema schema, String componentName, String componentNamespace);
-
-  public abstract void execute();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateContentModelCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateContentModelCommand.java
deleted file mode 100644
index 87a560e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateContentModelCommand.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDModelGroup;
-
-public class UpdateContentModelCommand extends BaseCommand
-{
-  XSDModelGroup xsdModelGroup;
-  XSDCompositor oldXSDCompositor, newXSDCompositor;
-  
-  
-  public UpdateContentModelCommand(String label, XSDModelGroup xsdModelGroup, XSDCompositor xsdCompositor)
-  {
-    super(label);
-    this.xsdModelGroup = xsdModelGroup;
-    this.newXSDCompositor = xsdCompositor;
-    this.oldXSDCompositor = xsdModelGroup.getCompositor();
-  }
-
-  
-  public void execute()
-  {
-    try
-    {
-      super.execute();
-      beginRecording(xsdModelGroup.getElement());
-      xsdModelGroup.setCompositor(newXSDCompositor);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-    
-  public void undo()
-  {
-    xsdModelGroup.setCompositor(oldXSDCompositor);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateElementReferenceAndManageDirectivesCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateElementReferenceAndManageDirectivesCommand.java
deleted file mode 100644
index b8aeb47..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateElementReferenceAndManageDirectivesCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-
-public class UpdateElementReferenceAndManageDirectivesCommand extends UpdateComponentReferenceAndManageDirectivesCommand
-{
-  public UpdateElementReferenceAndManageDirectivesCommand(XSDConcreteComponent concreteComponent, String componentName, String componentNamespace, IFile file)
-  {
-    super(concreteComponent, componentName, componentNamespace, file);
-  }
-
-  protected XSDComponent getDefinedComponent(XSDSchema schema, String componentName, String componentNamespace)
-  {
-    XSDElementDeclaration result = schema.resolveElementDeclaration(componentNamespace, componentName);
-    if (result.eContainer() == null)
-    {
-      result = null;
-    }
-    return result;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(concreteComponent.getElement());
-      XSDComponent elementDef = computeComponent();
-      if (elementDef != null)
-      {
-        UpdateElementReferenceCommand command = new UpdateElementReferenceCommand(Messages._UI_ACTION_UPDATE_ELEMENT_REFERENCE, (XSDElementDeclaration) concreteComponent,
-            (XSDElementDeclaration) elementDef);
-        command.execute();
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateElementReferenceCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateElementReferenceCommand.java
deleted file mode 100644
index d4b5278..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateElementReferenceCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDElementDeclaration;
-
-public class UpdateElementReferenceCommand extends BaseCommand
-{
-  XSDElementDeclaration element, ref;
-
-  public UpdateElementReferenceCommand(String label, XSDElementDeclaration element, XSDElementDeclaration ref)
-  {
-    super(label);
-    this.element = element;
-    this.ref = ref;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(element.getElement());
-      element.setResolvedElementDeclaration(ref);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateMaxOccursCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateMaxOccursCommand.java
deleted file mode 100644
index d159eb1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateMaxOccursCommand.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class UpdateMaxOccursCommand extends BaseCommand
-{
-	private int oldMaxOccurs;
-	private int newMaxOccurs;
-  private boolean removeMaxOccursAttribute;
-	
-	XSDParticle particle;
-
-  public UpdateMaxOccursCommand(String label, XSDParticle particle, int MaxOccurs)
-	{
-		super(label);
-		this.newMaxOccurs = MaxOccurs;
-		this.particle = particle;
-	}
-	
-	public void execute()
-	{
-    try
-    {
-      Element element = particle.getElement();
-      beginRecording(element);
-      removeMaxOccursAttribute = (!(element.hasAttribute(XSDConstants.MAXOCCURS_ATTRIBUTE)))? true: false;
-		  oldMaxOccurs = particle.getMaxOccurs();
-		  particle.setMaxOccurs(newMaxOccurs);
-    }
-    finally
-    {
-      endRecording();
-    }
-	}
-	
-	public void redo()
-	{
-		execute();
-	}
-	
-	public void undo()
-	{
-    if (removeMaxOccursAttribute)
-    {
-      particle.unsetMaxOccurs();
-    }
-    else
-    {
-		  particle.setMaxOccurs(oldMaxOccurs);
-    }
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateMinOccursCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateMinOccursCommand.java
deleted file mode 100644
index 5e31766..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateMinOccursCommand.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDAttributeUseCategory;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class UpdateMinOccursCommand extends BaseCommand
-{
-  private int oldMinOccurs;
-  private int newMinOccurs;
-  private boolean removeMinOccursAttribute;
-
-  XSDComponent component;
-
-  public UpdateMinOccursCommand(String label, XSDComponent component, int minOccurs)
-  {
-    super(label);
-    this.newMinOccurs = minOccurs;
-    this.component = component;
-  }
-
-  public void execute()
-  {
-    Element element = component.getElement();
-    try
-    {
-      beginRecording(element);
-      removeMinOccursAttribute = (!(element.hasAttribute(XSDConstants.MINOCCURS_ATTRIBUTE))) ? true : false;
-
-      if (component instanceof XSDParticle)
-      {
-        oldMinOccurs = ((XSDParticle) component).getMinOccurs();
-        ((XSDParticle) component).setMinOccurs(newMinOccurs);
-      }
-      else if (component instanceof XSDAttributeUse)
-      {
-        oldMinOccurs = (((XSDAttributeUse) component).getUse() == XSDAttributeUseCategory.REQUIRED_LITERAL ? 1 : 0);
-        if (newMinOccurs == 1)
-          ((XSDAttributeUse) component).setUse(XSDAttributeUseCategory.REQUIRED_LITERAL);
-        else
-          ((XSDAttributeUse) component).setUse(XSDAttributeUseCategory.OPTIONAL_LITERAL);
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-  public void undo()
-  {
-    if (component instanceof XSDParticle)
-    {
-      if (removeMinOccursAttribute)
-      {
-        ((XSDParticle) component).unsetMinOccurs();
-      }
-      else
-      {
-        ((XSDParticle) component).setMinOccurs(oldMinOccurs);
-      }
-    }
-    else if (component instanceof XSDAttributeUse)
-    {
-      if (removeMinOccursAttribute)
-      {
-        ((XSDParticle) component).unsetMinOccurs();
-      }
-      else
-      {
-        if (oldMinOccurs == 1)
-          ((XSDAttributeUse) component).setUse(XSDAttributeUseCategory.REQUIRED_LITERAL);
-        else
-          ((XSDAttributeUse) component).setUse(XSDAttributeUseCategory.OPTIONAL_LITERAL);
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNameCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNameCommand.java
deleted file mode 100644
index 730a7c2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNameCommand.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xsd.ui.internal.refactor.PerformUnsavedRefactoringOperation;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.XMLRefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.rename.RenameComponentProcessor;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class UpdateNameCommand extends BaseCommand
-{
-//  private String oldName;
-  private String newName;
-  private XSDNamedComponent component;
-
-  public UpdateNameCommand(String label, XSDNamedComponent component, String newName)
-  {
-    super(label);
-
-    if (component instanceof XSDComplexTypeDefinition && component.getName() == null && component.eContainer() instanceof XSDNamedComponent && ((XSDNamedComponent) component.eContainer()).getName() != null)
-    {
-      component = (XSDNamedComponent) component.eContainer();
-    }
-
-    this.component = component;
-    this.newName = newName;
-//    this.oldName = component.getName();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.gef.commands.Command#execute()
-   */
-  public void execute()
-  {
-    try
-    {
-      beginRecording(component.getElement());
-      renameComponent(newName);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-  /**
-   * Performs a rename refactoring to rename the component and all the
-   * references to it within the current schema.
-   * 
-   * @param newName the new component name.
-   */
-  private void renameComponent(String newName)
-  {
-    // this is a 'globally' defined component (e.g. global element)    
-    if (component.eContainer() instanceof XSDSchema)
-    {
-      IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-      if (workbenchWindow != null)
-      {
-        IWorkbenchPage page = workbenchWindow.getActivePage();
-        if (page != null)
-        {
-          IEditorInput editorInput = page.getActiveEditor().getEditorInput();
-          if (editorInput instanceof FileEditorInput)
-          {
-            RefactoringComponent refactoringComponent = new XMLRefactoringComponent(
-              component,
-              (IDOMElement)component.getElement(), 
-              component.getName(),
-              component.getTargetNamespace());
-
-            RenameComponentProcessor processor = new RenameComponentProcessor(refactoringComponent, newName, true);    
-            RenameRefactoring refactoring = new RenameRefactoring(processor);
-            PerformUnsavedRefactoringOperation operation = new PerformUnsavedRefactoringOperation(refactoring);
-            operation.run(null);
-          }
-          else
-          {
-            // We can't refactor rename external files
-            component.setName(newName);
-          }
-        }
-      }
-    } 
-    else
-    {
-      // this is a 'locally' defined component (e.g. local element)
-      // no need to call refactoring since this component can't be referenced      
-      component.setName(newName);
-    }  
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNamespaceInformationCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNamespaceInformationCommand.java
deleted file mode 100644
index 35efdd6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNamespaceInformationCommand.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.nsedit.TargetNamespaceChangeHandler;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class UpdateNamespaceInformationCommand extends BaseCommand
-{
-  protected XSDSchema xsdSchema;
-  protected String newPrefix, newTargetNamespace;
-  
-  public UpdateNamespaceInformationCommand(String label, XSDSchema xsdSchema, String newPrefix, String newTargetNamespace)
-  {
-    super(label);
-    this.xsdSchema = xsdSchema;
-    this.newPrefix = newPrefix;
-    this.newTargetNamespace = newTargetNamespace;
-  }
-
-  public void execute()
-  {
-    ensureSchemaElement(xsdSchema);
-    
-    Element element = xsdSchema.getElement();
-    try
-    {
-      //DocumentImpl doc = (DocumentImpl) element.getOwnerDocument();
-
-      String modelTargetNamespace = xsdSchema.getTargetNamespace();
-      String oldNamespace = xsdSchema.getTargetNamespace();
-
-      TypesHelper helper = new TypesHelper(xsdSchema);
-      String oldPrefix = helper.getPrefix(element.getAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE), false);
-
-      if (modelTargetNamespace == null)
-      {
-        modelTargetNamespace = ""; //$NON-NLS-1$
-      }
-
-      String targetNamespace = newTargetNamespace.trim();
-      String prefix = newPrefix.trim();
-
-      if (!validatePrefix(prefix) || !validateTargetNamespace(targetNamespace))
-      {
-        return;
-      }
-
-      if (prefix.length() > 0 && targetNamespace.length() == 0)
-      {
-        // can't have blank targetnamespace and yet specify a prefix
-        return;
-      }
-
-      //doc.getModel().beginRecording(this, XSDEditorPlugin.getXSDString("_UI_TARGETNAMESPACE_CHANGE")); //$NON-NLS-1$
-      beginRecording(element);
-      
-      String xsdForXSDPrefix = xsdSchema.getSchemaForSchemaQNamePrefix();
-      Map map = xsdSchema.getQNamePrefixToNamespaceMap();
-
-      // Check if prefix is blank
-      // if it is, then make sure we have a prefix
-      // for schema for schema
-      if (prefix.length() == 0)
-      {
-        // if prefix for schema for schema is blank
-        // then set it to value specified in preference
-        // and update ALL nodes with this prefix
-        if (xsdForXSDPrefix == null || (xsdForXSDPrefix != null && xsdForXSDPrefix.trim().length() == 0))
-        {
-          // get preference prefix
-          xsdForXSDPrefix = XSDEditorPlugin.getPlugin().getXMLSchemaPrefix();
-          // get a unique prefix by checking what's in the map
-
-          xsdForXSDPrefix = getUniqueSchemaForSchemaPrefix(xsdForXSDPrefix, map);
-          element.setAttribute("xmlns:" + xsdForXSDPrefix, XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001); //$NON-NLS-1$
-
-          updateAllNodes(element, xsdForXSDPrefix);
-
-          // remove the old xmlns attribute for the schema for schema
-          if (element.hasAttribute("xmlns")  && //$NON-NLS-1$
-              element.getAttribute("xmlns").equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001)) //$NON-NLS-1$
-          {
-            element.removeAttribute("xmlns"); //$NON-NLS-1$
-          }
-        }
-      }
-
-      if (targetNamespace.length() > 0 || (targetNamespace.length() == 0 && prefix.length() == 0))
-      {
-        // clean up the old prefix for this schema
-        if (oldPrefix != null && oldPrefix.length() > 0)
-        {
-          element.removeAttribute("xmlns:" + oldPrefix); //$NON-NLS-1$
-          // element.setAttribute("xmlns:" + prefix, targetNamespace);
-          // java.util.Map prefixToNameSpaceMap =
-          // xsdSchema.getQNamePrefixToNamespaceMap();
-          // prefixToNameSpaceMap.remove(oldPrefix);
-        }
-        else
-        // if no prefix
-        {
-          if (element.hasAttribute("xmlns")) //$NON-NLS-1$
-          {
-            if (!element.getAttribute("xmlns").equals(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001)) //$NON-NLS-1$
-            {
-              element.removeAttribute("xmlns"); //$NON-NLS-1$
-            }
-          }
-        }
-      }
-
-      if (targetNamespace.length() > 0)
-      {
-        if (!modelTargetNamespace.equals(targetNamespace))
-        {
-          element.setAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE, targetNamespace);
-        }
-        // now set the new xmlns:prefix attribute
-        if (prefix.length() > 0)
-        {
-          element.setAttribute("xmlns:" + prefix, targetNamespace); //$NON-NLS-1$
-        }
-        else
-        {
-          element.setAttribute("xmlns", targetNamespace); //$NON-NLS-1$
-        }
-        // set the targetNamespace attribute
-      }
-      else
-      // else targetNamespace is blank
-      {
-        if (prefix.length() == 0)
-        {
-          element.removeAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE);
-        }
-      }
-
-      // do our own referential integrity
-      TargetNamespaceChangeHandler targetNamespaceChangeHandler = new TargetNamespaceChangeHandler(xsdSchema, oldNamespace, targetNamespace);
-      targetNamespaceChangeHandler.resolve();
-
-      updateElement(xsdSchema);
-
-      //doc.getModel().endRecording(this);
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-  
-  
-  // issue (cs) I don't have a clue why we need to call this method
-  //
-  private static void updateElement(XSDConcreteComponent concreteComp)
-  {
-    try
-    {
-      concreteComp.updateElement();
-    }
-    catch (Exception e)
-    {
-      for (Iterator containments = concreteComp.eClass().getEAllReferences().iterator(); containments.hasNext(); )
-      {
-        EReference eReference = (EReference)containments.next();
-        if (eReference.isContainment())
-        {
-          if (eReference.isMany())
-          {
-            for (Iterator objects = ((Collection)concreteComp.eGet(eReference)).iterator(); objects.hasNext(); )
-            {
-              XSDConcreteComponent xsdConcreteComponent = (XSDConcreteComponent)objects.next();
-              try
-              {
-                xsdConcreteComponent.updateElement();
-              }
-              catch (Exception ex) {}
-            }
-          }
-          else
-          {
-            XSDConcreteComponent xsdConcreteComponent = (XSDConcreteComponent)concreteComp.eGet(eReference);
-            if (xsdConcreteComponent != null)
-            {
-              try
-              {
-                xsdConcreteComponent.updateElement();
-              }
-              catch (Exception ex) {}
-            }
-          }
-        }
-      }
-    }
-  }      
-  private String getUniqueSchemaForSchemaPrefix(String xsdForXSDPrefix, Map map)
-  {
-    if (xsdForXSDPrefix == null || (xsdForXSDPrefix != null && xsdForXSDPrefix.trim().length() == 0))
-    {
-      xsdForXSDPrefix = "xsd"; //$NON-NLS-1$
-    }
-    // ensure prefix is unique
-    int prefixExtension = 1;
-    while (map.containsKey(xsdForXSDPrefix) && prefixExtension < 100)
-    {
-      xsdForXSDPrefix = xsdForXSDPrefix + String.valueOf(prefixExtension);
-      prefixExtension++;
-    }
-    return xsdForXSDPrefix;
-  }
-
-  private void updateAllNodes(Element element, String prefix)
-  {
-    element.setPrefix(prefix);
-    NodeList list = element.getChildNodes();
-    if (list != null)
-    {
-      for (int i = 0; i < list.getLength(); i++)
-      {
-        Node child = list.item(i);
-        if (child != null && child instanceof Element)
-        {
-          child.setPrefix(prefix);
-          if (child.hasChildNodes())
-          {
-            updateAllNodes((Element) child, prefix);
-          }
-        }
-      }
-    }
-  }
-
-  private boolean validateTargetNamespace(String ns)
-  {
-    // will allow blank namespace !!
-    if (ns.equals("")) //$NON-NLS-1$
-    {
-      return true;
-    }
-
-    String errorMessage = null;
-    try
-    {
-      URI testURI = new URI(ns);
-      testURI.isAbsolute();
-    }
-    catch (URISyntaxException e)
-    {
-      errorMessage = XSDEditorPlugin.getXSDString("_WARN_INVALID_TARGET_NAMESPACE"); //$NON-NLS-1$
-    }
-
-    if (errorMessage == null || errorMessage.length() == 0)
-    {
-      return true;
-    }
-    return false;
-  }
-  
-  protected boolean validatePrefix(String prefix)
-  {
-    if (prefix != null && prefix.equals("")) return true;
-    return XMLChar.isValidNCName(prefix);
-  }
-  
-  public void redo()
-  {
-    execute();
-  }
-  
-  public void undo()
-  {
-  }
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNumericBoundsFacetCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNumericBoundsFacetCommand.java
deleted file mode 100644
index 0f5cea9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateNumericBoundsFacetCommand.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDMaxExclusiveFacet;
-import org.eclipse.xsd.XSDMaxInclusiveFacet;
-import org.eclipse.xsd.XSDMinExclusiveFacet;
-import org.eclipse.xsd.XSDMinInclusiveFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class UpdateNumericBoundsFacetCommand extends BaseCommand
-{
-  XSDSimpleTypeDefinition xsdSimpleType;
-  String max, min;
-  boolean includeMin, includeMax;
-  private boolean doUpdateMax = false, doUpdateMin = false;
-  XSDMinInclusiveFacet minInclusiveFacet;
-  XSDMinExclusiveFacet minExclusiveFacet;
-  XSDMaxInclusiveFacet maxInclusiveFacet;
-  XSDMaxExclusiveFacet maxExclusiveFacet;
-
-
-  public UpdateNumericBoundsFacetCommand(String label, XSDSimpleTypeDefinition xsdSimpleType, boolean includeMin, boolean includeMax)
-  {
-    super(label);
-    this.xsdSimpleType = xsdSimpleType;
-    this.includeMin = includeMin;
-    this.includeMax = includeMax;
-    
-    minInclusiveFacet = xsdSimpleType.getMinInclusiveFacet();
-    minExclusiveFacet = xsdSimpleType.getMinExclusiveFacet();
-    maxInclusiveFacet = xsdSimpleType.getMaxInclusiveFacet();
-    maxExclusiveFacet = xsdSimpleType.getMaxExclusiveFacet();
-
-  }
-
-  public void setMin(String min)
-  {
-    this.min = min;
-    doUpdateMin = true;
-  }
-  
-  public void setMax(String max)
-  {
-    this.max = max;
-    doUpdateMax = true;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(xsdSimpleType.getElement());
-
-      if (doUpdateMin)
-      {
-        if (includeMin)
-        {
-          if (minInclusiveFacet == null && min != null)
-          {
-            minInclusiveFacet = XSDFactory.eINSTANCE.createXSDMinInclusiveFacet();
-            minInclusiveFacet.setLexicalValue(min);
-            xsdSimpleType.getFacetContents().add(minInclusiveFacet);
-
-            if (minExclusiveFacet != null)
-            {
-              xsdSimpleType.getFacetContents().remove(minExclusiveFacet);
-            }
-          }
-          else if (minInclusiveFacet != null && min != null)
-          {
-            minInclusiveFacet.setLexicalValue(min);
-          }
-          else if (minInclusiveFacet != null && min == null)
-          {
-            xsdSimpleType.getFacetContents().remove(minInclusiveFacet);
-          }
-        }
-        else
-        // !includeMin
-        {
-          if (minExclusiveFacet == null && min != null)
-          {
-            minExclusiveFacet = XSDFactory.eINSTANCE.createXSDMinExclusiveFacet();
-            minExclusiveFacet.setLexicalValue(min);
-            xsdSimpleType.getFacetContents().add(minExclusiveFacet);
-
-            if (minInclusiveFacet != null)
-            {
-              xsdSimpleType.getFacetContents().remove(minInclusiveFacet);
-            }
-          }
-          else if (minExclusiveFacet != null && min != null)
-          {
-            minExclusiveFacet.setLexicalValue(min);
-          }
-          else if (minExclusiveFacet != null && min == null)
-          {
-            xsdSimpleType.getFacetContents().remove(minExclusiveFacet);
-          }
-        }
-      }
-      else if (doUpdateMax)
-      {
-        if (includeMax)
-        {
-          if (maxInclusiveFacet == null && max != null)
-          {
-            maxInclusiveFacet = XSDFactory.eINSTANCE.createXSDMaxInclusiveFacet();
-            maxInclusiveFacet.setLexicalValue(max);
-            xsdSimpleType.getFacetContents().add(maxInclusiveFacet);
-
-            if (maxExclusiveFacet != null)
-            {
-              xsdSimpleType.getFacetContents().remove(maxExclusiveFacet);
-            }
-          }
-          else if (maxInclusiveFacet != null && max != null)
-          {
-            maxInclusiveFacet.setLexicalValue(max);
-          }
-          else if (maxInclusiveFacet != null && max == null)
-          {
-            xsdSimpleType.getFacetContents().remove(maxInclusiveFacet);
-          }
-        }
-        else
-        // !includeMax
-        {
-          if (maxExclusiveFacet == null && max != null)
-          {
-            maxExclusiveFacet = XSDFactory.eINSTANCE.createXSDMaxExclusiveFacet();
-            maxExclusiveFacet.setLexicalValue(max);
-            xsdSimpleType.getFacetContents().add(maxExclusiveFacet);
-
-            if (maxInclusiveFacet != null)
-            {
-              xsdSimpleType.getFacetContents().remove(maxInclusiveFacet);
-            }
-          }
-          else if (maxExclusiveFacet != null && max != null)
-          {
-            maxExclusiveFacet.setLexicalValue(max);
-          }
-          else if (maxExclusiveFacet != null && max == null)
-          {
-            xsdSimpleType.getFacetContents().remove(maxExclusiveFacet);
-          }
-        }
-      }
-
-      formatChild(xsdSimpleType.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateStringLengthFacetCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateStringLengthFacetCommand.java
deleted file mode 100644
index b5e78e9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateStringLengthFacetCommand.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDLengthFacet;
-import org.eclipse.xsd.XSDMaxLengthFacet;
-import org.eclipse.xsd.XSDMinLengthFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class UpdateStringLengthFacetCommand extends BaseCommand
-{
-  XSDSimpleTypeDefinition xsdSimpleType;
-  String max, min;
-  private boolean doUpdateMax = false, doUpdateMin = false;
-
-  public UpdateStringLengthFacetCommand(String label, XSDSimpleTypeDefinition xsdSimpleType)
-  {
-    super(label);
-    this.xsdSimpleType = xsdSimpleType;
-  }
-  
-  public void setMin(String min)
-  {
-    this.min = min;
-    doUpdateMin = true;
-  }
-  
-  public void setMax(String max)
-  {
-    this.max = max;
-    doUpdateMax = true;
-  }
-  
-  public void execute()
-  {
-    try
-    {
-      beginRecording(xsdSimpleType.getElement());
-      XSDLengthFacet lengthFacet = xsdSimpleType.getEffectiveLengthFacet();
-      XSDMinLengthFacet minLengthFacet = xsdSimpleType.getEffectiveMinLengthFacet();
-      XSDMaxLengthFacet maxLengthFacet = xsdSimpleType.getEffectiveMaxLengthFacet();
-
-      String currentLength = null, currentMin = null, currentMax = null;
-      if (lengthFacet != null)
-      {
-        currentLength = lengthFacet.getLexicalValue();
-      }
-      if (minLengthFacet != null)
-      {
-        currentMin = minLengthFacet.getLexicalValue();
-      }
-      if (maxLengthFacet != null)
-      {
-        currentMax = maxLengthFacet.getLexicalValue();
-      }
-
-      if (doUpdateMax && !doUpdateMin)
-      {
-        if (maxLengthFacet != null)
-        {
-          if (max != null)
-          {
-            if (max.equals(currentMin))
-            {
-              lengthFacet = XSDFactory.eINSTANCE.createXSDLengthFacet();
-              lengthFacet.setLexicalValue(max);
-              xsdSimpleType.getFacetContents().add(lengthFacet);
-              xsdSimpleType.getFacetContents().remove(maxLengthFacet);
-              xsdSimpleType.getFacetContents().remove(minLengthFacet);
-            }
-            else
-            {
-              if (lengthFacet != null)
-              {
-                xsdSimpleType.getFacetContents().remove(lengthFacet);
-              }
-              if (minLengthFacet == null && currentLength != null)
-              {
-                minLengthFacet = XSDFactory.eINSTANCE.createXSDMinLengthFacet();
-                minLengthFacet.setLexicalValue(currentLength);
-                xsdSimpleType.getFacetContents().add(minLengthFacet);
-              }
-              maxLengthFacet.setLexicalValue(max);
-            }
-          }
-          else
-          {
-            xsdSimpleType.getFacetContents().remove(maxLengthFacet);
-          }
-        }
-        else
-        {
-          if (currentMin != null && currentMin.equals(max))
-          {
-            if (lengthFacet == null)
-            {
-              lengthFacet = XSDFactory.eINSTANCE.createXSDLengthFacet();
-              xsdSimpleType.getFacetContents().add(lengthFacet);
-            }
-            lengthFacet.setLexicalValue(max);
-            xsdSimpleType.getFacetContents().remove(minLengthFacet);
-          }
-          else if (currentLength != null && !currentLength.equals(max))
-          {
-            xsdSimpleType.getFacetContents().remove(lengthFacet);
-
-            if (max != null)
-            {
-              maxLengthFacet = XSDFactory.eINSTANCE.createXSDMaxLengthFacet();
-              maxLengthFacet.setLexicalValue(max);
-              xsdSimpleType.getFacetContents().add(maxLengthFacet);
-            }
-
-            minLengthFacet = XSDFactory.eINSTANCE.createXSDMinLengthFacet();
-            minLengthFacet.setLexicalValue(currentLength);
-            xsdSimpleType.getFacetContents().add(minLengthFacet);
-          }
-          else
-          {
-            if (lengthFacet != null)
-            {
-              xsdSimpleType.getFacetContents().remove(lengthFacet);
-
-              minLengthFacet = XSDFactory.eINSTANCE.createXSDMinLengthFacet();
-              minLengthFacet.setLexicalValue(currentLength);
-              xsdSimpleType.getFacetContents().add(minLengthFacet);
-
-            }
-            maxLengthFacet = XSDFactory.eINSTANCE.createXSDMaxLengthFacet();
-            maxLengthFacet.setLexicalValue(max);
-            xsdSimpleType.getFacetContents().add(maxLengthFacet);
-          }
-        }
-      }
-      else if (!doUpdateMax && doUpdateMin)
-      {
-        if (minLengthFacet != null)
-        {
-          if (min != null)
-          {
-            if (min.equals(currentMax))
-            {
-              lengthFacet = XSDFactory.eINSTANCE.createXSDLengthFacet();
-              lengthFacet.setLexicalValue(min);
-              xsdSimpleType.getFacetContents().add(lengthFacet);
-              xsdSimpleType.getFacetContents().remove(maxLengthFacet);
-              xsdSimpleType.getFacetContents().remove(minLengthFacet);
-            }
-            else
-            {
-              if (lengthFacet != null)
-              {
-                xsdSimpleType.getFacetContents().remove(lengthFacet);
-              }
-              if (maxLengthFacet == null && currentLength != null)
-              {
-                maxLengthFacet = XSDFactory.eINSTANCE.createXSDMaxLengthFacet();
-                maxLengthFacet.setLexicalValue(currentLength);
-                xsdSimpleType.getFacetContents().add(maxLengthFacet);
-              }
-              minLengthFacet.setLexicalValue(min);
-            }
-          }
-          else
-          {
-            xsdSimpleType.getFacetContents().remove(minLengthFacet);
-          }
-        }
-        else
-        {
-          if (currentMax != null && currentMax.equals(min))
-          {
-            if (lengthFacet == null)
-            {
-              lengthFacet = XSDFactory.eINSTANCE.createXSDLengthFacet();
-              xsdSimpleType.getFacetContents().add(lengthFacet);
-            }
-            lengthFacet.setLexicalValue(min);
-            xsdSimpleType.getFacetContents().remove(maxLengthFacet);
-          }
-          else if (currentLength != null && !currentLength.equals(min))
-          {
-            xsdSimpleType.getFacetContents().remove(lengthFacet);
-
-            if (min != null)
-            {
-              minLengthFacet = XSDFactory.eINSTANCE.createXSDMinLengthFacet();
-              minLengthFacet.setLexicalValue(min);
-              xsdSimpleType.getFacetContents().add(minLengthFacet);
-            }
-
-            maxLengthFacet = XSDFactory.eINSTANCE.createXSDMaxLengthFacet();
-            maxLengthFacet.setLexicalValue(currentLength);
-            xsdSimpleType.getFacetContents().add(maxLengthFacet);
-          }
-          else
-          {
-            minLengthFacet = XSDFactory.eINSTANCE.createXSDMinLengthFacet();
-            minLengthFacet.setLexicalValue(min);
-            xsdSimpleType.getFacetContents().add(minLengthFacet);
-
-            if (lengthFacet != null)
-            {
-              xsdSimpleType.getFacetContents().remove(lengthFacet);
-
-              maxLengthFacet = XSDFactory.eINSTANCE.createXSDMaxLengthFacet();
-              maxLengthFacet.setLexicalValue(currentLength);
-              xsdSimpleType.getFacetContents().add(maxLengthFacet);
-            }
-          }
-        }
-      }
-      formatChild(xsdSimpleType.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTextValueCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTextValueCommand.java
deleted file mode 100644
index 6663646..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTextValueCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.wst.xml.ui.internal.tabletree.TreeContentHelper;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-/*
- * This command is used from the extension view to edit extension elements
- * and which are implemented as DOM objects (not part of the EMF model)
- */
-public class UpdateTextValueCommand  extends BaseCommand
-{
-  Element element;
-  String value;
-  
-  public UpdateTextValueCommand(Element element, String value)
-  {
-    this.element = element;
-    this.value = value;
-  }
-
-  
-  public void execute()
-  {
-    try
-    {
-      beginRecording(element);      
-      Node textNode = null;
-      TreeContentHelper helper = new TreeContentHelper();
-      for (Node node = element.getFirstChild(); node != null; node = node.getNextSibling()) 
-      {
-        if (node.getNodeType() == Node.TEXT_NODE &&
-            !helper.isIgnorableText(node)) 
-        {
-          textNode = node;
-          break;
-        }         
-      }       
-      if (textNode == null)
-      {
-        textNode = element.getOwnerDocument().createTextNode("");
-        element.appendChild(textNode);
-      }  
-      helper.setNodeValue(textNode, value);        
-    }
-    finally
-    {
-      endRecording();
-    }
-  } 
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTypeReferenceAndManageDirectivesCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTypeReferenceAndManageDirectivesCommand.java
deleted file mode 100644
index 0ed77b3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTypeReferenceAndManageDirectivesCommand.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class UpdateTypeReferenceAndManageDirectivesCommand extends UpdateComponentReferenceAndManageDirectivesCommand
-{
-
-  public UpdateTypeReferenceAndManageDirectivesCommand(XSDConcreteComponent concreteComponent,
-		  String componentName, String componentNamespace, IFile file)
-  {
-	  super(concreteComponent, componentName, componentNamespace, file);
-  }
-
-  
-  protected XSDComponent getDefinedComponent(XSDSchema schema, String componentName, String componentNamespace)
-  {
-    XSDTypeDefinition result = schema.resolveTypeDefinition(componentNamespace, componentName);
-    if (result.eContainer() == null)
-    {
-      result = null;
-    }      
-    return result;
-  }
-  
-  
-  public void execute()
-  {
-    try
-    {
-      beginRecording(concreteComponent.getElement());
-      XSDComponent td = computeComponent();
-      if (td != null && td instanceof XSDTypeDefinition)
-      {
-        UpdateTypeReferenceCommand command = new UpdateTypeReferenceCommand(concreteComponent, (XSDTypeDefinition) td);
-        command.execute();
-        XSDDirectivesManager.removeUnusedXSDImports(concreteComponent.getSchema());
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTypeReferenceCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTypeReferenceCommand.java
deleted file mode 100644
index cda106c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateTypeReferenceCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class UpdateTypeReferenceCommand extends BaseCommand
-{
-  XSDConcreteComponent concreteComponent;
-  XSDTypeDefinition newType;
-  
-  public UpdateTypeReferenceCommand(XSDConcreteComponent concreteComponent, XSDTypeDefinition newType)
-  {
-    this.concreteComponent = concreteComponent;
-    this.newType = newType;
-  }
-   
-  public void execute()
-  {
-    try
-    {
-      beginRecording(concreteComponent.getElement());
-
-      if (concreteComponent instanceof XSDElementDeclaration)
-      {
-        setElementType((XSDElementDeclaration) concreteComponent);
-      }
-      else if (concreteComponent instanceof XSDAttributeUse)
-      {
-        setAttributeType((XSDAttributeUse) concreteComponent);
-      }
-      else if (concreteComponent instanceof XSDAttributeDeclaration)
-      {
-        setAttributeType((XSDAttributeDeclaration) concreteComponent);
-      }
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
- 
-  protected void setElementType(XSDElementDeclaration ed)
-  {
-    ed = ed.getResolvedElementDeclaration();
-    if (ed != null)
-    {  
-      ed.setTypeDefinition(newType);
-    }      
-  }
-  
-  protected void setAttributeType(XSDAttributeUse attributeUse)
-  {
-    setAttributeType(attributeUse.getAttributeDeclaration());
-  }
-  
-  protected void setAttributeType(XSDAttributeDeclaration ad)
-  {
-    ad = ad.getResolvedAttributeDeclaration();
-    if (ad != null && newType instanceof XSDSimpleTypeDefinition)
-    {
-      ad.setTypeDefinition((XSDSimpleTypeDefinition)newType);
-    }  
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateXSDPatternFacetCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateXSDPatternFacetCommand.java
deleted file mode 100644
index 3d1b6ad..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateXSDPatternFacetCommand.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDPatternFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class UpdateXSDPatternFacetCommand extends BaseCommand
-{
-  public static final int ADD = 0;
-  public static final int DELETE = 1;
-  public static final int UPDATE = 2;
-  
-  XSDSimpleTypeDefinition xsdSimpleTypeDefinition;
-  String value;
-  int actionType;
-  XSDPatternFacet patternToEdit;
-  
-  public UpdateXSDPatternFacetCommand(String label, XSDSimpleTypeDefinition xsdSimpleTypeDefinition, int actionType)
-  {
-    super(label);
-    this.xsdSimpleTypeDefinition = xsdSimpleTypeDefinition;
-    this.actionType = actionType;
-    
-  }
-  
-  public void setValue(String value)
-  {
-    this.value = value;
-  }
-  
-  public void setPatternToEdit(XSDPatternFacet patternToEdit)
-  {
-    this.patternToEdit = patternToEdit;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(xsdSimpleTypeDefinition.getElement());
-      if (actionType == ADD)
-      {
-        XSDPatternFacet pattern = XSDFactory.eINSTANCE.createXSDPatternFacet();
-        pattern.setLexicalValue(value);
-        xsdSimpleTypeDefinition.getFacetContents().add(pattern);
-      }
-      else if (actionType == DELETE)
-      {
-        Assert.isNotNull(patternToEdit);
-        if (xsdSimpleTypeDefinition.getFacetContents().contains(patternToEdit))
-          xsdSimpleTypeDefinition.getFacetContents().remove(patternToEdit);
-      }
-      else if (actionType == UPDATE)
-      {
-        Assert.isNotNull(patternToEdit);
-        patternToEdit.setLexicalValue(value);
-      }
-      formatChild(xsdSimpleTypeDefinition.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateXSDWhiteSpaceFacetCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateXSDWhiteSpaceFacetCommand.java
deleted file mode 100644
index bd92c3f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/commands/UpdateXSDWhiteSpaceFacetCommand.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.commands;
-
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDWhiteSpace;
-import org.eclipse.xsd.XSDWhiteSpaceFacet;
-
-public class UpdateXSDWhiteSpaceFacetCommand extends BaseCommand
-{
-  XSDSimpleTypeDefinition xsdSimpleTypeDefinition;
-  boolean doAddFacet;
-  
-  public UpdateXSDWhiteSpaceFacetCommand(String label, XSDSimpleTypeDefinition xsdSimpleType, boolean doAddFacet)
-  {
-    super(label);
-    this.xsdSimpleTypeDefinition = xsdSimpleType;
-    this.doAddFacet = doAddFacet;
-  }
-
-  public void execute()
-  {
-    try
-    {
-      beginRecording(xsdSimpleTypeDefinition.getElement());
-      XSDWhiteSpaceFacet whitespaceFacet = xsdSimpleTypeDefinition.getWhiteSpaceFacet();
-
-      if (doAddFacet)
-      {
-        if (whitespaceFacet == null)
-        {
-          whitespaceFacet = XSDFactory.eINSTANCE.createXSDWhiteSpaceFacet();
-          xsdSimpleTypeDefinition.getFacetContents().add(whitespaceFacet);
-        }
-        whitespaceFacet.setLexicalValue(XSDWhiteSpace.COLLAPSE_LITERAL.getName());
-      }
-      else
-      {
-        if (whitespaceFacet != null)
-        {
-          xsdSimpleTypeDefinition.getFacetContents().remove(whitespaceFacet);
-        }
-      }
-      formatChild(xsdSimpleTypeDefinition.getElement());
-    }
-    finally
-    {
-      endRecording();
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/providers/XSDSectionLabelProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/providers/XSDSectionLabelProvider.java
deleted file mode 100644
index 321e5f8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/providers/XSDSectionLabelProvider.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.providers;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDAdapterFactory;
-import org.eclipse.wst.xsd.ui.internal.adapters.XSDBaseAdapter;
-import org.eclipse.wst.xsd.ui.internal.adt.outline.ITreeElement;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDSectionLabelProvider extends LabelProvider
-{
-  /**
-   * 
-   */
-  public XSDSectionLabelProvider()
-  {
-    super();
-  }
-
-  /**
-   * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-   */
-  public Image getImage(Object object)
-  {
-    if (object == null || object.equals(StructuredSelection.EMPTY))
-    {
-      return null;
-    }
-    Image result = null;
-    if (object instanceof StructuredSelection)
-    {
-      Object selected = ((StructuredSelection) object).getFirstElement();
-
-      if (selected instanceof XSDConcreteComponent)
-      {
-        XSDBaseAdapter adapter = (XSDBaseAdapter)XSDAdapterFactory.getInstance().adapt((XSDConcreteComponent)selected);
-        return ((ITreeElement)adapter).getImage();
-      }
-    }
-    return result;
-  }
-
-  /**
-   * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-   */
-  public String getText(Object object)
-  {
-    if (object == null || object.equals(StructuredSelection.EMPTY))
-    {
-      return org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_NO_ITEMS_SELECTED;
-    }
-
-    String result = null;
-
-    boolean isReference = false;
-    Object selected = null;
-    if (object instanceof StructuredSelection)
-    {
-      selected = ((StructuredSelection) object).getFirstElement();
-
-      if (selected instanceof XSDConcreteComponent)
-      {
-        if (selected instanceof XSDElementDeclaration)
-        {
-          XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration) selected;
-          if (xsdElementDeclaration.isElementDeclarationReference())
-          {
-            isReference = true;
-          }
-        } else if (selected instanceof XSDAttributeDeclaration)
-        {
-          if (((XSDAttributeDeclaration) selected).isAttributeDeclarationReference())
-          {
-            isReference = true;
-          }
-        } else if (selected instanceof XSDModelGroupDefinition)
-        {
-          if (((XSDModelGroupDefinition) selected).isModelGroupDefinitionReference())
-          {
-            isReference = true;
-          }
-        }
-        StringBuffer sb = new StringBuffer();
-        Element element = ((XSDConcreteComponent) selected).getElement();
-        if (element != null)
-        {
-          sb.append(((XSDConcreteComponent) selected).getElement().getLocalName());
-
-          if (isReference)
-          {
-            sb.append(" ref");//$NON-NLS-1$
-            // This string is not easily translatable to other languages.
-            // For now, make it english-only since we use the element tag as the title anyway
-//            sb.append(Messages.UI_PAGE_HEADING_REFERENCE);
-          }
-
-          IWorkbench workbench = PlatformUI.getWorkbench();
-          IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-          if (workbenchWindow != null)
-          {
-            IWorkbenchPage page = workbenchWindow.getActivePage();
-            if (page != null)
-            {
-              IEditorPart editorPart = page.getActiveEditor();
-              XSDSchema xsdSchema = ((XSDConcreteComponent) selected).getSchema();
-              IEditorInput editorInput = editorPart.getEditorInput();
-              boolean isReadOnly = false;
-              if (!(editorInput instanceof IFileEditorInput || editorInput instanceof FileStoreEditorInput))
-              {
-                isReadOnly = true;
-              }
-              if (editorPart != null && xsdSchema != editorPart.getAdapter(XSDSchema.class) || isReadOnly)
-              {
-                sb.append(" (" + Messages.UI_LABEL_READ_ONLY + ")"); //$NON-NLS-1$ //$NON-NLS-2$
-              }
-            }
-          }
-          return sb.toString();
-        }
-        else
-        {
-          // If the element is null, then let's use the model object to find
-          // an appropriate name
-          if ((XSDConcreteComponent) selected instanceof XSDNamedComponent)
-          {
-            return ((XSDNamedComponent)selected).getName();
-          }
-          else if ((XSDConcreteComponent) selected instanceof XSDSchema)
-          {
-            return XSDConstants.SCHEMA_ELEMENT_TAG;
-          }
-          // last resort....
-          return "(" + Messages.UI_LABEL_READ_ONLY + ")"; //$NON-NLS-1$ //$NON-NLS-2$
-        }
-      }
-
-      if (object instanceof Element)
-      {
-        return ((Element) object).getLocalName();
-      }
-    }
-
-    return result;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractExtensionsSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractExtensionsSection.java
deleted file mode 100644
index 8a80a25..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractExtensionsSection.java
+++ /dev/null
@@ -1,615 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.List;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.SashForm;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.events.MouseTrackAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddExtensionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.AddExtensionsComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.DOMExtensionDetailsContentProvider;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.DOMExtensionItemMenuListener;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.ExtensionDetailsViewer;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.ExtensionsSchemasRegistry;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.SpecificationForExtensionsSchema;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public abstract class AbstractExtensionsSection extends AbstractSection
-{
-  protected ExtensionDetailsViewer extensionDetailsViewer;
-  protected TreeViewer extensionTreeViewer;
-  protected ITreeContentProvider extensionTreeContentProvider;
-  protected ILabelProvider extensionTreeLabelProvider;
-  protected Label contentLabel;
-  protected ISelectionChangedListener elementSelectionChangedListener;
-  protected IDocumentChangedNotifier documentChangeNotifier;
-  protected INodeAdapter internalNodeAdapter = new InternalNodeAdapter();
-
-  private Composite page;
-  protected Button addButton, removeButton;
-  private Object prevInput;
-  private SpecificationForExtensionsSchema prevCategory;
-
-  /**
-   * 
-   */
-  public AbstractExtensionsSection()
-  {
-    super();    
-  }
-  
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    extensionDetailsViewer.setCommandStack(getCommandStack());
-  }
-  
-  class InternalNodeAdapter implements INodeAdapter
-  {
-
-    public boolean isAdapterForType(Object type)
-    {
-      // this method should never be called
-      // we don't use objects of this class as 'standard' adapters
-      return true;
-    }
-
-    public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-    {     
-      boolean isRoot = false;
-      if (notifier instanceof Element)
-      {
-        if (isTreeViewerInputElement((Element)notifier))// TODO
-        {
-          isRoot = true;
-          extensionTreeViewer.refresh(extensionTreeViewer.getInput());
-        }  
-      }
-      if (!isRoot)
-      {  
-        extensionTreeViewer.refresh(notifier);
-        if ( newValue instanceof Element)
-        {
-          extensionTreeViewer.expandToLevel(notifier, 1);
-          extensionTreeViewer.setSelection(new StructuredSelection(newValue));
-        }
-      }  
-    }    
-  }
-  
-  protected boolean isTreeViewerInputElement(Element element)
-  {
-    return false;
-  }
-
-  public void createContents(Composite parent)
-  {
-    // TODO (cs) add assertion
-    if (extensionTreeContentProvider == null)
-       return;
-    
-    IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-    documentChangeNotifier = (IDocumentChangedNotifier)editor.getAdapter(IDocumentChangedNotifier.class);
-    
-    if (documentChangeNotifier != null)
-    {
-      documentChangeNotifier.addListener(internalNodeAdapter);
-    }  
-    
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 1;
-    composite.setLayout(gridLayout);
-
-    GridData gridData = new GridData();
-
-    page = getWidgetFactory().createComposite(composite);
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 1;
-    page.setLayout(gridLayout);
-
-    gridData = new GridData();
-    gridData.grabExcessHorizontalSpace = true;
-    gridData.grabExcessVerticalSpace = true;
-    gridData.verticalAlignment = GridData.FILL;
-    gridData.horizontalAlignment = GridData.FILL;
-    page.setLayoutData(gridData);
-    
-    SashForm sashForm = new SashForm(page, SWT.HORIZONTAL);
-    // Try to limit the initial width of the section
-    
-    int w = SWT.DEFAULT;
-    try
-    {
-      IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-
-      // Find the width of the Tabbed Property Sheet's composite excluding the tab
-      if (part instanceof PropertySheet)
-      {
-        PropertySheet sheet = (PropertySheet)part;
-        if (sheet.getCurrentPage() instanceof TabbedPropertySheetPage)
-        {
-          TabbedPropertySheetPage tabbedPage = (TabbedPropertySheetPage)sheet.getCurrentPage();
-          Composite targetComposite = null;
-          if (tabbedPage.getControl() instanceof Composite)
-          {
-            Composite c = (Composite)tabbedPage.getControl();
-            int length = c.getChildren().length;
-            for (int i = 0; i < length; i++)
-            {
-              Control ctrl = c.getChildren()[i];
-              int length2  = (((Composite)ctrl).getChildren()).length;
-              for (int j = 0; j < length2; j++ )
-              {
-                if ((((Composite)ctrl).getChildren())[j] instanceof ScrolledComposite)
-                {
-                  targetComposite = (Composite)(((Composite)ctrl).getChildren())[j];
-                  break;
-                }
-              }
-            }
-          }
-          if (targetComposite != null)
-          {
-            w = targetComposite.getSize().x - 20;  // ensure scrollbars don't show
-          }
-          // The above can be accomplished by the following code
-          // but because TabbedPropertyComposite is in an internal package, I will get a discouraged
-          // access warning.
-          // w = ((TabbedPropertyComposite)(tabbedPage.getControl())).getTabComposite().getSize().x;
-        }
-      }
-    }
-    catch(Exception e)
-    {
-      w = SWT.DEFAULT;
-    }
-    gridData = new GridData();
-    gridData.grabExcessHorizontalSpace = true;
-    gridData.grabExcessVerticalSpace = true;
-    gridData.verticalAlignment = GridData.FILL;
-    gridData.horizontalAlignment = GridData.FILL;
-    // The initial size should be set, not the widthHint, which forces the width
-    // to remain constant.
-    sashForm.setSize(w, SWT.DEFAULT);
-    sashForm.setLayoutData(gridData);
-    sashForm.setForeground(ColorConstants.white);
-    sashForm.setBackground(ColorConstants.white);
-    Control[] children = sashForm.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      children[i].setVisible(false);
-    }
-    Composite leftContent = getWidgetFactory().createComposite(sashForm, SWT.FLAT);
-    gridLayout = new GridLayout();
-    gridLayout.numColumns = 1;
-    leftContent.setLayout(gridLayout);
-
-    Section section = getWidgetFactory().createSection(leftContent, SWT.FLAT | ExpandableComposite.TITLE_BAR);
-    section.setText(Messages._UI_LABEL_EXTENSIONS);
-    section.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    Composite tableAndButtonComposite = getWidgetFactory().createComposite(leftContent, SWT.FLAT);
-    tableAndButtonComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-    gridLayout = new GridLayout();
-    gridLayout.numColumns = 2;
-    tableAndButtonComposite.setLayout(gridLayout);    
-    
-    extensionTreeViewer = new TreeViewer(tableAndButtonComposite, SWT.FLAT | SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.LINE_SOLID);
-    MenuManager menuManager = new MenuManager();    
-    extensionTreeViewer.getTree().setMenu(menuManager.createContextMenu(extensionTreeViewer.getTree()));
-    menuManager.addMenuListener(new DOMExtensionItemMenuListener(extensionTreeViewer));
-    
-    gridLayout = new GridLayout();
-    gridLayout.numColumns = 1;
-    extensionTreeViewer.getTree().setLayout(gridLayout);
-    gridData = new GridData();
-    gridData.grabExcessHorizontalSpace = true;
-    gridData.grabExcessVerticalSpace = true;
-    gridData.verticalAlignment = GridData.FILL;
-    gridData.horizontalAlignment = GridData.FILL;
-   
-    extensionTreeViewer.getTree().setLayoutData(gridData);
-    extensionTreeViewer.setContentProvider(extensionTreeContentProvider);
-    extensionTreeViewer.setLabelProvider(extensionTreeLabelProvider);
-    elementSelectionChangedListener = new ElementSelectionChangedListener();
-    extensionTreeViewer.addSelectionChangedListener(elementSelectionChangedListener);
-    extensionTreeViewer.getTree().addMouseTrackListener(new MouseTrackAdapter()
-    {
-      public void mouseHover(org.eclipse.swt.events.MouseEvent e)
-      {
-        ISelection selection = extensionTreeViewer.getSelection();
-        if (selection instanceof StructuredSelection)
-        {
-          Object obj = ((StructuredSelection) selection).getFirstElement();
-          if (obj instanceof Element)
-          {
-            Element element = (Element) obj;
-            ExtensionsSchemasRegistry registry = getExtensionsSchemasRegistry();
-            // ApplicationSpecificSchemaProperties[] properties =
-            // registry.getAllApplicationSpecificSchemaProperties();
-            // ApplicationSpecificSchemaProperties[] properties =
-            // (ApplicationSpecificSchemaProperties[])
-            // registry.getAllApplicationSpecificSchemaProperties().toArray(new
-            // ApplicationSpecificSchemaProperties[0]);
-            List properties = registry.getAllExtensionsSchemasContribution();
-
-            int length = properties.size();
-            for (int i = 0; i < length; i++)
-            {
-              SpecificationForExtensionsSchema current = (SpecificationForExtensionsSchema) properties.get(i);
-              if (current.getNamespaceURI().equals(element.getNamespaceURI()))
-              {
-                extensionTreeViewer.getTree().setToolTipText(current.getDescription());
-                break;
-              }
-            }
-          }
-        }
-      }
-
-    });
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(extensionTreeViewer.getControl(),
-    		XSDEditorCSHelpIds.EXTENSIONS_TAB__EXTENSIONS); 
-    
-    Composite buttonComposite = getWidgetFactory().createComposite(tableAndButtonComposite, SWT.FLAT);
-    //ColumnLayout columnLayout = new ColumnLayout();
-    //buttonComposite.setLayout(columnLayout);
-    buttonComposite.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 1;
-    gridLayout.makeColumnsEqualWidth = true;
-    buttonComposite.setLayout(gridLayout);
-    
-    addButton = getWidgetFactory().createButton(buttonComposite, Messages._UI_ACTION_ADD_WITH_DOTS, SWT.FLAT);   
-    addButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-    addButton.addSelectionListener(this);
-    addButton.setToolTipText(Messages._UI_ACTION_ADD_EXTENSION_COMPONENT);
-    //addButton.setLayoutData(new ColumnLayoutData(ColumnLayoutData.FILL));
-    addButton.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(addButton,
-    		XSDEditorCSHelpIds.EXTENSIONS_TAB__ADD);     
-    
-    removeButton = getWidgetFactory().createButton(buttonComposite, Messages._UI_ACTION_DELETE, SWT.FLAT);
-    removeButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-    removeButton.addSelectionListener(this);
-    removeButton.setToolTipText(Messages._UI_ACTION_DELETE_EXTENSION_COMPONENT);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(removeButton,
-    		XSDEditorCSHelpIds.EXTENSIONS_TAB__DELETE);   
-    
-    //removeButton.setLayoutData(new ColumnLayoutData(ColumnLayoutData.FILL));
-
-    // TODO (cs) uncomment the up/down button when we have time to implement
-    //
-    //Button up = getWidgetFactory().createButton(buttonComposite, Messages._UI_LABEL_UP, SWT.FLAT);
-    //up.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    
-    //Button down = getWidgetFactory().createButton(buttonComposite, Messages._UI_LABEL_DOWN, SWT.FLAT);
-    //down.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
-    Composite rightContent = getWidgetFactory().createComposite(sashForm, SWT.FLAT);
-    Section section2 = getWidgetFactory().createSection(rightContent, SWT.FLAT | ExpandableComposite.TITLE_BAR);
-    section2.setText(Messages._UI_LABEL_EXTENSION_DETAILS);
-    section2.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    //contentLabel = getWidgetFactory().createLabel(rightContent, "Content");
-
-    Composite testComp = getWidgetFactory().createComposite(rightContent, SWT.FLAT);
-
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.marginLeft = 0;
-    gridLayout.marginRight = 0;
-    gridLayout.numColumns = 1;
-    gridLayout.marginHeight = 3;
-    gridLayout.marginWidth = 3;
-    rightContent.setLayout(gridLayout);
-
-    gridData = new GridData();
-    gridData.grabExcessHorizontalSpace = true;
-    gridData.grabExcessVerticalSpace = true;
-    gridData.verticalAlignment = GridData.FILL;
-    gridData.horizontalAlignment = GridData.FILL;
-    rightContent.setLayoutData(gridData);
-
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginLeft = 0;
-    gridLayout.marginRight = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.marginHeight = 3;
-    gridLayout.marginWidth = 3;
-    gridLayout.numColumns = 2;
-    testComp.setLayout(gridLayout);
-
-    gridData = new GridData();
-    gridData.grabExcessHorizontalSpace = true;
-    gridData.grabExcessVerticalSpace = true;
-    gridData.verticalAlignment = GridData.FILL;
-    gridData.horizontalAlignment = GridData.FILL;
-    testComp.setLayoutData(gridData);
-
-    createElementContentWidget(testComp);
-
-    int[] weights = { 40, 60 };
-    sashForm.setWeights(weights);
-  }
-
-  protected void createElementContentWidget(Composite parent)
-  {
-    extensionDetailsViewer = new ExtensionDetailsViewer(parent, getWidgetFactory());
-    extensionDetailsViewer.setContentProvider(new DOMExtensionDetailsContentProvider());    
-    extensionDetailsViewer.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(extensionDetailsViewer.getControl(),
-    		XSDEditorCSHelpIds.EXTENSIONS_TAB__EXTENSIONS_DETAILS);   
-  }
-  
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    setListenerEnabled(false);
-    if (input != null)
-    {
-      if ( prevInput == input)
-    	  return;
-      else
-    	  prevInput = input;
-      
-      Tree tree = extensionTreeViewer.getTree();
-      extensionDetailsViewer.setInput(null);
-      tree.removeAll();
-      
-      addButton.setEnabled(!isReadOnly);
-      
-      extensionTreeViewer.setInput(input);
-      if (tree.getSelectionCount() == 0 && tree.getItemCount() > 0)
-      {       
-        TreeItem treeItem = tree.getItem(0);     
-        extensionTreeViewer.setSelection(new StructuredSelection(treeItem.getData()));
-      }
-      removeButton.setEnabled(tree.getSelectionCount() > 0  && !isReadOnly);
-      // Bugzilla 197315.  Make this bulletproof for maintenance release.
-      Control detailsViewerControl = extensionDetailsViewer.getControl();
-      if (detailsViewerControl != null && !detailsViewerControl.isDisposed())
-      {
-        detailsViewerControl.setEnabled(!isReadOnly);
-      }
-    }
-    setListenerEnabled(true);
-  }
-
-  public Composite getPage()
-  {
-    return page;
-  }
-
-  protected abstract AddExtensionCommand getAddExtensionCommand(Object o);
-  protected abstract Command getRemoveExtensionCommand(Object o);  
-  protected abstract ExtensionsSchemasRegistry getExtensionsSchemasRegistry();
-  
-  protected AddExtensionsComponentDialog createAddExtensionsComponentDialog()
-  {
-    return new AddExtensionsComponentDialog(composite.getShell(), getExtensionsSchemasRegistry());
-  }
-    
-  public void widgetSelected(SelectionEvent event)
-  {
-    if (event.widget == addButton)
-    {
-      ExtensionsSchemasRegistry registry = getExtensionsSchemasRegistry();
-      AddExtensionsComponentDialog dialog = createAddExtensionsComponentDialog();
-
-      List properties = registry.getAllExtensionsSchemasContribution();
-
-      dialog.setInput(properties);
-      dialog.setBlockOnOpen(true);
-      dialog.setPrefStore( getPrefStore() );
-      
-      if (prevCategory != null)
-    	  dialog.setInitialCategorySelection(prevCategory);
-
-      if (dialog.open() == Window.OK)
-      {
-        Object newSelection = null;          
-        Object[] result = dialog.getResult();      
-        if (result != null)
-        {
-          SpecificationForExtensionsSchema extensionsSchemaSpec = (SpecificationForExtensionsSchema) result[1];
-          AddExtensionCommand addExtensionCommand = getAddExtensionCommand(result[0]);
-          if (addExtensionCommand != null)
-          {  
-            addExtensionCommand.setSchemaProperties(extensionsSchemaSpec);
-            if (getCommandStack() != null)
-            {
-              getCommandStack().execute(addExtensionCommand);
-              newSelection = addExtensionCommand.getNewObject();
-            }
-          }
-        }
-        //refresh();
-        if (newSelection != null)
-        {
-          extensionTreeViewer.setSelection(new StructuredSelection(newSelection));
-        }
-      }
-
-      prevCategory = dialog.getSelectedCategory();
-    }
-    else if (event.widget == removeButton)
-    {
-      ISelection selection = extensionTreeViewer.getSelection();
-      
-      if (selection instanceof StructuredSelection)
-      {
-        Object o = ((StructuredSelection) selection).getFirstElement();
-        Command command = getRemoveExtensionCommand(o);            
-        if (getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-        }
-      }
-    }
-    else if (event.widget == extensionTreeViewer.getTree())
-    {
-
-    }
-  }
-
-  // TODO make this one an abstract method. XSDEditor and WSDLEditor should return
-  // diferent IpreferenceStore objects
-  protected IPreferenceStore getPrefStore() {
-	return null;
-  }
-
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-
-  }
-
-  public boolean shouldUseExtraSpace()
-  {
-    return true;
-  }
-
-  public void dispose()
-  {
-    if (documentChangeNotifier != null)
-      documentChangeNotifier.removeListener(internalNodeAdapter);
-  }
- 
-
-  Node selectedNode;
-
-  class ElementSelectionChangedListener implements ISelectionChangedListener
-  {
-    public void selectionChanged(SelectionChangedEvent event)
-    {   
-      boolean isDeleteEnabled = false;
-      ISelection selection = event.getSelection();
-      if (selection instanceof StructuredSelection)
-      {
-        StructuredSelection structuredSelection = (StructuredSelection)selection;
-        if (structuredSelection.size() > 0)
-        {  
-          Object obj = structuredSelection.getFirstElement();
-          if (obj instanceof Node)
-          {
-            selectedNode = (Node) obj;
-            extensionDetailsViewer.setInput(obj);
-            isDeleteEnabled = true;         
-          }
-        }  
-        else
-        {
-          // if nothing is selected then don't show any details
-          //
-          extensionDetailsViewer.setInput(null);
-        }
-
-        // Upon element selection, the details view populates fine, but there is no vertical scrollbar,
-        // so it misleads the user into thinking there are no other attributes available
-        // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=174073
-        // This is a workaround to force a layout of the tab composite
-        IWorkbenchPart part = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart();
-        if (part instanceof PropertySheet)
-        {
-          PropertySheet sheet = (PropertySheet)part;
-          if (sheet.getCurrentPage() instanceof TabbedPropertySheetPage)
-          {
-            TabbedPropertySheetPage tabbedPage = (TabbedPropertySheetPage)sheet.getCurrentPage();
-            if (tabbedPage.getControl() instanceof Composite)
-            {
-              Composite c = (Composite)tabbedPage.getControl();
-              Point p = c.getSize();
-              // c.layout(true, true) doesn't appear to work.
-              // But this forces a relayout:
-              c.setSize(p.x, p.y + 1);
-              // Change the size back to the original
-              c.setSize(p.x, p.y);
-            }
-          }
-        }
-      }
-      removeButton.setEnabled(isDeleteEnabled && !isReadOnly);
-    }
-  }
-
-  public ITreeContentProvider getExtensionTreeContentProvider()
-  {
-    return extensionTreeContentProvider;
-  }
-
-  public void setExtensionTreeContentProvider(ITreeContentProvider extensionTreeContentProvider)
-  {
-    this.extensionTreeContentProvider = extensionTreeContentProvider;
-  }
-
-  public ILabelProvider getExtensionTreeLabelProvider()
-  {
-    return extensionTreeLabelProvider;
-  }
-
-  public void setExtensionTreeLabelProvider(ILabelProvider extensionTreeLabelProvider)
-  {
-    this.extensionTreeLabelProvider = extensionTreeLabelProvider;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSection.java
deleted file mode 100644
index 9f2362b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSection.java
+++ /dev/null
@@ -1,396 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.SubContributionManager;
-import org.eclipse.jface.action.SubStatusLineManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.PaintEvent;
-import org.eclipse.swt.events.PaintListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.GC;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.ISharedImages;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.FormColors;
-import org.eclipse.ui.ide.FileStoreEditorInput;
-import org.eclipse.ui.views.properties.tabbed.AbstractPropertySection;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDComponent;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public abstract class AbstractSection extends AbstractPropertySection implements SelectionListener, Listener
-{
-  protected Composite composite;
-  protected PaintListener painter;
-  protected XSDSchema xsdSchema;
-  protected Object input;
-  protected boolean isReadOnly;
-  protected boolean listenerEnabled = true;
-  protected boolean isSimple;
-  protected CustomListener customListener = new CustomListener();
-  protected IEditorPart owningEditor;
-  private IStatusLineManager statusLine;
-  protected boolean isTraversing = false;
-  
-  public static final Image ICON_ERROR = XSDEditorPlugin.getDefault().getWorkbench().getSharedImages().getImage(ISharedImages.IMG_OBJS_ERROR_TSK);
-  
-  public AbstractSection()
-  {
-    super();
-  }
-  
-  public void createControls(Composite parent, TabbedPropertySheetPage aTabbedPropertySheetPage)
-  {
-    super.createControls(parent, aTabbedPropertySheetPage);
-    isSimple = getIsSimple();
-    createContents(parent);
-  }
-  
-  protected abstract void createContents(Composite parent);
-
-    protected PaintListener createPainter() {
-        return new PaintListener() {
-
-            public void paintControl(PaintEvent e) {
-//                Rectangle bounds = composite.getClientArea();
-                GC gc = e.gc;
-
-                gc.setForeground(gc.getBackground());
-                gc.setBackground(getWidgetFactory().getColors().getColor(
-                    FormColors.TB_BG));
-
-//                gc.fillGradientRectangle(4 + bounds.width / 2, 0,
-//                    bounds.width / 2 - 9, bounds.height, false);
-
-                gc.setForeground(getWidgetFactory().getColors().getColor(
-                    FormColors.TB_BORDER));
-//                gc.drawLine(bounds.width - 5, 0, bounds.width - 5,
-//                    bounds.height);
-            }
-
-        };
-
-    }
-    
-    public void dispose()
-    {
-        if (composite != null && ! composite.isDisposed() && painter != null)
-            composite.removePaintListener(painter);
-        
-        super.dispose();
-    }
-
-    public void setInput(IWorkbenchPart part, ISelection selection)
-    {
-        super.setInput(part, selection);
-        isSimple = getIsSimple();
-        Object input = ((IStructuredSelection)selection).getFirstElement();
-        this.input = input;
-        
-        if (input instanceof XSDConcreteComponent)
-        {
-          xsdSchema = ((XSDConcreteComponent)input).getSchema();
-        }
-        
-        // set owning editor of this section
-        if (part!=null)
-        {
-            if (part instanceof IEditorPart)
-            {
-                owningEditor = (IEditorPart)part;
-            }
-            else
-            {
-                owningEditor = part.getSite().getWorkbenchWindow().getActivePage().getActiveEditor();
-            }
-        }
-        if (xsdSchema == owningEditor.getAdapter(XSDSchema.class))
-        {
-          isReadOnly = false;
-        }
-        else
-        {
-          isReadOnly = true;
-        }
-
-        IEditorInput editorInput = owningEditor.getEditorInput();
-        if (!(editorInput instanceof IFileEditorInput || editorInput instanceof FileStoreEditorInput))
-        {
-          isReadOnly = true;
-        }
-    }
-
-    public void refresh()
-    {
-      super.refresh();
-      composite.setEnabled(!isReadOnly);
-    }
-
-    public void applyAllListeners(Control control)
-    {
-      control.addListener(SWT.Modify, customListener);
-      control.addListener(SWT.FocusOut, customListener);
-      control.addListener(SWT.KeyDown, customListener);
-    }
-    
-    public void applyModifyListeners(Control control)
-    {
-      control.addListener(SWT.Modify, customListener);
-      control.addListener(SWT.FocusOut, customListener);
-    }
-
-    public void applyKeyListener(Control control)
-    {
-      control.addListener(SWT.KeyDown, customListener);
-    }
-
-    public void removeListeners(Control control)
-    {
-      control.removeListener(SWT.Modify, customListener);
-      control.removeListener(SWT.FocusOut, customListener);
-      control.removeListener(SWT.KeyDown, customListener);
-    }
-    
-    public void doWidgetDefaultSelected(SelectionEvent e)
-    {}
-    
-    public void doWidgetSelected(SelectionEvent e)
-    {}
-
-    public void widgetSelected(SelectionEvent e)
-    {
-      if (isListenerEnabled() &&
-          input != null &&
-          !isReadOnly) 
-      {
-        doWidgetSelected(e);
-      }
-    }
-
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      if (isListenerEnabled() &&
-          input != null &&
-          !isReadOnly) 
-      {
-        doWidgetDefaultSelected(e);
-      }
-    }
-
-    /**
-     * Get the value of listenerEnabled.
-     * @return value of listenerEnabled.
-     */
-    public boolean isListenerEnabled() 
-    {
-      return listenerEnabled;
-    }
-    
-    /**
-     * Set the value of listenerEnabled.
-     * @param v  Value to assign to listenerEnabled.
-     */
-    public void setListenerEnabled(boolean  v) 
-    {
-      this.listenerEnabled = v;
-    }
-
-    /**
-     * Sent when an event that the receiver has registered for occurs.
-     *
-     * @param event the event which occurred
-     */
-    public void handleEvent(Event event)
-    {
-      if (isListenerEnabled() && !isReadOnly) 
-      {
-        doHandleEvent(event);
-      }
-    }
-
-    /**
-     * Subclasses should override
-     * @param event
-     */
-    protected void doHandleEvent(Event event)
-    {
-    }
-
-    protected IEditorPart getActiveEditor()
-    {
-      IWorkbench workbench = PlatformUI.getWorkbench();
-      IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-      IEditorPart editorPart = workbenchWindow.getActivePage().getActiveEditor();
-      this.owningEditor = editorPart;
-      return editorPart;
-    }
-    
-    public CommandStack getCommandStack()
-    {
-      Object commandStack = owningEditor.getAdapter(CommandStack.class); 
-          
-      if (commandStack==null)
-          return null;
-      else
-          return (CommandStack)commandStack;
-    }
-    
-    public boolean getIsSimple()
-    {
-      return false;
-    }
-    
-    
-    
-    /**
-     * Intended to display error messages.
-     * @return
-     */
-    private IStatusLineManager getStatusLineManager()
-    {
-      if (statusLine==null && getPart()!=null)
-      {
-        if(getPart().getSite() instanceof IEditorSite)
-          statusLine = ((IEditorSite)getPart().getSite()).getActionBars().getStatusLineManager();
-        else if (getPart().getSite() instanceof IViewSite)
-          statusLine = ((IViewSite)getPart().getSite()).getActionBars().getStatusLineManager();
-        
-        /* 
-         * We must manually set the visibility of the status line since the action bars are from the editor
-         * which means the status line only shows up when the editor is in focus (by default).
-         * Note only a SubStatusLineManager can set the visibility.
-         */
-        if (statusLine instanceof SubStatusLineManager)
-          ((SubStatusLineManager)statusLine).setVisible(true);
-      }
-      
-      return statusLine;
-    }
-
-    /**
-     * Display an error message in the status line.
-     * Call setErrorMessage(null) to clear the status line.
-     * @param text 
-     */
-    public void setErrorMessage(String text)
-    {
-      IStatusLineManager statusLine = getStatusLineManager();
-
-      if (statusLine!=null)
-      {
-        if (text==null || text.length()<1)
-          statusLine.setErrorMessage(null);
-        else
-          statusLine.setErrorMessage(ICON_ERROR, text);
-
-        // ensure our message gets displayed
-        if (statusLine instanceof SubContributionManager)
-          ((SubContributionManager)statusLine).setVisible(true);
-        
-        statusLine.update(true);
-      }
-    }
-
-    
-    protected EObject getModel()
-    {
-      return (XSDComponent)input;
-    }
-
-    
-    class CustomListener implements Listener
-    {
-      boolean handlingEvent = false;
-      public void handleEvent(Event event)
-      {
-        if (isListenerEnabled() && !isReadOnly) 
-        {
-          switch (event.type)
-          {
-            case SWT.KeyDown :
-            {
-              if (event.character == SWT.CR)
-              {
-                if (!handlingEvent)
-                {
-                  handlingEvent = true;
-                  doHandleEvent(event);
-                  handlingEvent = false;
-                }
-              }
-              break;
-            }
-            case SWT.FocusOut :
-            {
-              if (!handlingEvent)
-              {
-                handlingEvent = true;
-                doHandleEvent(event);
-                handlingEvent = false;
-              }
-              break;
-            }
-          }
-        }
-      }
-    }
-    
-    protected boolean shouldPerformComboSelection(int eventType, Object selectedItem)
-    {
-      // if traversing through combobox, don't automatically pop up
-      // the browse and new dialog boxes
-      boolean wasTraversing = isTraversing;
-      if (isTraversing)
-        isTraversing = false;
-
-      // we only care about default selecting (hitting enter in combobox)
-      // for browse.. and new.. otherwise, selection event will be fired
-      if (eventType == SWT.DefaultSelection)
-      {
-        if (selectedItem instanceof String && ((Messages._UI_ACTION_BROWSE.equals(selectedItem) || Messages._UI_ACTION_NEW.equals(selectedItem))))
-          return true;
-        return false;
-      }
-
-      // if was traversing and got selection event, do nothing if it's 
-      // browse.. or new..
-      if (wasTraversing && selectedItem instanceof String)
-      {
-        if (Messages._UI_ACTION_BROWSE.equals(selectedItem) || Messages._UI_ACTION_NEW.equals(selectedItem))
-        {
-          return false;
-        }
-      }
-      return true;
-    }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSectionDescriptor.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSectionDescriptor.java
deleted file mode 100644
index e0b33bb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AbstractSectionDescriptor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.ISection;
-import org.eclipse.ui.views.properties.tabbed.ISectionDescriptor;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-public class AbstractSectionDescriptor implements ISectionDescriptor
-{
-  /**
-   * 
-   */
-  public AbstractSectionDescriptor()
-  {
-    super();
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getId()
-   */
-  public String getId()
-  {
-    return ""; //$NON-NLS-1$
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getFilter()
-   */
-  public IFilter getFilter()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getInputTypes()
-   */
-  public List getInputTypes()
-  {
-    List list = new ArrayList();
-    list.add(XSDConcreteComponent.class);
-    return list;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getSectionClass()
-   */
-  public ISection getSectionClass()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getTargetTab()
-   */
-  public String getTargetTab()
-  {
-    return null;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#appliesTo(org.eclipse.ui.IWorkbenchPart, org.eclipse.jface.viewers.ISelection)
-   */
-  public boolean appliesTo(IWorkbenchPart part, ISelection selection)
-  {
-    Object object = null;
-    if (selection instanceof StructuredSelection)
-    {
-      StructuredSelection structuredSelection = (StructuredSelection)selection;
-      object = structuredSelection.getFirstElement();
-      if (object instanceof XSDConcreteComponent || object instanceof Element)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISectionDescriptor#getAfterSection()
-   */
-  public String getAfterSection()
-  {
-    return ""; //$NON-NLS-1$
-  }
-
-  
-  public int getEnablesFor()
-  {
-	return ENABLES_FOR_ANY;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AnnotationSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AnnotationSection.java
deleted file mode 100644
index 8de7f40..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/AnnotationSection.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddDocumentationCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class AnnotationSection extends AbstractSection
-{
-  Text simpleText;
-
-  public void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    simpleText = getWidgetFactory().createText(composite, "", SWT.V_SCROLL | SWT.H_SCROLL); //$NON-NLS-1$
-    simpleText.addListener(SWT.Modify, this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(simpleText,
-    		XSDEditorCSHelpIds.DOCUMENTATION_TAB__NO_LABEL); 
-    
-
-    FormData data = new FormData();
-    data.left = new FormAttachment(0, 1);
-    data.right = new FormAttachment(100, -1);
-    data.top = new FormAttachment(0, 1);
-    data.bottom = new FormAttachment(100, -1);
-    simpleText.setLayoutData(data);
-  }
-
-  public AnnotationSection()
-  {
-    super();
-  }
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    super.refresh();
-    
-    if (simpleText.isFocusControl()) return;
-    setListenerEnabled(false);
-    if (input instanceof XSDConcreteComponent)
-    {
-      XSDAnnotation xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation((XSDConcreteComponent) input, false);
-      setInitialText(xsdAnnotation);
-    }
-    setListenerEnabled(true);
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    if (input instanceof XSDConcreteComponent)
-    {
-      if (event.widget == simpleText)
-      {
-        AddDocumentationCommand command = new AddDocumentationCommand(Messages._UI_ACTION_ADD_DOCUMENTATION, null, (XSDConcreteComponent) input, simpleText.getText(), ""); //$NON-NLS-1$
-        getCommandStack().execute(command);
-      }
-    }
-
-  }
-
-  public boolean shouldUseExtraSpace()
-  {
-    return true;
-  }
-
-  public void dispose()
-  {
-
-  }
-
-  private void setInitialText(XSDAnnotation an)
-  {
-    if (an != null)
-    {
-      try
-      {
-        List documentationList = an.getUserInformation();
-        if (documentationList.size() > 0)
-        {
-          Element docElement = (Element) documentationList.get(0);
-          if (docElement != null)
-          {
-            simpleText.setText(doSerialize(docElement));
-          }
-        }
-        else
-        {
-            simpleText.setText("");
-        }
-      }
-      catch (Exception e)
-      {
-
-      }
-    }
-    else
-    {
-      simpleText.setText(""); //$NON-NLS-1$
-    }
-  }
-
-  private String doSerialize(Element element) throws IOException
-  {
-    String source = ""; //$NON-NLS-1$
-
-    Node firstChild = element.getFirstChild();
-    Node lastChild = element.getLastChild();
-    int start = 0;
-    int end = 0;
-
-    if (element instanceof IDOMElement)
-    {
-      IDOMElement domElement = (IDOMElement) element;
-      IDOMModel model = domElement.getModel();
-      IDOMDocument doc = model.getDocument();
-
-      if (firstChild instanceof IDOMNode)
-      {
-        IDOMNode first = (IDOMNode) firstChild;
-        start = first.getStartOffset();
-      }
-      if (lastChild instanceof IDOMNode)
-      {
-        IDOMNode last = (IDOMNode) lastChild;
-        end = last.getEndOffset();
-      }
-      source = doc.getSource().substring(start, end);
-    }
-
-    return source;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/CommonDirectivesSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/CommonDirectivesSection.java
deleted file mode 100644
index e301ebb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/CommonDirectivesSection.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.HashMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDParser;
-
-public abstract class CommonDirectivesSection extends AbstractSection
-{
-  Text schemaLocationText;
-  Button wizardButton;
-  StyledText errorText;
-  Color red;
-  protected boolean isValidSchemaLocation = true;
-
-  // TODO: common up code with XSDSelectIncludeFileWizard
-  public void doHandleEvent(Event event)
-  {
-    errorText.setText(""); //$NON-NLS-1$
-
-    if (event.widget == schemaLocationText)
-    {
-        String errorMessage = ""; //$NON-NLS-1$
-        isValidSchemaLocation = true;
-        String xsdModelFile = schemaLocationText.getText();
-        String namespace = ""; //$NON-NLS-1$
-        XSDSchema externalSchema = null;
-        
-        if (xsdModelFile.length() == 0)
-        {
-          handleSchemaLocationChange(xsdModelFile, "", null); //$NON-NLS-1$
-          return;
-        }
-
-        try
-        {
-          IFile currentIFile = null;
-          IEditorInput editorInput = getActiveEditor().getEditorInput();
-          if (editorInput instanceof IFileEditorInput)
-          {
-            currentIFile = ((IFileEditorInput)editorInput).getFile();
-          }
-          
-          URI newURI = URI.createURI(xsdModelFile);
-          String xsdFile = URIHelper.getRelativeURI(newURI.toString(), currentIFile.getFullPath().toString());
-          final String normalizedXSDFile = URIHelper.normalize(xsdFile, currentIFile.getLocation().toString(), ""); //$NON-NLS-1$
-          final String normalizedURI = URI.encodeFragment(URIHelper.addImpliedFileProtocol(normalizedXSDFile), true).toString();
-          XSDParser parser = new XSDParser(new HashMap());
-          parser.parse(normalizedURI);
-          externalSchema = parser.getSchema();
-
-          if (externalSchema != null)
-          {
-            String extNamespace = externalSchema.getTargetNamespace();
-            if (extNamespace == null) extNamespace = ""; //$NON-NLS-1$
-            namespace = extNamespace;
-            
-            if (externalSchema.getDiagnostics() != null &&
-                externalSchema.getDiagnostics().size() > 0)
-            {
-              isValidSchemaLocation = false;
-              errorMessage = XSDEditorPlugin.getResourceString("_UI_INCORRECT_XML_SCHEMA", xsdModelFile); //$NON-NLS-1$
-            }  
-            else
-            {
-              String currentNameSpace = xsdSchema.getTargetNamespace();
-              if (input instanceof XSDInclude || input instanceof XSDRedefine)
-              {  
-                // Check the namespace to make sure they are the same as current file
-                if (extNamespace != null)
-                {
-                  if (currentNameSpace != null && !extNamespace.equals(currentNameSpace))
-                  {
-                    errorMessage = XSDEditorPlugin.getResourceString("_UI_DIFFERENT_NAME_SPACE", xsdModelFile); //$NON-NLS-1$
-                    isValidSchemaLocation = false;
-                  }
-                }
-              }
-              else
-              {  
-                // Check the namespace to make sure they are different from the current file
-                if (extNamespace != null)
-                {
-                  if (currentNameSpace != null && extNamespace.equals(currentNameSpace))
-                  {
-                    errorMessage = XSDEditorPlugin.getResourceString("_UI_SAME_NAME_SPACE", xsdModelFile); //$NON-NLS-1$
-                    isValidSchemaLocation = false;
-                  }
-                }
-              }
-            }
-          }
-          else
-          {
-            errorMessage = Messages._UI_ERROR_INVALID_FILE;
-            isValidSchemaLocation = false;
-          }
-        }
-        catch(Exception e)
-        {
-          errorMessage = Messages._UI_ERROR_INVALID_FILE;
-          isValidSchemaLocation = false;
-        }
-        finally
-        {
-          if (!isValidSchemaLocation)
-          {
-            errorText.setText(errorMessage);
-            int length = errorText.getText().length();
-            red = new Color(null, 255, 0, 0);
-            StyleRange style = new StyleRange(0, length, red, schemaLocationText.getBackground());
-            errorText.setStyleRange(style);
-          }
-          else
-          {
-            handleSchemaLocationChange(xsdModelFile, namespace, externalSchema);          
-          }
-        }
-      }
-  }
-  
-  protected void handleSchemaLocationChange(String schemaFileString, String namespace, XSDSchema externalSchema)
-  {
-    
-  }
-
-  
-  public void dispose()
-  {
-    super.dispose();
-    if (red != null)
-    {
-      red.dispose();
-      red = null;
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/EnumerationsSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/EnumerationsSection.java
deleted file mode 100644
index e8e2add..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/EnumerationsSection.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.common.ui.internal.viewers.NavigableTableViewer;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddEnumerationsCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.SetXSDFacetValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.widgets.EnumerationsDialog;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class EnumerationsSection extends AbstractSection
-{
-  private EnumerationsTableViewer enumerationsTable;
-  private Button addButton;
-  private Button addManyButton;
-  private Button deleteButton;
-
-  /**
-   * 
-   */
-  public EnumerationsSection()
-  {
-    super();
-  }
-
-  public void widgetSelected(SelectionEvent e)
-  {
-    XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
-
-    if (e.widget == addButton)
-    {
-      List enumList = st.getEnumerationFacets();
-      String newName = XSDCommonUIUtils.createUniqueEnumerationValue("value", enumList); //$NON-NLS-1$
-
-      AddEnumerationsCommand command = new AddEnumerationsCommand(Messages._UI_ACTION_ADD_ENUMERATION, (XSDSimpleTypeDefinition) input);
-      command.setValue(newName);
-      getCommandStack().execute(command);
-
-      enumerationsTable.refresh();
-      int newItemIndex = enumerationsTable.getTable().getItemCount() - 1;
-      enumerationsTable.editElement(enumerationsTable.getElementAt(newItemIndex), 0);
-    }
-    else if (e.widget == addManyButton)
-    {
-      Display display = Display.getCurrent();
-      // if it is null, get the default one
-      display = display == null ? Display.getDefault() : display;
-      Shell parentShell = display.getActiveShell();
-      EnumerationsDialog dialog = new EnumerationsDialog(parentShell);
-      dialog.setBlockOnOpen(true);
-      int result = dialog.open();
-
-      if (result == Window.OK)
-      {
-        String text = dialog.getText();
-        String delimiter = dialog.getDelimiter();
-        StringTokenizer tokenizer = new StringTokenizer(text, delimiter);
-        CompoundCommand compoundCommand = new CompoundCommand(Messages._UI_ACTION_ADD_ENUMERATIONS);
-        while (tokenizer.hasMoreTokens())
-        {
-          String token = tokenizer.nextToken();
-          if (dialog.isPreserveWhitespace() == false)
-          {
-            token = token.trim();
-          }
-          AddEnumerationsCommand command = new AddEnumerationsCommand(Messages._UI_ACTION_ADD_ENUMERATIONS, (XSDSimpleTypeDefinition) input);
-          command.setValue(token);
-          compoundCommand.add(command);
-        }
-        getCommandStack().execute(compoundCommand);
-      }
-      enumerationsTable.refresh();
-    }
-    else if (e.widget == deleteButton)
-    {
-      StructuredSelection selection = (StructuredSelection) enumerationsTable.getSelection();
-      if (selection != null)
-      {
-        Iterator i = selection.iterator();
-        CompoundCommand compoundCommand = new CompoundCommand(Messages._UI_ACTION_DELETE_ENUMERATION);
-        while (i.hasNext())
-        {
-          Object obj = i.next();
-          if (obj != null)
-          {
-            if (obj instanceof XSDEnumerationFacet)
-            {
-              XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) obj;
-
-              DeleteCommand deleteCommand = new DeleteCommand(Messages._UI_ACTION_DELETE_ENUMERATION, enumFacet);
-              compoundCommand.add(deleteCommand);
-            }
-          }
-        }
-        getCommandStack().execute(compoundCommand);
-        enumerationsTable.refresh();
-      }
-    }
-    else if (e.widget == enumerationsTable.getTable())
-    {
-      StructuredSelection selection = (StructuredSelection) enumerationsTable.getSelection();
-      if (selection.getFirstElement() != null)
-      {
-        deleteButton.setEnabled(true);
-      }
-      else
-      {
-        deleteButton.setEnabled(false);
-      }
-    }
-
-  }
-
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-
-  }
-
-  public void createContents(Composite parent)
-  {
-    TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-    composite = factory.createFlatFormComposite(parent);
-
-    enumerationsTable = new EnumerationsTableViewer(getWidgetFactory().createTable(composite, SWT.MULTI | SWT.FULL_SELECTION));
-    enumerationsTable.setInput(input);
-    Table table = enumerationsTable.getTable();
-    table.addSelectionListener(this);
-
-    addButton = getWidgetFactory().createButton(composite, XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_ADD_BUTTON_LABEL"), SWT.PUSH); //$NON-NLS-1$
-    addManyButton = getWidgetFactory().createButton(composite, XSDEditorPlugin.getXSDString("_UI_REGEX_WIZARD_ADD_BUTTON_LABEL") + "...", SWT.PUSH); //$NON-NLS-1$ //$NON-NLS-2$
-    deleteButton = getWidgetFactory().createButton(composite, XSDEditorPlugin.getXSDString("_UI_ACTION_DELETE_INCLUDE"), SWT.PUSH); //$NON-NLS-1$
-
-    FormData data2 = new FormData();
-    data2.top = new FormAttachment(0, 0);
-    data2.left = new FormAttachment(100, -100);
-    data2.right = new FormAttachment(100, 0);
-    // data2.width = 50;
-    addButton.setLayoutData(data2);
-    addButton.addSelectionListener(this);
-
-    FormData data = new FormData();
-    data.left = new FormAttachment(addButton, 0, SWT.LEFT);
-    data.right = new FormAttachment(100, 0);
-    data.top = new FormAttachment(addButton, 0);
-    addManyButton.setLayoutData(data);
-    addManyButton.addSelectionListener(this);
-
-    data = new FormData();
-    data.left = new FormAttachment(addButton, 0, SWT.LEFT);
-    data.right = new FormAttachment(100, 0);
-    data.top = new FormAttachment(addManyButton, 0);
-    deleteButton.setLayoutData(data);
-    deleteButton.setEnabled(false);
-    deleteButton.addSelectionListener(this);
-
-    data = new FormData();
-    data.top = new FormAttachment(0, 0);
-    data.left = new FormAttachment(0, 0);
-    data.right = new FormAttachment(addButton, 0);
-    data.bottom = new FormAttachment(100, 0);
-    data.width = 50;
-    table.setLayoutData(data);
-    table.addListener(SWT.Resize, this);
-  }
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    if (isReadOnly)
-    {
-      composite.setEnabled(false);
-    }
-    else
-    {
-      composite.setEnabled(true);
-    }
-    XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
-
-    Iterator validFacets = st.getValidFacets().iterator();
-
-    boolean isApplicable = false;
-    while (validFacets.hasNext())
-    {
-      String aValidFacet = (String) validFacets.next();
-      if (aValidFacet.equals(XSDConstants.ENUMERATION_ELEMENT_TAG))
-      {
-        isApplicable = true;
-      }
-    }
-
-    if (isApplicable)
-    {
-      addButton.setEnabled(true);
-      addManyButton.setEnabled(true);
-    }
-    else
-    {
-      addButton.setEnabled(false);
-      addManyButton.setEnabled(false);
-    }
-    enumerationsTable.setInput(input);
-  }
-
-  public void handleEvent(Event event)
-  {
-    Table table = enumerationsTable.getTable();
-    if (event.type == SWT.Resize && event.widget == table)
-    {
-      TableColumn tableColumn = table.getColumn(0);
-      tableColumn.setWidth(table.getSize().x);
-    }
-  }
-
-  public void dispose()
-  {
-  }
-
-  public boolean shouldUseExtraSpace()
-  {
-    return true;
-  }
-
-  class EnumerationsTableViewer extends NavigableTableViewer implements ICellModifier
-  {
-    protected String[] columnProperties = { XSDConstants.ENUMERATION_ELEMENT_TAG };
-
-    protected CellEditor[] cellEditors;
-
-    Table table;
-
-    public EnumerationsTableViewer(Table table)
-    {
-      super(table);
-      table = getTable();
-
-      table.setLinesVisible(true);
-
-      setContentProvider(new EnumerationsTableContentProvider());
-      setLabelProvider(new EnumerationsTableLabelProvider());
-      setColumnProperties(columnProperties);
-
-      setCellModifier(this);
-
-      TableColumn column = new TableColumn(table, SWT.NONE, 0);
-      column.setText(columnProperties[0]);
-      column.setAlignment(SWT.LEFT);
-      column.setResizable(true);
-
-      cellEditors = new CellEditor[1];
-
-      TableLayout layout = new TableLayout();
-      ColumnWeightData data = new ColumnWeightData(100);
-
-      layout.addColumnData(data);
-      cellEditors[0] = new TextCellEditor(table);
-
-      getTable().setLayout(layout);
-      setCellEditors(cellEditors);
-    }
-
-    public boolean canModify(Object element, String property)
-    {
-      return true;
-    }
-
-    public void modify(Object element, String property, Object value)
-    {
-      if (element instanceof TableItem && (value != null))
-      {
-        TableItem item = (TableItem) element;
-
-        XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) item.getData();
-        SetXSDFacetValueCommand command = new SetXSDFacetValueCommand(Messages._UI_ACTION_SET_ENUMERATION_VALUE, enumFacet);
-        command.setValue((String) value);
-        getCommandStack().execute(command);
-        item.setData(enumFacet);
-        item.setText((String) value);
-      }
-    }
-
-    public Object getValue(Object element, String property)
-    {
-      if (element instanceof XSDEnumerationFacet)
-      {
-        XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) element;
-        String value = enumFacet.getLexicalValue();
-        if (value == null)
-          value = ""; //$NON-NLS-1$
-        return value;
-      }
-      return ""; //$NON-NLS-1$
-    }
-
-  }
-
-  class EnumerationsTableContentProvider implements IStructuredContentProvider
-  {
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-    }
-
-    public java.lang.Object[] getElements(java.lang.Object inputElement)
-    {
-      java.util.List list = new ArrayList();
-      if (inputElement instanceof XSDSimpleTypeDefinition)
-      {
-        XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) inputElement;
-        return st.getEnumerationFacets().toArray();
-      }
-      return list.toArray();
-    }
-
-    public void dispose()
-    {
-    }
-  }
-
-  class EnumerationsTableLabelProvider extends LabelProvider implements ITableLabelProvider
-  {
-    public EnumerationsTableLabelProvider()
-    {
-
-    }
-
-    public Image getColumnImage(Object element, int columnIndex)
-    {
-      return XSDEditorPlugin.getXSDImage("icons/XSDSimpleEnum.gif"); //$NON-NLS-1$
-    }
-
-    public String getColumnText(Object element, int columnIndex)
-    {
-      if (element instanceof XSDEnumerationFacet)
-      {
-        XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) element;
-        String value = enumFacet.getLexicalValue();
-        if (value == null)
-          value = ""; //$NON-NLS-1$
-        return value;
-      }
-      return ""; //$NON-NLS-1$
-    }
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/ExtensionsSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/ExtensionsSection.java
deleted file mode 100644
index 1fad510..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/ExtensionsSection.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddExtensionAttributeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddExtensionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddExtensionElementCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ExtensibleAddExtensionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ExtensibleRemoveExtensionNodeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.RemoveExtensionNodeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.AddExtensionsComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.CategoryProvider;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.DOMExtensionTreeLabelProvider;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.ExtensionItemFilter;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.ExtensionsSchemasRegistry;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.SpecificationForExtensionsSchema;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.XSDExtensionTreeContentProvider;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeFilter;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelAdapter;
-import org.eclipse.wst.xsd.ui.internal.util.ModelReconcileAdapter;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class ExtensionsSection extends AbstractExtensionsSection
-{
-  XSDModelAdapter adapter = null;
-  
-  public ExtensionsSection()
-  {
-    super();
-    setExtensionTreeLabelProvider(new DOMExtensionTreeLabelProvider());
-    setExtensionTreeContentProvider(new XSDExtensionTreeContentProvider());
-  }
-  
-  protected AddExtensionsComponentDialog createAddExtensionsComponentDialog()
-  {
-    AddExtensionsComponentDialog dialog =  new AddExtensionsComponentDialog(composite.getShell(), getExtensionsSchemasRegistry())
-    {
-      protected IStructuredContentProvider getCategoryContentProvider()
-      {
-        return new XSDCategoryContentProvider();
-      }
-    };
-    dialog.addElementsTableFilter(new AddExtensionsComponentDialogFilter(input, dialog));    
-    return dialog;   
-  }
-   
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection); 
-    if (adapter == null)
-    {
-      if (selection instanceof StructuredSelection)
-      {
-        Object obj = ((StructuredSelection) selection).getFirstElement();
-        if (obj instanceof XSDConcreteComponent)
-        {  
-          Element element = ((XSDConcreteComponent)obj).getElement();
-          if (element != null)
-          {
-            adapter = XSDModelAdapter.lookupOrCreateModelAdapter(element.getOwnerDocument());
-            if (adapter != null)
-            {
-              ModelReconcileAdapter modelReconcileAdapter = adapter.getModelReconcileAdapter();
-              if (modelReconcileAdapter != null)
-              {
-                modelReconcileAdapter.addListener(internalNodeAdapter);
-              }
-            }  
-          }
-        }
-      }
-    }
-    extensionTreeViewer.expandToLevel(2);
-  }
-  
-  public void dispose()
-  {
-    super.dispose();
-    if (adapter != null)
-    {
-      ModelReconcileAdapter modelReconcileAdapter = adapter.getModelReconcileAdapter();
-      if (modelReconcileAdapter != null)
-      {
-        modelReconcileAdapter.removeListener(internalNodeAdapter);
-      }
-    }  
-  }
-
-  protected AddExtensionCommand getAddExtensionCommand(Object o)
-  {
-    AddExtensionCommand addExtensionCommand = null;
-    if (o instanceof XSDElementDeclaration)
-    {
-      XSDElementDeclaration element = (XSDElementDeclaration) o;
-      ExtensibleAddExtensionCommand extensibleAddExtensionCommand = getExtensionsSchemasRegistry().getAddExtensionCommand(element.getTargetNamespace());
-      if (extensibleAddExtensionCommand != null)
-      {
-        extensibleAddExtensionCommand.setInputs((XSDConcreteComponent) input, element);
-        addExtensionCommand = extensibleAddExtensionCommand;
-      }
-      else
-      {
-        addExtensionCommand = new AddExtensionElementCommand(Messages._UI_ACTION_ADD_APPINFO_ELEMENT, (XSDConcreteComponent) input, element);
-      }
-    }
-    else if (o instanceof XSDAttributeDeclaration)
-    {
-      XSDAttributeDeclaration attribute = (XSDAttributeDeclaration) o;
-      addExtensionCommand = new AddExtensionAttributeCommand(Messages._UI_ACTION_ADD_APPINFO_ATTRIBUTE, (XSDConcreteComponent) input, attribute);
-    }
-    return addExtensionCommand;
-  }
-
-  protected Command getRemoveExtensionCommand(Object o)
-  {
-    Command command = null;
-    try
-    {
-      if (o instanceof Node)
-      {
-        Node node = (Node)o;
-        ExtensibleRemoveExtensionNodeCommand removeCommand = getExtensionsSchemasRegistry().getRemoveExtensionNodeCommand(node.getNamespaceURI());
-        if (removeCommand != null)
-        {
-          removeCommand.setInput((XSDConcreteComponent)input);
-          removeCommand.setNode(node);
-          return removeCommand;
-        }
-        else
-        {
-          command = new RemoveExtensionNodeCommand(Messages._UI_ACTION_DELETE_APPINFO_ELEMENT, node);  
-          // command.execute();
-        }
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    return command;
-  }  
-  
-  protected ExtensionsSchemasRegistry getExtensionsSchemasRegistry()
-  {
-    return XSDEditorPlugin.getDefault().getExtensionsSchemasRegistry();
-  }
-  
-  protected boolean isTreeViewerInputElement(Element element)
-  {     
-    if (input instanceof XSDConcreteComponent)
-    {  
-      XSDConcreteComponent component = (XSDConcreteComponent)input;
-      Element componentElement = component.getElement();
-      Node parent = element.getParentNode();
-      Node grandParent = parent != null ? parent.getParentNode() : null;
-      return componentElement == element || componentElement == parent || componentElement == grandParent;
-    }
-    return false;
-  }
-  
-  protected IPreferenceStore getPrefStore()
-  {
-    return XSDEditorPlugin.getPlugin().getPreferenceStore();
-  }
-  
-  static class XSDCategoryContentProvider implements IStructuredContentProvider
-  {
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-     */
-    public Object[] getElements(Object inputElement)
-    {    
-      SpecificationForExtensionsSchema[] extensionsSchemaSpecs = null;
-      try
-      {
-        List inputList = (List) inputElement;
-        
-        List total = new ArrayList();
-        total.addAll(inputList);
-        
-        List dynamicCategories = XSDEditorPlugin.getPlugin().getExtensionsSchemasRegistry().getCategoryProviders();
-        for (Iterator iter = dynamicCategories.iterator(); iter.hasNext(); )
-        {
-          CategoryProvider categoryProvider = (CategoryProvider)iter.next();
-          for (Iterator it = categoryProvider.getCategories().iterator(); it.hasNext(); )
-          {
-            SpecificationForExtensionsSchema sp = (SpecificationForExtensionsSchema)it.next();
-            total.add(sp);
-          }
-        }
-
-        extensionsSchemaSpecs = (SpecificationForExtensionsSchema[]) total.toArray(new SpecificationForExtensionsSchema[0]);
-      }
-      catch (Exception e)
-      {
-      }
-      return extensionsSchemaSpecs;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose()
-    {
-      // Do nothing
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-     *      java.lang.Object, java.lang.Object)
-     */
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-      // Do nothing
-
-    }           
-  }
-  
-  /**
-   * This filter is to be used by the dialog invoked when addButton is pressed
-   */
-  protected class AddExtensionsComponentDialogFilter extends ViewerFilter
-  {
-    private Object input;
-    private AddExtensionsComponentDialog dialog;
-
-    public AddExtensionsComponentDialogFilter(Object input, AddExtensionsComponentDialog dialog)
-    {
-      this.input = input;
-      this.dialog = dialog;
-    }
-
-    public boolean select(Viewer viewer, Object parentElement, Object element)
-    {      
-      if (input instanceof XSDConcreteComponent &&
-          element instanceof XSDConcreteComponent)
-      {              
-        SpecificationForExtensionsSchema spec = dialog.getSelectedCategory();
-        // here we obtain the node filter that was registered for the applicable namespace
-        // notied
-        NodeFilter filter = XSDEditorPlugin.getPlugin().getNodeCustomizationRegistry().getNodeFilter(spec.getNamespaceURI());
-        
-        if (filter == null)
-        {
-          // Check if a node filter has been specified, if so, then use it
-          filter = spec.getNodeFilter();
-        }
-
-        if (filter instanceof ExtensionItemFilter)
-        {
-          ExtensionItemFilter extensionItemFilter = (ExtensionItemFilter)filter;
-          return extensionItemFilter.isApplicableContext((XSDConcreteComponent)input, (XSDConcreteComponent)element);               
-        }
-        else
-        {
-          // TODO cs: even if it's just a plain old NodeFilter we should still be able to use it! 
-        }
-      }
-      return true;
-    }
-  }  
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/FacetViewer.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/FacetViewer.java
deleted file mode 100644
index e13d74d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/FacetViewer.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-//import java.util.ArrayList;
-//import java.util.Iterator;
-//import java.util.List;
-//
-//import org.eclipse.jface.viewers.CellEditor;
-//import org.eclipse.jface.viewers.ColumnWeightData;
-//import org.eclipse.jface.viewers.ICellModifier;
-//import org.eclipse.jface.viewers.ISelectionChangedListener;
-//import org.eclipse.jface.viewers.IStructuredContentProvider;
-//import org.eclipse.jface.viewers.ITableLabelProvider;
-//import org.eclipse.jface.viewers.LabelProvider;
-//import org.eclipse.jface.viewers.SelectionChangedEvent;
-//import org.eclipse.jface.viewers.StructuredSelection;
-//import org.eclipse.jface.viewers.TableLayout;
-//import org.eclipse.jface.viewers.TextCellEditor;
-//import org.eclipse.jface.viewers.Viewer;
-//import org.eclipse.swt.SWT;
-//import org.eclipse.swt.events.MouseEvent;
-//import org.eclipse.swt.events.MouseTrackAdapter;
-//import org.eclipse.swt.graphics.Image;
-//import org.eclipse.swt.graphics.Point;
-//import org.eclipse.swt.widgets.Composite;
-//import org.eclipse.swt.widgets.Table;
-//import org.eclipse.swt.widgets.TableColumn;
-//import org.eclipse.swt.widgets.TableItem;
-//import org.eclipse.wst.common.ui.internal.viewers.NavigableTableViewer;
-//import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-//import org.eclipse.wst.xsd.ui.internal.actions.DOMAttribute;
-//import org.eclipse.wst.xsd.ui.internal.properties.XSDComboBoxPropertyDescriptor;
-//import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-//import org.eclipse.xsd.XSDConstrainingFacet;
-//import org.eclipse.xsd.XSDFactory;
-//import org.eclipse.xsd.XSDMaxExclusiveFacet;
-//import org.eclipse.xsd.XSDMaxFacet;
-//import org.eclipse.xsd.XSDMaxInclusiveFacet;
-//import org.eclipse.xsd.XSDMinExclusiveFacet;
-//import org.eclipse.xsd.XSDMinFacet;
-//import org.eclipse.xsd.XSDMinInclusiveFacet;
-//import org.eclipse.xsd.XSDSimpleTypeDefinition;
-//import org.eclipse.xsd.util.XSDConstants;
-//import org.eclipse.xsd.util.XSDSchemaBuildingTools;
-//import org.w3c.dom.Element;
-
-public class FacetViewer //extends NavigableTableViewer implements ICellModifier
-{
-//  public static final String FACET_NAME = XSDEditorPlugin.getXSDString("_UI_FACET_NAME"); // "Name";
-//  public static final String FACET_VALUE = XSDEditorPlugin.getXSDString("_UI_FACET_VALUE"); // "Value";
-//  public static final String FACET_OTHER = XSDEditorPlugin.getXSDString("_UI_FACET_FIXED"); // "Fixed";
-//
-//  protected FacetsTableLabelProvider facetsTableLabelProvider = new FacetsTableLabelProvider();
-//  protected FacetsTableContentProvider facetsTableContentProvider = new FacetsTableContentProvider();
-//  protected String[] columnProperties = { FACET_NAME, FACET_VALUE, FACET_OTHER };
-//  protected CellEditor[] cellEditors; // these cellEditors are used when
-//                                      // non-whitespace facet is selected
-//  protected CellEditor[] altCellEditors; // these cellEditors are used when
-//                                          // whitespace facet is selected
-//
-//  protected String[] whiteSpaceValues = new String[] { "", "preserve", "replace", "collapse" };
-//  protected String[] trueFalseValues = new String[] { "", "false", "true" };
-//
-//  /**
-//   * @param parent
-//   */
-//  public FacetViewer(Composite parent)
-//  {
-//    super(new Table(parent, SWT.FULL_SELECTION | SWT.SINGLE));
-//
-//    getTable().setLinesVisible(true);
-//    getTable().setHeaderVisible(true);
-//
-//    addSelectionChangedListener(new SelectionChangedListener());
-//    getTable().addMouseTrackListener(new MyMouseTrackListener());
-//
-//    setContentProvider(facetsTableContentProvider);
-//    setLabelProvider(facetsTableLabelProvider);
-//    setColumnProperties(columnProperties);
-//
-//    setCellModifier(this);
-//
-//    for (int i = 0; i < 3; i++)
-//    {
-//      TableColumn column = new TableColumn(getTable(), SWT.NONE, i);
-//      column.setText(columnProperties[i]);
-//      column.setAlignment(SWT.LEFT);
-//      column.setResizable(true);
-//    }
-//
-//    cellEditors = new CellEditor[3];
-//    altCellEditors = new CellEditor[3];
-//
-//    TableLayout layout = new TableLayout();
-//    ColumnWeightData data = new ColumnWeightData(60, 80, true);
-//    layout.addColumnData(data);
-//    cellEditors[0] = null;
-//
-//    ColumnWeightData data2 = new ColumnWeightData(120, 80, true);
-//    layout.addColumnData(data2);
-//
-//    cellEditors[1] = new TextCellEditor(getTable());
-//    XSDComboBoxPropertyDescriptor pd = new XSDComboBoxPropertyDescriptor("combo", "whitespace", whiteSpaceValues);
-//    altCellEditors[1] = pd.createPropertyEditor(getTable());
-//
-//    ColumnWeightData data3 = new ColumnWeightData(60, 60, true);
-//    layout.addColumnData(data3);
-//
-//    XSDComboBoxPropertyDescriptor pd2 = new XSDComboBoxPropertyDescriptor("combo", "other", trueFalseValues);
-//    cellEditors[2] = pd2.createPropertyEditor(getTable());
-//    altCellEditors[2] = pd2.createPropertyEditor(getTable());
-//
-//    getTable().setLayout(layout);
-//    setCellEditors(cellEditors);
-//
-//  }
-//
-//  /*
-//   * (non-Javadoc)
-//   * 
-//   * @see org.eclipse.jface.viewers.ICellModifier#canModify(java.lang.Object,
-//   *      java.lang.String)
-//   */
-//  public boolean canModify(Object element, String property)
-//  {
-//    return property.equals(FACET_VALUE) || property.equals(FACET_OTHER);
-//  }
-//
-//  /*
-//   * (non-Javadoc)
-//   * 
-//   * @see org.eclipse.jface.viewers.ICellModifier#getValue(java.lang.Object,
-//   *      java.lang.String)
-//   */
-//  public Object getValue(Object element, String property)
-//  {
-//    int column = 0;
-//    if (property.equals(columnProperties[0]))
-//    {
-//      column = 0;
-//    }
-//    else if (property.equals(columnProperties[1]))
-//    {
-//      column = 1;
-//    }
-//    else if (property.equals(columnProperties[2]))
-//    {
-//      column = 2;
-//    }
-//
-//    return facetsTableLabelProvider.getColumnText(element, column);
-//  }
-//
-//  /*
-//   * (non-Javadoc)
-//   * 
-//   * @see org.eclipse.jface.viewers.ICellModifier#modify(java.lang.Object,
-//   *      java.lang.String, java.lang.Object)
-//   */
-//  public void modify(Object element, String property, Object value)
-//  {
-//    XSDSimpleTypeDefinition xsdSimpleType = (XSDSimpleTypeDefinition) getInput();
-//    TableItem item = (TableItem) element;
-//    if (item != null)
-//    {
-//      Object o = item.getData();
-//      if (o != null)
-//      {
-//        if (o instanceof String)
-//        {
-//          String facet = (String) o;
-//
-//          Element simpleTypeElement = xsdSimpleType.getElement();
-//          XSDDOMHelper xsdDOMHelper = new XSDDOMHelper();
-//          Element derivedByElement = xsdDOMHelper.getDerivedByElement(simpleTypeElement);
-//
-//          String prefix = simpleTypeElement.getPrefix();
-//          prefix = (prefix == null) ? "" : (prefix + ":");
-//
-//          Element childNodeElement = null;
-//          DOMAttribute valueAttr = null;
-//
-//          XSDConstrainingFacet targetFacet = getXSDConstrainingFacet(facet);
-//
-//          String newValue = "";
-//          if (value != null && value instanceof String)
-//          {
-//            newValue = (String) value;
-//          }
-//
-//          if (property.equals(columnProperties[1]))
-//          {
-//            if (targetFacet == null && newValue.length() > 0)
-//            {
-//              targetFacet = createFacet(facet);
-//              childNodeElement = (derivedByElement.getOwnerDocument()).createElementNS(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001, prefix + facet);
-//              valueAttr = new DOMAttribute(XSDConstants.VALUE_ATTRIBUTE, newValue);
-//              childNodeElement.setAttribute(valueAttr.getName(), valueAttr.getValue());
-//              // add and format child
-//              derivedByElement.appendChild(childNodeElement);
-//              targetFacet.setElement(childNodeElement);
-//              XSDDOMHelper.formatChild(childNodeElement);
-//
-//              // XSDSchemaHelper.updateElement(xsdSimpleType);
-//            }
-//            if (targetFacet == null)
-//            {
-//              return;
-//            }
-//
-//            if (newValue.length() > 0)
-//            {
-//              targetFacet.setLexicalValue(newValue);
-//
-//              if (targetFacet instanceof XSDMaxFacet || targetFacet instanceof XSDMinFacet)
-//              {
-//                if (targetFacet instanceof XSDMaxFacet)
-//                {
-//                  if (targetFacet instanceof XSDMaxExclusiveFacet)
-//                  {
-//                    XSDMaxInclusiveFacet xsdMaxInclusiveFacet = xsdSimpleType.getMaxInclusiveFacet();
-//                    if (xsdMaxInclusiveFacet != null)
-//                    {
-//                      Element xsdMaxInclusiveFacetElement = xsdMaxInclusiveFacet.getElement();
-//                      XSDDOMHelper.removeNodeAndWhitespace(xsdMaxInclusiveFacetElement);
-//                    }
-//                  }
-//                  else if (targetFacet instanceof XSDMaxInclusiveFacet)
-//                  {
-//                    XSDMaxExclusiveFacet xsdMaxExclusiveFacet = xsdSimpleType.getMaxExclusiveFacet();
-//                    if (xsdMaxExclusiveFacet != null)
-//                    {
-//                      Element xsdMaxExclusiveFacetElement = xsdMaxExclusiveFacet.getElement();
-//                      XSDDOMHelper.removeNodeAndWhitespace(xsdMaxExclusiveFacetElement);
-//                    }
-//                  }
-//                }
-//                else if (targetFacet instanceof XSDMinFacet)
-//                {
-//                  if (targetFacet instanceof XSDMinExclusiveFacet)
-//                  {
-//                    XSDMinInclusiveFacet xsdMinInclusiveFacet = xsdSimpleType.getMinInclusiveFacet();
-//                    if (xsdMinInclusiveFacet != null)
-//                    {
-//                      Element xsdMinInclusiveFacetElement = xsdMinInclusiveFacet.getElement();
-//                      XSDDOMHelper.removeNodeAndWhitespace(xsdMinInclusiveFacetElement);
-//                    }
-//                  }
-//                  else if (targetFacet instanceof XSDMinInclusiveFacet)
-//                  {
-//                    XSDMinExclusiveFacet xsdMinExclusiveFacet = xsdSimpleType.getMinExclusiveFacet();
-//                    if (xsdMinExclusiveFacet != null)
-//                    {
-//                      Element xsdMinExclusiveFacetElement = xsdMinExclusiveFacet.getElement();
-//                      XSDDOMHelper.removeNodeAndWhitespace(xsdMinExclusiveFacetElement);
-//                    }
-//                  }
-//                }
-//              }
-//            }
-//            else
-//            // newValue.length == 0
-//            {
-//              Element targetFacetElement = targetFacet.getElement();
-//              XSDDOMHelper.removeNodeAndWhitespace(targetFacetElement);
-//            }
-//          }
-//          else if (property.equals(columnProperties[2]))
-//          {
-//            if (targetFacet != null)
-//            {
-//              if (newValue.length() > 0)
-//              {
-//                targetFacet.getElement().setAttribute(XSDConstants.FIXED_ATTRIBUTE, newValue);
-//              }
-//              else
-//              {
-//                targetFacet.getElement().removeAttribute(XSDConstants.FIXED_ATTRIBUTE);
-//              }
-//            }
-//          }
-//          xsdSimpleType.setElement(simpleTypeElement);
-//          // xsdSimpleType.updateElement();
-//          refresh();
-//        }
-//      }
-//    }
-//  }
-//
-//  private XSDConstrainingFacet getXSDConstrainingFacet(String facetString)
-//  {
-//    XSDSimpleTypeDefinition xsdSimpleType = (XSDSimpleTypeDefinition) getInput();
-//    List list = xsdSimpleType.getFacetContents();
-//    if (list == null)
-//    {
-//      return null;
-//    }
-//    Iterator iter = list.iterator();
-//    XSDConstrainingFacet targetFacet = null;
-//
-//    while (iter.hasNext())
-//    {
-//      XSDConstrainingFacet xsdConstrainingFacet = (XSDConstrainingFacet) iter.next();
-//      if (xsdConstrainingFacet.getFacetName().equals(facetString))
-//      {
-//        targetFacet = xsdConstrainingFacet;
-//        break;
-//      }
-//    }
-//    return targetFacet;
-//  }
-//
-//  private XSDConstrainingFacet createFacet(String facet)
-//  {
-//    XSDFactory factory = XSDSchemaBuildingTools.getXSDFactory();
-//    XSDConstrainingFacet xsdFacet = null;
-//    if (facet.equals("length"))
-//    {
-//      xsdFacet = factory.createXSDLengthFacet();
-//    }
-//    else if (facet.equals("minLength"))
-//    {
-//      xsdFacet = factory.createXSDMinLengthFacet();
-//    }
-//    else if (facet.equals("maxLength"))
-//    {
-//      xsdFacet = factory.createXSDMaxLengthFacet();
-//    }
-//    else if (facet.equals("minInclusive"))
-//    {
-//      xsdFacet = factory.createXSDMinInclusiveFacet();
-//    }
-//    else if (facet.equals("minExclusive"))
-//    {
-//      xsdFacet = factory.createXSDMinExclusiveFacet();
-//    }
-//    else if (facet.equals("maxInclusive"))
-//    {
-//      xsdFacet = factory.createXSDMaxInclusiveFacet();
-//    }
-//    else if (facet.equals("maxExclusive"))
-//    {
-//      xsdFacet = factory.createXSDMaxExclusiveFacet();
-//    }
-//
-//    else if (facet.equals("totalDigits"))
-//    {
-//      xsdFacet = factory.createXSDTotalDigitsFacet();
-//    }
-//    else if (facet.equals("fractionDigits"))
-//    {
-//      xsdFacet = factory.createXSDFractionDigitsFacet();
-//    }
-//    else if (facet.equals("whiteSpace"))
-//    {
-//      xsdFacet = factory.createXSDWhiteSpaceFacet();
-//    }
-//    return xsdFacet;
-//  }
-//
-//  /**
-//   * Get the tooltip for the facet
-//   */
-//  public String getToolTip(String facet)
-//  {
-//    String key = "";
-//    if (facet.equals("length"))
-//    {
-//      key = "_UI_TOOLTIP_LENGTH";
-//    }
-//    else if (facet.equals("minLength"))
-//    {
-//      key = "_UI_TOOLTIP_MIN_LEN";
-//    }
-//    else if (facet.equals("maxLength"))
-//    {
-//      key = "_UI_TOOLTIP_MAX_LEN";
-//    }
-//
-//    else if (facet.equals("minInclusive"))
-//    {
-//      key = "_UI_TOOLTIP_MIN_INCLUSIVE";
-//    }
-//    else if (facet.equals("minExclusive"))
-//    {
-//      key = "_UI_TOOLTIP_MIN_EXCLUSIVE";
-//    }
-//
-//    else if (facet.equals("maxInclusive"))
-//    {
-//      key = "_UI_TOOLTIP_MAX_INCLUSIVE";
-//    }
-//    else if (facet.equals("maxExclusive"))
-//    {
-//      key = "_UI_TOOLTIP_MAX_EXCLUSIVE";
-//    }
-//
-//    else if (facet.equals("totalDigits"))
-//    {
-//      key = "_UI_TOOLTIP_TOTAL_DIGITS";
-//    }
-//    else if (facet.equals("fractionDigits"))
-//    {
-//      key = "_UI_TOOLTIP_FRACTION_DIGITS";
-//    }
-//
-//    else if (facet.equals("whiteSpace"))
-//    {
-//      key = "_UI_TOOLTIP_WHITE_SPACE";
-//    }
-//
-//    return (key != null) ? XSDEditorPlugin.getXSDString(key) : "";
-//  }
-//
-//  /**
-//   * This listener detects which row is selected and add a tool tip for that row
-//   */
-//  public class MyMouseTrackListener extends MouseTrackAdapter
-//  {
-//    public void mouseHover(MouseEvent e)
-//    {
-//      TableItem item = getTable().getItem(new Point(e.x, e.y));
-//      if (item != null)
-//      {
-//        Object o = item.getData();
-//        if (o != null)
-//        {
-//          String facetName = (String) o;
-//          getTable().setToolTipText(getToolTip(facetName));
-//        }
-//      }
-//    }
-//  }
-//
-//  /**
-//   * Based on the selection, detects if it is a white space or not, and add the
-//   * corresponding cell editors
-//   */
-//  public class SelectionChangedListener implements ISelectionChangedListener
-//  {
-//    public void selectionChanged(SelectionChangedEvent event)
-//    {
-//      Object selection = event.getSelection();
-//      if (selection instanceof StructuredSelection)
-//      {
-//        Object o = ((StructuredSelection) selection).getFirstElement();
-//        if (o != null)
-//        {
-//          String facet = (String) o;
-//          if (facet.equals("whiteSpace"))
-//          {
-//            setCellEditors(altCellEditors);
-//          }
-//          else
-//          {
-//            setCellEditors(cellEditors);
-//          }
-//        }
-//      }
-//    }
-//  }
-//
-//  class FacetsTableContentProvider implements IStructuredContentProvider
-//  {
-//    protected String facet;
-//
-//    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-//    {
-//    }
-//
-//    public java.lang.Object[] getElements(java.lang.Object inputElement)
-//    {
-//      List v = new ArrayList();
-//      XSDSimpleTypeDefinition inputXSDSimpleType = (XSDSimpleTypeDefinition) inputElement;
-//      XSDSimpleTypeDefinition base = inputXSDSimpleType.getPrimitiveTypeDefinition();
-//
-//      if (base != null)
-//      {
-//        Iterator validFacets = inputXSDSimpleType.getValidFacets().iterator();
-//        while (validFacets.hasNext())
-//        {
-//          String aValidFacet = (String) validFacets.next();
-//          if (!(aValidFacet.equals("pattern") || aValidFacet.equals("enumeration")))
-//          {
-//            v.add(aValidFacet);
-//          }
-//        }
-//      }
-//      return v.toArray();
-//    }
-//
-//    public void dispose()
-//    {
-//    }
-//  }
-//
-//  class FacetsTableLabelProvider extends LabelProvider implements ITableLabelProvider
-//  {
-//    public Image getColumnImage(Object element, int columnIndex)
-//    {
-//      return null;
-//    }
-//
-//    public String getColumnText(Object element, int columnIndex)
-//    {
-//      if (element instanceof String)
-//      {
-//        String value = null;
-//        XSDConstrainingFacet targetFacet = getXSDConstrainingFacet((String) element);
-//        switch (columnIndex)
-//        {
-//        case 0:
-//        {
-//          value = (String) element;
-//          break;
-//        }
-//        case 1:
-//        {
-//          if (targetFacet == null)
-//          {
-//            value = "";
-//          }
-//          else
-//          {
-//            value = targetFacet.getLexicalValue();
-//          }
-//
-//          break;
-//        }
-//        case 2:
-//        {
-//          if (targetFacet == null)
-//          {
-//            value = "";
-//          }
-//          else
-//          {
-//            Element elem = targetFacet.getElement();
-//            value = elem.getAttribute(XSDConstants.FIXED_ATTRIBUTE);
-//            if (value == null)
-//              value = "";
-//          }
-//        }
-//        }
-//        return value;
-//      }
-//      return "";
-//    }
-//  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/IDocumentChangedNotifier.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/IDocumentChangedNotifier.java
deleted file mode 100644
index a72e632..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/IDocumentChangedNotifier.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-
-public interface IDocumentChangedNotifier
-{
-  public void addListener(INodeAdapter adapter);
-  public void removeListener(INodeAdapter adapter);  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/MultiplicitySection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/MultiplicitySection.java
deleted file mode 100644
index 556acfa..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/MultiplicitySection.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateMaxOccursCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateMinOccursCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDParticleContent;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-
-public class MultiplicitySection extends RefactoringSection
-{
-  protected CCombo minCombo, maxCombo;
-
-  public MultiplicitySection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-  }
-
-  
-  public void doHandleEvent(Event event)
-  {
-    if (event.widget == minCombo)
-    {
-      updateMinAttribute();
-    }
-    else if (event.widget == maxCombo)
-    {
-      updateMaxAttribute();
-    }
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == minCombo)
-    {
-      updateMinAttribute();
-    }
-    else if (e.widget == maxCombo)
-    {
-      updateMaxAttribute();
-    }
-    super.doWidgetSelected(e);
-  }
-
-  protected void updateMaxAttribute()
-  {
-    setErrorMessage(null);
-    XSDParticle particle = null;
-
-    if (input instanceof XSDParticleContent)
-    {
-      particle = getAssociatedParticle((XSDParticleContent) input);
-    }
-    if (particle != null)
-    {
-      String newValue = maxCombo.getText().trim();
-      
-      if (newValue.length() == 0)
-      {
-        particle.unsetMaxOccurs();
-        return;
-      }
-      try
-      {
-        int newMax = 1;
-        if (newValue.equals("unbounded") || newValue.equals("*")) //$NON-NLS-1$ //$NON-NLS-2$
-        {
-          newMax = XSDParticle.UNBOUNDED;
-        }
-        else
-        {
-          if (newValue.length() > 0)
-          {
-            newMax = Integer.parseInt(newValue);
-          }
-        }
-        setListenerEnabled(false);
-        UpdateMaxOccursCommand command = new UpdateMaxOccursCommand(Messages._UI_ACTION_CHANGE_MAXIMUM_OCCURRENCE, particle, newMax);
-        getCommandStack().execute(command);
-        setListenerEnabled(true);
-
-      }
-      catch (NumberFormatException e)
-      {
-        setErrorMessage(Messages._UI_ERROR_INVALID_VALUE_FOR_MAXIMUM_OCCURRENCE);
-      }
-    }
-  }
-
-  protected void updateMinAttribute()
-  {
-    setErrorMessage(null);
-    XSDParticle particle = null;
-
-    if (input instanceof XSDParticleContent)
-    {
-      particle = getAssociatedParticle((XSDParticleContent) input);
-    }
-    if (particle != null)
-    {
-      String newValue = minCombo.getText();
-      if (newValue.length() == 0)
-      {
-        particle.unsetMinOccurs();
-      }
-      try
-      {
-        int newMin = 1;
-        if (newValue.equals("unbounded") || newValue.equals("*")) //$NON-NLS-1$ //$NON-NLS-2$
-        {
-          newMin = XSDParticle.UNBOUNDED;
-        }
-        else
-        {
-          newMin = Integer.parseInt(newValue);
-        }
-        UpdateMinOccursCommand command = new UpdateMinOccursCommand(Messages._UI_ACTION_CHANGE_MINIMUM_OCCURRENCE, particle, newMin);
-        getCommandStack().execute(command);
-      }
-      catch (NumberFormatException e)
-      {
-
-      }
-    }
-  }
-  
-  protected void refreshMinMax()
-  {
-    boolean refreshMinText = true;
-    boolean refreshMaxText = true;
-    if (minCombo.isFocusControl())
-    {
-      refreshMinText = false;
-    }
-    if (maxCombo.isFocusControl())
-    {
-      refreshMaxText = false;
-    }
-    if (refreshMinText)
-    {
-      minCombo.setText(""); //$NON-NLS-1$
-    }
-    if (refreshMaxText)
-    {
-      maxCombo.setText(""); //$NON-NLS-1$
-    }
-
-    if (input != null)
-    {
-      if (input instanceof XSDParticleContent)
-      {
-        XSDParticle particle = getAssociatedParticle((XSDParticleContent) input);
-        if (particle != null)
-        {
-          // minText.setText(String.valueOf(particle.getMinOccurs()));
-          // maxText.setText(String.valueOf(particle.getMaxOccurs()));
-          Element element = particle.getElement();
-          if (element != null)
-          {
-            if (element.hasAttribute(XSDConstants.MINOCCURS_ATTRIBUTE) && refreshMinText)
-            {
-              String min = element.getAttribute(XSDConstants.MINOCCURS_ATTRIBUTE);
-              minCombo.setText(min);
-            }
-            if (element.hasAttribute(XSDConstants.MAXOCCURS_ATTRIBUTE) && refreshMaxText)
-            {
-              String max = element.getAttribute(XSDConstants.MAXOCCURS_ATTRIBUTE);
-              maxCombo.setText(max);
-            }
-          }
-        }
-      }
-    }
-  }
-
-  protected XSDParticle getAssociatedParticle(XSDParticleContent particleContent)
-  {
-    XSDConcreteComponent xsdComp = particleContent.getContainer();
-    if (xsdComp instanceof XSDParticle)
-    {
-      return (XSDParticle) xsdComp;
-    }
-    return null;
-  }
-  
-  public void dispose()
-  {
-    if (minCombo != null && !minCombo.isDisposed())
-      removeListeners(minCombo);
-    if (maxCombo != null && !maxCombo.isDisposed())
-      removeListeners(maxCombo);
-    super.dispose();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/RefactoringSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/RefactoringSection.java
deleted file mode 100644
index 644ef65..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/RefactoringSection.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
-import org.eclipse.ui.forms.widgets.ImageHyperlink;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.ISelectionMapper;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.refactor.actions.RenameComponentAction;
-import org.eclipse.xsd.XSDSchema;
-
-public abstract class RefactoringSection extends AbstractSection implements IHyperlinkListener
-{
-  /**
-   * Clicking on it invokes the refactor->rename action.
-   */
-  private ImageHyperlink renameHyperlink;
-  
-  protected boolean hideHyperLink;
-
-  /**
-   * Invokes the refactor->rename action on the current selection.
-   */
-  private void invokeRenameRefactoring()
-  {
-    IEditorPart editor = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-    XSDSchema schema = (XSDSchema) editor.getAdapter(XSDSchema.class);
-    ISelection selection = new StructuredSelection(input);
-    ISelectionMapper mapper = (ISelectionMapper) editor.getAdapter(ISelectionMapper.class);
-    selection = mapper != null ? mapper.mapSelection(selection) : selection;
-    RenameComponentAction action = new RenameComponentAction(selection, schema);
-    action.update(selection);
-    action.run();
-  }
-
-  protected void showLink(boolean isVisible)
-  {
-	  renameHyperlink.setVisible(isVisible);
-  }
-  
-  /**
-   * Creates the refactor/rename hyperlink shown beside a component name.
-   * Clicking on the hyperlink invokes the refactor/rename action.
-   * 
-   * @param parent
-   *          the parent composite. Must not be null.
-   */
-  protected void createRenameHyperlink(Composite parent)
-  {
-    renameHyperlink = getWidgetFactory().createImageHyperlink(parent, SWT.NONE);
-
-    renameHyperlink.setImage(XSDEditorPlugin.getXSDImage("icons/quickassist.gif")); //$NON-NLS-1$
-    renameHyperlink.setToolTipText(Messages._UI_TOOLTIP_RENAME_REFACTOR);
-    renameHyperlink.addHyperlinkListener(this);
-  }
-  
-  protected void setRenameHyperlinkEnabled(boolean isEnabled)
-  {
-    renameHyperlink.setEnabled(isEnabled);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated(org.eclipse.ui.forms.events.HyperlinkEvent)
-   */
-  public void linkActivated(HyperlinkEvent e)
-  {
-    invokeRenameRefactoring();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org.eclipse.ui.forms.events.HyperlinkEvent)
-   */
-  public void linkEntered(HyperlinkEvent e)
-  {
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org.eclipse.ui.forms.events.HyperlinkEvent)
-   */
-  public void linkExited(HyperlinkEvent e)
-  {
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SchemaLocationSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SchemaLocationSection.java
deleted file mode 100644
index e8798bb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SchemaLocationSection.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesSchemaLocationUpdater;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.impl.XSDIncludeImpl;
-import org.eclipse.xsd.impl.XSDRedefineImpl;
-import org.w3c.dom.Element;
-
-public class SchemaLocationSection extends CommonDirectivesSection
-{
-	  IWorkbenchPart part;
-	  
-	  /**
-	   * 
-	   */
-	  public SchemaLocationSection()
-	  {
-	    super();
-	  }
-
-		/**
-		 * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-		 */
-		public void createContents(Composite parent)
-		{
-			composite = getWidgetFactory().createFlatFormComposite(parent);
-
-      GridLayout gridLayout = new GridLayout();
-      gridLayout.marginTop = 0;
-      gridLayout.marginBottom = 0;
-      gridLayout.numColumns = 3;
-      composite.setLayout(gridLayout);
-      
-      GridData data = new GridData();
-
-			// Create Schema Location Label
-			CLabel schemaLocationLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_SCHEMA_LOCATION")); //$NON-NLS-1$
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      schemaLocationLabel.setLayoutData(data);
-			
-      // Create Schema Location Text
-      schemaLocationText = getWidgetFactory().createText(composite, "", SWT.NONE); //$NON-NLS-1$
-      schemaLocationText.setEditable(true);
-      applyAllListeners(schemaLocationText);       
-
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-      schemaLocationText.setLayoutData(data);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(schemaLocationText,
-      		XSDEditorCSHelpIds.GENERAL_TAB__INCLUDE_REDEFINE__SCHEMALOCATION);
-      
-			// Create Wizard Button
-			wizardButton = getWidgetFactory().createButton(composite, "", SWT.NONE); //$NON-NLS-1$
-      wizardButton.setImage(XSDEditorPlugin.getXSDImage("icons/browsebutton.gif")); //$NON-NLS-1$
-      data = new GridData();
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-			wizardButton.setLayoutData(data);
-			wizardButton.addSelectionListener(this);
-			
-      // error text
-      errorText = new StyledText(composite, SWT.FLAT);
-      errorText.setEditable(false);
-      errorText.setEnabled(false);
-      errorText.setText(""); //$NON-NLS-1$
-      
-      data = new GridData();
-      data.horizontalAlignment = GridData.FILL;
-      data.horizontalSpan = 3;
-      data.grabExcessHorizontalSpace = true;
-      errorText.setLayoutData(data);
-
-		}
-		
-    public void doWidgetSelected(SelectionEvent event)
-    {
-      if (event.widget == wizardButton)
-      {
-        XSDDirectivesSchemaLocationUpdater.updateSchemaLocation(xsdSchema,input,true);
-        refresh();
-      }
-    }
-
-		/*
-		 * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-		 */
-		public void refresh()
-		{
-				setListenerEnabled(false);
-
-				Element element = null;
-				if (input instanceof XSDInclude)
-        { 
-					element = ((XSDIncludeImpl) input).getElement();
-				}
-				else if (input instanceof XSDRedefine)
-        {
-					element = ((XSDRedefineImpl) input).getElement();
-				}
-				
-				if (element != null)
-        {
-					String location = ""; //$NON-NLS-1$
-					location = element.getAttribute("schemaLocation"); //$NON-NLS-1$
-          if (location == null)
-          {
-            location = ""; //$NON-NLS-1$
-          }
-					schemaLocationText.setText(location);
-				}
-
-        setListenerEnabled(true);
-		}
-
-	  /* (non-Javadoc)
-	   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-	   */
-	  public boolean shouldUseExtraSpace()
-	  {
-	    return true;
-	  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SimpleContentUnionMemberTypesDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SimpleContentUnionMemberTypesDialog.java
deleted file mode 100644
index a090be1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SimpleContentUnionMemberTypesDialog.java
+++ /dev/null
@@ -1,312 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.wst.xsd.ui.internal.util.ViewUtility;
-import org.eclipse.wst.xsd.ui.internal.widgets.TypeSection;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-
-
-public class SimpleContentUnionMemberTypesDialog extends Dialog implements SelectionListener
-{
-  XSDSimpleTypeDefinition simpleType;
-  /**
-   * @param parentShell
-   */
-  public SimpleContentUnionMemberTypesDialog(Shell parentShell, XSDSimpleTypeDefinition simpleType)
-  {
-    super(parentShell);
-    this.simpleType = simpleType;
-  }
-  
-  Table table;
-  TypeSection typeSection;
-  Button addButton, removeButton;
-  org.eclipse.swt.widgets.List memberTypesList;
-  
-  private String result;
-
-  protected void configureShell(Shell shell)
-  {
-    super.configureShell(shell);
-  }
-
-  protected void buttonPressed(int buttonId)
-  {
-    if (buttonId == Window.OK)
-    {
-      StringBuffer sb = new StringBuffer();
-      int length = memberTypesList.getItemCount();
-      for (int i=0 ; i < length; i++)
-      {
-        sb.append(memberTypesList.getItem(i));
-        if (i < length - 1)
-        {
-          sb.append(" "); //$NON-NLS-1$
-        }
-      }
-      result = sb.toString();
-    }
-    super.buttonPressed(buttonId);
-  }
-
-  public String getResult() { return result; }
-
-  //
-  // Create the controls
-  //
-  public Control createDialogArea(Composite parent)
-  {
-    Composite client = (Composite)super.createDialogArea(parent);
-    getShell().setText("Union " + XSDConstants.MEMBERTYPES_ATTRIBUTE);  //$NON-NLS-1$
-    
-    Label instructions = new Label(client, SWT.LEFT | SWT.WRAP);
-    instructions.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_SELECT_MEMBERTYPES")); //$NON-NLS-1$
-    
-    Composite columnsComposite = new Composite(client, SWT.NONE);
-    GridLayout ccGL = new GridLayout();
-    ccGL.verticalSpacing = 0;
-    ccGL.horizontalSpacing = 0;
-    ccGL.marginHeight = 0;
-    ccGL.marginWidth = 0;
-    ccGL.makeColumnsEqualWidth = true;
-    ccGL.numColumns = 3;
-    columnsComposite.setLayout(ccGL);
-    
-    GridData ccGD = new GridData();
-    ccGD.grabExcessHorizontalSpace = true;
-    ccGD.horizontalAlignment = GridData.FILL;
-    columnsComposite.setLayoutData(ccGD);     
-                           
-    typeSection = new TypeSection(columnsComposite);
-    typeSection.setShowUserComplexType(false);
-
-    typeSection.createClient(columnsComposite);
-    typeSection.getSimpleType().setSelection(false);
-    typeSection.getSimpleType().addSelectionListener(this);
-    typeSection.getUserSimpleType().addSelectionListener(this);
-    
-    ViewUtility.createHorizontalFiller(columnsComposite, 1);
-    
-    Label memberListLabel = new Label(columnsComposite, SWT.LEFT);
-    memberListLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_MEMBERTYPES_VALUE")); //$NON-NLS-1$
-    
-    Composite dataComposite = new Composite(client, SWT.NONE);
-    GridLayout dcGL = new GridLayout();
-    dcGL.verticalSpacing = 0;
-    dcGL.marginHeight = 0;
-    dcGL.marginWidth = 0;
-    dcGL.numColumns = 3;
-    dataComposite.setLayout(dcGL);
-    
-    GridData dcGD = new GridData();
-    dcGD.grabExcessHorizontalSpace = true;
-    dcGD.grabExcessVerticalSpace = true;
-    dataComposite.setLayoutData(dcGD);
-    
-    table = new Table(dataComposite,
-        SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER); 
-    table.setHeaderVisible(false);
-    table.setLinesVisible(true);
-    GridData gd2 = new GridData();
-    gd2.grabExcessHorizontalSpace = true;
-    gd2.grabExcessVerticalSpace = true;
-    gd2.horizontalAlignment = GridData.FILL;
-    gd2.verticalAlignment = GridData.FILL;
-    gd2.heightHint = 200;
-    gd2.widthHint = 200;
-    table.setLayoutData(gd2);
-
-    // Fill table
-    handleSetInput();
-    table.getItemCount();
-
-    TableColumn tc = new TableColumn(table, SWT.LEFT);
-    tc.setWidth(200);
-    tc.setResizable(true);
-    
-    Composite buttonComposite = new Composite(dataComposite, SWT.NONE);
-    GridLayout bcGL = new GridLayout();
-    bcGL.numColumns = 1;
-    buttonComposite.setLayout(bcGL);
-    addButton = new Button(buttonComposite, SWT.PUSH);
-    addButton.setText(">"); //$NON-NLS-1$
-    addButton.addSelectionListener(this);
-    removeButton = new Button(buttonComposite, SWT.PUSH);
-    removeButton.setText("<"); //$NON-NLS-1$
-    removeButton.addSelectionListener(this);
-    
-    Composite listComposite = new Composite(dataComposite, SWT.NONE);
-    GridLayout mtGL = new GridLayout();
-    mtGL.numColumns = 1;
-    mtGL.marginHeight = 0;
-    mtGL.marginWidth = 0;
-    mtGL.horizontalSpacing = 0;
-    mtGL.verticalSpacing = 0;
-    listComposite.setLayout(mtGL);
-
-    GridData mtGD = new GridData();
-    mtGD.grabExcessHorizontalSpace = true;
-    mtGD.grabExcessVerticalSpace = true;
-    mtGD.verticalAlignment = GridData.FILL;
-    mtGD.horizontalAlignment = GridData.FILL;
-    listComposite.setLayoutData(mtGD);
-    
-    memberTypesList = new org.eclipse.swt.widgets.List(listComposite, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER);
-    GridData mtlGD = new GridData();
-    mtlGD.grabExcessHorizontalSpace = true;
-    mtlGD.grabExcessVerticalSpace = true;
-    mtlGD.verticalAlignment = GridData.FILL;
-    mtlGD.horizontalAlignment = GridData.FILL;
-    mtlGD.heightHint = 200;
-    mtlGD.widthHint = 200;
-    memberTypesList.setLayoutData(mtlGD);
-    
-    initializeMemberListContent();
-    return client;
-  }
-
-  private void initializeMemberListContent()
-  {
-//    String result = element.getAttribute(XSDConstants.MEMBERTYPES_ATTRIBUTE);
-//    if (result == null)
-//    {
-//      return;
-//    }
-//    StringTokenizer token = new StringTokenizer(result);
-//    while (token.hasMoreTokens())
-//    {
-//      memberTypesList.add(token.nextToken());
-//    }
-    XSDSchema schema = simpleType.getSchema();
-    for (Iterator i = simpleType.getMemberTypeDefinitions().iterator(); i.hasNext(); )
-    {
-      String name = ((XSDSimpleTypeDefinition)i.next()).getQName(schema);
-      if (name != null)
-      memberTypesList.add(name);
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == typeSection.getSimpleType() && typeSection.getSimpleType().getSelection())
-     {
-      populateBuiltInType();
-    }
-    else if (e.widget == typeSection.getUserSimpleType() && typeSection.getUserSimpleType().getSelection())
-     {
-      populateUserSimpleType(false);
-    }
-    else if (e.widget == addButton)
-    {
-      TableItem[] items = table.getItems();
-      int selection = table.getSelectionIndex();
-      if (items != null && items.length > 0 && selection >= 0)
-      {
-        String typeToAdd = items[selection].getData().toString();
-        if (memberTypesList.indexOf(typeToAdd) < 0)
-        {
-          memberTypesList.add(items[selection].getData().toString());
-        }
-      }
-    }
-    else if (e.widget == removeButton)
-    {
-      String[] typesToRemove = memberTypesList.getSelection();
-      for (int i=0; i < typesToRemove.length; i++)
-      {
-        memberTypesList.remove(typesToRemove[i]);
-      }
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-   */
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-  }
-  
-  public void handleSetInput()
-  {
-    populateBuiltInType();
-  }
-  
-  public void populateBuiltInType()
-  {
-    table.removeAll();
-    List items = getBuiltInTypeNamesList();
-    for (int i = 0; i < items.size(); i++)
-     {
-      TableItem item = new TableItem(table, SWT.NONE);
-      item.setText(items.get(i).toString());
-      item.setImage(XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif")); //$NON-NLS-1$
-      item.setData(items.get(i));
-    }
-  }
-
-  public void populateUserSimpleType(boolean showAnonymous)
-  {
-    table.removeAll();
-    if (showAnonymous)
-     {
-      TableItem anonymousItem = new TableItem(table, SWT.NONE);
-      anonymousItem.setText("**anonymous**"); //$NON-NLS-1$
-      anonymousItem.setData("**anonymous**"); //$NON-NLS-1$
-    }
-    List items = getUserSimpleTypeNamesList();
-    for (int i = 0; i < items.size(); i++)
-     {
-      TableItem item = new TableItem(table, SWT.NONE);
-      item.setText(items.get(i).toString());
-      item.setImage(XSDEditorPlugin.getXSDImage("icons/XSDSimpleType.gif")); //$NON-NLS-1$
-      item.setData(items.get(i));
-    }
-  }
-  
-  public java.util.List getBuiltInTypeNamesList()
-  {
-    TypesHelper helper = new TypesHelper(simpleType.getSchema());
-    return helper.getBuiltInTypeNamesList();
-  }
-
-  public java.util.List getUserSimpleTypeNamesList()
-  {
-    TypesHelper helper = new TypesHelper(simpleType.getSchema());
-    return helper.getUserSimpleTypeNamesList();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SpecificConstraintsWidget.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SpecificConstraintsWidget.java
deleted file mode 100644
index c13b65d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/SpecificConstraintsWidget.java
+++ /dev/null
@@ -1,727 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import com.ibm.icu.util.StringTokenizer;
-
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TextCellEditor;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.common.ui.internal.viewers.NavigableTableViewer;
-import org.eclipse.wst.xsd.ui.internal.common.commands.AddEnumerationsCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ChangeToLocalSimpleTypeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.DeleteCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.SetXSDFacetValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateXSDPatternFacetCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.widgets.EnumerationsDialog;
-import org.eclipse.wst.xsd.ui.internal.wizards.RegexWizard;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDFacet;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDPatternFacet;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-
-public class SpecificConstraintsWidget implements SelectionListener, Listener
-{
-  public static int ENUMERATION = 0;
-  public static int PATTERN = 1;
-  
-  int kind;
-  ConstraintsTableViewer constraintsTableViewer;
-  Button addButton;
-  Button addUsingDialogButton;
-  Button deleteButton;
-  Button editButton;
-  Composite composite;
-  boolean isEnabled;
-  TabbedPropertySheetWidgetFactory factory;
-  XSDSimpleTypeDefinition input;
-  XSDFeature feature;
-  boolean isReadOnly;
-  CommandStack commandStack;
-  XSDFacetSection facetSection;
-
-  /**
-   * @deprecated
-   * @param composite
-   * @param factory
-   * @param feature
-   * @param input
-   * @param facetSection
-   */
-  public SpecificConstraintsWidget(Composite composite, TabbedPropertySheetWidgetFactory factory, XSDFeature feature, XSDSimpleTypeDefinition input, XSDFacetSection facetSection)
-  {
-    this(composite, factory, feature, input, facetSection, ENUMERATION);
-  }
-
-  public SpecificConstraintsWidget(Composite composite, TabbedPropertySheetWidgetFactory factory, XSDFeature feature, XSDSimpleTypeDefinition input, XSDFacetSection facetSection, int kind)
-  {
-    this.factory = factory;
-    this.input = input;
-    this.composite = composite;
-    this.feature = feature;
-    this.facetSection = facetSection;
-    this.kind = kind;
-    
-    createControl(composite);
-  }
-
-  public void setCommandStack(CommandStack commandStack)
-  {
-    this.commandStack = commandStack; 
-  }
-
-  public void setIsReadOnly(boolean isReadOnly)
-  {
-    this.isReadOnly = isReadOnly;
-  }
-
-  public TabbedPropertySheetWidgetFactory getWidgetFactory()
-  {
-    return factory;
-  }
-  
-  public Control getControl()
-  {
-    return composite;
-  }
-  
-  public void setEnabled(boolean isEnabled)
-  {
-    this.isEnabled = isEnabled;
-    addButton.setEnabled(isEnabled);
-    addUsingDialogButton.setEnabled(isEnabled);
-    editButton.setEnabled(isEnabled);
-    constraintsTableViewer.getTable().setEnabled(isEnabled);
-    composite.setEnabled(isEnabled);
-  }
-
-  public Control createControl(Composite parent)
-  {
-    composite = factory.createFlatFormComposite(parent);
-    GridData data = new GridData();
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 2;
-    composite.setLayout(gridLayout);
-
-    constraintsTableViewer = new ConstraintsTableViewer(getWidgetFactory().createTable(composite, SWT.MULTI | SWT.FULL_SELECTION));
-    constraintsTableViewer.setInput(input);
-    Table table = constraintsTableViewer.getTable();
-    table.addSelectionListener(this);
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = true;
-    data.widthHint = 150;
-    data.grabExcessVerticalSpace = true;
-    table.setLayoutData(data);
-    table.addListener(SWT.Resize, this);
-    
-    Composite buttonComposite = getWidgetFactory().createComposite(composite, SWT.FLAT);
-    GridLayout buttonCompositeLayout = new GridLayout();
-    buttonCompositeLayout.marginTop = 0;
-    buttonCompositeLayout.marginBottom = 0;
-    buttonCompositeLayout.numColumns = 1;
-    buttonComposite.setLayout(buttonCompositeLayout);
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.grabExcessHorizontalSpace = false;
-    buttonComposite.setLayoutData(data);
-
-    
-    addButton = getWidgetFactory().createButton(buttonComposite, Messages._UI_ACTION_ADD, SWT.PUSH);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.BEGINNING;
-    addButton.setLayoutData(data);
-    addButton.addSelectionListener(this);
-    
-    addUsingDialogButton = getWidgetFactory().createButton(buttonComposite, Messages._UI_ACTION_ADD_WITH_DOTS, SWT.PUSH);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.BEGINNING;
-    addUsingDialogButton.setLayoutData(data);
-    addUsingDialogButton.addSelectionListener(this);
-
-    editButton = getWidgetFactory().createButton(buttonComposite, Messages._UI_ACTION_EDIT_WITH_DOTS, SWT.PUSH);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    editButton.setLayoutData(data);
-    editButton.addSelectionListener(this);
-    
-    
-    deleteButton = getWidgetFactory().createButton(buttonComposite, Messages._UI_ACTION_DELETE, SWT.PUSH);
-
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    deleteButton.setLayoutData(data);
-    deleteButton.addSelectionListener(this);
-
-    setButtonStates(kind);
-    return composite;
-  }
-
-  public void handleEvent(Event event)
-  {
-    Table table = constraintsTableViewer.getTable();
-    if (event.type == SWT.Resize && event.widget == table)
-    {
-      TableColumn tableColumn = table.getColumn(0);
-      tableColumn.setWidth(table.getSize().x);
-    }
-  }
-
-  public void setInput(Object input)
-  {
-    constraintsTableViewer.setInput(input);
-    if (isReadOnly)
-    {
-      composite.setEnabled(false);
-    }
-    else
-    {
-      composite.setEnabled(true);
-    }
-//    constraintsTableViewer.refresh();
-  }
-
-  public int getConstraintKind()
-  {
-	  return this.kind;
-  }
-  
-  protected void setButtonStates(int kind)
-  {
-    boolean add, addUsing, delete, edit;
-
-    boolean listHasItems = false;
-    StructuredSelection selection = (StructuredSelection) constraintsTableViewer.getSelection();
-    if (selection != null)
-    {
-      if (selection.toList().size() > 0)
-      {
-        listHasItems = true;
-      }
-    }
-
-    if (kind == ENUMERATION)
-    {
-      add = true;
-      addUsing = true;
-      edit = false;
-    }
-    else if (kind == PATTERN)
-    {
-      add = false;
-      addUsing = true;
-      edit = listHasItems;
-    }
-    else
-    {
-      add = true;
-      addUsing = true;
-      edit = true;
-    }
-    delete = listHasItems;
-
-    if (!addButton.isDisposed())
-    {
-      addButton.setEnabled(add);
-    }
-    if (!addUsingDialogButton.isDisposed())
-    {
-      addUsingDialogButton.setEnabled(addUsing);
-    }
-    if (!deleteButton.isDisposed())
-    {
-      deleteButton.setEnabled(delete);
-    }
-    if (!editButton.isDisposed())
-    {
-      editButton.setEnabled(edit);
-    }
-  }  
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-    XSDSimpleTypeDefinition st = input;
-    if (e.widget == addButton)
-    {
-      List enumList = st.getEnumerationFacets();
-      String newName = XSDCommonUIUtils.createUniqueEnumerationValue("value", enumList); //$NON-NLS-1$
-
-      if (kind == ENUMERATION)
-      {
-        CompoundCommand compoundCommand = new CompoundCommand();
-        XSDSimpleTypeDefinition targetSimpleType = null;
-        if (feature != null)
-        {
-          XSDSimpleTypeDefinition anonymousSimpleType = XSDCommonUIUtils.getAnonymousSimpleType(feature, input);
-          if (anonymousSimpleType == null)
-          {
-            anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-            anonymousSimpleType.setBaseTypeDefinition(input);
-
-            ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CHANGE_PATTERN, feature);
-            changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
-            compoundCommand.add(changeToAnonymousCommand);
-            input = anonymousSimpleType;
-          }
-          targetSimpleType = anonymousSimpleType;
-        }
-        else
-        {
-          targetSimpleType = input;
-        }
-
-        AddEnumerationsCommand command = new AddEnumerationsCommand(Messages._UI_ACTION_ADD_ENUMERATION, targetSimpleType);
-        command.setValue(newName);
-        compoundCommand.add(command);
-        commandStack.execute(compoundCommand);
-        setInput(input);
-        constraintsTableViewer.refresh();
-        int newItemIndex = constraintsTableViewer.getTable().getItemCount() - 1;
-        constraintsTableViewer.editElement(constraintsTableViewer.getElementAt(newItemIndex), 0);
-      }
-    }
-    else if (e.widget == addUsingDialogButton)
-    {
-      Display display = Display.getCurrent();
-      // if it is null, get the default one
-      display = display == null ? Display.getDefault() : display;
-      Shell shell = display.getActiveShell();
-
-      if (kind == PATTERN)
-      {
-        String initialValue = ""; //$NON-NLS-1$
-        RegexWizard wizard = new RegexWizard(initialValue);
-
-        WizardDialog wizardDialog = new WizardDialog(shell, wizard);
-        wizardDialog.setBlockOnOpen(true);
-        wizardDialog.create();
-
-        int result = wizardDialog.open();
-
-        if (result == Window.OK)
-        {
-          String newPattern = wizard.getPattern();
-          CompoundCommand compoundCommand = new CompoundCommand();
-          XSDSimpleTypeDefinition targetSimpleType = null;
-          if (feature != null)
-          {
-            XSDSimpleTypeDefinition anonymousSimpleType = XSDCommonUIUtils.getAnonymousSimpleType(feature, input);
-            if (anonymousSimpleType == null)
-            {
-              anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-              anonymousSimpleType.setBaseTypeDefinition(input);
-
-              ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CHANGE_PATTERN, feature);
-              changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
-              compoundCommand.add(changeToAnonymousCommand);
-              input = anonymousSimpleType;
-            }
-            targetSimpleType = anonymousSimpleType;
-          }
-          else
-          {
-            targetSimpleType = input;
-          }
-          
-          UpdateXSDPatternFacetCommand command = new UpdateXSDPatternFacetCommand(Messages._UI_ACTION_ADD_PATTERN, targetSimpleType, UpdateXSDPatternFacetCommand.ADD);
-          command.setValue(newPattern);
-          setInput(input);
-          compoundCommand.add(command);
-          commandStack.execute(compoundCommand);
-          facetSection.doSetInput();
-        }
-        constraintsTableViewer.refresh();
-      }
-      else
-      {
-        EnumerationsDialog dialog = new EnumerationsDialog(shell);
-        dialog.setBlockOnOpen(true);
-        int result = dialog.open();
-
-        if (result == Window.OK)
-        {
-          String text = dialog.getText();
-          String delimiter = dialog.getDelimiter();
-          StringTokenizer tokenizer = new StringTokenizer(text, delimiter);
-          CompoundCommand compoundCommand = new CompoundCommand(Messages._UI_ACTION_ADD_ENUMERATIONS);
-          
-          XSDSimpleTypeDefinition targetSimpleType = null;
-          if (feature != null)
-          {
-            XSDSimpleTypeDefinition anonymousSimpleType = XSDCommonUIUtils.getAnonymousSimpleType(feature, input);
-            if (anonymousSimpleType == null)
-            {
-              anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-              anonymousSimpleType.setBaseTypeDefinition(input);
-
-              ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand("", feature); //$NON-NLS-1$
-              changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
-              compoundCommand.add(changeToAnonymousCommand);
-              input = anonymousSimpleType;
-            }
-            targetSimpleType = anonymousSimpleType;
-          }
-          else
-          {
-            targetSimpleType = input;
-          }
-
-          while (tokenizer.hasMoreTokens())
-          {
-            String token = tokenizer.nextToken();
-            if (dialog.isPreserveWhitespace() == false)
-            {
-              token = token.trim();
-            }
-            AddEnumerationsCommand command = new AddEnumerationsCommand(Messages._UI_ACTION_ADD_ENUMERATIONS, targetSimpleType);
-            command.setValue(token);
-            compoundCommand.add(command);
-          }
-          commandStack.execute(compoundCommand);
-        }
-        //setInput(input);
-        facetSection.doSetInput();
-        constraintsTableViewer.refresh();
-      }
-    }
-    else if (e.widget == deleteButton)
-    {
-      StructuredSelection selection = (StructuredSelection) constraintsTableViewer.getSelection();
-      CompoundCommand compoundCommand = new CompoundCommand();
-      if (selection != null)
-      {
-        Iterator i = selection.iterator();
-        if (selection.size() > 0)
-        {
-          compoundCommand.setLabel(Messages._UI_ACTION_DELETE_CONSTRAINTS);
-        }
-        else
-        {
-          compoundCommand.setLabel(Messages._UI_ACTION_DELETE_PATTERN);
-        }
-        while (i.hasNext())
-        {
-          Object obj = i.next();
-          if (obj != null)
-          {
-            if (obj instanceof XSDPatternFacet)
-            {
-              UpdateXSDPatternFacetCommand command = new UpdateXSDPatternFacetCommand("", input, UpdateXSDPatternFacetCommand.DELETE); //$NON-NLS-1$
-              command.setPatternToEdit((XSDPatternFacet)obj);
-              compoundCommand.add(command);
-            }
-            else if (obj instanceof XSDEnumerationFacet)
-            {
-              XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) obj;
-              DeleteCommand deleteCommand = new DeleteCommand(Messages._UI_ACTION_DELETE_ENUMERATION, enumFacet);
-              compoundCommand.add(deleteCommand);
-            }
-          }
-        }
-        commandStack.execute(compoundCommand);
-        constraintsTableViewer.refresh();
-      }
-    }
-    else if (e.widget == editButton)
-    {
-      StructuredSelection selection = (StructuredSelection) constraintsTableViewer.getSelection();
-      if (selection != null)
-      {
-        Object obj = selection.getFirstElement();
-        if (obj instanceof XSDPatternFacet)
-        {
-          XSDPatternFacet pattern = (XSDPatternFacet) obj;
-          String initialValue = pattern.getLexicalValue();
-          if (initialValue == null)
-          {
-            initialValue = ""; //$NON-NLS-1$
-          }
-
-          Shell shell = Display.getCurrent().getActiveShell();
-
-          RegexWizard wizard = new RegexWizard(initialValue);
-
-          WizardDialog wizardDialog = new WizardDialog(shell, wizard);
-          wizardDialog.setBlockOnOpen(true);
-          wizardDialog.create();
-
-          int result = wizardDialog.open();
-
-          if (result == Window.OK)
-          {
-            String newPattern = wizard.getPattern();
-            pattern.setLexicalValue(newPattern);
-            constraintsTableViewer.refresh();
-          }
-        }
-      }
-    }
-    
-    setButtonStates(this.kind);
-  }
-  
-  public void widgetDefaultSelected(SelectionEvent e)
-  {
-
-  }
-
-  
-  public void setConstraintKind(int kind)
-  {
-    this.kind = kind;
-    setButtonStates(kind);
-    constraintsTableViewer.setInput(input);
-    constraintsTableViewer.refresh();
-  }
-  
-  public void doModify(Object element, String property, Object value)
-  {
-    setButtonStates(this.kind);
-    if (element instanceof TableItem && (value != null))
-    {
-      TableItem item = (TableItem) element;
-
-      if (item.getData() instanceof XSDPatternFacet)
-      {
-        XSDPatternFacet patternFacet = (XSDPatternFacet) item.getData();
-        patternFacet.setLexicalValue((String) value);
-
-        item.setData(patternFacet);
-        item.setText((String) value);
-      }
-      else if (item.getData() instanceof XSDEnumerationFacet)
-      {
-        XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) item.getData();
-        SetXSDFacetValueCommand command = new SetXSDFacetValueCommand(Messages._UI_ACTION_SET_ENUMERATION_VALUE, enumFacet);
-        command.setValue((String) value);
-        commandStack.execute(command);
-        item.setData(enumFacet);
-        item.setText((String) value);
-      }
-    }
-  }
-  
-  public Object doGetValue(Object element, String property)
-  {
-    if (element instanceof XSDPatternFacet)
-    {
-      XSDPatternFacet patternFacet = (XSDPatternFacet) element;
-      String value = patternFacet.getLexicalValue();
-      if (value == null)
-        value = ""; //$NON-NLS-1$
-      return value;
-    }
-    else if (element instanceof XSDEnumerationFacet)
-    {
-      XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) element;
-      String value = enumFacet.getLexicalValue();
-      if (value == null)
-        value = ""; //$NON-NLS-1$
-      return value;
-    }
-
-    return ""; //$NON-NLS-1$
-  }
-  
-  class ConstraintsTableViewer extends NavigableTableViewer implements ICellModifier
-  {
-    protected String[] columnProperties = { Messages._UI_LABEL_PATTERN };
-
-    protected CellEditor[] cellEditors;
-
-    Table table;
-
-    public ConstraintsTableViewer(Table table)
-    {
-      super(table);
-      table = getTable();
-
-      table.setLinesVisible(true);
-
-      setContentProvider(new ConstraintsContentProvider());
-      setLabelProvider(new ConstraintsTableLabelProvider());
-      setColumnProperties(columnProperties);
-
-      setCellModifier(this);
-
-      TableColumn column = new TableColumn(table, SWT.NONE, 0);
-      column.setText(columnProperties[0]);
-      column.setAlignment(SWT.LEFT);
-      column.setResizable(true);
-
-      cellEditors = new CellEditor[1];
-
-      TableLayout layout = new TableLayout();
-      ColumnWeightData data = new ColumnWeightData(100);
-
-      layout.addColumnData(data);
-      cellEditors[0] = new TextCellEditor(table);
-
-      getTable().setLayout(layout);
-      setCellEditors(cellEditors);
-    }
-    
-    public boolean canModify(Object element, String property)
-    {
-      return true;
-    }
-
-    public void modify(Object element, String property, Object value)
-    {
-      doModify(element, property, value);
-    }
-
-    public Object getValue(Object element, String property)
-    {
-      return doGetValue(element, property);
-    }
-
-  }
-
-  class ConstraintsContentProvider implements IStructuredContentProvider
-  {
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-    }
-
-    public java.lang.Object[] getElements(java.lang.Object inputElement)
-    {
-      java.util.List list = new ArrayList();
-      if (inputElement instanceof XSDSimpleTypeDefinition)
-      {
-        XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) inputElement;
-        boolean isDefined = false;
-        Iterator iter;
-        if (kind == PATTERN)
-        {
-          iter = st.getPatternFacets().iterator();
-        }
-        else
-        {
-          iter = st.getEnumerationFacets().iterator();
-        }
-
-        while (iter.hasNext())
-        {
-          XSDFacet facet = (XSDFacet) iter.next();
-          isDefined = (facet.getRootContainer() == facetSection.xsdSchema);
-        }
-
-        if (kind == PATTERN)
-        {
-          if (isDefined)
-          {
-            return st.getPatternFacets().toArray();
-          }
-        }
-        else
-        {
-          if (isDefined)
-          {
-            return st.getEnumerationFacets().toArray();
-          }
-        }
-      }
-      return list.toArray();
-    }
-
-    public void dispose()
-    {
-    }
-  }
-
-  class ConstraintsTableLabelProvider extends LabelProvider implements ITableLabelProvider
-  {
-    public ConstraintsTableLabelProvider()
-    {
-
-    }
-
-    public Image getColumnImage(Object element, int columnIndex)
-    {
-      if (kind == PATTERN)
-      {
-        return XSDEditorPlugin.getXSDImage("icons/XSDSimplePattern.gif"); //$NON-NLS-1$
-      }
-      else
-      {
-        return XSDEditorPlugin.getXSDImage("icons/XSDSimpleEnum.gif"); //$NON-NLS-1$
-      }
-    }
-
-    public String getColumnText(Object element, int columnIndex)
-    {
-      if (element instanceof XSDPatternFacet)
-      {
-        XSDPatternFacet pattern = (XSDPatternFacet) element;
-        String value = pattern.getLexicalValue();
-        if (value == null)
-          value = ""; //$NON-NLS-1$
-        return value;
-      }
-      else if (element instanceof XSDEnumerationFacet)
-      {
-        XSDEnumerationFacet enumFacet = (XSDEnumerationFacet) element;
-        String value = enumFacet.getLexicalValue();
-        if (value == null)
-          value = ""; //$NON-NLS-1$
-        return value;
-      }
-      return ""; //$NON-NLS-1$
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDActionManager.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDActionManager.java
deleted file mode 100644
index b31fa6c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDActionManager.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMDataType;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.ui.internal.XMLUIMessages;
-import org.eclipse.wst.xml.ui.internal.actions.EditAttributeAction;
-import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class XSDActionManager extends XMLNodeActionManager {
-
-  private CommandStack commandStack;
-  
-	public XSDActionManager(IStructuredModel model, Viewer viewer) {
-		super(model, viewer);
-	}
-  
-  public void setCommandStack(CommandStack commandStack) {
-    this.commandStack = commandStack;
-  }
-
-  protected Action createAddCDataSectionAction(Node parent, int index)
-  {
-    return null;
-  }
-  
-  protected Action createAddPCDataAction(Node parent, CMDataType dataType, int index) {
-    return null;
-  }
-  
-  
-	protected void contributeAddDocumentChildActions(IMenuManager menu, Document document, int ic, int vc) {
-	}
-  
-	protected void contributeEditGrammarInformationActions(IMenuManager menu, Node node) {
-	}
-	
-	protected void contributePIAndCommentActions(IMenuManager menu, Document document, int index) {
-	}
-	
-	protected void contributePIAndCommentActions(IMenuManager menu, Element parentElement, CMElementDeclaration parentEd, int index) {
-	}
-	
-	protected void contributeTextNodeActions(IMenuManager menu, Element parentElement, CMElementDeclaration parentEd, int index) {
-		super.contributeTextNodeActions(menu, parentElement, parentEd, index);
-	}
-  
-  protected Action createAddAttributeAction(Element parent, CMAttributeDeclaration ad) {
-    Action action = null;
-    if (ad == null) {
-      action = new EditAttributeAction(this, parent, null, XMLUIMessages._UI_MENU_NEW_ATTRIBUTE, XMLUIMessages._UI_MENU_NEW_ATTRIBUTE_TITLE); //$NON-NLS-1$ //$NON-NLS-2$
-    } else {
-      action = new AddNodeAction(ad, parent, -1);
-    }
-    
-    WrapperCommand command = new WrapperCommand(action, parent, ad);
-    WrapperAction wrapperAction = new WrapperAction(command);
-    return wrapperAction;
-  }
-  
-  class WrapperAction extends Action
-  {
-    WrapperCommand command;
-    
-    public WrapperAction(WrapperCommand command)
-    {
-      super();
-      this.command = command;
-    }
-    
-    public String getText()
-    {
-      return command.getAction().getText();
-    }
-
-    public void run()
-    {
-      // Some editors may not use a command stack
-      if (commandStack != null)
-      {
-        commandStack.execute(command);
-      }
-      else
-      {
-        command.execute();
-      }
-    }
-  }
-
-  class WrapperCommand extends Command
-  {
-    Action action;
-    Element parent;
-    CMAttributeDeclaration ad;
-    public WrapperCommand(Action action, Element parent, CMAttributeDeclaration ad)
-    {
-      super();
-      this.action = action;
-      this.parent = parent;
-      this.ad = ad;
-    }
-    
-    public String getLabel()
-    {
-      return action.getText();
-    }
-    
-    public Action getAction()
-    {
-      return action;
-    }
-    
-    public void execute()
-    {
-      action.run();
-    }
-    
-    public void undo() {
-      
-//      ((Element)parent).removeAttribute(ad.getAttrName());
-
-      getModel().getUndoManager().undo();
-
-    } 
-        
-
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAnyElementContentsSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAnyElementContentsSection.java
deleted file mode 100644
index a17ab48..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAnyElementContentsSection.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.Iterator;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDProcessContents;
-import org.eclipse.xsd.XSDWildcard;
-
-public class XSDAnyElementContentsSection extends MultiplicitySection
-{
-  CCombo namespaceCombo;
-  CCombo processContentsCombo;
-
-  private String[] namespaceComboValues = { "", //$NON-NLS-1$
-      "##any", //$NON-NLS-1$
-      "##other", //$NON-NLS-1$
-      "##targetNamespace", //$NON-NLS-1$
-      "##local" //$NON-NLS-1$
-  };
-
-  /**
-   * 
-   */
-  public XSDAnyElementContentsSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridData data = new GridData();
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 2;
-    composite.setLayout(gridLayout);
-
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel namespaceLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_ATTRIBUTES_NAMESPACE);
-    namespaceLabel.setLayoutData(data);
-
-    namespaceCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    namespaceCombo.setLayoutData(data);
-    namespaceCombo.setItems(namespaceComboValues);
-    namespaceCombo.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(namespaceCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ANYELEMENT__NAMESPACE);
-
-    CLabel processContentsLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_ATTRIBUTES_PROCESSCONTENTS);
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    processContentsLabel.setLayoutData(data);
-
-    processContentsCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    processContentsCombo.setLayoutData(data);
-    Iterator list = XSDProcessContents.VALUES.iterator();
-    processContentsCombo.add(""); //$NON-NLS-1$
-    while (list.hasNext())
-    {
-      processContentsCombo.add(((XSDProcessContents) list.next()).getName());
-    }
-    processContentsCombo.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(processContentsCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ANYELEMENT__PROCESSCONTENTS);
-
-    // ------------------------------------------------------------------
-    // min property
-    // ------------------------------------------------------------------
-
-    getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_MINOCCURS);
-
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    minCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    minCombo.setLayoutData(data);
-    minCombo.add("0"); //$NON-NLS-1$
-    minCombo.add("1"); //$NON-NLS-1$
-    applyAllListeners(minCombo);
-    minCombo.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(minCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ANYELEMENT__MIN_OCCURENCE);
-
-    // ------------------------------------------------------------------
-    // max property
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_MAXOCCURS);
-
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    maxCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    maxCombo.setLayoutData(data);
-    maxCombo.add("0"); //$NON-NLS-1$
-    maxCombo.add("1"); //$NON-NLS-1$
-    maxCombo.add("unbounded"); //$NON-NLS-1$
-    applyAllListeners(maxCombo);
-    maxCombo.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(maxCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ANYELEMENT__MAX_OCCURENCE);
-  }
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    setListenerEnabled(false);
-    namespaceCombo.setText(""); //$NON-NLS-1$
-    processContentsCombo.setText(""); //$NON-NLS-1$
-    if (input != null)
-    {
-      if (input instanceof XSDWildcard)
-      {
-        XSDWildcard wildcard = (XSDWildcard) input;
-        if (wildcard.isSetLexicalNamespaceConstraint())
-        {
-          namespaceCombo.setText(wildcard.getStringLexicalNamespaceConstraint());
-        }
-        else
-        {
-          namespaceCombo.setText("");
-        }
-        if (wildcard.isSetProcessContents())
-        {
-          XSDProcessContents pc = wildcard.getProcessContents();
-          processContentsCombo.setText(pc.getName());
-        }
-        
-        if (wildcard.eContainer() instanceof XSDParticle)
-        {
-          minCombo.setEnabled(!isReadOnly);
-          maxCombo.setEnabled(!isReadOnly);
-        }
-        else
-        {
-          minCombo.setEnabled(false);
-          maxCombo.setEnabled(false);
-        }
-      }
-    }
-    refreshMinMax();
-    setListenerEnabled(true);
-  }
-
-  public boolean shouldUseExtraSpace()
-  {
-    return false;
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    XSDConcreteComponent concreteComponent = (XSDConcreteComponent) input;
-    if (concreteComponent instanceof XSDWildcard)
-    {
-      XSDWildcard wildcard = (XSDWildcard) concreteComponent;
-      if (e.widget == namespaceCombo)
-      {
-        String newValue = namespaceCombo.getText();
-        boolean removeAttribute = false;
-        if (newValue.length() == 0)
-        {
-          removeAttribute = true;
-        }
-        // TODO use commands
-        // beginRecording(XSDEditorPlugin.getXSDString("_UI_NAMESPACE_CHANGE"),
-        // element); //$NON-NLS-1$
-        if (removeAttribute)
-        {
-          wildcard.unsetLexicalNamespaceConstraint();
-        }
-        else
-        {
-          wildcard.setStringLexicalNamespaceConstraint(newValue);
-        }
-        // endRecording(element);
-      }
-      else if (e.widget == processContentsCombo)
-      {
-        String newValue = processContentsCombo.getText();
-        boolean removeAttribute = false;
-        if (newValue.length() == 0)
-        {
-          removeAttribute = true;
-        }
-        // beginRecording(XSDEditorPlugin.getXSDString("_UI_PROCESSCONTENTS_CHANGE"),
-        // element); //$NON-NLS-1$
-        if (removeAttribute)
-        {
-          wildcard.unsetProcessContents();
-        }
-        else
-        {
-          wildcard.setProcessContents(XSDProcessContents.get(processContentsCombo.getItem(processContentsCombo.getSelectionIndex())));
-        }
-        // endRecording(element);
-      }
-    }
-    super.doWidgetSelected(e);
-  }
-
-  public void dispose()
-  {
-    if (minCombo != null && !minCombo.isDisposed())
-      minCombo.removeSelectionListener(this);
-    if (maxCombo != null && !maxCombo.isDisposed())
-      maxCombo.removeSelectionListener(this);
-    super.dispose();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAttributeDeclarationSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAttributeDeclarationSection.java
deleted file mode 100644
index 8bd6664..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAttributeDeclarationSection.java
+++ /dev/null
@@ -1,908 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.BaseCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.dialogs.NewTypeDialog;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDAttributeReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDTypeReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDAttributeDeclarationSection extends RefactoringSection
-{
-  protected Text nameText, defaultOrFixedText;
-  protected CCombo componentNameCombo, typeCombo, usageCombo, formCombo;
-  protected Button defaultButton, fixedButton;
-  protected String typeName = "", refName = ""; //$NON-NLS-1$
-  boolean isAttributeReference;
-  
-  public XSDAttributeDeclarationSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    String typeLabel = Messages.UI_LABEL_TYPE; //$NON-NLS-1$
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // NameLabel
-    // ------------------------------------------------------------------
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    CLabel nameLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_NAME);
-    nameLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // NameText
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-    nameText.setLayoutData(data);
-    nameText.setEnabled(!isAttributeReference);
-    applyAllListeners(nameText);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ATTRIBUTE__NAME);
-
-    // ------------------------------------------------------------------
-    // Refactor/rename hyperlink
-    // ------------------------------------------------------------------
-    if (!hideHyperLink) 
-    {
-    	createRenameHyperlink(composite);
-		  setRenameHyperlinkEnabled(!isAttributeReference);
-    }
-    else
-    {
-   	  getWidgetFactory().createCLabel(composite, "");
-    }
-    
-
-    // ------------------------------------------------------------------
-    // Ref Label
-    // ------------------------------------------------------------------
-    if (isAttributeReference)
-    {
-      data = new GridData();
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      CLabel refLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_REFERENCE);
-      refLabel.setLayoutData(data);
-
-      // ------------------------------------------------------------------
-      // Ref Combo
-      // ------------------------------------------------------------------
-
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-
-      componentNameCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-      componentNameCombo.addSelectionListener(this);
-      componentNameCombo.addListener(SWT.Traverse, this);
-      componentNameCombo.setLayoutData(data);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(componentNameCombo,
-          XSDEditorCSHelpIds.GENERAL_TAB__ATTRIBUTE__NAME);
-
-      // dummy
-      getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-    }
-    
-    // ------------------------------------------------------------------
-    // typeLabel
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, typeLabel); //$NON-NLS-1$
-
-    // ------------------------------------------------------------------
-    // typeCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    typeCombo = getWidgetFactory().createCCombo(composite);
-    typeCombo.setLayoutData(data);
-    typeCombo.addSelectionListener(this);
-    typeCombo.addListener(SWT.Traverse, this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(typeCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ATTRIBUTE__TYPE);
-
-    // dummy
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-    
-    // ------------------------------------------------------------------
-    // UsageLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    CLabel useLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_USAGE"));
-    useLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // UsageCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    usageCombo = getWidgetFactory().createCCombo(composite);
-    usageCombo.setLayoutData(data);
-    usageCombo.addSelectionListener(this);
-    usageCombo.add("");
-    usageCombo.add("required"); //$NON-NLS-1$
-    usageCombo.add("optional"); //$NON-NLS-1$
-    usageCombo.add("prohibited"); //$NON-NLS-1$
-    usageCombo.addSelectionListener(this);
-    
-    // dummy
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-    
-    // ------------------------------------------------------------------
-    // defaultLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    CLabel defaultLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_VALUE_COLON);
-    defaultLabel.setLayoutData(data);
-    
-    Composite radio = getWidgetFactory().createComposite(composite);
-    radio.setLayout(new RowLayout());
-    
-    defaultButton = new Button(radio, SWT.RADIO);
-    defaultButton.setText(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_DEFAULT);
-    defaultButton.setBackground(parent.getBackground());
-    defaultButton.addSelectionListener(this);
-    
-    fixedButton = new Button(radio, SWT.RADIO);
-    fixedButton.setText(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_FIXED);  
-    fixedButton.setBackground(parent.getBackground());
-    fixedButton.addSelectionListener(this);
-    
-    // dummy
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-    
-    // dummy
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-
-    // ------------------------------------------------------------------
-    // defaultText
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    defaultOrFixedText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-    defaultOrFixedText.setLayoutData(data);
-    applyAllListeners(defaultOrFixedText);
-    
-    //PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-    //		XSDEditorCSHelpIds.GENERAL_TAB__ATTRIBUTE__DEFAULT);
-    
-    // dummy
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-    
-    // ------------------------------------------------------------------
-    // FormLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    CLabel formLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_FORM);
-    formLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // FormCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    formCombo = getWidgetFactory().createCCombo(composite);
-    formCombo.setLayoutData(data);
-    formCombo.addSelectionListener(this);
-    formCombo.add("");
-    formCombo.add("qualified"); //$NON-NLS-1$
-    formCombo.add("unqualified"); //$NON-NLS-1$
-    formCombo.addSelectionListener(this);
-    
-    // dummy
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-  }
-
-  private void fillTypesCombo()
-  {
-    IEditorPart editor = getActiveEditor();
-    XSDTypeReferenceEditManager manager = (XSDTypeReferenceEditManager)editor.getAdapter(XSDTypeReferenceEditManager.class);
-    if (manager != null)
-    {
-      ComponentSpecification[] items = manager.getQuickPicks();
-
-      typeCombo.removeAll();
-      typeCombo.add(Messages._UI_ACTION_BROWSE);
-      typeCombo.add(Messages._UI_ACTION_NEW);
-      for (int i = 0; i < items.length; i++)
-      {
-        typeCombo.add(items[i].getName());
-      }
-
-      XSDAttributeDeclaration namedComponent = ((XSDAttributeDeclaration) input).getResolvedAttributeDeclaration();
-      XSDTypeDefinition namedComponentType = namedComponent.getType();
-      if (namedComponentType != null)
-      {
-        String currentTypeName = namedComponentType.getQName(xsdSchema); // no
-                                                                          // prefix
-        ComponentSpecification ret = getComponentSpecFromQuickPickForValue(currentTypeName, manager);
-        if (ret == null) // not in quickPick
-          typeCombo.add(currentTypeName);
-      }
-    }
-  }
-  
-  private ComponentSpecification getComponentSpecFromQuickPickForValue(String value, ComponentReferenceEditManager editManager)
-  {
-    if (editManager != null)
-    {  
-      ComponentSpecification[] quickPicks = editManager.getQuickPicks();
-      if (quickPicks != null)
-      {
-        for (int i=0; i < quickPicks.length; i++)
-        {
-          ComponentSpecification componentSpecification = quickPicks[i];
-          if (value.equals(componentSpecification.getName()))
-          {
-            return componentSpecification;
-          }                
-        }  
-      }
-    }
-    return null;
-  }
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    super.refresh();
-
-    setListenerEnabled(false);
-
-    // refresh name
-
-    nameText.setText(""); //$NON-NLS-1$
-    if (input instanceof XSDAttributeDeclaration)
-    {
-      XSDAttributeDeclaration namedComponent = ((XSDAttributeDeclaration) input).getResolvedAttributeDeclaration();
-
-      String name = namedComponent.getName();
-      if (name != null)
-      {
-        nameText.setText(name);
-      }
-    }
-    
-    if (isAttributeReference)
-    {
-      refreshRefCombo();
-    }
-
-    // refresh type
-
-    typeCombo.setText(""); //$NON-NLS-1$
-    if (input != null)
-    {
-      if (input instanceof XSDAttributeDeclaration)
-      {
-        XSDAttributeDeclaration xsdAttribute = (XSDAttributeDeclaration) input;
-        isAttributeReference = ((XSDAttributeDeclaration)input).isAttributeDeclarationReference();
-        XSDTypeDefinition typeDef = xsdAttribute.getResolvedAttributeDeclaration().getTypeDefinition();
-        boolean isAnonymous = xsdAttribute.getAnonymousTypeDefinition() != null;
-
-        if (isAnonymous)
-        {
-          typeCombo.setText("**anonymous**"); //$NON-NLS-1$
-        }
-        else
-        {
-          fillTypesCombo();
-          if (typeDef != null)
-          {
-            typeName = typeDef.getQName(xsdSchema);
-            if (typeName == null)
-            {
-              typeName = ""; //$NON-NLS-1$
-            }
-            typeCombo.setText(typeName);
-          }
-          else
-          {
-            typeCombo.setText(Messages.UI_NO_TYPE); //$NON-NLS-1$
-          }
-        }
-
-        usageCombo.setText("");
-        usageCombo.setEnabled(!xsdAttribute.isGlobal());
-        
-        Element element = xsdAttribute.getElement();
-        boolean hasUseAttribute = false;
-        if (element != null)
-        {
-          hasUseAttribute = element.hasAttribute(XSDConstants.USE_ATTRIBUTE);
-          if (hasUseAttribute)
-          {
-            String usage = element.getAttribute(XSDConstants.USE_ATTRIBUTE);
-            usageCombo.setText(usage);
-          }
-        }
-        
-        defaultOrFixedText.setText(""); //$NON-NLS-1$
-       
-        boolean hasDefaultAttribute = false, hasFixedAttribute = false;
-        if (element != null)
-        {
-          hasDefaultAttribute = element.hasAttribute(XSDConstants.DEFAULT_ATTRIBUTE);
-          hasFixedAttribute = element.hasAttribute(XSDConstants.FIXED_ATTRIBUTE);
-
-          // Case where no fixed or default attributes exist, so ensure one of the radio buttons is selected
-          if (!hasDefaultAttribute && !hasFixedAttribute)
-          {
-            if (!defaultButton.getSelection() && !fixedButton.getSelection()) // if none are selected then pick fixed
-              fixedButton.setSelection(true);
-          }
-          else
-          {
-            // if both are present in source (an error!), assume that *fixed* takes "precedence"
-            defaultButton.setSelection(!hasFixedAttribute && hasDefaultAttribute);
-            fixedButton.setSelection(hasFixedAttribute);
-            if (hasDefaultAttribute)
-            {
-              String theDefault = element.getAttribute(XSDConstants.DEFAULT_ATTRIBUTE);
-            	defaultOrFixedText.setText(theDefault);
-            }
-            if (hasFixedAttribute) // will overwrite default if both present
-	          {
-        	    String fixed = element.getAttribute(XSDConstants.FIXED_ATTRIBUTE);
-        	    defaultOrFixedText.setText(fixed);
-	          }
-          }
-        }
-        
-        formCombo.setText(""); 
-        formCombo.setEnabled(!xsdAttribute.isGlobal() && !isAttributeReference);
-        boolean hasFormAttribute = false;
-        if (element != null)
-        {
-          hasFormAttribute = element.hasAttribute(XSDConstants.FORM_ATTRIBUTE);
-          if (hasFormAttribute)
-          {
-            String form = element.getAttribute(XSDConstants.FORM_ATTRIBUTE);
-            formCombo.setText(form);
-          }
-        }
-      }
-    }
-
-    setListenerEnabled(true);
-  }
-
-  public boolean shouldUseExtraSpace()
-  {
-    return false;
-  }
-  
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {
-    if (e.widget == typeCombo)
-    {
-      String selection = typeCombo.getText();
-      if (shouldPerformComboSelection(SWT.DefaultSelection, selection))
-        handleWidgetSelection(e);
-    } else if (e.widget == componentNameCombo)
-    {
-      String selection = componentNameCombo.getText();
-      if (shouldPerformComboSelection(SWT.DefaultSelection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == typeCombo)
-    {
-      String selection = typeCombo.getText();
-      if (shouldPerformComboSelection(SWT.Selection, selection))
-        handleWidgetSelection(e);
-    } else if (e.widget == componentNameCombo)
-    {
-      String selection = componentNameCombo.getText();
-      if (shouldPerformComboSelection(SWT.Selection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-  
-  private void handleWidgetSelection(SelectionEvent e)
-  {
-    if (e.widget == typeCombo)
-    {
-      IEditorPart editor = getActiveEditor();
-      if (editor == null) return;
-      ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDTypeReferenceEditManager.class);
-
-      String selection = typeCombo.getText();
-      ComponentSpecification newValue;
-      IComponentDialog dialog= null;
-      if ( selection.equals(Messages._UI_ACTION_BROWSE))
-      {
-        dialog = manager.getBrowseDialog();
-        ((XSDSearchListDialogDelegate) dialog).showComplexTypes(false);
-      }
-      else if ( selection.equals(Messages._UI_ACTION_NEW))
-      {
-        dialog = manager.getNewDialog();
-        ((NewTypeDialog) dialog).allowComplexType(false);
-      }
-
-      if (dialog != null)
-      {
-        if (dialog.createAndOpen() == Window.OK)
-        {
-          newValue = dialog.getSelectedComponent();
-          XSDAttributeDeclaration xsdAttribute = ((XSDAttributeDeclaration) input).getResolvedAttributeDeclaration();
-          manager.modifyComponentReference(xsdAttribute, newValue);
-        }
-        else{
-        	typeCombo.setText(typeName);
-        }
-      }
-      else //use the value from selected quickPick item
-      {
-        newValue = getComponentSpecFromQuickPickForValue(selection, manager);
-        if (newValue != null)
-          manager.modifyComponentReference(input, newValue);
-      }
-    }
-    else if (e.widget == componentNameCombo)
-    {
-      IEditorPart editor = getActiveEditor();
-      if (editor == null) return;
-      ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDAttributeReferenceEditManager.class);
-
-      String selection = componentNameCombo.getText();
-      ComponentSpecification newValue;
-      IComponentDialog dialog= null;
-      if ( selection.equals(Messages._UI_ACTION_BROWSE))
-      {
-        dialog = manager.getBrowseDialog();
-      }
-      else if ( selection.equals(Messages._UI_ACTION_NEW))
-      {
-        dialog = manager.getNewDialog();
-      }
-
-      if (dialog != null)
-      {
-        if (dialog.createAndOpen() == Window.OK)
-        {
-          newValue = dialog.getSelectedComponent();
-          manager.modifyComponentReference(input, newValue);
-        }
-        else
-        {
-          componentNameCombo.setText(refName);
-        }
-      }
-      else //use the value from selected quickPick item
-      {
-        newValue = getComponentSpecFromQuickPickForValue(selection, manager);
-        if (newValue != null)
-          manager.modifyComponentReference(input, newValue);
-      }
-    }
-    else 
-    {
-      XSDAttributeDeclaration xsdAttribute = (XSDAttributeDeclaration) input;
-      Element element = xsdAttribute.getElement();
-      if (e.widget == usageCombo)
-      {	      
-        final String newValue = usageCombo.getText();
-        if (element != null)
-        {
-          PropertiesChangeCommand command = new PropertiesChangeCommand(element, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_USAGE)
-          {
-            protected void doExecuteSteps()
-            {
-              if (newValue.length() == 0)
-                element.removeAttribute(XSDConstants.USE_ATTRIBUTE);
-              else
-                element.setAttribute(XSDConstants.USE_ATTRIBUTE, newValue);
-            }
-          };
-          getCommandStack().execute(command);
-        }
-      }
-      else if (e.widget == formCombo)
-      {
-        final String newValue = formCombo.getText();
-        if (element != null)
-        {
-          PropertiesChangeCommand command = new PropertiesChangeCommand(element, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_FORM)
-          {
-            protected void doExecuteSteps()
-            {
-              if (newValue.length() == 0)
-                element.removeAttribute(XSDConstants.FORM_ATTRIBUTE);
-              else
-                element.setAttribute(XSDConstants.FORM_ATTRIBUTE, newValue);
-            }
-          };
-          getCommandStack().execute(command);
-        }
-      }
-      else if (e.widget == defaultButton)
-      {
-        boolean newValue = defaultButton.getSelection();
-        if (element != null)
-        {
-          if (newValue)
-          {
-            if (element.hasAttribute(XSDConstants.FIXED_ATTRIBUTE))
-            {
-              final String value = element.getAttribute(XSDConstants.FIXED_ATTRIBUTE);
-
-              PropertiesChangeCommand command = new PropertiesChangeCommand(element, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_DEFAULT)
-              {
-                protected void doExecuteSteps()
-                {
-                  element.removeAttribute(XSDConstants.FIXED_ATTRIBUTE);
-                  element.setAttribute(XSDConstants.DEFAULT_ATTRIBUTE, value);
-                }
-              };
-              getCommandStack().execute(command);
-            }
-          }
-        }
-      }
-      else if (e.widget == fixedButton)
-      {
-        boolean newValue = fixedButton.getSelection();
-        if (element != null)
-        {
-          if (newValue)
-          {
-            if (element.hasAttribute(XSDConstants.DEFAULT_ATTRIBUTE))
-            {
-              final String value = element.getAttribute(XSDConstants.DEFAULT_ATTRIBUTE);
-              PropertiesChangeCommand command = new PropertiesChangeCommand(element, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_FIXED)
-              {
-                protected void doExecuteSteps()
-                {
-                  element.removeAttribute(XSDConstants.DEFAULT_ATTRIBUTE);
-                  element.setAttribute(XSDConstants.FIXED_ATTRIBUTE, value);
-                }
-              };
-              getCommandStack().execute(command);
-            }
-          }
-        }
-      }
-    }
-    super.doWidgetSelected(e);
-  }
-
-  protected void doHandleEvent(Event event)
-  {
-    if (event.type == SWT.Traverse) {
-      if (event.detail == SWT.TRAVERSE_ARROW_NEXT || event.detail == SWT.TRAVERSE_ARROW_PREVIOUS) {
-        isTraversing = true;
-        return;
-      }
-    }
-    super.doHandleEvent(event);
-    if (event.widget == nameText)
-    {
-      if (!nameText.getEditable())
-        return;
-
-      String newValue = nameText.getText().trim();
-      if (input instanceof XSDAttributeDeclaration)
-      {
-        XSDAttributeDeclaration namedComponent = ((XSDAttributeDeclaration) input).getResolvedAttributeDeclaration();
-
-        if (!validateSection())
-          return;
-
-        Command command = null;
-
-        // Make sure an actual name change has taken place
-        String oldName = namedComponent.getName();
-        if (!newValue.equals(oldName))
-        {
-          command = new UpdateNameCommand(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ACTION_RENAME, namedComponent, newValue);
-        }
-
-        if (command != null && getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-        }
-        
-        if (isAttributeReference)
-        {
-          XSDAttributeDeclaration attrRef = (XSDAttributeDeclaration)input;
-          String qname = attrRef.getResolvedAttributeDeclaration().getQName();
-          attrRef.getElement().setAttribute(XSDConstants.REF_ATTRIBUTE, qname);
-          
-//          TypesHelper helper = new TypesHelper(xsdSchema);
-//          List items = new ArrayList();
-//          items = helper.getGlobalElements();
-//          items.add(0, "");
-//          componentNameCombo.setItems((String [])items.toArray(new String[0]));
-//
-//          refreshRefCombo();
-        }
-
-      }
-    }
-    else if (event.widget == defaultOrFixedText)
-    {
-      XSDAttributeDeclaration xsdAttribute = (XSDAttributeDeclaration) input;
-      String newValue = defaultOrFixedText.getText();
-      Element element = xsdAttribute.getElement();
-      if (element != null)
-      {
-        if (newValue.length() == 0)
-        {
-          PropertiesChangeCommand command = new PropertiesChangeCommand(element, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_VALUE)
-          {
-            protected void doExecuteSteps()
-            {
-              element.removeAttribute(XSDConstants.FIXED_ATTRIBUTE);
-              element.removeAttribute(XSDConstants.DEFAULT_ATTRIBUTE);
-            }
-          };
-          getCommandStack().execute(command);
-        }
-        else
-        {
-          UpdateAttributeValueCommand command = null;
-          if (fixedButton.getSelection())
-          {
-            command = new UpdateAttributeValueCommand(element, XSDConstants.FIXED_ATTRIBUTE, newValue, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_FIXED)
-            {
-              protected void doPostProcessing()
-              {
-                element.removeAttribute(XSDConstants.DEFAULT_ATTRIBUTE);
-              }
-            };
-          }
-          else
-          {
-            command = new UpdateAttributeValueCommand(element, XSDConstants.DEFAULT_ATTRIBUTE, newValue, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_DEFAULT)
-            {
-              protected void doPostProcessing()
-              {
-                element.removeAttribute(XSDConstants.FIXED_ATTRIBUTE);
-              }
-            };
-          }
-          command.setDeleteIfEmpty(true);
-          getCommandStack().execute(command);
-        }
-      }
-    }
-  }
-  
-  protected boolean validateSection()
-  {
-    if (nameText == null || nameText.isDisposed())
-      return true;
-
-    setErrorMessage(null);
-
-    String name = nameText.getText().trim();
-
-    // validate against NCName
-    if (name.length() < 1 || !XMLChar.isValidNCName(name))
-    {
-      setErrorMessage(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ERROR_INVALID_NAME);
-      return false;
-    }
-
-    return true;
-  }
-  
-  public void dispose()
-  {
-    if (componentNameCombo != null && !componentNameCombo.isDisposed())
-    {
-      componentNameCombo.removeSelectionListener(this);
-      componentNameCombo.removeListener(SWT.Traverse, this);
-    }
-    if (nameText != null && !nameText.isDisposed())
-      removeListeners(nameText);
-    if (typeCombo != null && !typeCombo.isDisposed())
-    {
-      typeCombo.removeSelectionListener(this);
-      typeCombo.removeListener(SWT.Traverse, this);
-    }
-    super.dispose();
-  }
-
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    setListenerEnabled(false);
-    init();
-    relayout();
-    
-    setListenerEnabled(true);
-  }
-  
-  protected void init()
-  {
-    if (input instanceof XSDAttributeDeclaration)
-    {
-      XSDAttributeDeclaration xsdAttribute = (XSDAttributeDeclaration) input;
-      isAttributeReference = xsdAttribute.isAttributeDeclarationReference();
-      hideHyperLink = !xsdAttribute.isGlobal() || isAttributeReference;
-    }
-  }
-
-  protected void relayout()
-  {
-    Composite parentComposite = composite.getParent();
-    parentComposite.getParent().setRedraw(false);
-
-    if (parentComposite != null && !parentComposite.isDisposed())
-    {
-      Control[] children = parentComposite.getChildren();
-      for (int i = 0; i < children.length; i++)
-      {
-        children[i].dispose();
-      }
-    }
-
-    // Now initialize the new handler
-    createContents(parentComposite);
-    parentComposite.getParent().layout(true, true);
-
-    // Now turn painting back on
-    parentComposite.getParent().setRedraw(true);
-    refresh();
-  }
-  
-  protected void refreshRefCombo()
-  {
-    componentNameCombo.setText(""); //$NON-NLS-1$
-    fillComponentNameCombo();
-  }
-  
-  private void fillComponentNameCombo()
-  {
-    IEditorPart editor = getActiveEditor();
-    ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDAttributeReferenceEditManager.class);    
-    
-    componentNameCombo.removeAll();
-    componentNameCombo.add(Messages._UI_ACTION_BROWSE);
-    componentNameCombo.add(Messages._UI_ACTION_NEW);
-    ComponentSpecification[] quickPicks = manager.getQuickPicks();
-    if (quickPicks != null)
-    {
-      for (int i=0; i < quickPicks.length; i++)
-      {
-        ComponentSpecification componentSpecification = quickPicks[i];
-        componentNameCombo.add(componentSpecification.getName());
-      }  
-    }
-    ComponentSpecification[] history = manager.getHistory();
-    if (history != null)
-    {
-      for (int i=0; i < history.length; i++)
-      {
-        ComponentSpecification componentSpecification = history[i];
-        componentNameCombo.add(componentSpecification.getName());
-      }  
-    }
-    
-    XSDAttributeDeclaration namedComponent = (XSDAttributeDeclaration) input;
-    Element element = namedComponent.getElement();
-    if (element != null)
-    {
-      String attrValue = element.getAttribute(XSDConstants.REF_ATTRIBUTE);
-      if (attrValue == null)
-      {
-        attrValue = ""; //$NON-NLS-1$
-      }
-      ComponentSpecification ret = getComponentSpecFromQuickPickForValue(attrValue, manager);
-      if (ret == null)
-      {
-        componentNameCombo.add(attrValue);
-      }
-      componentNameCombo.setText(attrValue);
-      refName = attrValue;
-    } 
-  }
-
-  protected class PropertiesChangeCommand extends BaseCommand
-  {
-    protected Element element;
-    public PropertiesChangeCommand(Element element, String label)
-    {
-      super(NLS.bind(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ACTION_CHANGE, label));
-      this.element = element;
-    }
-    
-    public void execute()
-    {
-      try
-      {
-        beginRecording(element);
-        doExecuteSteps();
-      }
-      finally
-      {
-        endRecording();
-      }
-    }
-    
-    protected void doExecuteSteps()
-    {
-      
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAttributeGroupDefinitionSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAttributeGroupDefinitionSection.java
deleted file mode 100644
index 8a409f0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDAttributeGroupDefinitionSection.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDAttributeGroupDefinitionSection extends RefactoringSection
-{
-  protected Text nameText;
-  protected CCombo refCombo;
-  boolean isReference;
-
-  public XSDAttributeGroupDefinitionSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    if (isReference)
-    {
-      // ------------------------------------------------------------------
-      // Ref Label
-      // ------------------------------------------------------------------
-      GridData data = new GridData();
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      CLabel refLabel = getWidgetFactory().createCLabel(composite, XSDConstants.REF_ATTRIBUTE + ":");  //$NON-NLS-1$
-      refLabel.setLayoutData(data);
-
-      // ------------------------------------------------------------------
-      // Ref Combo
-      // ------------------------------------------------------------------
-
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-
-      refCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-      refCombo.addSelectionListener(this);
-      refCombo.setLayoutData(data);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(refCombo,
-      		XSDEditorCSHelpIds.GENERAL_TAB__ATTRIBUTEGROUP_REFS__REF);
-    }
-    else
-    {
-      // ------------------------------------------------------------------
-      // NameLabel
-      // ------------------------------------------------------------------
-      GridData data = new GridData();
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      CLabel nameLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_NAME);
-      nameLabel.setLayoutData(data);
-
-      // ------------------------------------------------------------------
-      // NameText
-      // ------------------------------------------------------------------
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-      nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-      nameText.setLayoutData(data);
-      applyAllListeners(nameText);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-      		XSDEditorCSHelpIds.GENERAL_TAB__ATTRIBUTEGROUP__NAME);
-
-      // ------------------------------------------------------------------
-      // Refactor/rename hyperlink 
-      // ------------------------------------------------------------------      
-      if (!hideHyperLink)
-      {
-        createRenameHyperlink(composite);
-        setRenameHyperlinkEnabled(!isReference);
-      }
-      else
-      {
-        getWidgetFactory().createCLabel(composite, "");
-      }
-    }
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-
-    if (isReadOnly)
-    {
-      composite.setEnabled(false);
-    }
-    else
-    {
-      composite.setEnabled(true);
-    }
-
-    setListenerEnabled(false);
-
-    XSDNamedComponent namedComponent = (XSDNamedComponent)input;
-    
-    if (isReference)
-    {
-      Element element = namedComponent.getElement();
-      if (element != null)
-      {
-        String attrValue = element.getAttribute(XSDConstants.REF_ATTRIBUTE);
-        if (attrValue == null)
-        {
-          attrValue = ""; //$NON-NLS-1$
-        }
-        refCombo.setText(attrValue);
-      }
-    }
-    else
-    {
-      // refresh name
-      nameText.setText(""); //$NON-NLS-1$
-
-      String name = namedComponent.getName();
-      if (name != null)
-      {
-        nameText.setText(name);
-      }
-    }
-    setListenerEnabled(true);
-  }
-
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    init();
-    relayout();
-    
-    if (isReference)
-    {
-      TypesHelper helper = new TypesHelper(xsdSchema);
-      List items = new ArrayList();
-      items = helper.getGlobalAttributeGroups();
-      items.add(0, ""); //$NON-NLS-1$
-      refCombo.setItems((String [])items.toArray(new String[0]));
-    }
-  }
-  
-  protected void relayout()
-  {
-    Composite parentComposite = composite.getParent();
-    parentComposite.getParent().setRedraw(false);
-
-    if (parentComposite != null && !parentComposite.isDisposed())
-    {
-      Control[] children = parentComposite.getChildren();
-      for (int i = 0; i < children.length; i++)
-      {
-        children[i].dispose();
-      }
-    }
-
-    // Now initialize the new handler
-    createContents(parentComposite);
-    parentComposite.getParent().layout(true, true);
-
-    // Now turn painting back on
-    parentComposite.getParent().setRedraw(true);
-    refresh();
-  }
-  
-  protected void init()
-  {
-    if (input instanceof XSDAttributeGroupDefinition)
-    {
-      XSDAttributeGroupDefinition group = (XSDAttributeGroupDefinition) input;
-      isReference = group.isAttributeGroupDefinitionReference();
-      hideHyperLink = isReference;
-    }
-  }
-  
-  public void doHandleEvent(Event event)
-  {
-    super.doHandleEvent(event);
-    if (event.widget == nameText)
-    {
-      String newValue = nameText.getText().trim();
-      if (input instanceof XSDNamedComponent)
-      {
-        XSDNamedComponent namedComponent = (XSDNamedComponent) input;
-        if (!validateSection())
-          return;
-
-        Command command = null;
-
-        // Make sure an actual name change has taken place
-        String oldName = namedComponent.getName();
-        if (!newValue.equals(oldName))
-        {
-          command = new UpdateNameCommand(Messages._UI_ACTION_RENAME, namedComponent, newValue);
-        }
-
-        if (command != null && getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-        }
-        // doReferentialIntegrityCheck(namedComponent, newValue);
-      }
-    }
-  }
-
-  protected boolean validateSection()
-  {
-    if (nameText == null || nameText.isDisposed())
-      return true;
-
-    setErrorMessage(null);
-
-    String name = nameText.getText().trim();
-
-    // validate against NCName
-    if (name.length() < 1 || !XMLChar.isValidNCName(name))
-    {
-      setErrorMessage(Messages._UI_ERROR_INVALID_NAME);
-      return false;
-    }
-
-    return true;
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == refCombo)
-    {
-      String newValue = refCombo.getText();
-      if (input instanceof XSDNamedComponent)
-      {
-        XSDNamedComponent namedComponent = (XSDNamedComponent)input;
-        Element element = namedComponent.getElement();
-
-        if (namedComponent instanceof XSDAttributeGroupDefinition)
-        {
-          element.setAttribute(XSDConstants.REF_ATTRIBUTE, newValue);
-          XSDDirectivesManager.removeUnusedXSDImports(namedComponent.getSchema());
-        }
-      }
-    }
-    super.doWidgetSelected(e);
-  }
-
-
-  public void dispose()
-  {
-    if (nameText != null && !nameText.isDisposed())
-      removeListeners(nameText);
-    super.dispose();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDComplexTypeAdvancedSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDComplexTypeAdvancedSection.java
deleted file mode 100644
index 0c2f82b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDComplexTypeAdvancedSection.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDComplexTypeAdvancedSection extends AbstractSection
-{
-  private static final String EMPTY = ""; //$NON-NLS-1$
-  private static final String FALSE = "false"; //$NON-NLS-1$
-  private static final String TRUE = "true"; //$NON-NLS-1$
-  protected CCombo blockCombo;
-  protected CCombo finalCombo;
-  protected CCombo mixedCombo;
-  protected CCombo abstractCombo;
-
-  private String finalValues[] = { EMPTY, XSDConstants.RESTRICTION_ELEMENT_TAG, //$NON-NLS-1$
-      XSDConstants.EXTENSION_ELEMENT_TAG, "#" + XSDConstants.ALL_ELEMENT_TAG }; //$NON-NLS-1$
-
-  private String blockValues[] = { EMPTY, XSDConstants.RESTRICTION_ELEMENT_TAG, //$NON-NLS-1$
-      XSDConstants.EXTENSION_ELEMENT_TAG, "#" + XSDConstants.ALL_ELEMENT_TAG }; //$NON-NLS-1$
-
-  private String booleanValues[] = { EMPTY, TRUE, FALSE }; // TODO use some
-                                                            // external string
-                                                            // here instead
-  protected void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 2;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // AbstractLabel
-    // ------------------------------------------------------------------
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel abstractLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_ABSTRACT + ":");
-    abstractLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // AbstractCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    abstractCombo = getWidgetFactory().createCCombo(composite);
-    abstractCombo.setLayoutData(data);
-    abstractCombo.setEditable(false);
-
-    abstractCombo.setItems(booleanValues);
-    abstractCombo.addSelectionListener(this);
-
-    // ------------------------------------------------------------------
-    // BlockLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel blockLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_BLOCK + ":");
-    blockLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // BlockCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    blockCombo = getWidgetFactory().createCCombo(composite);
-    blockCombo.setLayoutData(data);
-    blockCombo.setEditable(false);
-
-    blockCombo.setItems(blockValues);
-    blockCombo.addSelectionListener(this);
-
-    // ------------------------------------------------------------------
-    // FinalLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel finalLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_FINAL + ":");
-    finalLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // FinalCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    finalCombo = getWidgetFactory().createCCombo(composite);
-    finalCombo.setLayoutData(data);
-    finalCombo.setEditable(false);
-
-    finalCombo.setItems(finalValues);
-    finalCombo.addSelectionListener(this);
-    
-    // ------------------------------------------------------------------
-    // Mixed Label
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel mixedLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_MIXED + ":");
-    mixedLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // Mixed Combo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    mixedCombo = getWidgetFactory().createCCombo(composite);
-    mixedCombo.setLayoutData(data);
-    mixedCombo.setEditable(false);
-
-    mixedCombo.setItems(booleanValues);
-    mixedCombo.addSelectionListener(this);
-
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) input;
-    if (e.widget == blockCombo)
-    {
-      String value = blockCombo.getText();
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(complexType.getElement(), XSDConstants.BLOCK_ATTRIBUTE, value, Messages._UI_LABEL_BLOCK);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-    else if (e.widget == finalCombo)
-    {
-      String value = finalCombo.getText();
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(complexType.getElement(), XSDConstants.FINAL_ATTRIBUTE, value, Messages._UI_LABEL_FINAL);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-    else if (e.widget == abstractCombo)
-    {
-      String value = abstractCombo.getText();
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(complexType.getElement(), XSDConstants.ABSTRACT_ATTRIBUTE, value, Messages._UI_LABEL_ABSTRACT);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-    else if (e.widget == mixedCombo)
-    {
-      String value = mixedCombo.getText();
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(complexType.getElement(), XSDConstants.MIXED_ATTRIBUTE, value, Messages._UI_LABEL_MIXED);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-
-    setListenerEnabled(false);
-    try
-    {
-      if (input instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) input;
-        
-        boolean enabled = true; 
-        if (complexType.getContainer() instanceof XSDSchema)
-        {
-          enabled = !isReadOnly;
-        }
-        else
-        {
-          enabled = false;
-        }
-        
-        if (complexType.getElement().hasAttribute(XSDConstants.BLOCK_ATTRIBUTE))
-        {
-          String blockAttValue = complexType.getElement().getAttribute(XSDConstants.BLOCK_ATTRIBUTE);
-          blockCombo.setText(blockAttValue);
-        }
-        else
-        {
-          blockCombo.setText(EMPTY);
-        }
-        blockCombo.setEnabled(enabled);
-
-        if (complexType.getElement().hasAttribute(XSDConstants.FINAL_ATTRIBUTE))
-        {
-        	String finalAttValue = complexType.getElement().getAttribute(XSDConstants.FINAL_ATTRIBUTE);
-            finalCombo.setText(finalAttValue);
-        }
-        else
-        {
-          finalCombo.setText(EMPTY);
-        }
-        finalCombo.setEnabled(enabled);
-
-        if (complexType.getElement().hasAttribute(XSDConstants.ABSTRACT_ATTRIBUTE))
-        {
-          boolean absAttValue = complexType.isAbstract();
-          if (absAttValue)
-            abstractCombo.setText(TRUE);
-          else
-            abstractCombo.setText(FALSE);
-        }
-        else
-        {
-          abstractCombo.setText(EMPTY);
-        }
-        abstractCombo.setEnabled(enabled);
-        
-        if (complexType.getElement().hasAttribute(XSDConstants.MIXED_ATTRIBUTE))
-        {
-          boolean mixedValue = complexType.isMixed();
-          if (mixedValue)
-            mixedCombo.setText(TRUE);
-          else
-            mixedCombo.setText(FALSE);
-        }
-        else
-        {
-          mixedCombo.setText(EMPTY);
-        }
-
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    setListenerEnabled(true);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDComplexTypeSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDComplexTypeSection.java
deleted file mode 100644
index 05134a8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDComplexTypeSection.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateComplexTypeDerivationBy;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDComplexTypeBaseTypeEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDDerivationMethod;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDComplexTypeSection extends RefactoringSection implements SelectionListener
-{
-  protected Text nameText;
-  protected CCombo baseTypeCombo;
-  protected CCombo derivedByCombo;
-  private String derivedByChoicesComboValues[] = { "", XSDConstants.RESTRICTION_ELEMENT_TAG, XSDConstants.EXTENSION_ELEMENT_TAG }; //$NON-NLS-1$
-
-  public XSDComplexTypeSection()
-  {
-    super();
-  }
-
-  /**
-   * Contents of the property tab
-   * 
-   * NameLabel NameText DummyLabel BaseTypeLabel BaseTypeCombo BaseTypeButton
-   * DerivedByLabel DerivedByCombo
-   */
-  public void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // NameLabel
-    // ------------------------------------------------------------------
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    CLabel nameLabel = getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_NAME);
-    nameLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // NameText
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-    nameText.setLayoutData(data);
-    applyAllListeners(nameText);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-    		XSDEditorCSHelpIds.GENERAL_TAB__COMPLEX_TYPE__NAME);
-
-    // ------------------------------------------------------------------
-    // Refactor/rename hyperlink 
-    // ------------------------------------------------------------------
-    createRenameHyperlink(composite);
-    
-    // ------------------------------------------------------------------
-    // BaseTypeLabel
-    // ------------------------------------------------------------------
-
-    getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_INHERIT_FROM); //$NON-NLS-1$
-
-    // ------------------------------------------------------------------
-    // BaseTypeCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    baseTypeCombo = getWidgetFactory().createCCombo(composite);
-    baseTypeCombo.setEditable(false);
-    baseTypeCombo.setLayoutData(data);
-    baseTypeCombo.addSelectionListener(this);
-    baseTypeCombo.addListener(SWT.Traverse, this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(baseTypeCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__COMPLEX_TYPE__INHERIT_FROM);
-
-
-    // ------------------------------------------------------------------
-    // Spacer label
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, "");
-
-    // ------------------------------------------------------------------
-    // DerivedByLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel derivedByLabel = getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_INHERIT_BY); //$NON-NLS-1$
-    derivedByLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // DerivedByCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    derivedByCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    derivedByCombo.setLayoutData(data);
-    derivedByCombo.setItems(derivedByChoicesComboValues);
-    derivedByCombo.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(derivedByCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__COMPLEX_TYPE__INHERIT_BY);
-
-    // ------------------------------------------------------------------
-    // Spacer label
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, "");
-  }
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    super.refresh();
-    if (Display.getCurrent() == null)
-      return;
-
-    setListenerEnabled(false);
-    showLink(!hideHyperLink);
-
-    try
-    {
-      nameText.setText(""); //$NON-NLS-1$
-      baseTypeCombo.setText(""); //$NON-NLS-1$
-      fillTypesCombo();
-
-      if (input instanceof XSDComplexTypeDefinition)
-      {
-        XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) input;
-        String name = complexType.getName();
-        if (name == null)
-          name = ""; //$NON-NLS-1$
-
-        boolean isAnonymousType = name.equals("") ? true : false; //$NON-NLS-1$
-        if (isAnonymousType)
-        {
-          nameText.setText("**anonymous**"); //$NON-NLS-1$
-          nameText.setEditable(false);
-        }
-        else
-        {
-          nameText.setText(name);
-          nameText.setEditable(true);
-        }
-
-        XSDTypeDefinition baseTypeDefinition = complexType.getBaseTypeDefinition();
-        String baseType = ""; //$NON-NLS-1$
-        if (baseTypeDefinition != null)
-        {
-          baseType = baseTypeDefinition.getName();
-          if (baseType == null)
-          {
-            baseType = ""; //$NON-NLS-1$
-          }
-          else if (baseType.equals("anyType"))
-          {
-            baseType = ""; //$NON-NLS-1$
-          }
-        }
-        baseTypeCombo.setText(baseType);
-
-        derivedByCombo.setText(""); //$NON-NLS-1$
-        int derivationMethod = complexType.getDerivationMethod().getValue();
-        XSDDOMHelper domHelper = new XSDDOMHelper();
-        if(domHelper.getDerivedByElementFromComplexType(complexType.getElement()) != null) {
-	        if (derivationMethod == XSDDerivationMethod.EXTENSION)
-	        {
-	          derivedByCombo.setText(XSDConstants.EXTENSION_ELEMENT_TAG);
-	        }
-	        else if (derivationMethod == XSDDerivationMethod.RESTRICTION)
-	        {
-	          derivedByCombo.setText(XSDConstants.RESTRICTION_ELEMENT_TAG);
-	        }
-        }
-      }
-
-    }
-    finally
-    {
-      setListenerEnabled(true);
-    }
-  }
-
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {
-    if (e.widget == baseTypeCombo)
-    {
-      String selection = baseTypeCombo.getText();
-      if (shouldPerformComboSelection(SWT.DefaultSelection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == baseTypeCombo)
-    {
-      String selection = baseTypeCombo.getText();
-      if (shouldPerformComboSelection(SWT.Selection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-  
-  private void handleWidgetSelection(SelectionEvent e)
-  {
-    if (e.widget == baseTypeCombo)
-    {
-      IEditorPart editor = getActiveEditor();
-      if (editor == null) return;
-      ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDComplexTypeBaseTypeEditManager.class);
-
-      String selection = baseTypeCombo.getText();
-      ComponentSpecification newValue;
-      IComponentDialog dialog= null;
-      if ( selection.equals(Messages._UI_ACTION_BROWSE))
-      {
-        dialog = manager.getBrowseDialog();
-      }
-      else if ( selection.equals(Messages._UI_ACTION_NEW))
-      {
-        dialog = manager.getNewDialog();
-      }
-
-      if (dialog != null)
-      {
-        if (dialog.createAndOpen() == Window.OK)
-        {
-          newValue = dialog.getSelectedComponent();
-          manager.modifyComponentReference(input, newValue);
-        }
-        else
-        {
-          refresh();
-        }
-      }
-    }
-    else if (e.widget == derivedByCombo)
-    {
-      XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) input;
-      String value = derivedByCombo.getText();
-      Command command = new UpdateComplexTypeDerivationBy(complexType, value);
-
-      if (getCommandStack() != null)
-      {
-        getCommandStack().execute(command);
-      }
-    }
-    super.doWidgetSelected(e);
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-   */
-  public boolean shouldUseExtraSpace()
-  {
-    return false;
-  }
-
-  public void dispose()
-  {
-    super.dispose();
-    if (baseTypeCombo != null && !baseTypeCombo.isDisposed())
-      baseTypeCombo.removeListener(SWT.Traverse, this);
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    if (event.type == SWT.Traverse) {
-      if (event.detail == SWT.TRAVERSE_ARROW_NEXT || event.detail == SWT.TRAVERSE_ARROW_PREVIOUS) {
-        isTraversing = true;
-        return;
-      }
-    }
-    super.doHandleEvent(event);
-    if (event.widget == nameText)
-    {
-      if (!nameText.getEditable())
-        return;
-
-      String newValue = nameText.getText().trim();
-      if (input instanceof XSDNamedComponent)
-      {
-        XSDNamedComponent namedComponent = (XSDNamedComponent) input;
-
-        if (!validateSection())
-          return;
-
-        Command command = null;
-
-        // Make sure an actual name change has taken place
-        String oldName = namedComponent.getName();
-        if (!newValue.equals(oldName))
-        {
-          command = new UpdateNameCommand(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ACTION_RENAME, namedComponent, newValue);
-        }
-
-        if (command != null && getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-        }
-        // doReferentialIntegrityCheck(namedComponent, newValue);
-      }
-    }
-  }
-
-  protected boolean validateSection()
-  {
-    if (nameText == null || nameText.isDisposed())
-      return true;
-
-    setErrorMessage(null);
-
-    String name = nameText.getText().trim();
-
-    // validate against NCName
-    if (name.length() < 1 || !XMLChar.isValidNCName(name))
-    {
-      setErrorMessage(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ERROR_INVALID_NAME);
-      return false;
-    }
-
-    return true;
-  }
-  
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    setListenerEnabled(false);
-    if (input instanceof XSDComplexTypeDefinition)
-    {
-    	XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) input;
-      hideHyperLink = !(complexType.getContainer() instanceof XSDSchema);
-      
-    }    
-    
-    setListenerEnabled(true);
-  }
-  
-  private void fillTypesCombo()
-  {
-    baseTypeCombo.removeAll();
-    baseTypeCombo.add(Messages._UI_ACTION_BROWSE);
-    baseTypeCombo.add(Messages._UI_ACTION_NEW);
-    // Add the current Type of this attribute if needed
-    XSDComplexTypeDefinition complexType = (XSDComplexTypeDefinition) input;
-    XSDTypeDefinition baseType = complexType.getBaseType();
-    if (baseType != null && baseType.getQName() != null)
-    {
-      String currentTypeName = baseType.getQName(xsdSchema); //no prefix
-      if (currentTypeName != null && !currentTypeName.equals("anyType"))
-        baseTypeCombo.add(currentTypeName);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDElementDeclarationAdvancedSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDElementDeclarationAdvancedSection.java
deleted file mode 100644
index d4a6436..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDElementDeclarationAdvancedSection.java
+++ /dev/null
@@ -1,453 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     David Carver - STAR - added nillable advanced tab option, bug 209356
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeValueCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDSubstitutionGroupEditManager;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDElementDeclarationAdvancedSection extends AbstractSection
-{
-  private static final String EMPTY = ""; //$NON-NLS-1$
-  private static final String FALSE = "false"; //$NON-NLS-1$
-  private static final String TRUE = "true"; //$NON-NLS-1$
-  protected CCombo blockCombo;
-  protected CCombo finalCombo;
-  protected CCombo abstractCombo;
-  protected CCombo substGroupCombo;
-  protected CCombo nillableCombo;
-
-  private String blockValues[] = { EMPTY, "#" + XSDConstants.ALL_ELEMENT_TAG, //$NON-NLS-1$
-      XSDConstants.EXTENSION_ELEMENT_TAG, XSDConstants.RESTRICTION_ELEMENT_TAG,
-      "substitution" }; //$NON-NLS-1$
-
-  private String finalValues[] = { EMPTY, "#" + XSDConstants.ALL_ELEMENT_TAG, XSDConstants.EXTENSION_ELEMENT_TAG, //$NON-NLS-1$
-      XSDConstants.RESTRICTION_ELEMENT_TAG }; //$NON-NLS-1$
-
-  private String booleanValues[] = { EMPTY, TRUE, FALSE }; 
-
-  protected void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 2;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // AbstractLabel
-    // ------------------------------------------------------------------
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel abstractLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_ABSTRACT + ":");
-    abstractLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // AbstractCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    abstractCombo = getWidgetFactory().createCCombo(composite);
-    abstractCombo.setLayoutData(data);
-    abstractCombo.setEditable(false);
-
-    abstractCombo.setItems(booleanValues);
-    abstractCombo.addSelectionListener(this);
-
-    // ------------------------------------------------------------------
-    // BlockLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel blockLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_BLOCK + ":");
-    blockLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // BlockCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    blockCombo = getWidgetFactory().createCCombo(composite);
-    blockCombo.setLayoutData(data);
-    blockCombo.setEditable(false);
-
-    blockCombo.setItems(blockValues);
-    blockCombo.addSelectionListener(this);
-
-    // ------------------------------------------------------------------
-    // FinalLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel finalLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_FINAL + ":");
-    finalLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // FinalCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    finalCombo = getWidgetFactory().createCCombo(composite);
-    finalCombo.setLayoutData(data);
-    finalCombo.setEditable(false);
-
-    finalCombo.setItems(finalValues);
-    finalCombo.addSelectionListener(this);
-
-    // ------------------------------------------------------------------
-    // Substitution Group Label
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel subGroupLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_SUBSTITUTION_GROUP + ":");
-    subGroupLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // Substitution Group Combo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    substGroupCombo = getWidgetFactory().createCCombo(composite);
-    substGroupCombo.setLayoutData(data);
-    substGroupCombo.setEditable(true);
-    substGroupCombo.addSelectionListener(this);
-    substGroupCombo.addListener(SWT.Traverse, this);
-    applyAllListeners(substGroupCombo);
-    
-    // ------------------------------------------------------------------
-    // Nillable Label
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel nillableLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_NILLABLE + ":");
-    nillableLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // NillableCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    nillableCombo = getWidgetFactory().createCCombo(composite);
-    nillableCombo.setLayoutData(data);
-    nillableCombo.setEditable(false);
-
-    nillableCombo.setItems(booleanValues);
-    nillableCombo.addSelectionListener(this);
-    
-  }
-
-  public void doHandleEvent(Event e)
-  {
-    if (e.widget == substGroupCombo)
-    {
-      if (e.type == SWT.Traverse) {
-        if (e.detail == SWT.TRAVERSE_ARROW_NEXT || e.detail == SWT.TRAVERSE_ARROW_PREVIOUS)
-        {
-          isTraversing = true;
-          return;
-        }
-      }
-		
-      XSDElementDeclaration eleDec = (XSDElementDeclaration) input;
-      String value = substGroupCombo.getText();
-      String oldValue = eleDec.getElement().getAttribute(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE);
-      if (oldValue == null)
-        oldValue = EMPTY;
-      if (value.equals(oldValue))
-        return;
-
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(eleDec.getElement(), XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE, value, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_SUBSTITUTION_GROUP);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-  }
-
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {
-    if (e.widget == substGroupCombo)
-    {
-      String selection = substGroupCombo.getText();
-      if (shouldPerformComboSelection(SWT.DefaultSelection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == substGroupCombo)
-    {
-      String selection = substGroupCombo.getText();
-      if (shouldPerformComboSelection(SWT.Selection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  private void handleWidgetSelection(SelectionEvent e)
-  {
-    if (e.widget == blockCombo)
-    {
-      XSDElementDeclaration eleDec = (XSDElementDeclaration) input;
-      String value = blockCombo.getText();
-
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(eleDec.getElement(), XSDConstants.BLOCK_ATTRIBUTE, value, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_BLOCK);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-    else if (e.widget == finalCombo)
-    {
-      XSDElementDeclaration eleDec = (XSDElementDeclaration) input;
-      String value = finalCombo.getText();
-
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(eleDec.getElement(), XSDConstants.FINAL_ATTRIBUTE, value, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_FINAL);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-    else if (e.widget == abstractCombo)
-    {
-      XSDElementDeclaration eleDec = (XSDElementDeclaration) input;
-      String value = abstractCombo.getText();
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(eleDec.getElement(), XSDConstants.ABSTRACT_ATTRIBUTE, value, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_ABSTRACT);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-    else if (e.widget == substGroupCombo)
-    {
-      IEditorPart editor = getActiveEditor();
-      if (editor == null) return;
-      ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDSubstitutionGroupEditManager.class);
-
-      String selection = substGroupCombo.getText();
-      ComponentSpecification newValue;
-      IComponentDialog dialog= null;
-      if ( selection.equals(Messages._UI_ACTION_BROWSE))
-      {
-        dialog = manager.getBrowseDialog();
-      }
-      else if ( selection.equals(Messages._UI_ACTION_NEW))
-      {
-        dialog = manager.getNewDialog();
-      }
-
-      if (dialog != null)
-      {
-        if (dialog.createAndOpen() == Window.OK)
-        {
-          newValue = dialog.getSelectedComponent();
-          manager.modifyComponentReference(input, newValue);
-        }
-        else
-        {
-          substGroupCombo.setText("");
-        }
-      }
-      else //use the value from selected quickPick item
-      {
-        newValue = getComponentSpecFromQuickPickForValue(selection, manager);
-        if (newValue != null)
-          manager.modifyComponentReference(input, newValue);
-      }
-    }
-    else if (e.widget == nillableCombo)
-    {
-        XSDElementDeclaration eleDec = (XSDElementDeclaration) input;
-        String value = nillableCombo.getText();
-
-        UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(eleDec.getElement(), XSDConstants.NILLABLE_ATTRIBUTE, value, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_NILLABLE);
-        command.setDeleteIfEmpty(true);
-        getCommandStack().execute(command);
-    }
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-    fillSubstitutionGroupCombo();
-    setListenerEnabled(false);
-    try
-    {
-      if (input instanceof XSDElementDeclaration)
-      {
-        XSDElementDeclaration eleDec = (XSDElementDeclaration) input;
-
-        composite.setEnabled(!isReadOnly);
-        if (eleDec.getContainer() instanceof XSDSchema) // global element
-        {
-          abstractCombo.setEnabled(true);
-          finalCombo.setEnabled(true);
-          substGroupCombo.setEnabled(true);
-          nillableCombo.setEnabled(true);
-        }
-        else
-        {
-          abstractCombo.setEnabled(false);
-          finalCombo.setEnabled(false);
-          substGroupCombo.setEnabled(false);
-          
-          // Nillable when used in a local element declaration can't be set on
-          // on elements that use @ref.
-       	  nillableCombo.setEnabled(!eleDec.isElementDeclarationReference());
-        }
-
-        Element element = eleDec.getElement();
-        
-        if (element.hasAttribute(XSDConstants.BLOCK_ATTRIBUTE))
-        {
-          String blockAttValue = element.getAttribute(XSDConstants.BLOCK_ATTRIBUTE);
-          blockCombo.setText(blockAttValue);
-        }
-        else
-        {
-          blockCombo.setText(EMPTY);
-        }
-        // We should show the value of the attribute regardless if it is invalid
-        // ie. as the user starts typing 'true' in the source, the properties view
-        // should show the value dynamically
-        if (element.hasAttribute(XSDConstants.NILLABLE_ATTRIBUTE))
-        {
-          String attrValue = element.getAttribute(XSDConstants.NILLABLE_ATTRIBUTE);
-          nillableCombo.setText(attrValue);
-        }
-        else
-        {
-          nillableCombo.setText(EMPTY);
-        }
-  
-        if (element.hasAttribute(XSDConstants.FINAL_ATTRIBUTE))
-        {
-        	String finalAttValue = element.getAttribute(XSDConstants.FINAL_ATTRIBUTE);
-            finalCombo.setText(finalAttValue);
-        }
-        else
-        {
-          finalCombo.setText(EMPTY);
-        }
-
-        if (element.hasAttribute(XSDConstants.ABSTRACT_ATTRIBUTE))
-        {
-          abstractCombo.setText(element.getAttribute(XSDConstants.ABSTRACT_ATTRIBUTE));
-        }
-        else
-          abstractCombo.setText(EMPTY);
-
-        if (element.hasAttribute(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE))
-        {
-          substGroupCombo.setText(element.getAttribute(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE));
-        }
-        else
-        {
-          substGroupCombo.setText(EMPTY);
-        }
-      }
-    }
-    catch (Exception e)
-    {
-    }
-    setListenerEnabled(true);
-  }
-  
-  private void fillSubstitutionGroupCombo()
-  {
-    IEditorPart editor = getActiveEditor();
-    ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDSubstitutionGroupEditManager.class);
-    if (manager != null)
-    {
-      ComponentSpecification[] items = manager.getQuickPicks();
-
-      substGroupCombo.removeAll();
-      substGroupCombo.add(Messages._UI_ACTION_BROWSE);
-      substGroupCombo.add(Messages._UI_ACTION_NEW);
-      for (int i = 0; i < items.length; i++)
-      {
-        substGroupCombo.add(items[i].getName());
-      }
-      // Add the current substitution group if needed
-      XSDElementDeclaration namedComponent = ((XSDElementDeclaration) input).getSubstitutionGroupAffiliation();
-      if (namedComponent != null)
-      {
-        ComponentSpecification ret = getComponentSpecFromQuickPickForValue(namedComponent.getName(), manager);
-        if (ret == null)
-        {
-          substGroupCombo.add(namedComponent.getQName(xsdSchema));
-        }
-      }
-    }
-  }
-  
-  private ComponentSpecification getComponentSpecFromQuickPickForValue(String value, ComponentReferenceEditManager editManager)
-  {
-    if (editManager != null)
-    {  
-      ComponentSpecification[] quickPicks = editManager.getQuickPicks();
-      if (quickPicks != null)
-      {
-        for (int i=0; i < quickPicks.length; i++)
-        {
-          ComponentSpecification componentSpecification = quickPicks[i];
-          if (value != null && value.equals(componentSpecification.getName()))
-          {
-            return componentSpecification;
-          }                
-        }  
-      }
-    }
-    return null;
-  }
-  
-  public void dispose()
-  {
-  	if (substGroupCombo != null && !substGroupCombo.isDisposed())
-  	{
-		substGroupCombo.removeListener(SWT.Traverse, this);
-	}
-	super.dispose();
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDElementDeclarationSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDElementDeclarationSection.java
deleted file mode 100644
index 44451e9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDElementDeclarationSection.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.dialogs.NewTypeDialog;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDElementReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDTypeReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDElementDeclarationSection extends MultiplicitySection
-{
-  protected Text nameText;
-  protected CCombo typeCombo;
-  protected CCombo componentNameCombo;
-  boolean isElementReference;
-  protected String typeName = ""; //$NON-NLS-1$
-
-  private XSDTypeDefinition typeDefinition;
-
-  public XSDElementDeclarationSection()
-  {
-    super();
-  }
-
-  /**
-   * Contents of the property tab
-   */
-  public void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-    TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-
-    String typeLabel = Messages.UI_LABEL_TYPE; //$NON-NLS-1$
-
-    GridData data = new GridData();
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-    
-      // ------------------------------------------------------------------
-      // NameLabel
-      // ------------------------------------------------------------------
-
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      CLabel nameLabel = factory.createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_NAME);
-      nameLabel.setLayoutData(data);
-
-      // ------------------------------------------------------------------
-      // NameText
-      // ------------------------------------------------------------------
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-      nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-      nameText.setLayoutData(data);
-      nameText.setEnabled(!isElementReference);
-      applyAllListeners(nameText);   
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-        		XSDEditorCSHelpIds.GENERAL_TAB__ELEMENT__NAME);
-     
-      // ------------------------------------------------------------------
-      // Refactor/rename hyperlink 
-      // ------------------------------------------------------------------
-      if (!hideHyperLink)
-      {
-        createRenameHyperlink(composite);
-        setRenameHyperlinkEnabled(!isElementReference);
-      }
-      else
-      {
-        getWidgetFactory().createCLabel(composite, "");
-      }
-
-    // ------------------------------------------------------------------
-    // Ref Label
-    // ------------------------------------------------------------------
-    if (isElementReference)
-    {
-      data = new GridData();
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      CLabel refLabel = getWidgetFactory().createCLabel(composite, org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_LABEL_REFERENCE);
-      refLabel.setLayoutData(data);
-
-      // ------------------------------------------------------------------
-      // Ref Combo
-      // ------------------------------------------------------------------
-
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-
-      componentNameCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-      componentNameCombo.addSelectionListener(this);
-      componentNameCombo.addListener(SWT.Traverse, this);
-      componentNameCombo.setLayoutData(data);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(componentNameCombo,
-      		XSDEditorCSHelpIds.GENERAL_TAB__ELEMENT__REFERENCE);
-
-      // dummy
-      getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-    }
-
-    // ------------------------------------------------------------------
-    // typeLabel
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, typeLabel);
-
-    // ------------------------------------------------------------------
-    // typeCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    typeCombo = getWidgetFactory().createCCombo(composite); //$NON-NLS-1$
-    typeCombo.setEditable(false);
-    typeCombo.setLayoutData(data);
-    typeCombo.addSelectionListener(this);
-    typeCombo.addListener(SWT.Traverse, this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(typeCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ELEMENT__TYPE);
-    
-    // ------------------------------------------------------------------
-    // DummyLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-
-    // ------------------------------------------------------------------
-    // min property
-    // ------------------------------------------------------------------
-
-    getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_MINOCCURS);
-
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    minCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    minCombo.setLayoutData(data);
-    minCombo.add("0"); //$NON-NLS-1$
-    minCombo.add("1"); //$NON-NLS-1$
-    applyAllListeners(minCombo);
-    minCombo.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(minCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ELEMENT__MIN_OCCURENCE);    
-
-    // ------------------------------------------------------------------
-    // DummyLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-
-    // ------------------------------------------------------------------
-    // max property
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_MAXOCCURS);
-
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    maxCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    maxCombo.setLayoutData(data);
-    maxCombo.add("0"); //$NON-NLS-1$
-    maxCombo.add("1"); //$NON-NLS-1$
-    maxCombo.add("unbounded"); //$NON-NLS-1$
-    applyAllListeners(maxCombo);
-    maxCombo.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(maxCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__ELEMENT__MAX_OCCURENCE);    
-  }
-
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    setListenerEnabled(false);
-    init();
-    relayout();
-    
-    setListenerEnabled(true);
-  }
-  
-  protected void init()
-  {
-    if (input instanceof XSDElementDeclaration)
-    {
-      XSDElementDeclaration xsdElementDeclaration = (XSDElementDeclaration) input;
-      isElementReference = xsdElementDeclaration.isElementDeclarationReference();
-
-      hideHyperLink = !xsdElementDeclaration.isGlobal() || isElementReference;
-      typeDefinition = xsdElementDeclaration.getResolvedElementDeclaration().getTypeDefinition();
-    }
-  }
-  
-  private void fillTypesCombo()
-  {
-    IEditorPart editor = getActiveEditor();
-    ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDTypeReferenceEditManager.class);
-    if (manager != null)
-    {
-      ComponentSpecification[] items = manager.getQuickPicks();
-
-      typeCombo.removeAll();
-      typeCombo.add(Messages._UI_ACTION_BROWSE);
-      typeCombo.add(Messages._UI_ACTION_NEW);
-      for (int i = 0; i < items.length; i++)
-      {
-        typeCombo.add(items[i].getName());
-      }
-      // Add the current Type of this element if needed
-      XSDElementDeclaration namedComponent = ((XSDElementDeclaration) input).getResolvedElementDeclaration();
-      XSDTypeDefinition td = namedComponent.getType();
-      if (td != null)
-      {
-        String currentTypeName = td.getQName(xsdSchema);
-        if (currentTypeName == null) // anonymous type
-          currentTypeName = "**Anonymous**";
-        ComponentSpecification ret = getComponentSpecFromQuickPickForValue(currentTypeName, manager);
-        if (ret == null && currentTypeName != null) // not in quickPick
-        {
-          typeCombo.add(currentTypeName);
-        }
-      }
-    }
-  }
-  
-  private ComponentSpecification getComponentSpecFromQuickPickForValue(String value, ComponentReferenceEditManager editManager)
-  {
-    if (editManager != null)
-    {  
-      ComponentSpecification[] quickPicks = editManager.getQuickPicks();
-      if (quickPicks != null)
-      {
-        for (int i=0; i < quickPicks.length; i++)
-        {
-          ComponentSpecification componentSpecification = quickPicks[i];
-          if (value != null && value.equals(componentSpecification.getName()))
-          {
-            return componentSpecification;
-          }                
-        }  
-      }
-    }
-    return null;
-  }
-  
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    setListenerEnabled(false);
-
-    super.refresh();
-
-    XSDElementDeclaration xsdElementDeclaration = ((XSDElementDeclaration) input).getResolvedElementDeclaration();
-
-    // refresh name
-    nameText.setText(""); //$NON-NLS-1$
-    typeCombo.setText(""); //$NON-NLS-1$
-    String name = xsdElementDeclaration.getName();
-    if (name != null)
-    {
-      nameText.setText(name);
-    }
-    
-    if (isElementReference)
-    {
-      refreshRefCombo();
-    }
-
-    // refresh type
-    if (input != null)
-    {
-      if (input instanceof XSDElementDeclaration)
-      {
-        boolean isAnonymous = xsdElementDeclaration.getAnonymousTypeDefinition() != null;
-        //XSDTypeDefinition typeDef = XSDUtils.getResolvedType(xsdElementDeclaration);
-        XSDTypeDefinition typeDef = xsdElementDeclaration.getResolvedElementDeclaration().getTypeDefinition();
-         
-        if (typeDef != null)
-          typeName = typeDef.getQName(xsdSchema);
-
-        if (typeName == null)
-        {
-          typeName = ""; //$NON-NLS-1$
-        }
-
-        fillTypesCombo();
-        if (isAnonymous)
-        {
-        	typeCombo.setText("**Anonymous**");
-          typeName = "**Anonymous**";
-        }
-        else
-        {
-          if (typeDefinition != null)
-          {
-            typeCombo.setText(typeName);
-          }
-          else
-          {
-            typeCombo.setText(Messages.UI_NO_TYPE); //$NON-NLS-1$
-          }
-        }
-
-        maxCombo.setEnabled(!xsdElementDeclaration.isGlobal() || isElementReference);
-        minCombo.setEnabled(!xsdElementDeclaration.isGlobal() || isElementReference);
-      }
-    }
-
-    // refresh min max
-    refreshMinMax();
-
-    setListenerEnabled(true);
-
-  }
-
-  public boolean shouldUseExtraSpace()
-  {
-    return false;
-  }
-
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {
-    if (e.widget == typeCombo)
-    {
-      String selection = typeCombo.getText();
-      if (shouldPerformComboSelection(SWT.DefaultSelection, selection))
-        handleWidgetSelection(e);
-    } else if (e.widget == componentNameCombo)
-    {
-      String selection = componentNameCombo.getText();
-      if (shouldPerformComboSelection(SWT.DefaultSelection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == typeCombo)
-    {
-      String selection = typeCombo.getText();
-      if (shouldPerformComboSelection(SWT.Selection, selection))
-        handleWidgetSelection(e);
-    } else if (e.widget == componentNameCombo)
-    {
-      String selection = componentNameCombo.getText();
-      if (shouldPerformComboSelection(SWT.Selection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  private void handleWidgetSelection(SelectionEvent e)
-  {
-    if (e.widget == typeCombo)
-    {
-      IEditorPart editor = getActiveEditor();
-      if (editor == null) return;
-      ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDTypeReferenceEditManager.class);
-      String selection = typeCombo.getText();
-      ComponentSpecification newValue;
-      IComponentDialog dialog= null;
-      if ( selection.equals(Messages._UI_ACTION_BROWSE))
-      {
-        dialog = manager.getBrowseDialog();
-        ((XSDSearchListDialogDelegate) dialog).showComplexTypes(true);
-      }
-      else if ( selection.equals(Messages._UI_ACTION_NEW))
-      {
-        dialog = manager.getNewDialog();
-        ((NewTypeDialog) dialog).allowComplexType(true);
-      }
-
-      if (dialog != null)
-      {
-        if (dialog.createAndOpen() == Window.OK)
-        {
-          newValue = dialog.getSelectedComponent();
-          XSDElementDeclaration elementDeclaration = ((XSDElementDeclaration) input).getResolvedElementDeclaration();
-          manager.modifyComponentReference(elementDeclaration, newValue);
-        }
-        else
-        {
-          typeCombo.setText(typeName );
-        }
-      }
-      else //use the value from selected quickPick item
-      {
-        newValue = getComponentSpecFromQuickPickForValue(selection, manager);
-        if (newValue != null)
-          manager.modifyComponentReference(input, newValue);
-      }
-    }
-    else if (e.widget == componentNameCombo)
-    {
-      IEditorPart editor = getActiveEditor();
-      if (editor == null) return;
-      ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDElementReferenceEditManager.class);
-
-      String selection = componentNameCombo.getText();
-      ComponentSpecification newValue;
-      IComponentDialog dialog= null;
-      if ( selection.equals(Messages._UI_ACTION_BROWSE))
-      {
-        dialog = manager.getBrowseDialog();
-      }
-      else if ( selection.equals(Messages._UI_ACTION_NEW))
-      {
-        dialog = manager.getNewDialog();
-      }
-
-      if (dialog != null)
-      {
-        if (dialog.createAndOpen() == Window.OK)
-        {
-          newValue = dialog.getSelectedComponent();
-          manager.modifyComponentReference(input, newValue);
-        }
-        else
-        {
-          componentNameCombo.setText("");
-        }
-      }
-      else //use the value from selected quickPick item
-      {
-        newValue = getComponentSpecFromQuickPickForValue(selection, manager);
-        if (newValue != null)
-          manager.modifyComponentReference(input, newValue);
-      }
-    }
-    else if (e.widget == maxCombo)
-    {
-      updateMaxAttribute();
-    }
-    else if (e.widget == minCombo)
-    {
-      updateMinAttribute();
-    }
-  }
-
-  protected void relayout()
-  {
-    Composite parentComposite = composite.getParent();
-    parentComposite.getParent().setRedraw(false);
-
-    if (parentComposite != null && !parentComposite.isDisposed())
-    {
-      Control[] children = parentComposite.getChildren();
-      for (int i = 0; i < children.length; i++)
-      {
-        children[i].dispose();
-      }
-    }
-
-    // Now initialize the new handler
-    createContents(parentComposite);
-    parentComposite.getParent().layout(true, true);
-
-    // Now turn painting back on
-    parentComposite.getParent().setRedraw(true);
-    refresh();
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    if (event.type == SWT.Traverse) {
-      if (event.detail == SWT.TRAVERSE_ARROW_NEXT || event.detail == SWT.TRAVERSE_ARROW_PREVIOUS) {
-        isTraversing = true;
-        return;
-      }
-    }
-    super.doHandleEvent(event);
-    if (event.widget == nameText)
-    {
-      String newValue = nameText.getText().trim();
-      if (input instanceof XSDElementDeclaration)
-      {
-        XSDElementDeclaration namedComponent = ((XSDElementDeclaration) input).getResolvedElementDeclaration();
-        if (!validateSection())
-          return;
-
-        Command command = null;
-
-        // Make sure an actual name change has taken place
-        String oldName = namedComponent.getName();
-        if (!newValue.equals(oldName))
-        {
-          command = new UpdateNameCommand(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ACTION_RENAME, namedComponent, newValue);
-        }
-
-        if (command != null && getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-        }
-
-        // doReferentialIntegrityCheck(namedComponent, newValue);
-      }
-    }
-  }
-
-  protected boolean validateSection()
-  {
-    if (nameText == null || nameText.isDisposed())
-      return true;
-
-    setErrorMessage(null);
-
-    String name = nameText.getText().trim();
-
-    // validate against NCName
-    if (name.length() < 1 || !XMLChar.isValidNCName(name))
-    {
-      setErrorMessage(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ERROR_INVALID_NAME);
-      return false;
-    }
-
-    return true;
-  }
-
-  public void dispose()
-  {
-    if (componentNameCombo != null && !componentNameCombo.isDisposed())
-    {
-      componentNameCombo.removeSelectionListener(this);
-      componentNameCombo.removeListener(SWT.Traverse, this);
-    }
-    if (minCombo != null && !minCombo.isDisposed())
-      minCombo.removeSelectionListener(this);
-    if (maxCombo != null && !maxCombo.isDisposed())
-      maxCombo.removeSelectionListener(this);
-    if (typeCombo != null && !typeCombo.isDisposed())
-    {
-      typeCombo.removeSelectionListener(this);
-      typeCombo.removeListener(SWT.Traverse, this);
-    }
-    if (nameText != null && !nameText.isDisposed())
-      removeListeners(nameText);
-    super.dispose();
-  }
-
-  protected void refreshRefCombo()
-  {
-    componentNameCombo.setText(""); //$NON-NLS-1$
-    fillElementsCombo();
-  }
-  
-  private void fillElementsCombo()
-  {
-    IEditorPart editor = getActiveEditor();
-    ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDElementReferenceEditManager.class);    
-    if (manager != null)
-    {
-      componentNameCombo.removeAll();
-      componentNameCombo.add(Messages._UI_ACTION_BROWSE);
-      componentNameCombo.add(Messages._UI_ACTION_NEW);
-      ComponentSpecification[] quickPicks = manager.getQuickPicks();
-      if (quickPicks != null)
-      {
-        for (int i = 0; i < quickPicks.length; i++)
-        {
-          ComponentSpecification componentSpecification = quickPicks[i];
-          componentNameCombo.add(componentSpecification.getName());
-        }
-      }
-      ComponentSpecification[] history = manager.getHistory();
-      if (history != null)
-      {
-        for (int i = 0; i < history.length; i++)
-        {
-          ComponentSpecification componentSpecification = history[i];
-          componentNameCombo.add(componentSpecification.getName());
-        }
-      }
-    }
-    XSDElementDeclaration namedComponent = (XSDElementDeclaration) input;
-    Element element = namedComponent.getElement();
-    
-    if (element != null)
-    {
-      String attrValue = element.getAttribute(XSDConstants.REF_ATTRIBUTE);
-      if (attrValue == null)
-      {
-        attrValue = ""; //$NON-NLS-1$
-      }
-      ComponentSpecification ret = getComponentSpecFromQuickPickForValue(attrValue, manager);
-      if (ret == null)
-      {
-        componentNameCombo.add(attrValue);
-      }
-      componentNameCombo.setText(attrValue);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDEnumerationFacetSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDEnumerationFacetSection.java
deleted file mode 100644
index 37861fd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDEnumerationFacetSection.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.xsd.ui.internal.common.commands.SetXSDFacetValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.xsd.XSDEnumerationFacet;
-
-public class XSDEnumerationFacetSection extends AbstractSection
-{
-  CCombo finalCombo;
-  Text valueText;
-  
-  public XSDEnumerationFacetSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-    composite = factory.createFlatFormComposite(parent);
-
-    GridData data = new GridData();
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // ValueLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel valueLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_VALUE + ":"); //$NON-NLS-1$
-    valueLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // ValueText
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    valueText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-    valueText.setLayoutData(data);
-    applyAllListeners(valueText);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(valueText,
-    		XSDEditorCSHelpIds.GENERAL_TAB__SIMPLE_TYPE__NAME);    
-    
-  }
-  
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-
-    setListenerEnabled(false);
-
-    valueText.setText(""); //$NON-NLS-1$
-    
-    if (input instanceof XSDEnumerationFacet)
-    {
-      XSDEnumerationFacet xsdEnumeration = (XSDEnumerationFacet)input;
-      
-      if(xsdEnumeration != null)
-      {
-        valueText.setText(xsdEnumeration.getLexicalValue());
-      }
-    }
-    setListenerEnabled(true);
-  }
-  
-  public void doHandleEvent(Event event) 
-  {
-    if (event.widget == valueText)
-    {
-      if (!valueText.getEditable())
-        return;
-
-      String value = valueText.getText();
-      
-      if (input instanceof XSDEnumerationFacet)
-      {
-    	XSDEnumerationFacet xsdEnumeration = (XSDEnumerationFacet)input;
-    	  
-    	Command command = null;
-    	command = new SetXSDFacetValueCommand(Messages._UI_ACTION_CHANGE_ENUMERATION_VALUE,
-          xsdEnumeration, value);
-
-        if (command != null && getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-          valueText.setText(value);          
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDFacetSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDFacetSection.java
deleted file mode 100644
index 4f953ac..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDFacetSection.java
+++ /dev/null
@@ -1,1019 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.math.BigDecimal;
-import java.math.BigInteger;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CompoundCommand;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ChangeToLocalSimpleTypeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNumericBoundsFacetCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateStringLengthFacetCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateXSDWhiteSpaceFacetCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDLengthFacet;
-import org.eclipse.xsd.XSDMaxExclusiveFacet;
-import org.eclipse.xsd.XSDMaxFacet;
-import org.eclipse.xsd.XSDMaxInclusiveFacet;
-import org.eclipse.xsd.XSDMaxLengthFacet;
-import org.eclipse.xsd.XSDMinExclusiveFacet;
-import org.eclipse.xsd.XSDMinFacet;
-import org.eclipse.xsd.XSDMinInclusiveFacet;
-import org.eclipse.xsd.XSDMinLengthFacet;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-import org.eclipse.xsd.XSDWhiteSpace;
-import org.eclipse.xsd.XSDWhiteSpaceFacet;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDFacetSection extends AbstractSection
-{
-  private String minLengthString, maxLengthString, titleString;
-  Font titleFont;
-  CLabel title;
-  Label minLengthLabel;
-  Text minLengthText;
-  Label maxLengthLabel;
-  Text maxLengthText;
-  Group simpleTypeModifierGroup;
-  String simpleTypeModifierGroupTitle = ""; //$NON-NLS-1$
-  Button collapseWhitespaceButton;
-  Button useEnumerationsButton, usePatternsButton;
-  Button minimumInclusiveCheckbox;
-  Button maximumInclusiveCheckbox;
-  boolean isNumericBaseType;
-  boolean isSimpleTypeRestriction;
-  private XSDTypeDefinition typeDefinition;
-  private XSDSimpleTypeDefinition xsdSimpleTypeDefinition;
-  private XSDSimpleTypeDefinition currentPrimitiveType, previousPrimitiveType;
-  private XSDElementDeclaration xsdElementDeclaration;
-  private XSDAttributeDeclaration xsdAttributeDeclaration;
-  private XSDFeature xsdFeature;
-  boolean hasMaxMinFacets;
-
-  SpecificConstraintsWidget constraintsWidget;
-
-  private int constraintKind = SpecificConstraintsWidget.ENUMERATION;
-  
-  public XSDFacetSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-    composite = factory.createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 1;
-    composite.setLayout(gridLayout);
-
-    title = factory.createCLabel(composite, ""); //$NON-NLS-1$
-    FontData fontData = composite.getFont().getFontData()[0];
-    title.setFont(JFaceResources.getFontRegistry().getBold(fontData.getName()));
-    title.setText(titleString + (isReadOnly ? " - " + Messages._UI_LABEL_READONLY : "")); //$NON-NLS-1$ //$NON-NLS-2$
-
-    Composite facetComposite = factory.createComposite(composite, SWT.FLAT);
-
-    GridData data = new GridData();
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 2;
-    facetComposite.setLayout(gridLayout);
-    data.grabExcessVerticalSpace = true;
-    data.grabExcessHorizontalSpace = true;
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-    facetComposite.setLayoutData(data);
-
-    data = new GridData();
-    data.grabExcessVerticalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-
-    simpleTypeModifierGroup = getWidgetFactory().createGroup(facetComposite, simpleTypeModifierGroupTitle);
-    GridLayout groupGrid = new GridLayout();
-    groupGrid.marginTop = 0;
-    groupGrid.marginBottom = 0;
-    groupGrid.numColumns = 1;
-    simpleTypeModifierGroup.setLayoutData(data);
-    simpleTypeModifierGroup.setLayout(groupGrid);
-
-    Composite simpleTypeModifierComposite = getWidgetFactory().createFlatFormComposite(simpleTypeModifierGroup);
-    data = new GridData();
-    data.grabExcessVerticalSpace = true;
-    data.verticalAlignment = GridData.FILL;
-    data.horizontalAlignment = GridData.FILL;
-
-    GridLayout grid = new GridLayout();
-    grid.marginTop = 0;
-    grid.marginBottom = 0;
-    grid.numColumns = 3;
-    simpleTypeModifierComposite.setLayout(grid);
-    simpleTypeModifierComposite.setLayoutData(data);
-    if (hasMaxMinFacets)
-    {
-      boolean isLinux = java.io.File.separator.equals("/");
-      minLengthLabel = factory.createLabel(simpleTypeModifierComposite, minLengthString);
-      minLengthText = factory.createText(simpleTypeModifierComposite, ""); //$NON-NLS-1$
-      if (isLinux)
-      {
-      	minLengthText.addListener(SWT.Modify, customListener);
-      	minLengthText.addListener(SWT.KeyDown, customListener);
-      }
-      else
-        applyAllListeners(minLengthText);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(minLengthText,
-      		XSDEditorCSHelpIds.CONSTRAINTS_TAB__MINIMUM_LENGTH);
-
-      GridData minGridData = new GridData();
-      minGridData.widthHint = 100;
-      minLengthText.setLayoutData(minGridData);
-      minimumInclusiveCheckbox = factory.createButton(simpleTypeModifierComposite, Messages._UI_LABEL_INCLUSIVE, SWT.CHECK);
-      minimumInclusiveCheckbox.addSelectionListener(this);
-
-      maxLengthLabel = factory.createLabel(simpleTypeModifierComposite, maxLengthString);
-      maxLengthText = factory.createText(simpleTypeModifierComposite, ""); //$NON-NLS-1$
-      if (isLinux)
-      {
-    	  maxLengthText.addListener(SWT.Modify, customListener);
-    	  maxLengthText.addListener(SWT.KeyDown, customListener);
-      }
-      else
-        applyAllListeners(maxLengthText);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(maxLengthText,
-        		XSDEditorCSHelpIds.CONSTRAINTS_TAB__MAXIMUM_LENGTH);
-
-      GridData maxGridData = new GridData();
-      maxGridData.widthHint = 100;
-      maxLengthText.setLayoutData(maxGridData);
-
-      maximumInclusiveCheckbox = factory.createButton(simpleTypeModifierComposite, Messages._UI_LABEL_INCLUSIVE, SWT.CHECK);
-      maximumInclusiveCheckbox.addSelectionListener(this);
-
-      minimumInclusiveCheckbox.setVisible(isNumericBaseType);
-      maximumInclusiveCheckbox.setVisible(isNumericBaseType);
-    }
-    collapseWhitespaceButton = factory.createButton(simpleTypeModifierComposite, Messages._UI_LABEL_COLLAPSE_WHITESPACE, SWT.CHECK);
-    collapseWhitespaceButton.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(collapseWhitespaceButton,
-      		XSDEditorCSHelpIds.CONSTRAINTS_TAB__COLLAPSE_WHITESPACE);
-
-    Group specificValueConstraintsGroup = factory.createGroup(facetComposite, Messages._UI_LABEL_SPECIFIC_CONSTRAINT_VALUES);
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 2;
-    specificValueConstraintsGroup.setLayout(gridLayout);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    specificValueConstraintsGroup.setLayoutData(data);
-
-    Composite compositeForButtons = factory.createFlatFormComposite(specificValueConstraintsGroup);
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.verticalSpacing = 1;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 1;
-    compositeForButtons.setLayout(gridLayout);
-    data = new GridData();
-    data.verticalAlignment = GridData.BEGINNING;
-    compositeForButtons.setLayoutData(data);
-
-    factory.createCLabel(compositeForButtons, Messages._UI_LABEL_RESTRICT_VALUES_BY);
-//    useDefinedValuesButton = factory.createButton(compositeForButtons, "Only permit certain values", SWT.CHECK);
-//    useDefinedValuesButton.addSelectionListener(this);
-
-    Composite compositeForRadioButtons = factory.createFlatFormComposite(compositeForButtons);
-    gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginLeft = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 1;
-    compositeForRadioButtons.setLayout(gridLayout);
-    useEnumerationsButton = factory.createButton(compositeForRadioButtons, Messages._UI_LABEL_ENUMERATIONS, SWT.RADIO);
-    useEnumerationsButton.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(useEnumerationsButton,
-      		XSDEditorCSHelpIds.CONSTRAINTS_TAB__ENUMERATIONS);
-    usePatternsButton = factory.createButton(compositeForRadioButtons, Messages._UI_LABEL_PATTERNS, SWT.RADIO);
-    usePatternsButton.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(usePatternsButton,
-      		XSDEditorCSHelpIds.CONSTRAINTS_TAB__PATTERNS);    
-    
-    constraintsWidget = new SpecificConstraintsWidget(specificValueConstraintsGroup, factory, (input instanceof XSDFeature) ? (XSDFeature)input : null, xsdSimpleTypeDefinition, this, constraintKind);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.grabExcessVerticalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    data.verticalAlignment = GridData.FILL;
-    constraintsWidget.getControl().setLayoutData(data);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(constraintsWidget.getControl(),
-      		XSDEditorCSHelpIds.CONSTRAINTS_TAB__NO_LABEL);
-  }
-  
-  public void doSetInput()
-  {
-    setInput(getPart(), getSelection());
-  }
-
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    init();
-    
-    XSDSchema schemaOfType = null;
-
-    if (!isReadOnly)
-    {
-      schemaOfType = xsdSimpleTypeDefinition.getSchema();
-    }
-    if (schemaOfType == owningEditor.getAdapter(XSDSchema.class))
-    {
-      isReadOnly = false;
-    }
-    else
-    {
-      if (!XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(xsdSimpleTypeDefinition.getTargetNamespace()))
-        isReadOnly = true;
-    }
-    if (hasMaxMinFacets)
-    {
-      title.setText(titleString + (isReadOnly ? " - " + Messages._UI_LABEL_READONLY : "")); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-    relayout();
-    constraintsWidget.setCommandStack(getCommandStack());
-  }
-
-  protected void init()
-  {
-    hasMaxMinFacets = false;
-    try
-    {
-    updateInput();
-    
-    if (xsdSimpleTypeDefinition != null)
-    {
-      isSimpleTypeRestriction = xsdSimpleTypeDefinition.getVariety().getValue() == XSDVariety.ATOMIC;
-      
-      XSDSimpleTypeDefinition targetST = xsdSimpleTypeDefinition;
-      
-      while (!XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(targetST.getTargetNamespace()) && targetST != null)
-      {
-        targetST = targetST.getBaseTypeDefinition();
-      }
-      
-      minLengthString = ""; //$NON-NLS-1$
-      maxLengthString = ""; //$NON-NLS-1$
-      if (targetST.getValidFacets().contains("length")) //$NON-NLS-1$
-      {
-        minLengthString = Messages._UI_LABEL_MINIMUM_LENGTH;
-        maxLengthString = Messages._UI_LABEL_MAXIMUM_LENGTH;
-        simpleTypeModifierGroupTitle = Messages._UI_LABEL_CONSTRAINTS_ON_LENGTH_OF + targetST.getName();
-        isNumericBaseType = false;
-        hasMaxMinFacets = true;
-      }
-      else if (targetST.getValidFacets().contains("maxInclusive")) //$NON-NLS-1$
-      {
-        simpleTypeModifierGroupTitle = Messages._UI_LABEL_CONSTRAINTS_ON_VALUE_OF + targetST.getName();
-        minLengthString = Messages._UI_LABEL_MINIMUM_VALUE;
-        maxLengthString = Messages._UI_LABEL_MAXIMUM_VALUE;
-        isNumericBaseType = true;
-        hasMaxMinFacets = true;
-      }
-      else
-      {
-        simpleTypeModifierGroupTitle = Messages._UI_LABEL_CONTRAINTS_ON + (targetST != null ? targetST.getName() : "anyType"); //$NON-NLS-1$
-      }
-    }
-    }
-    catch(Exception e)
-    {
-    }
-  }
-  
-  private void updateInput()
-  {
-    previousPrimitiveType = currentPrimitiveType;
-    if (input instanceof XSDFeature)
-    {
-      xsdFeature = (XSDFeature) input;
-      typeDefinition = xsdFeature.getResolvedFeature().getType();
-      XSDTypeDefinition anonymousTypeDefinition = null;
-      if (xsdFeature instanceof XSDElementDeclaration)
-      {
-        xsdElementDeclaration = (XSDElementDeclaration)xsdFeature;
-        anonymousTypeDefinition = xsdElementDeclaration.getResolvedElementDeclaration().getAnonymousTypeDefinition();
-      }
-      else if (xsdFeature instanceof XSDAttributeDeclaration)
-      {
-        xsdAttributeDeclaration = (XSDAttributeDeclaration)xsdFeature;
-        anonymousTypeDefinition = xsdAttributeDeclaration.getResolvedAttributeDeclaration().getAnonymousTypeDefinition();
-      }
-      
-      if (typeDefinition instanceof XSDSimpleTypeDefinition)
-      {
-        xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition) typeDefinition;
-      }
-      
-      if (anonymousTypeDefinition instanceof XSDSimpleTypeDefinition)
-      {
-        xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition)anonymousTypeDefinition;
-      }
-      
-      if (xsdSimpleTypeDefinition != null)
-      {
-        if (!XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(xsdSimpleTypeDefinition.getTargetNamespace()))
-        {
-          XSDSimpleTypeDefinition basePrimitiveType = xsdSimpleTypeDefinition.getBaseTypeDefinition();
-          String basePrimitiveTypeString = basePrimitiveType != null ? basePrimitiveType.getName() : "";
-          currentPrimitiveType = basePrimitiveType;
-          titleString = Messages._UI_LABEL_TYPE + (anonymousTypeDefinition != null ? "(" + xsdFeature.getResolvedFeature().getName() + "Type)" : xsdSimpleTypeDefinition.getName())  + " , " + Messages._UI_LABEL_BASE + ": " + basePrimitiveTypeString; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-        }
-        else
-        {
-          currentPrimitiveType = xsdSimpleTypeDefinition;
-          titleString = Messages._UI_LABEL_TYPE + (anonymousTypeDefinition != null ? "(" + xsdFeature.getResolvedFeature().getName() + "Type)" : xsdSimpleTypeDefinition.getName());
-        }
-      }
-    }
-    else if (input instanceof XSDSimpleTypeDefinition)
-    {
-      xsdSimpleTypeDefinition = (XSDSimpleTypeDefinition) input;
-      currentPrimitiveType = xsdSimpleTypeDefinition;
-      titleString = Messages._UI_LABEL_TYPE + (xsdSimpleTypeDefinition.getName() == null ? "(localType)" : xsdSimpleTypeDefinition.getName()) + " , " + Messages._UI_LABEL_BASE + ": " + xsdSimpleTypeDefinition.getBaseTypeDefinition().getName(); //$NON-NLS-1$ //$NON-NLS-2$
-    }
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-    init();
-    
-    if (currentPrimitiveType != previousPrimitiveType)
-    {
-      relayout();      
-    }
-    
-    setListenerEnabled(false);
-    
-    XSDWhiteSpaceFacet whitespaceFacet = xsdSimpleTypeDefinition.getWhiteSpaceFacet();
-    if (whitespaceFacet != null)
-    {
-      if (xsdSimpleTypeDefinition.getFacetContents().contains(whitespaceFacet))
-      {
-        if (XSDWhiteSpace.COLLAPSE_LITERAL.equals(whitespaceFacet.getValue()))
-        {
-          if (!XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(xsdSimpleTypeDefinition.getTargetNamespace()))
-          {
-            collapseWhitespaceButton.setSelection(true);
-          }
-          else
-          {
-            collapseWhitespaceButton.setSelection(false);
-          }
-        }
-      }
-    }
-
-    if (hasMaxMinFacets && !minLengthLabel.isDisposed() && !maxLengthLabel.isDisposed())
-    {
-      minLengthLabel.setText(minLengthString);
-      maxLengthLabel.setText(maxLengthString);
-
-      if (!isNumericBaseType)
-        refreshStringLength();
-      else
-        refreshValueLengths();
-    }
-
-    if ((xsdSimpleTypeDefinition.getEnumerationFacets().size() > 0 
-    		&& constraintsWidget.getConstraintKind() == SpecificConstraintsWidget.ENUMERATION)
-    		|| xsdSimpleTypeDefinition.getPatternFacets().size() == 0) 
-    {
-      usePatternsButton.setSelection(false);
-      useEnumerationsButton.setSelection(true);
-      constraintsWidget.setConstraintKind(SpecificConstraintsWidget.ENUMERATION);
-      constraintsWidget.addButton.setEnabled(true);
-    }
-    else if ((xsdSimpleTypeDefinition.getPatternFacets().size() > 0
-    		&& constraintsWidget.getConstraintKind() == SpecificConstraintsWidget.PATTERN)
-    		|| xsdSimpleTypeDefinition.getEnumerationFacets().size() == 0)
-    {
-      usePatternsButton.setSelection(true);
-      useEnumerationsButton.setSelection(false);
-      constraintsWidget.setConstraintKind(SpecificConstraintsWidget.PATTERN);
-      constraintsWidget.addButton.setEnabled(false);
-    }
-    else
-    {
-      usePatternsButton.setSelection(false);
-      useEnumerationsButton.setSelection(true);
-      constraintsWidget.setConstraintKind(SpecificConstraintsWidget.ENUMERATION);
-      constraintsWidget.addButton.setEnabled(true);
-    }
-    constraintKind = constraintsWidget.getConstraintKind();
-    constraintsWidget.setInput(xsdSimpleTypeDefinition);
-
-    setWidgetsEnabled(isSimpleTypeRestriction && !isReadOnly);
-    composite.setEnabled(isSimpleTypeRestriction && !isReadOnly);
-    
-    setListenerEnabled(true);
-  }
-  
-  private void setWidgetsEnabled(boolean isEnabled)
-  {
-    if (collapseWhitespaceButton != null && !collapseWhitespaceButton.isDisposed())
-      collapseWhitespaceButton.setEnabled(isEnabled);
-    if (useEnumerationsButton != null && !useEnumerationsButton.isDisposed())
-      useEnumerationsButton.setEnabled(isEnabled);
-    if (usePatternsButton != null && !usePatternsButton.isDisposed())
-      usePatternsButton.setEnabled(isEnabled);
-    if (minimumInclusiveCheckbox != null && !minimumInclusiveCheckbox.isDisposed())
-      minimumInclusiveCheckbox.setEnabled(isEnabled);
-    if (maximumInclusiveCheckbox != null && !maximumInclusiveCheckbox.isDisposed())
-      maximumInclusiveCheckbox.setEnabled(isEnabled);
-    if (constraintsWidget != null && !constraintsWidget.getControl().isDisposed())
-    {
-      if(constraintsWidget.getConstraintKind() == SpecificConstraintsWidget.PATTERN)
-      {
-        constraintsWidget.addButton.setEnabled(false);  
-      }
-      else 
-      {
-        constraintsWidget.addButton.setEnabled(isEnabled);
-      }      
-      constraintsWidget.addUsingDialogButton.setEnabled(isEnabled);
-    }
-  }
-
-  protected void relayout()
-  {
-    Composite parent = composite.getParent();
-    parent.getParent().setRedraw(false);
-
-    if (parent != null && !parent.isDisposed())
-    {
-      Control[] children = parent.getChildren();
-      for (int i = 0; i < children.length; i++)
-      {
-        children[i].dispose();
-      }
-    }
-    createContents(parent);
-    parent.getParent().layout(true, true);
-    parent.getParent().setRedraw(true);
-    refresh();
-  }
-
-  public void dispose()
-  {
-    if (titleFont != null && !titleFont.isDisposed())
-      titleFont.dispose();
-    titleFont = null;
-    
-    if (minimumInclusiveCheckbox != null && !minimumInclusiveCheckbox.isDisposed())
-      minimumInclusiveCheckbox.removeSelectionListener(this);
-    if (maximumInclusiveCheckbox != null && !maximumInclusiveCheckbox.isDisposed())
-      maximumInclusiveCheckbox.removeSelectionListener(this);
-    
-    if (collapseWhitespaceButton != null && !collapseWhitespaceButton.isDisposed())
-      collapseWhitespaceButton.removeSelectionListener(this);
-
-    if (maxLengthText != null && !maxLengthText.isDisposed())
-      removeListeners(maxLengthText);
-    if (minLengthText != null && !minLengthText.isDisposed())
-      removeListeners(minLengthText);
-    
-    super.dispose();
-  }
-
-  public void refreshStringLength()
-  {
-    XSDMinLengthFacet minLengthFacet = xsdSimpleTypeDefinition.getMinLengthFacet();
-    XSDMaxLengthFacet maxLengthFacet = xsdSimpleTypeDefinition.getMaxLengthFacet();
-    XSDLengthFacet lengthFacet = xsdSimpleTypeDefinition.getLengthFacet();
-
-    try
-    {
-      if (minLengthFacet != null)
-      {
-        int minLengthValue = minLengthFacet.getValue();
-        if (minLengthValue >= 0 && minLengthFacet.getRootContainer() == xsdSchema)
-        {
-          minLengthText.setText(Integer.toString(minLengthValue));
-        }
-        else
-        {
-          minLengthText.setText(""); //$NON-NLS-1$
-        }
-      }
-      if (maxLengthFacet != null)
-      {
-        int maxLength = maxLengthFacet.getValue();
-        if (maxLength >= 0 && maxLengthFacet.getRootContainer() == xsdSchema)
-        {
-          maxLengthText.setText(Integer.toString(maxLength));
-        }
-        else
-        {
-          maxLengthText.setText(""); //$NON-NLS-1$
-        }
-      }
-      if (lengthFacet != null)
-      {
-        int length = lengthFacet.getValue();
-        if (length >= 0 && lengthFacet.getRootContainer() == xsdSchema)
-        {
-          minLengthText.setText(Integer.toString(length));
-          maxLengthText.setText(Integer.toString(length));
-        }
-      }
-    }
-    catch (Exception e)
-    {
-
-    }
-
-  }
-
-  public void refreshValueLengths()
-  {
-    XSDSimpleTypeDefinition type = xsdSimpleTypeDefinition;
-    XSDMinFacet minFacet = type.getMinFacet();
-    XSDMaxFacet maxFacet = type.getMaxFacet();
-
-    if (minFacet != null && minFacet.getRootContainer() == xsdSchema)
-    {
-      if (minFacet.getElement().getLocalName().equals(XSDConstants.MINEXCLUSIVE_ELEMENT_TAG) || minFacet.getElement().getLocalName().equals(XSDConstants.MININCLUSIVE_ELEMENT_TAG))
-      {
-        minLengthText.setText(minFacet.getLexicalValue());
-        minimumInclusiveCheckbox.setSelection(minFacet.isInclusive());
-        minimumInclusiveCheckbox.setEnabled(true);
-      }
-      else
-      {
-        minLengthText.setText(""); //$NON-NLS-1$
-      }
-    }
-    else
-    {
-      minimumInclusiveCheckbox.setSelection(false);
-      minimumInclusiveCheckbox.setEnabled(false);
-    }
-
-    if (maxFacet != null && maxFacet.getRootContainer() == xsdSchema)
-    {
-      if (maxFacet.getElement().getLocalName().equals(XSDConstants.MAXEXCLUSIVE_ELEMENT_TAG) || maxFacet.getElement().getLocalName().equals(XSDConstants.MAXINCLUSIVE_ELEMENT_TAG))
-      {
-        maxLengthText.setText(maxFacet.getLexicalValue());
-        maximumInclusiveCheckbox.setSelection(maxFacet.isInclusive());
-        maximumInclusiveCheckbox.setEnabled(true);
-      }
-      else
-      {
-        maxLengthText.setText(""); //$NON-NLS-1$
-      }
-    }
-    else
-    {
-      maximumInclusiveCheckbox.setSelection(false);
-      maximumInclusiveCheckbox.setEnabled(false);
-    }
-  }
-
-  protected void doHandleEvent(Event event)
-  {
-    super.doHandleEvent(event);
-    Command command = null;
-    boolean doUpdateMax = false, doUpdateMin = false;
-    boolean doSetInput = false;
-    
-    String minValue = minLengthText.getText().trim();
-    String maxValue = maxLengthText.getText().trim();
-
-    XSDLengthFacet lengthFacet = xsdSimpleTypeDefinition.getLengthFacet();
-    XSDMinLengthFacet minLengthFacet = xsdSimpleTypeDefinition.getMinLengthFacet();
-    XSDMaxLengthFacet maxLengthFacet = xsdSimpleTypeDefinition.getMaxLengthFacet();
-    
-    XSDMinInclusiveFacet minInclusiveFacet = xsdSimpleTypeDefinition.getMinInclusiveFacet();
-    XSDMinExclusiveFacet minExclusiveFacet = xsdSimpleTypeDefinition.getMinExclusiveFacet();
-    XSDMaxInclusiveFacet maxInclusiveFacet = xsdSimpleTypeDefinition.getMaxInclusiveFacet();
-    XSDMaxExclusiveFacet maxExclusiveFacet = xsdSimpleTypeDefinition.getMaxExclusiveFacet();
-
-    String currentMinInclusive = null, currentMinExclusive = null, currentMaxInclusive = null, currentMaxExclusive = null;
-    if (minInclusiveFacet != null)
-    {
-      currentMinInclusive = minInclusiveFacet.getLexicalValue();
-    }
-    if (minExclusiveFacet != null)
-    {
-      currentMinExclusive = minExclusiveFacet.getLexicalValue();
-    }
-    if (maxInclusiveFacet != null)
-    {
-      currentMaxInclusive = maxInclusiveFacet.getLexicalValue();
-    }
-    if (maxExclusiveFacet != null)
-    {
-      currentMaxExclusive = maxExclusiveFacet.getLexicalValue();
-    }
-    
-    String currentLength = null, currentMin = null, currentMax = null;
-    if (lengthFacet != null)
-    {
-      currentLength = lengthFacet.getLexicalValue();
-    }
-    if (minLengthFacet != null)
-    {
-      currentMin = minLengthFacet.getLexicalValue();
-    }
-    if (maxLengthFacet != null)
-    {
-      currentMax = maxLengthFacet.getLexicalValue();
-    }
-    
-    if (event.widget == minLengthText)
-    {
-      try
-      {
-        if (minValue.length() > 0)
-        {
-          if (!isNumericBaseType)
-          {
-            Number big = new BigInteger(minValue);
-            big.toString();
-            if (minLengthFacet != null)
-            {
-              if (minValue.equals(currentMin) || minValue.equals(currentLength))
-                return;
-            }
-            else
-            {
-              if (maxValue != null && minValue.equals(maxValue) && lengthFacet != null)
-              {
-                return;
-              }
-            }
-          }
-          else
-          {
-            if (xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("double").equals(xsdSimpleTypeDefinition.getBaseType()) || //$NON-NLS-1$
-                xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("float").equals(xsdSimpleTypeDefinition.getBaseType()) || //$NON-NLS-1$
-                xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("decimal").equals(xsdSimpleTypeDefinition.getBaseType())) //$NON-NLS-1$
-            {
-              BigDecimal bigDecimal = new BigDecimal(minValue);
-              bigDecimal.toString();
-              if ( (currentMinInclusive != null && minValue.equals(currentMinInclusive)) ||
-                   (currentMinExclusive != null && minValue.equals(currentMinExclusive)) )
-              {
-                return;
-              }
-            }
-            else
-            {
-              Number big = new BigInteger(minValue);
-              big.toString();
-            }
-            minimumInclusiveCheckbox.setEnabled(true);
-          }
-        }
-        else
-        {
-          if (!isNumericBaseType)
-          {
-            if (currentMin == null && currentLength == null)
-              return;
-          }
-          else
-          {
-            if (currentMinInclusive == null && minimumInclusiveCheckbox.getSelection())
-            {
-              return;
-            }
-            else if (currentMinExclusive == null && !minimumInclusiveCheckbox.getSelection())
-            {
-              return;
-            }
-          }
-          minimumInclusiveCheckbox.setEnabled(false);
-          minValue = null;
-        }
-        doUpdateMin = true;
-      }
-      catch (NumberFormatException e)
-      {
-        // TODO show error message
-        doUpdateMin = false;
-      }
-    }
-    if (event.widget == maxLengthText)
-    {
-      try
-      {
-        if (maxValue.length() > 0)
-        {
-          if (!isNumericBaseType)
-          {
-            Number big = new BigInteger(maxValue);
-            big.toString();
-            if (maxLengthFacet != null)
-            {
-              if (maxValue.equals(currentMax) || maxValue.equals(currentLength))
-                return;
-            }
-            else
-            {
-              if (minValue != null && maxValue.equals(minValue) && lengthFacet != null)
-              {
-                return;
-              }
-            }
-          }
-          else
-          {
-            if (xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("double").equals(xsdSimpleTypeDefinition.getBaseType()) || //$NON-NLS-1$
-                xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("float").equals(xsdSimpleTypeDefinition.getBaseType()) || //$NON-NLS-1$
-                xsdSchema.getSchemaForSchema().resolveSimpleTypeDefinition("decimal").equals(xsdSimpleTypeDefinition.getBaseType())) //$NON-NLS-1$
-            {
-              BigDecimal bigDecimal = new BigDecimal(maxValue);
-              bigDecimal.toString();
-            }
-            else
-            {
-              Number big = new BigInteger(maxValue);
-              big.toString();
-            }
-            maximumInclusiveCheckbox.setEnabled(true);
-          }
-        }
-        else
-        {
-          if (!isNumericBaseType)
-          {
-            if (currentMax == null && currentLength == null)
-              return;
-          }
-          else
-          {
-            if (currentMaxInclusive == null && maximumInclusiveCheckbox.getSelection())
-            {
-              return;
-            }
-            else if (currentMaxExclusive == null && !maximumInclusiveCheckbox.getSelection())
-            {
-              return;
-            }
-            maximumInclusiveCheckbox.setEnabled(false);
-          }
-          maxValue = null;
-        }
-
-        doUpdateMax = true;
-      }
-      catch (NumberFormatException e)
-      {
-        doUpdateMax = false;
-        // TODO show error message
-      }
-    }
-    
-    if (XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(xsdSimpleTypeDefinition.getTargetNamespace()) && (doUpdateMax || doUpdateMin))
-    {
-      XSDSimpleTypeDefinition anonymousSimpleType = null;
-      CompoundCommand compoundCommand = new CompoundCommand();
-      ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = null;
-      if (input instanceof XSDFeature)
-      {
-        anonymousSimpleType = XSDCommonUIUtils.getAnonymousSimpleType((XSDFeature)input, xsdSimpleTypeDefinition);
-        if (anonymousSimpleType == null)
-        {
-          anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-          anonymousSimpleType.setBaseTypeDefinition(xsdSimpleTypeDefinition);
-       
-          changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CONSTRAIN_LENGTH, (XSDFeature)input);
-          changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
-          compoundCommand.add(changeToAnonymousCommand);
-          doSetInput = true;
-        }
-
-        if (!isNumericBaseType)
-        {
-          UpdateStringLengthFacetCommand updateCommand = new UpdateStringLengthFacetCommand("", anonymousSimpleType); //$NON-NLS-1$
-          if (doUpdateMax)
-          {
-            updateCommand.setMax(maxValue);
-          }
-          if (doUpdateMin)
-          {
-            updateCommand.setMin(minValue);
-          }
-          compoundCommand.add(updateCommand);
-        }
-        else
-        {
-          UpdateNumericBoundsFacetCommand updateCommand = new UpdateNumericBoundsFacetCommand(Messages._UI_ACTION_UPDATE_BOUNDS, anonymousSimpleType, minimumInclusiveCheckbox.getSelection(), maximumInclusiveCheckbox.getSelection());
-          if (doUpdateMax)
-          {
-            updateCommand.setMax(maxValue);
-          }
-          if (doUpdateMin)
-          {
-            updateCommand.setMin(minValue);
-          }
-          compoundCommand.add(updateCommand);
-        }
-        command = compoundCommand;
-        getCommandStack().execute(command);
-      }
-      else if (input instanceof XSDSimpleTypeDefinition)
-      {
-        if (!isNumericBaseType)
-        {
-          UpdateStringLengthFacetCommand updateCommand = new UpdateStringLengthFacetCommand("", xsdSimpleTypeDefinition); //$NON-NLS-1$
-          if (doUpdateMax)
-          {
-            updateCommand.setMax(maxValue);
-          }
-          if (doUpdateMin)
-          {
-            updateCommand.setMin(minValue);
-          }
-          command = updateCommand;
-        }
-        else
-        {
-          UpdateNumericBoundsFacetCommand updateCommand = new UpdateNumericBoundsFacetCommand(Messages._UI_ACTION_UPDATE_BOUNDS, xsdSimpleTypeDefinition, minimumInclusiveCheckbox.getSelection(), maximumInclusiveCheckbox.getSelection());
-          if (doUpdateMax)
-          {
-            updateCommand.setMax(maxValue);
-          }
-          if (doUpdateMin)
-          {
-            updateCommand.setMin(minValue);
-          }
-          command = updateCommand;
-        }
-        getCommandStack().execute(command);
-      }
-    }
-    else
-    {
-      if (!isNumericBaseType)
-      {
-        UpdateStringLengthFacetCommand updateCommand = new UpdateStringLengthFacetCommand("", xsdSimpleTypeDefinition); //$NON-NLS-1$
-        if (doUpdateMax)
-        {
-          updateCommand.setMax(maxValue);
-        }
-        if (doUpdateMin)
-        {
-          updateCommand.setMin(minValue);
-        }
-        getCommandStack().execute(updateCommand);
-      }
-      else
-      {
-        UpdateNumericBoundsFacetCommand updateCommand = new UpdateNumericBoundsFacetCommand(Messages._UI_ACTION_UPDATE_BOUNDS, xsdSimpleTypeDefinition, minimumInclusiveCheckbox.getSelection(), maximumInclusiveCheckbox.getSelection());
-        if (doUpdateMax)
-        {
-          updateCommand.setMax(maxValue);
-        }
-        if (doUpdateMin)
-        {
-          updateCommand.setMin(minValue);
-        }
-        getCommandStack().execute(updateCommand);
-      }
-      
-    }
-    refresh();
-    if (doSetInput)
-      setInput(getPart(), getSelection());
-  }
-  
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == collapseWhitespaceButton)
-    {
-       CompoundCommand compoundCommand = new CompoundCommand();
-       XSDSimpleTypeDefinition anonymousSimpleType = null;
-       if (XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(xsdSimpleTypeDefinition.getTargetNamespace()))
-       {
-         if (input instanceof XSDFeature)
-         {
-           anonymousSimpleType = XSDCommonUIUtils.getAnonymousSimpleType((XSDFeature)input, xsdSimpleTypeDefinition);
-           if (anonymousSimpleType == null)
-           {
-             anonymousSimpleType = XSDFactory.eINSTANCE.createXSDSimpleTypeDefinition();
-             anonymousSimpleType.setBaseTypeDefinition(xsdSimpleTypeDefinition);
-           
-             ChangeToLocalSimpleTypeCommand changeToAnonymousCommand = new ChangeToLocalSimpleTypeCommand(Messages._UI_ACTION_CONSTRAIN_LENGTH, (XSDFeature)input);
-             changeToAnonymousCommand.setAnonymousSimpleType(anonymousSimpleType);
-             compoundCommand.add(changeToAnonymousCommand);
-           }
-  
-           UpdateXSDWhiteSpaceFacetCommand whiteSpaceCommand = new UpdateXSDWhiteSpaceFacetCommand(Messages._UI_ACTION_COLLAPSE_WHITESPACE, anonymousSimpleType, collapseWhitespaceButton.getSelection());
-           compoundCommand.add(whiteSpaceCommand);
-            
-           getCommandStack().execute(compoundCommand);
-        }
-         setInput(getPart(), getSelection());
-      }
-      else
-      {
-        UpdateXSDWhiteSpaceFacetCommand whiteSpaceCommand = new UpdateXSDWhiteSpaceFacetCommand(Messages._UI_ACTION_COLLAPSE_WHITESPACE, xsdSimpleTypeDefinition, collapseWhitespaceButton.getSelection());
-        getCommandStack().execute(whiteSpaceCommand);
-      }
-    }
-    else if (e.widget == minimumInclusiveCheckbox)
-    {
-      String minValue = minLengthText.getText().trim();
-      if (minValue.length() == 0) minValue = null;
-
-      UpdateNumericBoundsFacetCommand updateCommand = new UpdateNumericBoundsFacetCommand(Messages._UI_ACTION_UPDATE_BOUNDS, xsdSimpleTypeDefinition, minimumInclusiveCheckbox.getSelection(), maximumInclusiveCheckbox.getSelection());
-      updateCommand.setMin(minValue);
-      
-      if (minValue != null)
-        getCommandStack().execute(updateCommand);
-    }
-    else if (e.widget == maximumInclusiveCheckbox)
-    {
-      String maxValue = maxLengthText.getText().trim();
-      if (maxValue.length() == 0) maxValue = null;
-      UpdateNumericBoundsFacetCommand updateCommand = new UpdateNumericBoundsFacetCommand(Messages._UI_ACTION_UPDATE_BOUNDS, xsdSimpleTypeDefinition, minimumInclusiveCheckbox.getSelection(), maximumInclusiveCheckbox.getSelection());
-      updateCommand.setMax(maxValue);
-      if (maxValue != null)
-        getCommandStack().execute(updateCommand);
-    }
-    else if (e.widget == useEnumerationsButton)
-    {
-      constraintsWidget.addButton.setEnabled(true);
-      if (isListenerEnabled())
-      {
-        constraintsWidget.setConstraintKind(SpecificConstraintsWidget.ENUMERATION);
-        constraintKind = constraintsWidget.getConstraintKind();
-      }
-    }
-    else if (e.widget == usePatternsButton)
-    {
-      constraintsWidget.addButton.setEnabled(false);
-      if (isListenerEnabled())
-      {
-        constraintsWidget.setConstraintKind(SpecificConstraintsWidget.PATTERN);
-        constraintKind = constraintsWidget.getConstraintKind();
-      }
-    }
-  }
-  
-  public boolean shouldUseExtraSpace()
-  {
-    return true;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDFacetSectionFilter.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDFacetSectionFilter.java
deleted file mode 100644
index bdc57c5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDFacetSectionFilter.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.jface.viewers.IFilter;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class XSDFacetSectionFilter implements IFilter
-{
-  public boolean select(Object toTest)
-  {
-    if (toTest instanceof XSDFeature)
-    {
-      XSDTypeDefinition type = ((XSDFeature)toTest).getResolvedFeature().getType();
-      if (type instanceof XSDSimpleTypeDefinition)
-      {
-        return true;
-      }
-    }
-    else if (toTest instanceof XSDSimpleTypeDefinition)
-    {
-      XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition)toTest;
-      if (st.eContainer() instanceof XSDSchema ||
-          st.eContainer() instanceof XSDFeature)
-      {
-        return true;
-      }
-    }
-    return false;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDImportSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDImportSection.java
deleted file mode 100644
index 98263e1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDImportSection.java
+++ /dev/null
@@ -1,264 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.Map;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesSchemaLocationUpdater;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDImportSection extends SchemaLocationSection
-{
-  protected Text namespaceText, prefixText;
-  protected String oldPrefixValue;
-
-  public XSDImportSection()
-  {
-    super();
-  }
-
-  /**
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-   *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-   */
-  public void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    GridData data = new GridData();
-
-    // Create Schema Location Label
-    CLabel namespaceLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_NAMESPACE")); //$NON-NLS-1$
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    namespaceLabel.setLayoutData(data);
-
-    namespaceText = getWidgetFactory().createText(composite, "", SWT.NONE); //$NON-NLS-1$
-    namespaceText.setEditable(false);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    applyAllListeners(namespaceText);
-    namespaceText.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // DummyLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-
-    CLabel prefixLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_PREFIX")); //$NON-NLS-1$
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    prefixLabel.setLayoutData(data);
-
-    prefixText = getWidgetFactory().createText(composite, "", SWT.NONE); //$NON-NLS-1$
-    prefixText.setEditable(true);
-    applyAllListeners(prefixText);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    prefixText.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // DummyLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-
-    // Create Schema Location Label
-    CLabel schemaLocationLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_SCHEMA_LOCATION")); //$NON-NLS-1$
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    schemaLocationLabel.setLayoutData(data);
-
-    // Create Schema Location Text
-    schemaLocationText = getWidgetFactory().createText(composite, "", SWT.NONE); //$NON-NLS-1$
-    schemaLocationText.setEditable(true);
-    applyAllListeners(schemaLocationText);
-
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    schemaLocationText.setLayoutData(data);
-
-    // Create Wizard Button
-    wizardButton = getWidgetFactory().createButton(composite, "", SWT.NONE); //$NON-NLS-1$
-    wizardButton.setImage(XSDEditorPlugin.getXSDImage("icons/browsebutton.gif")); //$NON-NLS-1$
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    wizardButton.setLayoutData(data);
-    wizardButton.addSelectionListener(this);
-
-    // error text
-    errorText = new StyledText(composite, SWT.FLAT);
-    errorText.setEditable(false);
-    errorText.setEnabled(false);
-    errorText.setText(""); //$NON-NLS-1$
-
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.horizontalSpan = 3;
-    data.grabExcessHorizontalSpace = true;
-    errorText.setLayoutData(data);
-
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(schemaLocationText,
-    		XSDEditorCSHelpIds.GENERAL_TAB__IMPORT__SCHEMALOCATION);
-
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(namespaceText,
-    		XSDEditorCSHelpIds.GENERAL_TAB__IMPORT__NAMESPACE);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(prefixText,
-    		XSDEditorCSHelpIds.GENERAL_TAB__IMPORT__PREFIX);
-
-  }
-
-  public void refresh()
-  {
-    setListenerEnabled(false);
-
-    errorText.setText("");
-    Element element = null;
-    if (input instanceof XSDImport)
-    {
-      element = ((XSDImport) input).getElement();
-
-      String namespace = element.getAttribute("namespace"); //$NON-NLS-1$
-      String schemaLocation = element.getAttribute("schemaLocation"); //$NON-NLS-1$
-
-      TypesHelper helper = new TypesHelper(xsdSchema);
-      String prefix = helper.getPrefix(element.getAttribute(XSDConstants.NAMESPACE_ATTRIBUTE), false);
-
-      if (namespace == null)
-      {
-        namespace = ""; //$NON-NLS-1$
-      }
-
-      if (prefix == null)
-      {
-        prefix = ""; //$NON-NLS-1$
-      }
-
-      if (schemaLocation == null)
-      {
-        schemaLocation = ""; //$NON-NLS-1$
-      }
-
-      namespaceText.setText(namespace);
-      prefixText.setText(prefix);
-      schemaLocationText.setText(schemaLocation);
-      oldPrefixValue = prefixText.getText();
-    }
-
-    setListenerEnabled(true);
-  }
-
-  public void widgetSelected(SelectionEvent event)
-  {
-    if (event.widget == wizardButton)
-    {
-      setListenerEnabled(false);
-      
-      XSDDirectivesSchemaLocationUpdater.updateSchemaLocation(xsdSchema,input,false);
-      refresh();
-      setListenerEnabled(true);
-      prefixText.addListener(SWT.Modify, this);
-    }
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    setErrorMessage(null);
-    super.doHandleEvent(event);
-    if (event.widget == prefixText)
-    {
-      String newPrefix = prefixText.getText();
-      if (oldPrefixValue.equals(newPrefix) || !isValidSchemaLocation)
-        return;
-      Map map = xsdSchema.getQNamePrefixToNamespaceMap();
-      String key = prefixText.getText();      
-      if (key.length() == 0) key = null;
-      
-      if (validatePrefix(newPrefix) && schemaLocationText.getText().trim().length() > 0)
-      {
-        if (map.containsKey(key))
-        {
-          setErrorMessage(XSDEditorPlugin.getXSDString("_ERROR_LABEL_PREFIX_EXISTS"));
-        }
-        else
-        {
-          Element schemaElement = xsdSchema.getElement();
-          
-          if (key != null) {
-            if (oldPrefixValue.length() == 0) 
-              schemaElement.removeAttribute("xmlns");
-            else 
-              schemaElement.removeAttribute("xmlns:"+oldPrefixValue);
-            
-            schemaElement.setAttribute("xmlns:" + newPrefix, namespaceText.getText());
-          } 
-          else {
-            schemaElement.removeAttribute("xmlns:"+oldPrefixValue);
-            schemaElement.setAttribute("xmlns", namespaceText.getText());
-          }
-          xsdSchema.updateElement();
-          setErrorMessage(null);
-          oldPrefixValue = newPrefix;
-        }
-      }
-      else
-      {
-        setErrorMessage(XSDEditorPlugin.getXSDString("_ERROR_LABEL_INVALID_PREFIX"));
-      }
-    }
-  }
-
-  public void aboutToBeHidden()
-  {
-    setErrorMessage(null);
-    super.aboutToBeHidden();
-  }
-  
-  protected boolean validatePrefix(String prefix)
-  {
-    if (prefix.length() == 0) return true;
-    return XMLChar.isValidNCName(prefix);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDModelGroupDefinitionSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDModelGroupDefinitionSection.java
deleted file mode 100644
index fec1b37..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDModelGroupDefinitionSection.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDDirectivesManager;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDModelGroupDefinitionSection extends MultiplicitySection
-{
-  protected Text nameText;
-  protected CCombo componentNameCombo;
-  boolean isReference;
-
-  public XSDModelGroupDefinitionSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    if (isReference)
-    {
-      // ------------------------------------------------------------------
-      // Ref Label
-      // ------------------------------------------------------------------
-      GridData data = new GridData();
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      CLabel refLabel = getWidgetFactory().createCLabel(composite, XSDConstants.REF_ATTRIBUTE + ":"); //$NON-NLS-1$
-      refLabel.setLayoutData(data);
-
-      // ------------------------------------------------------------------
-      // Ref Combo
-      // ------------------------------------------------------------------
-
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-      data.horizontalSpan = 2;
-
-      componentNameCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-      componentNameCombo.addSelectionListener(this);
-      componentNameCombo.setLayoutData(data);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(componentNameCombo,
-      		XSDEditorCSHelpIds.GENERAL_TAB__MODELGROUP_REFS__REF);
-      
-      // ------------------------------------------------------------------
-      // min property
-      // ------------------------------------------------------------------
-      getWidgetFactory().createCLabel(composite, 
-    		  org.eclipse.wst.xsd.ui.internal.editor.Messages.UI_LABEL_MINOCCURS);
-      
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-      data.horizontalSpan = 2;
-
-      minCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-      minCombo.setLayoutData(data);
-      minCombo.add("0"); //$NON-NLS-1$
-      minCombo.add("1"); //$NON-NLS-1$
-      applyAllListeners(minCombo);
-      minCombo.addSelectionListener(this);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(minCombo,
-      		XSDEditorCSHelpIds.GENERAL_TAB__MODELGROUP__MIN_OCCURENCE);
-
-      // ------------------------------------------------------------------
-      // max property
-      // ------------------------------------------------------------------
-      getWidgetFactory().createCLabel(composite, 
-    		  org.eclipse.wst.xsd.ui.internal.editor.Messages.UI_LABEL_MAXOCCURS);
-
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-      data.horizontalSpan = 2;
-
-      maxCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-      maxCombo.setLayoutData(data);
-      maxCombo.add("0"); //$NON-NLS-1$
-      maxCombo.add("1"); //$NON-NLS-1$
-      maxCombo.add("unbounded"); //$NON-NLS-1$
-      applyAllListeners(maxCombo);
-      maxCombo.addSelectionListener(this);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(maxCombo,
-      		XSDEditorCSHelpIds.GENERAL_TAB__MODELGROUP__MAX_OCCURENCE);
-      
-    }
-    else
-    {
-      // ------------------------------------------------------------------
-      // NameLabel
-      // ------------------------------------------------------------------
-      GridData data = new GridData();
-      data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-      data.grabExcessHorizontalSpace = false;
-      CLabel nameLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_NAME);
-      nameLabel.setLayoutData(data);
-
-      // ------------------------------------------------------------------
-      // NameText
-      // ------------------------------------------------------------------
-      data = new GridData();
-      data.grabExcessHorizontalSpace = true;
-      data.horizontalAlignment = GridData.FILL;
-      nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-      nameText.setLayoutData(data);
-      applyAllListeners(nameText);
-      
-      PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-      		XSDEditorCSHelpIds.GENERAL_TAB__MODELGROUP_DEFINITION__NAME);
-
-      // ------------------------------------------------------------------
-      // Refactor/rename hyperlink 
-      // ------------------------------------------------------------------
-      if (!hideHyperLink)
-      {
-        createRenameHyperlink(composite);
-        setRenameHyperlinkEnabled(!isReference);
-      }
-      else
-      {
-        getWidgetFactory().createCLabel(composite, "");
-      }
-    }
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-
-    if (isReadOnly)
-    {
-      composite.setEnabled(false);
-    }
-    else
-    {
-      composite.setEnabled(true);
-    }
-
-    setListenerEnabled(false);
-
-    XSDNamedComponent namedComponent = (XSDNamedComponent) input;
-
-    if (isReference)
-    {
-      Element element = namedComponent.getElement();
-      if (element != null)
-      {
-        String attrValue = element.getAttribute(XSDConstants.REF_ATTRIBUTE);
-        if (attrValue == null)
-        {
-          attrValue = ""; //$NON-NLS-1$
-        }
-        componentNameCombo.setText(attrValue);
-
-        // refresh min max
-        if (minCombo != null && maxCombo != null)
-        {
-          refreshMinMax();
-        }
-      }
-    }
-    else
-    {
-      // refresh name
-      nameText.setText(""); //$NON-NLS-1$
-
-      String name = namedComponent.getName();
-      if (name != null)
-      {
-        nameText.setText(name);
-      }
-    }
-
-    setListenerEnabled(true);
-  }
-
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    init();
-    relayout();
-    
-    if (isReference)
-    {
-      TypesHelper helper = new TypesHelper(xsdSchema);
-      List items = new ArrayList();
-      items = helper.getModelGroups();
-      if (input instanceof XSDModelGroupDefinition)
-      {
-        XSDModelGroupDefinition group = (XSDModelGroupDefinition) input;
-        XSDConcreteComponent parent = group.getContainer();
-        while (parent != null)
-        {
-          if (parent instanceof XSDModelGroupDefinition)
-          {
-            items.remove(((XSDModelGroupDefinition)parent).getQName());
-            break;
-          }
-          parent = parent.getContainer();
-        }
-      }
-      items.add(0, ""); //$NON-NLS-1$
-      componentNameCombo.setItems((String [])items.toArray(new String[0]));
-    }
-  }
-
-  protected void init()
-  {
-    if (input instanceof XSDModelGroupDefinition)
-    {
-      XSDModelGroupDefinition group = (XSDModelGroupDefinition) input;
-      isReference = group.isModelGroupDefinitionReference();
-      hideHyperLink = isReference;
-    }
-  }
-
-  protected void relayout()
-  {
-    Composite parentComposite = composite.getParent();
-    parentComposite.getParent().setRedraw(false);
-
-    if (parentComposite != null && !parentComposite.isDisposed())
-    {
-      Control[] children = parentComposite.getChildren();
-      for (int i = 0; i < children.length; i++)
-      {
-        children[i].dispose();
-      }
-    }
-
-    // Now initialize the new handler
-    createContents(parentComposite);
-    parentComposite.getParent().layout(true, true);
-
-    // Now turn painting back on
-    parentComposite.getParent().setRedraw(true);
-    refresh();
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    super.doHandleEvent(event);
-    if (event.widget == nameText)
-    {
-      String newValue = nameText.getText().trim();
-      if (input instanceof XSDNamedComponent)
-      {
-        XSDNamedComponent namedComponent = (XSDNamedComponent) input;
-        if (!validateSection())
-          return;
-
-        Command command = null;
-
-        // Make sure an actual name change has taken place
-        String oldName = namedComponent.getName();
-        if (!newValue.equals(oldName))
-        {
-          command = new UpdateNameCommand(Messages._UI_ACTION_RENAME, namedComponent, newValue);
-        }
-
-        if (command != null && getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-        }
-        // doReferentialIntegrityCheck(namedComponent, newValue);
-      }
-    }
-  }
-
-  protected boolean validateSection()
-  {
-    if (nameText == null || nameText.isDisposed())
-      return true;
-
-    setErrorMessage(null);
-
-    String name = nameText.getText().trim();
-
-    // validate against NCName
-    if (name.length() < 1 || !XMLChar.isValidNCName(name))
-    {
-      setErrorMessage(Messages._UI_ERROR_INVALID_NAME);
-      return false;
-    }
-
-    return true;
-  }
-  
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == componentNameCombo)
-    {
-      String newValue = componentNameCombo.getText();
-      if (input instanceof XSDNamedComponent)
-      {
-        XSDNamedComponent namedComponent = (XSDNamedComponent)input;
-        Element element = namedComponent.getElement();
-
-        if (namedComponent instanceof XSDModelGroupDefinition)
-        {
-          element.setAttribute(XSDConstants.REF_ATTRIBUTE, newValue);
-          XSDDirectivesManager.removeUnusedXSDImports(namedComponent.getSchema());
-        }
-      }
-    }
-    super.doWidgetSelected(e);
-  }
-  
-  public void dispose()
-  {
-    if (nameText != null && !nameText.isDisposed())
-      removeListeners(nameText);
-    super.dispose();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDModelGroupSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDModelGroupSection.java
deleted file mode 100644
index c695f7c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDModelGroupSection.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateContentModelCommand;
-import org.eclipse.wst.xsd.ui.internal.editor.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.xsd.XSDCompositor;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-
-public class XSDModelGroupSection extends MultiplicitySection
-{
-  protected CCombo modelGroupCombo;
-  private String[] modelGroupComboValues = { "sequence", "choice", "all" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-
-  public XSDModelGroupSection()
-  {
-    super();
-  }
-
-  public void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 2;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // NameLabel
-    // ------------------------------------------------------------------
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    CLabel nameLabel = getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_KIND);
-    nameLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // NameText
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    modelGroupCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    modelGroupCombo.setLayoutData(data);
-    modelGroupCombo.addSelectionListener(this);
-    modelGroupCombo.setItems(modelGroupComboValues);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(modelGroupCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__MODELGROUP__KIND);
-
-
-    // ------------------------------------------------------------------
-    // min property
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_MINOCCURS);
-    
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    minCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    minCombo.setLayoutData(data);
-    minCombo.add("0"); //$NON-NLS-1$
-    minCombo.add("1"); //$NON-NLS-1$
-    applyAllListeners(minCombo);
-    minCombo.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(minCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__MODELGROUP__MIN_OCCURENCE);
-
-    // ------------------------------------------------------------------
-    // max property
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, Messages.UI_LABEL_MAXOCCURS);
-
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    maxCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    maxCombo.setLayoutData(data);
-    maxCombo.add("0"); //$NON-NLS-1$
-    maxCombo.add("1"); //$NON-NLS-1$
-    maxCombo.add("unbounded"); //$NON-NLS-1$
-    applyAllListeners(maxCombo);
-    maxCombo.addSelectionListener(this);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(maxCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__MODELGROUP__MAX_OCCURENCE);
-  }
-
-  
-  public void refresh()
-  {
-    super.refresh();
-
-    if (isReadOnly)
-    {
-      composite.setEnabled(false);
-    }
-    else
-    {
-      composite.setEnabled(true);
-    }
-
-    setListenerEnabled(false);
-
-    if (input != null)
-    {
-      if (input instanceof XSDModelGroup)
-      {
-        XSDModelGroup particle = (XSDModelGroup)input;
-        String modelType = particle.getCompositor().getName();
-        modelGroupCombo.setText(modelType);
-        
-        minCombo.setEnabled(!(particle.eContainer() instanceof XSDModelGroupDefinition));
-        maxCombo.setEnabled(!(particle.eContainer() instanceof XSDModelGroupDefinition));
-      }
-    }
-    
-    refreshMinMax();
-
-    setListenerEnabled(true);
-  }
-  
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    XSDModelGroup particle = (XSDModelGroup)input;
-    if (e.widget == modelGroupCombo)
-    {
-      XSDCompositor newValue = XSDCompositor.get(modelGroupCombo.getText());
-      UpdateContentModelCommand command = new UpdateContentModelCommand(org.eclipse.wst.xsd.ui.internal.common.util.Messages._UI_ACTION_CHANGE_CONTENT_MODEL, particle, newValue);
-      getCommandStack().execute(command);
-    }
-    super.doWidgetSelected(e);
-  }
-  
-  public void dispose()
-  {
-    if (minCombo != null && !minCombo.isDisposed())
-      minCombo.removeSelectionListener(this);
-    if (maxCombo != null && !maxCombo.isDisposed())
-      maxCombo.removeSelectionListener(this);
-    super.dispose();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSchemaAdvancedSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSchemaAdvancedSection.java
deleted file mode 100644
index 968d847..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSchemaAdvancedSection.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.xsd.XSDForm;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDSchemaAdvancedSection extends AbstractSection
-{
-  IWorkbenchPart part;
-  protected CLabel elementFormLabel, attributeFormLabel, blockDefaultLabel, finalDefaultLabel;
-  protected CCombo elementFormCombo, attributeFormCombo, blockDefaultCombo, finalDefaultCombo;  
-  
-  protected static final String emptyOption = ""; //$NON-NLS-1$
-  
-  protected static final String [] formQualification = { emptyOption, XSDForm.QUALIFIED_LITERAL.getLiteral(), 
-      XSDForm.UNQUALIFIED_LITERAL.getLiteral() };  //$NON-NLS-1$
-
-    
-  protected static final String derivedByChoicesComboValues[] = { "", XSDConstants.RESTRICTION_ELEMENT_TAG, //$NON-NLS-1$ 
-      XSDConstants.EXTENSION_ELEMENT_TAG }; 
-  
-  protected static final String blockDefaultValues[] = { emptyOption, "#" + XSDConstants.ALL_ELEMENT_TAG, //$NON-NLS-1$
-      XSDConstants.EXTENSION_ELEMENT_TAG, XSDConstants.RESTRICTION_ELEMENT_TAG,
-      "substitution"};
-  
-  protected static final String finalDefaultValues[] = { emptyOption, "#" + XSDConstants.ALL_ELEMENT_TAG, //$NON-NLS-1$
-      XSDConstants.EXTENSION_ELEMENT_TAG, XSDConstants.RESTRICTION_ELEMENT_TAG, 
-      XSDConstants.LIST_ELEMENT_TAG, XSDConstants.UNION_ELEMENT_TAG};      
-
-  public XSDSchemaAdvancedSection()
-  {
-    super();
-  }
-
-  /**
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-   *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-   */
-  public void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 2;
-    composite.setLayout(gridLayout);
-
-    // Create elementFormDefault label and combo       
-    elementFormLabel = XSDCommonUIUtils.getNewPropertiesLabel(composite,getWidgetFactory(),
-        Messages._UI_LABEL_ELEMENTFORMDEFAULT + ":");
-    elementFormCombo = XSDCommonUIUtils.getNewPropertiesCombo(composite,getWidgetFactory(),this,
-        formQualification,XSDEditorCSHelpIds.ADVANCE_TAB__SCHEMA_ELEMENT_FORM_DEFAULT);
-
-    // Create attributeFormDefault label and combo
-    attributeFormLabel = XSDCommonUIUtils.getNewPropertiesLabel(composite,getWidgetFactory(),
-        Messages._UI_LABEL_ATTRIBUTEFORMDEFAULT + ":");
-    attributeFormCombo = XSDCommonUIUtils.getNewPropertiesCombo(composite,getWidgetFactory(),this,
-        formQualification,XSDEditorCSHelpIds.ADVANCE_TAB__SCHEMA_ATTRIBUTE_FORM_DEFAULT);    
-    
-    // Create blockDefault label and combo
-    blockDefaultLabel = XSDCommonUIUtils.getNewPropertiesLabel(composite,getWidgetFactory(),
-        Messages._UI_LABEL_BLOCKDEFAULT + ":");
-    blockDefaultCombo = XSDCommonUIUtils.getNewPropertiesCombo(composite,getWidgetFactory(),this,
-        blockDefaultValues,XSDEditorCSHelpIds.ADVANCE_TAB__SCHEMA_BLOCK_DEFAULT);
-    
-    // Create finalDefault label and combo
-    finalDefaultLabel = XSDCommonUIUtils.getNewPropertiesLabel(composite,getWidgetFactory(),
-        Messages._UI_LABEL_FINALDEFAULT + ":");
-    finalDefaultCombo = XSDCommonUIUtils.getNewPropertiesCombo(composite,getWidgetFactory(),this,
-        finalDefaultValues,XSDEditorCSHelpIds.ADVANCE_TAB__SCHEMA_FINAL_DEFAULT);    
-    
-    Dialog.applyDialogFont(parent);
-  }
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    super.refresh();
-    setListenerEnabled(false);
-    
-    if (xsdSchema != null)
-    {
-      if (elementFormCombo != null)
-      {
-        String text;
-        if (xsdSchema.getElement().hasAttribute(XSDConstants.ELEMENTFORMDEFAULT_ATTRIBUTE))
-        {
-          text = xsdSchema.getElementFormDefault().getName();  
-        }
-        else 
-        {
-          text = emptyOption;  
-        } 
-        elementFormCombo.setText(text);
-      }
-      
-      if (attributeFormCombo != null)
-      {
-        String text;
-        if (xsdSchema.getElement().hasAttribute(XSDConstants.ATTRIBUTEFORMDEFAULT_ATTRIBUTE))
-        {
-          text = xsdSchema.getAttributeFormDefault().getName();
-        }
-        else 
-        {
-          text = emptyOption;
-        }
-        attributeFormCombo.setText(text);
-      }
-      
-      if (blockDefaultCombo != null)
-      {
-        String text;
-        if (xsdSchema.getElement().hasAttribute(XSDConstants.BLOCKDEFAULT_ATTRIBUTE))
-        {
-          text = xsdSchema.getElement().getAttribute(XSDConstants.BLOCKDEFAULT_ATTRIBUTE);
-        }
-        else 
-        {
-          text = emptyOption;
-        }
-        blockDefaultCombo.setText(text);
-      }
-      
-      if (finalDefaultCombo != null)
-      {
-        String text;
-        if (xsdSchema.getElement().hasAttribute(XSDConstants.FINALDEFAULT_ATTRIBUTE))
-        {
-          text = xsdSchema.getElement().getAttribute(XSDConstants.FINALDEFAULT_ATTRIBUTE);
-        }
-        else 
-        {
-          text = emptyOption;
-        }
-        finalDefaultCombo.setText(text);
-      }      
-    }    
-    setListenerEnabled(true);
-  }
-  
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (xsdSchema != null)
-    {          
-      if (e.widget == elementFormCombo && elementFormCombo != null)
-      {
-        String valueElementForm = elementFormCombo.getText();
-        UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(xsdSchema.getElement(), 
-            XSDConstants.ELEMENTFORMDEFAULT_ATTRIBUTE, valueElementForm, 
-            Messages._UI_LABEL_ELEMENTFORMDEFAULT);
-        command.setDeleteIfEmpty(true);
-        getCommandStack().execute(command);
-      }
-            
-      if (e.widget == attributeFormCombo && attributeFormCombo != null)
-      {     
-        String valueAttributeForm = attributeFormCombo.getText();
-        UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(xsdSchema.getElement(), 
-            XSDConstants.ATTRIBUTEFORMDEFAULT_ATTRIBUTE, valueAttributeForm, 
-            Messages._UI_LABEL_ATTRIBUTEFORMDEFAULT);
-        command.setDeleteIfEmpty(true);
-        getCommandStack().execute(command);        
-      }
-      
-      if (e.widget == blockDefaultCombo && blockDefaultCombo != null)
-      {
-        String valueBlockDefault = blockDefaultCombo.getText();        
-        UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(xsdSchema.getElement(), 
-            XSDConstants.BLOCKDEFAULT_ATTRIBUTE, valueBlockDefault, Messages._UI_LABEL_BLOCKDEFAULT);
-        command.setDeleteIfEmpty(true);
-        getCommandStack().execute(command);
-      }
-      
-      if(e.widget == finalDefaultCombo && finalDefaultCombo != null)
-      {
-        String finalBlockDefault = finalDefaultCombo.getText();        
-        UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(xsdSchema.getElement(), 
-            XSDConstants.FINALDEFAULT_ATTRIBUTE, finalBlockDefault, Messages._UI_LABEL_FINALDEFAULT);
-        command.setDeleteIfEmpty(true);
-        getCommandStack().execute(command);
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSchemaSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSchemaSection.java
deleted file mode 100644
index dab2646..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSchemaSection.java
+++ /dev/null
@@ -1,319 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *	   David Schneider, david.schneider@unisys.com - [142500] WTP properties pages fonts don't follow Eclipse preferences
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.osgi.util.TextProcessor;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.custom.StyleRange;
-import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.DOMNamespaceInfoManager;
-import org.eclipse.wst.xml.core.internal.contentmodel.util.NamespaceInfo;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xsd.ui.internal.actions.XSDEditNamespacesAction;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNamespaceInformationCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.nsedit.TargetNamespaceChangeHandler;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-
-public class XSDSchemaSection extends AbstractSection
-{
-  IWorkbenchPart part;
-  Text prefixText;
-  Text targetNamespaceText;
-  Button editButton;
-  StyledText errorText;
-  Color red;
-
-  /**
-   * 
-   */
-  public XSDSchemaSection()
-  {
-    super();
-  }
-
-  /**
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ITabbedPropertySection#createControls(org.eclipse.swt.widgets.Composite,
-   *      org.eclipse.wst.common.ui.properties.internal.provisional.TabbedPropertySheetWidgetFactory)
-   */
-  public void createContents(Composite parent)
-  {
-    composite = getWidgetFactory().createFlatFormComposite(parent);
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 2;
-    composite.setLayout(gridLayout);
-
-    GridData data = new GridData();
-
-    // Create Prefix Label
-    CLabel prefixLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_SCHEMA_PREFIX")); //$NON-NLS-1$
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    prefixLabel.setLayoutData(data);
-
-    // Create Prefix Text
-    prefixText = getWidgetFactory().createText(composite, "", SWT.NONE); //$NON-NLS-1$
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    prefixText.setLayoutData(data);
-    applyAllListeners(prefixText);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(prefixText,
-      		XSDEditorCSHelpIds.GENERAL_TAB__SCHEMA__PREFIX);
-
-    // Create TargetNamespace Label
-    CLabel targetNamespaceLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_TARGET_NAME_SPACE")); //$NON-NLS-1$
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    targetNamespaceLabel.setLayoutData(data);
-
-    // Create TargetNamespace Text
-    targetNamespaceText = getWidgetFactory().createText(composite, "", SWT.NONE); //$NON-NLS-1$
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    targetNamespaceText.setLayoutData(data);
-    applyAllListeners(targetNamespaceText);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(targetNamespaceText,
-      		XSDEditorCSHelpIds.GENERAL_TAB__SCHEMA__TARGETNAMESPACE);
-
-    // Advanced Button
-    editButton = getWidgetFactory().createButton(composite, XSDEditorPlugin.getXSDString("_UI_ACTION_EDIT_NAMESPACES"), SWT.PUSH); //$NON-NLS-1$
-    data = new GridData(SWT.END, SWT.CENTER, true, false);
-    data.horizontalSpan = 2;
-    editButton.setLayoutData(data);
-    editButton.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(editButton,
-      		XSDEditorCSHelpIds.GENERAL_TAB__SCHEMA__ADVANCED);
-
-    // error text
-    errorText = new StyledText(composite, SWT.FLAT);
-    errorText.setEditable(false);
-    errorText.setEnabled(false);
-    errorText.setText(""); //$NON-NLS-1$
-    data = new GridData();
-    data.horizontalAlignment = GridData.FILL;
-    data.horizontalSpan = 2;
-    data.grabExcessHorizontalSpace = true;
-    errorText.setLayoutData(data);
-    Dialog.applyDialogFont(parent);
-  }
-
-  /*
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.view.ITabbedPropertySection#refresh()
-   */
-  public void refresh()
-  {
-    super.refresh();
-    setListenerEnabled(false);
-
-    Element element = xsdSchema.getElement();
-
-    if (element != null)
-    {
-      // Handle prefixText
-      TypesHelper helper = new TypesHelper(xsdSchema);
-      String aPrefix = helper.getPrefix(element.getAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE), false);
-
-      if (aPrefix != null && aPrefix.length() > 0)
-      {
-        prefixText.setText(aPrefix);
-      }
-      else
-      {
-        prefixText.setText(""); //$NON-NLS-1$
-      }
-
-      // Handle TargetNamespaceText
-     
-      if (element.hasAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE))
-      {
-        String tns = element.getAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE);
-        String processedString = TextProcessor.process(tns);
-        targetNamespaceText.setText(processedString);
-      }
-      else
-      {
-        targetNamespaceText.setText(""); //$NON-NLS-1$
-      }
-      errorText.setText(""); //$NON-NLS-1$
-    }
-    setListenerEnabled(true);
-  }
-
-  public void doHandleEvent(Event event)
-  {
-    errorText.setText(""); //$NON-NLS-1$
-    String prefixValue = prefixText.getText();
-    String tnsValue = targetNamespaceText.getText();
-
-    Element element = xsdSchema.getElement();
-    TypesHelper helper = new TypesHelper(xsdSchema);
-    String currentPrefix = helper.getPrefix(element.getAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE), false);
-    String currentNamespace = xsdSchema.getTargetNamespace();
-    
-    if (tnsValue.trim().length() == 0)
-    {
-      if (prefixValue.trim().length() > 0)
-      {
-        errorText.setText(XSDEditorPlugin.getXSDString("_ERROR_TARGET_NAMESPACE_AND_PREFIX")); //$NON-NLS-1$
-        int length = errorText.getText().length();
-        red = new Color(null, 255, 0, 0);
-        StyleRange style = new StyleRange(0, length, red, targetNamespaceText.getBackground());
-        errorText.setStyleRange(style);
-        return;
-      }
-    }
-
-    if (event.widget == prefixText)
-    {
-      // If the prefix is the same, just return.   This may happen if the
-      // widget loses focus.
-      if (prefixValue.equals(currentPrefix)) 
-        return;
-      updateNamespaceInfo(prefixValue, tnsValue);
-    }
-    else if (event.widget == targetNamespaceText)
-    {
-      // If the ns is the same, just return.   This may happen if the
-      // widget loses focus.
-      if (tnsValue.equals(currentNamespace)) 
-        return;
-
-      DOMNamespaceInfoManager namespaceInfoManager = new DOMNamespaceInfoManager();
-      List namespaceInfoList = namespaceInfoManager.getNamespaceInfoList(xsdSchema.getElement());
-
-      Element xsdSchemaElement = xsdSchema.getElement();
-      DocumentImpl doc = (DocumentImpl) xsdSchemaElement.getOwnerDocument();
-
-      try
-      {
-        doc.getModel().beginRecording(this, XSDEditorPlugin.getXSDString("_UI_NAMESPACE_CHANGE"));
-        
-        if (tnsValue.trim().length() == 0 ) //remove the targetNamespace attribute
-        {
-          xsdSchemaElement.removeAttribute(XSDConstants.TARGETNAMESPACE_ATTRIBUTE);
-          return;
-        }
-
-        // Now replace the namespace for the xmlns entry
-        for (Iterator i = namespaceInfoList.iterator(); i.hasNext();)
-        {
-          NamespaceInfo info = (NamespaceInfo) i.next();
-          if (info.uri.equals(currentNamespace))
-          {
-            info.uri = tnsValue;
-          }
-        }
-
-        xsdSchema.setIncrementalUpdate(false);
-        // set the new xmlns entries
-        namespaceInfoManager.removeNamespaceInfo(element);
-        namespaceInfoManager.addNamespaceInfo(element, namespaceInfoList, false);
-        xsdSchema.setIncrementalUpdate(true);
-
-        // set the targetNamespace attribute
-        xsdSchema.setTargetNamespace(tnsValue);
-        
-        TargetNamespaceChangeHandler targetNamespaceChangeHandler = new TargetNamespaceChangeHandler(xsdSchema, currentNamespace, tnsValue);
-        targetNamespaceChangeHandler.resolve();
-      }
-      catch (Exception e)
-      {
-
-      }
-      finally
-      {
-        try
-        {
-          xsdSchema.update();
-        }
-        finally
-        {
-          doc.getModel().endRecording(this);
-        }
-      }
-    }
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == editButton)
-    {
-      XSDEditNamespacesAction nsAction = new XSDEditNamespacesAction(XSDEditorPlugin.getXSDString("_UI_ACTION_EDIT_NAMESPACES"), xsdSchema.getElement(), null, xsdSchema); //$NON-NLS-1$ 
-      nsAction.run();
-      refresh();
-    }
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.wst.common.ui.properties.internal.provisional.ISection#shouldUseExtraSpace()
-   */
-  public boolean shouldUseExtraSpace()
-  {
-    return true;
-  }
-
-  private void updateNamespaceInfo(String newPrefix, String newTargetNamespace)
-  {
-    UpdateNamespaceInformationCommand command = new UpdateNamespaceInformationCommand(Messages._UI_ACTION_NAMESPACE_INFORMATION_CHANGE, xsdSchema, newPrefix, newTargetNamespace);
-    getCommandStack().execute(command);
-  }
-
-  public void dispose()
-  {
-    if (prefixText != null && !prefixText.isDisposed())
-      removeListeners(prefixText);
-    if (targetNamespaceText != null && !targetNamespaceText.isDisposed())
-      removeListeners(targetNamespaceText);
-    
-    if (red != null)
-    {
-      red.dispose();
-      red = null;
-    }
-    super.dispose();
-  }
-
-  /**
-   * @deprecated
-   */
-  protected boolean validatePrefix(String prefix)
-  {
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeAdvancedSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeAdvancedSection.java
deleted file mode 100644
index 06db194..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeAdvancedSection.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDSimpleTypeAdvancedSection extends AbstractSection
-{
-  private static final String EMPTY = ""; //$NON-NLS-1$		
-  private String finalValues[] = { EMPTY, "#" + XSDConstants.ALL_ELEMENT_TAG,  //$NON-NLS-1$
-	      XSDConstants.LIST_ELEMENT_TAG, XSDConstants.RESTRICTION_ELEMENT_TAG, 
-	      XSDConstants.UNION_ELEMENT_TAG};
-  
-  CCombo finalCombo;
-  
-  public XSDSimpleTypeAdvancedSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-    composite = factory.createFlatFormComposite(parent);
-
-    GridData data = new GridData();
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // FinalLabel
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-
-    CLabel finalLabel = getWidgetFactory().createCLabel(composite, Messages._UI_LABEL_FINAL + ":");
-    finalLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // FinalCombo
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    finalCombo = getWidgetFactory().createCCombo(composite);
-    finalCombo.setLayoutData(data);
-    finalCombo.setEditable(false);
-
-    finalCombo.setItems(finalValues);
-    finalCombo.addSelectionListener(this);    
-  }
-  
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-
-    setListenerEnabled(false);
-
-    finalCombo.setText(""); //$NON-NLS-1$); 
-    
-    if (input instanceof XSDSimpleTypeDefinition)
-    {
-      XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition) input;
-
-      
-      if (simpleType.getElement().hasAttribute(XSDConstants.FINAL_ATTRIBUTE))
-      {
-        String finalAttValue = simpleType.getElement().getAttribute(XSDConstants.FINAL_ATTRIBUTE);
-        finalCombo.setText(finalAttValue);
-      }
-      else
-      {
-        finalCombo.setText(EMPTY);
-      }
-    }
-    setListenerEnabled(true);
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == finalCombo && input != null && input instanceof XSDSimpleTypeDefinition)
-    {
-      XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition) input;
-      String value = finalCombo.getText();
-      UpdateAttributeValueCommand command = new UpdateAttributeValueCommand(simpleType.getElement(), XSDConstants.FINAL_ATTRIBUTE, value, Messages._UI_LABEL_FINAL);
-      command.setDeleteIfEmpty(true);
-      getCommandStack().execute(command);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeSection.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeSection.java
deleted file mode 100644
index c7c764f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDSimpleTypeSection.java
+++ /dev/null
@@ -1,655 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.xerces.util.XMLChar;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.common.ui.internal.search.dialogs.ComponentSpecification;
-import org.eclipse.wst.xsd.ui.internal.actions.CreateElementAction;
-import org.eclipse.wst.xsd.ui.internal.actions.DOMAttribute;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.ComponentReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.adt.edit.IComponentDialog;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateNameCommand;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.dialogs.NewTypeDialog;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDComplexTypeBaseTypeEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDTypeReferenceEditManager;
-import org.eclipse.wst.xsd.ui.internal.editor.search.XSDSearchListDialogDelegate;
-import org.eclipse.wst.xsd.ui.internal.util.XSDDOMHelper;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDVariety;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-import com.ibm.icu.util.StringTokenizer;
-
-public class XSDSimpleTypeSection extends RefactoringSection
-{
-  protected Text nameText;
-  CCombo varietyCombo;
-  CCombo typesCombo;
-  CLabel typesLabel;
-
-  XSDSimpleTypeDefinition memberTypeDefinition, itemTypeDefinition, baseTypeDefinition;
-
-  public XSDSimpleTypeSection()
-  {
-    super();
-  }
-
-  protected void createContents(Composite parent)
-  {
-    TabbedPropertySheetWidgetFactory factory = getWidgetFactory();
-    composite = factory.createFlatFormComposite(parent);
-
-    GridData data = new GridData();
-
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.marginTop = 0;
-    gridLayout.marginBottom = 0;
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-
-    // ------------------------------------------------------------------
-    // NameLabel
-    // ------------------------------------------------------------------
-
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    CLabel nameLabel = factory.createCLabel(composite, Messages._UI_LABEL_NAME);
-    nameLabel.setLayoutData(data);
-
-    // ------------------------------------------------------------------
-    // NameText
-    // ------------------------------------------------------------------
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    nameText = getWidgetFactory().createText(composite, ""); //$NON-NLS-1$
-    nameText.setLayoutData(data);
-    applyAllListeners(nameText);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-    		XSDEditorCSHelpIds.GENERAL_TAB__SIMPLE_TYPE__NAME);
-    
-
-    // ------------------------------------------------------------------
-    // Refactor/rename hyperlink 
-    // ------------------------------------------------------------------
-    createRenameHyperlink(composite);
-
-    // Variety Label
-    CLabel label = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_VARIETY")); //$NON-NLS-1$
-
-    // Variety Combo
-    data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    label.setLayoutData(data);
-
-    varietyCombo = getWidgetFactory().createCCombo(composite, SWT.FLAT);
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-
-    List list = XSDVariety.VALUES;
-    Iterator iter = list.iterator();
-    while (iter.hasNext())
-    {
-      varietyCombo.add(((XSDVariety) iter.next()).getName());
-    }
-    varietyCombo.addSelectionListener(this);
-    varietyCombo.setLayoutData(data);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(varietyCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__SIMPLE_TYPE__VARIETY);
-
-
-    // ------------------------------------------------------------------
-    // DummyLabel
-    // ------------------------------------------------------------------
-    getWidgetFactory().createCLabel(composite, ""); //$NON-NLS-1$
-
-    // ------------------------------------------------------------------
-    // Types Label
-    // ------------------------------------------------------------------
-    typesLabel = getWidgetFactory().createCLabel(composite, XSDEditorPlugin.getXSDString("_UI_LABEL_MEMBERTYPES")); //$NON-NLS-1$
-
-    // ------------------------------------------------------------------
-    // Types Combo
-    // ------------------------------------------------------------------
-    typesCombo = getWidgetFactory().createCCombo(composite);
-    typesCombo.setEditable(false);
-    typesCombo.setLayoutData(data);
-    typesCombo.addSelectionListener(this);
-    typesCombo.addListener(SWT.Traverse, this);
-
-    
-    data = new GridData();
-    data.grabExcessHorizontalSpace = true;
-    data.horizontalAlignment = GridData.FILL;
-    typesCombo.setLayoutData(data);
-    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(typesCombo,
-    		XSDEditorCSHelpIds.GENERAL_TAB__SIMPLE_TYPE__BASE_TYPE);
-
-  }
-
-  protected void relayout()
-  {
-    Composite parentComposite = composite.getParent();
-    parentComposite.getParent().setRedraw(false);
-
-    if (parentComposite != null && !parentComposite.isDisposed())
-    {
-      Control[] children = parentComposite.getChildren();
-      for (int i = 0; i < children.length; i++)
-      {
-        children[i].dispose();
-      }
-    }
-
-    // Now initialize the new handler
-    createContents(parentComposite);
-    parentComposite.getParent().layout(true, true);
-
-    // Now turn painting back on
-    parentComposite.getParent().setRedraw(true);
-    refresh();
-  }
-
-  public void refresh()
-  {
-    super.refresh();
-
-    setListenerEnabled(false);
-    showLink(!hideHyperLink);
-
-    nameText.setText(""); //$NON-NLS-1$
-    varietyCombo.setText(""); //$NON-NLS-1$
-    typesCombo.setText(""); //$NON-NLS-1$
-    fillTypesCombo();
-    typesLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_BASE_TYPE_WITH_COLON")); //$NON-NLS-1$
-
-    if (input instanceof XSDSimpleTypeDefinition)
-    {
-      XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
-      String simpleTypeName = st.getName();
-      if (simpleTypeName != null)
-      {
-        nameText.setText(simpleTypeName);
-        nameText.setEditable(true);
-      }
-      else
-      {
-        nameText.setText("**anonymous**"); //$NON-NLS-1$);
-        nameText.setEditable(false);
-      }
-      
-      String variety = st.getVariety().getName();
-      int intVariety = st.getVariety().getValue();
-      XSDDOMHelper domHelper = new XSDDOMHelper();
-      if(domHelper.getDerivedByElementFromSimpleType(st.getElement()) != null) {
-	      if (variety != null)
-	      {
-	        varietyCombo.setText(variety);
-	        if (intVariety == XSDVariety.ATOMIC)
-	        {
-	          baseTypeDefinition = st.getBaseTypeDefinition();
-	          String name = ""; //$NON-NLS-1$
-	          if (baseTypeDefinition != null)
-	          {
-	            name = baseTypeDefinition.getName();
-	            if (name == null) name = "";
-	          }
-	          typesCombo.setText(name);
-	          typesLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_BASE_TYPE_WITH_COLON")); //$NON-NLS-1$
-	        }
-	        else if (intVariety == XSDVariety.LIST)
-	        {
-	          itemTypeDefinition = st.getItemTypeDefinition();
-	          String name = ""; //$NON-NLS-1$
-	          if (itemTypeDefinition != null)
-	          {
-	            name = itemTypeDefinition.getName();
-	            if (name == null) name = "";
-	          }
-	          typesCombo.setText(name);
-	          typesLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_ITEM_TYPE")); //$NON-NLS-1$
-	        }
-	        else if (intVariety == XSDVariety.UNION)
-	        {
-	          List memberTypesList = st.getMemberTypeDefinitions();
-	          StringBuffer sb = new StringBuffer();
-	          for (Iterator i = memberTypesList.iterator(); i.hasNext();)
-	          {
-	            XSDSimpleTypeDefinition typeObject = (XSDSimpleTypeDefinition) i.next();
-	            String name = typeObject.getQName();
-	            if (name != null)
-	            {
-	              sb.append(name);
-	              if (i.hasNext())
-	              {
-	                sb.append(" "); //$NON-NLS-1$
-	              }
-	            }
-	          }
-	          String memberTypes = sb.toString();
-	          typesCombo.setText(memberTypes);
-	          typesLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_MEMBERTYPES")); //$NON-NLS-1$
-	        }
-	      }
-	    }
-    }
-    setListenerEnabled(true);
-
-  }
-
-  public void doWidgetDefaultSelected(SelectionEvent e)
-  {
-    if (e.widget == typesCombo)
-    {
-      String selection = typesCombo.getText();
-      if (shouldPerformComboSelection(SWT.DefaultSelection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  public void doWidgetSelected(SelectionEvent e)
-  {
-    if (e.widget == typesCombo)
-    {
-      String selection = typesCombo.getText();
-      if (shouldPerformComboSelection(SWT.Selection, selection))
-        handleWidgetSelection(e);
-    } else
-    {
-      handleWidgetSelection(e);
-    }
-  }
-
-  private void handleWidgetSelection(SelectionEvent e)
-  {
-    if (e.widget == typesCombo)
-    {
-      IEditorPart editor = getActiveEditor();
-      if (editor == null) return;
-      ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDComplexTypeBaseTypeEditManager.class);    
-
-      String selection = typesCombo.getText();
-      ComponentSpecification newValue;
-      IComponentDialog dialog= null;
-      if ( selection.equals(org.eclipse.wst.xsd.ui.internal.editor.Messages._UI_ACTION_BROWSE))
-      {
-        dialog = manager.getBrowseDialog();
-        ((XSDSearchListDialogDelegate) dialog).showComplexTypes(false);
-      }
-      else if ( selection.equals(org.eclipse.wst.xsd.ui.internal.editor.Messages._UI_ACTION_NEW))
-      {
-        dialog = manager.getNewDialog();
-        ((NewTypeDialog) dialog).allowComplexType(false);
-      }
-
-      if (dialog != null)
-      {
-        if (dialog.createAndOpen() == Window.OK)
-        {
-          newValue = dialog.getSelectedComponent();
-          manager.modifyComponentReference(input, newValue);
-        }
-      }
-      else //use the value from selected quickPick item
-      {
-        newValue = getComponentSpecFromQuickPickForValue(selection, manager);
-        if (newValue != null)
-          manager.modifyComponentReference(input, newValue);
-      }
-    }
-    else if (e.widget == varietyCombo)
-    {
-      if (input != null)
-      {
-        if (input instanceof XSDSimpleTypeDefinition)
-        {
-          XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
-          Element parent = st.getElement();
-
-          String variety = varietyCombo.getText();
-          if (variety.equals(XSDVariety.ATOMIC_LITERAL.getName()))
-          {
-            typesLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_BASE_TYPE_WITH_COLON")); //$NON-NLS-1$
-            st.setVariety(XSDVariety.ATOMIC_LITERAL);
-            addCreateElementActionIfNotExist(XSDConstants.RESTRICTION_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_RESTRICTION"), parent, null); //$NON-NLS-1$
-          }
-          else if (variety.equals(XSDVariety.UNION_LITERAL.getName()))
-          {
-            typesLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_MEMBERTYPES")); //$NON-NLS-1$
-            st.setVariety(XSDVariety.UNION_LITERAL);
-            addCreateElementActionIfNotExist(XSDConstants.UNION_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_UNION"), parent, null); //$NON-NLS-1$
-          }
-          else if (variety.equals(XSDVariety.LIST_LITERAL.getName()))
-          {
-            typesLabel.setText(XSDEditorPlugin.getXSDString("_UI_LABEL_ITEM_TYPE")); //$NON-NLS-1$
-            st.setVariety(XSDVariety.LIST_LITERAL);
-            addCreateElementActionIfNotExist(XSDConstants.LIST_ELEMENT_TAG, XSDEditorPlugin.getXSDString("_UI_ACTION_ADD_LIST"), parent, null); //$NON-NLS-1$
-          }
-        }
-      }
-    }
-  }
-
-  public boolean shouldUseExtraSpace()
-  {
-    return false;
-  }
-
-  // issue (cs) this method seems to be utilizing 'old' classes, can we reimplement?
-  // (e.g. ChangeElementAction, XSDDOMHelper, etc)
-  protected boolean addCreateElementActionIfNotExist(String elementTag, String label, Element parent, Node relativeNode)
-  {
-    XSDSimpleTypeDefinition st = (XSDSimpleTypeDefinition) input;
-    List attributes = new ArrayList();
-    String reuseType = null;
-
-    // beginRecording(XSDEditorPlugin.getXSDString("_UI_LABEL_VARIETY_CHANGE"),
-    // parent); //$NON-NLS-1$
-    if (elementTag.equals(XSDConstants.RESTRICTION_ELEMENT_TAG))
-    {
-      Element listNode = getFirstChildNodeIfExists(parent, XSDConstants.LIST_ELEMENT_TAG, false);
-      if (listNode != null)
-      {
-        if (listNode.hasAttribute(XSDConstants.ITEMTYPE_ATTRIBUTE))
-        	reuseType = listNode.getAttribute(XSDConstants.ITEMTYPE_ATTRIBUTE);
-        XSDDOMHelper.removeNodeAndWhitespace(listNode);
-      }
-
-      Element unionNode = getFirstChildNodeIfExists(parent, XSDConstants.UNION_ELEMENT_TAG, false);
-      if (unionNode != null)
-      {
-        
-        if (unionNode.hasAttribute(XSDConstants.MEMBERTYPES_ATTRIBUTE))
-        {
-          String memberAttr = unionNode.getAttribute(XSDConstants.MEMBERTYPES_ATTRIBUTE);
-          StringTokenizer stringTokenizer = new StringTokenizer(memberAttr);
-          reuseType = stringTokenizer.nextToken();
-        }
-        XSDDOMHelper.removeNodeAndWhitespace(unionNode);
-      }
-
-      if (reuseType == null)
-      {
-        reuseType = getBuiltInStringQName();
-      }
-      attributes.add(new DOMAttribute(XSDConstants.BASE_ATTRIBUTE, reuseType));
-      st.setItemTypeDefinition(null);
-    }
-    else if (elementTag.equals(XSDConstants.LIST_ELEMENT_TAG))
-    {
-      Element restrictionNode = getFirstChildNodeIfExists(parent, XSDConstants.RESTRICTION_ELEMENT_TAG, false);
-      if (restrictionNode != null)
-      {
-        reuseType = restrictionNode.getAttribute(XSDConstants.BASE_ATTRIBUTE);
-        XSDDOMHelper.removeNodeAndWhitespace(restrictionNode);
-      }
-      Element unionNode = getFirstChildNodeIfExists(parent, XSDConstants.UNION_ELEMENT_TAG, false);
-      if (unionNode != null)
-      {
-        String memberAttr = unionNode.getAttribute(XSDConstants.MEMBERTYPES_ATTRIBUTE);
-        if (memberAttr != null)
-        {
-          StringTokenizer stringTokenizer = new StringTokenizer(memberAttr);
-          reuseType = stringTokenizer.nextToken();
-        }
-        XSDDOMHelper.removeNodeAndWhitespace(unionNode);
-      }
-      attributes.add(new DOMAttribute(XSDConstants.ITEMTYPE_ATTRIBUTE, reuseType));
-    }
-    else if (elementTag.equals(XSDConstants.UNION_ELEMENT_TAG))
-    {
-      Element listNode = getFirstChildNodeIfExists(parent, XSDConstants.LIST_ELEMENT_TAG, false);
-      if (listNode != null)
-      {
-        reuseType = listNode.getAttribute(XSDConstants.ITEMTYPE_ATTRIBUTE);
-        XSDDOMHelper.removeNodeAndWhitespace(listNode);
-      }
-      Element restrictionNode = getFirstChildNodeIfExists(parent, XSDConstants.RESTRICTION_ELEMENT_TAG, false);
-      if (restrictionNode != null)
-      {
-        reuseType = restrictionNode.getAttribute(XSDConstants.BASE_ATTRIBUTE);
-        XSDDOMHelper.removeNodeAndWhitespace(restrictionNode);
-      }
-      attributes.add(new DOMAttribute(XSDConstants.MEMBERTYPES_ATTRIBUTE, reuseType));
-      st.setItemTypeDefinition(null);
-    }
-
-    if (getFirstChildNodeIfExists(parent, elementTag, false) == null)
-    {
-      Action action = addCreateElementAction(elementTag, label, attributes, parent, relativeNode);
-      action.run();
-    }
-
-    st.setElement(parent);
-    st.updateElement();
-    // endRecording(parent);
-    return true;
-  }
-
-  protected Action addCreateElementAction(String elementTag, String label, List attributes, Element parent, Node relativeNode)
-  {
-    CreateElementAction action = new CreateElementAction(label);
-    action.setElementTag(elementTag);
-    action.setAttributes(attributes);
-    action.setParentNode(parent);
-    action.setRelativeNode(relativeNode);
-    return action;
-  }
-
-  protected Element getFirstChildNodeIfExists(Node parent, String elementTag, boolean isRef)
-  {
-    NodeList children = parent.getChildNodes();
-    Element targetNode = null;
-    for (int i = 0; i < children.getLength(); i++)
-    {
-      Node child = children.item(i);
-      if (child != null && child instanceof Element)
-      {
-        if (XSDDOMHelper.inputEquals(child, elementTag, isRef))
-        {
-          targetNode = (Element) child;
-          break;
-        }
-      }
-    }
-    return targetNode;
-  }
-
-  protected String getBuiltInStringQName()
-  {
-    String stringName = "string"; //$NON-NLS-1$
-
-    if (xsdSchema != null)
-    {
-      String schemaForSchemaPrefix = xsdSchema.getSchemaForSchemaQNamePrefix();
-      if (schemaForSchemaPrefix != null && schemaForSchemaPrefix.length() > 0)
-      {
-        String prefix = xsdSchema.getSchemaForSchemaQNamePrefix();
-        if (prefix != null && prefix.length() > 0)
-        {
-          stringName = prefix + ":" + stringName; //$NON-NLS-1$
-        }
-      }
-    }
-    return stringName;
-  }
-
-  // TODO: Common this up with element declaration
-  public void doHandleEvent(Event event) 
-  {
-    if (event.type == SWT.Traverse) {
-      if (event.detail == SWT.TRAVERSE_ARROW_NEXT || event.detail == SWT.TRAVERSE_ARROW_PREVIOUS) {
-        isTraversing = true;
-        return;
-      }
-    }
-    if (event.widget == nameText)
-    {
-      if (!nameText.getEditable())
-        return;
-
-      String newValue = nameText.getText().trim();
-      if (input instanceof XSDNamedComponent)
-      {
-        XSDNamedComponent namedComponent = (XSDNamedComponent)input;
-        if (!validateSection())
-          return;
-
-        Command command = null;
-
-        // Make sure an actual name change has taken place
-        String oldName = namedComponent.getName();
-        if (!newValue.equals(oldName))
-        {
-          command = new UpdateNameCommand(Messages._UI_ACTION_RENAME, namedComponent, newValue);
-        }
-
-        if (command != null && getCommandStack() != null)
-        {
-          getCommandStack().execute(command);
-        }
-
-      }
-    }
-  }
-  
-  protected boolean validateSection()
-  {
-    if (nameText == null || nameText.isDisposed())
-      return true;
-
-    setErrorMessage(null);
-
-    String name = nameText.getText().trim();
-
-    // validate against NCName
-    if (name.length() < 1 || !XMLChar.isValidNCName(name))
-    {
-      setErrorMessage(Messages._UI_ERROR_INVALID_NAME);
-      return false;
-    }
-
-    return true;
-  }
-  
-  public void setInput(IWorkbenchPart part, ISelection selection)
-  {
-    super.setInput(part, selection);
-    setListenerEnabled(false);
-    if (input instanceof XSDSimpleTypeDefinition)
-    {
-    	XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition) input;
-      hideHyperLink = !(simpleType.getContainer() instanceof XSDSchema);
-      
-    }    
-    // Don't have to call relayout() here
-    setListenerEnabled(true);
-  }
-  
-  private void fillTypesCombo()
-  {
-    typesCombo.removeAll();
-    
-    IEditorPart editor = getActiveEditor();
-    ComponentReferenceEditManager manager = (ComponentReferenceEditManager)editor.getAdapter(XSDTypeReferenceEditManager.class);
-    if (manager != null)
-    {
-      ComponentSpecification[] items = manager.getQuickPicks();
-
-      typesCombo.add(org.eclipse.wst.xsd.ui.internal.adt.editor.Messages._UI_ACTION_BROWSE);
-      typesCombo.add(org.eclipse.wst.xsd.ui.internal.editor.Messages._UI_ACTION_NEW);
-
-      for (int i = 0; i < items.length; i++)
-      {
-        typesCombo.add(items[i].getName());
-      }
-
-      // Add the current Type of this attribute if needed
-      XSDSimpleTypeDefinition simpleType = (XSDSimpleTypeDefinition) input;
-      XSDTypeDefinition baseType = simpleType.getBaseType();
-      if (baseType != null && baseType.getQName() != null)
-      {
-        String currentTypeName = baseType.getQName(xsdSchema); // no prefix
-        ComponentSpecification ret = getComponentSpecFromQuickPickForValue(currentTypeName, manager);
-        if (ret == null && currentTypeName != null) // not in quickPick
-        {
-          typesCombo.add(currentTypeName);
-        }
-      }
-    }
-  }
-
-  // TODO: common this up with XSDElementDeclarationSection
-  private ComponentSpecification getComponentSpecFromQuickPickForValue(String value, ComponentReferenceEditManager editManager)
-  {
-    if (editManager != null)
-    {  
-      ComponentSpecification[] quickPicks = editManager.getQuickPicks();
-      if (quickPicks != null)
-      {
-        for (int i=0; i < quickPicks.length; i++)
-        {
-          ComponentSpecification componentSpecification = quickPicks[i];
-          if (value != null && value.equals(componentSpecification.getName()))
-          {
-            return componentSpecification;
-          }                
-        }  
-      }
-    }
-    return null;
-  }
-  
-  public void dispose()
-  {
-    if (typesCombo != null && !typesCombo.isDisposed())
-      typesCombo.removeListener(SWT.Traverse, this);
-    super.dispose();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDTableTreeViewer.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDTableTreeViewer.java
deleted file mode 100644
index 0b04e7b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/XSDTableTreeViewer.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections;
-
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLTableTreeContentProvider;
-import org.eclipse.wst.xml.ui.internal.tabletree.XMLTableTreeViewer;
-import org.w3c.dom.Element;
-
-public class XSDTableTreeViewer extends XMLTableTreeViewer
-{
-
-  String filter = ""; //$NON-NLS-1$
-
-  class XSDActionMenuListener implements IMenuListener
-  {
-    public void menuAboutToShow(IMenuManager menuManager)
-    {
-      // used to disable NodeSelection listening while running NodeAction
-      // XSDActionManager nodeActionManager = new XSDActionManager(fModel,
-      // XSDTableTreeViewer.this);
-      // nodeActionManager.setCommandStack(commandStack);
-      // nodeActionManager.fillContextMenu(menuManager, getSelection());
-
-      // used to disable NodeSelection listening while running NodeAction
-      // XMLNodeActionManager nodeActionManager = new
-      // XMLNodeActionManager(((IDOMDocument) getInput()).getModel(),
-      // XMLTableTreeViewer.this) {
-      if (getInput() != null)
-      {
-        XSDActionManager nodeActionManager = new XSDActionManager(((IDOMDocument) (((Element) getInput()).getOwnerDocument())).getModel(), XSDTableTreeViewer.this);
-        // nodeActionManager.setCommandStack(commandStack);
-        nodeActionManager.fillContextMenu(menuManager, getSelection());
-      }
-
-    }
-  }
-
-  public XSDTableTreeViewer(Composite parent)
-  {
-    super(parent);
-    // treeExtension.setCellModifier(null);
-    getTree().setLinesVisible(true);
-
-    // treeExtension = new XMLTreeExtension(getTree());
-
-    // Reassign the content provider
-    XMLTableTreeContentProvider provider = new MyContentProvider();
-    // provider.addViewer(this);
-
-    setContentProvider(provider);
-    setLabelProvider(provider);
-
-    // setViewerSelectionManager(new ViewerSelectionManagerImpl(null));
-  }
-
-  protected Object getRoot()
-  {
-    return super.getRoot();
-  }
-
-  public void setFilter(String filter)
-  {
-    this.filter = filter;
-  }
-
-  protected void createContextMenu()
-  {
-    // TODO Verify if this is okay to override the MenuManager
-    MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
-    contextMenu.add(new Separator("additions")); //$NON-NLS-1$
-    contextMenu.setRemoveAllWhenShown(true);
-
-    // This is the line we have to modify
-    contextMenu.addMenuListener(new XSDActionMenuListener());
-    Menu menu = contextMenu.createContextMenu(getControl());
-    getControl().setMenu(menu);
-  }
-
-  boolean added = false;
-
-  class MyContentProvider extends XMLTableTreeContentProvider
-  {
-
-    // public Object[] getChildren(Object element) {
-    //			
-    // if (!added) {
-    // if (element instanceof Element) {
-    // added = true;
-    // Element elem = (Element)element;
-    // if (elem instanceof INodeNotifier) {
-    // viewerNotifyingAdapterFactory.adapt((INodeNotifier) elem);
-    // }
-    // // return new Object[] {elem};
-    // }
-    // }
-    // return super.getChildren(element);
-    // }
-
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-      added = false;
-      if (oldInput instanceof Element)
-        oldInput = ((Element) oldInput).getOwnerDocument();
-
-      if (newInput instanceof Element)
-        newInput = ((Element) newInput).getOwnerDocument();
-      super.inputChanged(viewer, oldInput, newInput);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
deleted file mode 100644
index 3b309bf..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddExtensionsComponentDialog.java
+++ /dev/null
@@ -1,785 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.apache.xerces.dom.DocumentImpl;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IDoubleClickListener;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Cursor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.MessageBox;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.SelectionDialog;
-import org.eclipse.wst.xsd.contentmodel.internal.XSDImpl;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-public class AddExtensionsComponentDialog extends SelectionDialog implements ISelectionChangedListener, SelectionListener
-{
-  protected static final Image DEFAULT_ELEMENT_ICON = XSDEditorPlugin.getXSDImage("icons/XSDElement.gif"); //$NON-NLS-1$
-  protected static final Image DEFAULT_ATTRIBUTE_ICON = XSDEditorPlugin.getXSDImage("icons/XSDAttribute.gif"); //$NON-NLS-1$
-
-  /** A temporary Document in which we create temporary DOM element for each element in the
-   * Element view. (required by LabelProvider)  */ 
-  protected static Document tempDoc = new DocumentImpl();
-  
-  Button addButton, removeButton, editButton;
-
-  public AddExtensionsComponentDialog(Shell parent, ExtensionsSchemasRegistry schemaRegistry)
-  {
-    super(parent);
-    setTitle(Messages._UI_ACTION_ADD_EXTENSION_COMPONENTS);
-    setShellStyle(SWT.APPLICATION_MODAL | SWT.RESIZE | SWT.CLOSE);    
-  }
-
-  private List fInput;
-
-  private TableViewer categoryTableViewer, elementTableViewer;
-  private ArrayList existingNames;
-
-  private ViewerFilter elementTableViewerFilter;
-  private SpecificationForExtensionsSchema currentExtCategory;
-  private HashMap specToComponentsList = new HashMap();
-  private IPreferenceStore prefStore;
-  
-  public void setInput(List input)
-  {
-    this.fInput = input;
-  }
-  
-  public SpecificationForExtensionsSchema getSelectedCategory(){
-	return currentExtCategory;
-  }
-  
-  public void setInitialCategorySelection(SpecificationForExtensionsSchema spec){
-	  currentExtCategory = spec;
-  }
-  
-  protected IStructuredContentProvider getCategoryContentProvider()
-  {
-    return new CategoryContentProvider();
-  }
-
-  protected Control createDialogArea(Composite container)
-  {
-    Composite parent = (Composite) super.createDialogArea(container);
-
-    Composite categoryComposite = new Composite(parent, SWT.NONE);
-    GridLayout gl = new GridLayout();
-    gl.numColumns = 2;
-    gl.marginHeight = 0;
-    gl.marginWidth = 0;
-    GridData data = new GridData(GridData.FILL_BOTH);
-    categoryComposite.setLayoutData(data);
-    categoryComposite.setLayout(gl);
-
-    Label label = new Label(categoryComposite, SWT.LEFT);
-    label.setText(Messages._UI_LABEL_EXTENSION_CATEGORIES);
-
-    new Label(categoryComposite, SWT.NONE);
-
-    categoryTableViewer = new TableViewer(categoryComposite, getTableStyle());
-    categoryTableViewer.setContentProvider(getCategoryContentProvider());
-    categoryTableViewer.setLabelProvider(new CategoryLabelProvider());
-    categoryTableViewer.setInput(fInput);
-    categoryTableViewer.addSelectionChangedListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(categoryTableViewer.getControl(), XSDEditorCSHelpIds.ADD_EXTENSIONS_COMPONENTS__EXTENSION_CATEGORIES);
-
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    Table table = categoryTableViewer.getTable();
-    table.setLayoutData(gd);
-    table.setFont(container.getFont());
-
-    Composite buttonComposite = new Composite(categoryComposite, SWT.NONE);
-    gl = new GridLayout();
-    gl.makeColumnsEqualWidth = true;
-    gl.numColumns = 1;
-    data = new GridData();
-    data.horizontalAlignment = SWT.FILL;
-    buttonComposite.setLayoutData(data);
-    buttonComposite.setLayout(gl);
-
-    addButton = new Button(buttonComposite, SWT.PUSH);
-    addButton.setText(Messages._UI_LABEL_ADD_WITH_DOTS);
-    addButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-    addButton.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(addButton,
-    		XSDEditorCSHelpIds.ADD_EXTENSIONS_COMPONENTS__ADD);    
-
-    removeButton = new Button(buttonComposite, SWT.PUSH);
-    removeButton.setText(Messages._UI_LABEL_DELETE);
-    removeButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-    removeButton.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(removeButton,
-    		XSDEditorCSHelpIds.ADD_EXTENSIONS_COMPONENTS__DELETE);    
-
-    
-    editButton = new Button(buttonComposite, SWT.PUSH);
-    editButton.setText(Messages._UI_LABEL_EDIT);
-    editButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-    editButton.addSelectionListener(this);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(editButton,
-    		XSDEditorCSHelpIds.ADD_EXTENSIONS_COMPONENTS__EDIT);    
-    
-    
-    List initialSelection = getInitialElementSelections();
-    if (initialSelection != null)
-      categoryTableViewer.setSelection(new StructuredSelection(initialSelection));
-
-    Label elementLabel = new Label(categoryComposite, SWT.LEFT);
-    elementLabel.setText(Messages._UI_LABEL_AVAILABLE_COMPONENTS_TO_ADD);
-
-    new Label(categoryComposite, SWT.NONE);
-
-    elementTableViewer = new TableViewer(categoryComposite, getTableStyle());
-    elementTableViewer.setContentProvider(new ElementContentProvider());
-    elementTableViewer.setLabelProvider(new ElementLabelProvider());
-    elementTableViewer.setInput(null);
-    elementTableViewer.addDoubleClickListener(new IDoubleClickListener()
-    {
-      public void doubleClick(DoubleClickEvent event)
-      {
-        okPressed();
-      }
-    });
-    if ( elementTableViewerFilter != null){
-      elementTableViewer.addFilter(elementTableViewerFilter);
-    }
-    
-    gd = new GridData(GridData.FILL_BOTH);
-    table = elementTableViewer.getTable();
-    table.setLayoutData(gd);
-    table.setFont(container.getFont());
-
-    elementTableViewer.addSelectionChangedListener(new ISelectionChangedListener() {
-		public void selectionChanged(SelectionChangedEvent event) {
-	          getButton(IDialogConstants.OK_ID).setEnabled(true);			
-	    }        	  
-      });
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(elementTableViewer.getControl(), XSDEditorCSHelpIds.ADD_EXTENSIONS_COMPONENTS__AVAILABLE_COMPONENTS_TO_ADD);
-    
-    return parent;
-  }
-
-  public void create()
-  {
-    super.create();
-    if (categoryTableViewer.getTable().getItemCount() > 0)
-    {
-      categoryTableViewer.getTable().select(0);
-      
-      StructuredSelection structuredSelection;
-      if (currentExtCategory != null){
-    	  structuredSelection = new StructuredSelection(currentExtCategory);
-      }
-      else{
-    	  structuredSelection = 
-    		  new StructuredSelection(categoryTableViewer.getElementAt(0));
-      }
-      
-	  categoryTableViewer.setSelection(structuredSelection);
-    }
-    
-    // Setup the list of category names that already exist
-    // and contructs the XSDSchema for each category
-	existingNames = new ArrayList();
-	TableItem[] categories = categoryTableViewer.getTable().getItems();
-	for (int i = 0; i < categories.length; i++ ){
-		existingNames.add(categories[i].getText());
-
-		SpecificationForExtensionsSchema spec = 
-			(SpecificationForExtensionsSchema) categories[i].getData();
-		XSDSchema schema = getASISchemaModel(spec);
-		
-		if (schema == null)
-		{
-			continue;
-		}
-
-		List components = buildInput(schema);
-		specToComponentsList.put(spec, components);
-
-		// mark category as gray/empty if applicable
-		Object[] remains = components.toArray();
-		if ( elementTableViewerFilter != null)
-			remains = elementTableViewerFilter.filter(elementTableViewer, 
-					elementTableViewer.getTable(), remains);
-		if ( remains.length == 0)
-		{
-		  categories[i].setForeground(
-			getShell().getDisplay().getSystemColor(SWT.COLOR_GRAY));
-		}
-	}
-	
-	getButton(IDialogConstants.OK_ID).setEnabled(false);
-  }
-  
-  public void addElementsTableFilter(ViewerFilter filter){
-	elementTableViewerFilter = filter;
-  }
-  
-  public void setPrefStore(IPreferenceStore prefStore)
-  {
-    this.prefStore = prefStore;
-  }
-
-  protected Point getInitialSize()
-  {
-    return getShell().computeSize(400, 300);
-  }
-
-  /**
-   * Return the style flags for the table viewer.
-   * 
-   * @return int
-   */
-  protected int getTableStyle()
-  {
-    return SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER;
-  }
-
-  /*
-   * Overrides method from Dialog
-   */
-  protected void okPressed()
-  {
-    // Build a list of selected children.
-    getShell().setCursor(new Cursor(getShell().getDisplay(), SWT.CURSOR_WAIT));
-    IStructuredSelection elementSelection = (IStructuredSelection) elementTableViewer.getSelection();
-    IStructuredSelection categorySelection = (IStructuredSelection) categoryTableViewer.getSelection();
-    List result = new ArrayList();
-    result.add(elementSelection.getFirstElement());
-    result.add(categorySelection.getFirstElement());
-    if (elementSelection.getFirstElement() != null)
-    {
-      setResult(result);
-    }
-    else
-    {
-      setResult(null);
-    }
-    super.okPressed();
-  }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
-   */
-  public void widgetSelected(SelectionEvent e)
-  {
-    if (e.widget == addButton)
-    {
-    	AddNewCategoryDialog addNewCategoryDialog
-    		= new AddNewCategoryDialog(getShell());
-    	
-    	addNewCategoryDialog.setUnavailableCategoryNames(existingNames);
-    	
-    	if ( addNewCategoryDialog.open() == Window.OK ){    		
-    		SpecificationForExtensionsSchema schemaSpec = 
-    			new SpecificationForExtensionsSchema();
-    		schemaSpec.setDisplayName(addNewCategoryDialog.getNewCategoryName() );
-    		schemaSpec.setLocation(addNewCategoryDialog.getCategoryLocation() );
-    		schemaSpec.setSourceHint(addNewCategoryDialog.getSource());
-    		schemaSpec.setFromCatalog(addNewCategoryDialog.getFromCatalog() );
-
-    		fInput.add(schemaSpec);
-    		existingNames.add(schemaSpec.getDisplayName());
-
-    		// refresh without updating labels of existing TableItems    		
-    		categoryTableViewer.refresh(false);
-
-    		categoryTableViewer.setSelection(new StructuredSelection(schemaSpec));
-    		getButton(IDialogConstants.OK_ID).setEnabled(false);
-    		
-    		storeSpecInPref(schemaSpec);  // must store after selection changed is called ie. 2 lines above (trung)
-    	}
-    }
-    else if (e.widget == removeButton)
-    {
-    	TableItem[] selections = categoryTableViewer.getTable().getSelection();
-    	for (int i =0; i < selections.length; i++){
-    		SpecificationForExtensionsSchema spec = 
-    			(SpecificationForExtensionsSchema) selections[i].getData();
-
-			fInput.remove(spec );
-    		existingNames.remove(spec.getDisplayName());
-    		specToComponentsList.remove(spec);
-    		
-    		removeFromPref(spec);
-    	}
-    	categoryTableViewer.refresh(false);
-
-    	elementTableViewer.setInput(null);
-    	elementTableViewer.refresh();
-
-        // TODO auto select either the prev category, the next category or the first category in the Table
-    	getButton(IDialogConstants.OK_ID).setEnabled(false);
-    }
-    else if (e.widget == editButton)
-    {
-        // use this dialog not for adding but for editing purpose.
-        AddNewCategoryDialog dialog = new AddNewCategoryDialog(getShell(), Messages._UI_LABEL_EDIT_CATEGORY);
-        
-    	TableItem[] selections = categoryTableViewer.getTable().getSelection();
-    	if (selections.length == 0)
-    		return;
-
-    	SpecificationForExtensionsSchema spec = (SpecificationForExtensionsSchema) selections[0].getData();
-        
-    	String displayName = spec.getDisplayName();
-
-		dialog.setCategoryName(displayName );
-    	dialog.setFromCatalog(spec.isFromCatalog() );
-    	dialog.setSource(spec.getSourceHint() );
-    	dialog.setCategoryLocation(spec.getLocation() );
-
-    	specToComponentsList.remove(spec);
-    	dialog.setUnavailableCategoryNames(existingNames);
-        
-        if ( dialog.open() == Window.OK){
-        	existingNames.remove(displayName);
-			String newDisplayName = dialog.getNewCategoryName();
-
-			spec.setDisplayName(newDisplayName);
-        	spec.setLocation(dialog.getCategoryLocation());
-        	spec.setSourceHint(dialog.getSource());
-        	spec.setFromCatalog(dialog.getFromCatalog());
-        	spec.setNamespaceURI(null);
-        	
-        	existingNames.add(newDisplayName);
-
-        	categoryTableViewer.update(spec, null);
-        	refreshElementsViewer(spec);
-        	
-        	editSpecInPref(displayName, spec);
-        }
-    }
-  }
-
-/*
-   * (non-Javadoc)
-   * 
-   * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
-   */
-  public void widgetDefaultSelected(SelectionEvent event)
-  {
-
-  }
-
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    if (event.getSource() == categoryTableViewer)
-    {
-      ISelection selection = event.getSelection();
-      if (selection instanceof StructuredSelection)
-      {
-        Object obj = ((StructuredSelection) selection).getFirstElement();
-        if (obj instanceof SpecificationForExtensionsSchema)
-        {
-          SpecificationForExtensionsSchema spec = (SpecificationForExtensionsSchema) obj;
-          currentExtCategory = spec;
-          refreshElementsViewer(spec);
-
-          if ( spec.isDefautSchema() ){
-        	editButton.setEnabled(false);
-        	removeButton.setEnabled(false);
-          }
-          else{
-        	editButton.setEnabled(true);
-        	removeButton.setEnabled(true);
-          }
-
-          getButton(IDialogConstants.OK_ID).setEnabled(false);
-        }
-      }
-    }
-  }
-  
-  private void refreshElementsViewer(SpecificationForExtensionsSchema spec) {
-	  List components = (List) specToComponentsList.get(spec);
-	  if ( components != null){
-		elementTableViewer.setInput(components);
-		return;
-	  }
-	  
-	  XSDSchema xsdSchema = getASISchemaModel(spec);
-
-	  if (xsdSchema == null){
-		  MessageBox errDialog = new MessageBox(getShell(), SWT.ICON_ERROR);
-		  errDialog.setText(Messages._UI_ERROR_INVALID_CATEGORY);
-		  // TODO (trung) I was forced to use a String in Messages to make the error clearer
-		  // When we are back to development phase, use another string: "Extension Category: "
-		  // not "Extension Categories:" + " " like we are using here
-		  errDialog.setMessage(Messages._UI_LABEL_EXTENSION_CATEGORIES + " " + spec.getDisplayName() //$NON-NLS-1$
-				  + "\n"   //$NON-NLS-1$
-				  + Messages._UI_ERROR_FILE_CANNOT_BE_PARSED
-				  + "\n" + Messages._UI_ERROR_VALIDATE_THE_FILE);   //$NON-NLS-1$
-		  errDialog.open();
-		  
-		  elementTableViewer.setInput(new ArrayList(0));
-		  return;
-	  }
-	  
-	  components = buildInput(xsdSchema);
-      specToComponentsList.put(spec, components);	  
-	  
-	  List allItems = buildInput(xsdSchema);
-	  if ( allItems == null )
-		  return;
-	  elementTableViewer.setInput(allItems);
-  }
-  
-  private static List buildInput(XSDSchema xsdSchema)
-  {
-	if ( xsdSchema ==null )
-		return null;
-
-    List elements = xsdSchema.getElementDeclarations();
-    List attributes = xsdSchema.getAttributeDeclarations();
-    String targetNamespace = xsdSchema.getTargetNamespace();
-
-    // For safety purpose: We don't append 'attributes' to 'elements'
-    // ArrayStoreException(or similar one) may occur
-    List allItems = new ArrayList(attributes.size() + elements.size());
-    
-    {
-      // getElementDeclarations returns a lot of elements from import
-      // statement, we
-      // only add non-imported elements here. (trung)
-      for (int i = 0; i < elements.size(); i++)
-      {
-        XSDElementDeclaration currentElement = (XSDElementDeclaration) elements.get(i);
-        if (currentElement.getTargetNamespace() != null)
-        {
-          if (currentElement.getTargetNamespace().equals(targetNamespace))
-            allItems.add(currentElement);
-        }
-        else
-        {
-          if (targetNamespace == null)
-            allItems.add(currentElement);
-        }
-      }
-      // getAttributeDeclarations also returns a lot of elements from
-      // import statement, we
-      // only add non-imported elements here. (trung)
-      for (int i = 0; i < attributes.size(); i++)
-      {
-        XSDAttributeDeclaration currentAttribute = (XSDAttributeDeclaration) attributes.get(i);
-        if (currentAttribute.getTargetNamespace() != null)
-        {
-          if (currentAttribute.isGlobal() && currentAttribute.getTargetNamespace().equals(targetNamespace))
-            allItems.add(currentAttribute);
-        }
-        else
-        {
-          if (targetNamespace == null)
-            allItems.add(currentAttribute);
-        }
-      }
-    }
-    return allItems;
-  }
-
-  
-  private static XSDSchema getASISchemaModel(SpecificationForExtensionsSchema extensionsSchemaSpec)
-  {
-    String location = extensionsSchemaSpec.getLocation();
-    if ( location == null)
-    	return null;
-	XSDSchema xsdSchema = XSDImpl.buildXSDModel(location);
-    
-    // now that the .xsd file is read, we can retrieve the namespace of this xsd file
-    // and set the namespace for 'properties'
-    if ( extensionsSchemaSpec.getNamespaceURI() == null){
-    	extensionsSchemaSpec.setNamespaceURI( xsdSchema.getTargetNamespace());
-    }
-    
-    return xsdSchema;
-  }
-
-  private void storeSpecInPref(SpecificationForExtensionsSchema schemaSpec) {
-	if (prefStore == null)
-		return;
-	
-	String currentValue = prefStore.getString(ExtensionsSchemasRegistry.USER_ADDED_EXT_SCHEMAS);
-	String specDesc = "  " + "\t" + schemaSpec.getDisplayName() + "\t"+
-		schemaSpec.getNamespaceURI() + "\t" + schemaSpec.getLocation() + "\t" +
-		schemaSpec.isDefautSchema() + "\t" + schemaSpec.getSourceHint() + "\t" +
-		schemaSpec.isFromCatalog();
-	currentValue += specDesc + "\n";
-
-	prefStore.setValue(ExtensionsSchemasRegistry.USER_ADDED_EXT_SCHEMAS,
-			currentValue);
-  }
-
-  private void editSpecInPref(String displayName, SpecificationForExtensionsSchema newSpec) {
-	if (prefStore == null)
-	  return;
-	
-	String newValue = "";
-	String currentValue = prefStore.getString(ExtensionsSchemasRegistry.USER_ADDED_EXT_SCHEMAS);
-	StringTokenizer tokenizer = new StringTokenizer(currentValue, "\n");
-
-	while (tokenizer.hasMoreTokens())
-	{
-	  String oneSpecDesc = tokenizer.nextToken();
-	  // get the Display name
-	  StringTokenizer _tokenizer_2 = new StringTokenizer(oneSpecDesc, "\t");
-	  _tokenizer_2.nextToken();
-	  String dName = _tokenizer_2.nextToken();
-
-	  if ( dName.equals(displayName ) )
-	  {
-		oneSpecDesc = "  " + "\t" + newSpec.getDisplayName() + "\t"+
-			newSpec.getNamespaceURI() + "\t" + newSpec.getLocation() + "\t" +
-			newSpec.isDefautSchema() + "\t" + newSpec.getSourceHint() + "\t" +
-			newSpec.isFromCatalog();		  
-	  }
-
-	  newValue += oneSpecDesc + "\n";
-	}
-	prefStore.setValue(ExtensionsSchemasRegistry.USER_ADDED_EXT_SCHEMAS, newValue);
-	
-  }
-
-  private void removeFromPref(SpecificationForExtensionsSchema spec) {
-	if (prefStore == null)
-	  return;	  
-	  
-	String newValue = "";
-	String currentValue = prefStore.getString(ExtensionsSchemasRegistry.USER_ADDED_EXT_SCHEMAS);
-	StringTokenizer tokenizer = new StringTokenizer(currentValue, "\n");
-
-	while (tokenizer.hasMoreTokens())
-	{
-	  String oneSpecDesc = tokenizer.nextToken();
-	  // get the Display name
-	  StringTokenizer _tokenizer_2 = new StringTokenizer(oneSpecDesc, "\t");
-	  _tokenizer_2.nextToken();
-	  String dName = _tokenizer_2.nextToken();
-
-	  if ( dName.equals(spec.getDisplayName() ) )
-		continue;
-	  newValue += oneSpecDesc + "\n";
-	}
-	prefStore.setValue(ExtensionsSchemasRegistry.USER_ADDED_EXT_SCHEMAS, newValue);
-  }
-
-static class CategoryContentProvider implements IStructuredContentProvider
-  {
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-     */
-    public Object[] getElements(Object inputElement)
-    {    
-      SpecificationForExtensionsSchema[] extensionsSchemaSpecs = null;
-      try
-      {
-        List inputList = (List) inputElement;
-        extensionsSchemaSpecs = (SpecificationForExtensionsSchema[]) inputList.toArray(new SpecificationForExtensionsSchema[0]);
-      }
-      catch (Exception e)
-      {
-      }
-      return extensionsSchemaSpecs;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose()
-    {
-      // Do nothing
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-     *      java.lang.Object, java.lang.Object)
-     */
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-      // Do nothing
-
-    }
-  }
-
-  static class CategoryLabelProvider extends LabelProvider
-  {
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-     */
-    public Image getImage(Object element)
-    {
-      return XSDEditorPlugin.getXSDImage("icons/appinfo_category.gif"); //$NON-NLS-1$
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-     */
-    public String getText(Object element)
-    {
-      if (element instanceof SpecificationForExtensionsSchema)
-        return ((SpecificationForExtensionsSchema) element).getDisplayName();
-
-      return super.getText(element);
-    }
-  }
-
-  static class ElementContentProvider implements IStructuredContentProvider
-  {
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-     */
-    public Object[] getElements(Object inputElement)
-    {
-      if (inputElement instanceof List)
-      {
-        return ((List) inputElement).toArray();
-      }
-      return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-     */
-    public void dispose()
-    {
-      // Do nothing
-
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer,
-     *      java.lang.Object, java.lang.Object)
-     */
-    public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-    {
-      // Do nothing
-
-    }
-  }
-
-  class ElementLabelProvider extends LabelProvider
-  {    
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.ILabelProvider#getImage(java.lang.Object)
-     */
-    public Image getImage(Object element)
-    {
-      if ( element instanceof XSDElementDeclaration){
-    	  
-    	  // Workaround trick: (trung) we create a temporary Dom element and put it in the label provider
-    	  // to get the image.
-    	  String namespace = ((XSDElementDeclaration) element).getSchema().getTargetNamespace();
-    	  String name = ((XSDElementDeclaration) element).getName();
-    	  Element tempElement = tempDoc.createElementNS(namespace, name);
-          ILabelProvider lp = XSDEditorPlugin.getDefault().getNodeCustomizationRegistry().getLabelProvider(namespace);
-    	  if (lp != null){
-    		  Image img = lp.getImage(tempElement);
-    		  
-    		  if (img != null){
-    			  return img;
-    		  }
-    	  }
-    	  return DEFAULT_ELEMENT_ICON;
-      }
-      else if ( element instanceof XSDAttributeDeclaration){
-    	  return DEFAULT_ATTRIBUTE_ICON;
-      }
-      return null;
-    }
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
-     */
-    public String getText(Object element)
-    {
-      if (element instanceof XSDElementDeclaration)
-        return ((XSDElementDeclaration) element).getName();
-      if (element instanceof XSDAttributeDeclaration )
-        return ((XSDAttributeDeclaration) element).getName();
-      return super.getText(element);
-    }
-  }
-
-  public boolean close()
-  {
-    return super.close();
-  }
-  
-  protected void enableButtons(boolean value)
-  {
-    editButton.setEnabled(value);
-    addButton.setEnabled(value);
-    removeButton.setEnabled(value);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddNewCategoryDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddNewCategoryDialog.java
deleted file mode 100644
index 5356877..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/AddNewCategoryDialog.java
+++ /dev/null
@@ -1,370 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.window.Window;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.dialogs.SelectSingleFileDialog;
-import org.eclipse.wst.xsd.ui.internal.common.util.Messages;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-
-public class AddNewCategoryDialog extends Dialog
-{
-  private static final String SCHEMA_LABEL = Messages._UI_LABEL_SCHEMA;
-  private static final String NAME_LABEL = Messages._UI_LABEL_NAME;  
-  private static final String SELECT_FROM_WORKSPACE = Messages._UI_LABEL_WORKSPACE; 
-  private static final String SELECT_FROM_CATALOG = Messages._UI_LABEL_CATALOG;  
-  private String dialogTitle = Messages._UI_LABEL_ADD_CATEGORY;
-    
-  protected MenuManager browseMenu;
-  protected Label name;
-  protected Text nameText;
-  protected Label schema;
-  protected CLabel schemaDisplayer;
-  protected ToolBar browseToolBar;
-  protected ToolItem browseItem;
-  protected Button searchCatalog;
-  protected Button searchWorkspace;  
-  protected Composite sourcesComposite;
-
-  protected List invalidNames;
-  
-  // TODO (cs) rename this field to extensionSchemaLocation in WTP 2.0
-  protected String appInfoSchemaLocation;
-  protected String categoryName;
-  protected CLabel errDisplayer;
-  protected boolean isCategoryNameValid;
-  protected boolean fromCatalog;
-  
-  private boolean canOK =false; 
-  
-  /** Either the location if come from workspace or namespace if come from
-   * 	XML Catalog  */
-  protected String source;
-
-  public AddNewCategoryDialog(Shell parentShell)
-  {
-    super(parentShell);
-  }
-
-  public AddNewCategoryDialog(Shell parentShell, String dialogTitle)
-  {
-    super(parentShell);
-    this.dialogTitle = dialogTitle;
-  }
-  
-  /**
-   * receive a List of names which have already been added to the category list
-   * 
-   * @param unavailNames
-   *          Array of unvailable names
-   */
-  public void setUnavailableCategoryNames(List unavailNames)
-  {
-    invalidNames = unavailNames;
-  }
-
-  public String getNewCategoryName()
-  {
-    return categoryName.trim();
-  }
-
-  public String getCategoryLocation()
-  {
-    return appInfoSchemaLocation;
-  }
-  
-  public void setCategoryLocation(String s){
-	  appInfoSchemaLocation = s;
-  }
-  
-  /** @deprecated */
-  public SpecificationForExtensionsSchema getExtensionsSchemaSpec(){
-	SpecificationForExtensionsSchema schemaSpec = new SpecificationForExtensionsSchema();
-	schemaSpec.setDisplayName(getNewCategoryName());
-	schemaSpec.setLocation(getCategoryLocation());
-	
-	return schemaSpec;
-  }
-    
-  public void setCategoryName(String categoryName) {
-	this.categoryName = categoryName;
-  }
-
-  public boolean getFromCatalog() {
-	return fromCatalog;
-  }
-  
-  public void setFromCatalog(boolean b){
-	fromCatalog = b;	
-  }
-
-  public String getSource()
-  {
-	return source;  
-  }
-  
-  public void setSource(String source) {
-	this.source = source;
-  }
-
-  protected Control createButtonBar(Composite parent)
-  {
-    Control result = super.createButtonBar(parent);
-    getButton(IDialogConstants.OK_ID).setEnabled(canOK);
-    return result;
-  }
-
-  // redundant method to improve speed (according to the compiler)
-  protected Button getButton(int id) {
-    return super.getButton(id);
-  }
-  
-  protected Control createDialogArea(Composite parent)
-  {
-    getShell().setText(dialogTitle);
-
-    Composite mainComposite = (Composite) super.createDialogArea(parent);
-    GridLayout layout = new GridLayout(2, false);
-    layout.marginTop = 10;
-    mainComposite.setLayout(layout);
-    mainComposite.setLayoutData(new GridData(GridData.FILL_BOTH));
-    GridData data = new GridData();
-    data.widthHint = 400;
-
-    mainComposite.setLayoutData(data);
-
-    // Line 1, name
-    name = new Label(mainComposite, SWT.NONE);
-    name.setText(NAME_LABEL);
-
-    nameText = new Text(mainComposite, SWT.BORDER | SWT.SINGLE);
-    nameText.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));    
-    if (categoryName != null)
-    	nameText.setText(categoryName);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(nameText,
-    		XSDEditorCSHelpIds.ADD_CATEGORY__NAME);     
-
-    
-
-    // Line 2, schema
-    schema = new Label(mainComposite, SWT.NONE);
-    schema.setText(SCHEMA_LABEL);
-
-    schemaDisplayer = new CLabel(mainComposite, SWT.BORDER | SWT.SINGLE);
-    schemaDisplayer.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    if (source != null)
-    {
-    	if (fromCatalog)
-    		schemaDisplayer.setImage(
-    				XSDEditorPlugin.getXSDImage("icons/xmlcatalog_obj.gif")); //$NON-NLS-1$
-    	else
-    		schemaDisplayer.setImage(
-    				XSDEditorPlugin.getXSDImage("icons/XSDFile.gif")); //$NON-NLS-1$
-    	schemaDisplayer.setText(source);
-    	
-    }
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(schemaDisplayer,
-    		XSDEditorCSHelpIds.ADD_CATEGORY__SCHEMA); 
-    
-    if (categoryName != null && source != null)
-    	canOK = true;
-    
-    // Line 3, schema selection buttons            
-    Button hidden = new Button(mainComposite, SWT.NONE);
-    hidden.setVisible(false);    
-           
-    sourcesComposite = new Composite(mainComposite, SWT.NONE);
-    RowLayout sourcesLayout = new RowLayout();
-  
-    sourcesComposite.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));
-    sourcesComposite.setLayout(sourcesLayout);
-    
-    searchWorkspace = new Button(sourcesComposite, SWT.NONE);
-    searchWorkspace.setText(SELECT_FROM_WORKSPACE);
-        
-    searchCatalog = new Button(sourcesComposite, SWT.NONE);
-    searchCatalog.setText(SELECT_FROM_CATALOG);
-    
-    searchWorkspace.addSelectionListener(new SelectionAdapter()
-    {
-    	public void widgetSelected(SelectionEvent e)
-    	{
-    		final String XSD_FILE_EXTENSION = ".xsd"; //$NON-NLS-1$   	    
-    	    
-    	      SelectSingleFileDialog dialog = new SelectSingleFileDialog(getShell(), null, true);
-    	      dialog.addFilterExtensions(new String[] { XSD_FILE_EXTENSION });
-    	      dialog.create();
-    	      dialog.setTitle(Messages._UI_LABEL_SELECT_XSD_FILE);
-    	      dialog.setMessage(Messages._UI_DESCRIPTION_CHOOSE_XSD_FILE);
-
-    	      if (dialog.open() == Window.OK)
-    	      {
-    	        IFile appInfoSchemaFile = dialog.getFile();
-    	        if (appInfoSchemaFile != null)
-    	        {
-    	          // remove leading slash from the value to avoid the
-    	          // whole leading slash ambiguity problem
-    	          String uri = appInfoSchemaFile.getFullPath().toString();
-    	          while (uri.startsWith("/") || uri.startsWith("\\")) { //$NON-NLS-1$ //$NON-NLS-2$
-    	            uri = uri.substring(1);
-    	          }
-    	          appInfoSchemaLocation = uri.toString();
-    	          source = uri;
-    	          fromCatalog = false;
-
-    	          appInfoSchemaLocation = "file://" + Platform.getLocation().toString() + "/" + appInfoSchemaLocation; //$NON-NLS-1$ //$NON-NLS-2$
-    	          // TODO... be careful how we construct the location
-    	          // UNIX related issues here
-
-    	          schemaDisplayer.setImage(XSDEditorPlugin.getXSDImage("icons/XSDFile.gif")); //$NON-NLS-1$
-    	          schemaDisplayer.setText(uri);
-
-    	          // Enable the OK button if we should..
-    	          if (isCategoryNameValid)
-    	          {
-    	            getButton(IDialogConstants.OK_ID).setEnabled(true);
-    	            errDisplayer.setText(""); //$NON-NLS-1$
-    	            errDisplayer.setImage(null);
-    	          }
-    	        }
-    	      }
-    	    }
-    	}
-    
-    );
-    
-    searchCatalog.addSelectionListener(new SelectionAdapter()
-    {
-    	public void widgetSelected(SelectionEvent e)
-    	{
-    	      SelectFromCatalogDialog dialog = new SelectFromCatalogDialog(getShell());
-    	      // dialog.open();
-    	      if (dialog.open() == Window.OK)
-    	      {
-    	        appInfoSchemaLocation = dialog.getCurrentSelectionLocation();
-    	        source = dialog.getCurrentSelectionNamespace();
-    	        fromCatalog = true;
-
-    	        schemaDisplayer.setImage(XSDEditorPlugin.getXSDImage("icons/xmlcatalog_obj.gif")); //$NON-NLS-1$
-    	        schemaDisplayer.setText(dialog.getCurrentSelectionNamespace());
-
-    	        // Enable the OK button if we should..
-    	        if (isCategoryNameValid && !appInfoSchemaLocation.equals("")) //$NON-NLS-1$
-    	        {
-    	          getButton(IDialogConstants.OK_ID).setEnabled(true);
-    	          errDisplayer.setText(""); //$NON-NLS-1$
-    	          errDisplayer.setImage(null);    	        
-    	      }
-    	    }
-    	}
-    });
-    
-
-    // TODO: Should be able to get the image from the XML plugin. Don't need
-    // to copy to XSDEditor icons folder like this.
-
-
-    // Composite errComp = new Composite(mainComposite, SWT.NONE);
-    // errComp.setBackground(org.eclipse.draw2d.ColorConstants.white);
-    // errComp.setLayout(new GridLayout());
-    errDisplayer = new CLabel(mainComposite, SWT.FLAT);
-    // errDisplayer.setText("abd");
-    GridData gd = new GridData(GridData.FILL_BOTH);
-    gd.grabExcessHorizontalSpace = true;
-    gd.horizontalSpan = 3;
-    errDisplayer.setLayoutData(gd);
-
-    // errComp.setLayoutData(gd);
-    // errDisplayer.setLayoutData(gd);
-    // errMsgContainer.setContent(errDisplayer);
-
-    nameText.addModifyListener(new ModifyListener()
-    {
-      // track the nameText and enable/disable the OK button accordingly
-      public void modifyText(ModifyEvent e)
-      {
-        categoryName = nameText.getText();
-
-        // name is in the invalid List
-        if (invalidNames != null)
-        {
-          if (invalidNames.contains(categoryName.trim()))
-          {
-            isCategoryNameValid = false;
-
-            getButton(IDialogConstants.OK_ID).setEnabled(false);
-            errDisplayer.setText(Messages._UI_ERROR_NAME_ALREADY_USED);
-            errDisplayer.setImage(XSDEditorPlugin.getXSDImage("icons/error_st_obj.gif")); //$NON-NLS-1$
-            return;
-          }
-        }
-        // name is empty string
-        if (categoryName.equals("")) //$NON-NLS-1$
-        {
-          isCategoryNameValid = false;
-
-          getButton(IDialogConstants.OK_ID).setEnabled(false);
-          errDisplayer.setText(""); //$NON-NLS-1$
-          errDisplayer.setImage(null);
-          return;
-        }
-
-        /*
-         * Enable the Ok button if the location field AND the name field are not
-         * empty
-         */
-        if (!categoryName.equals("")) //$NON-NLS-1$
-        {
-          isCategoryNameValid = true;
-          errDisplayer.setText(""); //$NON-NLS-1$
-          errDisplayer.setImage(null);
-        }
-        if (appInfoSchemaLocation != null && !appInfoSchemaLocation.equals("")) //$NON-NLS-1$
-        {
-          getButton(IDialogConstants.OK_ID).setEnabled(true);
-        }
-      }
-    });
-
-    return parent;
-  }
-
-  protected void okPressed()
-  {
-    super.okPressed();
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/CategoryProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/CategoryProvider.java
deleted file mode 100644
index a3eb64a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/CategoryProvider.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-
-public class CategoryProvider
-{
-  private ICatalog systemCatalog;
-
-  public CategoryProvider()
-  {
-    
-  }
-  
-  /**
-   * Extenders should implement and return a list of 
-   * SpecificationForExtensionsSchema
-   * @return
-   */
-  public List getCategories()
-  {
-    return new ArrayList();
-  }
-  
-  /**
-   * Helper method to find the physical location of the schema
-   * in the XML Catalog
-   * @param namespaceURI
-   * @return physical location of the schema
-   */
-  public String locateFileUsingCatalog(String namespaceURI)
-  {
-    retrieveCatalog();
-
-    ICatalogEntry[] entries = systemCatalog.getCatalogEntries();
-    for (int i = 0; i < entries.length; i++)
-    {
-      if (entries[i].getKey().equals(namespaceURI))
-        return entries[i].getURI();
-    }
-
-    return null;
-  }
-
-  private void retrieveCatalog()
-  {
-    if (systemCatalog != null)
-      return;
-
-    ICatalog defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-    INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-    for (int i = 0; i < nextCatalogs.length; i++)
-    {
-      INextCatalog catalog = nextCatalogs[i];
-      ICatalog referencedCatalog = catalog.getReferencedCatalog();
-      if (referencedCatalog != null)
-      {
-        if (XMLCorePlugin.SYSTEM_CATALOG_ID.equals(referencedCatalog.getId()))
-        {
-          systemCatalog = referencedCatalog;
-        }
-      }
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionDetailsContentProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionDetailsContentProvider.java
deleted file mode 100644
index f28e18a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionDetailsContentProvider.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.tabletree.TreeContentHelper;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.DefaultListNodeEditorConfiguration;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeCustomizationRegistry;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeEditorConfiguration;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeEditorProvider;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-
-public class DOMExtensionDetailsContentProvider implements ExtensionDetailsContentProvider
-{
-  private static final Object[] EMPTY_ARRAY = {};
-  private static final String[] EMPTY_STRING_ARRAY = {};
-  private static final String XMLNS = "xmlns"; //$NON-NLS
-  private static final String TEXT_NODE_KEY = "text()"; //$NON-NLS
-
-  public Object[] getItems(Object input)
-  {
-    HashMap resultMap = new HashMap();
-    if (input instanceof Element)
-    {
-      Element element = (Element) input;
-      
-      // here we compute items for the attributes that physically in the document 
-      //
-      NamedNodeMap attributes = element.getAttributes();
-      for (int i = 0; i < attributes.getLength(); i++)
-      {
-        Attr attr = (Attr) attributes.item(i);
-        if (!XMLNS.equals(attr.getName()) && !XMLNS.equals(attr.getPrefix())) //$NON-NLS-1$ //$NON-NLS-2$
-        {
-          resultMap.put(attr.getName(), DOMExtensionItem.createItemForElementAttribute(element, attr));
-        }
-      }
-     
-      // here we compute an item for the text node that is physically in the document 
-      //      
-      String textNodeValue = new TreeContentHelper().getNodeValue(element);
-      if (textNodeValue != null)
-      {  
-        resultMap.put(TEXT_NODE_KEY, DOMExtensionItem.createItemForElementText(element));
-      }  
-      
-      ModelQuery modelQuery = ModelQueryUtil.getModelQuery(element.getOwnerDocument());
-      if (modelQuery != null)
-      {
-        CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);
-        if (ed != null)
-        {
-          // here we compute items for the attributes that may be added to the document according to the grammar 
-          //           
-          List list = modelQuery.getAvailableContent(element, ed, ModelQuery.INCLUDE_ATTRIBUTES);
-          for (Iterator i = list.iterator(); i.hasNext(); )
-          {  
-              CMAttributeDeclaration ad = (CMAttributeDeclaration)i.next();
-              if (ad != null && resultMap.get(ad.getNodeName()) == null)
-              {
-                resultMap.put(ad.getNodeName(), DOMExtensionItem.createItemForElementAttribute(element, ad));
-              }            
-          }
-          if (resultMap.get(TEXT_NODE_KEY) == null)
-          {
-            // here we compute an item for the text node that may be added to the document according to the grammar 
-            //                  
-            int contentType = ed.getContentType();
-            if (contentType == CMElementDeclaration.PCDATA || contentType == CMElementDeclaration.MIXED)
-            {
-              resultMap.put(TEXT_NODE_KEY, DOMExtensionItem.createItemForElementText(element));
-            }
-          }  
-        }
-      }
-      Collection collection = resultMap.values();
-      // initialize the editor information for each item
-      //
-      for (Iterator i = collection.iterator(); i.hasNext();)
-      {
-        initPropertyEditorConfiguration((DOMExtensionItem) i.next());
-      }
-      DOMExtensionItem[] items = new DOMExtensionItem[collection.size()];
-      resultMap.values().toArray(items);
-      
-      // here we sort the list alphabetically
-      //
-      if (items.length > 0)
-      {  
-        Comparator comparator = new Comparator()
-        {
-          public int compare(Object arg0, Object arg1)
-          {         
-            DOMExtensionItem a = (DOMExtensionItem)arg0;
-            DOMExtensionItem b = (DOMExtensionItem)arg1;
-            
-            // begin special case to ensure 'text nodes' come last
-            if (a.isTextValue() && !b.isTextValue())
-            {
-              return 1;   
-            }
-            else if (b.isTextValue() && !a.isTextValue())
-            {
-              return -1;
-            }  
-            // end special case
-            else
-            {          
-              return Collator.getInstance().compare(a.getName(), b.getName());
-            }  
-          }
-        };
-        Arrays.sort(items, comparator);
-      }  
-      return items;
-    }
-    else if (input instanceof Attr)
-    {
-      Attr attr = (Attr) input;
-      DOMExtensionItem item = DOMExtensionItem.createItemForAttributeText(attr.getOwnerElement(), attr);
-      DOMExtensionItem[] items = {item};
-      return items;
-    }
-    return EMPTY_ARRAY;
-  }
-
-  public String getName(Object item)
-  {
-    if (item instanceof DOMExtensionItem)
-    {
-      return ((DOMExtensionItem) item).getName();
-    }
-    return ""; //$NON-NLS-1$
-  }
-
-  public String getValue(Object item)
-  {
-    if (item instanceof DOMExtensionItem)
-    {
-      return ((DOMExtensionItem) item).getValue();
-    }
-    return ""; //$NON-NLS-1$
-  }
-
-  public String[] getPossibleValues(Object item)
-  {
-    if (item instanceof DOMExtensionItem)
-    {
-      return ((DOMExtensionItem) item).getPossibleValues();
-    }
-    return EMPTY_STRING_ARRAY;
-  }
-
-  protected void initPropertyEditorConfiguration(DOMExtensionItem item)
-  {
-    String namespace = item.getNamespace();
-    String name = item.getName();
-    String parentName = item.getParentName();
-    NodeEditorConfiguration configuration = null;
-    if (namespace != null)
-    {
-      // TODO (cs) remove reference to XSDEditorPlugin... make generic
-      // perhaps push down the xml.ui ?
-      //
-      NodeCustomizationRegistry registry = XSDEditorPlugin.getDefault().getNodeCustomizationRegistry();
-      NodeEditorProvider provider= registry.getNodeEditorProvider(namespace);      
-      if (provider != null)
-      {
-        configuration = provider.getNodeEditorConfiguration(parentName, name);
-        if (configuration != null)
-        {  
-          configuration.setParentNode(item.getParentNode());
-          if (item.getNode() != null)
-          {
-            configuration.setNode(item.getNode());
-          }
-        }  
-      }
-    }
-    String[] values = item.getPossibleValues();
-    if (values != null && values.length > 1)
-    {
-      configuration = new DefaultListNodeEditorConfiguration(values);
-    }
-    
-    // Note that it IS expected that the configaration may be null
-    //
-    item.setPropertyEditorConfiguration(configuration);
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItem.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItem.java
deleted file mode 100644
index 5250525..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItem.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMAttributeDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.modelquery.ModelQueryUtil;
-import org.eclipse.wst.xml.ui.internal.tabletree.TreeContentHelper;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateAttributeValueCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.UpdateTextValueCommand;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-class DOMExtensionItem extends ExtensionItem
-{
-  private final static int KIND_ELEMENT_ATTR = 1;
-  private final static int KIND_ELEMENT_TEXT = 2;
-  private final static int KIND_ELEMENT_CMATTRIBUTE = 3;
-  private final static int KIND_ATTR_TEXT = 4;
-  int kind;
-  Attr attribute;
-  Element parent;
-  CMNode cmNode;
-
-  private DOMExtensionItem(int kind, Element parent, Attr node, CMNode cmNode)
-  {
-    this.kind = kind;
-    this.parent = parent;
-    this.attribute = node;
-    this.cmNode = cmNode;
-  }
-  
-  public boolean isTextValue()
-  {
-    return kind == KIND_ELEMENT_TEXT || kind == KIND_ATTR_TEXT;
-  }
-
-  static DOMExtensionItem createItemForElementText(Element parent)
-  {
-    return new DOMExtensionItem(KIND_ELEMENT_TEXT, parent, null, null);
-  }
-
-  static DOMExtensionItem createItemForElementAttribute(Element parent, Attr attribute)
-  {
-    return new DOMExtensionItem(KIND_ELEMENT_ATTR, parent, attribute, null);
-  }
-
-  static DOMExtensionItem createItemForElementAttribute(Element parent, CMAttributeDeclaration ad)
-  {
-    if (ad == null)
-    {
-      System.out.println("null!");
-    }
-    return new DOMExtensionItem(KIND_ELEMENT_CMATTRIBUTE, parent, null, ad);
-  }
-
-  static DOMExtensionItem createItemForAttributeText(Element parent, Attr attribute)
-  {
-    return new DOMExtensionItem(KIND_ATTR_TEXT, parent, attribute, null);
-  }
-
-  public String getName()
-  {
-    String result = null;
-    switch (kind)
-    {
-      case KIND_ATTR_TEXT : {
-        result = "value";
-        break;
-      }
-      case KIND_ELEMENT_ATTR : {
-        result = attribute.getName();
-        break;
-      }
-      case KIND_ELEMENT_CMATTRIBUTE : {
-        CMAttributeDeclaration ad = (CMAttributeDeclaration) cmNode;
-        result = ad.getNodeName();
-        break;
-      }
-      case KIND_ELEMENT_TEXT : {
-        result = "text value";
-        break;
-      }
-    }
-    return result != null ? result : "";
-  }
-
-  public String getValue()
-  {
-    switch (kind)
-    {
-      case KIND_ATTR_TEXT :
-      case KIND_ELEMENT_ATTR : {
-        // note intentional fall-thru!!
-        return attribute.getNodeValue();
-      }
-      case KIND_ELEMENT_CMATTRIBUTE : {
-        // CS : one would think that we'd just need to return "" here
-        // but after editing a item of this kind and giving it value
-        // the list of item's doesn't get recomputed.. so we need to trick
-        // one of these items to behave like the KIND_ELEMENT_ATTR case
-        //
-        String value = parent.getAttribute(cmNode.getNodeName());
-        return (value != null) ? value : "";
-      }
-      case KIND_ELEMENT_TEXT : {
-        return new TreeContentHelper().getElementTextValue(parent);         
-      }
-    }
-    return "";
-  }
-  
-
-  public String[] getPossibleValues()
-  {
-    String[] result = {};
-     
-    switch (kind)
-    {
-      case KIND_ATTR_TEXT :
-      case KIND_ELEMENT_ATTR : {
-        // note intentional fall-thru!!
-        ModelQuery modelQuery = ModelQueryUtil.getModelQuery(parent.getOwnerDocument());
-        if (modelQuery != null)
-        {            
-          CMAttributeDeclaration ad = modelQuery.getCMAttributeDeclaration(attribute);        
-          if (ad != null)
-          {
-            result = modelQuery.getPossibleDataTypeValues(parent, ad);
-          }
-        }
-        break;
-      }
-      case KIND_ELEMENT_CMATTRIBUTE : {
-        ModelQuery modelQuery = ModelQueryUtil.getModelQuery(parent.getOwnerDocument());
-        if (modelQuery != null && cmNode != null)
-        {
-          result = modelQuery.getPossibleDataTypeValues(parent, cmNode);
-        }
-        break;
-      }
-      case KIND_ELEMENT_TEXT : {
-        ModelQuery modelQuery = ModelQueryUtil.getModelQuery(parent.getOwnerDocument());
-        if (modelQuery != null)
-        {
-          CMElementDeclaration ed = modelQuery.getCMElementDeclaration(parent);
-          if (ed != null)
-          { 
-            result = modelQuery.getPossibleDataTypeValues(parent, ed);             
-          }  
-        }
-        break;
-      }
-    }
-    return result;
-  }
-
-  public Command getUpdateValueCommand(String newValue)
-  {
-    switch (kind)
-    {
-      case KIND_ATTR_TEXT :
-      case KIND_ELEMENT_ATTR : {
-        // note intentional fall-thru!!               
-        return new UpdateAttributeValueCommand(parent, attribute.getNodeName(), newValue, true);
-      }
-      case KIND_ELEMENT_CMATTRIBUTE : {
-        final CMAttributeDeclaration ad = (CMAttributeDeclaration) cmNode;
-        return new UpdateAttributeValueCommand(parent, ad.getAttrName(), newValue, true);
-      }
-      case KIND_ELEMENT_TEXT : {
-        return new UpdateTextValueCommand(parent, newValue);
-      }
-    }
-    return null;
-  }
-
-  public String getNamespace()
-  {
-    String namespace = null;
-    if (kind == KIND_ATTR_TEXT)
-    {
-      namespace = attribute.getNamespaceURI();
-    }
-    else if (parent != null)
-    {
-      namespace = parent.getNamespaceURI();
-    }
-    return namespace;
-  }
-
-  public Node getParentNode()
-  {
-    Node parentNode = null;
-    if (attribute != null)
-    {
-      parentNode = attribute.getOwnerElement();
-    }
-    else if (parent != null)
-    {
-      parentNode = parent;
-    }
-    return parentNode;
-  }
-
-  public String getParentName()
-  {
-    Node parentNode = getParentNode();
-    return parentNode != null ? parentNode.getLocalName() : "";
-  }
-
-  public Node getNode()
-  {
-    return attribute;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItemEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItemEditManager.java
deleted file mode 100644
index aac70ea..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItemEditManager.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Widget;
-
-
-/**
- * @deprecated
- */
-public class DOMExtensionItemEditManager implements ExtensionItemEditManager
-{
-  public void handleEdit(Object item, Widget widget)
-  {   
-  }
-
-  public Control createCustomButtonControl(Composite composite, Object item)
-  {
-    Button button = new Button(composite, SWT.NONE);
-    button.setText("..."); //$NON-NLS-1$
-    return button;
-  }
-
-  public Control createCustomTextControl(Composite composite, Object item)
-  {
-    return null;
-  }
-
-  public String getButtonControlStyle(Object object)
-  {
-    return ExtensionItemEditManager.STYLE_NONE;
-  }
-
-  public String getTextControlStyle(Object object)
-  {
-    return ExtensionItemEditManager.STYLE_NONE;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItemMenuListener.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItemMenuListener.java
deleted file mode 100644
index fc30c94..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionItemMenuListener.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
-import org.eclipse.wst.xml.core.internal.contentmodel.CMElementDeclaration;
-import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
-import org.eclipse.wst.xml.core.internal.document.ElementImpl;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument;
-import org.eclipse.wst.xml.ui.internal.contentoutline.XMLNodeActionManager;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class DOMExtensionItemMenuListener implements IMenuListener
-{
-  TreeViewer treeViewer;
-
-  public DOMExtensionItemMenuListener(TreeViewer treeViewer)
-  {
-    this.treeViewer = treeViewer;
-  }
-
-  public void menuAboutToShow(IMenuManager manager)
-  {
-    manager.removeAll();
-    ISelection selection = treeViewer.getSelection();
-    if (selection instanceof IStructuredSelection)
-    {
-      IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-      if (structuredSelection.getFirstElement() instanceof ElementImpl)
-      {
-        ElementImpl elementImpl = (ElementImpl) structuredSelection.getFirstElement();
-        IDOMDocument domDocument = (IDOMDocument) elementImpl.getOwnerDocument();
-        InternalNodeActionManager actionManager = new InternalNodeActionManager(domDocument.getModel(), treeViewer);
-        actionManager.fillContextMenu(manager, structuredSelection);
-      }
-    }
-  }
-  
-  
-  class InternalNodeActionManager extends XMLNodeActionManager
-  {
-    public InternalNodeActionManager(IStructuredModel model, Viewer viewer)
-    {
-      super(model, viewer);
-    }
-
-    public void contributeActions(IMenuManager menu, List selection)
-    {
-      //menu.add(new Action("there"){});     
-      try
-      {
-      int editMode = modelQuery.getEditMode();
-      int ic = ModelQuery.INCLUDE_CHILD_NODES;
-      int vc = (editMode == ModelQuery.EDIT_MODE_CONSTRAINED_STRICT) ? ModelQuery.VALIDITY_STRICT : ModelQuery.VALIDITY_NONE;
-      List implicitlySelectedNodeList = null;
-
-      if (selection.size() == 1)
-      {
-        Node node = (Node) selection.get(0);
-        // contribute add child actions
-        contributeAddChildActions(menu, node, ic, vc);
-      }
-      if (selection.size() > 0)
-      {
-        implicitlySelectedNodeList = getSelectedNodes(selection, true);
-        // contribute delete actions
-        contributeDeleteActions(menu, implicitlySelectedNodeList, ic, vc);
-      }
-      }
-      catch(Exception e)
-      {
-        menu.add(new Action(e.getMessage()){});
-      }
-      /*
-      if (selection.size() > 0)
-      {
-        // contribute replace actions
-        contributeReplaceActions(menu, implicitlySelectedNodeList, ic, vc);
-      }*/
-    }
-
-    protected void contributeAddChildActions(IMenuManager menu, Node node, int ic, int vc)
-    {
-      int nodeType = node.getNodeType();
-      if (nodeType == Node.ELEMENT_NODE)
-      {
-        // 'Add Child...' and 'Add Attribute...' actions
-        //
-        Element element = (Element) node;
-        MyMenuManager newMenu = new MyMenuManager("New"){
-          public boolean isVisible() { return true; }          
-        };//$NON-NLS-1$
-        newMenu.setVisible(true);
-        menu.add(newMenu);
-        
-        CMElementDeclaration ed = modelQuery.getCMElementDeclaration(element);
-        if (ed != null)
-        {
-          List modelQueryActionList = new ArrayList();
-          // add insert child node actions
-          //
-          modelQueryActionList = new ArrayList();
-          modelQuery.getInsertActions(element, ed, -1, ic, vc, modelQueryActionList);
-          addActionHelper(newMenu, modelQueryActionList);
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeContentProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeContentProvider.java
deleted file mode 100644
index bc90293..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeContentProvider.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.wst.sse.core.internal.provisional.INodeAdapter;
-import org.eclipse.wst.sse.core.internal.provisional.INodeNotifier;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class DOMExtensionTreeContentProvider implements ITreeContentProvider, INodeAdapter
-{
-  protected String facet;
-  protected Viewer viewer;
-  
-  public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
-  {
-    this.viewer = viewer;
-  }
-    
-  public Object[] getChildren(Object parentElement)
-  {
-    if (parentElement instanceof Element)
-    {
-      Element element = (Element)parentElement;        
-      ArrayList list = new ArrayList();
-      for (Node node = element.getFirstChild(); node != null; node = node.getNextSibling())
-      {
-        if (node.getNodeType() == Node.ELEMENT_NODE)
-        {
-          list.add(node);
-        }  
-      }  
-      return list.toArray();      
-    }
-    return Collections.EMPTY_LIST.toArray();
-  }
-  
-  public boolean hasChildren(Object element)
-  {
-    Object[] children = getChildren(element);
-    return children.length > 0;
-  }
-  
-  public Object getParent(Object element)
-  {
-    return null;
-  }
-
-  public java.lang.Object[] getElements(java.lang.Object inputElement)
-  {
-    return getChildren(inputElement);
-  }
-
-  public void dispose()
-  {
-  }
-  
-  public void notifyChanged(INodeNotifier notifier, int eventType, Object changedFeature, Object oldValue, Object newValue, int pos)
-  {
-    if (viewer != null)
-    {  
-      viewer.refresh();
-    }  
-  }
-  
-  public boolean isAdapterForType(Object type)
-  {
-    // this method is not used
-    return false;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeLabelProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeLabelProvider.java
deleted file mode 100644
index d173548..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/DOMExtensionTreeLabelProvider.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeCustomizationRegistry;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.w3c.dom.Attr;
-import org.w3c.dom.DOMException;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.Text;
-
-public class DOMExtensionTreeLabelProvider extends LabelProvider
-{
-  protected static final Image DEFAULT_ELEMENT_ICON = XSDEditorPlugin.getXSDImage("icons/XSDElement.gif"); //$NON-NLS-1$
-  protected static final Image DEFAULT_ATTR_ICON = XSDEditorPlugin.getXSDImage("icons/XSDAttribute.gif"); //$NON-NLS-1$
-    
-  public DOMExtensionTreeLabelProvider()
-  {    
-  }
-  
-  public Image getImage(Object element)
-  {
-    NodeCustomizationRegistry registry = XSDEditorPlugin.getDefault().getNodeCustomizationRegistry();
-    if (element instanceof Element)
-    {
-      Element domElement = (Element) element;
-      String namespace = domElement.getNamespaceURI();
-      if (namespace != null)
-      {  
-        ILabelProvider lp = registry.getLabelProvider(namespace);
-        if (lp != null)
-        {
-          Image img = lp.getImage(domElement);
-          if (img != null)
-            return img;
-        }  
-      }
-      return DEFAULT_ELEMENT_ICON;
-    }
-    if (element instanceof Attr)
-    return DEFAULT_ATTR_ICON;
-    return null;
-  }
-
-  public String getText(Object input)
-  {
-    if (input instanceof Element)
-    {
-      Element domElement = (Element) input;
-      String textVal = "";
-
-      if (domElement.hasChildNodes())
-      {
-        Node node = domElement.getChildNodes().item(0);
-        if (node instanceof Text)
-        {
-          Text textNode = (Text) node;
-          try
-          {
-            if (!textNode.getNodeValue().contains("\n"))
-              textVal = " [" + textNode.getNodeValue() + "]";
-          }
-          catch (DOMException e)
-          {
-            textVal = "";
-          }
-        }
-      }
-      return domElement.getLocalName() + textVal;
-    }
-    if ( input instanceof Attr){
-      return ((Attr) input).getLocalName();
-    }
-    return ""; //$NON-NLS-1$
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionDetailsContentProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionDetailsContentProvider.java
deleted file mode 100644
index 6cfaac1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionDetailsContentProvider.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-public interface ExtensionDetailsContentProvider
-{
-  Object[] getItems(Object input);
-  String getName(Object item);
-  String getValue(Object item);
-  String[] getPossibleValues(Object item);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionDetailsViewer.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionDetailsViewer.java
deleted file mode 100644
index 8a62a5a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionDetailsViewer.java
+++ /dev/null
@@ -1,336 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Jesse Valianes - Seneca College https://bugs.eclipse.org/bugs/show_bug.cgi?id=235381
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.gef.commands.Command;
-import org.eclipse.gef.commands.CommandStack;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.DialogNodeEditorConfiguration;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.ListNodeEditorConfiguration;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeEditorConfiguration;
-
-public class ExtensionDetailsViewer extends Viewer
-{
-  private final static String ITEM_DATA = "ITEM_DATA"; //$NON-NLS-1$
-  private final static String EDITOR_CONFIGURATION_DATA = "EDITOR_CONFIGURATION_DATA"; //$NON-NLS-1$
-  
-  Composite control;  
-  Composite composite;
-  ExtensionDetailsContentProvider contentProvider;
-  TabbedPropertySheetWidgetFactory widgetFactory;  
-  InternalControlListener internalControlListener;
-  CommandStack commandStack;
-  
-  public ExtensionDetailsViewer(Composite parent, TabbedPropertySheetWidgetFactory widgetFactory)
-  {
-    this.widgetFactory = widgetFactory;    
-    control =  widgetFactory.createComposite(parent);
-    internalControlListener = new InternalControlListener();
-    control.setLayout(new GridLayout());    
-  }
-  public Control getControl()
-  {
-    return control;
-  }
-  
-  public void setCommandStack(CommandStack commandStack)
-  {
-    this.commandStack = commandStack;
-  }
-  
-  public Object getInput()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public ISelection getSelection()
-  {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public void refresh()
-  {
-    Control[] children = composite.getChildren(); 
-    for (int i = 0; i < children.length; i++)
-    {
-      Control control = children[i];
-      if (control instanceof Text)
-      {
-         ExtensionItem item = (ExtensionItem)control.getData(ITEM_DATA);
-         String value = contentProvider.getValue(item);        
-        ((Text)control).setText(value); 
-      }  
-    }
-  }
-
-  private void createTextOrComboControl(ExtensionItem item, Composite composite)
-  {
-    Control control = null;
-    String value = contentProvider.getValue(item);
-    NodeEditorConfiguration editorConfiguration = item.getPropertyEditorConfiguration();
-
-    if (editorConfiguration != null && hasStyle(editorConfiguration, NodeEditorConfiguration.STYLE_COMBO))
-    {          
-      ListNodeEditorConfiguration configuration = (ListNodeEditorConfiguration)editorConfiguration;
-      CCombo combo = widgetFactory.createCCombo(composite);
-      combo.setText(value);
-      Object[] values = configuration.getValues(item);
-      LabelProvider labelProvider = configuration.getLabelProvider();
-      for (int j = 0; j < values.length; j++)
-      {            
-        Object o = values[j];
-        String displayName = labelProvider != null ?
-            labelProvider.getText(o) :
-              o.toString();
-            combo.add(displayName);
-      }
-      combo.addSelectionListener(internalControlListener);
-      control = combo;
-    }
-    if (control == null)
-    {
-      Text text = widgetFactory.createText(composite,value);
-      text.addKeyListener(internalControlListener);
-      control = text; 
-    } 
-    control.setData(ITEM_DATA, item);
-    control.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    control.addFocusListener(internalControlListener);      
-  }
-  
-  private void createButtonControl(ExtensionItem item, Composite composite)
-  {
-    NodeEditorConfiguration editorConfiguration = item.getPropertyEditorConfiguration();
-    if (editorConfiguration != null && hasStyle(editorConfiguration, NodeEditorConfiguration.STYLE_DIALOG))
-    {    
-      DialogNodeEditorConfiguration configuration = (DialogNodeEditorConfiguration)editorConfiguration;            
-      Button button = new Button(composite, SWT.NONE);
-      GridData gridData = new GridData();
-      gridData.heightHint = 17;
-      button.setLayoutData(gridData);
-      button.addSelectionListener(internalControlListener);
-      button.setData(ITEM_DATA, item);
-      button.setData(EDITOR_CONFIGURATION_DATA, configuration);
-      String text = configuration.getButonText();
-      if (text != null)
-      {  
-        button.setText(text); //$NON-NLS-1$
-      }  
-      button.setImage(configuration.getButtonImage());
-    }
-    else
-    {
-      Control placeHolder = new Label(composite, SWT.NONE);
-      placeHolder.setVisible(false);
-      placeHolder.setEnabled(false);
-      placeHolder.setLayoutData(new GridData()); 
-    }      
-  } 
-  
-  public void setInput(Object input)
-  { 
-    // TODO (cs) add assertions
-    //
-    if (contentProvider == null)
-      return;
-    
-    if (composite != null)
-    {/*
-      for (Iterator i = controlsThatWeAreListeningTo.iterator(); i.hasNext(); )
-      {
-        Control control = (Control)i.next();       
-        if (control != null)
-        {  
-          control.removeFocusListener(internalFocusListener);
-        }  
-      } */ 
-      removeListeners();
-      composite.dispose();       
-    }   
-
-    composite = widgetFactory.createComposite(control);
-    composite.setBackground(ColorConstants.white);
-    GridLayout gridLayout = new GridLayout();
-    gridLayout.numColumns = 3;
-    composite.setLayout(gridLayout);
-    composite.setLayoutData(new GridData(GridData.FILL_BOTH));
-
-    Object[] items = contentProvider.getItems(input);      
-
-    for (int i = 0; i < items.length; i++)
-    {
-      ExtensionItem item = (ExtensionItem)items[i];
-      String name = contentProvider.getName(item);
-      Label label = widgetFactory.createLabel(composite, name + ":"); //$NON-NLS-1$
-      label.setLayoutData(new GridData());
-      createTextOrComboControl(item, composite);
-      createButtonControl(item, composite);
-    }  
-    control.layout(true);    
-  }
-    
-  private boolean hasStyle(NodeEditorConfiguration configuration, int style)
-  {
-    return (configuration.getStyle() & style) != 0;
-  }
-  
-  
-  public void setSelection(ISelection selection, boolean reveal)
-  {
-    // TODO Auto-generated method stub
-    
-  }
-  public ExtensionDetailsContentProvider getContentProvider()
-  {
-    return contentProvider;
-  }
-  public void setContentProvider(ExtensionDetailsContentProvider contentProvider)
-  {
-    this.contentProvider = contentProvider;
-  }
-  
-  private void applyEdit(ExtensionItem item, Widget widget)
-  {
-    if (item != null)
-    {    
-      String value = null;
-      if (widget instanceof Text)
-      {
-        Text text = (Text)widget;
-        value = text.getText();    
-      }
-      else if (widget instanceof CCombo)
-      {
-        CCombo combo = (CCombo)widget;
-        int index = combo.getSelectionIndex();
-        if (index != -1)
-        {  
-          value = combo.getItem(index);
-        }  
-      }       
-      if (value != null)
-      {  
-        Command command = item.getUpdateValueCommand(value);
-        if (command != null)
-        {
-          if (commandStack != null)
-            commandStack.execute(command);
-          else
-            command.execute();
-        }
-      }                    
-    }              
-  }
-  
-  class InternalControlListener implements FocusListener, SelectionListener, KeyListener
-  {
-    public void widgetSelected(SelectionEvent e)
-    {
-      // for button controls we handle selection events
-      //        
-      Object item = e.widget.getData(EDITOR_CONFIGURATION_DATA);
-      if (item == null)
-        item = e.widget.getData(ITEM_DATA);    
-      if (item instanceof DialogNodeEditorConfiguration)
-      {
-        DialogNodeEditorConfiguration dialogNodeEditorConfiguration = (DialogNodeEditorConfiguration)item;        
-        dialogNodeEditorConfiguration.invokeDialog();
-        refresh();
-      }
-      else if (item instanceof ExtensionItem)
-      {
-        applyEdit((ExtensionItem)item, e.widget);
-      }      
-    }
-    
-    public void widgetDefaultSelected(SelectionEvent e)
-    {
-      // do nothing      
-    } 
-    
-    public void focusGained(FocusEvent e)
-    {
-    }    
-    
-    public void focusLost(FocusEvent e)
-    {
-      // apply edits for text and combo box controls
-      // via the focusLost event
-      Object item = e.widget.getData(ITEM_DATA);
-      if (item instanceof ExtensionItem)
-      {
-        applyEdit((ExtensionItem)item, e.widget);
-      }      
-    }
-
-    public void keyPressed(KeyEvent e)
-    {
-      // handle explict ENTER key
-      Object item = e.widget.getData(ITEM_DATA);
-      if (item instanceof ExtensionItem)
-      {
-        if (e.character == SWT.CR)
-          applyEdit((ExtensionItem)item, e.widget);
-      }      
-    }
-
-    public void keyReleased(KeyEvent e)
-    {
-      // Ignore these events
-    }
-  }
-  
-  public void removeListeners()
-  {
-    if (composite != null && !composite.isDisposed())
-    {
-      Control [] children = composite.getChildren();
-      int length = children.length;
-      for (int i = 0; i < length; i++)
-      {
-        Control o = children[i];
-        if (o instanceof CCombo)
-        {
-          ((CCombo)o).removeSelectionListener(internalControlListener);
-          o.removeFocusListener(internalControlListener);
-        }
-        else if (o instanceof Text)
-        {
-          ((Text)o).removeKeyListener(internalControlListener);
-          o.removeFocusListener(internalControlListener);
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItem.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItem.java
deleted file mode 100644
index 4b67808..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItem.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import org.eclipse.gef.commands.Command;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeEditorConfiguration;
-
-public abstract class ExtensionItem
-{
-  NodeEditorConfiguration propertyEditorConfiguration;
-
-  public NodeEditorConfiguration getPropertyEditorConfiguration()
-  {
-    return propertyEditorConfiguration;
-  }
-
-  public void setPropertyEditorConfiguration(NodeEditorConfiguration propertyEditorConfiguration)
-  {
-    this.propertyEditorConfiguration = propertyEditorConfiguration;
-  }  
-  
-  public abstract Command getUpdateValueCommand(String newValue);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItemEditManager.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItemEditManager.java
deleted file mode 100644
index b84ad1c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItemEditManager.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Widget;
- 
-/**
- * @deprecated
- */ 
-public interface ExtensionItemEditManager
-{  
-  public final static String STYLE_NONE = "none";   //$NON-NLS-1$  
-  public final static String STYLE_TEXT = "text"; //$NON-NLS-1$  
-  public final static String STYLE_COMBO = "combo"; //$NON-NLS-1$
-  public final static String STYLE_CUSTOM = "custom";     //$NON-NLS-1$
-  
-  void handleEdit(Object item, Widget widget);
-  String getTextControlStyle(Object item);
-  String getButtonControlStyle(Object item);
-  Control createCustomTextControl(Composite composite, Object item);
-  Control createCustomButtonControl(Composite composite, Object item);  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItemFilter.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItemFilter.java
deleted file mode 100644
index b199c37..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionItemFilter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import org.eclipse.xsd.XSDConcreteComponent;
-
-// cs: This interface is intended to suppliment the NodeFilter class
-// that can be specified via the customization extensions point.
-// When the initial list of a category's objects is displayed 
-// we'll use a NodeFilter to prune the list.  If the NodeFilter
-// implements this interface we'll call this interface's isApplicableContext
-// method instead of the NodeFilter's DOM node based method.  This provides 
-// are a more convenient interface for clients who are only interested in 
-// filter the list presented via the AddExtensionComponentDialog.
-// See the class ExtensionsSection for more details.
-//
-public interface ExtensionItemFilter
-{
-  public boolean isApplicableContext(XSDConcreteComponent parent, XSDConcreteComponent candidate);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionsSchemasRegistry.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionsSchemasRegistry.java
deleted file mode 100644
index 8fc3af6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/ExtensionsSchemasRegistry.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolver;
-import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ExtensibleAddExtensionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ExtensibleRemoveExtensionNodeCommand;
-import org.w3c.dom.Element;
-
-public class ExtensionsSchemasRegistry
-{
-  public static final String USER_ADDED_EXT_SCHEMAS = "USER-ADDED-EXT-SCHEMAS";  // TODO externalize
-  private static final String LOCATION_PREFIX = "platform:/plugin/"; //$NON-NLS-1$
-  public static final String DESCRIPTION = "description"; //$NON-NLS-1$
-  public static final String DISPLAYNAME = "displayName"; //$NON-NLS-1$
-  public static final String NAMESPACEURI = "namespaceURI"; //$NON-NLS-1$
-  public static final String XSDFILEURL = "xsdFileURL"; //$NON-NLS-1$
-  public static final String LABELPROVIDER = "labelProviderClass"; //$NON-NLS-1$
-  public static final String ADD_COMMAND_CLASS = "addCommandClass"; //$NON-NLS-1$
-  public static final String DELETE_COMMAND_CLASS = "deleteCommandClass"; //$NON-NLS-1$
-  public static final String CATEGORY_PROVIDER_CLASS = "class"; //$NON-NLS-1$
-  
-  protected IPreferenceStore prefStore;
-  protected String extensionId;
-
-  protected ArrayList nsURIProperties, categoryProviderList;
-  private String deprecatedExtensionId;
-  
-  public ExtensionsSchemasRegistry(String appinfo_extensionid)
-  {
-    extensionId = appinfo_extensionid;
-  }
-  
-  public void __internalSetDeprecatedExtensionId(String deprecatedId)
-  {
-    deprecatedExtensionId = deprecatedId;
-  }
-  
-  public void setPrefStore(IPreferenceStore store)
-  {
-	  prefStore = store;
-  }
-
-  public List getAllExtensionsSchemasContribution()
-  {  
-    // If we read the registry, then let's not do it again.
-    if (nsURIProperties != null)
-    {
-      return nsURIProperties;
-    }
- 
-    nsURIProperties = new ArrayList();
-    categoryProviderList = new ArrayList();
-
-    getAllExtensionsSchemasContribution(extensionId);
-    if (deprecatedExtensionId != null)
-    {
-      getAllExtensionsSchemasContribution(deprecatedExtensionId);     
-    }  
-    
-    // get user-added schemas stored in preference
-    if (prefStore != null)
-    {
-      String value = prefStore.getString(USER_ADDED_EXT_SCHEMAS);
-      StringTokenizer tokenizer = new StringTokenizer(value, "\n");
-   
-      while ( tokenizer.hasMoreTokens() )
-      {
-        nsURIProperties.add( new SpecificationForExtensionsSchema( tokenizer.nextToken() ) );
-      }
-    }
-    
-    return nsURIProperties;
-  }
-  
-  private List getAllExtensionsSchemasContribution(String id)
-  {
-    IConfigurationElement[] asiPropertiesList = Platform.getExtensionRegistry().getConfigurationElementsFor(id);
-
-    boolean hasASIProperties = (asiPropertiesList != null) && (asiPropertiesList.length > 0);
-
-    if (hasASIProperties)
-    {
-      for (int i = 0; i < asiPropertiesList.length; i++)
-      {
-        IConfigurationElement asiPropertiesElement = asiPropertiesList[i];
-        String elementName = asiPropertiesElement.getName();
-
-        if ("category".equals(elementName))
-        {
-          String description = asiPropertiesElement.getAttribute(DESCRIPTION);
-          String displayName = asiPropertiesElement.getAttribute(DISPLAYNAME);
-          String namespaceURI = asiPropertiesElement.getAttribute(NAMESPACEURI);
-          String xsdFileURL = asiPropertiesElement.getAttribute(XSDFILEURL);
-          String labelProviderClass = asiPropertiesElement.getAttribute(LABELPROVIDER);
-          String addCommandClass = asiPropertiesElement.getAttribute(ADD_COMMAND_CLASS);
-          String deleteCommandClass = asiPropertiesElement.getAttribute(DELETE_COMMAND_CLASS);
-          
-          if (displayName == null)
-          {
-            // If there is no display name, force the user
-            // to manually create a name. Therefore, we ignore entry without
-            // a display name.
-            continue;
-          }
-
-          if (xsdFileURL == null)
-          {
-            xsdFileURL = locateFileUsingCatalog(namespaceURI);
-          }
-
-          SpecificationForExtensionsSchema extensionsSchemaSpec = createEntry();
-          extensionsSchemaSpec.setDescription(description);
-          extensionsSchemaSpec.setDisplayName(displayName);
-          extensionsSchemaSpec.setNamespaceURI(namespaceURI);
-          extensionsSchemaSpec.setDefautSchema();
-
-          String pluginId = asiPropertiesElement.getDeclaringExtension().getContributor().getName();
-
-          if (labelProviderClass != null)
-          {
-            ILabelProvider labelProvider = null;
-            try
-            {
-              Class theClass = Platform.getBundle(pluginId).loadClass(labelProviderClass);
-              if (theClass != null)
-              {
-                labelProvider = (ILabelProvider) theClass.newInstance();
-                if (labelProvider != null)
-                {
-                  extensionsSchemaSpec.setLabelProvider(labelProvider);
-                }
-              }
-            }
-            catch (Exception e)
-            {
-
-            }
-          }
-          
-          if (addCommandClass != null)
-          {
-            try
-            {
-              ExtensibleAddExtensionCommand addCommand = (ExtensibleAddExtensionCommand)asiPropertiesElement.createExecutableExtension(ADD_COMMAND_CLASS);
-              if (addCommand != null)
-              {
-                extensionsSchemaSpec.setExtensibleAddExtensionCommand(addCommand);
-              }
-            }
-            catch (Exception e)
-            {
-            }
-          }
-
-          if (deleteCommandClass != null)
-          {
-            try
-            {
-              ExtensibleRemoveExtensionNodeCommand deleteCommand = (ExtensibleRemoveExtensionNodeCommand)asiPropertiesElement.createExecutableExtension(DELETE_COMMAND_CLASS);
-              if (deleteCommand != null)
-              {
-                extensionsSchemaSpec.setExtensibleRemoveExtensionNodeCommand(deleteCommand);
-              }
-            }
-            catch (Exception e)
-            {
-            }
-          }
-
-          extensionsSchemaSpec.setLocation(LOCATION_PREFIX + pluginId + "/" + xsdFileURL); //$NON-NLS-1$
-
-          nsURIProperties.add(extensionsSchemaSpec);
-
-        }
-        else if ("categoryProvider".equals(elementName))
-        {
-          String categoryProviderClass = asiPropertiesElement.getAttribute(CATEGORY_PROVIDER_CLASS);
-          
-          if (categoryProviderClass != null)
-          {
-            try
-            {
-              CategoryProvider categoryProvider = (CategoryProvider)asiPropertiesElement.createExecutableExtension(CATEGORY_PROVIDER_CLASS);
-              if (categoryProvider != null)
-              {
-                categoryProviderList.add(categoryProvider);
-              }
-            }
-            catch (Exception e)
-            {
-            }
-          }
-          
-        }
-        
-      }
-
-    }
-    
-    return nsURIProperties;
-  }
-  
-  public ExtensibleAddExtensionCommand getAddExtensionCommand(String namespace)
-  {
-    // Didn't retrieve the config elements yet.
-    if (nsURIProperties == null)
-    {
-      getAllExtensionsSchemasContribution();
-    }
-    
-    for (Iterator i = nsURIProperties.iterator(); i.hasNext(); )
-    {
-      SpecificationForExtensionsSchema spec = (SpecificationForExtensionsSchema)i.next();
-      String nsURI = spec.getNamespaceURI();
-      if (nsURI != null && nsURI.equals(namespace))
-      {
-        return spec.getExtensibleAddExtensionCommand();
-      }
-    }
-
-    for (Iterator i = categoryProviderList.iterator(); i.hasNext(); )
-    {
-      CategoryProvider categoryProvider = (CategoryProvider)i.next();
-      for (Iterator j = categoryProvider.getCategories().iterator(); j.hasNext(); )
-      {
-        SpecificationForExtensionsSchema spec = (SpecificationForExtensionsSchema) j.next();
-        String namespaceURI = spec.getNamespaceURI();
-        if (namespaceURI != null && namespaceURI.equals(namespace))
-        {
-          return spec.getExtensibleAddExtensionCommand();
-        }
-      }
-    }
-
-    return null;
-  }
-
-  public ExtensibleRemoveExtensionNodeCommand getRemoveExtensionNodeCommand(String namespace)
-  {
-    // Didn't retrieve the config elements yet.
-    if (nsURIProperties == null)
-    {
-      getAllExtensionsSchemasContribution();
-    }
-    
-    for (Iterator i = nsURIProperties.iterator(); i.hasNext(); )
-    {
-      SpecificationForExtensionsSchema spec = (SpecificationForExtensionsSchema)i.next();
-      String nsURI = spec.getNamespaceURI();
-      if (nsURI != null && nsURI.equals(namespace))
-      {
-        return spec.getExtensibleRemoveExtensionNodeCommand();
-      }
-    }
-    
-    for (Iterator i = categoryProviderList.iterator(); i.hasNext(); )
-    {
-      CategoryProvider categoryProvider = (CategoryProvider)i.next();
-      for (Iterator j = categoryProvider.getCategories().iterator(); j.hasNext(); )
-      {
-        SpecificationForExtensionsSchema spec = (SpecificationForExtensionsSchema) j.next();
-        String namespaceURI = spec.getNamespaceURI();
-        if (namespaceURI != null && namespaceURI.equals(namespace))
-        {
-          return spec.getExtensibleRemoveExtensionNodeCommand();
-        }
-      }
-    }
-    
-    return null;
-  }
-  
-  public List getCategoryProviders()
-  {
-    if (nsURIProperties == null)
-    {
-      getAllExtensionsSchemasContribution();
-    }
-    
-    return categoryProviderList;
-  }
-
-  /**
-   * @deprecated
-   */
-  public ILabelProvider getLabelProvider(Element element)
-  {
-    return null;
-  }
-
-  public SpecificationForExtensionsSchema createEntry()
-  {
-    return new SpecificationForExtensionsSchema();
-  }
-
-  /**
-   * Returns the String location for the schema with the given namespaceURI by
-   * looking at the XML catalog. We look only in the plugin specified entries of
-   * the catalog.
-   * 
-   * @param namespaceURI
-   * @return String representing the location of the schema.
-   */
-  private String locateFileUsingCatalog(String namespaceURI)
-  {
-    URIResolver resolver = URIResolverPlugin.createResolver();
-    String result = resolver.resolve("", namespaceURI, "");
-    return resolver.resolvePhysicalLocation("", namespaceURI, result);
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/SelectFromCatalogDialog.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/SelectFromCatalogDialog.java
deleted file mode 100644
index 9b5daf0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/SelectFromCatalogDialog.java
+++ /dev/null
@@ -1,207 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.wst.xml.core.internal.XMLCorePlugin;
-import org.eclipse.wst.xml.core.internal.catalog.CatalogSet;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalog;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.ICatalogEntry;
-import org.eclipse.wst.xml.core.internal.catalog.provisional.INextCatalog;
-import org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogEntriesView;
-import org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogEntryDetailsView;
-import org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogMessages;
-import org.eclipse.wst.xml.ui.internal.catalog.XMLCatalogTreeViewer;
-
-public class SelectFromCatalogDialog extends Dialog
-{
-
-  private ICatalog workingUserCatalog;
-  private ICatalog userCatalog;
-  private ICatalog defaultCatalog;
-  private XMLCatalogEntriesView catalogEntriesView;
-  private ICatalog systemCatalog;
-
-  private String currentSelectionLocation;
-  private String currentSelectionNamespace;
-
-  public SelectFromCatalogDialog(Shell parentShell)
-  {
-    super(parentShell);
-
-    defaultCatalog = XMLCorePlugin.getDefault().getDefaultXMLCatalog();
-    INextCatalog[] nextCatalogs = defaultCatalog.getNextCatalogs();
-    for (int i = 0; i < nextCatalogs.length; i++)
-    {
-      INextCatalog catalog = nextCatalogs[i];
-      ICatalog referencedCatalog = catalog.getReferencedCatalog();
-      if (referencedCatalog != null)
-      {
-        if (XMLCorePlugin.SYSTEM_CATALOG_ID.equals(referencedCatalog.getId()))
-        {
-          systemCatalog = referencedCatalog;
-        }
-        else if (XMLCorePlugin.USER_CATALOG_ID.equals(referencedCatalog.getId()))
-        {
-          userCatalog = referencedCatalog;
-        }
-      }
-    }
-  }
-
-  protected Control createDialogArea(Composite parent)
-  {
-    // we create a working copy of the 'User Settings' for the Catalog
-    // that we can modify
-    CatalogSet tempCatalogSet = new CatalogSet();
-    workingUserCatalog = tempCatalogSet.lookupOrCreateCatalog("working", ""); //$NON-NLS-1$ //$NON-NLS-2$
-
-    // TODO: add entries from the nested catalogs as well
-    workingUserCatalog.addEntriesFromCatalog(userCatalog);
-
-    Composite composite = new Composite(parent, SWT.NULL);
-    composite.setLayout(new GridLayout());
-    GridData gridData = new GridData(GridData.FILL_BOTH);
-    gridData.heightHint = 500;
-    composite.setLayoutData(gridData);
-    createCatalogEntriesView(composite);
-    createCatalogDetailsView(composite);
-
-    return composite;
-  }
-
-  protected void createCatalogEntriesView(Composite parent)
-  {
-    Group group = new Group(parent, SWT.NONE);
-    group.setLayout(new GridLayout());
-    GridData gridData = new GridData(GridData.FILL_BOTH);
-    gridData.widthHint = 370;
-    group.setLayoutData(gridData);
-    group.setText(XMLCatalogMessages.UI_LABEL_USER_ENTRIES);
-    group.setToolTipText(XMLCatalogMessages.UI_LABEL_USER_ENTRIES_TOOL_TIP);
-
-    /*
-     * create a subclass of XMLCatalogEntriesView which suppresses - the
-     * creation of 'Add', 'Edit', 'Delete' buttons - any method involving the
-     * above buttons
-     */
-    catalogEntriesView = new XMLCatalogEntriesView(group, workingUserCatalog, systemCatalog)
-    {
-      protected void createButtons(Composite parent)
-      {
-      }
-
-      protected void updateWidgetEnabledState()
-      {
-      }
-
-    };
-
-    // Only XML Schema entry is selectable
-    catalogEntriesView.setLayoutData(gridData);
-    XMLCatalogTreeViewer catalogTreeViewer = ((XMLCatalogTreeViewer) catalogEntriesView.getViewer());
-    catalogTreeViewer.resetFilters();
-
-    catalogTreeViewer.addFilter(new XMLCatalogTableViewerFilter(new String[] { ".xsd" }));
-  }
-
-  // Bug in the filter of the XML plugin, have to give a correct version here
-  // TODO: Waiting for the fix to be commited to XML plugin and
-  // be used by constellation
-  private class XMLCatalogTableViewerFilter extends ViewerFilter
-  {
-    private static final String W3_XMLSCHEMA_NAMESPACE = "http://www.w3.org/2001/";
-    protected String[] extensions;
-
-    public XMLCatalogTableViewerFilter(String[] extensions1)
-    {
-      this.extensions = extensions1;
-    }
-
-    public boolean select(Viewer viewer, Object parent, Object element)
-    {
-      boolean result = false;
-      if (element instanceof ICatalogEntry)
-      {
-        ICatalogEntry catalogEntry = (ICatalogEntry) element;
-        for (int i = 0; i < extensions.length; i++)
-        {
-          // if the extension is correct and the namespace indicates
-          // that this entry is not the W3 XML Schema
-          if (catalogEntry.getURI().endsWith(extensions[i]) && !catalogEntry.getKey().startsWith(W3_XMLSCHEMA_NAMESPACE))
-          {
-            result = true;
-            break;
-          }
-        }
-      }
-      else if (element.equals(XMLCatalogTreeViewer.PLUGIN_SPECIFIED_ENTRIES_OBJECT) || element.equals(XMLCatalogTreeViewer.USER_SPECIFIED_ENTRIES_OBJECT))
-      {
-        return true;
-      }
-      return result;
-    }
-  }
-
-  protected void createCatalogDetailsView(Composite parent)
-  {
-    Group detailsGroup = new Group(parent, SWT.NONE);
-    detailsGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    detailsGroup.setLayout(new GridLayout());
-    detailsGroup.setText(XMLCatalogMessages.UI_LABEL_DETAILS);
-    final XMLCatalogEntryDetailsView detailsView = new XMLCatalogEntryDetailsView(detailsGroup);
-    ISelectionChangedListener listener = new ISelectionChangedListener()
-    {
-      public void selectionChanged(SelectionChangedEvent event)
-      {
-        ISelection selection = event.getSelection();
-        Object selectedObject = (selection instanceof IStructuredSelection) ? ((IStructuredSelection) selection).getFirstElement() : null;
-        if (selectedObject instanceof ICatalogEntry)
-        {
-          ICatalogEntry entry = (ICatalogEntry) selectedObject;
-          detailsView.setCatalogElement(entry);
-          currentSelectionLocation = entry.getURI();
-          currentSelectionNamespace = entry.getKey();
-        }
-        else
-        {
-          detailsView.setCatalogElement((ICatalogEntry) null);
-          currentSelectionLocation = "";
-          currentSelectionNamespace = "";
-        }
-      }
-    };
-    catalogEntriesView.getViewer().addSelectionChangedListener(listener);
-  }
-
-  public String getCurrentSelectionLocation()
-  {
-    return currentSelectionLocation;
-  }
-
-  public String getCurrentSelectionNamespace()
-  {
-    return currentSelectionNamespace;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/SpecificationForExtensionsSchema.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/SpecificationForExtensionsSchema.java
deleted file mode 100644
index 8b4a9a5..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/SpecificationForExtensionsSchema.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ExtensibleAddExtensionCommand;
-import org.eclipse.wst.xsd.ui.internal.common.commands.ExtensibleRemoveExtensionNodeCommand;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom.NodeFilter;
-
-public class SpecificationForExtensionsSchema
-{
-  private String description;
-  private String displayName;
-  private String namespaceURI;
-  private String location;
-  private ILabelProvider labelProvider;
-  private boolean isDefaultSchema = false;
-  private ExtensibleAddExtensionCommand addCommand;
-  private ExtensibleRemoveExtensionNodeCommand removeCommand;
-  private NodeFilter nodeFilter;
-  private String classification;
-  
-  /**
-   * Either the workspace-relative path of the xsd file or the namespace
-   * of the xsd file (if it come from the Catalog) 
-   */
-  private String sourceHint;
-  private boolean fromCatalog;
-
-  public SpecificationForExtensionsSchema()
-  {
-    super();
-  }
-
-  public SpecificationForExtensionsSchema(String desc) {
-	StringTokenizer tokenizer = new StringTokenizer(desc, "\t");
-	
-	// we must be sure that each 'desc' contains info in correct format
-	// no error checking here
-	description = tokenizer.nextToken();
-	displayName = tokenizer.nextToken();
-	namespaceURI = tokenizer.nextToken();
-	location = tokenizer.nextToken();
-	isDefaultSchema = tokenizer.nextToken().equals("true");
-	sourceHint = tokenizer.nextToken();
-	fromCatalog = tokenizer.nextToken().equals("true");
-  }
-
-/**
-   * @return Returns the description.
-   */
-  public String getDescription()
-  {
-    return description;
-  }
-
-  /**
-   * @param description
-   *          The description to set.
-   */
-  public void setDescription(String description)
-  {
-    this.description = description;
-  }
-
-  /**
-   * @return Returns the displayName.
-   */
-  public String getDisplayName()
-  {
-    return displayName;
-  }
-
-  /**
-   * @param name
-   *          The displayName to set.
-   */
-  public void setDisplayName(String displayName)
-  {
-    this.displayName = displayName;
-  }
-
-  /**
-   * @return Returns the namespaceURI.
-   */
-  public String getNamespaceURI()
-  {
-    return namespaceURI;
-  }
-
-  /**
-   * @param namespaceURI
-   *          The namespaceURI to set.
-   */
-  public void setNamespaceURI(String namespaceURI)
-  {
-    this.namespaceURI = namespaceURI;
-  }
-
-  /**
-   * @return Returns the location of the xsd file.
-   */
-  public String getLocation()
-  {
-    return location;
-  }
-
-  /**
-   * @param location
-   *          The location to be set
-   */
-  public void setLocation(String location)
-  {
-    this.location = location;
-  }
-
-  public ILabelProvider getLabelProvider()
-  {
-    return labelProvider;
-  }
-  
-  public void setLabelProvider(ILabelProvider labelProvider)
-  {
-    this.labelProvider = labelProvider;
-  }
-
-  public ExtensibleAddExtensionCommand getExtensibleAddExtensionCommand()
-  {
-    return addCommand;
-  }
-
-  public void setExtensibleAddExtensionCommand(ExtensibleAddExtensionCommand addCommand)
-  {
-    this.addCommand = addCommand;
-  }
-
-  public ExtensibleRemoveExtensionNodeCommand getExtensibleRemoveExtensionNodeCommand()
-  {
-    return removeCommand;
-  }
-
-  public void setExtensibleRemoveExtensionNodeCommand(ExtensibleRemoveExtensionNodeCommand removeCommand)
-  {
-    this.removeCommand = removeCommand;
-  }
-
-  public boolean isDefautSchema(){
-	  return isDefaultSchema ;
-  }
-
-  public void setDefautSchema(){
-	  isDefaultSchema = true;
-  }
-  
-  public void setSourceHint(String s){
-	  sourceHint = s;
-  }
-  
-  public String getSourceHint(){
-	  return sourceHint;
-  }
-
-  public boolean isFromCatalog() {
-	return fromCatalog;
-  }
-
-  public void setFromCatalog(boolean fromCatalog) {
-	this.fromCatalog = fromCatalog;
-  }
-  
-  /**
-   * There is no support for setting this via the extension point defined in the plugin.xml
-   * This allows extenders to provide a filter for a category that has been added 
-   * dynamically (programmatically)
-   * @param nodeFilter
-   */ 
-  public void setNodeFilter(NodeFilter nodeFilter)
-  {
-    this.nodeFilter = nodeFilter;
-  }
-  
-  /**
-   * Get the node filter
-   * @return NodeFilter
-   */
-  public NodeFilter getNodeFilter()
-  {
-    return nodeFilter;
-  }
-  
-  /**
-   * There is no support for setting this via the extension point defined in the plugin.xml
-   * This allows extenders to group categories into groups or classificationss  
-   * @param classification
-   */
-  public void setClassification(String classification)
-  {
-    this.classification = classification;
-  }
-  
-  /**
-   * Get the classification
-   * @return String
-   */
-  public String getClassification()
-  {
-    return classification;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/XSDExtensionTreeContentProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/XSDExtensionTreeContentProvider.java
deleted file mode 100644
index d0e4255..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/XSDExtensionTreeContentProvider.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-public class XSDExtensionTreeContentProvider extends DOMExtensionTreeContentProvider
-{  
-  public Object[] getElements(Object inputElement)
-  {
-    if (inputElement instanceof XSDConcreteComponent)
-    {
-      XSDConcreteComponent component = (XSDConcreteComponent) inputElement;
-      List elementsAndAttributes = new ArrayList();
-      XSDAnnotation xsdAnnotation = XSDCommonUIUtils.getInputXSDAnnotation(component, false);
-      if (xsdAnnotation != null)
-      {
-        // Bug 137856 - Extension page of properties shouldn't display imported elements
-        // Added this if statement
-        if (xsdAnnotation.getSchema() == component.getSchema())
-        {
-          List appInfoList = xsdAnnotation.getApplicationInformation();
-          Element appInfoElement = null;
-          if (appInfoList.size() > 0)
-          {
-            appInfoElement = (Element) appInfoList.get(0);
-          }
-          if (appInfoElement != null)
-          {
-            for (Iterator it = appInfoList.iterator(); it.hasNext();)
-            {
-              Object obj = it.next();
-              if (obj instanceof Element)
-              {
-                Element appInfo = (Element) obj;
-                NodeList nodeList = appInfo.getChildNodes();
-                int length = nodeList.getLength();
-                for (int i = 0; i < length; i++)
-                {
-                  Node node = nodeList.item(i);
-                  if (node instanceof Element)
-                  {
-                    elementsAndAttributes.add(node);
-                  }
-                }
-              }
-            }
-            
-            /** Construct attributes list */
-            NamedNodeMap attributes = appInfoElement.getAttributes();
-            if (attributes != null)
-            {
-              // String defaultNamespace =
-              // (String)component.getSchema().getQNamePrefixToNamespaceMap().get("");
-              int length = attributes.getLength();
-              for (int i = 0; i < length; i++)
-              {
-                Node oneAttribute = attributes.item(i);
-                if (!isXmlnsAttribute(oneAttribute))
-                {
-                  String namespace = oneAttribute.getNamespaceURI();
-                  boolean isExtension = true;
-                  if (namespace == null && oneAttribute.getPrefix() == null)
-                  {
-                    isExtension = false;
-                  }
-                  else if (!XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(namespace))
-                  {
-                    isExtension = true;
-                  }
-                  if (isExtension)
-                  {
-                    elementsAndAttributes.add(oneAttribute);
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-      return elementsAndAttributes.toArray();
-    }
-    return Collections.EMPTY_LIST.toArray();
-  }
-
-  private static boolean isXmlnsAttribute(Node attribute)
-  {
-    String prefix = attribute.getPrefix();
-    if (prefix != null)
-    {
-      // this handle the xmlns:foo="blah" case
-      return "xmlns".equals(prefix); //$NON-NLS-1$
-    }
-    else
-    {
-      // this handles the xmlns="blah" case
-      return "xmlns".equals(attribute.getNodeName()); //$NON-NLS-1$
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/DefaultListNodeEditorConfiguration.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/DefaultListNodeEditorConfiguration.java
deleted file mode 100644
index 584ad71..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/DefaultListNodeEditorConfiguration.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;
-
-
-public class DefaultListNodeEditorConfiguration extends ListNodeEditorConfiguration
-{
-  private String[] values;
-  
-  public DefaultListNodeEditorConfiguration(String[] values)
-  {
-    this.values = values; 
-  }
- 
-  public Object[] getValues(Object propertyObject)
-  {
-    return values;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/DialogNodeEditorConfiguration.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/DialogNodeEditorConfiguration.java
deleted file mode 100644
index ead530d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/DialogNodeEditorConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;
-
-import org.eclipse.swt.graphics.Image;
-
-public abstract class DialogNodeEditorConfiguration extends NodeEditorConfiguration
-{
-  public int getStyle()
-  {        
-    return STYLE_DIALOG;
-  }
-  
-  public String getButonText()
-  {
-    return null;
-  }
-  
-  public Image getButtonImage()
-  {
-    return null;
-  }
-  
-  public abstract void invokeDialog();
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/ListNodeEditorConfiguration.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/ListNodeEditorConfiguration.java
deleted file mode 100644
index fdfbce6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/ListNodeEditorConfiguration.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;
-
-import org.eclipse.jface.viewers.LabelProvider;
-
-public abstract class ListNodeEditorConfiguration extends NodeEditorConfiguration
-{
-  private LabelProvider labelProvider;
- 
-  public LabelProvider getLabelProvider()
-  {
-    return labelProvider;
-  }
-  
-  public int getStyle()
-  {
-    return STYLE_COMBO;
-  }    
-
-  public void setLabelProvider(LabelProvider labelProvider)
-  {
-    this.labelProvider = labelProvider;
-  }
-
-  public abstract Object[] getValues(Object propertyObject);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeCustomizationRegistry.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeCustomizationRegistry.java
deleted file mode 100644
index e4df63d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeCustomizationRegistry.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;
-
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.ILabelProvider;
-
-public class NodeCustomizationRegistry
-{
-  private static final String NAMESPACE = "namespace"; //$NON-NLS-1$  
-  private static final String LABEL_PROVIDER_CLASS_ATTRIBUTE_NAME = "labelProviderClass";     
-  private static final String NODE_EDITOR_PROVIDER_CLASS_ATTRIBUTE_NAME = "nodeEditorProviderClass"; //$NON-NLS-1$
-  private static final String FILTER_CLASS_ATTRIBUTE_NAME = "filterClass"; 
-
-
-  protected String extensionId;
-  protected HashMap map;
-
-  public NodeCustomizationRegistry(String propertyEditorExtensionId)
-  {
-    extensionId = "org.eclipse.wst.xsd.ui.extensibilityNodeCustomizations";//propertyEditorExtensionId;
-  }  
-  
-  private class Descriptor
-  {
-    IConfigurationElement configurationElement;
-    NodeEditorProvider nodeEditorProvider;
-    NodeFilter nodeFilter;    
-    boolean nodeEditorProviderFailedToLoad = false;
-    boolean labelProviderFailedToLoad = false;
-    
-    Descriptor(IConfigurationElement element)
-    {
-      this.configurationElement = element;
-    }
-    
-    NodeEditorProvider lookupOrCreateNodeEditorProvider()
-    {
-      if (nodeEditorProvider == null && !nodeEditorProviderFailedToLoad)
-      {
-        try
-        {
-          nodeEditorProvider = (NodeEditorProvider)configurationElement.createExecutableExtension(NODE_EDITOR_PROVIDER_CLASS_ATTRIBUTE_NAME);
-        }
-        catch (Exception e) 
-        {
-          nodeEditorProviderFailedToLoad = true;
-        }
-      } 
-      return nodeEditorProvider;
-    }
-    
-    ILabelProvider createLabelProvider()
-    {
-      if (!labelProviderFailedToLoad)
-      {  
-        try
-        {
-          return (ILabelProvider)configurationElement.createExecutableExtension(LABEL_PROVIDER_CLASS_ATTRIBUTE_NAME);
-        }
-        catch (Exception e) 
-        {
-          labelProviderFailedToLoad = true;
-        }
-      }
-      return null;
-    }
-
-    public NodeFilter getNodeFilter()
-    {
-      if (!nodeEditorProviderFailedToLoad)
-      {  
-        try
-        {
-          nodeFilter = (NodeFilter)configurationElement.createExecutableExtension(FILTER_CLASS_ATTRIBUTE_NAME);
-        }
-        catch (Exception e) 
-        {
-          nodeEditorProviderFailedToLoad = true;
-        }
-      }
-      return nodeFilter;
-    }
-  }
-
-  
-  private HashMap initMap()
-  {
-    HashMap theMap = new HashMap();
-    IConfigurationElement[] extensions = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.wst.xsd.ui.extensibilityNodeCustomizations");
-    for (int i = 0; i < extensions.length; i++)
-    {
-      IConfigurationElement configurationElement = extensions[i];
-      String namespace = configurationElement.getAttribute(NAMESPACE);
-      if (namespace != null)
-      {
-        theMap.put(namespace, new Descriptor(configurationElement));
-      }     
-    }    
-    return theMap;
-  }
-
-  private Descriptor getDescriptor(String namespace)
-  {
-    map = null;
-    if (namespace != null)
-    { 
-      if (map == null)
-      {  
-        map = initMap();
-      }  
-      return (Descriptor)map.get(namespace);
-    }
-    return null;     
-  }
-  
-  public NodeEditorProvider getNodeEditorProvider(String namespace)
-  {     
-    Descriptor descriptor = getDescriptor(namespace);
-    if (descriptor != null)
-    {  
-      return descriptor.lookupOrCreateNodeEditorProvider();       
-    }
-    return null;
-  }
-  
-  public ILabelProvider getLabelProvider(String namespace)
-  {
-    Descriptor descriptor = getDescriptor(namespace);
-    if (descriptor != null)
-    {  
-      return descriptor.createLabelProvider();       
-    }
-    return null;    
-  }
-  
-  public NodeFilter getNodeFilter(String namespace)
-  {
-    Descriptor descriptor = getDescriptor(namespace);
-    if (descriptor != null)
-    {  
-      return descriptor.getNodeFilter();       
-    }
-    return null;    
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeEditorConfiguration.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeEditorConfiguration.java
deleted file mode 100644
index 1506ad2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeEditorConfiguration.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;
-
-import org.w3c.dom.Node;
-
-public abstract class NodeEditorConfiguration
-{  
-  public final static int STYLE_NONE = 0;   
-  public final static int STYLE_TEXT = 1; 
-  public final static int STYLE_COMBO = 2;
-  public final static int STYLE_DIALOG = 4;   
-  
-  public abstract int getStyle();
-  
-  private Node node;
-  private Node parentNode;
-
-  public Node getNode()
-  {
-    return node;
-  }
-  public void setNode(Node node)
-  {
-    this.node = node;
-  }
-  public Node getParentNode()
-  {
-    return parentNode;
-  }
-  public void setParentNode(Node parentNode)
-  {
-    this.parentNode = parentNode;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeEditorProvider.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeEditorProvider.java
deleted file mode 100644
index 07d1c63..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeEditorProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;
-
-
-public abstract class NodeEditorProvider
-{
-  public abstract NodeEditorConfiguration getNodeEditorConfiguration(String parentName, String nodeName); 
-  //public abstract NodeEditorConfiguration getNodeEditorConfiguration(Node node);   
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeFilter.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeFilter.java
deleted file mode 100644
index 5cabbc7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/properties/sections/appinfo/custom/NodeFilter.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.properties.sections.appinfo.custom;
-
-import org.w3c.dom.Node;
-
-public class NodeFilter
-{  
-  public boolean isApplicableContext(Node parentNode, int nodeType, String namespace, String name)
-  {  
-    return true;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/Messages.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/Messages.java
deleted file mode 100644
index 7110fa3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/Messages.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.util;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS
-{
-  static 
-  {
-    NLS.initializeMessages("org.eclipse.wst.xsd.ui.internal.common.util.messages", Messages.class); //$NON-NLS-1$
-  }
-
-  public Messages()
-  {
-    super();
-  }
-  
-  public static String _UI_ACTION_OPEN_IN_NEW_EDITOR;
-  public static String _UI_ACTION_ADD_ATTRIBUTE_GROUP;
-  public static String _UI_ACTION_ADD_ATTRIBUTE_GROUP_REF;
-  public static String _UI_ACTION_ADD_ATTRIBUTE_GROUP_DEFINITION;
-  public static String _UI_ACTION_ADD_GROUP_REF;
-  public static String _UI_ACTION_ADD_GROUP;
-  public static String _UI_ACTION_DELETE;
-  public static String _UI_ACTION_ADD_COMPLEX_TYPE;
-  public static String _UI_ACTION_ADD_ATTRIBUTE;
-  public static String _UI_ACTION_ADD_SIMPLE_TYPE;
-  public static String _UI_ACTION_UPDATE_ELEMENT_REFERENCE;
-  public static String _UI_LABEL_NO_ITEMS_SELECTED;
-  public static String _UI_ACTION_ADD;
-  public static String _UI_ACTION_ADD_WITH_DOTS;
-  public static String _UI_ACTION_EDIT_WITH_DOTS;
-  public static String _UI_ACTION_CHANGE_PATTERN;
-  public static String _UI_ACTION_ADD_ENUMERATION;
-  public static String _UI_ACTION_INSERT_ENUMERATION;
-  public static String _UI_ACTION_ADD_PATTERN;
-  public static String _UI_ACTION_ADD_ENUMERATIONS;
-  public static String _UI_ACTION_DELETE_CONSTRAINTS;
-  public static String _UI_ACTION_DELETE_PATTERN;
-  public static String _UI_ACTION_DELETE_ENUMERATION;
-  public static String _UI_ACTION_SET_ENUMERATION_VALUE;
-  public static String _UI_LABEL_PATTERN;
-  public static String _UI_ACTION_CHANGE_MAXIMUM_OCCURRENCE;
-  public static String _UI_ERROR_INVALID_VALUE_FOR_MAXIMUM_OCCURRENCE;
-  public static String _UI_ACTION_CHANGE_MINIMUM_OCCURRENCE;
-  public static String _UI_ACTION_ADD_APPINFO_ELEMENT;
-  public static String _UI_ACTION_ADD_APPINFO_ATTRIBUTE;
-  public static String _UI_ACTION_DELETE_APPINFO_ELEMENT;
-  public static String _UI_ACTION_DELETE_APPINFO_ATTRIBUTE;
-  public static String _UI_ACTION_CHANGE_CONTENT_MODEL;
-  public static String _UI_ACTION_RENAME;
-  public static String _UI_ACTION_CHANGE_ENUMERATION_VALUE;
-  public static String _UI_ERROR_INVALID_NAME;
-  public static String _UI_LABEL_NAME;
-  public static String _UI_LABEL_REFERENCE;
-  public static String _UI_ACTION_UPDATE_MAXIMUM_OCCURRENCE;
-  public static String _UI_ACTION_UPDATE_MINIMUM_OCCURRENCE;
-  public static String _UI_LABEL_READONLY;
-  public static String _UI_LABEL_INCLUSIVE;
-  public static String _UI_LABEL_COLLAPSE_WHITESPACE;
-  public static String _UI_LABEL_SPECIFIC_CONSTRAINT_VALUES;
-  public static String _UI_LABEL_RESTRICT_VALUES_BY;
-  public static String _UI_LABEL_ENUMERATIONS;
-  public static String _UI_LABEL_PATTERNS;
-  public static String _UI_LABEL_MINIMUM_LENGTH;
-  public static String _UI_LABEL_MAXIMUM_LENGTH;
-  public static String _UI_LABEL_CONSTRAINTS_ON_LENGTH_OF;
-  public static String _UI_LABEL_CONSTRAINTS_ON_VALUE_OF;
-  public static String _UI_LABEL_MINIMUM_VALUE;
-  public static String _UI_LABEL_MAXIMUM_VALUE;
-  public static String _UI_LABEL_CONTRAINTS_ON;
-  public static String _UI_LABEL_TYPE;
-  public static String _UI_LABEL_BLOCKDEFAULT;
-  public static String _UI_LABEL_FINALDEFAULT;
-  public static String _UI_ACTION_CONSTRAIN_LENGTH;
-  public static String _UI_ACTION_UPDATE_BOUNDS;
-  public static String _UI_ACTION_COLLAPSE_WHITESPACE;
-  public static String _UI_LABEL_BASE;
-  public static String _UI_ERROR_INVALID_FILE;
-  public static String _UI_LABEL_EXTENSIONS;
-  public static String _UI_ACTION_ADD_EXTENSION_COMPONENT;
-  public static String _UI_ACTION_DELETE_EXTENSION_COMPONENT;
-  public static String _UI_LABEL_UP;
-  public static String _UI_LABEL_DOWN;
-  public static String _UI_LABEL_EXTENSION_DETAILS;
-  public static String _UI_ACTION_ADD_DOCUMENTATION;
-  public static String _UI_ACTION_ADD_EXTENSION_COMPONENTS;
-  public static String _UI_LABEL_EXTENSION_CATEGORIES;
-  public static String _UI_LABEL_ADD_WITH_DOTS;
-  public static String _UI_LABEL_DELETE;
-  public static String _UI_LABEL_EDIT;
-  public static String _UI_LABEL_AVAILABLE_COMPONENTS_TO_ADD;
-  public static String _UI_LABEL_EDIT_CATEGORY;
-  public static String _UI_ERROR_INVALID_CATEGORY;
-  public static String _UI_ERROR_FILE_CANNOT_BE_PARSED;
-  public static String _UI_ERROR_VALIDATE_THE_FILE;
-  public static String _UI_LABEL_SCHEMA;
-  public static String _UI_LABEL_ADD_CATEGORY;
-  public static String _UI_ERROR_NAME_ALREADY_USED;
-  public static String _UI_ACTION_BROWSE_WORKSPACE;
-  public static String _UI_LABEL_SELECT_XSD_FILE;
-  public static String _UI_DESCRIPTION_CHOOSE_XSD_FILE;
-  public static String _UI_ACTION_BROWSE_CATALOG;
-  public static String _UI_ACTION_ADD_ANY_ELEMENT;
-  public static String _UI_ACTION_ADD_ANY_ATTRIBUTE;
-  public static String _UI_ACTION_SET_BASE_TYPE;
-  public static String _UI_TOOLTIP_RENAME_REFACTOR;
-  public static String _UI_VALUE_COLON;
-  public static String _UI_ID;
-  public static String _UI_REF;
-  public static String _UI_FIXED;
-  public static String _UI_DEFAULT;
-  public static String _UI_FORM;
-  public static String _UI_USAGE;
-  public static String _UI_ACTION_CHANGE;
-  public static String _UI_ACTION_NAMESPACE_INFORMATION_CHANGE;
-  public static String _UI_LABEL_ABSTRACT;
-  public static String _UI_LABEL_BLOCK;
-  public static String _UI_LABEL_FINAL;
-  public static String _UI_LABEL_SUBSTITUTION_GROUP;
-  public static String _UI_LABEL_MIXED;
-  public static String _UI_LABEL_VALUE;
-  public static String _UI_LABEL_FORM;
-  public static String _UI_LABEL_NILLABLE;
-  public static String _UI_LABEL_ELEMENTFORMDEFAULT;
-  public static String _UI_LABEL_ATTRIBUTEFORMDEFAULT;
-  public static String _UI_LABEL_WORKSPACE;
-  public static String _UI_LABEL_CATALOG;
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDCommonUIUtils.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDCommonUIUtils.java
deleted file mode 100644
index 9510888..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDCommonUIUtils.java
+++ /dev/null
@@ -1,622 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     Naoki Akiyama, Fujitsu - Bug 244901 - Cannot set xsd:annotation to 
- *                              xsd:redefine by Properties view.
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.util;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.DecorationOverlayIcon;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.wst.xsd.ui.internal.adt.design.ImageOverlayDescriptor;
-import org.eclipse.wst.xsd.ui.internal.common.properties.sections.AbstractSection;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.xsd.XSDAnnotation;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDAttributeUse;
-import org.eclipse.xsd.XSDComplexTypeContent;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDEnumerationFacet;
-import org.eclipse.xsd.XSDFacet;
-import org.eclipse.xsd.XSDFactory;
-import org.eclipse.xsd.XSDFeature;
-import org.eclipse.xsd.XSDIdentityConstraintDefinition;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDNotationDeclaration;
-import org.eclipse.xsd.XSDParticle;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.XSDWildcard;
-import org.eclipse.xsd.XSDXPathDefinition;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class XSDCommonUIUtils
-{
-  public XSDCommonUIUtils()
-  {
-    super();
-  }
-  
-  public static Image getUpdatedImage(XSDConcreteComponent input, Image baseImage, boolean isReadOnly)
-  {
-    XSDAnnotation xsdAnnotation = getInputXSDAnnotation(input, false);
-    
-    if (xsdAnnotation != null)
-    {
-      if (xsdAnnotation.getApplicationInformation().size() > 0)
-      {
-        // Will use the class name appended by the read only state as the name of the image.
-        // There is a disabled and an enabled version of each baseImage, so we can't simply
-        // use the component name as the name of the image
-        String imageName = input.getClass().getName() + isReadOnly;
-        Image newImage = XSDEditorPlugin.getDefault().getImageRegistry().get(imageName);
-        if (newImage == null)
-        {
-          ImageOverlayDescriptor ovr = new ImageOverlayDescriptor(baseImage, isReadOnly);
-          newImage = ovr.getImage();
-          XSDEditorPlugin.getDefault().getImageRegistry().put(imageName, newImage);
-        }
-        return newImage;
-      }
-    }
-    return baseImage;
-  }
-
-  public static XSDAnnotation getInputXSDAnnotation(XSDConcreteComponent input, boolean createIfNotExist)
-  {
-    XSDAnnotation xsdAnnotation = null;
-    XSDFactory factory = XSDFactory.eINSTANCE;
-    if (input instanceof XSDAttributeDeclaration)
-    {
-      XSDAttributeDeclaration xsdComp = (XSDAttributeDeclaration) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDAttributeGroupDefinition)
-    {
-      XSDAttributeGroupDefinition xsdComp = (XSDAttributeGroupDefinition) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDElementDeclaration)
-    {
-      XSDElementDeclaration xsdComp = (XSDElementDeclaration) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDNotationDeclaration)
-    {
-      XSDNotationDeclaration xsdComp = (XSDNotationDeclaration) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDXPathDefinition)
-    {
-      XSDXPathDefinition xsdComp = (XSDXPathDefinition) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDModelGroup)
-    {
-      XSDModelGroup xsdComp = (XSDModelGroup) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDModelGroupDefinition)
-    {
-      XSDModelGroupDefinition xsdComp = (XSDModelGroupDefinition) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDIdentityConstraintDefinition)
-    {
-      XSDIdentityConstraintDefinition xsdComp = (XSDIdentityConstraintDefinition) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDWildcard)
-    {
-      XSDWildcard xsdComp = (XSDWildcard) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDSchema)
-    {
-      XSDSchema xsdComp = (XSDSchema) input;
-      List list = xsdComp.getAnnotations();
-      if (list.size() > 0)
-      {
-        xsdAnnotation = (XSDAnnotation) list.get(0);
-      }
-      else
-      {
-        if (createIfNotExist && xsdAnnotation == null)
-        {
-          xsdAnnotation = factory.createXSDAnnotation();
-          if (xsdComp.getContents() != null)
-          {
-            xsdComp.getContents().add(0, xsdAnnotation);
-          }
-        }
-      }
-      return xsdAnnotation;
-    }
-    else if (input instanceof XSDFacet)
-    {
-      XSDFacet xsdComp = (XSDFacet) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDTypeDefinition)
-    {
-      XSDTypeDefinition xsdComp = (XSDTypeDefinition) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDInclude)
-    {
-      XSDInclude xsdComp = (XSDInclude) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDImport)
-    {
-      XSDImport xsdComp = (XSDImport) input;
-      xsdAnnotation = xsdComp.getAnnotation();
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        xsdComp.setAnnotation(xsdAnnotation);
-      }
-    }
-    else if (input instanceof XSDRedefine)
-    {
-      XSDRedefine xsdComp = (XSDRedefine) input;
-      List contents = xsdComp.getContents(); 
-      for (int i = 0; i < contents.size(); i++)
-      { 
-        Object content = contents.get(i);
-        if (content instanceof XSDAnnotation)
-        {
-          xsdAnnotation = (XSDAnnotation) content;
-          break;
-        }
-      }
-      if (createIfNotExist && xsdAnnotation == null)
-      {
-        xsdAnnotation = factory.createXSDAnnotation();
-        contents.add(0, xsdAnnotation);
-      }
-      return xsdAnnotation;
-    }
-    else if (input instanceof XSDAnnotation)
-    {
-      xsdAnnotation = (XSDAnnotation) input;
-    }
-
-    if (createIfNotExist)
-    {
-      formatAnnotation(xsdAnnotation);
-    }
-
-    return xsdAnnotation;
-  }
-
-  private static void formatAnnotation(XSDAnnotation annotation)
-  {
-    Element element = annotation.getElement();
-    formatChild(element);
-  }
-
-  public static void formatChild(Node child)
-  {
-    if (child instanceof IDOMNode)
-    {
-      IDOMModel model = ((IDOMNode) child).getModel();
-      try
-      {
-        // tell the model that we are about to make a big model change
-        model.aboutToChangeModel();
-
-        IStructuredFormatProcessor formatProcessor = new FormatProcessorXML();
-        formatProcessor.formatNode(child);
-      }
-      finally
-      {
-        // tell the model that we are done with the big model change
-        model.changedModel();
-      }
-    }
-  }
-
-  public static String createUniqueElementName(String prefix, List elements)
-  {
-    ArrayList usedNames = new ArrayList();
-    for (Iterator i = elements.iterator(); i.hasNext();)
-    {
-      usedNames.add(getDisplayName((XSDNamedComponent) i.next()));
-    }
-
-    int i = 1;
-    String testName = prefix;
-    while (usedNames.contains(testName))
-    {
-      testName = prefix + i++;
-    }
-    return testName;
-  }
-  
-  public static String createUniqueEnumerationValue(String prefix, List elements)
-  {
-    ArrayList usedNames = new ArrayList();
-    for (Iterator i = elements.iterator(); i.hasNext();)
-    {
-      usedNames.add(((XSDEnumerationFacet) i.next()).getLexicalValue());
-    }
-
-    int i = 1;
-    String testName = prefix;
-    while (usedNames.contains(testName))
-    {
-      testName = prefix + i++;
-    }
-    return testName;
-  }
-
-  public static String getDisplayName(XSDNamedComponent component)
-  {
-    if (component instanceof XSDTypeDefinition)
-      return getDisplayNameFromXSDType((XSDTypeDefinition) component);
-
-    if (component instanceof XSDFeature)
-    {
-      XSDFeature feature = (XSDFeature) component;
-      if (feature.getName() != null)
-        return feature.getName();
-      else if (feature.getResolvedFeature() != null && feature.getResolvedFeature().getName() != null)
-        return feature.getResolvedFeature().getName();
-    }
-
-    return component.getName();
-
-  }
-
-  public static String getDisplayNameFromXSDType(XSDTypeDefinition type)
-  {
-    return getDisplayNameFromXSDType(type, true);
-  }
-
-  public static String getDisplayNameFromXSDType(XSDTypeDefinition type, boolean returnPrimitiveParents)
-  {
-    if (type == null)
-      return null;
-
-    if (type.getName() == null || type.getName().length() == 0)
-    {
-      if (returnPrimitiveParents && isPrimitiveType(type))
-      {
-        return getDisplayNameFromXSDType(type.getBaseType());
-      }
-
-      EObject container = type.eContainer();
-
-      while (container != null)
-      {
-        if (container instanceof XSDNamedComponent && ((XSDNamedComponent) container).getName() != null)
-        {
-          return ((XSDNamedComponent) container).getName();
-        }
-        container = container.eContainer();
-      }
-      return null;
-    }
-    else
-      return type.getName();
-  }
-
-  public static boolean isPrimitiveType(XSDTypeDefinition type)
-  {
-    if (type instanceof XSDComplexTypeDefinition)
-      return false;
-
-    XSDTypeDefinition baseType = null;
-    if (type != null)
-    {
-      baseType = type.getBaseType();
-      XSDTypeDefinition origType = baseType; // KC: although invalid, we need to
-                                            // prevent cycles and to avoid an
-                                            // infinite loop
-      while (baseType != null && !XSDConstants.isAnySimpleType(baseType) && !XSDConstants.isAnyType(baseType) && origType != baseType)
-      {
-        type = baseType;
-        baseType = type.getBaseType();
-      }
-      baseType = type;
-    }
-    else
-    {
-      return false;
-    }
-
-    return (XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001.equals(baseType.getTargetNamespace()));
-  }
-
-  public static XSDSimpleTypeDefinition getAnonymousSimpleType(XSDFeature input, XSDSimpleTypeDefinition xsdSimpleTypeDefinition)
-  {
-    XSDSimpleTypeDefinition anonymousSimpleType = null;
-    XSDTypeDefinition localType = null;
-
-    if (input instanceof XSDElementDeclaration)
-    {
-      localType = ((XSDElementDeclaration) input).getAnonymousTypeDefinition();
-    }
-    else if (input instanceof XSDAttributeDeclaration)
-    {
-      localType = ((XSDAttributeDeclaration) input).getAnonymousTypeDefinition();
-    }
-
-    if (localType instanceof XSDSimpleTypeDefinition)
-    {
-      anonymousSimpleType = (XSDSimpleTypeDefinition) localType;
-    }
-    return anonymousSimpleType;
-  }
-
-  // bug246036 - check for cyclic groups.  We should refactor out this static class.
-  private static Stack visitedGroups = new Stack();
-  
-  public static void resetVisitedGroupsStack()
-  {
-    visitedGroups.clear();
-  }
-
-  public static List getChildElements(XSDModelGroup group)
-  {
-    List children = new ArrayList();
-    visitedGroups.push(group);
-    if (group == null) return children;
-    
-    for (Iterator i = group.getContents().iterator(); i.hasNext();)
-    {
-      XSDParticle next = (XSDParticle) i.next();
-      if (next.getContent() instanceof XSDFeature)
-      {
-        if (children.contains(next.getContent())) break;
-        children.add(next.getContent());
-      }
-      else if (next.getTerm() instanceof XSDModelGroup)
-      {
-        if (!visitedGroups.contains(group))
-        children.addAll(getChildElements((XSDModelGroup) next.getTerm()));
-      }
-    }
-    visitedGroups.pop();
-    return children;
-  }
-
-  public static List getAllAttributes(XSDComplexTypeDefinition xsdComplexType)
-  {
-    List attributes = getChildElements(xsdComplexType);
-    attributes.addAll(getChildAttributes(xsdComplexType));
-
-    return attributes;
-  }
-
-  public static List getAllAttributes(XSDModelGroupDefinition xsdModelGroupDefinition)
-  {
-    List attributes = getChildElements(xsdModelGroupDefinition);
-
-    return attributes;
-  }
-  
-  public static List getInheritedAttributes(XSDComplexTypeDefinition ct)
-  {
-    List attrs = new ArrayList();
-    XSDTypeDefinition parent = ct.getBaseTypeDefinition();
-    if (parent != null && parent instanceof XSDComplexTypeDefinition && ct.isSetDerivationMethod())
-    {
-      attrs.addAll(getAllAttributes((XSDComplexTypeDefinition) parent));
-      if (! ct.isCircular()) attrs.addAll(getInheritedAttributes((XSDComplexTypeDefinition) parent));
-    }
-
-    return attrs;
-  }
-
-  public static List getChildElements(XSDComplexTypeDefinition ct)
-  {
-    return getChildElements(getModelGroup(ct));
-  }
-  
-  public static List getChildElements(XSDModelGroupDefinition xsdModelGroupDefinition)
-  {
-    return getChildElements(xsdModelGroupDefinition.getModelGroup());
-  }
-  
-  public static XSDModelGroup getModelGroup(XSDComplexTypeDefinition cType)
-  {
-    XSDParticle particle = cType.getComplexType();
-
-    if (particle == null || particle.eContainer() != cType)
-      return null;
-
-    Object particleContent = particle.getContent();
-    XSDModelGroup group = null;
-
-    if (particleContent instanceof XSDModelGroupDefinition)
-      group = ((XSDModelGroupDefinition) particleContent).getResolvedModelGroupDefinition().getModelGroup();
-    else if (particleContent instanceof XSDModelGroup)
-      group = (XSDModelGroup) particleContent;
-
-    if (group == null)
-      return null;
-
-    if (group.getContents().isEmpty() || group.eResource() != cType.eResource())
-    {
-      XSDComplexTypeContent content = cType.getContent();
-      if (content instanceof XSDParticle)
-        group = (XSDModelGroup) ((XSDParticle) content).getContent();
-    }
-
-    return group;
-  }
-
-  public static List getChildAttributes(XSDComplexTypeDefinition ct)
-  {
-    EList attrContents = ct.getAttributeContents();
-    List attrs = new ArrayList();
-    for (int i = 0; i < attrContents.size(); i++)
-    {
-      Object next = attrContents.get(i);
-
-      if (next instanceof XSDAttributeUse)
-      {
-        attrs.add(((XSDAttributeUse) next).getContent().getResolvedAttributeDeclaration());
-      }
-      else if (next instanceof XSDAttributeGroupDefinition)
-      {
-        //XSDAttributeGroupDefinition attrGroup = (XSDAttributeGroupDefinition) next;
-      }
-    }
-    return attrs;
-  }
-
-  public static Image getImageWithErrorOverlay(XSDConcreteComponent input, Image baseImage, boolean isReadOnly)
-  {
-    Image extensionImage = getUpdatedImage(input, baseImage, isReadOnly);
-    ImageDescriptor errorOverlay = XSDEditorPlugin.getImageDescriptor("icons/ovr16/error_ovr.gif");  //$NON-NLS-1$
-    if (baseImage == extensionImage)
-    {
-      String imageName = input.getClass().getName() + "_error_" + isReadOnly;
-      Image newImage = XSDEditorPlugin.getDefault().getImageRegistry().get(imageName);
-      if (newImage == null)
-      {
-        DecorationOverlayIcon ovr = new DecorationOverlayIcon(baseImage, errorOverlay, IDecoration.TOP_LEFT);
-        newImage = ovr.createImage();
-        XSDEditorPlugin.getDefault().getImageRegistry().put(imageName, newImage);
-      }
-      return newImage;
-    }
-    else
-    {
-      String imageName = input.getClass().getName() + "_extension_error_" + isReadOnly;
-      Image newImage = XSDEditorPlugin.getDefault().getImageRegistry().get(imageName);
-      if (newImage == null)
-      {
-        DecorationOverlayIcon ovr = new DecorationOverlayIcon(extensionImage, errorOverlay, IDecoration.TOP_LEFT);
-        newImage = ovr.createImage();
-        XSDEditorPlugin.getDefault().getImageRegistry().put(imageName, newImage);
-      }
-      return newImage;
-    }
-  }
-
-  public static CCombo getNewPropertiesCombo(Composite composite, TabbedPropertySheetWidgetFactory widgetFactory,
-      AbstractSection listener, String[] items, String helpID)
-  {
-    CCombo combo = widgetFactory.createCCombo(composite);
-    combo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-    combo.setEditable(false);
-    combo.setItems(items);
-    combo.addSelectionListener(listener);    
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(combo, helpID);
-    return combo;
-  }
-  
-  public static CLabel getNewPropertiesLabel(Composite composite, TabbedPropertySheetWidgetFactory widgetFactory,
-      String labelText)
-  {
-    // Create label
-    CLabel label;    
-    label = widgetFactory.createCLabel(composite, labelText);
-    GridData data = new GridData();
-    data.horizontalAlignment = GridData.HORIZONTAL_ALIGN_BEGINNING;
-    data.grabExcessHorizontalSpace = false;
-    label.setLayoutData(data);
-    
-    return label;
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDDirectivesManager.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDDirectivesManager.java
deleted file mode 100644
index 39a1d8b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDDirectivesManager.java
+++ /dev/null
@@ -1,815 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.common.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.wst.sse.core.StructuredModelManager;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.text.XSDModelAdapter;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDConstants;
-import org.eclipse.xsd.util.XSDUtil;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-/**
- * This class performs cleanup/removal of unused XSD imports and includes from XML Schemas
- * and xmlns entries in the namespace table
- */
-public class XSDDirectivesManager
-{
-  protected static final String XMLNS = "xmlns"; //$NON-NLS-1$
-  // List of all the unused directives.  These will be removed
-  protected List unusedDirectives = new ArrayList();
-  // List of all the included XSDSchema's
-  protected List usedIncludeSchemas = new ArrayList();
-  // List of all the XSDInclude's that are indirectly used
-  protected List usedIndirectIncludes = new ArrayList();
-  // List of the XSDInclude's that are directly used
-  protected List usedDirectIncludes = new ArrayList();
-  // Used to track the included schemas that were analyzed to avoid circular loop
-  protected List analyzedIncludeSchemas = new ArrayList();
-  // List of all the imported used schemas
-  protected List usedSchemas = new ArrayList();
-  // List of all the indirectly used includes  
-  protected Map usedIndirectIncludesMap = new HashMap();
-  // Keep track of all the unused prefixes
-  protected Set unusedPrefixes;
-  // Keep track of all the used prefixes
-  protected Set usedPrefixes;
-  // Map of each schema's unused prefixes
-  protected Map schemaToPrefixMap;
-
-  public static void removeUnusedXSDImports(XSDSchema schema)
-  {
-    // Only do the removal if the preference is turned on
-    if (XSDEditorPlugin.getDefault().getRemoveImportSetting())
-    {
-      XSDDirectivesManager mgr = new XSDDirectivesManager();
-      mgr.performRemoval(schema);
-      mgr.cleanup();
-    }
-  }
-  
-  /**
-   * Main method to do the cleanup
-   * @param schema
-   */
-  public void performRemoval(XSDSchema schema)
-  {
-    // Compute unused imports and unused prefixes
-    computeUnusedImports(schema);
-    // Remove the imports
-    removeUnusedImports();
-    // Remove the prefixes
-    removeUnusedPrefixes();
-  }
-  
-  /**
-   * Clients can manually clean the lists
-   */
-  public void cleanup()
-  {
-    clearMaps();
-  }
-
-  /**
-   * After performing the cleanup, return the list of unused XSD directives
-   *  
-   * @return list of unused XSD directives
-   */
-  public List getUnusedXSDDirectives()
-  {
-    return unusedDirectives;
-  }
-  
-  /**
-   * After performing the cleanup, return the map of each schemas unused prefixes
-   * 
-   * @return map of each schemas unused prefixes
-   */
-  public Map getSchemaToPrefixMap()
-  {
-    return schemaToPrefixMap;
-  }
-
-  /**
-   * Returns the set of unused prefixes from the XML namespace table
-   * 
-   * @return set of unused prefixes
-   */
-  public Set getUnusedPrefixes()
-  {
-    return unusedPrefixes;
-  }
-
-  /**
-   * Returns the set of used prefixes from the XML namespace table
-   * 
-   * @return set of used prefixes
-   */
-  public Set getUsedPrefixes()
-  {
-    return usedPrefixes;
-  }
-
-  /**
-   * Perform any cleanup after computing and removing the unused imports.
-   */
-  protected void clearMaps()
-  {
-    if (schemaToPrefixMap != null)
-    {
-      schemaToPrefixMap.clear();
-    }
-  }
-
-  /**
-   * Remove the list of all unused imports.  Imports is used in the generic term here.
-   */
-  protected void removeUnusedImports()
-  {
-    Iterator iter = unusedDirectives.iterator();
-    while (iter.hasNext())
-    {
-      XSDSchemaDirective xsdDirective = (XSDSchemaDirective) iter.next();
-      removeXSDDirective(xsdDirective);
-    }
-  }
-
-  /**
-   * Removes the directive from the model
-   * @param xsdImport
-   */
-  protected void removeXSDDirective(XSDSchemaDirective xsdImport)
-  {
-    XSDSchema schema = xsdImport.getSchema();
-    
-    Element element = xsdImport.getElement();
-    
-    Document doc = element.getOwnerDocument();
-
-    if (doc instanceof IDOMNode)
-      ((IDOMNode)doc).getModel().aboutToChangeModel();
-    
-    try
-    {
-      if (!removeTextNodesBetweenNextElement(element))
-      {
-        removeTextNodeBetweenPreviousElement(element);
-      }
-      element.getParentNode().removeChild(element);
-    }
-    finally
-    {
-      if (doc instanceof IDOMNode)
-      {
-        ((IDOMNode)doc).getModel().changedModel();
-      }
-      schema.update(true);
-    }
-
-  }
-
-  /**
-   * This computes the list of unused imports for a schema
-   * @param schema
-   */
-  protected void computeUnusedImports(XSDSchema schema)
-  {
-    unusedDirectives = new ArrayList();
-    usedSchemas = new ArrayList();
-    usedPrefixes = new HashSet();
-    schemaToPrefixMap = new HashMap();
-    
-    try
-    {
-      // Step One.  Find unused imports using cross referencer
-      Map xsdNamedComponentUsage = TopLevelComponentCrossReferencer.find(schema);
-      
-      doCrossReferencer(schema, usedSchemas, xsdNamedComponentUsage);
-
-      // Step Two.  Update the unusedImport list given the list of used schemas obtained from cross referencing
-      addToUnusedImports(schema, usedSchemas);
-      
-      // Step Three.  Compute unused prefixes to be removed
-      computeUnusedPrefixes(schema);
-    }
-    catch (Exception e)
-    {
-      unusedDirectives.clear();
-      schemaToPrefixMap.clear();
-    }
-  }
-  
-  /**
-   * Computes the list of unused prefixes from the XML namespace table given a schema
-   * @param schema
-   */
-  protected void computeUnusedPrefixes(XSDSchema schema)
-  {
-    Map prefixMap = schema.getQNamePrefixToNamespaceMap();
-    Set definedPrefixes = prefixMap.keySet();
-    Set actualSet = new HashSet();
-    NamedNodeMap attributes = schema.getElement().getAttributes();
-    Iterator iter = definedPrefixes.iterator();
-    while (iter.hasNext())
-    {
-      String pref = (String)iter.next();
-      if (pref == null)
-      {
-        if (attributes.getNamedItem(XMLNS) != null)
-           actualSet.add(null);
-      }
-      else
-      {
-        if (attributes.getNamedItem(XMLNS + ":" + pref) != null) //$NON-NLS-1$
-          actualSet.add(pref);
-      }
-    }
-
-    unusedPrefixes = new HashSet(actualSet);
-    
-    usedPrefixes.add(schema.getSchemaForSchemaQNamePrefix());
-    
-    Element element = schema.getElement();
-    
-    NodeList childElements = element.getChildNodes();
-    int length = childElements.getLength();
-    for (int i = 0; i < length; i++)
-    {
-      Node node = childElements.item(i);
-      if (node instanceof Element)
-      {
-        traverseDOMElement((Element)node, schema);
-      }
-    }
-    
-    // compute the used prefixes
-    computeUsedXSDPrefixes(schema);
-    
-    // remove the used prefixes from the unused to get the list of unused prefixes
-    unusedPrefixes.removeAll(usedPrefixes);
-    
-    // perform additional process from extenders
-    doAdditionalProcessing(schema);
-    
-    schemaToPrefixMap.put(schema, unusedPrefixes);
-  }
-  
-  /**
-   * Remove unused prefixes from the XML namespace table
-   */
-  protected void removeUnusedPrefixes()
-  {
-    Set schemaSet = schemaToPrefixMap.keySet();
-    Iterator iter = schemaSet.iterator();
-    while (iter.hasNext())
-    {
-      XSDSchema schema = (XSDSchema)iter.next();
-      Map prefixMap = schema.getQNamePrefixToNamespaceMap();
-      Set prefixesToRemove = (Set)schemaToPrefixMap.get(schema);
-      Iterator iter2 = prefixesToRemove.iterator();
-      while (iter2.hasNext())
-      {
-        String string = (String)iter2.next();
-        if (prefixMap.containsKey(string))
-          prefixMap.remove(string);
-      }
-    }
-  }
-  
-  /**
-   * Extenders can customize
-   * @param schema
-   */
-  protected void doAdditionalProcessing(XSDSchema schema)
-  {
-    // Do nothing for XSD
-  }
-  
-  /**
-   * 
-   * @param schema
-   */
-  private void computeUsedXSDPrefixes(XSDSchema schema)
-  {
-    Map prefixMap = schema.getQNamePrefixToNamespaceMap();
-    Set definedPrefixes = prefixMap.keySet();
-    
-    boolean foundEntryForTargetNamespace = false;
-    String targetNamespace = schema.getTargetNamespace();
-    for (Iterator iter = usedPrefixes.iterator(); iter.hasNext(); )
-    {
-      String key = (String) iter.next();
-      String value = (String) prefixMap.get(key);
-      if (targetNamespace == null && value == null)
-      {
-        foundEntryForTargetNamespace = true;
-        break;
-      }
-      else if (targetNamespace != null && value != null)
-      {
-        if (targetNamespace.equals(value))
-        {
-          foundEntryForTargetNamespace = true;
-          break;
-        }
-      }
-    }
-    
-    if (!foundEntryForTargetNamespace)
-    {
-      for (Iterator iter = definedPrefixes.iterator(); iter.hasNext();)
-      {
-        String key = (String) iter.next();
-        String value = (String) prefixMap.get(key);
-        if (targetNamespace == null && value == null)
-        {
-          usedPrefixes.add(null);
-          break;
-        }
-        else if (targetNamespace != null && value != null)
-        {
-          if (targetNamespace.equals(value))
-          {
-            usedPrefixes.add(key);
-            break;
-          }
-        }
-      }
-    }
-  }
-  
-  /**
-   * Find prefixes that are in the document.
-   * @param element
-   * @param schema
-   */
-  private void traverseDOMElement(Element element, XSDSchema schema)
-  {
-    String prefix = element.getPrefix();
-    usedPrefixes.add(prefix);
-    
-    NamedNodeMap attrs = element.getAttributes();
-    int numOfAttrs = attrs.getLength();
-    for (int i = 0; i < numOfAttrs; i++)
-    {
-      Node node = attrs.item(i);
-      String attrPrefix = node.getPrefix();
-      if (attrPrefix != null)
-      {
-        usedPrefixes.add(attrPrefix);
-      }
-      
-      String attr = node.getLocalName();
-      if (attr != null)
-      {
-        String value = node.getNodeValue();
-        if (value == null) continue;
-        if (attr.equals(XSDConstants.REF_ATTRIBUTE) ||
-            attr.equals(XSDConstants.REFER_ATTRIBUTE) ||
-            attr.equals(XSDConstants.TYPE_ATTRIBUTE) ||
-            attr.equals(XSDConstants.BASE_ATTRIBUTE) ||
-            attr.equals(XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE) ||
-            attr.equals(XSDConstants.ITEMTYPE_ATTRIBUTE))
-        {
-          try
-          {
-            usedPrefixes.add(extractPrefix(value));
-          }
-          catch (IndexOutOfBoundsException e)
-          {
-          }
-        }
-        else if (attr.equals(XSDConstants.MEMBERTYPES_ATTRIBUTE))
-        {
-          StringTokenizer tokenizer = new StringTokenizer(value);
-          while (tokenizer.hasMoreTokens())
-          {
-            try
-            {
-              String token = tokenizer.nextToken();
-              usedPrefixes.add(extractPrefix(token));
-            }
-            catch (IndexOutOfBoundsException e)
-            {
-            }
-          }
-        }
-      }
-    }
-    
-    NodeList childElements = element.getChildNodes();
-    int length = childElements.getLength();
-    for (int i = 0; i < length; i++)
-    {
-      Node node = childElements.item(i);
-      if (node instanceof Element)
-      {
-        traverseDOMElement((Element)node, schema);
-      }
-    }
-  }
-  
-  /**
-   * Extract the prefix from the given string.  For example, pref:attr returns pref.
-   * @param value
-   * @return the prefix
-   */
-  protected String extractPrefix(String value)
-  {
-    int index = value.indexOf(':');
-    if (index < 0) 
-      return null;
-    else
-      return value.substring(0, index);
-  }
-
-  /**
-   * This determines the list of referenced components and hence the used schemas from which
-   * we can determine what are the unused directives
-   * 
-   * @param schema
-   * @param unusedImportList
-   * @param usedSchemas
-   */
-  protected void doCrossReferencer(XSDSchema schema, List usedSchemas, Map xsdNamedComponentUsage)
-  {
-    // Calculate additional unused imports that may have the same
-    // namespace that did not get added in the initial pass
-    Iterator iterator = xsdNamedComponentUsage.keySet().iterator();
-    // First determine the used schemas from the cross referencer
-    while (iterator.hasNext())
-    {
-      XSDNamedComponent namedComponent = (XSDNamedComponent) iterator.next();
-      XSDSchema namedComponentSchema = namedComponent.getSchema();
-      // If the named component belongs to the same schema, then continue...we
-      // want to check the external references
-      if (namedComponentSchema == schema)
-      {
-        continue;
-      }
-      Collection collection = (Collection) xsdNamedComponentUsage.get(namedComponent);
-      Iterator iterator2 = collection.iterator();
-      while (iterator2.hasNext())
-      {
-        Setting setting = (Setting) iterator2.next();
-        Object obj = setting.getEObject();
-        if (isComponentUsed(obj, schema, namedComponentSchema))
-        {
-          if (!usedSchemas.contains(namedComponentSchema))
-            usedSchemas.add(namedComponentSchema);
-        }
-      }
-    }
-  }
-  
-  /**
-   * Determines if the object to be analyzed is referenced by the schema 
-   * @param obj
-   * @param schema
-   * @param targetSchema
-   * @return true if the component is referenced by the schema, false if not referenced
-   */
-  protected boolean isComponentUsed(Object obj, XSDSchema schema, XSDSchema targetSchema)
-  {
-    if (obj instanceof XSDConcreteComponent)
-    {
-      XSDConcreteComponent component = (XSDConcreteComponent) obj;
-      if (component == schema || component instanceof XSDSchema)
-      {
-        return false;
-      }
-      if (!usedIncludeSchemas.contains(targetSchema))
-        usedIncludeSchemas.add(targetSchema);
-      return true;
-    }
-    return false;
-  }
-  
-  /**
-   * From a list of used schemas, update the unusedImports list for the given schema
-   * 
-   * @param schema
-   * @param unusedImports
-   * @param usedSchemas
-   */
-  protected void addToUnusedImports(XSDSchema schema, List usedSchemas)
-  {
-    // now that we have the list of usedSchemas, get the list of unused
-    // schemas by comparing this list to what is actually in the schema
-    Iterator iter = schema.getContents().iterator();
-    while(iter.hasNext())
-    {
-      Object o = iter.next();
-      if (o instanceof XSDSchemaDirective)
-      {
-        XSDSchemaDirective directive = (XSDSchemaDirective) o;
-        boolean isUsed = false;
-        Iterator iter2 = usedSchemas.iterator();
-        while (iter2.hasNext())
-        {
-          XSDSchema usedSchema = (XSDSchema) iter2.next();
-          if (directive instanceof XSDImport && directive.getResolvedSchema() == usedSchema)
-          {
-            isUsed = true;
-            break;
-          }
-          if (directive instanceof XSDInclude && ((XSDInclude)directive).getIncorporatedSchema() == usedSchema)
-          {
-            isUsed = true;
-            usedDirectIncludes.add(usedSchema);
-            break;
-          }
-          // blindly accept redefines as used
-          if (directive instanceof XSDRedefine)
-          {
-            isUsed = true;
-            break;
-          }
-        }
-        
-        // If it is an include, we need to check if it is used indirectly
-        if (directive instanceof XSDInclude && !isUsed)
-        {
-          XSDInclude inc = (XSDInclude)directive;
-          XSDSchema incSchema = inc.getIncorporatedSchema();
-          if (incSchema != null)
-          {
-            XSDSchema usedSchema = getUsedIncludeSchema(incSchema, inc);
-            if (usedSchema != null)
-            {
-              usedIndirectIncludes.add(directive);
-              usedIndirectIncludesMap.put(directive, usedSchema);
-              isUsed = true;
-            }
-            else
-            {
-              isUsed = false;
-            }
-          }
-        }
-        
-        // If resolved directives are determined unused
-        // If resolved directives are not already in the unused list
-        // Also any redefines should be considered used
-        if (!isUsed && !unusedDirectives.contains(directive) && !(directive instanceof XSDRedefine))
-        {
-          unusedDirectives.add(directive);
-        }
-      }
-    }
-    Iterator iter3 = usedIndirectIncludes.iterator();
-    while (iter3.hasNext())
-    {
-      Object o = iter3.next();
-      if (o instanceof XSDInclude)
-      {
-        XSDInclude inc = (XSDInclude)o;
-        XSDSchema targetSchema = (XSDSchema)usedIndirectIncludesMap.get(inc);
-        if (usedIncludeSchemas.contains(targetSchema) && usedDirectIncludes.contains(targetSchema))
-        {
-          unusedDirectives.add(inc);
-        }
-        else
-        {
-          usedDirectIncludes.add(targetSchema);
-        }
-      }
-    }
-  }
-
-  /**
-   * Includes can be used indirectly.   If the schema includes A which includes B, but the schema
-   * references something in B, then A is indirectly used, and hence A cannot be removed.
-   * 
-   * @param schema
-   * @param xsdInclude
-   * @return the referenced schema if used, null if not used
-   */
-  private XSDSchema getUsedIncludeSchema(XSDSchema schema, XSDInclude xsdInclude)
-  {
-    XSDSchema refSchema = null;
-    boolean isUsed = false;
-    Iterator iter = schema.getContents().iterator();
-    while (iter.hasNext())
-    {
-      Object o = iter.next();
-      if (o instanceof XSDInclude)
-      {
-        XSDInclude inc = (XSDInclude)o;
-        XSDSchema incSchema = inc.getIncorporatedSchema();
-        if (incSchema != null)
-        {
-          Iterator iter2 = usedIncludeSchemas.iterator();
-          while (iter2.hasNext())
-          {
-            XSDSchema xsdSch = (XSDSchema)iter2.next();
-            if (incSchema == xsdSch)
-            {
-              isUsed = true;
-              refSchema = incSchema;
-              break;
-            }
-          }
-          
-          if (!isUsed)
-          {
-            if (!analyzedIncludeSchemas.contains(incSchema)) // To prevent infinite cycle
-            {
-              analyzedIncludeSchemas.add(incSchema);
-              refSchema = getUsedIncludeSchema(incSchema, inc);
-            }
-          }
-          if (isUsed || refSchema != null)
-          {
-            return refSchema;
-          }
-        }
-      }
-      else
-      {
-        break;
-      }
-    }
-    return refSchema;
-  }
-  
-  /**
-   * See cross reference for more details. 
-   */
-  protected static class TopLevelComponentCrossReferencer extends XSDUtil.XSDNamedComponentCrossReferencer
-  {
-    private static final long serialVersionUID = 1L;
-    
-    XSDSchema schemaForSchema = XSDUtil.getSchemaForSchema(XSDConstants.SCHEMA_FOR_SCHEMA_URI_2001);
-    XSDSchema schemaForXSI = XSDSchemaImpl.getSchemaInstance(XSDConstants.SCHEMA_INSTANCE_URI_2001);
-
-    protected TopLevelComponentCrossReferencer(EObject arg0)
-    {
-      super(arg0);
-    }
-
-    /**
-     * Returns a map of all XSDNamedComponent cross references in the content
-     * tree.
-     */
-    public static Map find(EObject eObject)
-    {
-      TopLevelComponentCrossReferencer result = new TopLevelComponentCrossReferencer(eObject);
-      result.crossReference();
-      result.done();
-      return result;
-    }
-
-    protected boolean crossReference(EObject eObject, EReference eReference, EObject crossReferencedEObject)
-    {
-      if (crossReferencedEObject instanceof XSDNamedComponent)
-      {
-        XSDNamedComponent namedComponent = (XSDNamedComponent) crossReferencedEObject;
-
-        if (namedComponent.getContainer() == schemaForSchema || 
-            namedComponent.getContainer() == schemaForXSI || 
-            crossReferencedEObject.eContainer() == eObject || 
-            namedComponent.getName() == null)
-        {
-          return false;
-        }
-
-        if (namedComponent instanceof XSDTypeDefinition)
-        {
-          XSDTypeDefinition typeDefinition = (XSDTypeDefinition) namedComponent;
-          if (!(typeDefinition.getContainer() instanceof XSDSchema))
-          {
-            return false;
-          }
-          if (typeDefinition.getName() == null)
-          {
-            return false;
-          }
-        }
-        return true;
-      }
-      return false;
-    }
-  }
-
-  /**
-   * Helper method to remove Text nodes
-   * @param element
-   * @return
-   */
-  protected boolean removeTextNodesBetweenNextElement(Element element)
-  {
-    List nodesToRemove = new ArrayList();
-    for (Node node = element.getNextSibling(); node != null; node = node.getNextSibling())
-    {
-      if (node.getNodeType() == Node.TEXT_NODE)
-      {
-        nodesToRemove.add(node);
-      }
-      else if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        for (Iterator j = nodesToRemove.iterator(); j.hasNext();)
-        {
-          Node nodeToRemove = (Node) j.next();
-          nodeToRemove.getParentNode().removeChild(nodeToRemove);
-        }
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Helper method to remove Text nodes.
-   * @param element
-   * @return
-   */
-  protected boolean removeTextNodeBetweenPreviousElement(Element element)
-  {
-    List nodesToRemove = new ArrayList();
-    for (Node node = element.getPreviousSibling(); node != null; node = node.getPreviousSibling())
-    {
-      if (node.getNodeType() == Node.TEXT_NODE)
-      {
-        nodesToRemove.add(node);
-      }
-      else if (node.getNodeType() == Node.ELEMENT_NODE)
-      {
-        for (Iterator j = nodesToRemove.iterator(); j.hasNext();)
-        {
-          Node nodeToRemove = (Node) j.next();
-          nodeToRemove.getParentNode().removeChild(nodeToRemove);
-        }
-        return true;
-      }
-    }
-    return false;
-  }
-  
-  /**
-   * 
-   * @param iFile
-   * @param checkPreference - if false, ignore checking the preference setting 
-   * @throws CoreException
-   * @throws IOException
-   */
-  
-  public static void removeUnusedXSDImports(IFile iFile, boolean checkPreference) throws CoreException, IOException
-  {
-    if (!checkPreference || XSDEditorPlugin.getDefault().getRemoveImportSetting())
-    {
-      IDOMModel model = (IDOMModel) StructuredModelManager.getModelManager().getModelForEdit(iFile);
-      if (model != null)
-      {
-        Document document = model.getDocument();
-        if (document != null)
-        {
-          XSDSchema schema = XSDModelAdapter.lookupOrCreateSchema(document);
-          XSDDirectivesManager mgr = new XSDDirectivesManager();
-          mgr.performRemoval(schema);
-          mgr.cleanup();
-          model.save();
-        }
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDDirectivesSchemaLocationUpdater.java b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDDirectivesSchemaLocationUpdater.java
deleted file mode 100644
index 1f8c19d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/XSDDirectivesSchemaLocationUpdater.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.wst.xsd.ui.internal.common.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.common.ui.internal.viewers.ResourceFilter;
-import org.eclipse.wst.common.uriresolver.internal.util.URIHelper;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.util.TypesHelper;
-import org.eclipse.wst.xsd.ui.internal.wizards.XSDSelectIncludeFileWizard;
-import org.eclipse.xsd.XSDImport;
-import org.eclipse.xsd.XSDInclude;
-import org.eclipse.xsd.XSDRedefine;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.impl.XSDImportImpl;
-import org.w3c.dom.Element;
-
-public class XSDDirectivesSchemaLocationUpdater
-{
-  /**
-   * Modifies the schema location by opening the schema location dialog and
-   * processing the results. This method refactors the code in
-   * XSDImportSection$widgetSelected and SchemaLocationSection$widgetSelected
-   * and the processing in handleSchemaLocationChange()
-   */
-  public static void updateSchemaLocation(XSDSchema xsdSchema, Object selection, boolean isInclude)
-  {
-    Shell shell = Display.getCurrent().getActiveShell();
-    IFile currentIFile = null;
-    IEditorInput editorInput = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActiveEditor().getEditorInput();
-    ViewerFilter filter;
-
-    if (editorInput instanceof IFileEditorInput)
-    {
-      currentIFile = ((IFileEditorInput) editorInput).getFile();
-      filter = new ResourceFilter(new String[] { ".xsd" }, //$NON-NLS-1$ 
-          new IFile[] { currentIFile }, null);
-    }
-    else
-    {
-      filter = new ResourceFilter(new String[] { ".xsd" }, //$NON-NLS-1$ 
-          null, null);
-    }
-
-    XSDSelectIncludeFileWizard fileSelectWizard = new XSDSelectIncludeFileWizard(xsdSchema, isInclude, XSDEditorPlugin.getXSDString("_UI_FILEDIALOG_SELECT_XML_SCHEMA"), //$NON-NLS-1$
-        XSDEditorPlugin.getXSDString("_UI_FILEDIALOG_SELECT_XML_DESC"), //$NON-NLS-1$
-        filter, new StructuredSelection(selection));
-
-    WizardDialog wizardDialog = new WizardDialog(shell, fileSelectWizard);
-    wizardDialog.create();
-    wizardDialog.setBlockOnOpen(true);
-    int result = wizardDialog.open();
-
-    if (result == Window.OK)
-    {
-      IFile selectedIFile = fileSelectWizard.getResultFile();
-      String schemaFileString;
-      if (selectedIFile != null && currentIFile != null)
-      {
-        schemaFileString = URIHelper.getRelativeURI(selectedIFile.getLocation(), currentIFile.getLocation());
-      }
-      else if (selectedIFile != null && currentIFile == null)
-      {
-        schemaFileString = selectedIFile.getLocationURI().toString();
-      }
-      else
-      {
-        schemaFileString = fileSelectWizard.getURL();
-      }
-
-      String attributeSchemaLocation = "schemaLocation"; //$NON-NLS-1$
-      if (selection instanceof XSDImport)
-      {
-        XSDImport xsdImport = (XSDImport) selection;
-        xsdImport.getElement().setAttribute(attributeSchemaLocation, schemaFileString); //$NON-NLS-1$
-
-        String namespace = fileSelectWizard.getNamespace();
-        if (namespace == null)
-          namespace = ""; //$NON-NLS-1$
-
-        XSDSchema externalSchema = fileSelectWizard.getExternalSchema();
-        java.util.Map map = xsdSchema.getQNamePrefixToNamespaceMap();
-        Element schemaElement = xsdSchema.getElement();
-
-        // update the xmlns in the schema element first, and then update the
-        // import element next so that the last change will be in the import element. This keeps the
-        // selection on the import element
-        TypesHelper helper = new TypesHelper(externalSchema);
-        String prefix = helper.getPrefix(namespace, false);
-
-        if (map.containsKey(prefix))
-        {
-          prefix = null;
-        }
-
-        if (prefix == null || (prefix != null && prefix.length() == 0))
-        {
-          StringBuffer newPrefix = new StringBuffer("pref"); //$NON-NLS-1$
-          int prefixExtension = 1;
-          while (map.containsKey(newPrefix.toString()) && prefixExtension < 100)
-          {
-            newPrefix = new StringBuffer("pref" + String.valueOf(prefixExtension)); //$NON-NLS-1$
-            prefixExtension++;
-          }
-          prefix = newPrefix.toString();
-        }
-
-        String attributeNamespace = "namespace"; //$NON-NLS-1$
-        if (namespace.length() > 0)
-        {
-          // if ns already in map, use its corresponding prefix
-          if (map.containsValue(namespace))
-          {
-            TypesHelper typesHelper = new TypesHelper(xsdSchema);
-            prefix = typesHelper.getPrefix(namespace, false);
-          }
-          else
-          // otherwise add to the map
-          {
-            schemaElement.setAttribute("xmlns:" + prefix, namespace); //$NON-NLS-1$
-          }
-          // prefixText.setText(prefix);
-          xsdImport.getElement().setAttribute(attributeNamespace, namespace);
-        }
-
-        // See https://bugs.eclipse.org/bugs/show_bug.cgi?id=155885
-        // Need to import otherwise the external schema is never
-        // resolved. One problem is that the schema location is still null,
-        // so the set types dialog will show types that belong to that schema
-        // with a null schema location. This should load resource
-        // into the resource set
-        if (selection instanceof XSDImportImpl) // redundant
-        {
-          XSDImportImpl xsdImportImpl = (XSDImportImpl) selection;
-          xsdImportImpl.importSchema();
-        }
-
-      }
-      else if (selection instanceof XSDInclude)
-      {
-        XSDInclude xsdInclude = (XSDInclude) selection;
-        xsdInclude.getElement().setAttribute(attributeSchemaLocation, schemaFileString);
-      }
-      else if (selection instanceof XSDRedefine)
-      {
-        XSDRedefine xsdRedefine = (XSDRedefine) selection;
-        xsdRedefine.getElement().setAttribute(attributeSchemaLocation, schemaFileString);
-      }
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/messages.properties b/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/messages.properties
deleted file mode 100644
index 789580e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-common/org/eclipse/wst/xsd/ui/internal/common/util/messages.properties
+++ /dev/null
@@ -1,123 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-_UI_ACTION_OPEN_IN_NEW_EDITOR=Open In New Editor
-_UI_ACTION_DELETE_CONSTRAINTS=Delete Constraints
-_UI_ACTION_DELETE_ENUMERATION=Delete Enumeration
-_UI_ACTION_DELETE_APPINFO_ELEMENT=Delete AppInfo Element
-_UI_ACTION_DELETE_APPINFO_ATTRIBUTE=Delete AppInfo Attribute
-_UI_ACTION_DELETE_EXTENSION_COMPONENT=Delete Extension Component
-_UI_ACTION_ADD_ATTRIBUTE_GROUP=Add Attribute Group
-_UI_ACTION_ADD_APPINFO_ELEMENT=Add AppInfo Element
-_UI_ACTION_ADD_ATTRIBUTE=Add Attribute
-_UI_ACTION_ADD_GROUP_REF=Add Group Ref
-_UI_ACTION_ADD_ANY_ELEMENT=Add An&y
-_UI_ACTION_ADD_ANY_ATTRIBUTE=Add Any Attribute
-_UI_ACTION_ADD_WITH_DOTS=Add...
-_UI_ACTION_UPDATE_BOUNDS=Update bounds
-_UI_ACTION_ADD_COMPLEX_TYPE=Add Complex Type
-_UI_ACTION_ADD_ENUMERATIONS=Add Enumerations
-_UI_ACTION_ADD_DOCUMENTATION=Add Documentation
-_UI_ACTION_CONSTRAIN_LENGTH=Constrain length
-_UI_ACTION_BROWSE_WORKSPACE=Workspace
-_UI_LABEL_NO_ITEMS_SELECTED=No items selected
-_UI_LABEL_ELEMENTFORMDEFAULT=Prefix for Elements
-_UI_LABEL_ATTRIBUTEFORMDEFAULT=Prefix for Attributes
-_UI_LABEL_BLOCKDEFAULT=Block default
-_UI_LABEL_EXTENSION_DETAILS=Extension Details
-_UI_LABEL_EXTENSION_CATEGORIES=Extension Categories:
-_UI_LABEL_FINALDEFAULT=Final default
-_UI_LABEL_COLLAPSE_WHITESPACE=Collapse whitespace
-_UI_LABEL_RESTRICT_VALUES_BY=Restrict values by:
-_UI_LABEL_MINIMUM_LENGTH=Minimum length:
-_UI_LABEL_MAXIMUM_LENGTH=Maximum length:
-_UI_LABEL_SELECT_XSD_FILE=Select XSD file
-_UI_LABEL_CONSTRAINTS_ON_VALUE_OF=Constraints on value of 
-_UI_ACTION_ADD_SIMPLE_TYPE=Add Simple Type
-_UI_ACTION_EDIT_WITH_DOTS=Edit...
-_UI_ACTION_CHANGE_PATTERN=Change pattern
-_UI_ACTION_ADD_ENUMERATION=Add Enumeration
-_UI_ACTION_INSERT_ENUMERATION=Insert Enumeration
-_UI_ACTION_CHANGE_ENUMERATION_VALUE=Change Enumeration value
-_UI_ACTION_DELETE_PATTERN=Delete Pattern
-_UI_ACTION_BROWSE_CATALOG=Catalog
-_UI_ACTION_ADD_GROUP=Add Group
-_UI_ACTION_ADD_PATTERN=Add pattern
-_UI_ACTION_SET_BASE_TYPE=Set Base Type
-_UI_ERROR_INVALID_NAME=Invalid name
-_UI_ERROR_INVALID_FILE=Invalid file
-_UI_ERROR_INVALID_CATEGORY=Invalid Category
-_UI_ACTION_DELETE=Delete
-_UI_ACTION_ADD=Add
-_UI_ACTION_RENAME=Rename
-_UI_LABEL_PATTERN=Pattern
-_UI_LABEL_PATTERNS=Patterns
-_UI_LABEL_NAME=Name:
-_UI_LABEL_TYPE=Type: 
-_UI_LABEL_BASE=Base
-_UI_LABEL_UP=Up
-_UI_LABEL_DOWN=Down
-_UI_LABEL_DELETE=Delete
-_UI_LABEL_SCHEMA=&Schema:
-_UI_LABEL_EDIT=Edit
-_UI_LABEL_REFERENCE=Reference:
-_UI_LABEL_READONLY=ReadOnly
-_UI_LABEL_INCLUSIVE=Inclusive
-_UI_LABEL_ENUMERATIONS=Enumerations
-_UI_LABEL_EXTENSIONS=Extensions
-_UI_LABEL_MINIMUM_VALUE=Minimum value:
-_UI_LABEL_MAXIMUM_VALUE=Maximum value:
-_UI_LABEL_CONTRAINTS_ON=Constraints on 
-_UI_LABEL_ADD_WITH_DOTS=Add...
-_UI_LABEL_ADD_CATEGORY=Add Category
-_UI_LABEL_EDIT_CATEGORY=Edit Category
-_UI_ACTION_ADD_ATTRIBUTE_GROUP_REF=Add Attribute Group Ref
-_UI_ACTION_ADD_EXTENSION_COMPONENT=Add Extension Component
-_UI_ACTION_ADD_EXTENSION_COMPONENTS=Add Extension Components
-_UI_LABEL_CONSTRAINTS_ON_LENGTH_OF=Constraints on length of 
-_UI_ACTION_ADD_APPINFO_ATTRIBUTE=Add AppInfo Attribute
-_UI_ACTION_SET_ENUMERATION_VALUE=Set Enumeration Value
-_UI_ACTION_UPDATE_ELEMENT_REFERENCE=Update Element Reference
-_UI_ACTION_UPDATE_MAXIMUM_OCCURRENCE=Update Maximum Occurrence
-_UI_ACTION_UPDATE_MINIMUM_OCCURRENCE=Update Minimum Occurrence
-_UI_ACTION_CHANGE_MAXIMUM_OCCURRENCE=Maximum Occurrence Change 
-_UI_ACTION_CHANGE_MINIMUM_OCCURRENCE=Minimum Occurrence Change
-_UI_LABEL_SPECIFIC_CONSTRAINT_VALUES=Specific constraint values
-_UI_LABEL_AVAILABLE_COMPONENTS_TO_ADD=Available components to Add:
-_UI_ACTION_CHANGE_CONTENT_MODEL=Change Content Model
-_UI_ERROR_FILE_CANNOT_BE_PARSED=The xsd file of the selected category cannot be parsed.
-_UI_DESCRIPTION_CHOOSE_XSD_FILE=Choose an XSD file containing schema for your extensible components
-_UI_ERROR_VALIDATE_THE_FILE=Please validate the file.
-_UI_ERROR_NAME_ALREADY_USED=The name is already being used.
-_UI_ACTION_COLLAPSE_WHITESPACE=Collapse whitespace
-_UI_ACTION_ADD_ATTRIBUTE_GROUP_DEFINITION=Add Attribute Group Definition
-_UI_ERROR_INVALID_VALUE_FOR_MAXIMUM_OCCURRENCE=Invalid value for maximum occurrence
-_UI_TOOLTIP_RENAME_REFACTOR=Click here to invoke the Rename refactoring.
-_UI_VALUE_COLON=Value:
-_UI_ID=ID:
-_UI_REF=Reference:
-_UI_FIXED=Fixed
-_UI_DEFAULT=Default
-_UI_FORM=Form qualification:
-_UI_LABEL_CATALOG=&XML Catalog...
-_UI_LABEL_WORKSPACE=&Workspace...
-# The following string will be used for the undo action.  An
-# example label is: Undo Abstract Change
-_UI_ACTION_CHANGE={0} Change
-_UI_ACTION_NAMESPACE_INFORMATION_CHANGE=Namespace Information Change
-_UI_LABEL_ABSTRACT=Abstract
-_UI_LABEL_BLOCK=Block
-_UI_LABEL_FINAL=Final
-_UI_LABEL_SUBSTITUTION_GROUP=Substitution Group
-_UI_LABEL_MIXED=Mixed
-_UI_LABEL_VALUE=Value
-_UI_USAGE=Usage
-_UI_LABEL_FORM=Form
-_UI_LABEL_NILLABLE=Nillable
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/Checks.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/Checks.java
deleted file mode 100644
index 243aa72..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/Checks.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.xml.core.internal.provisional.NameValidator;
-
-public class Checks {
-	
-	public static RefactoringStatus checkName(String name) {
-		RefactoringStatus result= new RefactoringStatus();
-		if ("".equals(name)) //$NON-NLS-1$
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("Checks_Choose_name"));  //$NON-NLS-1$
-		return result;
-	}
-	
-	public static boolean isAlreadyNamed(RefactoringComponent element, String name){
-		return name.equals(element.getName());
-	}
-	
-	public static RefactoringStatus checkComponentName(String name) {
-		RefactoringStatus result= new RefactoringStatus();
-		if (!NameValidator.isValid(name))
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("Checks_Choose_name"));  //$NON-NLS-1$
-
-		return result;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/INameUpdating.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/INameUpdating.java
deleted file mode 100644
index af89666..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/INameUpdating.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-
-/**
- * @author ebelisar
- */
-public interface INameUpdating {
-
-	public abstract void setNewElementName(String newName);
-	public abstract String getNewElementName();
-	public abstract String getCurrentElementName();
-    public abstract RefactoringStatus checkNewElementName(String newName);
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/IReferenceUpdating.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/IReferenceUpdating.java
deleted file mode 100644
index 1ff48fe..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/IReferenceUpdating.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-public interface IReferenceUpdating {
-
-	/**
-	 * Checks if this refactoring object is capable of updating references to the renamed element.
-	 */
-	public boolean canEnableUpdateReferences();
-
-	/**
-	 * If <code>canUpdateReferences</code> returns <code>true</code>, then this method is used to
-	 * inform the refactoring object whether references should be updated.
-	 * This call can be ignored if  <code>canUpdateReferences</code> returns <code>false</code>.
-	 */	
-	public void setUpdateReferences(boolean update);
-
-	/**
-	 * If <code>canUpdateReferences</code> returns <code>true</code>, then this method is used to
-	 * ask the refactoring object whether references should be updated.
-	 * This call can be ignored if  <code>canUpdateReferences</code> returns <code>false</code>.
-	 */		
-	public boolean getUpdateReferences();
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/PerformUnsavedRefactoringOperation.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/PerformUnsavedRefactoringOperation.java
deleted file mode 100644
index 10739ec..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/PerformUnsavedRefactoringOperation.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring;
-
-public class PerformUnsavedRefactoringOperation implements IWorkspaceRunnable 
-{ 
-  private ProcessorBasedRefactoring refactoring;
-  
-  public PerformUnsavedRefactoringOperation(ProcessorBasedRefactoring refactoring)
-  {
-    this.refactoring = refactoring;
-  }
-  
-  public void run(IProgressMonitor pm)
-  {
-    if (pm == null)
-    {
-      pm = new NullProgressMonitor();
-    }  
-    try
-    { 
-      refactoring.checkAllConditions(pm);
-      Change change = refactoring.createChange(pm);   
-      if (change instanceof CompositeChange)
-      {
-        CompositeChange compositeChange = (CompositeChange)change;
-        setSaveMode(compositeChange);              
-      }  
-      change.perform(pm);         
-    }
-    catch (Exception e)
-    {
-      e.printStackTrace();
-    }
-  }
-
-  private void setSaveMode(CompositeChange composite)
-  {
-    Change[] children = composite.getChildren();
-    for (int i = 0; i < children.length; i++)
-    {
-      Change child = children[i];
-      if (child instanceof TextFileChange)
-      {
-        ((TextFileChange)child).setSaveMode(TextFileChange.LEAVE_DIRTY);
-      } 
-      else if (child instanceof CompositeChange)
-      {
-        setSaveMode((CompositeChange)child);
-      }  
-    }  
-  }
-}  
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/RefactoringComponent.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/RefactoringComponent.java
deleted file mode 100644
index 554bc8a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/RefactoringComponent.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-public interface RefactoringComponent
-{
-	/**
-	 * @return the name of the component that is refactored.  E.g. "foo"
-	 */
-	public String getName();
-	
-	/**
-	 * @return the namespace of the component that is refactored.  E.g. "http://foo"
-	 */
-	public String getNamespaceURI();
-	
-	/**
-	 * The basic DOM element is used by the refactoring processor/participant to get 
-	 * access to the file location.
-	 * 
-	 * @return the Structured Source Editor XML DOM element object that underlines the 
-	 * combonent being refactore.
-	 * 
-	 * @see IDOMElement 
-	 */
-	public IDOMElement getElement();
-	
-	/** 
-	 * @return the qualified name of the type of the refactored component. 
-	 * 
-	 * <p>
-	 * A qualified name consists of a local name and a namespace.  
-	 * E.g. "complexType"-local name, "http://www.w3.org/2001/XMLSchema"-namespace
-	 * </p>
-	 * 
-	 * @see QualifiedName
-	 */
-	public QualifiedName getTypeQName();
-		
-	/** 
-	 * The model object may be required to be given to the refactored participants as is or 
-	 * other objects could be derived from it.
-	 * 
-	 * @return the principal object being refactored, such as an instance of WSDLElement or 
-	 * XSDNamedComponent
-	 */
-	public Object getModelObject();
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/RefactoringMessages.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/RefactoringMessages.java
deleted file mode 100644
index 68ed4b2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/RefactoringMessages.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-import java.text.MessageFormat;
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class RefactoringMessages {
-
-	private static final String RESOURCE_BUNDLE= "org.eclipse.wst.xsd.ui.internal.refactor.messages";//$NON-NLS-1$
-
-	private static ResourceBundle fgResourceBundle= ResourceBundle.getBundle(RESOURCE_BUNDLE);
-
-	private RefactoringMessages() {
-	}
-
-	public static String getString(String key) {
-		try {
-			return fgResourceBundle.getString(key);
-		} catch (MissingResourceException e) {
-			return "!" + key + "!";//$NON-NLS-2$ //$NON-NLS-1$
-		}
-	}
-	
-	public static String[] getStrings(String keys[]) {
-		String[] result= new String[keys.length];
-		for (int i= 0; i < keys.length; i++) {
-			result[i]= getString(keys[i]);
-		}
-		return result;
-	}
-	
-	public static String getFormattedString(String key, Object arg) {
-		return getFormattedString(key, new Object[] { arg });
-	}
-	
-	public static String getFormattedString(String key, Object[] args) {
-		return MessageFormat.format(getString(key), args);	
-	}	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/TextChangeManager.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/TextChangeManager.java
deleted file mode 100644
index e1c53e8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/TextChangeManager.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-
-/**
- * A <code>TextChangeManager</code> manages associations between <code>IFile</code> and <code>TextChange</code> objects.
- */
-public class TextChangeManager {
-	
-	private Map fMap= new HashMap(10); // IFile -> TextChange
-	
-	private final boolean fKeepExecutedTextEdits;
-	
-	public TextChangeManager() {
-		this(false);
-	}
-
-	public TextChangeManager(boolean keepExecutedTextEdits) {
-		fKeepExecutedTextEdits= keepExecutedTextEdits;
-	}
-	
-	/**
-	 * Adds an association between the given file and the passed
-	 * change to this manager.
-	 * 
-	 * @param file the file (key)
-	 * @param change the change associated with the file
-	 */
-	public void manage(IFile file, TextChange change) {
-		fMap.put(file, change);
-	}
-	
-	/**
-	 * Returns the <code>TextChange</code> associated with the given file.
-	 * If the manager does not already manage an association it creates a one.
-	 * 
-	 * @param file the file for which the text buffer change is requested
-	 * @return the text change associated with the given file. 
-	 */
-	public TextChange get(IFile file) {
-		TextChange result= (TextChange)fMap.get(file);
-		if (result == null) {
-			result= new TextFileChange(file.toString(), file);
-			result.setKeepPreviewEdits(fKeepExecutedTextEdits);
-			result.initializeValidationData(new NullProgressMonitor());
-			fMap.put(file, result);
-		}
-		return result;
-	}
-	
-	/**
-	 * Removes the <tt>TextChange</tt> managed under the given key
-	 * <code>unit<code>.
-	 * 
-	 * @param unit the key determining the <tt>TextChange</tt> to be removed.
-	 * @return the removed <tt>TextChange</tt>.
-	 */
-	public TextChange remove(IFile unit) {
-		return (TextChange)fMap.remove(unit);
-	}
-	
-	/**
-	 * Returns all text changes managed by this instance.
-	 * 
-	 * @return all text changes managed by this instance
-	 */
-	public TextChange[] getAllChanges(){
-		return (TextChange[])fMap.values().toArray(new TextChange[fMap.values().size()]);
-	}
-
-	/**
-	 * Returns all files managed by this instance.
-	 * 
-	 * @return all files managed by this instance
-	 */	
-	public IFile[] getAllCompilationUnits(){
-		return (IFile[]) fMap.keySet().toArray(new IFile[fMap.keySet().size()]);
-	}
-	
-	/**
-	 * Clears all associations between resources and text changes.
-	 */
-	public void clear() {
-		fMap.clear();
-	}
-
-	/**
-	 * Returns if any text changes are managed for the specified file.
-	 * 
-	 * @param file the file
-	 * @return <code>true</code> if any text changes are managed for the specified file and <code>false</code> otherwise
-	 */		
-	public boolean containsChangesIn(IFile file){
-		return fMap.containsKey(file);
-	}
-}
-
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/XMLRefactoringComponent.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/XMLRefactoringComponent.java
deleted file mode 100644
index ad779b1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/XMLRefactoringComponent.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor;
-
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-
-
-public class XMLRefactoringComponent implements RefactoringComponent
-{
-	// The name of the component being refactored
-	String name;
-	
-	// The namespace in which component is defined, e.g. XML or WSDL target namespace
-	String targetNamespace;
-	
-	// Optional model object that is refactored
-	Object model;
-	
-	// SED DOM object that underlines the component being refactored
-	IDOMElement domElement;
-
-	public XMLRefactoringComponent(Object modelObject, IDOMElement domElement, String name, String namespace)
-	{
-		super();
-		this.model = modelObject;
-		this.domElement = domElement;
-		this.name = name;
-		this.targetNamespace = namespace;
-		
-		
-	}
-	
-	public XMLRefactoringComponent(IDOMElement domElement, String name, String namespace)
-	{
-		super();
-		this.domElement = domElement;
-		this.name = name;
-		this.targetNamespace = namespace;
-	}
-
-	public Object getModelObject()
-	{
-		return model;
-	}
-
-	public IDOMElement getElement()
-	{
-		return domElement;
-	}
-
-	public String getName()
-	{
-		
-		return name;
-	}
-
-	public String getNamespaceURI()
-	{
-		return targetNamespace;
-	}
-
-	
-	public QualifiedName getTypeQName()
-	{
-		return new QualifiedName(domElement.getNamespaceURI(), domElement.getLocalName());
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeAnonymousTypeGlobalAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeAnonymousTypeGlobalAction.java
deleted file mode 100644
index cb3f3bf..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeAnonymousTypeGlobalAction.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.refactor.structure.MakeAnonymousTypeGlobalCommand;
-import org.eclipse.wst.xsd.ui.internal.refactor.structure.MakeTypeGlobalProcessor;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactoringWizardMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RenameRefactoringWizard;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Node;
-
-public class MakeAnonymousTypeGlobalAction extends XSDSelectionDispatchAction {
-
-	private String fParentName;
-	private boolean isComplexType = true;
-	private XSDTypeDefinition fSelectedComponent;
-	
-	public MakeAnonymousTypeGlobalAction(ISelection selection, XSDSchema schema) {
-		super(selection, schema);
-		setText(RefactoringWizardMessages.MakeAnonymousTypeGlobalAction_text); //$NON-NLS-1$
-	}
-	
-	public boolean canRun() {
-
-		return fSelectedComponent != null;
-	}
-	
-
-	private String getNewDefaultName(){
-		if(fParentName != null && !"".equals(fParentName)){ //$NON-NLS-1$
-			if(isComplexType){
-				return fParentName + "ComplexType"; //$NON-NLS-1$
-			}
-			else{
-				return fParentName + "SimpleType"; //$NON-NLS-1$
-			}
-		}
-		else{
-			if(isComplexType){
-				return "NewComplexType"; //$NON-NLS-1$
-			}
-			else{
-				return "NewSimpleType"; //$NON-NLS-1$
-			}
-		}
-		
-	}
-	private boolean canEnable(XSDConcreteComponent xsdComponent){
-		if (xsdComponent instanceof XSDComplexTypeDefinition) {
-			fSelectedComponent = (XSDComplexTypeDefinition)xsdComponent;
-			isComplexType = true;
-			XSDComplexTypeDefinition typeDef = (XSDComplexTypeDefinition) xsdComponent;
-			XSDConcreteComponent parent = typeDef.getContainer();
-			if(parent instanceof XSDElementDeclaration){
-				fParentName = ((XSDElementDeclaration)parent).getName();
-				return true;
-			}
-		} 
-		else if (xsdComponent instanceof XSDSimpleTypeDefinition){
-			fSelectedComponent = (XSDSimpleTypeDefinition)xsdComponent;
-			isComplexType = false;
-			XSDSimpleTypeDefinition typeDef = (XSDSimpleTypeDefinition) xsdComponent;
-			XSDConcreteComponent parent = typeDef.getContainer();
-			if(parent instanceof XSDElementDeclaration){
-				fParentName = ((XSDElementDeclaration)parent).getName();
-				return true;
-			}
-			else if(parent instanceof XSDAttributeDeclaration){
-				fParentName = ((XSDAttributeDeclaration)parent).getName();
-				return true;
-			}
-			
-		}
-		return false;
-	}
-
-	protected boolean canEnable(Object selectedObject) {
-		
-		if (selectedObject instanceof XSDConcreteComponent) {
-			return canEnable((XSDConcreteComponent)selectedObject) && super.canEnable(selectedObject);
-		}
-		else if (selectedObject instanceof Node) {
-			Node node = (Node) selectedObject;
-			XSDConcreteComponent concreteComponent = getSchema().getCorrespondingComponent(node);
-			return canEnable(concreteComponent) && super.canEnable(concreteComponent);
-		
-		}
-		return false;
-		
-	}
-
-	public void run1() {
-		
-		if(fSelectedComponent == null){
-			return;
-		}
-		
-		if(fSelectedComponent.getSchema() == null){
-			getSchema().updateElement(true);
-		}
-		MakeTypeGlobalProcessor processor = new MakeTypeGlobalProcessor(fSelectedComponent, getNewDefaultName());
-		RenameRefactoring refactoring = new RenameRefactoring(processor);
-		try {
-			RefactoringWizard wizard = new RenameRefactoringWizard(
-					refactoring,
-					RefactoringWizardMessages.RenameComponentWizard_defaultPageTitle, // TODO: provide correct strings
-					RefactoringWizardMessages.RenameComponentWizard_inputPage_description, null);
-			RefactoringWizardOpenOperation op= new RefactoringWizardOpenOperation(wizard);
-			op.run(XSDEditorPlugin.getShell(), wizard.getDefaultPageTitle());
-			//triggerBuild();
-		} catch (InterruptedException e) {
-			// do nothing. User action got cancelled
-		}
-		
-	}
-	
-	public void run(){
-		if(fSelectedComponent == null){
-			return;
-		}
-		
-		if(fSelectedComponent.getSchema() == null){
-			getSchema().updateElement(true);
-		}
-		DocumentImpl doc = (DocumentImpl) fSelectedComponent.getElement().getOwnerDocument();
-		doc.getModel().beginRecording(
-						this,
-						RefactoringWizardMessages.MakeAnonymousTypeGlobalAction_text);
-		MakeAnonymousTypeGlobalCommand command = new MakeAnonymousTypeGlobalCommand(
-				fSelectedComponent, getNewDefaultName());
-		command.run();
-		doc.getModel().endRecording(this);
-	}
-	
-	
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeLocalElementGlobalAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeLocalElementGlobalAction.java
deleted file mode 100644
index 847b127..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/MakeLocalElementGlobalAction.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.structure.MakeLocalElementGlobalCommand;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSchema;
-import org.w3c.dom.Node;
-
-public class MakeLocalElementGlobalAction extends XSDSelectionDispatchAction {
-
-	XSDElementDeclaration fSelectedComponent;
-
-	public MakeLocalElementGlobalAction(ISelection selection, XSDSchema schema) {
-		super(selection, schema);
-		setText(RefactoringMessages.getString("MakeLocalElementGlobalAction.text")); //$NON-NLS-1$
-	}
-	
-	public boolean canRun() {
-
-		return fSelectedComponent != null;
-	}
-
-	protected boolean canEnable(XSDConcreteComponent selectedObject) {
-
-		fSelectedComponent = null;
-		if (selectedObject instanceof XSDElementDeclaration) {
-			XSDElementDeclaration element = (XSDElementDeclaration) selectedObject;
-			if (!element.isElementDeclarationReference() && !element.isGlobal()) {
-				fSelectedComponent = element;
-			}
-		} 
-		return canRun();
-	}
-	
-	
-	protected boolean canEnable(Object selectedObject) {
-		
-		if (selectedObject instanceof XSDConcreteComponent) {
-			return canEnable((XSDConcreteComponent)selectedObject) && super.canEnable(selectedObject);
-		}
-		else if (selectedObject instanceof Node) {
-			Node node = (Node) selectedObject;
-			XSDConcreteComponent concreteComponent = getSchema()
-					.getCorrespondingComponent(node);
-			return canEnable(concreteComponent) && super.canEnable(concreteComponent);
-		}
-		return false;
-		
-	}
-
-
-	public void run() {
-		DocumentImpl doc = (DocumentImpl) fSelectedComponent.getElement()
-				.getOwnerDocument();
-		doc.getModel().beginRecording(this, getText());
-		MakeLocalElementGlobalCommand command = new MakeLocalElementGlobalCommand(
-				fSelectedComponent);
-		command.run();
-		doc.getModel().endRecording(this);
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameAction.java
deleted file mode 100644
index 01d2fb7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameAction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactoringWizardMessages;
-
-
-
-/**
-* Renames a XML Schema element or workbench resource.
-* <p>
-* Action is applicable to selections containing elements of type
-* <code></code> or <code>IResource</code>.
-* 
-* <p>
-* This class may be instantiated; it is not intended to be subclassed.
-* </p>
-
-*/
-public class RenameAction extends SelectionDispatchAction  {
-
-	private SelectionDispatchAction renameComponentAction;
-	private SelectionDispatchAction renameResourceAction;
-	
-	
-	public RenameAction(ISelection selection) {
-		super(selection);
-		setText(RefactoringWizardMessages.RenameAction_text); 
-		renameResourceAction= new RenameResourceAction(selection);
-		renameResourceAction.setText(getText());
-		
-	}
-	public RenameAction(ISelection selection, Object model) {
-		super(selection);
-		setText(RefactoringWizardMessages.RenameAction_text);
-		renameComponentAction= new RenameComponentAction(selection, model);
-		renameComponentAction.setText(getText());
-		renameResourceAction= new RenameResourceAction(selection);
-		renameResourceAction.setText(getText());
-		
-	}
-	
-
-	
-	/*
-	 * @see ISelectionChangedListener#selectionChanged(SelectionChangedEvent)
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		renameComponentAction.selectionChanged(event);
-		if (renameResourceAction != null)
-			renameResourceAction.selectionChanged(event);
-		setEnabled(computeEnabledState());		
-	}
-
-	/*
-	 * @see SelectionDispatchAction#update(ISelection)
-	 */
-	public void update(ISelection selection) {
-		if(renameComponentAction != null){
-			renameComponentAction.update(selection);
-		}
-		if (renameResourceAction != null)
-			renameResourceAction.update(selection);
-		setEnabled(computeEnabledState());		
-	}
-	
-	private boolean computeEnabledState(){
-		if (renameResourceAction != null) {
-			return renameComponentAction.isEnabled() || renameResourceAction.isEnabled();
-		} else {
-			return renameComponentAction.isEnabled();
-		}
-	}
-	
-	public void run(IStructuredSelection selection) {
-		if (renameComponentAction != null && renameComponentAction.isEnabled())
-			renameComponentAction.run(selection);
-		if (renameResourceAction != null && renameResourceAction.isEnabled())
-			renameResourceAction.run(selection);
-	}
-
-	public void run(ITextSelection selection) {
-		if (renameComponentAction != null && renameComponentAction.canRun())
-			renameComponentAction.run(selection);
-		else
-			MessageDialog.openInformation(XSDEditorPlugin.getShell(), RefactoringWizardMessages.RenameAction_rename, RefactoringWizardMessages.RenameAction_unavailable);  
-	}
-	public void run(ISelection selection) {
-	    if(selection == null){
-	    	super.run();
-	    }
-	    else{
-	    	super.run(selection);
-	    }
-		
-	}
-	public final void setRenameComponentAction(
-			SelectionDispatchAction renameComponentAction)
-	{
-		this.renameComponentAction = renameComponentAction;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameComponentAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameComponentAction.java
deleted file mode 100644
index 8fca361..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameComponentAction.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
-import org.eclipse.ui.actions.GlobalBuildAction;
-import org.eclipse.wst.common.ui.internal.dialogs.SaveDirtyFilesDialog;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.XMLRefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.rename.RenameComponentProcessor;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactoringWizardMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RenameRefactoringWizard;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDTypeDefinition;
-import org.w3c.dom.Node;
-
-public class RenameComponentAction extends XSDSelectionDispatchAction {
-
-	private XSDNamedComponent selectedComponent;
-
-	public RenameComponentAction(ISelection selection,
-			Object aModel) {
-		super(selection, aModel);
-	
-	}
-
-	protected boolean canEnable(XSDConcreteComponent selectedObject) {
-
-		selectedComponent = null;
-		if (selectedObject instanceof XSDNamedComponent) {
-			selectedComponent = (XSDNamedComponent) selectedObject;
-
-			// if it's element reference, then this action is not appropriate
-			if (selectedComponent instanceof XSDElementDeclaration) {
-				XSDElementDeclaration element = (XSDElementDeclaration) selectedComponent;
-				if (element.isElementDeclarationReference()) {
-					selectedComponent = null;
-				}
-			}
-			if(selectedComponent instanceof XSDTypeDefinition){
-				XSDTypeDefinition type = (XSDTypeDefinition) selectedComponent;
-				XSDConcreteComponent parent = type.getContainer();
-				if (parent instanceof XSDElementDeclaration) {
-					XSDElementDeclaration element = (XSDElementDeclaration) parent;
-					if(element.getAnonymousTypeDefinition().equals(type)){
-						selectedComponent = null;
-					}
-				}
-				else if(parent instanceof XSDAttributeDeclaration) {
-					XSDAttributeDeclaration element = (XSDAttributeDeclaration) parent;
-					if(element.getAnonymousTypeDefinition().equals(type)){
-						selectedComponent = null;
-					}
-				}
-			}
-		}
-
-		return canRun();
-	}
-
-	protected boolean canEnable(Object selectedObject) {
-
-		if (selectedObject instanceof XSDConcreteComponent) 
-		{
-			return canEnable((XSDConcreteComponent) selectedObject) && super.canEnable(selectedObject);
-		} else if (selectedObject instanceof Node) 
-		{
-			Node node = (Node) selectedObject;
-			if (getSchema() != null) 
-			{
-				XSDConcreteComponent concreteComponent = getSchema()
-						.getCorrespondingComponent(node);
-				return canEnable(concreteComponent) && super.canEnable(concreteComponent);
-			}
-		}
-		return false;
-
-	}
-
-	public boolean canRun() {
-
-		return selectedComponent != null;
-	}
-
-	public void run(ISelection selection) {
-		if (selectedComponent.getName() == null) {
-			selectedComponent.setName(new String());
-		}
-		if (selectedComponent.getSchema() == null) {
-			if (getSchema() != null) {
-				getSchema().updateElement(true);
-			}
-
-		}
-        
-        boolean rc = SaveDirtyFilesDialog.saveDirtyFiles();
-        if (!rc)
-        {
-          return;
-        }  
-        RefactoringComponent component = new XMLRefactoringComponent(
-				selectedComponent,
-				(IDOMElement)selectedComponent.getElement(), 
-				selectedComponent.getName(),
-				selectedComponent.getTargetNamespace());
-		
-		RenameComponentProcessor processor = new RenameComponentProcessor(
-				component, selectedComponent.getName());
-		RenameRefactoring refactoring = new RenameRefactoring(processor);
-		try {
-			RefactoringWizard wizard = new RenameRefactoringWizard(
-					refactoring,
-					RefactoringWizardMessages.RenameComponentWizard_defaultPageTitle, 
-					RefactoringWizardMessages
-							.RenameComponentWizard_inputPage_description, 
-					null);
-			RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(
-					wizard);
-			op.run(XSDEditorPlugin.getShell(), wizard
-					.getDefaultPageTitle());
-			
-			// TODO (cs) I'm not sure why we need to do this.  See bug 145700
-			//triggerBuild();
-		} catch (InterruptedException e) {
-			// do nothing. User action got cancelled
-		}
-
-	}
-
-	public static void triggerBuild() {
-		if (ResourcesPlugin.getWorkspace().getDescription().isAutoBuilding()) {
-			new GlobalBuildAction(XSDEditorPlugin.getPlugin().getWorkbench()
-					.getActiveWorkbenchWindow(),
-					IncrementalProjectBuilder.INCREMENTAL_BUILD).run();
-		}
-	}	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameResourceAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameResourceAction.java
deleted file mode 100644
index 17d7d9f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameResourceAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.refactor.rename.RenameResourceProcessor;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactoringWizardMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RenameRefactoringWizard;
-
-
-
-public class RenameResourceAction extends SelectionDispatchAction {
-
-
-
-	
-	public RenameResourceAction(ISelection selection)
-	{
-		super(selection);
-	}
-
-	public void selectionChanged(IStructuredSelection selection) {
-		IResource element= getResource(selection);
-		if (element == null) {
-			setEnabled(false);
-		} else {
-			RenameResourceProcessor processor= new RenameResourceProcessor(element);
-			setEnabled(processor.isApplicable());
-			
-		}
-	}
-
-	public void run(IStructuredSelection selection) {
-		IResource resource = getResource(selection);
-		RenameResourceProcessor processor= new RenameResourceProcessor(resource);
-
-			if(!processor.isApplicable())
-				return;
-			RenameRefactoring refactoring= new RenameRefactoring(processor);
-			try {
-				RefactoringWizard wizard = new RenameRefactoringWizard(
-						refactoring,
-						RefactoringWizardMessages.RenameComponentWizard_defaultPageTitle, //TODO: provide correct strings
-						RefactoringWizardMessages.RenameComponentWizard_inputPage_description, 
-						null);
-				RefactoringWizardOpenOperation op= new RefactoringWizardOpenOperation(wizard);
-				op.run(XSDEditorPlugin.getShell(), wizard.getDefaultPageTitle());
-			} catch (InterruptedException e) {
-				// do nothing. User action got cancelled
-			}
-			
-	}
-	
-	private static IResource getResource(IStructuredSelection selection) {
-		if (selection.size() != 1)
-			return null;
-		Object first= selection.getFirstElement();
-		if (! (first instanceof IResource))
-			return null;
-		return (IResource)first;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameResourceActionDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameResourceActionDelegate.java
deleted file mode 100644
index 444a5ab..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameResourceActionDelegate.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-/**
- * @author ebelisar@ca.ibm.com
- */
-public class RenameResourceActionDelegate implements IObjectActionDelegate {
-	
-	private ISelection fCurrentSelection;
-
-//	private IWorkbenchPart fPart;
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-//		fPart = targetPart;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		if (fCurrentSelection instanceof IStructuredSelection) {
-			IStructuredSelection structuredSelection= (IStructuredSelection) fCurrentSelection;
-			Object first= structuredSelection.getFirstElement();
-			if (first instanceof IFile) {
-				RenameResourceAction renameAction = new RenameResourceAction(structuredSelection);
-				renameAction.run(structuredSelection);
-			}
-		}
-
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fCurrentSelection= selection;
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameTargetNamespaceAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameTargetNamespaceAction.java
deleted file mode 100644
index 58ceedc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/RenameTargetNamespaceAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation;
-import org.eclipse.ui.actions.GlobalBuildAction;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.refactor.rename.RenameTargetNamespaceProcessor;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactoringWizardMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RenameRefactoringWizard;
-
-public class RenameTargetNamespaceAction extends XSDSelectionDispatchAction {
-
-	public RenameTargetNamespaceAction(ISelection selection,
-			Object aModel) {
-		super(selection, aModel);
-		setText(RefactoringWizardMessages.RenameTargetNamespace_text);
-
-	}
-
-
-	protected boolean canEnable(Object selectedObject) {
-
-		return super.canEnable(selectedObject);
-
-	}
-	
-	public boolean canRun() {
-
-		return getSchema() != null;
-	}
-
-
-	public void run(ISelection selection) {
-
-		
-		RenameTargetNamespaceProcessor processor = new RenameTargetNamespaceProcessor(getSchema(), getSchema().getTargetNamespace());
-		RenameRefactoring refactoring = new RenameRefactoring(processor);
-		try {
-			RefactoringWizard wizard = new RenameRefactoringWizard(
-					refactoring,
-					RefactoringWizardMessages.RenameComponentWizard_defaultPageTitle,//TODO: provide correct strings
-					RefactoringWizardMessages.RenameComponentWizard_inputPage_description, 
-					null);
-			RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(
-					wizard);
-			op.run(XSDEditorPlugin.getShell(), wizard
-					.getDefaultPageTitle());
-			triggerBuild();
-		} catch (InterruptedException e) {
-			// do nothing. User action got cancelled
-		}
-
-	}
-
-	public static void triggerBuild() {
-		if (ResourcesPlugin.getWorkspace().getDescription().isAutoBuilding()) {
-			new GlobalBuildAction(XSDEditorPlugin.getPlugin().getWorkbench()
-					.getActiveWorkbenchWindow(),
-					IncrementalProjectBuilder.INCREMENTAL_BUILD).run();
-		}
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/SelectionDispatchAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/SelectionDispatchAction.java
deleted file mode 100644
index 7a2aaca..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/SelectionDispatchAction.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-
-
-
-/**
- * Action that dispatches the <code>IAction#run()</code> and the 
- * <code>ISelectionChangedListener#selectionChanged</code> 
- * according to the type of the selection. 
- * 
- * <ul>
- * 	<li>if selection is of type <code>ITextSelection</code> then
- * 	<code>run(ITextSelection)</code> and <code>selectionChanged(ITextSelection)</code>
- * 	is called.</li> 
- * 	<li>if selection is of type <code>IStructuredSelection</code> then
- * 	<code>run(IStructuredSelection)</code> and <code>
- * 	selectionChanged(IStructuredSelection)</code> is called.</li>
- * 	<li>default is to call <code>run(ISelection)</code> and <code>
- * 	selectionChanged(ISelection)</code>.</li>
- * </ul>
- * 
- * <p>
- * adapted from <code>org.eclipse.jdt.ui.actions.SelectionDispatchAction</code>
- * </p>
- *   
- * 
- */
-public abstract class SelectionDispatchAction extends Action implements ISelectionChangedListener {
-	
-	private ISelection selection;
-	
-	private Object model;
-	
-	protected SelectionDispatchAction(ISelection selection) {
-		Assert.isNotNull(selection);
-		this.selection = selection;
-		
-	}
-
-	/**
-	 * Returns the selection provided by the site owning this action.
-	 * 
-	 * @return the site's selection
-	 */	
-	public ISelection getSelection() {
-		return selection;
-	}
-	
-	/**
-	 * Updates the action's enablement state according to the given selection. This
-	 * default implementation calls one of the <code>selectionChanged</code>
-	 * methods depending on the type of the passed selection.
-	 * 
-	 * @param selection the selection this action is working on
-	 */
-	public void update(ISelection selection) {
-		dispatchSelectionChanged(selection);
-	}
-
-	/**
-	 * Notifies this action that the given structured selection has changed. This default
-	 * implementation calls <code>selectionChanged(ISelection selection)</code>.
-	 * 
-	 * @param selection the new selection
- 	 */
-	public void selectionChanged(IStructuredSelection selection) {
-		if (selection.size() == 1) {
-			Object object = selection.getFirstElement();
-			setEnabled(canEnable(object));
-		}
-		else{
-			setEnabled(false);
-		}
-	}
-	
-	protected boolean canEnable(Object selectedObject){
-		return false;
-	}
-
-	/**
-	 * Executes this actions with the given structured selection. This default implementation
-	 * calls <code>run(ISelection selection)</code>.
-	 */
-	public void run(IStructuredSelection selection) {
-		run((ISelection)selection);
-	}
-
-	
-	/**
-	 * Notifies this action that the given text selection has changed.  This default
-	 * implementation calls <code>selectionChanged(ISelection selection)</code>.
-	 * 
-	 * @param selection the new selection
- 	 */
-	public void selectionChanged(ITextSelection selection) {
-		selectionChanged((ISelection)selection);
-	}
-	
-	/**
-	 * Executes this actions with the given text selection. This default implementation
-	 * calls <code>run(ISelection selection)</code>.
-	 */
-	public void run(ITextSelection selection) {
-		run((ISelection)selection);
-	}
-	
-	/**
-	 * Notifies this action that the given selection has changed.  This default
-	 * implementation sets the action's enablement state to <code>false</code>.
-	 * 
-	 * @param selection the new selection
- 	 */
-	public void selectionChanged(ISelection selection) {
-		setEnabled(false);
-	}
-	
-	/**
-	 * Executes this actions with the given selection. This default implementation
-	 * does nothing.
-	 */
-	public void run(ISelection selection) {
-
-	}
-
-	/* (non-Javadoc)
-	 * Method declared on IAction.
-	 */
-	public void run() {
-		dispatchRun(getSelection());
-		
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared on ISelectionChangedListener.
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		dispatchSelectionChanged(event.getSelection());
-	}
-
-	private void dispatchSelectionChanged(ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			selectionChanged((IStructuredSelection)selection);
-		} else if (selection instanceof ITextSelection) {
-			selectionChanged((ITextSelection)selection);
-		} else {
-			selectionChanged(selection);
-		}
-	}
-
-	protected void dispatchRun(ISelection selection) {
-		if (selection instanceof IStructuredSelection) {
-			run((IStructuredSelection)selection);
-		}  else if (selection instanceof ITextSelection) {
-			run((ITextSelection)selection);
-		} else {
-			run(selection);
-		}
-	}
-
-	public final Object getModel()
-	{
-		return model;
-	}
-
-	public final void setModel(Object model)
-	{
-		this.model = model;
-	}
-	
-	public boolean canRun() {
-
-		return true;
-	}
-
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDRefactorActionGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDRefactorActionGroup.java
deleted file mode 100644
index 0169f26..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDRefactorActionGroup.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import java.util.ArrayList;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorActionGroup;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDRefactorActionGroup extends RefactorActionGroup {
-
-	private static final String MAKE_ELEMENT_GLOBAL = "org.eclipse.wst.xsd.ui.refactor.makeElementGlobal"; //$NON-NLS-1$
-
-	private static final String MAKE_TYPE_GLOBAL = "org.eclipse.wst.xsd.ui.refactor.makeTypeGlobal"; //$NON-NLS-1$
-
-	private static final String RENAME_ELEMENT = "org.eclipse.wst.xsd.ui.refactor.rename.element"; //$NON-NLS-1$
-
-	//private static final String RENAME_TARGET_NAMESPCE = "org.eclipse.wst.xsd.ui.refactor.renameTargetNamespace"; //$NON-NLS-1$
-
-	private SelectionDispatchAction fMakeLocalElementGlobal;
-
-	private SelectionDispatchAction fMakeLocalTypeGlobal;
-
-	public XSDRefactorActionGroup(ISelection selection,
-			XSDSchema schema) {
-		super(selection);
-		fEditorActions = new ArrayList();
-		fRenameAction = new RenameAction(selection, schema);
-		fRenameAction.setActionDefinitionId(RENAME_ELEMENT);
-		fEditorActions.add(fRenameAction);
-
-		//fRenameTargetNamespace = new RenameTargetNamespaceAction(
-		//		selection, schema);
-		//fRenameTargetNamespace.setActionDefinitionId(RENAME_TARGET_NAMESPCE);
-		//fEditorActions.add(fRenameTargetNamespace);
-
-		fMakeLocalElementGlobal = new MakeLocalElementGlobalAction(
-				selection, schema);
-		fMakeLocalElementGlobal.setActionDefinitionId(MAKE_ELEMENT_GLOBAL);
-		fEditorActions.add(fMakeLocalElementGlobal);
-
-		fMakeLocalTypeGlobal = new MakeAnonymousTypeGlobalAction(
-				selection, schema);
-		fMakeLocalTypeGlobal.setActionDefinitionId(MAKE_TYPE_GLOBAL);
-		fEditorActions.add(fMakeLocalTypeGlobal);
-
-		initAction(fRenameAction, selection);
-		//initAction(fRenameTargetNamespace, selection);
-		initAction(fMakeLocalElementGlobal, selection);
-		initAction(fMakeLocalTypeGlobal, selection);
-	}
-
-	public void dispose() {
-//		disposeAction(fRenameAction, selection);
-//		disposeAction(fMakeLocalElementGlobal, selection);
-//		disposeAction(fMakeLocalTypeGlobal, selection);
-//		disposeAction(fRenameTargetNamespace, selection);
-		super.dispose();
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDRefactorGroupActionDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDRefactorGroupActionDelegate.java
deleted file mode 100644
index a0873fc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDRefactorGroupActionDelegate.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-import org.eclipse.wst.xsd.ui.internal.editor.ISelectionMapper;
-import org.eclipse.wst.xsd.ui.internal.refactor.actions.XSDRefactorActionGroup;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorActionGroup;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorGroupActionDelegate;
-import org.eclipse.wst.xsd.ui.internal.refactor.wizard.RefactorGroupSubMenu;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDRefactorGroupActionDelegate extends RefactorGroupActionDelegate {
-
-	public XSDRefactorGroupActionDelegate() {
-		super();
-	}
-
-	/**
-	 * Fills the menu with applicable refactor sub-menues
-	 * @param menu The menu to fill
-	 */
-	protected void fillMenu(Menu menu) {
-		if (fSelection == null) {
-			return;
-		}
-		if (workbenchPart != null) {
-			IWorkbenchPartSite site = workbenchPart.getSite();
-			if (site == null)
-				return;
-	
-			IEditorPart editor = site.getPage().getActiveEditor();
-			if (editor != null) {              
-                XSDSchema schema = (XSDSchema)editor.getAdapter(XSDSchema.class);
-                ISelectionMapper mapper = (ISelectionMapper)editor.getAdapter(ISelectionMapper.class);
-			    if (schema != null)
-                {                
-                    ISelection selection = mapper != null ? mapper.mapSelection(fSelection) : fSelection;                    
-					RefactorActionGroup refactorMenuGroup = new XSDRefactorActionGroup(selection, schema);
-					RefactorGroupSubMenu subMenu = new RefactorGroupSubMenu(refactorMenuGroup);
-					subMenu.fill(menu, -1);
-				}				
-			}
-		
-		}
-	
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDSelectionDispatchAction.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDSelectionDispatchAction.java
deleted file mode 100644
index ba28df9..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/actions/XSDSelectionDispatchAction.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.actions;
-
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDSchema;
-
-public class XSDSelectionDispatchAction extends SelectionDispatchAction
-{
-
-	
-	
-	public XSDSelectionDispatchAction(ISelection selection, Object model)
-	{
-		super(selection);
-		setModel(model);
-	}
-
-	protected XSDSchema getSchema(){
-		Object model = getModel();
-		if(model instanceof XSDSchema)
-		{
-			return (XSDSchema) model;
-		}
-	
-		return null;
-	}
-	
-	protected boolean canEnable(Object selectedComponent)
-	{
-		XSDSchema selectedComponentSchema = null;
-		if (selectedComponent instanceof XSDConcreteComponent)
-		{
-			selectedComponentSchema = ((XSDConcreteComponent)selectedComponent).getSchema();
-		}
-		
-		if (selectedComponentSchema != null && selectedComponentSchema == getSchema() )
-		{
-			return true;
-		}
-		return false;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/messages.properties b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/messages.properties
deleted file mode 100644
index 62ac4e0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/messages.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-RefactorMenu.label=Refactor
-RefactorActionGroup.no_refactoring_available=<no refactoring available>
-
-RenameAction.rename=Rename
-RenameAction.unavailable=Operation unavailable on the current selection.\nSelect a ....
-RenameAction.text=Re&name...
-
-RenameInputWizardPage.new_name= &New name:
-RenameRefactoringWizard.internal_error= Internal error during name checking: {0}
-
-
-RenameXSDElementAction.exception=Unexpected exception occurred. See log for details
-RenameXSDElementAction.not_available=Operation unavailable on the current selection.\nSelect a XSD project, folder, resource, file, attribute declarations,  attribute group definitions, complex type definitions, element declarations, identity constraint definitions, model groups definitions, notation declarations, or simple type definitions.
-RenameXSDElementAction.name=Rename
-
-
-RenameSupport.dialog.title=Rename
-RenameSupport.not_available=Rename support not available
-
-RenameComponentWizard.defaultPageTitle=Rename wizard
-RenameComponentWizard.inputPage.description=Rename XML Schema component
-
-RenameInputWizardPage.update_references=Update references
-XSDComponentRenameChange.name=XML Schema component renaming in {0}: {1} to {2}
-XSDComponentRenameChange.Renaming=Renaming...
-ResourceRenameParticipant.compositeChangeName=XSD file rename references updating changes
-RenameResourceChange.rename_resource_reference_change=Renaming resource name references
-XSDRenameResourceChange.name=Resource rename: {0} to {1}
-RenameResourceRefactoring.Internal_Error=Internal error
-RenameResourceRefactoring.alread_exists=Resource already exist
-RenameResourceRefactoring.invalidName=Invalid resource name
-RenameResourceProcessor.name=Resource renaming
-MakeLocalElementGlobalAction.text=Make Local Element Global
-XSDComponentRenameParticipant.Component_Refactoring_updates=XML Schema refactoring changes
-WSDLComponentRenameParticipant.Component_Refactoring_updates=WSDL refactoring changes
-RenameComponentProcessor.Component_Refactoring_updates=Component name refactoring changes
-RenameComponentProcessor.Component_Refactoring_update_declatation=Update component declaration/definition
-RenameComponentProcessor.Component_Refactoring_update_reference=Update component reference
-XSDComponentRenameParticipant.xsd_component_rename_participant=XSD component rename participant
-WSDLComponentRenameParticipant.wsdl_component_rename_participant=WSDL component rename participant
-ResourceRenameParticipant.File_Rename_update_reference=File rename refactoring changes
-RenameComponentRefactoring_checking=Checking...
-RenameComponentRefactoring_searching=Searching...
-Checks_Choose_name=Invalid name
-RenameComponentRefactoring_another_name=Name already used
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ComponentRenameArguments.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ComponentRenameArguments.java
deleted file mode 100644
index ebdf3d0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ComponentRenameArguments.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import java.util.Map;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
-
-public class ComponentRenameArguments extends RenameArguments {
-	
-	TextChangeManager changeManager;
-	Map matches;
-	String qualifier;
-
-	public ComponentRenameArguments(String newName, boolean updateReferences) {
-		super(newName, updateReferences);
-	}
-
-	public TextChangeManager getChangeManager() {
-		return changeManager;
-	}
-
-	public void setChangeManager(TextChangeManager changeManager) {
-		this.changeManager = changeManager;
-	}
-
-	public Map getMatches() {
-		return matches;
-	}
-
-	public void setMatches(Map matches) {
-		this.matches = matches;
-	}
-
-	public String getQualifier() {
-		return qualifier;
-	}
-
-	public void setQualifier(String qualifier) {
-		this.qualifier = qualifier;
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
deleted file mode 100644
index b49d4fb..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameComponentProcessor.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-//import com.ibm.icu.text.Collator;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.text.Position;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ParticipantManager;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
-import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.common.core.search.SearchEngine;
-import org.eclipse.wst.common.core.search.SearchMatch;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.core.search.scope.SelectionSearchScope;
-import org.eclipse.wst.common.core.search.scope.WorkspaceSearchScope;
-import org.eclipse.wst.common.core.search.util.CollectingSearchRequestor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentDeclarationPattern;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentReferencePattern;
-import org.eclipse.wst.xsd.ui.internal.refactor.Checks;
-import org.eclipse.wst.xsd.ui.internal.refactor.INameUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.IReferenceUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
-import org.eclipse.wst.xsd.ui.internal.refactor.util.TextChangeCompatibility;
-
-
-
-public class RenameComponentProcessor extends RenameProcessor implements INameUpdating, IReferenceUpdating {
-	public static final String IDENTIFIER = "org.eclipse.wst.xml.refactor.renameComponentProcessor"; //$NON-NLS-1$
-    private boolean singleFileOnly = false;
-    
-	public static String quoteString(String value) {
-		value = value == null ? "" : value;
-
-		StringBuffer sb = new StringBuffer();
-		if (!value.startsWith("\"")) {
-			sb.append("\"");
-		}
-		sb.append(value);
-		if (!value.endsWith("\"")) {
-			sb.append("\"");
-		}
-		return sb.toString();
-	}
-
-	private TextChangeManager changeManager;
-
-	private String newName;
-
-	private RefactoringComponent selectedComponent;
-
-	private boolean updateReferences = true;
-
-	private Map references = new HashMap();
-
-	public RenameComponentProcessor(RefactoringComponent selectedComponent) {
-		this.selectedComponent = selectedComponent;
-	}
-
-	public RenameComponentProcessor(RefactoringComponent selectedComponent, String newName) {
-		this(selectedComponent, newName, false);
-	}
-    
-    public RenameComponentProcessor(RefactoringComponent selectedComponent, String newName, boolean singleFileOnly) {
-        this.newName = newName;
-        this.selectedComponent = selectedComponent;
-        this.singleFileOnly = singleFileOnly;
-    }    
-
-	private void addDeclarationUpdate(TextChangeManager manager) throws CoreException {
-		String fileStr = selectedComponent.getElement().getModel().getBaseLocation();
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileStr));
-		addDeclarationUpdate(manager, file);
-	}
-
-	final void addDeclarationUpdate(TextChangeManager manager, IFile file) throws CoreException {
-
-		String componentName = selectedComponent.getName();
-		String componentNamespace = selectedComponent.getNamespaceURI();
-		QualifiedName elementQName = new QualifiedName(componentNamespace, componentName);
-		QualifiedName typeQName = selectedComponent.getTypeQName();
-
-
-
-		SearchScope scope = new WorkspaceSearchScope();
-		if (file != null) {
-			scope = new SelectionSearchScope(new IResource[]{file});
-		}
-		CollectingSearchRequestor requestor = new CollectingSearchRequestor();
-		SearchPattern pattern = new XMLComponentDeclarationPattern(file, elementQName, typeQName);
-		SearchEngine searchEngine = new SearchEngine();
-        HashMap map = new HashMap();
-        if (singleFileOnly)
-        {
-          map.put("searchDirtyContent", Boolean.TRUE);
-        }  
-		searchEngine.search(pattern, requestor, scope, map, new NullProgressMonitor());
-		List results = requestor.getResults();
-		
-		// more than one declaration found, so use offset as additional check
-		Position offsetPosition = null;
-		if (results.size() > 1) {
-		    IDOMElement selectedElement = selectedComponent.getElement();
-		    if (selectedElement != null) {
-		    	int startOffset = selectedElement.getStartOffset();
-		    	offsetPosition = new Position(startOffset, (selectedElement.getEndOffset() - startOffset));
-		    }
-		}
-		
-		for (Iterator iter = results.iterator(); iter.hasNext();) {
-			SearchMatch match = (SearchMatch) iter.next();
-			if (match != null) {
-				boolean addTextChange = true;
-				// additional check to verify correct declaration is changed
-				if (offsetPosition != null) {
-					addTextChange = offsetPosition.overlapsWith(match.getOffset(), match.getLength());  
-				}
-				if (addTextChange) {
-					TextChange textChange = manager.get(match.getFile());
-					String newName = getNewElementName();
-					newName = quoteString(newName);
-	
-					ReplaceEdit replaceEdit = new ReplaceEdit(match.getOffset(), match.getLength(), newName);
-					String editName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_update_declatation");
-					TextChangeCompatibility.addTextEdit(textChange, editName, replaceEdit);
-				}
-			}
-		}
-	}
-
-	void addOccurrences(TextChangeManager manager, IProgressMonitor pm, RefactoringStatus status) throws CoreException {
-
-		String fileStr = selectedComponent.getElement().getModel().getBaseLocation();
-		IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(new Path(fileStr));
-
-		String componentName = selectedComponent.getName();
-		String componentNamespace = selectedComponent.getNamespaceURI();
-		QualifiedName elementQName = new QualifiedName(componentNamespace, componentName);
-		QualifiedName typeQName = selectedComponent.getTypeQName();
-
-		SearchEngine searchEngine = new SearchEngine();
-        SearchScope scope = null;
-        HashMap map = new HashMap();
-        if (singleFileOnly)
-        {
-          map.put("searchDirtyContent", Boolean.TRUE);
-          scope = new SelectionSearchScope(new IResource[]{file});
-        }
-        else
-        {  
-          scope = new WorkspaceSearchScope();
-        } 
-		SortingSearchRequestor requestor = new SortingSearchRequestor();
-		SearchPattern pattern = new XMLComponentReferencePattern(file, elementQName, typeQName);
-        
-		searchEngine.search(pattern, requestor, scope, map, new NullProgressMonitor());
-		references = requestor.getResults();
-		// for (Iterator iter = references.iterator(); iter.hasNext();) {
-		// SearchMatch match = (SearchMatch) iter.next();
-
-		// TextChange textChange = manager.get(match.getFile());
-		// String newName = getNewElementName();
-		// if(match.getObject() instanceof Node){
-		// Node node = (Node)match.getObject();
-		// if(node instanceof IDOMAttr){
-		// IDOMAttr attr = (IDOMAttr)node;
-		// IDOMElement element = (IDOMElement)attr.getOwnerElement() ;
-		// newName = getNewQName(element, componentNamespace, newName);
-		// }
-		// newName = quoteString(newName);
-		// }
-		//				
-		// ReplaceEdit replaceEdit = new ReplaceEdit(match.getOffset(),
-		// match.getLength(), newName );
-		// String editName =
-		// RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_update_reference");
-		// TextChangeCompatibility.addTextEdit(textChange, editName,
-		// replaceEdit);
-
-		// }
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating#canEnableTextUpdating()
-	 */
-	public boolean canEnableTextUpdating() {
-		return true;
-	}
-
-	public boolean canEnableUpdateReferences() {
-		return true;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	public RefactoringStatus checkFinalConditions(IProgressMonitor monitor, CheckConditionsContext context) throws CoreException, OperationCanceledException {
-		Assert.isNotNull(monitor);
-		Assert.isNotNull(context);
-		final RefactoringStatus status = new RefactoringStatus();
-		try {
-			monitor.beginTask("", 2); //$NON-NLS-1$
-			monitor.setTaskName(RefactoringMessages.getString("RenameComponentRefactoring_checking")); //$NON-NLS-1$
-			status.merge(checkNewElementName(getNewElementName()));
-			monitor.worked(1);
-			monitor.setTaskName(RefactoringMessages.getString("RenameComponentRefactoring_searching")); //$NON-NLS-1$
-			status.merge(createRenameChanges(new SubProgressMonitor(monitor, 1)));
-		}
-		finally {
-			monitor.done();
-		}
-		return status;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		// TODO add code to check initial conditions for component rename
-		Assert.isNotNull(pm);
-		try {
-			return new RefactoringStatus();
-		}
-		finally {
-			pm.done();
-		}
-
-	}
-
-	public final RefactoringStatus checkNewElementName(final String name) {
-		Assert.isNotNull(name);
-		final RefactoringStatus result = Checks.checkName(name);
-		result.merge(Checks.checkComponentName(name));
-		if (Checks.isAlreadyNamed(selectedComponent, name))
-			result.addFatalError(RefactoringMessages.getString("RenameComponentRefactoring_another_name")); //$NON-NLS-1$
-		return result;
-	}
-
-	private Object[] computeDerivedElements() {
-
-		Object[] elements = getElements();
-		// Object[] results = new Object[elements.length];
-		// for(int i=0; i< elements.length; i++){
-		// RefactoringComponent component = (RefactoringComponent)elements[i];
-		// results[i] = component.getAdaptee();
-		//			
-		// }
-		return elements;
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		// don't create any change now, all the changes are in changeManger
-		// variable and will be combined in postCreateChange method
-		return null;
-	}
-
-	private TextChangeManager updateChangeManager(IProgressMonitor pm, RefactoringStatus status) throws CoreException {
-		TextChangeManager manager = getChangeManager();
-		// only one declaration gets updated
-		addDeclarationUpdate(manager);
-		if (getUpdateReferences()) {
-			addOccurrences(manager, pm, status);
-		}
-		return manager;
-	}
-
-	private RefactoringStatus createRenameChanges(final IProgressMonitor monitor) throws CoreException {
-		Assert.isNotNull(monitor);
-		final RefactoringStatus status = new RefactoringStatus();
-		try {
-			monitor.beginTask(RefactoringMessages.getString("RenameComponentRefactoring_searching"), 1); //$NON-NLS-1$
-			updateChangeManager(new SubProgressMonitor(monitor, 1), status);
-		}
-		finally {
-			monitor.done();
-		}
-		return status;
-	}
-
-	public TextChangeManager getChangeManager() {
-
-		if (changeManager == null) {
-			changeManager = new TextChangeManager(false);
-		}
-		return changeManager;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xsd.internal.refactoring.rename.XSDRenameProcessor#getAffectedProjectNatures()
-	 */
-	protected String[] getAffectedProjectNatures() throws CoreException {
-		// TODO: find project natures of the files that are going to be
-		// refactored
-		return new String[]{"org.eclipse.jdt.core.javanature"};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating#getCurrentElementName()
-	 */
-	public String getCurrentElementName() {
-		//
-		return selectedComponent.getName();
-	}
-
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getElements()
-	 */
-	public Object[] getElements() {
-		Object model = selectedComponent.getModelObject();
-		if (model != null) {
-			return new Object[]{model};
-		}
-		return new Object[0];
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getIdentifier()
-	 */
-	public String getIdentifier() {
-		return IDENTIFIER;
-	}
-
-	public String getNewElementName() {
-		return newName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getProcessorName()
-	 */
-	public String getProcessorName() {
-		return RefactoringMessages.getFormattedString("RenameComponentRefactoring.name", //$NON-NLS-1$
-					new String[]{selectedComponent.getNamespaceURI() + ":" + selectedComponent.getName(), newName});
-
-	}
-
-
-	public boolean getUpdateReferences() {
-		return updateReferences;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#isApplicable()
-	 */
-	public boolean isApplicable() throws CoreException {
-		if (selectedComponent == null)
-			return false;
-		// TODO implement isApplicable logic for the named component,
-		// verify how it is different from other condition checks
-		// if (fNamedComponent.isAnonymous())
-		// return false;
-		// if (! Checks.isAvailable(fType))
-		// return false;
-		// if (isSpecialCase(fType))
-		// return false;
-		return true;
-	}
-
-	protected void loadDerivedParticipants(RefactoringStatus status, List result, Object[] derivedElements, ComponentRenameArguments arguments, String[] natures, SharableParticipants shared) throws CoreException {
-		if (derivedElements != null) {
-			for (int i = 0; i < derivedElements.length; i++) {
-				RenameParticipant[] participants = ParticipantManager.loadRenameParticipants(status, this, derivedElements[i], arguments, natures, shared);
-				result.addAll(Arrays.asList(participants));
-			}
-		}
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xsd.internal.refactoring.rename.XSDRenameProcessor#loadDerivedParticipants(org.eclipse.ltk.core.refactoring.RefactoringStatus,
-	 *      java.util.List, java.lang.String[],
-	 *      org.eclipse.ltk.core.refactoring.participants.SharableParticipants)
-	 */
-	protected void loadDerivedParticipants(RefactoringStatus status, List result, String[] natures, SharableParticipants shared) throws CoreException {
-		ComponentRenameArguments arguments = new ComponentRenameArguments(getNewElementName(), getUpdateReferences());
-		arguments.setMatches(references);
-		arguments.setQualifier(selectedComponent.getNamespaceURI());
-		// pass in changeManger to the participants so that it can collect all
-		// changes/per files
-		arguments.setChangeManager(getChangeManager());
-		loadDerivedParticipants(status, result, computeDerivedElements(), arguments, natures, shared);
-	}
-
-	protected void loadElementParticipants(RefactoringStatus status, List result, RenameArguments arguments, String[] natures, SharableParticipants shared) throws CoreException {
-		Object[] elements = new Object[0];// getElements();
-		for (int i = 0; i < elements.length; i++) {
-			result.addAll(Arrays.asList(ParticipantManager.loadRenameParticipants(status, this, elements[i], arguments, natures, shared)));
-		}
-	}
-
-
-	public final RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants sharedParticipants) throws CoreException {
-		RenameArguments arguments = new RenameArguments(getNewElementName(), getUpdateReferences());
-		String[] natures = getAffectedProjectNatures();
-		List result = new ArrayList();
-		loadElementParticipants(status, result, arguments, natures, sharedParticipants);
-		loadDerivedParticipants(status, result, natures, sharedParticipants);
-		for (Iterator i = result.iterator(); i.hasNext();) {
-			Object o = i.next();
-			if (o instanceof XMLComponentRenameParticipant) {
-				XMLComponentRenameParticipant p = (XMLComponentRenameParticipant) o;
-				// getChangeManager()
-				p.setChangeManager(getChangeManager());
-			}
-		}
-
-		return (RefactoringParticipant[]) result.toArray(new RefactoringParticipant[result.size()]);
-	}
-
-	public void setNewElementName(String newName) {
-		Assert.isNotNull(newName);
-		this.newName = newName;
-	}
-
-	public void setUpdateReferences(boolean update) {
-		updateReferences = update;
-
-	}
-
-	public Change postCreateChange(Change[] participantChanges, IProgressMonitor pm) throws CoreException, OperationCanceledException {
-		Assert.isNotNull(pm);
-		try {
-			String changeName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_updates");
-			TextChange[] changes = changeManager.getAllChanges();
-//			Comparator c = new Comparator() {
-//				public int compare(Object o1, Object o2) {
-//					TextFileChange c1 = (TextFileChange) o1;
-//					TextFileChange c2 = (TextFileChange) o2;
-//					return Collator.getInstance().compare(c1.getFile().getFullPath(), c2.getFile().getFullPath());
-//				}
-//			};
-			if (changes.length > 0) {
-				// Arrays.sort(changes, c);
-				CompositeChange compositeChange = new CompositeChange("!" + changeName, changes);
-				compositeChange.markAsSynthetic();
-				return compositeChange;
-			}
-			else {
-				return null;
-			}
-
-		}
-		finally {
-			pm.done();
-		}
-	}
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameResourceProcessor.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameResourceProcessor.java
deleted file mode 100644
index e817083..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameResourceProcessor.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package  org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ParticipantManager;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
-import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
-import org.eclipse.wst.xsd.ui.internal.refactor.INameUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-
-public class RenameResourceProcessor extends RenameProcessor implements INameUpdating {
-
-	private IResource fResource;
-	private String fNewElementName;
-		
-	public static final String IDENTIFIER= "org.eclipse.wst.ui.xsd.renameResourceProcessor"; //$NON-NLS-1$
-	
-	public RenameResourceProcessor(IResource resource) {
-		fResource= resource;
-		if (fResource != null) {
-			setNewElementName(fResource.getName());
-		}
-	}
-
-	//---- INameUpdating ---------------------------------------------------
-	
-	public void setNewElementName(String newName) {
-		Assert.isNotNull(newName);
-		fNewElementName= newName;
-	}
-
-	public String getNewElementName() {
-		return fNewElementName;
-	}
-	
-	//---- IRenameProcessor methods ---------------------------------------
-		
-	public String getIdentifier() {
-		return IDENTIFIER;
-	}
-	
-	public boolean isApplicable()  {
-		if (fResource == null)
-			return false;
-		if (! fResource.exists())
-			return false;
-		if (! fResource.isAccessible())	
-			return false;
-		return true;			
-	}
-	
-	public String getProcessorName() {
-		String message= RefactoringMessages.getFormattedString("RenameResourceProcessor.name", //$NON-NLS-1$
-				new String[]{getCurrentElementName(), getNewElementName()});
-		return message;
-	}
-	
-	public Object[] getElements() {
-		return new Object[] {fResource};
-	}
-	
-	public String getCurrentElementName() {
-		return fResource.getName();
-	}
-	
-	public String[] getAffectedProjectNatures() throws CoreException {
-		return new String[0];
-	}
-
-	public Object getNewElement() {
-		
-			
-		return ResourcesPlugin.getWorkspace().getRoot().findMember(createNewPath(getNewElementName()));
-	}
-
-	public boolean getUpdateReferences() {
-		return true;
-	}
-	
-	public RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants shared) throws CoreException {
-		Object[] elements= getElements();
-		String[] natures= getAffectedProjectNatures();
-		List result= new ArrayList();
-		RenameArguments arguments= new RenameArguments(getNewElementName(), getUpdateReferences());
-		for (int i= 0; i < elements.length; i++) {
-			result.addAll(Arrays.asList(ParticipantManager.loadRenameParticipants(status, 
-				this, elements[i],
-				arguments, natures, shared)));
-		}
-		return (RefactoringParticipant[])result.toArray(new RefactoringParticipant[result.size()]);
-	}
-	
-	//--- Condition checking --------------------------------------------
-
-	public RefactoringStatus checkInitialConditions(IProgressMonitor pm) throws CoreException {
-		return new RefactoringStatus();
-	}
-	
-	/* non java-doc
-	 * @see IRenameRefactoring#checkNewName()
-	 */
-	public RefactoringStatus checkNewElementName(String newName)  {
-		Assert.isNotNull(newName, "new name"); //$NON-NLS-1$
-		IContainer c= fResource.getParent();
-		if (c == null)
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("RenameResourceRefactoring.Internal_Error")); //$NON-NLS-1$
-						
-		if (c.findMember(newName) != null)
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("RenameResourceRefactoring.alread_exists")); //$NON-NLS-1$
-			
-		if (!c.getFullPath().isValidSegment(newName))
-			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getString("RenameResourceRefactoring.invalidName")); //$NON-NLS-1$
-	
-		RefactoringStatus result= RefactoringStatus.create(c.getWorkspace().validateName(newName, fResource.getType()));
-		if (! result.hasFatalError())
-			result.merge(RefactoringStatus.create(c.getWorkspace().validatePath(createNewPath(newName), fResource.getType())));		
-		return result;		
-	}
-	
-	/* non java-doc
-	 * @see Refactoring#checkInput(IProgressMonitor)
-	 */
-	public RefactoringStatus checkFinalConditions(IProgressMonitor pm, CheckConditionsContext context)  {
-		pm.beginTask("", 1); //$NON-NLS-1$
-		try{
-			return new RefactoringStatus();
-		} finally{
-			pm.done();
-		}	
-	}
-
-	private String createNewPath(String newName){
-		return fResource.getFullPath().removeLastSegments(1).append(newName).toString();
-	}
-		
-	//--- changes 
-	
-	/* non java-doc 
-	 * @see IRefactoring#createChange(IProgressMonitor)
-	 */
-	public Change createChange(IProgressMonitor pm) {
-		pm.beginTask("", 1); //$NON-NLS-1$
-		try{
-			return new ResourceRenameChange(fResource, getNewElementName());
-		} finally{
-			pm.done();
-		}	
-	}
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameTargetNamespaceProcessor.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameTargetNamespaceProcessor.java
deleted file mode 100644
index 4cd3c85..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/RenameTargetNamespaceProcessor.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ParticipantManager;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
-import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
-import org.eclipse.wst.xsd.ui.internal.refactor.INameUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.IReferenceUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringComponent;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
-import org.eclipse.xsd.XSDSchema;
-
-
-public class RenameTargetNamespaceProcessor extends RenameProcessor implements INameUpdating, IReferenceUpdating
-{
-	private String newNamespace;
-	private boolean updateReferences = true;
-	private TextChangeManager changeManager;
-	private XSDSchema model;
-
-
-	public static final String IDENTIFIER = "org.eclipse.wst.ui.xsd.renameComponentProcessor"; //$NON-NLS-1$
-
-	public RenameTargetNamespaceProcessor(XSDSchema model, String newName)
-	{
-		this.model = model;
-		this.newNamespace = newName;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating#canEnableTextUpdating()
-	 */
-	public boolean canEnableTextUpdating()
-	{
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating#getCurrentElementName()
-	 */
-	public String getCurrentElementName()
-	{
-		//
-		return model.getTargetNamespace();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xsd.internal.refactoring.rename.XSDRenameProcessor#getAffectedProjectNatures()
-	 */
-	protected String[] getAffectedProjectNatures() throws CoreException
-	{
-		// TODO: find project natures of the files that are going to be
-		// refactored
-		return new String[]{"org.eclipse.jdt.core.javanature"};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xsd.internal.refactoring.rename.XSDRenameProcessor#loadDerivedParticipants(org.eclipse.ltk.core.refactoring.RefactoringStatus,
-	 *      java.util.List, java.lang.String[],
-	 *      org.eclipse.ltk.core.refactoring.participants.SharableParticipants)
-	 */
-	protected void loadDerivedParticipants(RefactoringStatus status,
-			List result, String[] natures, SharableParticipants shared)
-			throws CoreException
-	{
-		String newCUName= getNewElementName(); //$NON-NLS-1$
-		RenameArguments arguments= new RenameArguments(newCUName, getUpdateReferences());
-		loadDerivedParticipants(status, result, 
-			computeDerivedElements(), arguments, 
-			 natures, shared);
-	}
-	
-	protected void loadDerivedParticipants(RefactoringStatus status, List result, Object[] derivedElements, 
-			RenameArguments arguments,  String[] natures, SharableParticipants shared) throws CoreException {
-		if (derivedElements != null) {
-			for (int i= 0; i < derivedElements.length; i++) {
-				RenameParticipant[] participants= ParticipantManager.loadRenameParticipants(status, 
-					this, derivedElements[i], 
-					arguments, natures, shared);
-				result.addAll(Arrays.asList(participants));
-			}
-		}
-		
-	}
-	
-	private Object[] computeDerivedElements() {
-
-		Object[] elements = getElements();
-		Object[] results = new Object[elements.length];
-		for(int i=0; i< elements.length; i++){
-			RefactoringComponent component = (RefactoringComponent)elements[i];
-			results[i] = component.getModelObject();
-			
-		}
-		return results;
-		
-	}
-	
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor,
-	 *      org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	public RefactoringStatus checkFinalConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws CoreException,
-			OperationCanceledException
-	{
-		try
-		{
-			RefactoringStatus result = new RefactoringStatus();
-			pm.beginTask("", 9); //$NON-NLS-1$
-			changeManager = createChangeManager(new SubProgressMonitor(pm, 1),
-					result);
-			return result;
-		} finally
-		{
-			pm.done();
-		}
-		
-
-	}
-
-	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
-			throws CoreException, OperationCanceledException
-	{
-		// TODO add code to check initial conditions for component rename
-		return new RefactoringStatus();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException
-	{
-		try
-		{
-			String changeName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_updates");
-			return new CompositeChange(changeName, changeManager.getAllChanges());
-		} finally
-		{
-			pm.done();
-		}
-
-		// Change[] changes = ComponentRenameChange.createChangesFor(
-		// this.fNamedComponent, getNewElementName());
-		//
-		// if (changes.length > 0)
-		// {
-		// CompositeChange multiChange = null;
-		// multiChange = new CompositeChange(
-		// "XSD component rename participant changes", changes); //$NON-NLS-1$
-		// TODO: externalize string
-		// return multiChange;
-		// } else
-		// {
-		//
-		// return new ComponentRenameChange(
-		// fNamedComponent,
-		// fNamedComponent.getName(),
-		// getNewElementName(),
-		// fNamedComponent.getSchema());
-		// }
-		
-		
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getElements()
-	 */
-	public Object[] getElements()
-	{
-		return new Object[] { model };
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getIdentifier()
-	 */
-	public String getIdentifier()
-	{
-		return IDENTIFIER;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getProcessorName()
-	 */
-	public String getProcessorName()
-	{
-		return RefactoringMessages.getFormattedString(
-				"RenameComponentRefactoring.name", //$NON-NLS-1$
-				new String[]
-				{
-						getCurrentElementName(),
-						getNewElementName() });
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#isApplicable()
-	 */
-	public boolean isApplicable() throws CoreException
-	{
-		if (getModel() == null)
-			return false;
-		// TODO implement isApplicable logic for the named component,
-		// verify how it is different from other condition checks
-		// if (fNamedComponent.isAnonymous())
-		// return false;
-		// if (! Checks.isAvailable(fType))
-		// return false;
-		// if (isSpecialCase(fType))
-		// return false;
-		return true;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.INameUpdating#checkNewElementName(java.lang.String)
-	 */
-	public RefactoringStatus checkNewElementName(String newName)
-	{
-		Assert.isNotNull(newName, "new name"); //$NON-NLS-1$
-		// TODO: implement new name checking
-		// RefactoringStatus result = Checks.checkTypeName(newName);
-		// if (Checks.isAlreadyNamed(fType, newName))
-		// result.addFatalError(RefactoringCoreMessages.getString("RenameTypeRefactoring.choose_another_name"));
-		// //$NON-NLS-1$
-		return new RefactoringStatus();
-	}
-
-	public final RefactoringParticipant[] loadParticipants(
-			RefactoringStatus status, SharableParticipants sharedParticipants)
-			throws CoreException
-	{
-		RenameArguments arguments = new RenameArguments(getNewElementName(),
-				true);
-		String[] natures = getAffectedProjectNatures();
-		List result = new ArrayList();
-		loadElementParticipants(status, result, arguments, natures,
-				sharedParticipants);
-		loadDerivedParticipants(status, result, natures, sharedParticipants);
-		return (RefactoringParticipant[]) result
-				.toArray(new RefactoringParticipant[result.size()]);
-	}
-
-	protected void loadElementParticipants(RefactoringStatus status,
-			List result, RenameArguments arguments, String[] natures,
-			SharableParticipants shared) throws CoreException
-	{
-		Object[] elements = getElements();
-		for (int i = 0; i < elements.length; i++)
-		{
-			result.addAll(Arrays.asList(ParticipantManager
-					.loadRenameParticipants(status, this, elements[i],
-							arguments, natures, shared)));
-		}
-	}
-	
-	private TextChangeManager createChangeManager(IProgressMonitor pm,
-			RefactoringStatus status) throws CoreException
-	{
-		TextChangeManager manager = new TextChangeManager(false);
-		// only one declaration gets updated
-		addDeclarationUpdate(manager);
-		return manager;
-	}
-
-	private void addDeclarationUpdate(TextChangeManager manager)
-
-	{
-		String fileStr = getModel().getSchemaLocation();
-		URI uri = URI.createPlatformResourceURI(fileStr);
-		try
-		{
-			URL url = new URL(uri.toString());
-			url = Platform.resolve(url);
-			if(url != null){
-				IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
-				IFile file = root.getFileForLocation(new Path(url.getFile()));
-				if(file != null ){
-					TextChange change = manager.get(file);
-					addDeclarationUpdate(change);
-				}
-			}
-		} catch (MalformedURLException e)
-		{
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		} catch (IOException e)
-		{
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		
-		
-	}
-	
-	
-
-	final void addDeclarationUpdate(TextChange change) 
-	{
-//		String editName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_update_declatation");;
-//	  
-//		NamedComponentRenamer renamer = new NamedComponentRenamer(
-//				selectedComponent.getElement(), newNamespace);
-//		renamer.renameComponent();
-//		List textEdits = renamer.getTextEdits();
-//		for (int j = 0; j < textEdits.size(); j++)
-//		{
-//			ReplaceEdit replaceEdit = (ReplaceEdit) textEdits
-//					.get(j);
-//			TextChangeCompatibility.addTextEdit(change,
-//					editName, replaceEdit);
-//		}
-	}
-
-	public void setNewElementName(String newName)
-	{
-		this.newNamespace = newName;
-	}
-
-	public String getNewElementName()
-	{
-		return newNamespace;
-	}
-
-	
-
-	public boolean canEnableUpdateReferences()
-	{
-		return true;
-	}
-
-	public boolean getUpdateReferences()
-	{
-		return updateReferences;
-	}
-
-	public void setUpdateReferences(boolean update)
-	{
-		updateReferences = update;
-		
-	}
-
-	public final TextChangeManager getChangeManager()
-	{
-		return changeManager;
-	}
-
-	public final XSDSchema getModel()
-	{
-		return model;
-	}
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameChange.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameChange.java
deleted file mode 100644
index e213e2a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameChange.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-
-/**
- * Represents a change that renames a given resource
- */
-public class ResourceRenameChange extends Change {
-
-	/*
-	 * we cannot use handles because they became invalid when you rename the resource.
-	 * paths do not.
-	 */
-	private IPath fResourcePath;
-
-	private String fNewName;
-
-	/**
-	 * @param newName includes the extension
-	 */
-	public ResourceRenameChange(IResource resource, String newName) {
-		this(resource.getFullPath(), newName);
-	}
-
-	private ResourceRenameChange(IPath resourcePath, String newName) {
-		fResourcePath= resourcePath;
-		fNewName= newName;
-	}
-
-	private IResource getResource() {
-		return ResourcesPlugin.getWorkspace().getRoot().findMember(fResourcePath);
-	}
-
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException {
-		
-		// TODO: implement file validation, see JDTChange
-		return new RefactoringStatus();
-	}
-	
-	/*
-	 * to avoid the exception senders should check if a resource with the new name
-	 * already exists
-	 */
-	public Change perform(IProgressMonitor pm) throws CoreException {
-		try {
-			pm.beginTask(RefactoringMessages.getString("XSDRenameResourceChange.rename_resource"), 1); //$NON-NLS-1$
-
-			getResource().move(renamedResourcePath(fResourcePath, fNewName), getCoreRenameFlags(), pm);
-
-			String oldName= fResourcePath.lastSegment();
-			IPath newPath= renamedResourcePath(fResourcePath, fNewName);
-			return new ResourceRenameChange(newPath, oldName);
-		} finally {
-			pm.done();
-		}
-	}
-
-	private int getCoreRenameFlags() {
-		if (getResource().isLinked())
-			return IResource.SHALLOW;
-		else
-			return IResource.NONE;
-	}
-
-	/*
-	 * changes resource names /s/p/A.java renamed to B.java becomes /s/p/B.java
-	 */
-	public static IPath renamedResourcePath(IPath path, String newName) {
-		return path.removeLastSegments(1).append(newName);
-	}
-
-	public String getName() {
-		return RefactoringMessages.getFormattedString(
-			"XSDRenameResourceChange.name", new String[]{fResourcePath.toString(), //$NON-NLS-1$
-			renamedResourcePath(fResourcePath, fNewName).toString()});
-	}
-
-	public Object getModifiedElement() {
-		return getResource();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.Change#initializeValidationData(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		// TODO Auto-generated method stub
-
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java
deleted file mode 100644
index ec2bf8e..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/ResourceRenameParticipant.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.IContentType;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.CompositeChange;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSchema;
-
-/**
- * This rename participant creates text changes for the references of the XSD and WSDL files
- */
-public class ResourceRenameParticipant extends RenameParticipant {
-	
-//	private IFile file = null;
-	private TextChangeManager changeManager;
-
-	
-	private static String XSD_CONTENT_TYPE_ID = "org.eclipse.wst.xsd.core.xsdsource";
-	private static String WSDL_CONTENT_TYPE_ID = "org.eclipse.wst.wsdl.wsdlsource";
-
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#initialize(java.lang.Object)
-	 */
-	protected boolean initialize(Object element) {
-		if(element instanceof IFile) {
-			// check if file has XSD or WSDL content
-			IFile aFile = (IFile) element;
-			try {
-				IContentDescription description = aFile.getContentDescription();
-				if ( description == null )
-  				return false;
-				IContentType contentType = description.getContentType();
-				if(contentType != null){
-					if(XSD_CONTENT_TYPE_ID.equals(contentType.getId()) ||
-							WSDL_CONTENT_TYPE_ID.equals(contentType.getId())){
-//						file = aFile;
-						return true;
-					}
-				}
-			} catch (CoreException e) {
-				return false;
-			}
-		}
-		return false;
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant#getName()
-	 */
-	public String getName() {
-		return RefactoringMessages.getString("ResourceRenameParticipant.compositeChangeName");
-	}
-	
-//	private IPath getNewFilePath() {
-//		
-//		IPath oldPath = file.getRawLocation();
-//		IPath newPath = oldPath.removeLastSegments(1).append(getArguments().getNewName());
-//		return newPath;
-//	}
-
-	public RefactoringStatus checkConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws OperationCanceledException
-	{
-		RefactoringStatus result = new RefactoringStatus();
-		try
-		{
-			pm.beginTask("", 9); //$NON-NLS-1$
-			changeManager = createChangeManager(new SubProgressMonitor(pm, 1),
-					result);
-			
-		} catch(CoreException e){
-			result.addFatalError(e.toString());
-		}
-		finally
-		{
-			pm.done();
-		}
-		return result;
-
-	}
-	
-	
-
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException
-	{
-		try
-		{
-			String changeName = RefactoringMessages.getString("RenameResourceChange.rename_resource_reference_change");
-			TextChange[] changes =  changeManager.getAllChanges();
-			if(changes.length > 0){
-				return new CompositeChange(changeName, changes);
-			}
-			else{
-				return null;
-			}
-			
-		} finally
-		{
-			pm.done();
-		}
-
-	}
-	
-	
-	private TextChangeManager createChangeManager(IProgressMonitor pm,
-			RefactoringStatus status) throws CoreException
-	{
-		TextChangeManager manager = new TextChangeManager(false);
-		// only one declaration gets updated
-		//addDeclarationUpdate(manager);
-		if (getArguments().getUpdateReferences())
-			addOccurrences(manager, pm, status);
-		return manager;
-	}
-
-
-
-	void addOccurrences(TextChangeManager manager, IProgressMonitor pm,
-			RefactoringStatus status) throws CoreException
-	{
-//		
-//		Object[] occurrences = SearchTools.getFileDependencies(file);
-//		pm.beginTask("", occurrences.length); //$NON-NLS-1$
-//		
-//		for (int i = 0; i < occurrences.length; i++)
-//		{
-//			Object object = occurrences[i];
-//
-//			if (object instanceof SearchResultGroup)
-//			{
-//				SearchResultGroup searchResult = (SearchResultGroup) object;
-//				if (searchResult == null)
-//					continue;
-//				
-//				IFile referencingFile = (IFile)searchResult.getResource();
-//					
-//				resourceSet = new ResourceSetImpl();
-//				// for each result file create XSD model and get component from that model
-//				resourceSet.getAdapterFactories().add(
-//						new XSDSchemaLocationResolverAdapterFactory());
-//				URI uri = URI.createFileURI(referencingFile.getLocation().toPortableString());
-//				try
-//				{
-//					XSDSchema schema = XSDFactory.eINSTANCE.createXSDSchema();
-//					IStructuredModel structuredModel = StructuredModelManager.getModelManager().getModelForRead(referencingFile);
-//					IDOMModel domModel = (IDOMModel) structuredModel;
-//					Resource resource = new XSDResourceImpl();
-//					resource.setURI(uri);
-//					schema = XSDFactory.eINSTANCE.createXSDSchema();
-//					resource.getContents().add(schema);
-//					resourceSet.getResources().add(resource);
-//					schema.setElement(domModel.getDocument().getDocumentElement());
-//					// get target namespace 
-//					String stringPath = file.getLocation().toString();
-//					String targetNamespace = XMLQuickScan.getTargetNamespace(stringPath);
-//					targetNamespace = targetNamespace == null ? "" : targetNamespace;
-//
-//					List textEdits = new ArrayList();
-//					SearchMatch[] matches = searchResult.getSearchResults();
-//					
-//					for (int j = 0; j < matches.length; j++) {
-//						SearchMatch match = matches[j];
-//						
-//						FileReferenceRenamer renamer = new FileReferenceRenamer(
-//								match.getAttrValue(), targetNamespace, getNewFilePath().toString(), schema);
-//						renamer.visitSchema(schema);
-//					    textEdits.addAll(renamer.getTextEdits());
-//					}
-//					
-//					
-//					if(!textEdits.isEmpty()){
-//						TextChange textChange = manager.get(referencingFile);
-//						for (int j = 0; j < textEdits.size(); j++)
-//						{
-//							ReplaceEdit replaceEdit = (ReplaceEdit) textEdits
-//									.get(j);
-//							String editName = RefactoringMessages.getString("ResourceRenameParticipant.File_Rename_update_reference");
-//							TextChangeCompatibility.addTextEdit(textChange,
-//									editName, replaceEdit);
-//						}
-//					}
-//					
-//				} catch (Exception e)
-//				{
-//					e.printStackTrace();
-//				} finally
-//				{
-//
-//				}
-//			}
-//		}
-	}
-	
-	
-	public  class ReferenceLocationFinder
-	{
-		protected XSDNamedComponent component;
-		protected String name;
-		protected XSDSchema referencingSchema;
-		protected List results = new ArrayList();
-
-		public ReferenceLocationFinder(XSDNamedComponent component,
-				String name, XSDSchema referencingSchema)
-		{
-			this.component = component;
-			this.name = name;
-			this.referencingSchema = referencingSchema;
-		}
-
-		public void run()
-		{
-			
-			//XSDSwitch xsdSwitch = new XSDSwitch()
-//			{
-//				public Object caseXSDTypeDefinition(XSDTypeDefinition object)
-//				{
-//					GlobalTypeReferenceRenamer renamer = new GlobalTypeReferenceRenamer(
-//							object.getName(), object.getTargetNamespace(), name, referencingSchema);
-//					renamer.visitSchema(referencingSchema);
-//					results.addAll(renamer.getTextEdits());
-//					return null;
-//				}
-//
-//				public Object caseXSDElementDeclaration(
-//						XSDElementDeclaration object)
-//				{
-//					if (object.isGlobal())
-//					{
-//						GlobalElementRenamer renamer = new GlobalElementRenamer(
-//								object.getName(), object.getTargetNamespace(), name, referencingSchema);
-//						renamer.visitSchema(referencingSchema);
-//						results.addAll(renamer.getTextEdits());
-//					}
-//					return null;
-//				}
-//
-//				public Object caseXSDModelGroupDefinition(
-//						XSDModelGroupDefinition object)
-//				{
-//					GlobalGroupRenamer renamer = new GlobalGroupRenamer(
-//							object.getName(), object.getTargetNamespace(), name, referencingSchema);
-//					renamer.visitSchema(referencingSchema);
-//					return null;
-//				}
-//			};
-			//xsdSwitch.doSwitch(component);
-//			component.setName(name);
-//			try
-//			{
-//				referencingSchema.eResource().save(new HashMap());
-//			} catch (IOException e)
-//			{
-//				e.printStackTrace();
-//			}
-
-		}
-
-		public final List getResults()
-		{
-			return results;
-		}
-	}
-	
-	
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/SortingSearchRequestor.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/SortingSearchRequestor.java
deleted file mode 100644
index d140a8c..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/SortingSearchRequestor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.common.core.search.SearchMatch;
-import org.eclipse.wst.common.core.search.SearchRequestor;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-public class SortingSearchRequestor extends SearchRequestor {
-	
-	public static String NONAMESPACE = "nonamespace";
-
-	
-		private Map fFound;
-
-		public SortingSearchRequestor() {
-			fFound= new HashMap();
-		}
-		
-
-		
-		/**
-		 * @return a List of {@link SearchMatch}es (sorted by namespace)
-		 */
-		public Map/* namespace - <SearchMatch>*/ getResults() {
-			return fFound;
-		}
-
-
-
-		/* (non-Javadoc)
-		 * @see org.eclipse.wst.common.core.search.internal.provisional.SearchRequestor#acceptSearchMatch(org.eclipse.wst.common.search.internal.provisional.SearchMatch)
-		 */
-		public void acceptSearchMatch(SearchMatch match) throws CoreException {
-
-			
-			if(match != null && match.getObject() instanceof Node){
-				Node node = (Node)match.getObject();
-				Element domElement = null;
-				switch (node.getNodeType()) {
-				case Node.ATTRIBUTE_NODE:
-					domElement = ((Attr)node).getOwnerElement();
-					break;
-				case Node.ELEMENT_NODE:
-					domElement = ((Element)node);
-					break;
-				default:
-					break;
-				}
-				String namespace = domElement.getNamespaceURI();
-				if(namespace == null || namespace.equals("")){
-					namespace = NONAMESPACE;
-				}
-				List matches = getMatches(namespace);
-				matches.add(match);			
-			}
-			
-		}
-		
-		private List getMatches(String namespace){
-			Object matches = fFound.get(namespace);
-			if(!(matches instanceof List)){
-				matches = new ArrayList();
-				fFound.put(namespace, matches);
-			}
-			return (List)matches;
-			
-		}
-		
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java
deleted file mode 100644
index 4aba320..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XMLComponentRenameParticipant.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import java.util.Iterator;
-import java.util.List;
-
-//import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-//import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.RenameParticipant;
-import org.eclipse.text.edits.ReplaceEdit;
-import org.eclipse.wst.common.core.search.SearchMatch;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMAttr;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.wst.xsd.ui.internal.refactor.TextChangeManager;
-import org.eclipse.wst.xsd.ui.internal.refactor.util.TextChangeCompatibility;
-import org.eclipse.xsd.util.XSDConstants;
-import org.w3c.dom.Node;
-
-public class XMLComponentRenameParticipant extends RenameParticipant {
-	
-	protected SearchMatch match;
-
-	protected TextChangeManager changeManager;
-	protected List matches;
-
-    
-    
-	protected boolean initialize(Object element) {
-		
-		if(getArguments() instanceof ComponentRenameArguments){
-			// changeManger is passed in from the RenameComponentProcessor to collect all the changes
-			changeManager = ((ComponentRenameArguments)getArguments()).getChangeManager();
-		}
-		
-		return false;
-	}
-	
-	public String getName() {
-		return "XML Component Rename Participant";
-	}
-
-	public RefactoringStatus checkConditions(IProgressMonitor monitor,
-			CheckConditionsContext context) throws OperationCanceledException {
-		return null;
-	}
-	
-	public TextChangeManager getChangeManager(){
-		
-		if(changeManager == null){
-				changeManager = new TextChangeManager(false);
-		}
-		return changeManager;
-		
-	}
-	
-//	private RefactoringStatus createRenameChanges(final IProgressMonitor monitor) throws CoreException {
-//		Assert.isNotNull(monitor);
-//		final RefactoringStatus status= new RefactoringStatus();
-//		try {
-//			monitor.beginTask("RefactoringMessages.RenameComponentRefactoring_searching", 1); 
-//			createRenameChanges(new SubProgressMonitor(monitor, 1));
-//			//updateChangeManager(new SubProgressMonitor(monitor, 1), status);
-//		} finally {
-//			monitor.done();
-//		}
-//		return status;
-//	}
-
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException {
-		for (Iterator iter = matches.iterator(); iter.hasNext();) {
-			SearchMatch match = (SearchMatch) iter.next();
-			TextChange textChange = getChangeManager().get(match.getFile());
-			String newName = getArguments().getNewName();
-			String qualifier = "";
-			if(getArguments() instanceof ComponentRenameArguments){
-				qualifier = ((ComponentRenameArguments)getArguments()).getQualifier();
-			}
-			if(match.getObject() instanceof Node){
-				Node node = (Node)match.getObject();
-				if(node instanceof IDOMAttr){
-					IDOMAttr attr = (IDOMAttr)node;
-					IDOMElement element = (IDOMElement)attr.getOwnerElement() ;
-					newName = getNewQName(element, qualifier, newName);
-				}
-				newName = RenameComponentProcessor.quoteString(newName);
-			}
-			
-			ReplaceEdit replaceEdit = new ReplaceEdit(match.getOffset(), match.getLength(), newName );
-			String editName = RefactoringMessages.getString("RenameComponentProcessor.Component_Refactoring_update_reference");
-			TextChangeCompatibility.addTextEdit(textChange, editName, replaceEdit);
-   		}
-		// don't create any change now, all the changes are in changeManger variable and will be combined in RenameComponentProcessor.postCreateChange method
-		return null;
-	}
-	
-	private static String getNewQName(Node node, String targetNamespace, String newName) {
-		StringBuffer sb = new StringBuffer();
-		if (newName != null) {
-			String prefix = XSDConstants.lookupQualifier(node, targetNamespace);
-			if (prefix != null && prefix.length() > 0) {
-				sb.append(prefix);
-				sb.append(":");
-				sb.append(newName);
-			} else {
-				sb.append(newName);
-			}
-		} else {
-			sb.append(newName);
-		}
-
-		return sb.toString();
-	}
-
-  public void setChangeManager(TextChangeManager changeManager)
-  {
-    this.changeManager = changeManager;
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XSDComponentRenameParticipant.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XSDComponentRenameParticipant.java
deleted file mode 100644
index 3d169fd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/rename/XSDComponentRenameParticipant.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.rename;
-
-import java.util.List;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.xsd.XSDNamedComponent;
-
-/**
- * This participant takes case of renaming matches that are XSD components
- */
-public class XSDComponentRenameParticipant extends XMLComponentRenameParticipant {
-
-protected boolean initialize(Object element) {
-		super.initialize(element);
-		if(element instanceof XSDNamedComponent){
-			if(getArguments() instanceof ComponentRenameArguments){
-				matches = (List)((ComponentRenameArguments)getArguments()).getMatches().get(IXSDSearchConstants.XMLSCHEMA_NAMESPACE);
-			}
-			if(matches != null){
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public String getName() {
-		
-		return "XSD component rename participant";
-	}
-
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/AbstractCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/AbstractCommand.java
deleted file mode 100644
index a39ebaf..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/AbstractCommand.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.structure;
-
-import org.eclipse.wst.sse.core.internal.format.IStructuredFormatProcessor;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMModel;
-import org.eclipse.wst.xml.core.internal.provisional.document.IDOMNode;
-import org.eclipse.wst.xml.core.internal.provisional.format.FormatProcessorXML;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.w3c.dom.Element;
-
-public abstract class AbstractCommand 
-{
-  private XSDConcreteComponent parent;
-  private XSDConcreteComponent model;
-
-  protected AbstractCommand(XSDConcreteComponent parent)
-  {
-    this.parent = parent;
-  }
-  
-  public abstract void run();
-
-  protected XSDConcreteComponent getParent()
-  {
-    return parent;
-  }
-  
-  public XSDConcreteComponent getModelObject()
-  {
-    return model;
-  }
-  
-  protected void setModelObject(XSDConcreteComponent model)
-  {
-    this.model = model;
-  }
-  
-  // Establish part-whole relationship
-  protected abstract boolean adopt(XSDConcreteComponent model);
-
-  protected void formatChild(Element child)
-  {
-    if (child instanceof IDOMNode)
-    {
-      IDOMModel model = ((IDOMNode)child).getModel();
-      try
-      {
-        // tell the model that we are about to make a big model change
-        model.aboutToChangeModel();
-        
-        IStructuredFormatProcessor formatProcessor = new FormatProcessorXML();
-        formatProcessor.formatNode(child);
-      }
-      finally
-      {
-        // tell the model that we are done with the big model change
-        model.changedModel(); 
-      }
-    }
-  }
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeAnonymousTypeGlobalCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeAnonymousTypeGlobalCommand.java
deleted file mode 100644
index d9fc1b0..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeAnonymousTypeGlobalCommand.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.structure;
-
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public final class MakeAnonymousTypeGlobalCommand extends AbstractCommand {
-
-	String fNewName;
-
-	public MakeAnonymousTypeGlobalCommand(XSDConcreteComponent element,
-			String newName) {
-		super(element.getContainer());
-		setModelObject(element);
-		fNewName = newName;
-	}
-
-	public void run() {
-		XSDConcreteComponent model = getModelObject();
-		XSDConcreteComponent parent = model.getContainer();
-		XSDTypeDefinition globalTypeDef = null;
-		if (model instanceof XSDComplexTypeDefinition) {
-			if (parent instanceof XSDElementDeclaration) {
-				// clone typedef with it's content and set it global
-				globalTypeDef = (XSDComplexTypeDefinition) model
-						.cloneConcreteComponent(true, false);
-				globalTypeDef.setName(fNewName);
-				parent.getSchema().getContents().add(globalTypeDef);
-				((XSDElementDeclaration) parent)
-						.setTypeDefinition(globalTypeDef);
-			}
-		} else if (model instanceof XSDSimpleTypeDefinition) {
-
-			XSDSimpleTypeDefinition typeDef = (XSDSimpleTypeDefinition) model;
-			if (parent instanceof XSDElementDeclaration) {
-				// clone typedef with it's content and set it global
-				globalTypeDef = (XSDSimpleTypeDefinition) typeDef
-						.cloneConcreteComponent(true, false);
-				globalTypeDef.setName(fNewName);
-				parent.getSchema().getContents().add(globalTypeDef);
-				((XSDElementDeclaration) parent)
-						.setTypeDefinition(globalTypeDef);
-				formatChild(globalTypeDef.getElement());
-
-			} else if (parent instanceof XSDAttributeDeclaration) {
-				// clone typedef with it's content and set it global
-				globalTypeDef = (XSDSimpleTypeDefinition) typeDef
-						.cloneConcreteComponent(true, false);
-				globalTypeDef.setName(fNewName);
-				parent.getSchema().getContents().add(globalTypeDef);
-				((XSDAttributeDeclaration) parent)
-						.setTypeDefinition((XSDSimpleTypeDefinition) globalTypeDef);
-
-			}
-
-		}
-
-		formatChild(globalTypeDef.getElement());
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.wst.xsd.ui.internal.commands.AbstractCommand#adopt(org.eclipse.xsd.XSDConcreteComponent)
-	 */
-	protected boolean adopt(XSDConcreteComponent model) {
-		// TODO Auto-generated method stub
-		return true;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeLocalElementGlobalCommand.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeLocalElementGlobalCommand.java
deleted file mode 100644
index d7eb8a7..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeLocalElementGlobalCommand.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.structure;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.xsd.ui.internal.common.util.XSDCommonUIUtils;
-import org.eclipse.xsd.XSDConcreteComponent;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroup;
-import org.eclipse.xsd.XSDSchema;
-
-
-public final class MakeLocalElementGlobalCommand extends AbstractCommand
-{
-  public MakeLocalElementGlobalCommand(XSDConcreteComponent element)
-  {
-    super(element.getContainer());
-    setModelObject(element);
-  }
-
-  public void run()
-  {
-    if (getModelObject() instanceof XSDElementDeclaration)
-    {
-
-      XSDElementDeclaration localElementDeclaration = (XSDElementDeclaration)getModelObject();
-      XSDConcreteComponent parent = getParent();
-      XSDConcreteComponent container = parent.getContainer();
-
-      // Clone the local element with its content and set it global
-
-      XSDElementDeclaration globalElementDeclaration = (XSDElementDeclaration)localElementDeclaration.cloneConcreteComponent(true, false);
-
-      // The schema may already have a global element declaration with this name. In that case, ensure the name of the newly created
-      // element does not collide with an existing one.
-
-      XSDSchema schema = container.getSchema();
-      String localElementName = localElementDeclaration.getName();
-      XSDElementDeclaration existingGlobalElement = schema.resolveElementDeclaration(localElementName);
-      boolean elementExists = existingGlobalElement != null && existingGlobalElement.getSchema() != null;
-      if (elementExists)
-      {
-        String newElementName = XSDCommonUIUtils.createUniqueElementName(localElementName, schema.getElementDeclarations());
-        globalElementDeclaration.setName(newElementName);
-      }
-
-      EList schemaContents = schema.getContents();
-      schemaContents.add(globalElementDeclaration);
-
-      // Modify the local element to become a reference to the global element.
-
-      localElementDeclaration.setName(null);
-      localElementDeclaration.setTypeDefinition(null);
-      localElementDeclaration.setAnonymousTypeDefinition(null);
-      localElementDeclaration.setResolvedElementDeclaration(globalElementDeclaration);
-      XSDModelGroup modelGroup = (XSDModelGroup)container;
-
-      // Format the markup. 
-
-      formatChild(modelGroup.getElement());
-      formatChild(globalElementDeclaration.getElement());
-    }
-  }
-
-  /* (non-Javadoc)
-   * @see org.eclipse.wst.xsd.ui.internal.commands.AbstractCommand#adopt(org.eclipse.xsd.XSDConcreteComponent)
-   */
-  protected boolean adopt(XSDConcreteComponent model)
-  {
-    return true;
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java
deleted file mode 100644
index 23b1d23..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalChange.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.structure;
-
-import java.util.Map;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.jface.text.Assert;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.ltk.core.refactoring.TextFileChange;
-import org.eclipse.wst.xml.core.internal.document.DocumentImpl;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-/**
- * @author ebelisar
- * 
- */
-public class MakeTypeGlobalChange extends Change {
-
-	private Map fChanges;
-
-	private String fNewName;
-
-	private XSDTypeDefinition fTypeComponent;
-
-	public MakeTypeGlobalChange(XSDTypeDefinition component, 
-			String newName) {
-		Assert.isNotNull(newName, "new name"); //$NON-NLS-1$
-
-		fTypeComponent = component;
-		fNewName = newName;
-	}
-
-	// public static Change[] createChangesFor(XSDNamedComponent component,
-	// String newName) {
-	// // TODO: P1 implement search of XSD files
-	// XSDSearchSupport support = XSDSearchSupport.getInstance();
-	// RefactorSearchRequestor requestor = new
-	// RefactorSearchRequestor(component, newName);
-	// support.searchRunnable(component, IXSDSearchConstants.WORKSPACE_SCOPE,
-	// requestor);
-	//
-	// return requestor.getChanges();
-	//
-	// }
-
-	protected Change createUndoChange() {
-		return new MakeTypeGlobalChange(fTypeComponent, getNewName());
-	}
-
-	protected void doRename(IProgressMonitor pm) throws CoreException {
-		// TODO P1 change temporary rename of XSD model components
-		performModify(getNewName());
-	}
-
-	public void performModify(final String value) {
-//			DelayedRenameRunnable runnable = new DelayedRenameRunnable(
-//					fTypeComponent, value);
-			// TODO: remove Display
-			//Display.getCurrent().asyncExec(runnable);
-	}
-
-	protected static class DelayedRenameRunnable implements Runnable {
-		protected XSDTypeDefinition component;
-
-		protected String name;
-
-		public DelayedRenameRunnable(XSDTypeDefinition component, String name) {
-			this.component = component;
-			this.name = name;
-		}
-
-		public void run() {
-			DocumentImpl doc = (DocumentImpl) component.getElement().getOwnerDocument();
-			doc.getModel().beginRecording(
-							this,
-							RefactoringMessages
-									.getString("_UI_ACTION_MAKE_ANONYMOUS_TYPE_GLOBAL"));
-			MakeAnonymousTypeGlobalCommand command = new MakeAnonymousTypeGlobalCommand(
-					component, name);
-			command.run();
-			doc.getModel().endRecording(this);
-		}
-	}
-
-	public TextChange getChange(IFile file) {
-		TextChange result = (TextChange) fChanges.get(file);
-		if (result == null) {
-			result = new TextFileChange(file.getName(), file);
-			fChanges.put(file, result);
-		}
-		return result;
-	}
-
-	public String getName() {
-		return RefactoringMessages
-				.getFormattedString(
-						"MakeTypeGlobalChange.name", new String[] {getNewName() }); //$NON-NLS-1$
-	}
-
-	public final Change perform(IProgressMonitor pm) throws CoreException {
-		try {
-			pm.beginTask(RefactoringMessages
-					.getString("XSDComponentRenameChange.Renaming"), 1); //$NON-NLS-1$
-			Change result = createUndoChange();
-			doRename(new SubProgressMonitor(pm, 1));
-			return result;
-		} finally {
-			pm.done();
-		}
-	}
-
-	/**
-	 * Gets the newName.
-	 * 
-	 * @return Returns a String
-	 */
-	protected String getNewName() {
-		return fNewName;
-	}
-
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#getModifiedElement()
-	 */
-	public Object getModifiedElement() {
-		// TODO Auto-generated method stub
-		return fTypeComponent;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#initializeValidationData(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public void initializeValidationData(IProgressMonitor pm) {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ltk.core.refactoring.Change#isValid(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RefactoringStatus isValid(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException {
-		// TODO implement change validation
-		return new RefactoringStatus();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalProcessor.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalProcessor.java
deleted file mode 100644
index 0b793f3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/structure/MakeTypeGlobalProcessor.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.structure;
-
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.ltk.core.refactoring.Change;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext;
-import org.eclipse.ltk.core.refactoring.participants.ParticipantManager;
-import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant;
-import org.eclipse.ltk.core.refactoring.participants.RenameArguments;
-import org.eclipse.ltk.core.refactoring.participants.RenameProcessor;
-import org.eclipse.ltk.core.refactoring.participants.SharableParticipants;
-import org.eclipse.wst.xsd.ui.internal.refactor.INameUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-import org.eclipse.xsd.XSDTypeDefinition;
-
-public class MakeTypeGlobalProcessor extends RenameProcessor implements INameUpdating{
-	
-	private XSDTypeDefinition fTypeComponent;
-	private String fNewElementName;
-
-	public static final String IDENTIFIER= "org.eclipse.wst.ui.xsd.makeTypeGlobalProcessor"; //$NON-NLS-1$
-
-	//private QualifiedNameSearchResult fNameSearchResult;
-	
-	public MakeTypeGlobalProcessor(XSDTypeDefinition element, String newName) {
-		fTypeComponent= element;
-		fNewElementName = newName;
-		
-	}
-	
-	public XSDTypeDefinition getTypeComponent() {
-		return fTypeComponent;
-	}
-
-	
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.ITextUpdating#canEnableTextUpdating()
-	 */
-	public boolean canEnableTextUpdating() {
-		return true;
-	}
-
-	protected String[] getAffectedProjectNatures() throws CoreException {
-		//TODO: find project natures of the files that are going to be refactored
-		return new String[0];
-	}
-	
-	protected void loadDerivedParticipants(RefactoringStatus status,
-			List result, String[] natures, SharableParticipants shared)
-			throws CoreException {
-		// TODO: provide a way to load rename participants
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#checkFinalConditions(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext)
-	 */
-	public RefactoringStatus checkFinalConditions(IProgressMonitor pm,
-			CheckConditionsContext context) throws CoreException,
-			OperationCanceledException {
-		// TODO add code to check final conditions for component rename
-		return new RefactoringStatus();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#checkInitialConditions(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public RefactoringStatus checkInitialConditions(IProgressMonitor pm)
-			throws CoreException, OperationCanceledException {
-//		 TODO add code to check initial conditions for component rename
-		return new RefactoringStatus();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#createChange(org.eclipse.core.runtime.IProgressMonitor)
-	 */
-	public Change createChange(IProgressMonitor pm) throws CoreException,
-			OperationCanceledException {
-		// TODO P1 add change creation
-//		Change[] changes = XSDComponentRenameChange.createChangesFor(this.fNamedComponent, getNewElementName());
-//		CompositeChange multiChange = null; 
-//			if(changes.length > 0)
-//				multiChange  = new CompositeChange("XSD component rename participant changes", changes); //$NON-NLS-1$ TODO: externalize string
-//		return multiChange;
-		
-//		computeNameMatches(pm);	
-//		Change[] changes = fNameSearchResult.getAllChanges();
-//		return new CompositeChange("XSD file rename participant changes", changes); //TODO: externalize string
-		pm.beginTask("", 1); //$NON-NLS-1$
-		try{
-			return new MakeTypeGlobalChange(fTypeComponent, getNewElementName());
-		} finally{
-			pm.done();
-		}	 
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getElements()
-	 */
-	public Object[] getElements() {
-		
-		return new Object[] {fTypeComponent};
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getIdentifier()
-	 */
-	public String getIdentifier() {
-		return IDENTIFIER;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#getProcessorName()
-	 */
-	public String getProcessorName() {
-		return RefactoringMessages.getFormattedString(
-				"MakeLocalTypeGlobalRefactoring.name",  //$NON-NLS-1$
-				new String[]{getNewElementName()});
-
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor#isApplicable()
-	 */
-	public boolean isApplicable() throws CoreException {
-		if (fTypeComponent == null)
-			return false;
-		// TODO implement isApplicable logic for the named component, 
-		// verify how it is different from other condition checks
-//		if (fNamedComponent.isAnonymous())
-//			return false;
-//		if (! Checks.isAvailable(fType))
-//			return false;
-//		if (isSpecialCase(fType))
-//			return false;
-		return true;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.INameUpdating#checkNewElementName(java.lang.String)
-	 */
-	public RefactoringStatus checkNewElementName(String newName){
-		Assert.isNotNull(newName, "new name"); //$NON-NLS-1$
-		// TODO: implement new name checking
-//		RefactoringStatus result = Checks.checkTypeName(newName);
-//		if (Checks.isAlreadyNamed(fType, newName))
-//			result.addFatalError(RefactoringCoreMessages.getString("RenameTypeRefactoring.choose_another_name"));	 //$NON-NLS-1$
-		return new RefactoringStatus();
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jdt.internal.corext.refactoring.tagging.INameUpdating#getNewElement()
-	 */
-	public Object getNewElement() throws CoreException {
-		// TODO implement this method, it's used for updating selection on new element
-		return null;
-	}
-	
-//	private void computeNameMatches(IProgressMonitor pm) throws CoreException {
-//	
-//	    IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
-//	    try {
-//			URL fileURL = Platform.resolve(new URL(fNamedComponent.getSchema().getSchemaLocation()));
-//			IFile file = workspaceRoot.getFileForLocation(new Path(fileURL.getPath()));
-//			if (fNameSearchResult == null)
-//				fNameSearchResult= new QualifiedNameSearchResult();
-//			QualifiedNameFinder.process(fNameSearchResult, getNamedComponent().getName(),  
-//				getNewElementName(), 
-//				"*.xsd", file.getProject(), pm);
-//		} catch (IOException e) {
-//			// TODO Auto-generated catch block
-//			e.printStackTrace();
-//		}
-//	}
-	
-	public final RefactoringParticipant[] loadParticipants(RefactoringStatus status, SharableParticipants sharedParticipants) throws CoreException {
-		RenameArguments arguments= new RenameArguments(getNewElementName(), true);
-		String[] natures= getAffectedProjectNatures();
-		List result= new ArrayList();
-		loadElementParticipants(status, result, arguments, natures, sharedParticipants);
-		loadDerivedParticipants(status, result, natures, sharedParticipants);
-		return (RefactoringParticipant[])result.toArray(new RefactoringParticipant[result.size()]);
-	}
-	
-	protected void loadElementParticipants(RefactoringStatus status, List result, RenameArguments arguments, String[] natures, SharableParticipants shared) throws CoreException {
-		Object[] elements= getElements();
-		for (int i= 0; i < elements.length; i++) {
-			result.addAll(Arrays.asList(ParticipantManager.loadRenameParticipants(status, 
-				this,  elements[i],
-				arguments, natures, shared)));
-		}
-	}
-	
-	
-	public void setNewElementName(String newName) {
-		
-		fNewElementName= newName;
-	}
-
-	public String getNewElementName() {
-		return fNewElementName;
-	}
-
-	public String getCurrentElementName() {
-		// TODO Auto-generated method stub
-		return fNewElementName;
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/util/TextChangeCompatibility.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/util/TextChangeCompatibility.java
deleted file mode 100644
index 04a75e8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/util/TextChangeCompatibility.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.util;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.ltk.core.refactoring.TextChange;
-import org.eclipse.text.edits.MultiTextEdit;
-import org.eclipse.text.edits.TextEdit;
-import org.eclipse.text.edits.TextEditGroup;
-
-/**
- * A utility class to provide compatibility with the old
- * text change API of adding text edits directly and auto
- * inserting them into the tree.
- */
-public class TextChangeCompatibility {
-
-	public static void addTextEdit(TextChange change, String name, TextEdit edit) {
-		Assert.isNotNull(change);
-		Assert.isNotNull(name);
-		Assert.isNotNull(edit);
-		TextEdit root= change.getEdit();
-		if (root == null) {
-			root= new MultiTextEdit();
-			change.setEdit(root);
-		}
-		insert(root, edit);
-		change.addTextEditGroup(new TextEditGroup(name, edit));
-	}
-	
-	public static void addTextEdit(TextChange change, String name, TextEdit[] edits) {
-		Assert.isNotNull(change);
-		Assert.isNotNull(name);
-		Assert.isNotNull(edits);
-		TextEdit root= change.getEdit();
-		if (root == null) {
-			root= new MultiTextEdit();
-			change.setEdit(root);
-		}
-		for (int i= 0; i < edits.length; i++) {
-			insert(root, edits[i]);
-		}
-		change.addTextEditGroup(new TextEditGroup(name, edits));
-	}
-	
-	public static void insert(TextEdit parent, TextEdit edit) {
-		if (!parent.hasChildren()) {
-			parent.addChild(edit);
-			return;
-		}
-		TextEdit[] children= parent.getChildren();
-		// First dive down to find the right parent.
-		for (int i= 0; i < children.length; i++) {
-			TextEdit child= children[i];
-			if (covers(child, edit)) {
-				insert(child, edit);
-				return;
-			}
-		}
-		// We have the right parent. Now check if some of the children have to
-		// be moved under the new edit since it is covering it.
-		for (int i= children.length - 1; i >= 0; i--) {
-			TextEdit child= children[i];
-			if (covers(edit, child)) {
-				parent.removeChild(i);
-				edit.addChild(child);
-			}
-		}
-		parent.addChild(edit);
-	}
-	
-	private static boolean covers(TextEdit thisEdit, TextEdit otherEdit) {
-		if (thisEdit.getLength() == 0)	// an insertion point can't cover anything
-			return false;
-		
-		int thisOffset= thisEdit.getOffset();
-		int thisEnd= thisEdit.getExclusiveEnd();	
-		if (otherEdit.getLength() == 0) {
-			int otherOffset= otherEdit.getOffset();
-			return thisOffset < otherOffset && otherOffset < thisEnd;
-		} else {
-			int otherOffset= otherEdit.getOffset();
-			int otherEnd= otherEdit.getExclusiveEnd();
-			return thisOffset <= otherOffset && otherEnd <= thisEnd;
-		}
-	}		
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorActionGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorActionGroup.java
deleted file mode 100644
index 7318d09..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorActionGroup.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.wizard;
-
-import java.util.Iterator;
-import java.util.List;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.actions.ActionGroup;
-import org.eclipse.wst.xsd.ui.internal.refactor.actions.RenameAction;
-import org.eclipse.wst.xsd.ui.internal.refactor.actions.SelectionDispatchAction;
-
-/**
- * Action group that adds refactor actions (for example 'Rename', 'Move') to a
- * context menu and the global menu bar.
- * 
- */
-public abstract class RefactorActionGroup extends ActionGroup {
-	
-	private static class NoActionAvailable extends Action {
-		public NoActionAvailable() {
-			setEnabled(true);
-			setText(RefactoringWizardMessages.RefactorActionGroup_no_refactoring_available); 
-		}
-	}
-
-	/**
-	 * Pop-up menu: name of group for reorganize actions (value
-	 * <code>"group.reorganize"</code>).
-	 */
-	public static final String GROUP_REORGANIZE = IWorkbenchActionConstants.GROUP_REORGANIZE;
-
-	public static final String MENU_ID = "org.eclipse.wst.xsd.ui.refactoring.menu"; //$NON-NLS-1$
-
-	public static final String RENAME = "org.eclipse.wst.xsd.ui.refactoring.actions.Rename"; //$NON-NLS-1$
-
-
-	protected static void initAction(SelectionDispatchAction action,
-			ISelection selection) {
-
-		Assert.isNotNull(selection);
-		Assert.isNotNull(action);
-		action.update(selection);
-		//provider.addSelectionChangedListener(action);
-	}
-
-	protected List fEditorActions;
-
-	private String fGroupName = GROUP_REORGANIZE;
-	
-	private Action fNoActionAvailable = new NoActionAvailable();
-
-	protected RenameAction fRenameAction;
-
-	protected SelectionDispatchAction fRenameTargetNamespace;
-
-	protected ISelection selection;
-	
-	public RefactorActionGroup(ISelection selection) {
-			this.selection = selection;
-			
-	}
-
-	public int addAction(IAction action) {
-		if (action != null && action.isEnabled()) {
-			fEditorActions.add(action);
-			return 1;
-		}
-		return 0;
-	}
-
-	private void addRefactorSubmenu(IMenuManager menu) {
-
-		IMenuManager refactorSubmenu = new MenuManager(RefactoringWizardMessages.RefactorMenu_label, MENU_ID);
-		refactorSubmenu.addMenuListener(new IMenuListener() {
-				public void menuAboutToShow(IMenuManager manager) {
-					refactorMenuShown(manager);
-				}
-			});
-		refactorSubmenu.add(fNoActionAvailable);
-			if (menu.find(refactorSubmenu.getId()) == null) {
-				if (menu.find(fGroupName) == null) {
-					menu.add(refactorSubmenu);
-				} else {
-					menu.appendToGroup(fGroupName, refactorSubmenu);
-				}
-			}
-	}
-
-	protected void disposeAction(ISelectionChangedListener action,
-			ISelectionProvider provider) {
-		if (action != null)
-			provider.removeSelectionChangedListener(action);
-	}
-
-	/*
-	 * (non-Javadoc) Method declared in ActionGroup
-	 */
-	public void fillActionBars(IActionBars actionBars) {
-		super.fillActionBars(actionBars);
-		actionBars.setGlobalActionHandler(RENAME, fRenameAction);
-		retargetFileMenuActions(actionBars);
-	}
-
-	public void fillActions(List enabledActions) {
-		
-		if(selection != null && fEditorActions != null){
-			for (Iterator iter = fEditorActions.iterator(); iter.hasNext();) {
-				Action action = (Action) iter.next();
-				if (action instanceof SelectionDispatchAction) {
-					SelectionDispatchAction selectionAction = (SelectionDispatchAction) action;
-					selectionAction.update(selection);
-				}
-
-			}
-			for (Iterator iter = fEditorActions.iterator(); iter.hasNext();) {
-				Action action = (Action) iter.next();
-				if (action != null) {
-					enabledActions.add(action);
-				}
-			}
-		}
-		
-	}
-
-	/*
-	 * (non-Javadoc) Method declared in ActionGroup
-	 */
-	public void fillContextMenu(IMenuManager menu) {
-		super.fillContextMenu(menu);
-		addRefactorSubmenu(menu);
-	}
-
-	private int fillRefactorMenu(IMenuManager refactorSubmenu) {
-		int added = 0;
-		refactorSubmenu.add(new Separator(GROUP_REORGANIZE));
-		for (Iterator iter = fEditorActions.iterator(); iter.hasNext();) {
-			Action action = (Action) iter.next();
-			if (action != null && action.isEnabled()) {
-				fEditorActions.add(action);
-				return 1;
-			}
-		}
-		return added;
-	}
-
-	private void refactorMenuHidden(IMenuManager manager) {
-
-		for (Iterator iter = fEditorActions.iterator(); iter.hasNext();) {
-			Action action = (Action) iter.next();
-			if (action instanceof SelectionDispatchAction) {
-				SelectionDispatchAction selectionAction = (SelectionDispatchAction) action;
-				selectionAction.update(selection);
-			}
-
-		}
-	}
-
-	private void refactorMenuShown(final IMenuManager refactorSubmenu) {
-		// we know that we have an MenuManager since we created it in
-		// addRefactorSubmenu.
-		Menu menu = ((MenuManager) refactorSubmenu).getMenu();
-		menu.addMenuListener(new MenuAdapter() {
-			public void menuHidden(MenuEvent e) {
-				refactorMenuHidden(refactorSubmenu);
-			}
-		});
-
-		for (Iterator iter = fEditorActions.iterator(); iter.hasNext();) {
-			Action action = (Action) iter.next();
-			if (action instanceof SelectionDispatchAction) {
-				SelectionDispatchAction selectionAction = (SelectionDispatchAction) action;
-				selectionAction.update(selection);
-			}
-		}
-		refactorSubmenu.removeAll();
-		if (fillRefactorMenu(refactorSubmenu) == 0)
-			refactorSubmenu.add(fNoActionAvailable);
-	}
-
-	/**
-	 * Retargets the File actions with the corresponding refactoring actions.
-	 * 
-	 * @param actionBars
-	 *            the action bar to register the move and rename action with
-	 */
-	public void retargetFileMenuActions(IActionBars actionBars) {
-		actionBars.setGlobalActionHandler(ActionFactory.RENAME.getId(),
-				fRenameAction);
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorGroupActionDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorGroupActionDelegate.java
deleted file mode 100644
index 29c5678..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorGroupActionDelegate.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.wizard;
-
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public abstract class RefactorGroupActionDelegate implements IObjectActionDelegate, IEditorActionDelegate, IMenuCreator {
-
-	protected ISelection fSelection;
-	private IAction fDelegateAction;
-	// whether to re-fill the menu (reset on selection change)
-	private boolean fFillMenu = true;
-	protected IWorkbenchPart workbenchPart; 
-	protected ResourceSet resourceSet = new ResourceSetImpl();
-	
-
-	public RefactorGroupActionDelegate() {
-
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-	 */
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		workbenchPart = targetPart;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#dispose()
-	 */
-	public void dispose() {
-		// nothing to do
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-	 */
-	public Menu getMenu(Control parent) {
-		// never called
-		return null;
-	}
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-	 */
-	public Menu getMenu(Menu parent) {
-		//Create the new menu. The menu will get filled when it is about to be shown. see fillMenu(Menu).
-		Menu menu = new Menu(parent);
-		/**
-		 * Add listener to repopulate the menu each time
-		 * it is shown because MenuManager.update(boolean, boolean) 
-		 * doesn't dispose pulldown ActionContribution items for each popup menu.
-		 */
-		menu.addMenuListener(new MenuAdapter() {
-			public void menuShown(MenuEvent e) {
-				if (fFillMenu) {
-					Menu m = (Menu)e.widget;
-					MenuItem[] items = m.getItems();
-					for (int i=0; i < items.length; i++) {
-						items[i].dispose();
-					}
-					fillMenu(m);
-					fFillMenu = false;
-				}
-			}
-		});
-		return menu;
-	}
-
-	/*
-	 * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-	 */
-	public void run(IAction action) {
-		// Never called because we become a menu.
-	}
-	
-	/*
-	 * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-	 */
-	public void selectionChanged(IAction action, ISelection selection) {
-		fDelegateAction = action;
-		updateWith(selection);
-		
-	}
-
-    public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-		workbenchPart = targetEditor;
-		fDelegateAction = action;
-		if (targetEditor != null && targetEditor.getEditorSite() != null && targetEditor.getEditorSite().getSelectionProvider() != null) {
-			updateWith(targetEditor.getEditorSite().getSelectionProvider().getSelection());
-		}
-		
-	}
-    
-	public void updateWith(ISelection selection) {
-		fSelection = selection;
-		if (fDelegateAction != null) {
-			boolean enable = false;
-			if (selection != null) {
-				if (selection instanceof ITextSelection) {
-					//if (((ITextSelection) selection).getLength() > 0) {
-						enable = true;
-					//}
-				}
-				else if(selection instanceof IStructuredSelection ){
-					enable = !selection.isEmpty();
-				}
-			}
-			// enable action
-			fDelegateAction.setEnabled(enable);
-			
-			// fill submenu
-			fFillMenu = true;
-			fDelegateAction.setMenuCreator(this);
-			
-			
-		}
-		
-	}
-	
-	
-    protected abstract void fillMenu(Menu menu);
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorGroupSubMenu.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorGroupSubMenu.java
deleted file mode 100644
index 77780e1..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactorGroupSubMenu.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.wizard;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.ui.actions.CompoundContributionItem;
-
-public class RefactorGroupSubMenu extends CompoundContributionItem {
-
-	RefactorActionGroup fRefactorMenuGroup;
-	
-
-	public RefactorGroupSubMenu(RefactorActionGroup refactorMenuGroup) {
-		super();
-		fRefactorMenuGroup = refactorMenuGroup;
-	}
-
-	public RefactorGroupSubMenu(String id) {
-		super(id);
-	}
-
-	protected IContributionItem[] getContributionItems() {
-		  ArrayList actionsList = new ArrayList();
-		  ArrayList contribList = new ArrayList();
-		  fRefactorMenuGroup.fillActions(actionsList);
-	         
-	        if (actionsList != null && !actionsList.isEmpty()) {
-	            for (Iterator iter = actionsList.iterator(); iter.hasNext();) {
-	     			IAction action = (IAction) iter.next();
-	     			contribList.add(new ActionContributionItem(action));
-	     		}
-	        } else {
-	            Action dummyAction = new Action(RefactoringWizardMessages.RefactorActionGroup_no_refactoring_available) {
-	                // dummy inner class; no methods
-	            };
-	            dummyAction.setEnabled(false);
-	            contribList.add(new ActionContributionItem(dummyAction));
-	        }
-	        return (IContributionItem[]) contribList.toArray(new IContributionItem[contribList.size()]);
-
-	}
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactoringWizardMessages.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactoringWizardMessages.java
deleted file mode 100644
index 6bac54b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RefactoringWizardMessages.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.wizard;
-
-import org.eclipse.osgi.util.NLS;
-
-public class RefactoringWizardMessages  extends NLS {
-
-	private static final String BUNDLE_NAME= "org.eclipse.wst.xsd.ui.internal.refactor.wizard.messages";//$NON-NLS-1$
-
-	public static String RefactorMenu_label;
-	public static String RefactorActionGroup_no_refactoring_available;
-
-	public static String RenameAction_rename;
-	public static String RenameAction_unavailable;
-	public static String RenameAction_text;
-
-	public static String RenameInputWizardPage_new_name;
-	public static String RenameRefactoringWizard_internal_error;
-	
-	public static String RenameTargetNamespace_text;
-
-	public static String RenameXSDElementAction_exception;
-	public static String RenameXSDElementAction_not_available;
-	public static String RenameXSDElementAction_name;
-
-	public static String RenameSupport_dialog_title;
-	public static String RenameSupport_not_available;
-
-	public static String RenameComponentWizard_defaultPageTitle;
-	public static String RenameComponentWizard_inputPage_description;
-
-	public static String RenameInputWizardPage_update_references;
-	public static String XSDComponentRenameChange_name;
-	public static String XSDComponentRenameChange_Renaming;
-	public static String ResourceRenameParticipant_compositeChangeName;
-	public static String RenameResourceChange_rename_resource_reference_change;
-	public static String XSDRenameResourceChange_name;
-	public static String RenameResourceRefactoring_Internal_Error;
-	public static String RenameResourceRefactoring_alread_exists;
-	public static String RenameResourceRefactoring_invalidName;
-	public static String RenameResourceProcessor_name;
-	public static String MakeAnonymousTypeGlobalAction_text; 
-	public static String MakeLocalElementGlobalAction_text;
-	public static String XSDComponentRenameParticipant_Component_Refactoring_updates;
-	public static String WSDLComponentRenameParticipant_Component_Refactoring_updates;
-	public static String RenameComponentProcessor_Component_Refactoring_updates;
-	public static String RenameComponentProcessor_Component_Refactoring_update_declatation;
-	public static String RenameComponentProcessor_Component_Refactoring_update_reference;
-	public static String XSDComponentRenameParticipant_xsd_component_rename_participant;
-	public static String WSDLComponentRenameParticipant_wsdl_component_rename_participant;
-	public static String ResourceRenameParticipant_File_Rename_update_reference;
-
-
-	private RefactoringWizardMessages() {
-		// Do not instantiate
-	}
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, RefactoringWizardMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java
deleted file mode 100644
index 10bf304..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameInputWizardPage.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.wizard;
-
-
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.ui.refactoring.UserInputWizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorCSHelpIds;
-import org.eclipse.wst.xsd.ui.internal.refactor.IReferenceUpdating;
-import org.eclipse.wst.xsd.ui.internal.refactor.RefactoringMessages;
-
-/**
- * @author ebelisar
- *
- */
-public class RenameInputWizardPage  extends UserInputWizardPage{
-	private String fInitialValue;
-	private Text fTextField;
-	private Button fUpdateReferences;
-	/**
-	 * Creates a new text input page.
-	 * @param isLastUserPage <code>true</code> if this page is the wizard's last
-	 *  user input page. Otherwise <code>false</code>.
-	 */
-	public RenameInputWizardPage(String description, boolean isLastUserPage) {
-		this(description, isLastUserPage, ""); //$NON-NLS-1$
-	}
-	
-	/**
-	 * Creates a new text input page.
-	 * @param isLastUserPage <code>true</code> if this page is the wizard's last
-	 *  user input page. Otherwise <code>false</code>
-	 * @param initialValue the initial value
-	 */
-	public RenameInputWizardPage(String description, boolean isLastUserPage, String initialValue) {
-	    super("RenameInputWizardPage");
-		Assert.isNotNull(initialValue);
-		setDescription(description);
-		fInitialValue= initialValue;
-	}
-	
-	/**
-	 * Returns whether the initial input is valid. Typically it is not, because the 
-	 * user is required to provide some information e.g. a new type name etc.
-	 * 
-	 * @return <code>true</code> iff the input provided at initialization is valid
-	 */
-	protected boolean isInitialInputValid(){
-		return false;
-	}
-	
-	/**
-	 * Returns whether an empty string is a valid input. Typically it is not, because 
-	 * the user is required to provide some information e.g. a new type name etc.
-	 * 
-	 * @return <code>true</code> iff an empty string is valid
-	 */
-	protected boolean isEmptyInputValid(){
-		return false;
-	}
-	
-	/**
-	 * Returns the content of the text input field.
-	 * 
-	 * @return the content of the text input field. Returns <code>null</code> if
-	 * not text input field has been created
-	 */
-	protected String getText() {
-		if (fTextField == null)
-			return null;
-		return fTextField.getText();	
-	}
-	
-	/**
-	 * Sets the new text for the text field. Does nothing if the text field has not been created.
-	 * @param text the new value
-	 */
-	protected void setText(String text) {
-		if (fTextField == null)
-			return;
-		fTextField.setText(text);
-	}
-	
-	/**
-	 * Performs input validation. Returns a <code>RefactoringStatus</code> which
-	 * describes the result of input validation. <code>Null<code> is interpreted
-	 * as no error.
-	 */
-	protected RefactoringStatus validateTextField(String text){
-		return null;
-	}
-	
-	protected Text createTextInputField(Composite parent) {
-		return createTextInputField(parent, SWT.BORDER);
-	}
-	
-	protected Text createTextInputField(Composite parent, int style) {
-		fTextField= new Text(parent, style);
-		fTextField.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				textModified(getText());
-			}
-		});
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(fTextField, XSDEditorCSHelpIds.RENAME_NEW_NAME);
-		fTextField.setText(fInitialValue);
-		return fTextField;
-	}
-	
-	/**
-	 * Checks the page's state and issues a corresponding error message. The page validation
-	 * is computed by calling <code>validatePage</code>.
-	 */
-	protected void textModified(String text) {	
-		if (! isEmptyInputValid() && text.equals("")){ //$NON-NLS-1$
-			setPageComplete(false);
-			setErrorMessage(null);
-			restoreMessage();
-			return;
-		}
-		if ((! isInitialInputValid()) && text.equals(fInitialValue)){
-			setPageComplete(false);
-			setErrorMessage(null);
-			restoreMessage();
-			return;
-		}
-		
-		setPageComplete(validateTextField(text));
-		
-//		 TODO: enable preview in M4
-		getRefactoringWizard().setForcePreviewReview(false);
-		getContainer().updateButtons();
-	
-	}
-	
-	/**
-	 * Subclasses can override if they want to restore the message differently.
-	 * This implementation calls <code>setMessage(null)</code>, which clears the message 
-	 * thus exposing the description.
-	 */
-	protected void restoreMessage(){
-		setMessage(null);
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in IDialogPage
-	 */
-	public void dispose() {
-		fTextField= null;	
-	}
-	
-	/* (non-Javadoc)
-	 * Method declared in WizardPage
-	 */
-	public void setVisible(boolean visible) {
-		if (visible) {
-			textModified(getText());
-		}
-		super.setVisible(visible);
-		if (visible && fTextField != null) {
-			fTextField.setFocus();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
-	 */
-	public void createControl(Composite parent) {
-		Composite superComposite= new Composite(parent, SWT.NONE);
-		setControl(superComposite);
-		initializeDialogUnits(superComposite);
-		
-		superComposite.setLayout(new GridLayout());
-		Composite composite= new Composite(superComposite, SWT.NONE);
-		composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	
-		
-		GridLayout layout= new GridLayout();
-		layout.numColumns= 2;
-		layout.verticalSpacing= 8;
-		composite.setLayout(layout);
-		
-		
-		Label label= new Label(composite, SWT.NONE);
-		label.setText(getLabelText());
-		
-		Text text= createTextInputField(composite);
-		text.selectAll();
-		GridData gd= new GridData(GridData.FILL_HORIZONTAL);
-		gd.widthHint= convertWidthInCharsToPixels(25);
-		text.setLayoutData(gd);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(text, XSDEditorCSHelpIds.RENAME_NEW_NAME);
-    
-		addOptionalUpdateReferencesCheckbox(superComposite);
-		gd= new GridData(GridData.FILL_HORIZONTAL);
-		text.setLayoutData(gd);
-		
-		getRefactoringWizard().setForcePreviewReview(false);
-		
-		Dialog.applyDialogFont(superComposite);
-		//WorkbenchHelp.setHelp(getControl(), fHelpContextID);
-
-	}
-	
-	private static Button createCheckbox(Composite parent, String title, boolean value) {
-		Button checkBox= new Button(parent, SWT.CHECK);
-		checkBox.setText(title);
-		checkBox.setSelection(value);
-		return checkBox;		
-	}
-	
-	private void addOptionalUpdateReferencesCheckbox(Composite result) {
-
-		final IReferenceUpdating ref= (IReferenceUpdating)getRefactoring().getAdapter(IReferenceUpdating.class);
-		if (ref == null || !ref.canEnableUpdateReferences())	
-			return;
-		String title= RefactoringMessages.getString("RenameInputWizardPage.update_references"); //$NON-NLS-1$
-		boolean defaultValue= true; 
-		fUpdateReferences= createCheckbox(result, title, defaultValue);
-    PlatformUI.getWorkbench().getHelpSystem().setHelp(fUpdateReferences, XSDEditorCSHelpIds.RENAME_UPDATE_REFERENCES);
-		ref.setUpdateReferences(fUpdateReferences.getSelection());
-		fUpdateReferences.addSelectionListener(new SelectionAdapter(){
-			public void widgetSelected(SelectionEvent e) {
-    		ref.setUpdateReferences(fUpdateReferences.getSelection());
-			}
-		});				
-		fUpdateReferences.setEnabled(true);		
-	}
-	
-	protected String getLabelText() {
-		return RefactoringMessages.getString("RenameInputWizardPage.new_name"); //$NON-NLS-1$
-	}
-	
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameRefactoringWizard.java b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameRefactoringWizard.java
deleted file mode 100644
index e24977b..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/RenameRefactoringWizard.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.refactor.wizard;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ltk.core.refactoring.Refactoring;
-import org.eclipse.ltk.core.refactoring.RefactoringStatus;
-import org.eclipse.ltk.ui.refactoring.RefactoringWizard;
-import org.eclipse.wst.xsd.ui.internal.refactor.INameUpdating;
-
-public class RenameRefactoringWizard extends RefactoringWizard {
-	
-	private final String fInputPageDescription;
-
-	private final ImageDescriptor fInputPageImageDescriptor;
-	
-	public RenameRefactoringWizard(Refactoring refactoring, String defaultPageTitle, String inputPageDescription, 
-			ImageDescriptor inputPageImageDescriptor) {
-		super(refactoring, DIALOG_BASED_USER_INTERFACE);
-		setDefaultPageTitle(defaultPageTitle);
-    	fInputPageDescription= inputPageDescription;
-		fInputPageImageDescriptor= inputPageImageDescriptor;
-
-	}
-
-	/* non java-doc
-	 * @see RefactoringWizard#addUserInputPages
-	 */ 
-	protected void addUserInputPages() {
-		String initialSetting= getProcessor().getCurrentElementName();
-		RenameInputWizardPage inputPage= createInputPage(fInputPageDescription, initialSetting);
-		inputPage.setImageDescriptor(fInputPageImageDescriptor);
-		addPage(inputPage);
-	}
-
-	protected INameUpdating getProcessor() {
-		
-		return (INameUpdating)getRefactoring().getAdapter(INameUpdating.class);	
-	}
-	
-	
-	protected RenameInputWizardPage createInputPage(String message, String initialSetting) {
-		return new RenameInputWizardPage(message, true, initialSetting) {
-			protected RefactoringStatus validateTextField(String text) {
-				return validateNewName(text);
-			}	
-		};
-	}
-	
-	protected RefactoringStatus validateNewName(String newName) {
-		INameUpdating ref= getProcessor();
-		ref.setNewElementName(newName);
-//		try{
-			return ref.checkNewElementName(newName);
-//		} catch (CoreException e){
-//			//XXX: should log the exception
-//			String msg= e.getMessage() == null ? "": e.getMessage(); //$NON-NLS-1$
-//			return RefactoringStatus.createFatalErrorStatus(RefactoringMessages.getFormattedString("RenameRefactoringWizard.internal_error", msg));//$NON-NLS-1$
-//		}	
-	}
-	
-	
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/messages.properties b/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/messages.properties
deleted file mode 100644
index 246f29f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-refactor/org/eclipse/wst/xsd/ui/internal/refactor/wizard/messages.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-RefactorMenu_label=Refactor
-RefactorActionGroup_no_refactoring_available=<no refactoring available>
-
-RenameAction_rename=Rename
-RenameAction_unavailable=Operation unavailable on the current selection.\nSelect a ....
-RenameAction_text=Re&name...
-
-RenameInputWizardPage_new_name= &New name:
-RenameRefactoringWizard_internal_error= Internal error during name checking: {0}
-
-
-RenameXSDElementAction_exception=Unexpected exception occurred. See log for details
-RenameXSDElementAction_not_available=Operation unavailable on the current selection.\nSelect a XSD project, folder, resource, file, attribute declarations,  attribute group definitions, complex type definitions, element declarations, identity constraint definitions, model groups definitions, notation declarations, or simple type definitions.
-RenameXSDElementAction_name=Rename
-
-
-RenameSupport_dialog_title=Rename
-RenameSupport_not_available=Rename support not available
-
-RenameComponentWizard_defaultPageTitle=Rename wizard
-RenameComponentWizard_inputPage_description=Rename XML Schema component
-
-RenameInputWizardPage_update_references=Update references
-XSDComponentRenameChange_name=XML Schema component renaming in {0}: {1} to {2}
-XSDComponentRenameChange_Renaming=Renaming...
-ResourceRenameParticipant_compositeChangeName=XSD file rename references updating changes
-RenameResourceChange_rename_resource_reference_change=Renaming resource name references
-XSDRenameResourceChange_name=Resource rename: {0} to {1}
-RenameResourceRefactoring_Internal_Error=Internal error
-RenameResourceRefactoring_alread_exists=Resource already exist
-RenameResourceRefactoring_invalidName=Invalid resource name
-RenameResourceProcessor_name=Resource renaming
-MakeAnonymousTypeGlobalAction_text=Make Anonymous Type Global 
-MakeLocalElementGlobalAction_text=Make Local Element Global
-XSDComponentRenameParticipant_Component_Refactoring_updates=XML Schema refactoring changes
-WSDLComponentRenameParticipant_Component_Refactoring_updates=WSDL Schema refactoring changes
-RenameComponentProcessor_Component_Refactoring_updates=Component name refactoring changes
-RenameComponentProcessor_Component_Refactoring_update_declatation=Update component declaration/definition
-RenameComponentProcessor_Component_Refactoring_update_reference=Update component reference
-XSDComponentRenameParticipant_xsd_component_rename_participant=XSD component rename participant
-WSDLComponentRenameParticipant_wsdl_component_rename_participant=WSDL component rename participant
-ResourceRenameParticipant_File_Rename_update_reference=File rename refactoring changes
-
-RenameTargetNamespace_text=Rename Target Namespace
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/IXSDSearchConstants.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/IXSDSearchConstants.java
deleted file mode 100644
index 5c465b3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/IXSDSearchConstants.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search;
-
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-
-public interface IXSDSearchConstants {
-	
-	public static final String XMLSCHEMA_NAMESPACE = "http://www.w3.org/2001/XMLSchema";
-	public static String XSD_CONTENT_TYPE_ID = "org.eclipse.wst.xsd.core.xsdsource";
-
-    public static final QualifiedName   TYPE_META_NAME =  new QualifiedName (XMLSCHEMA_NAMESPACE, "type");
-    public static final QualifiedName   COMPLEX_TYPE_META_NAME =  new QualifiedName (XMLSCHEMA_NAMESPACE, "complexType");
-    public static final QualifiedName   SIMPLE_TYPE_META_NAME =  new QualifiedName (XMLSCHEMA_NAMESPACE, "simpleType");
-    public static final QualifiedName   ELEMENT_META_NAME =  new QualifiedName (XMLSCHEMA_NAMESPACE, "element");
-	public static final QualifiedName   ATTRIBUTE_META_NAME =  new QualifiedName (XMLSCHEMA_NAMESPACE, "attribute");
-	public static final QualifiedName   ATTRIBUTE_GROUP_META_NAME =  new QualifiedName (XMLSCHEMA_NAMESPACE, "attributeGroup");
-	public static final QualifiedName   GROUP_META_NAME =  new QualifiedName (XMLSCHEMA_NAMESPACE, "group");
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/SearchMessages.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/SearchMessages.java
deleted file mode 100644
index a7077a8..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/SearchMessages.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search;
-
-import org.eclipse.osgi.util.NLS;
-
-public final class SearchMessages extends NLS {
-
-	private static final String BUNDLE_NAME= "org.eclipse.wst.common.ui.internal.search.SearchMessages";//$NON-NLS-1$
-
-	private SearchMessages() {
-		// Do not instantiate
-	}
-
-	public static String group_references;
-	public static String Search_FindDeclarationAction_label;
-	public static String Search_FindDeclarationsInProjectAction_label;
-	public static String Search_FindDeclarationsInWorkingSetAction_label;
-
-	static {
-		NLS.initializeMessages(BUNDLE_NAME, SearchMessages.class);
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchContributor.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchContributor.java
deleted file mode 100644
index f589b57..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchContributor.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.xml.core.internal.search.ComponentSearchContributor;
-import org.eclipse.wst.xml.core.internal.search.XMLSearchPattern;
-import org.eclipse.xsd.util.XSDConstants;
-
-public class XSDSearchContributor extends ComponentSearchContributor  {
- 
-	
-	protected void initializeReferences() {
-		references = new HashMap();
-		String ns = IXSDSearchConstants.XMLSCHEMA_NAMESPACE;
-
-		List patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.ELEMENT_ELEMENT_TAG, XSDConstants.REF_ATTRIBUTE));
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.ELEMENT_ELEMENT_TAG, XSDConstants.SUBSTITUTIONGROUP_ATTRIBUTE));
-		references.put(IXSDSearchConstants.ELEMENT_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.RESTRICTION_ELEMENT_TAG, XSDConstants.BASE_ATTRIBUTE));
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.EXTENSION_ELEMENT_TAG, XSDConstants.BASE_ATTRIBUTE));
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.ELEMENT_ELEMENT_TAG, XSDConstants.TYPE_ATTRIBUTE));
-		references.put(IXSDSearchConstants.COMPLEX_TYPE_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.RESTRICTION_ELEMENT_TAG, XSDConstants.BASE_ATTRIBUTE));
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.ELEMENT_ELEMENT_TAG, XSDConstants.TYPE_ATTRIBUTE));
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.ATTRIBUTE_ELEMENT_TAG, XSDConstants.TYPE_ATTRIBUTE));
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.UNION_ELEMENT_TAG, XSDConstants.MEMBERTYPES_ATTRIBUTE));
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.LIST_ELEMENT_TAG, XSDConstants.ITEMTYPE_ATTRIBUTE));
-
-		references.put(IXSDSearchConstants.SIMPLE_TYPE_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.GROUP_ELEMENT_TAG, XSDConstants.REF_ATTRIBUTE));
-		references.put(IXSDSearchConstants.GROUP_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, XSDConstants.REF_ATTRIBUTE));
-		references.put(IXSDSearchConstants.ATTRIBUTE_GROUP_META_NAME, patterns);
-
-		patterns = new ArrayList();
-		patterns.add(new XMLSearchPattern( ns, XSDConstants.ATTRIBUTE_ELEMENT_TAG, XSDConstants.REF_ATTRIBUTE));
-		references.put(IXSDSearchConstants.ATTRIBUTE_META_NAME, patterns);
-	}
-
-	protected void initializeDeclarations(){
-		
-		declarations = new HashMap();
-		String ns = IXSDSearchConstants.XMLSCHEMA_NAMESPACE;
-
-		SearchPattern pattern = new XMLSearchPattern( ns, XSDConstants.SCHEMA_ELEMENT_TAG, XSDConstants.ELEMENT_ELEMENT_TAG, XSDConstants.NAME_ATTRIBUTE);
-		declarations.put(IXSDSearchConstants.ELEMENT_META_NAME, pattern);
-
-		pattern = new XMLSearchPattern(ns, XSDConstants.COMPLEXTYPE_ELEMENT_TAG, XSDConstants.NAME_ATTRIBUTE);
-		declarations.put(IXSDSearchConstants.COMPLEX_TYPE_META_NAME, pattern);
-
-		pattern = new XMLSearchPattern(ns, XSDConstants.SIMPLETYPE_ELEMENT_TAG, XSDConstants.NAME_ATTRIBUTE);
-		declarations.put(IXSDSearchConstants.SIMPLE_TYPE_META_NAME, pattern);
-
-		pattern = new XMLSearchPattern(ns, XSDConstants.ATTRIBUTE_ELEMENT_TAG, XSDConstants.NAME_ATTRIBUTE);
-		declarations.put(IXSDSearchConstants.ATTRIBUTE_META_NAME, pattern);
-
-		pattern = new XMLSearchPattern(ns, XSDConstants.ATTRIBUTEGROUP_ELEMENT_TAG, XSDConstants.NAME_ATTRIBUTE);
-		declarations.put(IXSDSearchConstants.ATTRIBUTE_GROUP_META_NAME, pattern);
-
-		pattern = new XMLSearchPattern(ns, XSDConstants.GROUP_ELEMENT_TAG, XSDConstants.NAME_ATTRIBUTE);
-		declarations.put(IXSDSearchConstants.GROUP_META_NAME, pattern);
-
-	}
-
-	protected void initializeSupportedNamespaces() {
-		namespaces = new String[]{ IXSDSearchConstants.XMLSCHEMA_NAMESPACE};
-	}
-
-
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchParticipant.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchParticipant.java
deleted file mode 100644
index 2051804..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchParticipant.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search;
-
-import java.util.Map;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.xml.core.internal.search.ComponentSearchContributor;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentSearchPattern;
-import org.eclipse.wst.xml.core.internal.search.XMLSearchParticipant;
-
-public class XSDSearchParticipant extends XMLSearchParticipant {
-
-	private static String ID = "org.eclipse.wst.xsd.search.XSDSearchParticipant";
-
-	public XSDSearchParticipant()
-	{
-	  super();
-      id = ID;
-	}	
-	
-	public String[] getSupportedContentTypes()
-	{
-	  String[] result = { "org.eclipse.wst.xsd.core.xsdsource" };
-	  return result;
-	}
-	
-	public boolean isApplicable(SearchPattern pattern, Map searchOptions)
-	{
-		if(pattern instanceof XMLComponentSearchPattern ){
-			XMLComponentSearchPattern componentPattern = (XMLComponentSearchPattern)pattern;
-			String namespace = componentPattern.getMetaName().getNamespace();
-			if(IXSDSearchConstants.XMLSCHEMA_NAMESPACE.equals(namespace)){
-				return true;
-			}
-		}
-		return false;
-	}
-		
-	public ComponentSearchContributor getSearchContributor() {		
-		return new XSDSearchContributor();
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchQuery.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchQuery.java
deleted file mode 100644
index 4dfefbd..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/XSDSearchQuery.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.pattern.SearchPattern;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.ui.internal.search.AbstractSearchQuery;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentDeclarationPattern;
-import org.eclipse.wst.xml.core.internal.search.XMLComponentReferencePattern;
-
-public class XSDSearchQuery extends AbstractSearchQuery
-{   
-  public final static int LIMIT_TO_DECLARATIONS = 1;
-  public final static int LIMIT_TO_REFERENCES   = 2;  
-  
-  int fLimitTo = 0;
-  IFile fContextFile;
-  QualifiedName fElementQName;
-  QualifiedName fTypeName;
-  
-  public XSDSearchQuery(String pattern, IFile file, QualifiedName elementQName, QualifiedName typeName, int limitTo, SearchScope scope, String scopeDescription)
-  {
-    super(pattern, scope, scopeDescription);
-    fLimitTo = limitTo;
-    fContextFile = file;
-    fElementQName = elementQName;
-    fTypeName = typeName;
-  }
-
-  protected SearchPattern createSearchPattern(QualifiedName typeName)
-  {
-    if (fLimitTo == LIMIT_TO_DECLARATIONS)
-    {  
-      return new XMLComponentDeclarationPattern(fContextFile, fElementQName, fTypeName);
-    }  
-    else if (fLimitTo == LIMIT_TO_REFERENCES)
-    {
-      return new XMLComponentReferencePattern(fContextFile, fElementQName, fTypeName);
-    }  
-    return null;
-  }
-}
-
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/BaseGroupActionDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/BaseGroupActionDelegate.java
deleted file mode 100644
index 1ac668f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/BaseGroupActionDelegate.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuCreator;
-import org.eclipse.jface.text.ITextSelection;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.events.MenuAdapter;
-import org.eclipse.swt.events.MenuEvent;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-//TODO (trung) should be in common.ui this one ??
-public abstract class BaseGroupActionDelegate implements IObjectActionDelegate, IEditorActionDelegate, IMenuCreator
-{
-    protected ISelection fSelection;
-    private IAction fDelegateAction;
-    // whether to re-fill the menu (reset on selection change)
-    private boolean fFillMenu = true;
-    protected IWorkbenchPart workbenchPart; 
-    
-
-    public BaseGroupActionDelegate() 
-    {
-
-    }
-    
-    /*
-     * @see org.eclipse.ui.IObjectActionDelegate#setActivePart(org.eclipse.jface.action.IAction, org.eclipse.ui.IWorkbenchPart)
-     */
-    public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-        workbenchPart = targetPart;
-    }
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IMenuCreator#dispose()
-     */
-    public void dispose() {
-        // nothing to do
-    }
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Control)
-     */
-    public Menu getMenu(Control parent) {
-        // never called
-        return null;
-    }
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.action.IMenuCreator#getMenu(org.eclipse.swt.widgets.Menu)
-     */
-    public Menu getMenu(Menu parent) {
-        //Create the new menu. The menu will get filled when it is about to be shown. see fillMenu(Menu).
-        Menu menu = new Menu(parent);
-        /**
-         * Add listener to repopulate the menu each time
-         * it is shown because MenuManager.update(boolean, boolean) 
-         * doesn't dispose pulldown ActionContribution items for each popup menu.
-         */
-        menu.addMenuListener(new MenuAdapter() {
-            public void menuShown(MenuEvent e) {
-                if (fFillMenu) {
-                    Menu m = (Menu)e.widget;
-                    MenuItem[] items = m.getItems();
-                    for (int i=0; i < items.length; i++) {
-                        items[i].dispose();
-                    }
-                    fillMenu(m);
-                    fFillMenu = false;
-                }
-            }
-        });
-        return menu;
-    }
-
-    /*
-     * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
-     */
-    public void run(IAction action) {
-        // Never called because we become a menu.
-    }
-    
-    /*
-     * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
-     */
-    public void selectionChanged(IAction action, ISelection selection) {
-        fDelegateAction = action;
-        updateWith(selection);
-        
-    }
-
-  public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-        workbenchPart = targetEditor;
-        fDelegateAction = action;
-        if (targetEditor != null && targetEditor.getEditorSite() != null && targetEditor.getEditorSite().getSelectionProvider() != null) {
-            updateWith(targetEditor.getEditorSite().getSelectionProvider().getSelection());
-        }
-        
-    }
-  
-    public void updateWith(ISelection selection) {
-        fSelection = selection;
-        if (fDelegateAction != null) {
-            boolean enable = false;
-            if (selection != null) {
-                if (selection instanceof ITextSelection) {
-                    //if (((ITextSelection) selection).getLength() > 0) {
-                        enable = true;
-                    //}
-                }
-                else if(selection instanceof IStructuredSelection ){
-                    enable = !selection.isEmpty();
-                }
-            }
-            // enable action
-            fDelegateAction.setEnabled(enable);
-            
-            // fill submenu
-            fFillMenu = true;
-            fDelegateAction.setMenuCreator(this);
-            
-            
-        }
-        
-    }
-    
-    
-  protected abstract void fillMenu(Menu menu);
-    
-   
-  
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/CompositeActionGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/CompositeActionGroup.java
deleted file mode 100644
index e0f936a..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/CompositeActionGroup.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/
-// TODO... open a bugzilla to get the JDT class moved to non internal platform
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.util.Assert;
-
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.actions.ActionContext;
-import org.eclipse.ui.actions.ActionGroup;
-
-public class CompositeActionGroup extends ActionGroup {
-
-    private ActionGroup[] fGroups;
-    
-    public CompositeActionGroup() {
-    }
-    
-    public CompositeActionGroup(ActionGroup[] groups) {
-        setGroups(groups);
-    }
-
-    protected void setGroups(ActionGroup[] groups) {
-        Assert.isTrue(fGroups == null);
-        Assert.isNotNull(groups);
-        fGroups= groups;        
-    }
-        
-    public ActionGroup get(int index) {
-        if (fGroups == null)
-            return null;
-        return fGroups[index];
-    }
-    
-    public void addGroup(ActionGroup group) {
-        if (fGroups == null) {
-            fGroups= new ActionGroup[] { group };
-        } else {
-            ActionGroup[] newGroups= new ActionGroup[fGroups.length + 1];
-            System.arraycopy(fGroups, 0, newGroups, 0, fGroups.length);
-            newGroups[fGroups.length]= group;
-            fGroups= newGroups;
-        }
-    }
-    
-    public void dispose() {
-        super.dispose();
-        if (fGroups == null)
-            return;
-        for (int i= 0; i < fGroups.length; i++) {
-            fGroups[i].dispose();
-        }
-    }
-
-    public void fillActionBars(IActionBars actionBars) {
-        super.fillActionBars(actionBars);
-        if (fGroups == null)
-            return;
-        for (int i= 0; i < fGroups.length; i++) {
-            fGroups[i].fillActionBars(actionBars);
-        }
-    }
-
-    public void fillContextMenu(IMenuManager menu) {
-        super.fillContextMenu(menu);
-        if (fGroups == null)
-            return;
-        for (int i= 0; i < fGroups.length; i++) {
-            fGroups[i].fillContextMenu(menu);
-        }
-    }
-
-    public void setContext(ActionContext context) {
-        super.setContext(context);
-        if (fGroups == null)
-            return;
-        for (int i= 0; i < fGroups.length; i++) {
-            fGroups[i].setContext(context);
-        }
-    }
-
-    public void updateActionBars() {
-        super.updateActionBars();
-        if (fGroups == null)
-            return;
-        for (int i= 0; i < fGroups.length; i++) {
-            fGroups[i].updateActionBars();
-        }
-    }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/DeclarationsSearchGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/DeclarationsSearchGroup.java
deleted file mode 100644
index 05308e2..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/DeclarationsSearchGroup.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-// TODO.. fill in the content
-public class DeclarationsSearchGroup
-{
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindAction.java
deleted file mode 100644
index ac5a175..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindAction.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.ui.IEditorPart;
-public class FindAction extends Action implements ISelectionChangedListener
-{
-  protected IEditorPart editor;
-
-  protected FindAction(IEditorPart editor)
-  {
-    this.editor = editor;
-  }
-
-  public void selectionChanged(SelectionChangedEvent event)
-  {
-    // TODO Auto-generated method stub
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesAction.java
deleted file mode 100644
index ad53351..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesAction.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.scope.SearchScope;
-import org.eclipse.wst.common.core.search.scope.WorkspaceSearchScope;
-import org.eclipse.wst.xsd.ui.internal.editor.ISelectionMapper;
-import org.eclipse.wst.xsd.ui.internal.search.IXSDSearchConstants;
-import org.eclipse.wst.xsd.ui.internal.search.XSDSearchQuery;
-import org.eclipse.xsd.XSDAttributeDeclaration;
-import org.eclipse.xsd.XSDAttributeGroupDefinition;
-import org.eclipse.xsd.XSDComplexTypeDefinition;
-import org.eclipse.xsd.XSDElementDeclaration;
-import org.eclipse.xsd.XSDModelGroupDefinition;
-import org.eclipse.xsd.XSDNamedComponent;
-import org.eclipse.xsd.XSDSimpleTypeDefinition;
-public class FindReferencesAction extends FindAction
-{
-  public FindReferencesAction(IEditorPart editor)
-  {
-    super(editor);
-  }
-
-  public void setActionDefinitionId(String string)
-  {
-  }
-
-  /**
-   * To be used by subclass in its run() Returns the file where the selection of
-   * a component (from the user) occurs ie. Returns the file that the user is
-   * currently working on.
-   * 
-   * @return The IFile representation of the current working file.
-   */
-  protected IFile getCurrentFile()
-  {
-    if (editor != null)
-    {
-      IEditorInput input = editor.getEditorInput();
-      if (input instanceof IFileEditorInput)
-      {
-        IFileEditorInput fileEditorInput = (IFileEditorInput) input;
-        return fileEditorInput.getFile();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * To be used by subclass in its run().. Determines the metaName of the XSD
-   * component given to this method.
-   * 
-   * @param component
-   *          The component of which we want to determine the name
-   * @return
-   */
-  protected QualifiedName determineMetaName(XSDNamedComponent component)
-  {
-    QualifiedName metaName = null;
-    if (component instanceof XSDComplexTypeDefinition)
-    {
-      metaName = IXSDSearchConstants.COMPLEX_TYPE_META_NAME;
-    }
-    else if (component instanceof XSDSimpleTypeDefinition)
-    {
-      metaName = IXSDSearchConstants.SIMPLE_TYPE_META_NAME;
-    }
-    else if (component instanceof XSDElementDeclaration)
-    {
-      metaName = IXSDSearchConstants.ELEMENT_META_NAME;
-    }
-    else if (component instanceof XSDModelGroupDefinition)
-    {
-      metaName = IXSDSearchConstants.GROUP_META_NAME;
-    }
-    else if (component instanceof XSDAttributeGroupDefinition)
-    {
-      metaName = IXSDSearchConstants.ATTRIBUTE_GROUP_META_NAME;
-    }
-    else if (component instanceof XSDAttributeDeclaration)
-    {
-      metaName = IXSDSearchConstants.ATTRIBUTE_META_NAME;
-    }
-    return metaName;
-  }
-  
-  protected XSDNamedComponent getXSDNamedComponent()
-  {
-    if (editor != null)
-    {
-      ISelectionProvider provider = (ISelectionProvider) editor.getAdapter(ISelectionProvider.class);
-      ISelectionMapper mapper = (ISelectionMapper) editor.getAdapter(ISelectionMapper.class);
-      if (provider != null)
-      {
-        ISelection selection = provider.getSelection();
-        if (mapper != null)
-        {
-          selection = mapper.mapSelection(selection);
-        }
-        if (selection != null && selection instanceof IStructuredSelection)
-        {
-          IStructuredSelection s = (IStructuredSelection) selection;
-          Object o = s.getFirstElement();
-          if (o != null && o instanceof XSDNamedComponent)
-          {
-            return (XSDNamedComponent) o;
-          }
-        }
-      }
-    }
-    // The expected component we get from the editor does not meet
-    // our expectation
-    return null;
-  }  
-
-  public void run()
-  {
-    String pattern = "";
-    XSDNamedComponent component = getXSDNamedComponent();
-    IFile file = getCurrentFile();
-    if (file != null && component != null)
-    {
-      QualifiedName metaName = determineMetaName(component);
-      QualifiedName elementQName = new QualifiedName(component.getTargetNamespace(), component.getName());
-      SearchScope scope = new WorkspaceSearchScope();
-      String scopeDescription = "Workspace";
-      XSDSearchQuery searchQuery = new XSDSearchQuery(pattern, file, elementQName, metaName, XSDSearchQuery.LIMIT_TO_REFERENCES, scope, scopeDescription);
-      NewSearchUI.activateSearchResultView();
-      NewSearchUI.runQueryInBackground(searchQuery);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
deleted file mode 100644
index c94f256..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInProjectAction.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.scope.ProjectSearchScope;
-import org.eclipse.wst.xsd.ui.internal.search.XSDSearchQuery;
-import org.eclipse.xsd.XSDNamedComponent;
-public class FindReferencesInProjectAction extends FindReferencesAction
-{
-  public FindReferencesInProjectAction(IEditorPart editor)
-  {
-    super(editor);
-  }
-
-  public void run()
-  {
-    String pattern = "";
-    XSDNamedComponent component = getXSDNamedComponent();
-    IFile file = getCurrentFile();
-    if (file != null && component != null)
-    {
-      QualifiedName metaName = determineMetaName(component);
-      QualifiedName elementQName = new QualifiedName(component.getTargetNamespace(), component.getName());
-      IPath fullPath = file.getFullPath();
-      ProjectSearchScope scope = new ProjectSearchScope(fullPath);
-      String scopeDescription = "Project";
-      XSDSearchQuery searchQuery = new XSDSearchQuery(pattern, file, elementQName, metaName, XSDSearchQuery.LIMIT_TO_REFERENCES, scope, scopeDescription);
-      NewSearchUI.activateSearchResultView();
-      NewSearchUI.runQueryInBackground(searchQuery);
-    }
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInWorkingSetAction.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInWorkingSetAction.java
deleted file mode 100644
index 4c710ef..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/FindReferencesInWorkingSetAction.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.window.Window;
-import org.eclipse.search.ui.NewSearchUI;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkingSet;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.IWorkingSetSelectionDialog;
-import org.eclipse.wst.common.core.search.pattern.QualifiedName;
-import org.eclipse.wst.common.core.search.scope.WorkingSetSearchScope;
-import org.eclipse.wst.xsd.ui.internal.editor.XSDEditorPlugin;
-import org.eclipse.wst.xsd.ui.internal.search.XSDSearchQuery;
-import org.eclipse.xsd.XSDNamedComponent;
-
-public class FindReferencesInWorkingSetAction extends FindReferencesAction{
-
-	public FindReferencesInWorkingSetAction(IEditorPart editor) {
-		super(editor);
-	}
-	
-	public void setActionDefinitionId(String string)
-	{
-		
-	}
-
-	public void run(){
-		IWorkingSet[] workingSets = queryWorkingSets();
-		if ( workingSets == null || workingSets.length == 0)
-			// The user chooses nothing, no point to continue.
-			return;
-		String pattern = "";
-
-		XSDNamedComponent component = getXSDNamedComponent();
-		IFile file = getCurrentFile();
-		if ( file != null && component != null){
-			QualifiedName metaName = determineMetaName(component);
-
-			QualifiedName elementQName = 
-				new QualifiedName(component.getTargetNamespace(), component.getName());
-
-			// Create a scope from the selected working sets
-			WorkingSetSearchScope scope = new WorkingSetSearchScope();
-			for (int i = 0; i < workingSets.length; i++){
-				IAdaptable[] elements = workingSets[i].getElements();
-				scope.addAWorkingSetToScope(elements);
-			}
-
-			String scopeDescription = "Working Set";    
-			XSDSearchQuery searchQuery = 
-				new XSDSearchQuery(pattern, file, elementQName, metaName, XSDSearchQuery.LIMIT_TO_REFERENCES, scope, scopeDescription);    
-			NewSearchUI.activateSearchResultView();
-			NewSearchUI.runQueryInBackground(searchQuery);
-		}
-	}
-
-	/**
-	 * Calls a dialog asking the user to choose the working Sets he wants
-	 * to do the search on
-	 * @return
-	 */
-	public static IWorkingSet[] queryWorkingSets(){
-		Shell shell= XSDEditorPlugin.getShell();
-		if (shell == null)
-			return null;
-		IWorkingSetSelectionDialog dialog =
-			PlatformUI.getWorkbench().getWorkingSetManager().createWorkingSetSelectionDialog(shell, true);
-		if (dialog.open() == Window.OK) {
-			IWorkingSet[] workingSets= dialog.getSelection();
-			if (workingSets.length > 0)
-				return workingSets;
-		}
-		return null;
-	}
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ImplementorsSearchGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ImplementorsSearchGroup.java
deleted file mode 100644
index 0efc8ff..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ImplementorsSearchGroup.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-// TODO... fill in the content
-public class ImplementorsSearchGroup
-{
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/OccurrencesSearchGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/OccurrencesSearchGroup.java
deleted file mode 100644
index 463e241..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/OccurrencesSearchGroup.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-// TODO... fill in the content
-public class OccurrencesSearchGroup
-{
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
deleted file mode 100644
index d6984b3..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/ReferencesSearchGroup.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import java.util.List;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.util.Assert;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchSite;
-import org.eclipse.wst.xsd.ui.internal.search.SearchMessages;
-
-public class ReferencesSearchGroup extends SearchGroup  {
-    protected static final String MENU_TEXT= SearchMessages.group_references; 
-
-    protected IEditorPart fEditor;
-    private IWorkbenchSite fSite;
-    private IActionBars fActionBars;
-    
-//    private String fGroupId;
-    
-    protected FindAction fFindReferencesAction;
-    protected FindAction fFindReferencesInProjectAction;
-    protected FindAction fFindReferencesInWorkingSetAction;
-
-
-    /**
-     * Note: This constructor is for internal use only. Clients should not call this constructor.
-     * @param editor
-     */
-    public ReferencesSearchGroup(IEditorPart editor) {
-        Assert.isNotNull(editor);
-        fEditor= editor;
-        fSite= fEditor.getSite();
-        
-        initialize();
-    }
-    
-    protected void initialize() {
-//      fGroupId= ITextEditorActionConstants.GROUP_FIND;
-
-        fFindReferencesAction= new FindReferencesAction(fEditor);
-        fFindReferencesAction.setText(SearchMessages.Search_FindDeclarationAction_label);
-        fFindReferencesAction.setActionDefinitionId("SEARCH_REFERENCES_IN_WORKSPACE");
-        //fEditor.setAction("SearchReferencesInWorkspace", fFindReferencesAction); //$NON-NLS-1$
-
-        fFindReferencesInProjectAction= new FindReferencesInProjectAction(fEditor);
-        fFindReferencesInProjectAction.setText(SearchMessages.Search_FindDeclarationsInProjectAction_label);        
-        fFindReferencesInProjectAction.setActionDefinitionId("SEARCH_REFERENCES_IN_PROJECT");
-        //fEditor.setAction("SearchReferencesInProject", fFindReferencesInProjectAction); //$NON-NLS-1$
-    
-        fFindReferencesInWorkingSetAction= new FindReferencesInWorkingSetAction(fEditor);
-        fFindReferencesInWorkingSetAction.setText(SearchMessages.Search_FindDeclarationsInWorkingSetAction_label);         
-        fFindReferencesInWorkingSetAction.setActionDefinitionId(".SEARCH_REFERENCES_IN_WORKING_SET");
-        //fEditor.setAction("SearchReferencesInWorkingSet", fFindReferencesInWorkingSetAction); //$NON-NLS-1$    	
-    }
-
-    /*
-    private void registerAction(SelectionDispatchAction action, ISelectionProvider provider, ISelection selection) {
-        action.update(selection);
-        provider.addSelectionChangedListener(action);
-    }*/
-
-    /**
-     * Note: this method is for internal use only. Clients should not call this method.
-     * 
-     * @return the menu label
-     */
-    protected String getName() {
-        return MENU_TEXT;
-    }
-    
-    public void fillActions(List list)
-    {
-      list.add(fFindReferencesAction);
-      //list.add(fFindReferencesInHierarchyAction);
-      list.add(fFindReferencesInProjectAction);
-      list.add(new Separator());
-      list.add(fFindReferencesInWorkingSetAction);
-    }
-    
-    /* (non-Javadoc)
-     * Method declared in ActionGroup
-     */
-    public void fillActionBars(IActionBars actionBars) {
-        Assert.isNotNull(actionBars);
-        super.fillActionBars(actionBars);
-        fActionBars= actionBars;
-        updateGlobalActionHandlers();
-    }
-
-    
-//    private void addAction(IAction action, IMenuManager manager) {
-//        if (action.isEnabled()) {
-//            manager.add(action);
-//        }
-//    }
-
-    /*
-    private void addWorkingSetAction(IWorkingSet[] workingSets, IMenuManager manager) {
-        FindAction action;
-        if (fEditor != null)
-            action= new WorkingSetFindAction(fEditor, new FindReferencesInWorkingSetAction(fEditor, workingSets), SearchUtil.toString(workingSets));
-        else
-            action= new WorkingSetFindAction(fSite, new FindReferencesInWorkingSetAction(fSite, workingSets), SearchUtil.toString(workingSets));
-        action.update(getContext().getSelection());
-        addAction(action, manager);
-    }
-    */
-    
-    /* (non-Javadoc)
-     * Method declared on ActionGroup.
-     */
-    public void fillContextMenu(IMenuManager manager) {
-      /*
-        MenuManager javaSearchMM= new MenuManager(getName(), IContextMenuConstants.GROUP_SEARCH);
-        addAction(fFindReferencesAction, javaSearchMM);
-        addAction(fFindReferencesInProjectAction, javaSearchMM);
-        addAction(fFindReferencesInHierarchyAction, javaSearchMM);
-        
-        javaSearchMM.add(new Separator());
-        
-        Iterator iter= SearchUtil.getLRUWorkingSets().sortedIterator();
-        while (iter.hasNext()) {
-            addWorkingSetAction((IWorkingSet[]) iter.next(), javaSearchMM);
-        }
-        addAction(fFindReferencesInWorkingSetAction, javaSearchMM);
-
-        if (!javaSearchMM.isEmpty())
-            manager.appendToGroup(fGroupId, javaSearchMM);
-        */    
-    }
-    
-    /* 
-     * Overrides method declared in ActionGroup
-     */
-    public void dispose() {
-        ISelectionProvider provider= fSite.getSelectionProvider();
-        if (provider != null) {
-            disposeAction(fFindReferencesAction, provider);
-            disposeAction(fFindReferencesInProjectAction, provider);
-          //  disposeAction(fFindReferencesInHierarchyAction, provider);
-            disposeAction(fFindReferencesInWorkingSetAction, provider);
-        }
-        fFindReferencesAction= null;
-        fFindReferencesInProjectAction= null;
-        //fFindReferencesInHierarchyAction= null;
-        fFindReferencesInWorkingSetAction= null;
-        updateGlobalActionHandlers();
-        super.dispose();
-    }
-
-    private void updateGlobalActionHandlers() {
-        if (fActionBars != null) {
-//            fActionBars.setGlobalActionHandler(JdtActionConstants.FIND_REFERENCES_IN_WORKSPACE, fFindReferencesAction);
-//            fActionBars.setGlobalActionHandler(JdtActionConstants.FIND_REFERENCES_IN_PROJECT, fFindReferencesInProjectAction);
-//            fActionBars.setGlobalActionHandler(JdtActionConstants.FIND_REFERENCES_IN_HIERARCHY, fFindReferencesInHierarchyAction);
-//            fActionBars.setGlobalActionHandler(JdtActionConstants.FIND_REFERENCES_IN_WORKING_SET, fFindReferencesInWorkingSetAction);
-        }
-    }
-
-    private void disposeAction(ISelectionChangedListener action, ISelectionProvider provider) {
-        if (action != null)
-            provider.removeSelectionChangedListener(action);
-    }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/SearchGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/SearchGroup.java
deleted file mode 100644
index 18071ba..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/SearchGroup.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import java.util.List;
-import org.eclipse.ui.actions.ActionGroup;
-
-public abstract class SearchGroup extends ActionGroup
-{
-  public abstract void fillActions(List list);
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchActionGroup.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchActionGroup.java
deleted file mode 100644
index ec6846d..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchActionGroup.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import org.eclipse.jface.util.Assert;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionGroup;
-
-public class XSDSearchActionGroup extends ActionGroup
-{
-//  private ReferencesSearchGroup fReferencesGroup;
-//  private DeclarationsSearchGroup fDeclarationsGroup;
-//  private ImplementorsSearchGroup fImplementorsGroup;
-//  private OccurrencesSearchGroup fOccurrencesGroup;
-//  private IEditorPart fEditor;
-
-  public XSDSearchActionGroup(IEditorPart editor)
-  {
-    Assert.isNotNull(editor);
-//    fEditor = editor;
-//    fReferencesGroup = new ReferencesSearchGroup(editor);
-//    fDeclarationsGroup = new DeclarationsSearchGroup();
-//    fImplementorsGroup = new ImplementorsSearchGroup();
-//    fOccurrencesGroup = new OccurrencesSearchGroup();
-  }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchDeclarationsGroupActionDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchDeclarationsGroupActionDelegate.java
deleted file mode 100644
index 91c55c6..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchDeclarationsGroupActionDelegate.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import org.eclipse.swt.widgets.Menu;
-
-//org.eclipse.wst.xsd.ui.internal.search.actions.XSDSearchGroupActionDelegate
-public class XSDSearchDeclarationsGroupActionDelegate extends BaseGroupActionDelegate
-{
-    protected void fillMenu(Menu menu) {
-
-    }             
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchGroupSubMenu.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchGroupSubMenu.java
deleted file mode 100644
index 5ec359f..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchGroupSubMenu.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.ui.actions.CompoundContributionItem;
-
-// TODO should be in common.ui
-public class XSDSearchGroupSubMenu extends CompoundContributionItem
-{
-  SearchGroup searchActionGroup;
-
-  public XSDSearchGroupSubMenu(SearchGroup refactorMenuGroup)
-  {
-    super();
-    searchActionGroup = refactorMenuGroup;
-  }
-
-  public XSDSearchGroupSubMenu(String id)
-  {
-    super(id);
-  }
-
-  protected IContributionItem[] getContributionItems()
-  {
-    ArrayList actionsList = new ArrayList();
-    ArrayList contribList = new ArrayList();
-    searchActionGroup.fillActions(actionsList);
-    if (actionsList != null && !actionsList.isEmpty())
-    {
-      for (Iterator iter = actionsList.iterator(); iter.hasNext();)
-      {
-        Object o = iter.next();
-        if (o instanceof IAction)
-        {  
-          IAction action = (IAction)o;
-          contribList.add(new ActionContributionItem(action));
-        }
-        else if (o instanceof Separator)
-        {
-          Separator separator = (Separator)o;
-          contribList.add(separator);
-        }  
-      }
-    }
-    else
-    {
-      Action dummyAction = new Action("XSDSeachActionGroup_no_refactoring_available") //TODO wrong string here ??
-      {
-        // dummy inner class; no methods
-      };
-      dummyAction.setEnabled(false);
-      contribList.add(new ActionContributionItem(dummyAction));
-    }
-    return (IContributionItem[]) contribList.toArray(new IContributionItem[contribList.size()]);        
-  }
-}
diff --git a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchReferencesGroupActionDelegate.java b/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchReferencesGroupActionDelegate.java
deleted file mode 100644
index be947bc..0000000
--- a/bundles/org.eclipse.wst.xsd.ui/src-search/org/eclipse/wst/xsd/ui/internal/search/actions/XSDSearchReferencesGroupActionDelegate.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-package org.eclipse.wst.xsd.ui.internal.search.actions;
-
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IWorkbenchPartSite;
-
-//org.eclipse.wst.xsd.ui.internal.search.actions.XSDSearchGroupActionDelegate
-public class XSDSearchReferencesGroupActionDelegate extends BaseGroupActionDelegate
-{
-    protected void fillMenu(Menu menu) {
-      try
-      {
-        if (fSelection == null) {
-            return;
-        }
-        if (workbenchPart != null)
-        {
-		  IWorkbenchPartSite site = workbenchPart.getSite();
-			if (site == null)
-			  return;
-	
-		  IEditorPart editor = site.getPage().getActiveEditor();
-          if ( editor != null ){
-            ReferencesSearchGroup referencesGroup = new ReferencesSearchGroup(editor);
-            XSDSearchGroupSubMenu subMenu = new XSDSearchGroupSubMenu(referencesGroup);
-            subMenu.fill(menu, -1);
-          }
-        }  
-      }
-      catch (Exception e)
-      {
-        e.printStackTrace();
-      }
-    }  
-}
diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/.classpath b/bundles/org.eclipse.wtp.javascript.capabilities/.classpath
deleted file mode 100644
index fd545ef..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/.project b/bundles/org.eclipse.wtp.javascript.capabilities/.project
deleted file mode 100644
index 970984c..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wtp.javascript.capabilities</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/bundles/org.eclipse.wtp.javascript.capabilities/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.wtp.javascript.capabilities/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 9504e18..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Tue May 19 03:12:16 EDT 2009
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.compiler.compliance=1.4
diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.wtp.javascript.capabilities/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index cb17609..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue May 19 03:12:17 EDT 2009
-eclipse.preferences.version=1
-resolve.requirebundle=false
-pluginProject.extensions=false
diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/META-INF/MANIFEST.MF b/bundles/org.eclipse.wtp.javascript.capabilities/META-INF/MANIFEST.MF
deleted file mode 100644
index ab7ba19..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wtp.javascript.capabilities;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.wtp.javascript.capabilities/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 1186a6a..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Properties file for org.eclipse.wtp.javascript.capabilities
-Bundle-Name.0 = JavaScript Capabilities
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-activity.javascript             = JavaScript Development
-activity.javascript.desc        = Develop JavaScript applications. 
diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/about.html b/bundles/org.eclipse.wtp.javascript.capabilities/about.html
deleted file mode 100644
index 31cec0d..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2009</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/bundles/org.eclipse.wtp.javascript.capabilities/build.properties b/bundles/org.eclipse.wtp.javascript.capabilities/build.properties
deleted file mode 100644
index 41197a4..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = META-INF/,\
-               .,\
-               OSGI-INF/,\
-               plugin.xml,\
-               OSGI-INF/l10n/,\
-               about.html
diff --git a/bundles/org.eclipse.wtp.javascript.capabilities/plugin.xml b/bundles/org.eclipse.wtp.javascript.capabilities/plugin.xml
deleted file mode 100644
index 3fdbbd4..0000000
--- a/bundles/org.eclipse.wtp.javascript.capabilities/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-    <extension
-        point="org.eclipse.ui.activities">
-        <activity
-            name="%activity.javascript"
-            description="%activity.javascript.desc"
-            id="org.eclipse.wtp.javascript.capabilities">
-        </activity>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.javascript.capabilities"
-            pattern="org\.eclipse\.wst\.jsdt\.[\.\w/]*">
-        </activityPatternBinding>
-        <!--
-        <categoryActivityBinding
-            activityId="org.eclipse.wtp.javascript.capabilities"
-            categoryId="org.eclipse.categories.developmentCategory">
-        </categoryActivityBinding>
-        <defaultEnablement
-            id="org.eclipse.wtp.javascript.capabilities">
-        </defaultEnablement>
-        -->
-    </extension>
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.wtp.web.capabilities/.project b/bundles/org.eclipse.wtp.web.capabilities/.project
deleted file mode 100644
index d08ea9c..0000000
--- a/bundles/org.eclipse.wtp.web.capabilities/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wtp.web.capabilities</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/bundles/org.eclipse.wtp.web.capabilities/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.wtp.web.capabilities/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index d4f00a1..0000000
--- a/bundles/org.eclipse.wtp.web.capabilities/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue May 19 10:29:20 EDT 2009
-eclipse.preferences.version=1
-resolve.requirebundle=false
-pluginProject.extensions=false
diff --git a/bundles/org.eclipse.wtp.web.capabilities/META-INF/MANIFEST.MF b/bundles/org.eclipse.wtp.web.capabilities/META-INF/MANIFEST.MF
deleted file mode 100644
index 6c46a99..0000000
--- a/bundles/org.eclipse.wtp.web.capabilities/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wtp.web.capabilities;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/bundles/org.eclipse.wtp.web.capabilities/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.wtp.web.capabilities/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 615c554..0000000
--- a/bundles/org.eclipse.wtp.web.capabilities/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Properties file for org.eclipse.wtp.web.capabilities
-Bundle-Name.0 = Web Capabilities
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-activity.web             = Web Development
-activity.web.desc        = Develop Web applications.
diff --git a/bundles/org.eclipse.wtp.web.capabilities/about.html b/bundles/org.eclipse.wtp.web.capabilities/about.html
deleted file mode 100644
index 31cec0d..0000000
--- a/bundles/org.eclipse.wtp.web.capabilities/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2009</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/bundles/org.eclipse.wtp.web.capabilities/build.properties b/bundles/org.eclipse.wtp.web.capabilities/build.properties
deleted file mode 100644
index cef084d..0000000
--- a/bundles/org.eclipse.wtp.web.capabilities/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = META-INF/,\
-               OSGI-INF/,\
-               plugin.xml,\
-               OSGI-INF/l10n/,\
-               about.html
diff --git a/bundles/org.eclipse.wtp.web.capabilities/plugin.xml b/bundles/org.eclipse.wtp.web.capabilities/plugin.xml
deleted file mode 100644
index 6b77b06..0000000
--- a/bundles/org.eclipse.wtp.web.capabilities/plugin.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-  
-
-   <!-- 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.wtp.web.capabilities">
-     	</activity>
-     	
-      	<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.wtp.xml.capabilities" 
-      		activityId="org.eclipse.wtp.web.capabilities">
-      	</activityRequirementBinding>
-      	-->
-      	<!--
-       <categoryActivityBinding
-            activityId="org.eclipse.wst.web.capabilities"
-            categoryId="org.eclipse.categories.developmentCategory">
-       </categoryActivityBinding>
-             	
-      	<defaultEnablement
-            id="org.eclipse.wtp.web.capabilities">
-      	</defaultEnablement>
-      -->
-   </extension>
-   
-</plugin>
diff --git a/bundles/org.eclipse.wtp.xml.capabilities/.project b/bundles/org.eclipse.wtp.xml.capabilities/.project
deleted file mode 100644
index bd1e416..0000000
--- a/bundles/org.eclipse.wtp.xml.capabilities/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wtp.xml.capabilities</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/bundles/org.eclipse.wtp.xml.capabilities/.settings/org.eclipse.pde.core.prefs b/bundles/org.eclipse.wtp.xml.capabilities/.settings/org.eclipse.pde.core.prefs
deleted file mode 100644
index eb760e2..0000000
--- a/bundles/org.eclipse.wtp.xml.capabilities/.settings/org.eclipse.pde.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Tue May 19 09:49:45 EDT 2009
-eclipse.preferences.version=1
-resolve.requirebundle=false
-pluginProject.extensions=false
diff --git a/bundles/org.eclipse.wtp.xml.capabilities/META-INF/MANIFEST.MF b/bundles/org.eclipse.wtp.xml.capabilities/META-INF/MANIFEST.MF
deleted file mode 100644
index 3c1ab7c..0000000
--- a/bundles/org.eclipse.wtp.xml.capabilities/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wtp.xml.capabilities;singleton:=true
-Bundle-Version: 1.0.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
diff --git a/bundles/org.eclipse.wtp.xml.capabilities/OSGI-INF/l10n/bundle.properties b/bundles/org.eclipse.wtp.xml.capabilities/OSGI-INF/l10n/bundle.properties
deleted file mode 100644
index 74b8872..0000000
--- a/bundles/org.eclipse.wtp.xml.capabilities/OSGI-INF/l10n/bundle.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Properties file for org.eclipse.wtp.xml.capabilities
-Bundle-Name.0 = XML Capabilities
-Bundle-Vendor.0 = Eclipse Web Tools Platform
-activity.xml             = XML Development
-activity.xml.desc        = Develop XML applications.
diff --git a/bundles/org.eclipse.wtp.xml.capabilities/about.html b/bundles/org.eclipse.wtp.xml.capabilities/about.html
deleted file mode 100644
index 31cec0d..0000000
--- a/bundles/org.eclipse.wtp.xml.capabilities/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2009</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/bundles/org.eclipse.wtp.xml.capabilities/build.properties b/bundles/org.eclipse.wtp.xml.capabilities/build.properties
deleted file mode 100644
index cef084d..0000000
--- a/bundles/org.eclipse.wtp.xml.capabilities/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = META-INF/,\
-               OSGI-INF/,\
-               plugin.xml,\
-               OSGI-INF/l10n/,\
-               about.html
diff --git a/bundles/org.eclipse.wtp.xml.capabilities/plugin.xml b/bundles/org.eclipse.wtp.xml.capabilities/plugin.xml
deleted file mode 100644
index 51ad491..0000000
--- a/bundles/org.eclipse.wtp.xml.capabilities/plugin.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-    <!--
-        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.wtp.xml.capabilities">
-        </activity>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.xml\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.xsd\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.dtd\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.apache\.xerces\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.common\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.sse\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.validation\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.internet\.cache\.[\.\w/]*">
-        </activityPatternBinding>
-        <activityPatternBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            pattern="org\.eclipse\.wst\.internet\.proxy\.[\.\w/]*">
-        </activityPatternBinding>
-        <!--
-        <categoryActivityBinding
-            activityId="org.eclipse.wtp.xml.capabilities"
-            categoryId="org.eclipse.categories.developmentCategory">
-        </categoryActivityBinding>
-        <defaultEnablement
-            id="org.eclipse.wtp.xml.capabilities">
-        </defaultEnablement>
-        -->
-    </extension>
-</plugin>
\ No newline at end of file
diff --git a/development/org.eclipse.wst.sse.unittests/.classpath b/development/org.eclipse.wst.sse.unittests/.classpath
deleted file mode 100644
index bfb3353..0000000
--- a/development/org.eclipse.wst.sse.unittests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/development/org.eclipse.wst.sse.unittests/.cvsignore b/development/org.eclipse.wst.sse.unittests/.cvsignore
deleted file mode 100644
index 9fc9cb0..0000000
--- a/development/org.eclipse.wst.sse.unittests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-ssejunit.jar
-temp.folder
diff --git a/development/org.eclipse.wst.sse.unittests/.project b/development/org.eclipse.wst.sse.unittests/.project
deleted file mode 100644
index e6f5109..0000000
--- a/development/org.eclipse.wst.sse.unittests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.unittests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.core.resources.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.ui.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.ltk.core.refactoring.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs b/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/development/org.eclipse.wst.sse.unittests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF b/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
deleted file mode 100644
index a0a678b..0000000
--- a/development/org.eclipse.wst.sse.unittests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,49 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.unittests; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: .
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.wst.sse.unittests,
- org.eclipse.wst.sse.unittests.minortools
-Require-Bundle: org.junit;bundle-version="[3.8.0,4.0.0)",
- org.eclipse.core.runtime,
- org.eclipse.wst.css.tests.encoding;resolution:=optional,
- org.eclipse.wst.css.core.tests;resolution:=optional,
- org.eclipse.wst.css.ui.tests;resolution:=optional,
- org.eclipse.wst.css.ui.tests.performance;resolution:=optional,
- org.eclipse.wst.dtd.core.tests;resolution:=optional,
- org.eclipse.wst.dtd.ui.tests;resolution:=optional,
- org.eclipse.wst.html.core.tests;resolution:=optional,
- org.eclipse.wst.html.tests.encoding;resolution:=optional,
- org.eclipse.wst.html.ui.tests;resolution:=optional,
- org.eclipse.wst.html.ui.tests.performance;resolution:=optional,
- org.eclipse.wst.sse.core.tests;resolution:=optional,
- org.eclipse.wst.sse.ui.tests;resolution:=optional,
- org.eclipse.wst.sse.ui.tests.performance;resolution:=optional,
- org.eclipse.wst.xml.core.tests;resolution:=optional,
- org.eclipse.wst.xml.tests.encoding;resolution:=optional,
- org.eclipse.wst.xml.ui.tests.performance;resolution:=optional,
- org.eclipse.wst.xml.validation.tests;resolution:=optional,
- org.eclipse.wst.xsd.validation.tests;resolution:=optional,
- org.eclipse.wst.css.ui.tests;resolution:=optional,
- org.eclipse.wst.sse.ui;resolution:=optional,
- org.eclipse.wst.xml.ui;resolution:=optional,
- org.eclipse.wst.xml.ui.tests;resolution:=optional,
- org.eclipse.jst.jsp.core.tests;resolution:=optional,
- org.eclipse.jst.jsp.tests.encoding;resolution:=optional,
- org.eclipse.jst.jsp.ui.tests;resolution:=optional,
- org.eclipse.jst.jsp.ui.tests.performance;resolution:=optional,
- org.eclipse.wst.xsd.core.tests;resolution:=optional,
- org.eclipse.wst.xsd.ui.tests;resolution:=optional,
- org.eclipse.wst.xsl.tests;resolution:=optional,
- org.eclipse.wst.jsdt.core.tests.compiler;resolution:=optional,
- org.eclipse.wst.jsdt.core.tests.model;resolution:=optional,
- org.eclipse.wst.jsdt.ui.tests;resolution:=optional,
- org.eclipse.wst.jsdt.web.core.tests;resolution:=optional,
- org.eclipse.wst.jsdt.web.ui.tests;resolution:=optional
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
diff --git a/development/org.eclipse.wst.sse.unittests/SSE Master List Test Suite.launch b/development/org.eclipse.wst.sse.unittests/SSE Master List Test Suite.launch
deleted file mode 100644
index 479e452..0000000
--- a/development/org.eclipse.wst.sse.unittests/SSE Master List Test Suite.launch
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.wst.sse.unittests.MasterListTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -showLocation -consoleLog"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.wst.sse.unittests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms100M -Xmx600M -XX:MaxPermSize=192M"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.sdk.ide"/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-</launchConfiguration>
diff --git a/development/org.eclipse.wst.sse.unittests/build.properties b/development/org.eclipse.wst.sse.unittests/build.properties
deleted file mode 100644
index bde1454..0000000
--- a/development/org.eclipse.wst.sse.unittests/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties
-source.. = src/
diff --git a/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif b/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif
deleted file mode 100644
index 75ebdb8..0000000
--- a/development/org.eclipse.wst.sse.unittests/icons/sourceEditor.gif
+++ /dev/null
Binary files differ
diff --git a/development/org.eclipse.wst.sse.unittests/plugin.properties b/development/org.eclipse.wst.sse.unittests/plugin.properties
deleted file mode 100644
index 8c4370b..0000000
--- a/development/org.eclipse.wst.sse.unittests/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     
-###############################################################################
-XML_Source_Page_Editor.name=XML Source Page Editor
-JavaScript_Source_Page_Editor.name=JavaScript Source Page Editor
-
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Unit Tests
-additionalTests=Additional TestCases and TestSuites
\ No newline at end of file
diff --git a/development/org.eclipse.wst.sse.unittests/plugin.xml b/development/org.eclipse.wst.sse.unittests/plugin.xml
deleted file mode 100644
index 6dd4917..0000000
--- a/development/org.eclipse.wst.sse.unittests/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-        <extension point="org.eclipse.ui.editors">
-                <editor
-                        name="%XML_Source_Page_Editor.name"
-                        icon="icons/sourceEditor.gif"
-                        contributorClass="org.eclipse.wst.xml.ui.internal.actions.ActionContributorXML"
-                        class="org.eclipse.wst.sse.ui.StructuredTextEditor"
-                        symbolicFontName="org.eclipse.wst.sse.ui.textfont"
-                        id="org.eclipse.core.runtime.xml.source">
-                        <contentTypeBinding
-                                contentTypeId="org.eclipse.core.runtime.xml" />
-                        <contentTypeBinding
-                                contentTypeId="org.eclipse.wst.xml.core.xmlsource" />
-                </editor>
-        </extension>
-
-	<extension-point id="additionalTests" name="%additionalTests" schema="schema/additionalTests.exsd"/>
-
-</plugin>
diff --git a/development/org.eclipse.wst.sse.unittests/schema/additionalTests.exsd b/development/org.eclipse.wst.sse.unittests/schema/additionalTests.exsd
deleted file mode 100644
index e0e5893..0000000
--- a/development/org.eclipse.wst.sse.unittests/schema/additionalTests.exsd
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.wst.sse.unittests">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.wst.sse.unittests" id="additionalTests" name="%additionalTests"/>
-      </appInfo>
-      <documentation>
-         This extension point provides a way to add extra test cases and suites to the already running list without declaring a runtime dependency in this plug-in.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="test"/>
-            <element ref="suite"/>
-         </choice>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="test">
-      <annotation>
-         <documentation>
-            Adds an individual Test case to run.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The Test class name.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="junit.framework.Test:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="suite">
-      <annotation>
-         <documentation>
-            Adds a TestSuite to run.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  The TestSuite class name.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="junit.framework.TestSuite:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java
deleted file mode 100644
index 03cafb4..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterListTestSuite.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2004, 2009 IBM Corporation and others.
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License v1.0 which
- * accompanies  this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- * 
- ****************************************************************************/
-
-package org.eclipse.wst.sse.unittests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.jsp.core.tests.JSPCoreTestSuite;
-import org.eclipse.jst.jsp.tests.encoding.JSPEncodingTestSuite;
-import org.eclipse.jst.jsp.ui.tests.JSPUITestSuite;
-import org.eclipse.wst.css.core.tests.CSSCoreTestSuite;
-import org.eclipse.wst.css.tests.encoding.CSSEncodingTestSuite;
-import org.eclipse.wst.css.ui.tests.CSSUITestSuite;
-import org.eclipse.wst.dtd.core.tests.DTDCoreTestSuite;
-import org.eclipse.wst.dtd.ui.tests.DTDUITestSuite;
-import org.eclipse.wst.html.core.tests.HTMLCoreTestSuite;
-import org.eclipse.wst.html.tests.encoding.HTMLEncodingTestSuite;
-import org.eclipse.wst.html.ui.tests.HTMLUITestSuite;
-import org.eclipse.wst.jsdt.core.tests.RunJSDTCoreTests;
-import org.eclipse.wst.jsdt.core.tests.compiler.JSDTCompilerTests;
-import org.eclipse.wst.jsdt.ui.tests.JSDTUITests;
-import org.eclipse.wst.jsdt.web.core.tests.AllWebCoreTests;
-import org.eclipse.wst.jsdt.web.ui.tests.AllWebUITests;
-import org.eclipse.wst.sse.core.tests.SSEModelTestSuite;
-import org.eclipse.wst.sse.ui.tests.SSEUITestSuite;
-import org.eclipse.wst.xml.core.tests.SSEModelXMLTestSuite;
-import org.eclipse.wst.xml.tests.encoding.EncodingTestSuite;
-import org.eclipse.wst.xml.ui.tests.XMLUITestSuite;
-import org.eclipse.wst.xml.validation.tests.internal.AllXMLTests;
-import org.eclipse.wst.xsd.core.tests.internal.AllXSDCoreTests;
-import org.eclipse.wst.xsd.validation.tests.internal.AllXSDTests;
-import org.eclipse.wst.xsl.tests.AllTestsSuite;
-
-public class MasterListTestSuite extends TestSuite {
-	private static final String CLASS = "class";
-	private static final String EXTENSION_POINT_ID = "org.eclipse.wst.sse.unittests.additionalTests";
-
-	public MasterListTestSuite() {
-		super("WTP Source Editing Master List Test Suite");
-
-		System.setProperty("wtp.autotest.noninteractive", "true");
-
-		addTest(SSEModelTestSuite.suite());
-
-		addTest(SSEModelXMLTestSuite.suite());
-		addTest(DTDCoreTestSuite.suite());
-		addTest(AllXSDCoreTests.suite());
-		addTest(CSSCoreTestSuite.suite());
-		addTest(HTMLCoreTestSuite.suite());
-		addTest(JSPCoreTestSuite.suite());
-
-		addTest(EncodingTestSuite.suite());
-		addTest(CSSEncodingTestSuite.suite());
-		addTest(HTMLEncodingTestSuite.suite());
-		addTest(JSPEncodingTestSuite.suite());
-
-		addTest(AllXMLTests.suite());
-		addTest(AllXSDTests.suite());
-
-		addTest(SSEUITestSuite.suite());
-		addTest(XMLUITestSuite.suite());
-		addTest(DTDUITestSuite.suite());
-		addTest(CSSUITestSuite.suite());
-		addTest(HTMLUITestSuite.suite());
-		addTest(JSPUITestSuite.suite());
-		
-		addTest(RunJSDTCoreTests.suite());
-		addTest(JSDTCompilerTests.suite());
-		addTest(JSDTUITests.suite());
-		addTest(AllWebCoreTests.suite());
-		addTest(AllWebUITests.suite());
-		
-
-		addTest(new AllTestsSuite());
-		
-		// addTest(RegressionBucket.suite());
-		// addTest(AllTestCases.suite());
-
-		IConfigurationElement[] elements = Platform.getExtensionRegistry().getConfigurationElementsFor(EXTENSION_POINT_ID);
-		for (int i = 0; i < elements.length; i++) {
-			if (elements[i].getName().equals("suite")) {
-				TestSuite suite;
-				try {
-					suite = (TestSuite) elements[i].createExecutableExtension(CLASS);
-					addTestSuite(suite.getClass());
-					System.err.println("Adding TestSuite " + suite.getClass().getName());
-				}
-				catch (CoreException e) {
-					e.printStackTrace(System.err);
-					Platform.getLog(Platform.getBundle("org.eclipse.wst.sse.unittests")).log(e.getStatus());
-				}
-			}
-			else if (elements[i].getName().equals("test")) {
-				Test test;
-				try {
-					test = (Test) elements[i].createExecutableExtension(CLASS);
-					addTestSuite(test.getClass());
-					System.err.println("Adding TestCase " + test.getClass().getName());
-				}
-				catch (CoreException e) {
-					e.printStackTrace(System.err);
-					Platform.getLog(Platform.getBundle("org.eclipse.wst.sse.unittests")).log(e.getStatus());
-				}
-			}
-		}
-	}
-
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-		// other than to signal to create an instance of this class.
-		// The rest it automatic from the tests added in constructor.
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java
deleted file mode 100644
index 8491014..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/MasterPerformanceTestSuite.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.sse.unittests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.jsp.ui.tests.performance.JSPUIPerformanceTests;
-import org.eclipse.wst.css.ui.tests.performance.CSSUIPerformanceTestSuite;
-import org.eclipse.wst.html.ui.tests.performance.HTMLUIPerformanceTestSuite;
-import org.eclipse.wst.sse.ui.tests.performance.SSEUIPerformanceTestSuite;
-import org.eclipse.wst.xml.ui.tests.performance.XMLUIPerformanceTestSuite;
-
-/*****************************************************************************
- * Copyright (c) 2004 IBM Corporation and others. All rights reserved. This
- * program and the accompanying materials are made available under the terms
- * of the Eclipse Public License v1.0 which accompanies this distribution, and
- * is available at http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors: IBM Corporation - initial API and implementation
- * 
- ****************************************************************************/
-
-public class MasterPerformanceTestSuite extends TestSuite {
-
-	public MasterPerformanceTestSuite() {
-		super("All Tests");
-
-		addTest(JSPUIPerformanceTests.suite());
-		addTest(CSSUIPerformanceTestSuite.suite());
-		addTest(HTMLUIPerformanceTestSuite.suite());
-		addTest(SSEUIPerformanceTestSuite.suite());
-		addTest(XMLUIPerformanceTestSuite.suite());
-
-
-	}
-
-	public void testAll() {
-		// this method needs to exist, but doesn't really do anything
-	}
-
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/TestTurkish.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/TestTurkish.java
deleted file mode 100644
index 939c544..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/TestTurkish.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.sse.unittests;
-
-import java.util.Locale;
-
-/**
- * TestTurkish
- * See http://www.i18nguy.com/unicode/turkish-i18n.html
- */
-
-public class TestTurkish {
-	public static void main(String[] args) {
-		String turkishLowerCase = "\u0131" + "\u0069";
-		String turkishUpperCase = "\u0130" + "\u0049";
-		Locale[] locales = Locale.getAvailableLocales();
-		for (int i = 0; i < locales.length; i++) {
-			// System.out.println(locales[i]);
-		}
-		Locale turkishLocale = new Locale("TR");
-		String testUppercase = turkishLowerCase.toUpperCase(turkishLocale);
-		System.out.println(turkishUpperCase.equals(testUppercase));
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestString.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestString.java
deleted file mode 100644
index 578fc46..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestString.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *     
- *******************************************************************************/
-
-package org.eclipse.wst.sse.unittests.minortools;
-
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-/**
- * TestString
- */
-
-public class TestString {
-
-	public static void main(String[] args) {
-
-
-		String xml = "<?xml version=\"1.0\" encoding=\"UTF-16\"?><message><sourceUri></sourceUri><body></body></message>";
-
-
-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
-		factory.setNamespaceAware(false);
-		factory.setValidating(false);
-		try {
-			DocumentBuilder builder = factory.newDocumentBuilder();
-			Document document = builder.parse(new InputSource(new StringReader(xml)));
-			if (document != null) {
-				System.out.print(document.hasChildNodes());
-			}
-			System.out.println(document);
-		}
-		catch (ParserConfigurationException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		catch (SAXException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		catch (IOException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-
-	}
-
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java
deleted file mode 100644
index aa2e238..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/TestStringUtils.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.unittests.minortools;
-
-
-
-public class TestStringUtils {
-
-	/**
-	 * TestStringUtils constructor comment.
-	 */
-	private TestStringUtils() {
-		super();
-	}
-
-	/**
-	 * Replace matching literal portions of a string with another string
-	 */
-	public static String replace(String aString, String source, String target) {
-		if (aString == null)
-			return null;
-		String normalString = ""; //$NON-NLS-1$
-		int length = aString.length();
-		int position = 0;
-		int previous = 0;
-		int spacer = source.length();
-		while (position + spacer - 1 < length && aString.indexOf(source, position) > -1) {
-			position = aString.indexOf(source, previous);
-			normalString = normalString + aString.substring(previous, position) + target;
-			position += spacer;
-			previous = position;
-		}
-		normalString = normalString + aString.substring(position, aString.length());
-
-		return normalString;
-	}
-
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java b/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java
deleted file mode 100644
index 61ed9c5..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/org/eclipse/wst/sse/unittests/minortools/VersionRemover.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.wst.sse.unittests.minortools;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
-import org.eclipse.wst.xml.core.tests.util.CommonXML;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.SAXException;
-
-
-
-/**
- * Modifies plugin.xml and fragment.xml files to not require specific versions
- * of their plugin dependencies.
- * 
- * @author nitin
- */
-public class VersionRemover {
-
-	char[] charbuff = new char[2048];
-	StringBuffer s = null;
-
-	public VersionRemover() {
-		super();
-	}
-
-
-
-	public static void main(String[] args) {
-		if (args.length < 1)
-			new VersionRemover().visit(new File("d:/target"));
-		else
-			new VersionRemover().visit(new File(args[0]));
-	}
-
-
-
-	protected void visit(File file) {
-		// Skip directories like org.eclipse.*, org.apache.*, and org.junit.*
-		if (file.isDirectory() && !file.getName().startsWith("org.eclipse.") && !file.getName().startsWith("org.apache") && !file.getName().startsWith("org.junit")) {
-			String[] contents = file.list();
-			for (int i = 0; i < contents.length; i++)
-				visit(new File(file.getAbsolutePath() + '/' + contents[i]));
-		}
-		else {
-			fixupFile(file);
-		}
-	}
-
-	protected void fixupFile(File file) {
-		// only load and fixup files named plugin.xml or fragment.xml under eclipse\plugins\XXXXXXX.*
-		if (!(file.getName().equalsIgnoreCase("plugin.xml") || file.getName().equalsIgnoreCase("fragment.xml")) || file.getAbsolutePath().indexOf("eclipse\\plugins\\XXXXXXX.") == -1)
-			return;
-		//		System.out.println(file.getAbsolutePath());
-		try {
-			Document doc = CommonXML.getDocumentBuilder().parse(file);
-			NodeList imports = null;
-			if (file.getName().equalsIgnoreCase("plugin.xml"))
-				imports = doc.getElementsByTagName("import");
-			else if (file.getName().equalsIgnoreCase("fragment.xml"))
-				imports = doc.getElementsByTagName("fragment");
-			boolean changed = false;
-			for (int i = 0; i < imports.getLength(); i++) {
-				Node importNode = imports.item(i);
-				if (importNode.getNodeName().equalsIgnoreCase("import") && importNode.getAttributes().getNamedItem("version") != null) {
-					changed = true;
-					importNode.getAttributes().removeNamedItem("version");
-				}
-				if (importNode.getAttributes().getNamedItem("plugin-version") != null) {
-					changed = true;
-					importNode.getAttributes().removeNamedItem("plugin-version");
-				}
-				if (importNode.getAttributes().getNamedItem("match") != null) {
-					importNode.getAttributes().removeNamedItem("match");
-					changed = true;
-				}
-			}
-			if (changed) {
-				FileOutputStream ostream = new FileOutputStream(file.getAbsolutePath());
-				CommonXML.serialize(doc, ostream);
-				ostream.close();
-				System.out.println("Modified " + file.getAbsolutePath());
-			}
-		}
-		catch (SAXException e) {
-			System.err.println(file.getPath() + ": " + e);
-		}
-		catch (IOException e) {
-			System.err.println(file.getPath() + ": " + e);
-		}
-	}
-}
diff --git a/development/org.eclipse.wst.sse.unittests/src/testStringXML.jpage b/development/org.eclipse.wst.sse.unittests/src/testStringXML.jpage
deleted file mode 100644
index 0f1eaa0..0000000
--- a/development/org.eclipse.wst.sse.unittests/src/testStringXML.jpage
+++ /dev/null
Binary files differ
diff --git a/development/org.eclipse.wst.sse.unittests/tet.jsp b/development/org.eclipse.wst.sse.unittests/tet.jsp
deleted file mode 100644
index 191b21e..0000000
--- a/development/org.eclipse.wst.sse.unittests/tet.jsp
+++ /dev/null
@@ -1,21 +0,0 @@
-<%@ page language="java" contentType="text/html; charset=UTF-8"

-	pageEncoding="UTF-8"%>

-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">

-<html>

-<head>

-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">

-<title>content of lowercase title tags</title>

-<tıtle>content of lowercase title tags (no diaresis over i)</tıtle>

-<title>content of uppercase tags</title>

-<title></title>

-<title></title>

-<title></title>

-<title></title>

-</head>

-<body>

-<i></i>

-<i></i>

-<i></i>

-<i></i>

-</body>

-</html>

diff --git a/development/org.eclipse.wst.sse.unittests/turkishCase.jpage b/development/org.eclipse.wst.sse.unittests/turkishCase.jpage
deleted file mode 100644
index ba96e61..0000000
--- a/development/org.eclipse.wst.sse.unittests/turkishCase.jpage
+++ /dev/null
@@ -1,3 +0,0 @@
-
-String s = "\u0131"+"\u0069";
-s.toUpperCase();
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.cvsignore b/docs/org.eclipse.jst.jsp.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.project b/docs/org.eclipse.jst.jsp.ui.infopop/.project
deleted file mode 100644
index 01be1bc..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.jst.jsp.ui.infopop</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.jsp.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml b/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml
deleted file mode 100644
index bac1fef..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<contexts>
-<context id="jspf1000">
-<description>Select values for the following properties from the drop-down lists:
--  <b>Character code:</b> Specifies the page directive's pageEncoding value and contentType charset. In HTML documents, this value is also used for the &lt;META&gt; tag's charset property.
--  <b>Language:</b> Specifies the page directive's programming language.
--  <b>Content Type:</b> Specifies the contentType's TYPE value for the page directive. In HTML documents, this value is also used for the &lt;META&gt; tag's content property.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="jspr0010">
-<description>Select this option to open the <b>Rename Resource</b> dialog, if applicable, which lets you rename the currently selected Java element and references to that element.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="jspr0020">
-<description>Select this option to open the <b>Move</b> dialog, if applicable, which lets you move the currently selected Java element. For example, you can move a method from one class to another.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0050">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a JavaServer Pages (JSP) file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating JSP files.  Changing the encoding causes any new JSP files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0051">
-<description>This page lets you customize the syntax highlighting that the JavaServer Pages (JSP) editor does when you are editing a file."
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that let you specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0052">
-<description>This page lets you create new and edit existing templates that will be used when you edit a JSP file.
-</description>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1050">
-<description>Select this option to open the <b>Cleanup</b> dialog, which contains settings to update a document so that it is well-formed and formatted. Cleanup includes such activities as inserting missing tags, adding quotation marks around attribute values, node capitalization, and formatting a document.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml b/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml
deleted file mode 100644
index 780835a..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/EditorJspContexts2.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<contexts>
-<context id="jspsource_source_HelpId">
-<description>The JSP source page editor lets you edit a JavaServer Pages file. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Making content assist work for JSP files" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html"/>
-</context>
-
-<context id="jspf1000">
-<description>Select values for the following properties from the drop-down lists:
--  <b>Character code:</b> Specifies the page directive's pageEncoding value and contentType charset. In HTML documents, this value is also used for the &lt;META&gt; tag's charset property.
--  <b>Language:</b> Specifies the page directive's programming language.
--  <b>Content Type:</b> Specifies the contentType's TYPE value for the page directive. In HTML documents, this value is also used for the &lt;META&gt; tag's content property.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="jspr0010">
-<description>Select this option to open the <b>Refactor Rename</b> dialog, if applicable, which lets you rename the currently selected Java element and references to that element.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="jspr0020">
-<description>Select this option to open the <b>Refactor Move</b> dialog, if applicable, which lets you move the currently selected Java element. For example, you can move a method from one class to another.
-</description>
-<topic label="Source editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing source code - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0050">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create or save a JavaServer Pages (JSP) file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when creating JSP files.  Changing the encoding causes any new JSP files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0051">
-<description>This page lets you customize the syntax highlighting that the JavaServer Pages (JSP) editor does when you are editing a file."
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that let you specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0052">
-<description>This page lets you create new and edit existing templates that will be used when you edit a JSP file.
-</description>
-<topic label="Adding and removing JSP templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1050">
-<description>Select this option to open the <b>Cleanup</b> dialog, which contains settings to update a document so that it is well-formed and formatted. Cleanup includes such activities as inserting missing tags, adding quotation marks around attribute values, node capitalization, and formatting a document.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/JspWizContexts.xml b/docs/org.eclipse.jst.jsp.ui.infopop/JspWizContexts.xml
deleted file mode 100644
index 1d085e2..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/JspWizContexts.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<contexts>
-	<context id="jspw0010">
-		<description>
-			Select the JSP template checkbox to create your JSP file based on a default template. You can choose to have your JSP created with HTML, XHTML, or XHTML with XML markup. If you do not select a template, your newly created JSP file will be completely blank.
-		</description>
-	</context>
-</contexts>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index bc6b0ed..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsp.ui.infopop; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/about.html b/docs/org.eclipse.jst.jsp.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties b/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
deleted file mode 100644
index 58c6973..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = EditorJspContexts.xml,\
-               EditorJspContexts2.xml,\
-               about.html,\
-               plugin.xml,\
-               META-INF/,\
-               META-INF/,\
-               EditorJspContexts2.xml,\
-               EditorJspContexts.xml,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               plugin.properties
-generateSourceBundle=false
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties
deleted file mode 100644
index 138c44e..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-# ==============================================================================
-# Translation Instruction: section to be translated
-# ==============================================================================
-Plugin.name = JSP tools infopops
-
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
deleted file mode 100644
index 3d1b116..0000000
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorJspContexts.xml" plugin="org.eclipse.jst.jsp.ui"/>
-       <contexts file="EditorJspContexts2.xml" plugin="org.eclipse.jst.jsp.core"/>
-       <contexts file="JspWizContexts.xml" plugin="org.eclipse.jst.jsp.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/.cvsignore b/docs/org.eclipse.wst.doc.user/.cvsignore
deleted file mode 100644
index 183c840..0000000
--- a/docs/org.eclipse.wst.doc.user/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.doc.user_1.0.0.jar
diff --git a/docs/org.eclipse.wst.doc.user/.project b/docs/org.eclipse.wst.doc.user/.project
deleted file mode 100644
index 94c75b9..0000000
--- a/docs/org.eclipse.wst.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.doc.user</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.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 5cf4c20..0000000
--- a/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.doc.user; singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.wst.doc.user/about.html b/docs/org.eclipse.wst.doc.user/about.html
deleted file mode 100644
index c761715..0000000
--- a/docs/org.eclipse.wst.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<title>About</title>
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the Redistributor's license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.doc.user/book.css b/docs/org.eclipse.wst.doc.user/book.css
deleted file mode 100644
index 0df2553..0000000
--- a/docs/org.eclipse.wst.doc.user/book.css
+++ /dev/null
@@ -1,203 +0,0 @@
-@import "../PRODUCT_PLUGIN/book.css";
-
-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";
-}
-
-/* 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
-}
-
-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
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/build.properties b/docs/org.eclipse.wst.doc.user/build.properties
deleted file mode 100644
index 8307a8e..0000000
--- a/docs/org.eclipse.wst.doc.user/build.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-bin.includes = about.html,\
-               common.css,\
-               commonltr.css,\
-               images/,\
-               META-INF/,\
-               notices.html,\
-               plugin.properties,\
-               plugin.xml,\
-               toc.xml,\
-               reference_toc.xml,\
-               topics/,\
-               book.css,\
-               commonrtl.css
diff --git a/docs/org.eclipse.wst.doc.user/common.css b/docs/org.eclipse.wst.doc.user/common.css
deleted file mode 100644
index 2f4f3f2..0000000
--- a/docs/org.eclipse.wst.doc.user/common.css
+++ /dev/null
@@ -1,1197 +0,0 @@
-body {
-	font-family: Arial, sans-serif;
-	font-size: 0.8em;
-	background-color: #ffffff;
-	color: Black;
-	margin-right: 5em;
-	margin-bottom: 1em;
-}
-
-.ibmfilepath {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-.ibmcommand {
-	font-weight: bold;
-}
-
-.ibmemphasis {
-	font-style: italic;
-}
-
-.mv,.pk,.pkdef,.pv {
-	font-family: monospace;
-	font-size: 100%;
-	padding-top: 0em;
-	padding-right: .3em;
-	padding-bottom: 0em;
-	padding-left: .3em;
-}
-
-tt,samp {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-BODY.nav {
-	background-color: #FFFFFF;
-	border-right: 0.2em ridge black;
-	font-size: 0.95em;
-}
-
-.base {
-	font-weight: normal;
-	font-style: normal;
-	font-variant: normal;
-	text-decoration: none;
-	background-color: #ffffff;
-}
-
-TABLE {
-	color: black;
-	width: 90%;
-	border-collapse: collapse;
-	border-color: Black;
-	background: white;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	margin-left: 0em;
-	margin-right: 0em;
-}
-
-.tbldesc {
-	font-style: italic;
-}
-
-TH {
-	font-weight: bold;
-	font-size: 0.7em;
-	color: black;
-	background-color: #dadada;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TH.base {
-	font-weight: bold;
-	color: black;
-	border: 1 solid #606060;
-	background-color: #dcdada;
-	padding-top: 0.65em;
-	padding-bottom: 0.65em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TD {
-	font-size: 0.7em;
-	color: black;
-	background-color: white;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-CITE {
-	font-style: italic;
-}
-
-EM {
-	font-style: italic;
-}
-
-STRONG {
-	font-weight: bold;
-}
-
-caption {
-	text-align: left;
-	font-style: italic;
-}
-
-DT {
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-}
-
-DD {
-	margin-left: 1.0em;
-}
-
-PRE,pre.cgraphic {
-	font-family: monospace;
-	font-size: 12px;
-	background-color: #dadada;
-	padding: 5px;
-}
-
-.italic {
-	font-style: italic;
-}
-
-.bold {
-	font-weight: bold;
-}
-
-.underlined {
-	text-decoration: underline;
-}
-
-.bold-italic,.boldItalic {
-	font-weight: bold;
-	font-style: italic;
-}
-
-.smallCaps,.smallcaps {
-	text-transform: uppercase;
-	font-size: smaller;
-	font-variant: small-caps;
-}
-
-.italic-underlined {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.bold-underlined {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.bold-italic-underlined {
-	font-weight: bold;
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.smallcaps-underlined {
-	font-variant: small-caps;
-	text-decoration: underline;
-}
-
-.emphasis {
-	font-style: italic;
-}
-
-.inlinedef {
-	font-style: italic;
-}
-
-.sidebar {
-	background: #cccccc;
-}
-
-A:link {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:visited {
-	color: #996699;
-	text-decoration: underline;
-}
-
-A:active {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:hover {
-	color: #996699;;
-	text-decoration: underline;
-}
-
-a.toclink:link {
-	text-decoration: none;
-}
-
-a.toclink:active {
-	text-decoration: none;
-}
-
-a.toclink:visited {
-	text-decoration: none;
-}
-
-a.toclink:hover {
-	text-decoration: underline;
-}
-
-a.ptoclink:link {
-	text-decoration: none;
-}
-
-a.ptoclink:active {
-	text-decoration: none;
-}
-
-a.ptoclink:visited {
-	text-decoration: none;
-}
-
-a.ptoclink:hover {
-	text-decoration: underline;
-}
-
-a.indexlink:link {
-	text-decoration: none;
-}
-
-a.indexlink:active {
-	text-decoration: none;
-}
-
-a.indexlink:visited {
-	text-decoration: none;
-}
-
-a.indexlink:hover {
-	text-decoration: underline;
-}
-
-a.figurelist:link {
-	text-decoration: none;
-}
-
-a.figurelist:active {
-	text-decoration: none;
-}
-
-a.figurelist:visited {
-	text-decoration: none;
-}
-
-a.figurelist:hover {
-	text-decoration: underline;
-}
-
-a.tablelist:link {
-	text-decoration: none;
-}
-
-a.tablelist:active {
-	text-decoration: none;
-}
-
-a.tablelist:visited {
-	text-decoration: none;
-}
-
-a.tablelist:hover {
-	text-decoration: underline;
-}
-
-a.boldgreylink:link {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:visited {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:hover {
-	text-decoration: underline;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-.runningheader {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter a:link {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:active {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:visited {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:hover {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: underline;
-}
-
-#breadcrumb,.breadcrumb,span.breadcrumbs {
-	font-size: 0.75em;
-}
-
-.fastpath {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.fastpathtitle {
-	font-weight: bold;
-}
-
-.toc {
-	font-size: small;
-}
-
-.nested0 {
-	margin-top: 0em;
-}
-
-.p {
-	margin-top: 1em;
-}
-
-span.figcap {
-	font-style: italic;
-}
-
-span.figdesc {
-	font-style: italic;
-}
-
-div.figbox {
-	
-}
-
-div.figrules {
-	
-}
-
-div.fignone {
-	
-}
-
-.fignone {
-	
-}
-
-.figborder {
-	
-}
-
-.figsides {
-	
-}
-
-.figtop {
-	
-}
-
-.figbottom {
-	
-}
-
-.figtopbot {
-	
-}
-
-.parentlink {
-	
-}
-
-.prevlink {
-	
-}
-
-.nextlink {
-	
-}
-
-.relconceptshd {
-	
-}
-
-.reltaskshd {
-	
-}
-
-.relrefhd {
-	
-}
-
-.synnone {
-	
-}
-
-.synborder {
-	
-}
-
-.synsides {
-	
-}
-
-.syntop {
-	
-}
-
-.synbottom {
-	
-}
-
-.syntopbot {
-	
-}
-
-.skip {
-	margin-top: 1em;
-}
-
-.skipspace {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.ulchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.olchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-ul,ol {
-	margin-top: 0.1em;
-	padding-top: 0.1em;
-}
-
-ul.simple {
-	list-style-type: none;
-}
-
-ul.indexlist {
-	list-style-type: none;
-}
-
-OL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-UL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-OL LI DIV P {
-	list-style-type: decimal;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-UL LI DIV P {
-	list-style-type: disc;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-* [compact="yes"]>li {
-	margin-top: 0 em;
-}
-
-* [compact="no"]>li {
-	margin-top: 0.5em;
-}
-
-hr {
-	margin-bottom: 0em;
-	margin-top: 0em;
-	padding-top: 0em;
-	padding-bottom: 0em;
-	width: 90%;
-	color: #cccccc;
-	text-align: center;
-}
-
-H1,.title,.pagetitle,.topictitle1 {
-	font-size: 1.5em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.5em;
-	word-spacing: 0.1em;
-}
-
-H2,.subtitle,.pagesubtitle,.topictitle2 {
-	font-size: 1.25em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.0em;
-	padding-bottom: 0.0em;
-}
-
-H3,.boldtitle,.topictitle3 {
-	font-size: 1.0em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	padding-bottom: 0.1em;
-}
-
-H4,.topictitle4 {
-	font-size: 0.9em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.1em;
-	padding-bottom: 0.1em;
-}
-
-h5,.topictitle5 {
-	font-size: 0.8em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-h6,.topictitle6 {
-	font-size: 0.7em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-div.headtitle {
-	font-size: 1em;
-	font-weight: bold;
-	margin-left: 0em;
-}
-
-div.head0 {
-	font-size: 0.9em;
-	font-weight: bold;
-	margin-left: 0em;
-	margin-top: 0.5em;
-}
-
-div.head1 {
-	font-size: 0.8em;
-	font-weight: bold;
-	margin-left: 1em;
-	padding-top: 0.5em;
-}
-
-div.head2 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 2em;
-}
-
-div.head3 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 3em;
-}
-
-div.head4 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 4em;
-}
-
-div.head5 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 5em;
-}
-
-div.head6 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 6em;
-}
-
-div.head7 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 7em;
-}
-
-div.head8 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 8em;
-}
-
-div.head9 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 9em;
-}
-
-.tip {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.tiptitle {
-	font-weight: bold;
-}
-
-.firstcol {
-	font-weight: bold;
-}
-
-.ptocH1 {
-	font-size: x-small;
-}
-
-.ptocH2 {
-	font-size: x-small;
-}
-
-.stitle {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.nte {
-	
-}
-
-.xxlines {
-	white-space: pre;
-	font-size: 0.95em;
-}
-
-.sectiontitle {
-	margin-top: 1em;
-	margin-bottom: 0em;
-	color: black;
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-div.imageleft {
-	text-align: left;
-}
-
-div.imagecenter {
-	text-align: center;
-}
-
-div.imageright {
-	text-align: right;
-}
-
-div.imagejustify {
-	text-align: justify;
-}
-
-div.mmobj {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjleft {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: left;
-}
-
-div.mmobjcenter {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjright {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: right;
-}
-
-pre.screen {
-	padding: 1em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-	border: thin solid Black;
-	font-size: 100%;
-}
-
-.prereq {
-	margin-left: 1.5em;
-}
-
-.defListHead {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.mv {
-	font-style: italic;
-}
-
-span.md {
-	text-decoration: line-through;
-}
-
-.pk,span.pk {
-	font-weight: bold;
-}
-
-span.pkdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.pv {
-	font-style: italic;
-}
-
-span.pvdef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-span.kwd {
-	font-weight: bold;
-}
-
-span.kdwdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.parmListKwd {
-	font-weight: bold;
-}
-
-.parmListVar {
-	font-style: italic;
-}
-
-span.oper {
-	font-style: normal;
-}
-
-span.operdef {
-	text-decoration: underline;
-}
-
-VAR,span.var {
-	font-style: italic;
-}
-
-span.vardef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-div.msg {
-	padding: 0.2em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-}
-
-div.msgnum {
-	float: left;
-	font-weight: bold;
-	margin-bottom: 1em;
-	margin-right: 1em;
-}
-
-div.msgtext {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-div.msgitemtitle {
-	font-weight: bold;
-}
-
-p.msgitem {
-	margin-top: 0em;
-}
-
-.attention,div.attention {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.attentiontitle,span.attentiontitle {
-	font-weight: bold;
-}
-
-.cautiontitle,div.cautiontitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.caution,div.caution {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.danger,div.danger {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 1em;
-}
-
-.dangertitle,div.dangertitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.important {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.importanttitle {
-	font-weight: bold;
-}
-
-.remember {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.remembertitle {
-	font-weight: bold;
-}
-
-.restriction {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.restrictiontitle {
-	font-weight: bold;
-}
-
-div.warningtitle {
-	font-weight: bold;
-}
-
-div.warningbody {
-	margin-left: 2em
-}
-
-.note {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.notetitle,div.notetitle {
-	font-weight: bold;
-}
-
-div.notebody {
-	margin-left: 2em;
-}
-
-div.notelisttitle {
-	font-weight: bold;
-}
-
-div.fnnum {
-	float: left;
-}
-
-div.fntext {
-	margin-left: 2em;
-}
-
-div.stepl {
-	margin-left: 2em;
-}
-
-div.steplnum {
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-left: 5em;
-}
-
-div.steplnum {
-	font-style: italic;
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-bottom: 0.5em;
-	margin-left: 3em;
-}
-
-div.ledi {
-	margin-left: 3em;
-}
-
-div.ledesc {
-	margin-left: 3em;
-}
-
-span.pblktitle {
-	font-weight: bold;
-}
-
-div.pblklblbox {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	margin-top: 0.2em;
-}
-
-span.ednoticestitle {
-	font-weight: bold;
-}
-
-span.uicontrol {
-	font-weight: bold;
-}
-
-span.term {
-	font-weight: bold;
-}
-
-span.idxshow {
-	color: green;
-}
-
-div.code {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-span.refkey {
-	font-weight: bold;
-	color: white;
-	background-color: black;
-}
-
-tt.apl {
-	font-style: italic;
-}
-
-div.qualifstart {
-	padding: 0.1em 0.5em 0.5em 0.5em;
-	border-top: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-div.qualifend {
-	padding: 0.5em 0.5em 0.1em 0.5em;
-	border-bottom: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-.noshade {
-	background-color: transparent;
-}
-
-.xlight {
-	background-color: #DADADA;
-}
-
-.light {
-	background-color: #B0B0B0;
-}
-
-.medium {
-	background-color: #8C8C8C;
-}
-
-.dark {
-	background-color: #6E6E6E;
-}
-
-.xdark {
-	background-color: #585858;
-}
-
-.light-yellow {
-	background-color: #FFFFCC;
-}
-
-.khaki {
-	background-color: #CCCC99;
-}
-
-.medium-blue {
-	background-color: #6699CC;
-}
-
-.light-blue {
-	background-color: #CCCCFF;
-}
-
-.mid-grey {
-	background-color: #CCCCCC;
-}
-
-.light-grey {
-	background-color: #DADADA;
-}
-
-.lightest-grey {
-	background-color: #E6E6E6;
-}
-
-#changed {
-	position: absolute;
-	left: 0.2em;
-	color: #7B68EE;
-	background-color: #FFFFFF;
-	font-style: normal;
-	font-weight: bold;
-}
-
-INPUT.buttons {
-	font-size: 0.75em;
-	border-top: 0.2em outset #B1B1B1;
-	border-right: 0.2em outset #000000;
-	border-bottom: 0.2em outset #000000;
-	border-left: 0.2em outset #B1B1B1;
-	background-color: #E2E2E2;
-	margin-bottom: 0.2em;
-}
-
-.cgraphic {
-	font-size: 90%;
-	color: black;
-}
-
-.aix,.hpux,.sun,.unix,.win2,.winnt,.win,.zos,.linux,.os390,.os400,.c,.cplusplus,.cobol,.fortran,.java,.macosx,.os2,.pl1,.rpg
-	{
-	background-repeat: no-repeat;
-	background-position: top left;
-	margin-top: 0.5em;
-	text-indent: 55px;
-}
-
-.aix {
-	background-image: url(ngaix.gif);
-}
-
-.hpux {
-	background-image: url(nghpux.gif);
-}
-
-.sun {
-	background-image: url(ngsolaris.gif);
-}
-
-.unix {
-	background-image: url(ngunix.gif);
-}
-
-.win2 {
-	background-image: url(ng2000.gif);
-}
-
-.winxp {
-	background-image: url(ngxp.gif);
-}
-
-.winnt {
-	background-image: url(ngnt.gif);
-}
-
-.win {
-	background-image: url(ngwin.gif);
-}
-
-.zos {
-	background-image: url(ngzos.gif);
-}
-
-.linux {
-	background-image: url(nglinux.gif);
-}
-
-.os390 {
-	background-image: url(ng390.gif);
-}
-
-.os400 {
-	background-image: url(ng400.gif);
-}
-
-.c {
-	background-image: url(ngc.gif);
-}
-
-.cplusplus {
-	background-image: url(ngcpp.gif);
-}
-
-.cobol {
-	background-image: url(ngcobol.gif);
-}
-
-.fortran {
-	background-image: url(ngfortran.gif);
-}
-
-.java {
-	background-image: url(ngjava.gif);
-}
-
-.macosx {
-	background-image: url(ngmacosx.gif);
-}
-
-.os2 {
-	background-image: url(ngos2.gif);
-}
-
-.pl1 {
-	background-image: url(ngpl1.gif);
-}
-
-.rpg {
-	background-image: url(ngrpg.gif);
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/commonltr.css b/docs/org.eclipse.wst.doc.user/commonltr.css
deleted file mode 100644
index e6a8195..0000000
--- a/docs/org.eclipse.wst.doc.user/commonltr.css
+++ /dev/null
@@ -1,1306 +0,0 @@
-/*
- | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
- */
- 
-.unresolved { background-color: skyblue; }
-.noTemplate { background-color: yellow; }
-
-.base { background-color: #ffffff; }
-
-/* Add space for top level topics */
-.nested0 { margin-top : 1em;}
-
-/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
-.p {margin-top: 1em}
-
-/* Default of italics to set apart figure captions */
-.figcap { font-style: italic }
-.figdesc { font-style: normal }
-
-/* Use @frame to create frames on figures */
-.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.figbottom { border-bottom : 2px solid; border-color : Silver;}
-.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-/* Most link groups are created with <div>. Ensure they have space before and after. */
-.ullinks { list-style-type: none }
-.ulchildlink { margin-top: 1em; margin-bottom: 1em }
-.olchildlink { margin-top: 1em; margin-bottom: 1em }
-.linklist { margin-bottom: 1em }
-.linklistwithchild { margin-left: 1.5em; margin-bottom: 1em  }
-.sublinklist { margin-left: 1.5em; margin-bottom: 1em  }
-.relconcepts { margin-top: 1em; margin-bottom: 1em }
-.reltasks { margin-top: 1em; margin-bottom: 1em }
-.relref { margin-top: 1em; margin-bottom: 1em }
-.relinfo { margin-top: 1em; margin-bottom: 1em }
-.breadcrumb { font-size : smaller; margin-bottom: 1em }
-.prereq { margin-left : 20px;}
-
-/* Set heading sizes, getting smaller for deeper nesting */
-.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
-.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
-.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
-.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
-.topictitle5 { font-size: 1.17em; font-weight: bold; }
-.topictitle6 { font-size: 1.17em; font-style: italic; }
-.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
-.section { margin-top: 1em; margin-bottom: 1em }
-.example { margin-top: 1em; margin-bottom: 1em }
-
-/* All note formats have the same default presentation */
-.note { margin-top: 1em; margin-bottom : 1em;}
-.notetitle { font-weight: bold }
-.notelisttitle { font-weight: bold }
-.tip { margin-top: 1em; margin-bottom : 1em;}
-.tiptitle { font-weight: bold }
-.fastpath { margin-top: 1em; margin-bottom : 1em;}
-.fastpathtitle { font-weight: bold }
-.important { margin-top: 1em; margin-bottom : 1em;}
-.importanttitle { font-weight: bold }
-.remember { margin-top: 1em; margin-bottom : 1em;}
-.remembertitle { font-weight: bold }
-.restriction { margin-top: 1em; margin-bottom : 1em;}
-.restrictiontitle { font-weight: bold }
-.attention { margin-top: 1em; margin-bottom : 1em;}
-.attentiontitle { font-weight: bold }
-.dangertitle { font-weight: bold }
-.danger { margin-top: 1em; margin-bottom : 1em;}
-.cautiontitle { font-weight: bold }
-.caution { font-weight: bold; margin-bottom : 1em; }
-
-/* Simple lists do not get a bullet */
-ul.simple { list-style-type: none }
-
-/* Used on the first column of a table, when rowheader="firstcol" is used */
-.firstcol { font-weight : bold;}
-
-/* Various basic phrase styles */
-.bold { font-weight: bold; }
-.boldItalic { font-weight: bold; font-style: italic; }
-.italic { font-style: italic; }
-.underlined { text-decoration: underline; }
-.uicontrol { font-weight: bold; }
-.parmname { font-weight: bold; }
-.kwd { font-weight: bold; }
-.defkwd { font-weight: bold; text-decoration: underline; }
-.var { font-style : italic;}
-.shortcut { text-decoration: underline; }
-
-/* Default of bold for definition list terms */
-.dlterm { font-weight: bold; }
-
-/* Use CSS to expand lists with @compact="no" */
-.dltermexpand { font-weight: bold; margin-top: 1em; }
-*[compact="yes"]>li { margin-top: 0em;}
-*[compact="no"]>li { margin-top: .53em;}	
-.liexpand { margin-top: 1em; margin-bottom: 1em }
-.sliexpand { margin-top: 1em; margin-bottom: 1em }
-.dlexpand { margin-top: 1em; margin-bottom: 1em }
-.ddexpand { margin-top: 1em; margin-bottom: 1em }
-.stepexpand { margin-top: 1em; margin-bottom: 1em }
-.substepexpand { margin-top: 1em; margin-bottom: 1em }
-
-/* Align images based on @align on topic/image */
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
-
-/* copied from common.css */
-body {
-	font-family: Arial, sans-serif;
-	font-size: 0.8em;
-	background-color: #ffffff;
-	color: Black;
-	margin-right: 5em;
-	margin-bottom: 1em;
-}
-
-.ibmfilepath {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-.ibmcommand {
-	font-weight: bold;
-}
-
-.ibmemphasis {
-	font-style: italic;
-}
-
-.mv,.pk,.pkdef,.pv {
-	font-family: monospace;
-	font-size: 100%;
-	padding-top: 0em;
-	padding-right: .3em;
-	padding-bottom: 0em;
-	padding-left: .3em;
-}
-
-tt,samp {
-	font-family: monospace;
-	font-size: 100%;
-}
-
-BODY.nav {
-	background-color: #FFFFFF;
-	border-right: 0.2em ridge black;
-	font-size: 0.95em;
-}
-
-.base {
-	font-weight: normal;
-	font-style: normal;
-	font-variant: normal;
-	text-decoration: none;
-	background-color: #ffffff;
-}
-
-TABLE {
-	color: black;
-	width: 90%;
-	border-collapse: collapse;
-	border-color: Black;
-	background: white;
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-	margin-left: 0em;
-	margin-right: 0em;
-}
-
-.tbldesc {
-	font-style: italic;
-}
-
-TH {
-	font-weight: bold;
-	font-size: 0.7em;
-	color: black;
-	background-color: #dadada;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TH.base {
-	font-weight: bold;
-	color: black;
-	border: 1 solid #606060;
-	background-color: #dcdada;
-	padding-top: 0.65em;
-	padding-bottom: 0.65em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-TD {
-	font-size: 0.7em;
-	color: black;
-	background-color: white;
-	padding-top: 0.1em;
-	padding-bottom: 0.3em;
-	padding-left: 1em;
-	padding-right: 1em;
-}
-
-CITE {
-	font-style: italic;
-}
-
-EM {
-	font-style: italic;
-}
-
-STRONG {
-	font-weight: bold;
-}
-
-caption {
-	text-align: left;
-	font-style: italic;
-}
-
-DT {
-	margin-top: 0.5em;
-	margin-bottom: 0.5em;
-}
-
-DD {
-	margin-left: 1.0em;
-}
-
-PRE,pre.cgraphic {
-	font-family: monospace;
-	font-size: 12px;
-	background-color: #dadada;
-	padding: 5px;
-}
-
-.italic {
-	font-style: italic;
-}
-
-.bold {
-	font-weight: bold;
-}
-
-.underlined {
-	text-decoration: underline;
-}
-
-.bold-italic,.boldItalic {
-	font-weight: bold;
-	font-style: italic;
-}
-
-.smallCaps,.smallcaps {
-	text-transform: uppercase;
-	font-size: smaller;
-	font-variant: small-caps;
-}
-
-.italic-underlined {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.bold-underlined {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.bold-italic-underlined {
-	font-weight: bold;
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.smallcaps-underlined {
-	font-variant: small-caps;
-	text-decoration: underline;
-}
-
-.emphasis {
-	font-style: italic;
-}
-
-.inlinedef {
-	font-style: italic;
-}
-
-.sidebar {
-	background: #cccccc;
-}
-
-A:link {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:visited {
-	color: #996699;
-	text-decoration: underline;
-}
-
-A:active {
-	color: #006699;
-	text-decoration: underline;
-}
-
-A:hover {
-	color: #996699;;
-	text-decoration: underline;
-}
-
-a.toclink:link {
-	text-decoration: none;
-}
-
-a.toclink:active {
-	text-decoration: none;
-}
-
-a.toclink:visited {
-	text-decoration: none;
-}
-
-a.toclink:hover {
-	text-decoration: underline;
-}
-
-a.ptoclink:link {
-	text-decoration: none;
-}
-
-a.ptoclink:active {
-	text-decoration: none;
-}
-
-a.ptoclink:visited {
-	text-decoration: none;
-}
-
-a.ptoclink:hover {
-	text-decoration: underline;
-}
-
-a.indexlink:link {
-	text-decoration: none;
-}
-
-a.indexlink:active {
-	text-decoration: none;
-}
-
-a.indexlink:visited {
-	text-decoration: none;
-}
-
-a.indexlink:hover {
-	text-decoration: underline;
-}
-
-a.figurelist:link {
-	text-decoration: none;
-}
-
-a.figurelist:active {
-	text-decoration: none;
-}
-
-a.figurelist:visited {
-	text-decoration: none;
-}
-
-a.figurelist:hover {
-	text-decoration: underline;
-}
-
-a.tablelist:link {
-	text-decoration: none;
-}
-
-a.tablelist:active {
-	text-decoration: none;
-}
-
-a.tablelist:visited {
-	text-decoration: none;
-}
-
-a.tablelist:hover {
-	text-decoration: underline;
-}
-
-a.boldgreylink:link {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:visited {
-	text-decoration: none;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-a.boldgreylink:hover {
-	text-decoration: underline;
-	color: #333333;
-	font-family: Verdana, Arial, sans-serif;
-	font-weight: bold;
-	font-size: 0.9em;
-}
-
-.runningheader {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 0.7em;
-}
-
-.runningfooter a:link {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:active {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:visited {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: none;
-}
-
-.runningfooter a:hover {
-	font-weight: bold;
-	color: #000000;
-	text-decoration: underline;
-}
-
-#breadcrumb,.breadcrumb,span.breadcrumbs {
-	font-size: 0.75em;
-}
-
-.fastpath {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.fastpathtitle {
-	font-weight: bold;
-}
-
-.toc {
-	font-size: small;
-}
-
-.nested0 {
-	margin-top: 0em;
-}
-
-.p {
-	margin-top: 1em;
-}
-
-span.figcap {
-	font-style: italic;
-}
-
-span.figdesc {
-	font-style: italic;
-}
-
-div.figbox {
-	
-}
-
-div.figrules {
-	
-}
-
-div.fignone {
-	
-}
-
-.fignone {
-	
-}
-
-.figborder {
-	
-}
-
-.figsides {
-	
-}
-
-.figtop {
-	
-}
-
-.figbottom {
-	
-}
-
-.figtopbot {
-	
-}
-
-.parentlink {
-	
-}
-
-.prevlink {
-	
-}
-
-.nextlink {
-	
-}
-
-.relconceptshd {
-	
-}
-
-.reltaskshd {
-	
-}
-
-.relrefhd {
-	
-}
-
-.synnone {
-	
-}
-
-.synborder {
-	
-}
-
-.synsides {
-	
-}
-
-.syntop {
-	
-}
-
-.synbottom {
-	
-}
-
-.syntopbot {
-	
-}
-
-.skip {
-	margin-top: 1em;
-}
-
-.skipspace {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.ulchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.olchildlink {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-ul,ol {
-	margin-top: 0.1em;
-	padding-top: 0.1em;
-}
-
-ul.simple {
-	list-style-type: none;
-}
-
-ul.indexlist {
-	list-style-type: none;
-}
-
-OL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-UL LI {
-	margin-top: 0.0em;
-	margin-bottom: 0.0em;
-	margin-left: 0.0em;
-}
-
-OL LI DIV P {
-	list-style-type: decimal;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-UL LI DIV P {
-	list-style-type: disc;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-}
-
-* [compact="yes"]>li {
-	margin-top: 0 em;
-}
-
-* [compact="no"]>li {
-	margin-top: 0.5em;
-}
-
-hr {
-	margin-bottom: 0em;
-	margin-top: 0em;
-	padding-top: 0em;
-	padding-bottom: 0em;
-	width: 90%;
-	color: #cccccc;
-	text-align: center;
-}
-
-H1,.title,.pagetitle,.topictitle1 {
-	font-size: 1.5em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.5em;
-	word-spacing: 0.1em;
-}
-
-H2,.subtitle,.pagesubtitle,.topictitle2 {
-	font-size: 1.25em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.0em;
-	padding-bottom: 0.0em;
-}
-
-H3,.boldtitle,.topictitle3 {
-	font-size: 1.0em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	padding-bottom: 0.1em;
-}
-
-H4,.topictitle4 {
-	font-size: 0.9em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0.1em;
-	padding-bottom: 0.1em;
-}
-
-h5,.topictitle5 {
-	font-size: 0.8em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-h6,.topictitle6 {
-	font-size: 0.7em;
-	font-style: normal;
-	font-weight: bold;
-	margin-bottom: 0em;
-	padding-bottom: 0em;
-}
-
-div.headtitle {
-	font-size: 1em;
-	font-weight: bold;
-	margin-left: 0em;
-}
-
-div.head0 {
-	font-size: 0.9em;
-	font-weight: bold;
-	margin-left: 0em;
-	margin-top: 0.5em;
-}
-
-div.head1 {
-	font-size: 0.8em;
-	font-weight: bold;
-	margin-left: 1em;
-	padding-top: 0.5em;
-}
-
-div.head2 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 2em;
-}
-
-div.head3 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 3em;
-}
-
-div.head4 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 4em;
-}
-
-div.head5 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 5em;
-}
-
-div.head6 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 6em;
-}
-
-div.head7 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 7em;
-}
-
-div.head8 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 8em;
-}
-
-div.head9 {
-	font-size: 0.7em;
-	font-weight: normal;
-	margin-left: 9em;
-}
-
-.tip {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.tiptitle {
-	font-weight: bold;
-}
-
-.firstcol {
-	font-weight: bold;
-}
-
-.ptocH1 {
-	font-size: x-small;
-}
-
-.ptocH2 {
-	font-size: x-small;
-}
-
-.stitle {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-.nte {
-	
-}
-
-.xxlines {
-	white-space: pre;
-	font-size: 0.95em;
-}
-
-.sectiontitle {
-	margin-top: 1em;
-	margin-bottom: 0em;
-	color: black;
-	font-size: 1.2em;
-	font-weight: bold;
-}
-
-div.imageleft {
-	text-align: left;
-}
-
-div.imagecenter {
-	text-align: center;
-}
-
-div.imageright {
-	text-align: right;
-}
-
-div.imagejustify {
-	text-align: justify;
-}
-
-div.mmobj {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjleft {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: left;
-}
-
-div.mmobjcenter {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: center;
-}
-
-div.mmobjright {
-	margin-top: 1em;
-	margin-bottom: 1em;
-	text-align: right;
-}
-
-pre.screen {
-	padding: 1em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-	border: thin solid Black;
-	font-size: 100%;
-}
-
-.prereq {
-	margin-left: 1.5em;
-}
-
-.defListHead {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.mv {
-	font-style: italic;
-}
-
-span.md {
-	text-decoration: line-through;
-}
-
-.pk,span.pk {
-	font-weight: bold;
-}
-
-span.pkdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-span.pv {
-	font-style: italic;
-}
-
-span.pvdef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-span.kwd {
-	font-weight: bold;
-}
-
-span.kdwdef {
-	font-weight: bold;
-	text-decoration: underline;
-}
-
-.parmListKwd {
-	font-weight: bold;
-}
-
-.parmListVar {
-	font-style: italic;
-}
-
-span.oper {
-	font-style: normal;
-}
-
-span.operdef {
-	text-decoration: underline;
-}
-
-VAR,span.var {
-	font-style: italic;
-}
-
-span.vardef {
-	font-style: italic;
-	text-decoration: underline;
-}
-
-div.msg {
-	padding: 0.2em 1em 1em 1em;
-	margin-top: 0.4em;
-	margin-bottom: 0.4em;
-}
-
-div.msgnum {
-	float: left;
-	font-weight: bold;
-	margin-bottom: 1em;
-	margin-right: 1em;
-}
-
-div.msgtext {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-div.msgitemtitle {
-	font-weight: bold;
-}
-
-p.msgitem {
-	margin-top: 0em;
-}
-
-.attention,div.attention {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.attentiontitle,span.attentiontitle {
-	font-weight: bold;
-}
-
-.cautiontitle,div.cautiontitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.caution,div.caution {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.danger,div.danger {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 1em;
-}
-
-.dangertitle,div.dangertitle {
-	margin-top: 1em;
-	font-weight: bold;
-}
-
-.important {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.importanttitle {
-	font-weight: bold;
-}
-
-.remember {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.remembertitle {
-	font-weight: bold;
-}
-
-.restriction {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.restrictiontitle {
-	font-weight: bold;
-}
-
-div.warningtitle {
-	font-weight: bold;
-}
-
-div.warningbody {
-	margin-left: 2em
-}
-
-.note {
-	margin-top: 1em;
-	margin-bottom: 1em;
-}
-
-.notetitle,div.notetitle {
-	font-weight: bold;
-}
-
-div.notebody {
-	margin-left: 2em;
-}
-
-div.notelisttitle {
-	font-weight: bold;
-}
-
-div.fnnum {
-	float: left;
-}
-
-div.fntext {
-	margin-left: 2em;
-}
-
-div.stepl {
-	margin-left: 2em;
-}
-
-div.steplnum {
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-left: 5em;
-}
-
-div.steplnum {
-	font-style: italic;
-	font-weight: bold;
-	float: left;
-	margin-left: 0.5em;
-}
-
-div.stepltext {
-	margin-bottom: 0.5em;
-	margin-left: 3em;
-}
-
-div.ledi {
-	margin-left: 3em;
-}
-
-div.ledesc {
-	margin-left: 3em;
-}
-
-span.pblktitle {
-	font-weight: bold;
-}
-
-div.pblklblbox {
-	padding: 0.5em 0.5em 0.5em 0.5em;
-	border: solid;
-	border-width: thin;
-	margin-top: 0.2em;
-}
-
-span.ednoticestitle {
-	font-weight: bold;
-}
-
-span.term {
-	font-weight: bold;
-}
-
-span.idxshow {
-	color: green;
-}
-
-div.code {
-	font-weight: bold;
-	margin-bottom: 1em;
-}
-
-span.refkey {
-	font-weight: bold;
-	color: white;
-	background-color: black;
-}
-
-tt.apl {
-	font-style: italic;
-}
-
-div.qualifstart {
-	padding: 0.1em 0.5em 0.5em 0.5em;
-	border-top: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-top: 0.2em;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-div.qualifend {
-	padding: 0.5em 0.5em 0.1em 0.5em;
-	border-bottom: solid;
-	border-left: solid;
-	border-right: solid;
-	border-width: thin;
-	font-weight: bold;
-	margin-bottom: 0.2em;
-	text-align: center;
-}
-
-.noshade {
-	background-color: transparent;
-}
-
-.xlight {
-	background-color: #DADADA;
-}
-
-.light {
-	background-color: #B0B0B0;
-}
-
-.medium {
-	background-color: #8C8C8C;
-}
-
-.dark {
-	background-color: #6E6E6E;
-}
-
-.xdark {
-	background-color: #585858;
-}
-
-.light-yellow {
-	background-color: #FFFFCC;
-}
-
-.khaki {
-	background-color: #CCCC99;
-}
-
-.medium-blue {
-	background-color: #6699CC;
-}
-
-.light-blue {
-	background-color: #CCCCFF;
-}
-
-.mid-grey {
-	background-color: #CCCCCC;
-}
-
-.light-grey {
-	background-color: #DADADA;
-}
-
-.lightest-grey {
-	background-color: #E6E6E6;
-}
-
-#changed {
-	position: absolute;
-	left: 0.2em;
-	color: #7B68EE;
-	background-color: #FFFFFF;
-	font-style: normal;
-	font-weight: bold;
-}
-
-INPUT.buttons {
-	font-size: 0.75em;
-	border-top: 0.2em outset #B1B1B1;
-	border-right: 0.2em outset #000000;
-	border-bottom: 0.2em outset #000000;
-	border-left: 0.2em outset #B1B1B1;
-	background-color: #E2E2E2;
-	margin-bottom: 0.2em;
-}
-
-.cgraphic {
-	font-size: 90%;
-	color: black;
-}
-
-.aix,.hpux,.sun,.unix,.win2,.winnt,.win,.zos,.linux,.os390,.os400,.c,.cplusplus,.cobol,.fortran,.java,.macosx,.os2,.pl1,.rpg
-	{
-	background-repeat: no-repeat;
-	background-position: top left;
-	margin-top: 0.5em;
-	text-indent: 55px;
-}
-
-.aix {
-	background-image: url(ngaix.gif);
-}
-
-.hpux {
-	background-image: url(nghpux.gif);
-}
-
-.sun {
-	background-image: url(ngsolaris.gif);
-}
-
-.unix {
-	background-image: url(ngunix.gif);
-}
-
-.win2 {
-	background-image: url(ng2000.gif);
-}
-
-.winxp {
-	background-image: url(ngxp.gif);
-}
-
-.winnt {
-	background-image: url(ngnt.gif);
-}
-
-.win {
-	background-image: url(ngwin.gif);
-}
-
-.zos {
-	background-image: url(ngzos.gif);
-}
-
-.linux {
-	background-image: url(nglinux.gif);
-}
-
-.os390 {
-	background-image: url(ng390.gif);
-}
-
-.os400 {
-	background-image: url(ng400.gif);
-}
-
-.c {
-	background-image: url(ngc.gif);
-}
-
-.cplusplus {
-	background-image: url(ngcpp.gif);
-}
-
-.cobol {
-	background-image: url(ngcobol.gif);
-}
-
-.fortran {
-	background-image: url(ngfortran.gif);
-}
-
-.java {
-	background-image: url(ngjava.gif);
-}
-
-.macosx {
-	background-image: url(ngmacosx.gif);
-}
-
-.os2 {
-	background-image: url(ngos2.gif);
-}
-
-.pl1 {
-	background-image: url(ngpl1.gif);
-}
-
-.rpg {
-	background-image: url(ngrpg.gif);
-}
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/commonrtl.css b/docs/org.eclipse.wst.doc.user/commonrtl.css
deleted file mode 100644
index 2350b01..0000000
--- a/docs/org.eclipse.wst.doc.user/commonrtl.css
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- | (c) Copyright IBM Corp. 2004, 2005 All Rights Reserved.
- */
- 
-.unresolved { background-color: skyblue; }
-.noTemplate { background-color: yellow; }
-
-.base { background-color: #ffffff; }
-
-/* Add space for top level topics */
-.nested0 { margin-top : 1em;}
-
-/* div with class=p is used for paragraphs that contain blocks, to keep the XHTML valid */
-.p {margin-top: 1em}
-
-/* Default of italics to set apart figure captions */
-.figcap { font-style: italic }
-.figdesc { font-style: normal }
-
-/* Use @frame to create frames on figures */
-.figborder { border-style: solid; padding-left : 3px; border-width : 2px; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figsides { border-left : 2px solid; padding-left : 3px; border-right : 2px solid; padding-right : 3px; margin-top: 1em; border-color : Silver;}
-.figtop { border-top : 2px solid; margin-top: 1em; border-color : Silver;}
-.figbottom { border-bottom : 2px solid; border-color : Silver;}
-.figtopbot { border-top : 2px solid; border-bottom : 2px solid; margin-top: 1em; border-color : Silver;}
-
-/* Most link groups are created with <div>. Ensure they have space before and after. */
-.ullinks { list-style-type: none }
-.ulchildlink { margin-top: 1em; margin-bottom: 1em }
-.olchildlink { margin-top: 1em; margin-bottom: 1em }
-.linklist { margin-top: 1em; margin-bottom: 1em }
-.linklistwithchild { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
-.sublinklist { margin-top: 1em; margin-right: 1.5em; margin-bottom: 1em  }
-.relconcepts { margin-top: 1em; margin-bottom: 1em }
-.reltasks { margin-top: 1em; margin-bottom: 1em }
-.relref { margin-top: 1em; margin-bottom: 1em }
-.relinfo { margin-top: 1em; margin-bottom: 1em }
-.breadcrumb { font-size : smaller; margin-bottom: 1em }
-.prereq { margin-right : 20px;}
-
-/* Set heading sizes, getting smaller for deeper nesting */
-.topictitle1 { margin-top: 0pc; margin-bottom: .1em; font-size: 1.34em; }
-.topictitle2 { margin-top: 1pc; margin-bottom: .45em; font-size: 1.17em; }
-.topictitle3 { margin-top: 1pc; margin-bottom: .17em; font-size: 1.17em; font-weight: bold; }
-.topictitle4 { margin-top: .83em; font-size: 1.17em; font-weight: bold; }
-.topictitle5 { font-size: 1.17em; font-weight: bold; }
-.topictitle6 { font-size: 1.17em; font-style: italic; }
-.sectiontitle { margin-top: 1em; margin-bottom: 0em; color: black; font-size: 1.17em; font-weight: bold;}
-.section { margin-top: 1em; margin-bottom: 1em }
-.example { margin-top: 1em; margin-bottom: 1em }
-
-/* All note formats have the same default presentation */
-.note { margin-top: 1em; margin-bottom : 1em;}
-.notetitle { font-weight: bold }
-.notelisttitle { font-weight: bold }
-.tip { margin-top: 1em; margin-bottom : 1em;}
-.tiptitle { font-weight: bold }
-.fastpath { margin-top: 1em; margin-bottom : 1em;}
-.fastpathtitle { font-weight: bold }
-.important { margin-top: 1em; margin-bottom : 1em;}
-.importanttitle { font-weight: bold }
-.remember { margin-top: 1em; margin-bottom : 1em;}
-.remembertitle { font-weight: bold }
-.restriction { margin-top: 1em; margin-bottom : 1em;}
-.restrictiontitle { font-weight: bold }
-.attention { margin-top: 1em; margin-bottom : 1em;}
-.attentiontitle { font-weight: bold }
-.dangertitle { font-weight: bold }
-.danger { margin-top: 1em; margin-bottom : 1em;}
-.cautiontitle { font-weight: bold }
-.caution { font-weight: bold; margin-bottom : 1em; }
-
-/* Simple lists do not get a bullet */
-ul.simple { list-style-type: none }
-
-/* Used on the first column of a table, when rowheader="firstcol" is used */
-.firstcol { font-weight : bold;}
-
-/* Various basic phrase styles */
-.bold { font-weight: bold; }
-.boldItalic { font-weight: bold; font-style: italic; }
-.italic { font-style: italic; }
-.underlined { text-decoration: underline; }
-.uicontrol { font-weight: bold; }
-.parmname { font-weight: bold; }
-.kwd { font-weight: bold; }
-.defkwd { font-weight: bold; text-decoration: underline; }
-.var { font-style : italic;}
-.shortcut { text-decoration: underline; }
-
-/* Default of bold for definition list terms */
-.dlterm { font-weight: bold; }
-
-/* Use CSS to expand lists with @compact="no" */
-.dltermexpand { font-weight: bold; margin-top: 1em; }
-*[compact="yes"]>li { margin-top: 0em;}
-*[compact="no"]>li { margin-top: .53em;}
-.liexpand { margin-top: 1em; margin-bottom: 1em }
-.sliexpand { margin-top: 1em; margin-bottom: 1em }
-.dlexpand { margin-top: 1em; margin-bottom: 1em }
-.ddexpand { margin-top: 1em; margin-bottom: 1em }
-.stepexpand { margin-top: 1em; margin-bottom: 1em }
-.substepexpand { margin-top: 1em; margin-bottom: 1em }
-
-/* Align images based on @align on topic/image */
-div.imageleft { text-align: left }
-div.imagecenter { text-align: center }
-div.imageright { text-align: right }
-div.imagejustify { text-align: justify }
-
-pre.screen { padding: 5px 5px 5px 5px; border: outset; background-color: #CCCCCC; margin-top: 2px; margin-bottom : 2px; white-space: pre}
-
-
diff --git a/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg b/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg
deleted file mode 100644
index 398dbe4..0000000
--- a/docs/org.eclipse.wst.doc.user/images/SelectExistingServer.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg b/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg
deleted file mode 100644
index 95f6b44..0000000
--- a/docs/org.eclipse.wst.doc.user/images/SelectNewServer.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg
deleted file mode 100644
index 9064bb8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg
deleted file mode 100644
index eca4347..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure2.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg
deleted file mode 100644
index 5d87d0c..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure3.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg
deleted file mode 100644
index c334bbf..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure4.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg b/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg
deleted file mode 100644
index a94614e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/XMLCatalog-Figure5.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/image99L.jpg b/docs/org.eclipse.wst.doc.user/images/image99L.jpg
deleted file mode 100644
index 506abdb..0000000
--- a/docs/org.eclipse.wst.doc.user/images/image99L.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg b/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg
deleted file mode 100644
index be7350e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageEJ9.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg b/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg
deleted file mode 100644
index d2f625c..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageIAI.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg b/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg
deleted file mode 100644
index ff98f42..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageLKF.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageO78.jpg b/docs/org.eclipse.wst.doc.user/images/imageO78.jpg
deleted file mode 100644
index 67077f8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageO78.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/imageU71.jpg b/docs/org.eclipse.wst.doc.user/images/imageU71.jpg
deleted file mode 100644
index 9ee0430..0000000
--- a/docs/org.eclipse.wst.doc.user/images/imageU71.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/note.gif b/docs/org.eclipse.wst.doc.user/images/note.gif
deleted file mode 100644
index f6260db..0000000
--- a/docs/org.eclipse.wst.doc.user/images/note.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png b/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png
deleted file mode 100644
index 25f260f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/selectRootElementDTD.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png b/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png
deleted file mode 100644
index 9955ed3..0000000
--- a/docs/org.eclipse.wst.doc.user/images/selectRootElementXSD.png
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdl.gif b/docs/org.eclipse.wst.doc.user/images/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif b/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif
deleted file mode 100644
index 9f074e8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdl_main.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg
deleted file mode 100644
index ebcd1c7..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-backbutton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg
deleted file mode 100644
index be74d57..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-binding.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg
deleted file mode 100644
index 15d6071..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-complex-type.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg
deleted file mode 100644
index 9c56342..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-finished-wsdl.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg
deleted file mode 100644
index 8dc34a3..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-operation.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg
deleted file mode 100644
index 57ddb29..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-skeleton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg
deleted file mode 100644
index 50553f6..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-new-wizard.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg
deleted file mode 100644
index f48165e..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-setelement-dialog.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg
deleted file mode 100644
index 8a36a66..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-settype-dialog.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg b/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg
deleted file mode 100644
index cc68a44..0000000
--- a/docs/org.eclipse.wst.doc.user/images/wsdleditor-smart-rename1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg
deleted file mode 100644
index 2092605..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-backbutton.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg
deleted file mode 100644
index f3b4f6f..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure1.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg
deleted file mode 100644
index 518c606..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure2.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg
deleted file mode 100644
index a66b6e7..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure3.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg
deleted file mode 100644
index 2a187da..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure4.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg
deleted file mode 100644
index b9622ef..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure5.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg
deleted file mode 100644
index 6e253b8..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure6.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg
deleted file mode 100644
index dfb7523..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure7.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg
deleted file mode 100644
index ef61772..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure8.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg b/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg
deleted file mode 100644
index 664eecc..0000000
--- a/docs/org.eclipse.wst.doc.user/images/xsdeditor-figure9.jpg
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.doc.user/notices.html b/docs/org.eclipse.wst.doc.user/notices.html
deleted file mode 100644
index 58b6069..0000000
--- a/docs/org.eclipse.wst.doc.user/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, 2007.</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.wst.doc.user/plugin.properties b/docs/org.eclipse.wst.doc.user/plugin.properties
deleted file mode 100644
index 6163b89..0000000
--- a/docs/org.eclipse.wst.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +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   = Master User Doc TOC
-providerName = Eclipse.org
diff --git a/docs/org.eclipse.wst.doc.user/plugin.xml b/docs/org.eclipse.wst.doc.user/plugin.xml
deleted file mode 100644
index 4e48f34..0000000
--- a/docs/org.eclipse.wst.doc.user/plugin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-	<extension point="org.eclipse.help.toc">
-		<toc file="toc.xml" primary="true" />
-	</extension>
-	<extension point="org.eclipse.help.toc">
-		<toc file="reference_toc.xml"/>
-	</extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.doc.user/reference_toc.xml b/docs/org.eclipse.wst.doc.user/reference_toc.xml
deleted file mode 100644
index 9d4b726..0000000
--- a/docs/org.eclipse.wst.doc.user/reference_toc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-<!-- ============================================================================= -->
-<!-- Define the top level topics                                                   -->
-<!-- ============================================================================= -->
-<toc label="Web Tools Platform reference information">
-   <anchor id="command_reference"/>
-   <anchor id="UI_reference"/>
-   <anchor id="javadoc_common"/>
-   <anchor id="javadoc_ejbtools"/>
-   <anchor id="javadoc_jeetools"/>
-   <anchor id="javadoc_servertools"/>
-   <anchor id="javadoc_sourceediting"/>
-   <anchor id="javadoc_xml"/>
-   <anchor id="javadoc_webservices"/>
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/toc.xml b/docs/org.eclipse.wst.doc.user/toc.xml
deleted file mode 100644
index 944270c..0000000
--- a/docs/org.eclipse.wst.doc.user/toc.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-<!-- ============================================================================= -->
-<!-- Define the top level topics                                                   -->
-<!-- ============================================================================= -->
-<toc label="Web Tools Platform User Guide"
-	topic="topics/overview.html">
-
-	<topic label="Creating Web applications">
-		<link
-			toc="../org.eclipse.wst.webtools.doc.user/webtools_toc.xml" />
-	</topic>
-	<topic label="Creating Java EE and enterprise applications">
-		<link toc="../org.eclipse.jst.j2ee.doc.user/jst_j2ee_toc.xml" />
-		<link toc="../org.eclipse.jst.ejb.doc.user/ejb_toc.xml" />
-	</topic>
-	<topic label="Editing markup language files"
-		href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html">
-		<link toc="../org.eclipse.wst.sse.doc.user/sse_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml" />
-		<link
-			toc="../org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml" />
-	</topic>
-	<!-- <link toc="../org.eclipse.wst.xml.doc.user/xml_toc.xml"/>-->
-	<topic label="Developing Web service applications">
-		<link toc="../org.eclipse.jst.ws.doc.user/webservice_toc.xml" />
-	</topic>
-	<topic label="Using the server tools">
-  		<link toc="../org.eclipse.wst.server.ui.doc.user/wtp_main_toc.xml" />
-	</topic>
-	<topic label="Reference">
-  		<link toc="reference_toc.xml" />
-	</topic>
-	<topic label="Limitations and Known Issues" href="topics/limitations.html" />
-	<topic label="Legal" href="notices.html" />
-</toc>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/topics/limitations.html b/docs/org.eclipse.wst.doc.user/topics/limitations.html
deleted file mode 100644
index f890bd7..0000000
--- a/docs/org.eclipse.wst.doc.user/topics/limitations.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css"
-	href="../../org.eclipse.wst.doc.user/common.css" >
-<title>Web Tools Platform Limitations and Known Issues</title>
-</head>
-<body>
-<h1>Web Tools Platform Limitations and Known Issues</h1>
-<p>The following are limitations and known issues:</p>
-<dl>
-<dt class="dlterm"><b>When using XDoclet the generation does not appear to run.</b></dt>
-<dd><p>Cause: XDoclet has some limitations with long path names.</p>
-<p>Solution: You should install Eclipse and the Web Tools Platform into a directory with a short
-path.</p>
-</dd>
-<dt class="dlterm"><b>When creating a Web service you may see a message similar to the following one:</b></dt>
-<dd><p><samp>org.apache.axis.utils.JavaUtils isAttachmentSupported
-WARNING: Unable to find required classes (javax.activation.DataHandler and 
-javax.mail.internet.MimeMultipart). Attachment support is disabled.
-</samp></p>
-<p>Cause: Attachment support is disabled.</p>
-<p>Solution: The Apache Axis tools should auto-detect the javax.activation classes provided you add 
-<samp>activation.jar</samp> to the build path of the project to which you are generating your Web service or client. 
-For services, you will also need to make sure <samp>activation.jar</samp> is available to the Tomcat JRE, either by 
-including it in the server's global classpath or by placing a copy of activation.jar into the target Web 
-project's <samp>lib/</samp> directory.
-</p>
-</dd>
-<dt class="dlterm"><b>Problems encountered publishing from dynamic Web projects with non-ASCII characters in the context root</b></dt>
-<dd>
-<p>Cause: By default the context root of a dynamic Web project uses the project name. If non-ASCII characters are used as project names for dynamic Web projects, 
-the default context root causes problems when trying to publish from the Web project.</p>
-<p>You may encounter the following errors if this occurs:
-<ul>
-<li>If you create a dynamic Web project with non-ASCII characters (leaving the context root
-to default to the project name containing non ASCII characters) and try to
-publish, you will see an error message similar to "The requested resource is not available".</li>
-<li>If a dynamic Web project containing a non-ASCII context root is used in an Axis1 Web service creation 
-scenario, you will see an error message similar to "Unable to deploy to Axis".</li>
-</ul>
-<p>Solution: The following ASCII characters are valid in the context root: all letters, all numbers, an underscore, a hyphen (dash), a forward slash, or a period.</p>
-</dd>
-</dl>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.doc.user/topics/overview.html b/docs/org.eclipse.wst.doc.user/topics/overview.html
deleted file mode 100644
index eab51be..0000000
--- a/docs/org.eclipse.wst.doc.user/topics/overview.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<!doctype HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css"
-	href="../../org.eclipse.wst.doc.user/common.css" >
-<title>Web Tools Project Overview</title>
-</head>
-<body>
-<h1>Web Tools Project Overview</h1>
-<p>The Web Tools Project aims to provide common infrastructure available
-to any Eclipse-based development environment targeting Web-enabled
-applications.</p>
-</body>
-</html>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.cvsignore b/docs/org.eclipse.wst.dtd.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.project b/docs/org.eclipse.wst.dtd.ui.infopop/.project
deleted file mode 100644
index df2f69d..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtd.ui.infopop</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.dtd.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
deleted file mode 100644
index ef66ce4..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 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
-	*******************************************************************************/ -->
-
-<!-- plugin: org.eclipse.wst.dtd.ui -->
-
-<contexts>
-	<context id="csh_outer_container">
-		<description />
-	</context>
-	<context id="webx0020"><!-- dtd files preference page -->
-		<description>
-			This page lets you choose which suffix (<b>dtd</b>, <b>ent</b>, or <b>mod</b>) is added when a new DTD file is created.
-		</description>
-	</context>
-	<context id="webx0021"><!-- dtd styles preference page -->
-		<description>
-			This page lets you customize the syntax highlighting that the document type definition (DTD) editor does when you are editing a file.
-
-			The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-			The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-			Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-		</description>
-		<topic
-			href="../org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html"
-			label="Setting source highlighting styles" />
-	</context>
-	<context id="webx0022"><!-- dtd template preference page -->
-		<description>
-			Templates are a chunk of predefined code that you can insert into a DTD file when it is created.
-
-			Click <b>New</b> if you want to create a completely new template.
-
-			Supply a new template <b>Name</b> and <b>Description</b>. The <b>Context</b> for the template is the context in which the template is available in the proposal list when content assist is requested. Specify the <b>Pattern</b> for your template using the appropriate tags, attributes, or attribute values to be inserted by content assist.
-
-			If you want to insert a variable, click the <b>Insert Variable</b> button and select the variable to be inserted. For example, the <b>date</b> variable indicates the current date will be inserted.
-
-			You can edit, remove, import, or export a template by using the same Preferences page.
-
-			If you have a template that you do not want to remove but you no longer want it to appear in the content assist list, clear its check box in the <b>Templates</b> preferences page.
-		</description>
-		<topic
-			href="../org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html"
-			label="Working with DTD templates" />
-		<topic
-			href="../org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html"
-			label="Creating DTD files" />
-	</context>
-	<context id=""><!-- create dtd page 1 has no id atm -->
-		<description>
-			In the <b>File name</b> field, type the name of the DTD. The name of your DTD file must end with the extension .dtd
-		</description>
-		<topic
-			href="../org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html"
-			label="" />
-	</context>
-	<context id="dtdw0010"><!-- dtd new file wizard page 2, page 1 has no ID -->
-		<description>
-			Click the <b>Use DTD Template</b> check box if you want to use a DTD template as the initial content in your new DTD page. A list of available DTD templates is listed - select the one you want to use. A preview of your DTD file is shown once you select a DTD template.
-		</description>
-		<topic
-			href="../org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html"
-			label="Working with DTD templates" />
-		<topic
-			href="../org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html"
-			label="Creating DTD files" />
-	</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml b/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
deleted file mode 100644
index 3a44d26..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/EditorDtdContexts2.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-
-<contexts>
-<context id="csh_outer_container">
-<description/>
-</context>
-<context id="dtdsource_source_HelpId">
-<description>The DTD editor lets you edit a document type definition.
-
-The editor provides text editing features such as syntax highlighting and unlimited undo and redo.
-</description>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index d58a668..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/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.dtd.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/about.html b/docs/org.eclipse.wst.dtd.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
deleted file mode 100644
index 7e8b37a..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               EditorDtdContexts.xml,\
-               META-INF/,\
-               EditorDtdContexts2.xml
-generateSourceBundle=false
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties
deleted file mode 100644
index 76c52ba..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName     = DTD Editor infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
deleted file mode 100644
index aa57fbc..0000000
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorDtdContexts.xml" plugin ="org.eclipse.wst.dtd.ui"/>
-       <contexts file="EditorDtdContexts2.xml" plugin ="org.eclipse.wst.dtd.core"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.cvsignore b/docs/org.eclipse.wst.dtdeditor.doc.user/.cvsignore
deleted file mode 100644
index 180fc9b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.dtdeditor.doc.user_1.0.0.jar
-temp
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.project b/docs/org.eclipse.wst.dtdeditor.doc.user/.project
deleted file mode 100644
index 4486d7a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.dtdeditor.doc.user</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.dtdeditor.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.ditamap b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.ditamap
deleted file mode 100644
index 88a77ee..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.ditamap
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map collection-type="sequence" id="dtdeditorTOC" title="DTD Editor">

-<topicref href="topics/cworkdtds.dita" navtitle="Working with DTDs" type="concept">

-<anchor id="dtd_post_cworkdtds"/>

-<topicref href="topics/tcretdtd.dita" linking="normal" navtitle="Creating DTDs"

-type="task">

-<anchor id="dtd_post_tcretdtd"/>

-<topicref href="topics/cdtdover.dita" linking="sourceonly" navtitle="Document type definition - Overview"

-type="concept"></topicref>

-<anchor id="dtd_post_cdtdover"/>

-<topicref href="topics/tedtsrcst.dita" linking="sourceonly" navtitle="Setting source highlighting styles"

-type="task"></topicref>

-<anchor id="dtd_post_ctedtsrcst"/>

-<topicref href="topics/tdtemplt.dita" linking="sourceonly" navtitle="Working with DTD templates"

-type="task"></topicref>

-<anchor id="dtd_post_tdtemplt"/></topicref>

-<topicref href="topics/timptdtd.dita" navtitle="Importing DTDs" type="task">

-</topicref>

-<anchor id="dtd_post_timptdtd"/>

-<topicref href="topics/tvaldtd.dita" navtitle="Validating DTDs" type="task">

-</topicref>

-<anchor id="dtd_post_tvaldtd"/>

-<topicref href="topics/rdtdicons.dita" navtitle="Icons used in the DTD editor"

-type="reference"></topicref>

-<anchor id="dtd_post_rdtdicons"/>

-<topicref href="topics/rdtdkey.dita" navtitle="DTD editor keyboard shortcuts"

-type="reference"></topicref>

-<anchor id="dtd_post_rdtdkey"/></topicref>

-</map>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
deleted file mode 100644
index 105d988..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="DTD Editor" topic="topics/cworkdtds.html">
-<topic label="Working with DTDs" href="topics/cworkdtds.html">
-<anchor id="dtd_post_cworkdtds"/>
-<topic label="Creating DTDs" href="topics/tcretdtd.html">
-<anchor id="dtd_post_tcretdtd"/>
-<topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
-<anchor id="dtd_post_cdtdover"/>
-<topic label="Setting source highlighting styles" href="topics/tedtsrcst.html"/>
-<anchor id="dtd_post_ctedtsrcst"/>
-<topic label="Working with DTD templates" href="topics/tdtemplt.html"/>
-<anchor id="dtd_post_tdtemplt"/>
-</topic>
-<topic label="Importing DTDs" href="topics/timptdtd.html"/>
-<anchor id="dtd_post_timptdtd"/>
-<topic label="Validating DTDs" href="topics/tvaldtd.html"/>
-<anchor id="dtd_post_tvaldtd"/>
-<topic label="Icons used in the DTD editor" href="topics/rdtdicons.html"/>
-<anchor id="dtd_post_rdtdicons"/>
-<topic label="DTD editor keyboard shortcuts" href="topics/rdtdkey.html"/>
-<anchor id="dtd_post_rdtdkey"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.ditamap b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.ditamap
deleted file mode 100644
index f05b032..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.ditamap
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">

-<map>

-<topicgroup collection-type="family">

-<topicref href="topics/tcretdtd.dita" linking="normal" navtitle="Creating a new DTD"

-type="task"></topicref>

-<topicref href="topics/cdtdover.dita" linking="targetonly" navtitle="Document type definition - Overview"

-type="concept"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cdtdover.dita" navtitle="Document type definition - Overview"

-type="concept"></topicref>

-<topicref href="topics/tvaldtd.dita" linking="targetonly" navtitle="Validating DTDs"

-type="task"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tcretdtd.dita" linking="normal" navtitle="Creating a new DTD"

-type="task"></topicref>

-<topicref href="topics/tdtemplt.dita" navtitle="Working with DTD templates"

-type="task"></topicref>

-</topicgroup>

-</map>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.xml
deleted file mode 100644
index ebdd30a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDreftable.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc topic="topics/tcretdtd.html">
-<topic label="Creating DTDs" href="topics/tcretdtd.html"/>
-<topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
-<topic label="Document type definitions (DTDs) - overview" href="topics/cdtdover.html"/>
-<topic label="Validating DTDs" href="topics/tvaldtd.html"/>
-<topic label="Creating DTDs" href="topics/tcretdtd.html"/>
-<topic label="Working with DTD templates" href="topics/tdtemplt.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml
deleted file mode 100644
index 663d0eb..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-	2008-01-09 Kate Price <katep@ca.ibm.com>
-	- modified for new DITA-OT version
-	2008-05-05 Kate Price <katep@ca.ibm.com>
-	- modified to add generation of pre-built help index. 
-	- Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="3.4.0" />
-			<property name="args.input" location="DTDreftable.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location="" />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index f333947..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.dtdeditor.doc.user; singleton:=true
-Bundle-Version: 1.0.500.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html b/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties b/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
deleted file mode 100644
index 69fe355..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bin.includes = DTDEditormap_toc.xml,\
-               about.html,\
-               org.eclipse.wst.dtdeditor.doc.userindex.xml,\
-               images/,\
-               plugin.properties,\
-               plugin.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/
-src.includes = *.maplist,\
-               *.ditamap,\
-               topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/dita.list b/docs/org.eclipse.wst.dtdeditor.doc.user/dita.list
deleted file mode 100644
index d83647e..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/dita.list
+++ /dev/null
@@ -1,12 +0,0 @@
-#Wed Apr 29 18:04:02 EDT 2009

-user.input.file=DTDreftable.ditamap

-user.input.dir=D\:\\Docs\\WTP3\\org.eclipse.wst.dtdeditor.doc.user

-flagimagelist=

-fullditamaplist=DTDreftable.ditamap

-conreflist=

-hreftargetslist=topics/tdtemplt.dita,topics/tcretdtd.dita,topics/tvaldtd.dita,topics/cdtdover.dita

-fullditatopiclist=topics/tdtemplt.dita,topics/tcretdtd.dita,topics/tvaldtd.dita,topics/cdtdover.dita

-fullditamapandtopiclist=topics/tdtemplt.dita,topics/tcretdtd.dita,DTDreftable.ditamap,topics/tvaldtd.dita,topics/cdtdover.dita

-htmllist=

-imagelist=

-hrefditatopiclist=topics/tvaldtd.dita

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif
deleted file mode 100644
index 39611d6..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Comment.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif
deleted file mode 100644
index 01f4889..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Element.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif
deleted file mode 100644
index cb41506..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif
deleted file mode 100644
index 5efa9b9..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Entity_Reference.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif
deleted file mode 100644
index 57ad089..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/ADD_Notation.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif
deleted file mode 100644
index 89ba825..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDChoice.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif
deleted file mode 100644
index 8bf3f97..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/XSDSequence.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif
deleted file mode 100644
index c6cde94..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif
deleted file mode 100644
index 6df0291..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/attribute_list.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif
deleted file mode 100644
index e799143..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nDTDFile.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif
deleted file mode 100644
index 7017d91..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nany.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif
deleted file mode 100644
index 119e3d4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/nempty.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif
deleted file mode 100644
index 093c6ba..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/organize_dtd_logically.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif b/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif
deleted file mode 100644
index 23c5d0b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/images/sort.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/_9.cfs b/docs/org.eclipse.wst.dtdeditor.doc.user/index/_9.cfs
deleted file mode 100644
index 2710567..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/_9.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable b/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions
deleted file mode 100644
index 4aea31e..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed Apr 29 18:03:30 EDT 2009

-org.eclipse.wst.dtdeditor.doc.user=org.eclipse.wst.dtdeditor.doc.user\n1.0.400.qualifier

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies
deleted file mode 100644
index fa707bb..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed Apr 29 18:03:30 EDT 2009

-lucene=1.9.1.v20080530-1600

-analyzer=org.eclipse.help.base\#3.3.101.M20080728_34x?locale\=en

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs
deleted file mode 100644
index 30876b7..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,11 +0,0 @@
-#This is a generated file; do not edit.

-#Wed Apr 29 18:03:30 EDT 2009

-/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html=0

-/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html=0

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments b/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments
deleted file mode 100644
index c84f1b2..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml
deleted file mode 100644
index aabd7bb..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/myplugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-  <extension point="org.eclipse.help.toc">
-   <toc file="DTDEditormap_toc.xml"/>
-       <index path="index/"/>
-  </extension>
-	<extension point="org.eclipse.help.index">
-		<index file="org.eclipse.wst.dtdeditor.doc.userindex.xml"/>     
-	</extension>
-	<extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.user.maplist b/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.user.maplist
deleted file mode 100644
index 13cbd72..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.user.maplist
+++ /dev/null
@@ -1,9 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="DTDEditormap_toc.ditamap"/>

-  </nav>

-  <link>

-    <map file="DTDEditormap_toc.ditamap"/>

-    <map file="DTDreftable.ditamap"/>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml
deleted file mode 100644
index badab2e..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/org.eclipse.wst.dtdeditor.doc.userindex.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="DTDs">
-    <entry keyword="creating">
-      <topic href="topics/tcretdtd.html#tcretdtd" title="Creating DTDs"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cdtdover.html#cdtdover" title="Document type definitions (DTDs) - overview"/>
-    </entry>
-    <entry keyword="highlighting styles">
-      <topic href="topics/tedtsrcst.html#ttaghilt" title="Setting source highlighting styles"/>
-    </entry>
-    <entry keyword="creating templates">
-      <topic href="topics/tdtemplt.html#twmacro" title="Working with DTD templates"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/timptdtd.html#timptdtd" title="Importing DTDs"/>
-    </entry>
-    <entry keyword="editor icons">
-      <topic href="topics/rdtdicons.html#ricons" title="Icons used in the DTD editor"/>
-    </entry>
-  </entry>
-  <entry keyword="XML editor">
-    <entry keyword="DTD highlighting styles">
-      <topic href="topics/tedtsrcst.html#ttaghilt" title="Setting source highlighting styles"/>
-    </entry>
-  </entry>
-  <entry keyword="templates">
-    <entry keyword="DTD">
-      <topic href="topics/tdtemplt.html#twmacro" title="Working with DTD templates"/>
-    </entry>
-  </entry>
-  <entry keyword="DTD">
-    <entry keyword="validating">
-      <topic href="topics/tvaldtd.html#tvaldtd" title="Validating DTDs"/>
-    </entry>
-  </entry>
-  <entry keyword="DTD editor">
-    <entry keyword="keyboard shortcuts">
-      <topic href="topics/rdtdkey.html#keyboardshortcutsinthedtdeditor" title="DTD editor keyboard shortcuts"/>
-    </entry>
-  </entry>
-  <entry keyword="keyboard shortcuts">
-    <entry keyword="DTD editor">
-      <topic href="topics/rdtdkey.html#keyboardshortcutsinthedtdeditor" title="DTD editor keyboard shortcuts"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties
deleted file mode 100644
index d10ce86..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR
-
-pluginName     = DTD Editor documentation
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
deleted file mode 100644
index 648e258..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-  <extension point="org.eclipse.help.toc">
-   <toc file="DTDEditormap_toc.xml"/>
-       <index path="index/"/>
-  </extension>
-	<extension point="org.eclipse.help.index">
-		<index file="org.eclipse.wst.dtdeditor.doc.userindex.xml"/>     
-	</extension>
-	<extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita
deleted file mode 100644
index 930a999..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cdtdover" xml:lang="en-us">

-<title>Document type definitions (DTDs) - overview</title>

-<titlealts>

-<searchtitle>Document type definition (DTD) - overview</searchtitle>

-</titlealts>

-<shortdesc>A document type definition (DTD) provides you with the means to

-validate XML files against a set of rules. When you create a DTD file, you

-can specify rules that control the structure of any XML files that reference

-the DTD file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTDs<indexterm>overview</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>A DTD can contain declarations that define elements, attributes, notations,

-and entities for any XML files that reference the DTD file. It also establishes

-constraints for how each element, attribute, notation, and entity can be used

-within any of the XML files that reference the DTD file.</p>

-<p>To be considered a valid XML file, the document must be accompanied by

-a DTD (or an XML schema), and conform to all of the declarations in the DTD

-(or XML schema).</p>

-<p>Certain XML parsers have the ability to read DTDs and check to see if the

-XML file it is reading follows all of those rules. While the parser is reading

-the XML file, it will check each line to be sure that it conforms to the rules

-that are laid out in the DTD file. If there is a problem, the parser generates

-an error and points to where the error occurs in the XML file. This kind of

-parser is called a validating parser because it validates the content of the

-XML file against the DTD.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
deleted file mode 100644
index 48a95ff..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cdtdover.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Document type definitions (DTDs) - overview" />
-<meta name="abstract" content="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file." />
-<meta name="description" content="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file." />
-<meta content="DTDs, overview" name="DC.subject" />
-<meta content="DTDs, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvaldtd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cdtdover" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Document type definition (DTD) - overview</title>
-</head>
-<body id="cdtdover"><a name="cdtdover"><!-- --></a>
-
-
-<h1 class="topictitle1">Document type definitions (DTDs) - overview</h1>
-
-
-
-
-<div><p>A document type definition (DTD) provides you with the means to
-validate XML files against a set of rules. When you create a DTD file, you
-can specify rules that control the structure of any XML files that reference
-the DTD file.</p>
-
-<p>A DTD can contain declarations that define elements, attributes, notations,
-and entities for any XML files that reference the DTD file. It also establishes
-constraints for how each element, attribute, notation, and entity can be used
-within any of the XML files that reference the DTD file.</p>
-
-<p>To be considered a valid XML file, the document must be accompanied by
-a DTD (or an XML schema), and conform to all of the declarations in the DTD
-(or XML schema).</p>
-
-<p>Certain XML parsers have the ability to read DTDs and check to see if the
-XML file it is reading follows all of those rules. While the parser is reading
-the XML file, it will check each line to be sure that it conforms to the rules
-that are laid out in the DTD file. If there is a problem, the parser generates
-an error and points to where the error occurs in the XML file. This kind of
-parser is called a validating parser because it validates the content of the
-XML file against the DTD.</p>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tvaldtd.html" title="Validating a DTD file lets you verify that it is well formed and does not contain any errors.">Validating DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.dita
deleted file mode 100644
index 72850d4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.dita
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<?Pub Inc?>

-<concept id="workingwithdtds" xml:lang="en-us">

-<title>Working with DTDs</title>

-<shortdesc>This sections contains information on the following:</shortdesc>

-<conbody></conbody>

-</concept>

-<?Pub *0000000395?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html
deleted file mode 100644
index b2478b4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/cworkdtds.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Working with DTDs" />
-<meta name="abstract" content="This sections contains information on the following:" />
-<meta name="description" content="This sections contains information on the following:" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/timptdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvaldtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rdtdicons.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rdtdkey.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="workingwithdtds" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with DTDs</title>
-</head>
-<body id="workingwithdtds"><a name="workingwithdtds"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with DTDs</h1>
-
-
-<div><p>This sections contains information on the following:</p>
-</div>
-
-<div>
-<ul class="ullinks">
-<li class="ulchildlink"><strong><a href="../topics/tcretdtd.html">Creating DTDs</a></strong><br />
-A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.</li>
-<li class="ulchildlink"><strong><a href="../topics/timptdtd.html">Importing DTDs</a></strong><br />
-If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor.</li>
-<li class="ulchildlink"><strong><a href="../topics/tvaldtd.html">Validating DTDs</a></strong><br />
-Validating a DTD file lets you verify that it is well formed and does not contain any errors.</li>
-<li class="ulchildlink"><strong><a href="../topics/rdtdicons.html">Icons used in the DTD editor</a></strong><br />
-These DTD editor icons appear in the Outline view.</li>
-<li class="ulchildlink"><strong><a href="../topics/rdtdkey.html">DTD editor keyboard shortcuts</a></strong><br />
-</li>
-</ul>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita
deleted file mode 100644
index b5a3e19..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.dita
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="ricons" xml:lang="en-us">

-<title>Icons used in the DTD editor</title>

-<titlealts>

-<searchtitle>Icons used in the DTD editor</searchtitle>

-</titlealts>

-<shortdesc>These DTD editor icons appear in the Outline view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTDs<indexterm>editor icons</indexterm></indexterm></keywords>

-</metadata></prolog>

-<refbody>

-<table>

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<thead>

-<row>

-<entry>Icon&nbsp;</entry>

-<entry>Description</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="COLSPEC0"></entry>

-<entry colname="COLSPEC1"></entry>

-</row>

-<row>

-<entry> <image href="../images/nany.gif"><alt>This graphic is the ANY content

-icon</alt></image> </entry>

-<entry>ANY content (content model)</entry>

-</row>

-<row>

-<entry><image href="../images/attribute.gif"><alt>This graphic is the attribute

-icon</alt></image> </entry>

-<entry>attribute</entry>

-</row>

-<row>

-<entry><image href="../images/attribute_list.gif"><alt>This graphic is the

-attribute list icon</alt></image> </entry>

-<entry>attribute list</entry>

-</row>

-<row>

-<entry colname="COLSPEC0"><image href="../images/ADD_Comment.gif"><alt>This

-graphic is the comment icon</alt></image></entry>

-<entry colname="COLSPEC1">comment</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDChoice.gif"><alt>This graphic is the content

-model - choice icon</alt></image></entry>

-<entry>content model - choice</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDSequence.gif"><alt>This graphic is the content

-model - sequence icon</alt></image></entry>

-<entry>content model - sequence</entry>

-</row>

-<row>

-<entry><image href="../images/ADD_Element.gif"><alt>This graphic is the element

-icon</alt></image> </entry>

-<entry>element</entry>

-</row>

-<row>

-<entry> <image href="../images/nempty.gif"><alt>This graphic is the EMPTY

-content (content model) icon</alt></image> </entry>

-<entry>EMPTY content (content model)</entry>

-</row>

-<row>

-<entry><image href="../images/ADD_Entity.gif"><alt>This graphic is the entity

-icon</alt></image> </entry>

-<entry>entity</entry>

-</row>

-<row>

-<entry><image href="../images/ADD_Notation.gif"><alt>This graphic is the notation

-icon</alt></image> </entry>

-<entry>notation</entry>

-</row>

-<row>

-<entry> <image href="../images/ADD_Entity_Reference.gif"><alt>This graphic

-is the parameter entity reference icon</alt></image></entry>

-<entry>parameter entity reference</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-<section></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
deleted file mode 100644
index 180b394..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdicons.html
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Icons used in the DTD editor" />
-<meta name="abstract" content="These DTD editor icons appear in the Outline view." />
-<meta name="description" content="These DTD editor icons appear in the Outline view." />
-<meta content="DTDs, editor icons" name="DC.subject" />
-<meta content="DTDs, editor icons" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ricons" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Icons used in the DTD editor</title>
-</head>
-<body id="ricons"><a name="ricons"><!-- --></a>
-
-
-<h1 class="topictitle1">Icons used in the DTD editor</h1>
-
-
-
-
-<div><p>These DTD editor icons appear in the Outline view.</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr>
-<th valign="top" id="N10063">Icon </th>
-
-<th valign="top" id="N1006A">Description</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" headers="N10063 ">&nbsp;</td>
-
-<td valign="top" headers="N1006A ">&nbsp;</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/nany.gif" alt="This graphic is the ANY content&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">ANY content (content model)</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/attribute.gif" alt="This graphic is the attribute&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/attribute_list.gif" alt="This graphic is the&#10;attribute list icon" /> </td>
-
-<td valign="top" headers="N1006A ">attribute list</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Comment.gif" alt="This&#10;graphic is the comment icon" /></td>
-
-<td valign="top" headers="N1006A ">comment</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/XSDChoice.gif" alt="This graphic is the content&#10;model - choice icon" /></td>
-
-<td valign="top" headers="N1006A ">content model - choice</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/XSDSequence.gif" alt="This graphic is the content&#10;model - sequence icon" /></td>
-
-<td valign="top" headers="N1006A ">content model - sequence</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Element.gif" alt="This graphic is the element&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">element</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/nempty.gif" alt="This graphic is the EMPTY&#10;content (content model) icon" /> </td>
-
-<td valign="top" headers="N1006A ">EMPTY content (content model)</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Entity.gif" alt="This graphic is the entity&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">entity</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "><img src="../images/ADD_Notation.gif" alt="This graphic is the notation&#10;icon" /> </td>
-
-<td valign="top" headers="N1006A ">notation</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10063 "> <img src="../images/ADD_Entity_Reference.gif" alt="This graphic&#10;is the parameter entity reference icon" /></td>
-
-<td valign="top" headers="N1006A ">parameter entity reference</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<div class="section" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.dita
deleted file mode 100644
index 6357fa4..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="keyboardshortcutsinthedtdeditor" xml:lang="en-us">

-<title outputclass="id_title">DTD editor keyboard shortcuts</title>

-<shortdesc outputclass="id_shortdesc"></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-<indexterm>keyboard shortcuts<indexterm>DTD editor</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<table frame="all">

-<tgroup cols="2"><colspec colname="col1" colwidth="84*"/><colspec colname="col3"

-colwidth="93*"/>

-<thead>

-<row valign="bottom">

-<entry colname="col1">Key Combination</entry>

-<entry colname="col3">Function</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="col1">Shift+Alt+Up Arrow</entry>

-<entry colname="col3">Expand selection to enclosing element</entry>

-</row>

-<row>

-<entry colname="col1">Shift+Alt+Right Arrow</entry>

-<entry colname="col3">Expand selection to next element</entry>

-</row>

-<row>

-<entry colname="col1">Shift+Alt+Left Arrow</entry>

-<entry colname="col3">Expand selection to previous element</entry>

-</row>

-<row>

-<entry colname="col1">Shift+Alt+Down Arrow</entry>

-<entry colname="col3">Restore last selection</entry>

-</row>

-<row>

-<entry colname="col1">Ctrl+Shift+P</entry>

-<entry colname="col3">Go to matching bracket</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html
deleted file mode 100644
index 1c0a656..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/rdtdkey.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="DTD editor keyboard shortcuts" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="DTD editor, keyboard shortcuts" name="DC.subject" />
-<meta content="DTD editor, keyboard shortcuts" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="keyboardshortcutsinthedtdeditor" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>DTD editor keyboard shortcuts</title>
-</head>
-<body id="keyboardshortcutsinthedtdeditor"><a name="keyboardshortcutsinthedtdeditor"><!-- --></a>
-
-
-<h1 class="id_title">DTD editor keyboard shortcuts</h1>
-
-
-
-<div><p class="id_shortdesc" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr valign="bottom">
-<th valign="bottom" width="47.45762711864407%" id="N10068">Key Combination</th>
-
-<th valign="bottom" width="52.54237288135594%" id="N1006F">Function</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Up Arrow</td>
-
-<td valign="top" width="52.54237288135594%" headers="N1006F ">Expand selection to enclosing element</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Right Arrow</td>
-
-<td valign="top" width="52.54237288135594%" headers="N1006F ">Expand selection to next element</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Left Arrow</td>
-
-<td valign="top" width="52.54237288135594%" headers="N1006F ">Expand selection to previous element</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10068 ">Shift+Alt+Down Arrow</td>
-
-<td valign="top" width="52.54237288135594%" headers="N1006F ">Restore last selection</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10068 ">Ctrl+Shift+P</td>
-
-<td valign="top" width="52.54237288135594%" headers="N1006F ">Go to matching bracket</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita
deleted file mode 100644
index 7af8ce3..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tcretdtd" xml:lang="en-us">

-<title>Creating DTDs</title>

-<titlealts>

-<searchtitle>Creating a new document type definition (DTD)</searchtitle>

-</titlealts>

-<shortdesc>A document type definition (DTD) contains a set of rules that can

-be used to validate an XML file. After you have created a DTD, you can edit

-it manually, adding declarations that define elements, attributes, entities,

-and notations, and how they can be used for any XML files that reference the

-DTD file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTDs<indexterm>creating</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To create a new

-DTD, complete the following steps:</p></context>

-<steps>

-<step><cmd>Create a project to contain the DTD if needed.</cmd></step>

-<step><cmd>In the workbench, click <menucascade><uicontrol>File</uicontrol>

-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade> and select <menucascade>

-<uicontrol>XML</uicontrol><uicontrol> DTD</uicontrol></menucascade>. Click <uicontrol>Next</uicontrol>. </cmd>

-</step>

-<step><cmd>Select the project or folder that will contain the DTD.</cmd></step>

-<step><cmd>In the <uicontrol>File name</uicontrol> field, type the name of

-the DTD, for example <userinput>MyDTD.dtd</userinput>.</cmd><info>The name

-of your DTD file must end with the extension <userinput>.dtd</userinput></info>

-</step>

-<step><cmd>Click <uicontrol>Next</uicontrol>.</cmd></step>

-<step importance="optional"><cmd>You can use a DTD template as the basis for

-your new DTD file. To do so, click the <uicontrol>Use DTD Template</uicontrol> check

-box, and select the template you want to use.</cmd></step>

-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-<result><p>The DTD appears in the Navigator view and automatically, by default,

-opens in the DTD editor. In the DTD editor, you can manually add elements,

-attributes, notations, entities, and comments to the DTD. If you close the

-file, and want to later re-open it in the DTD editor, double-click it in the

-Navigator view.</p></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
deleted file mode 100644
index 3bb6932..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tcretdtd.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating DTDs" />
-<meta name="abstract" content="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file." />
-<meta name="description" content="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file." />
-<meta content="DTDs, creating" name="DC.subject" />
-<meta content="DTDs, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cdtdover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdtemplt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcretdtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a new document type definition (DTD)</title>
-</head>
-<body id="tcretdtd"><a name="tcretdtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating DTDs</h1>
-
-
-
-
-<div><p>A document type definition (DTD) contains a set of rules that can
-be used to validate an XML file. After you have created a DTD, you can edit
-it manually, adding declarations that define elements, attributes, entities,
-and notations, and how they can be used for any XML files that reference the
-DTD file.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To create a new
-DTD, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Create a project to contain the DTD if needed.</span></li>
-
-<li class="stepexpand"><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span></span> and select <span class="menucascade">
-<span class="uicontrol">XML</span> &gt; <span class="uicontrol"> DTD</span></span>. Click <span class="uicontrol">Next</span>. </span>
-</li>
-
-<li class="stepexpand"><span>Select the project or folder that will contain the DTD.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">File name</span> field, type the name of
-the DTD, for example <kbd class="userinput">MyDTD.dtd</kbd>.</span> The name
-of your DTD file must end with the extension <kbd class="userinput">.dtd</kbd>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>You can use a DTD template as the basis for
-your new DTD file. To do so, click the <span class="uicontrol">Use DTD Template</span> check
-box, and select the template you want to use.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section"><p>The DTD appears in the Navigator view and automatically, by default,
-opens in the DTD editor. In the DTD editor, you can manually add elements,
-attributes, notations, entities, and comments to the DTD. If you close the
-file, and want to later re-open it in the DTD editor, double-click it in the
-Navigator view.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cdtdover.html" title="A document type definition (DTD) provides you with the means to validate XML files against a set of rules. When you create a DTD file, you can specify rules that control the structure of any XML files that reference the DTD file.">Document type definitions (DTDs) - overview</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tdtemplt.html" title="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with DTD templates</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita
deleted file mode 100644
index 47a267a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twmacro" xml:lang="en-us">

-<title>Working with DTD templates</title>

-<titlealts>

-<searchtitle>Working with DTD templates</searchtitle>

-</titlealts>

-<shortdesc>Templates are a chunk of predefined code that you can insert into

-a DTD file when it is created. You may find a template useful when you have

-a certain piece of code you want to reuse several times, and you do not want

-to write it out every time.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTDs<indexterm>creating templates</indexterm></indexterm>

-<indexterm>templates<indexterm>DTD</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To create a new DTD template, complete the following steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>DTD Files</uicontrol><uicontrol>Templates</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol> in the templates prefereces.</cmd>

-</step>

-<step><cmd>Supply a new template <uicontrol>Name</uicontrol> and <uicontrol>Description</uicontrol>.</cmd>

-</step>

-<step><cmd>Specify the <uicontrol>Context</uicontrol> for the template.</cmd>

-<info>This is the context in which the template is available in the proposal

-list when content assist is requested. </info></step>

-<step><cmd>Specify the <uicontrol>Pattern</uicontrol> for your template using

-the appropriate tags, attributes, or attribute values to be inserted by content

-assist.</cmd></step>

-<step importance="optional"><cmd>To insert a variable, click the <uicontrol>Insert

-Variable</uicontrol> button and select a variable. </cmd><info>For example,

-the <uicontrol>date</uicontrol> variable indicates the current date will be

-inserted. </info></step>

-<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-<postreq>You can edit, remove, import, or export a template by using the same

-preferences page. <p>If you have a template that you do not want to remove,

-but you no longer want the template to appear in the DTD templates list when

-you create a file, clear its checkbox in the templates table.</p></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html
deleted file mode 100644
index fae541b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tdtemplt.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Working with DTD templates" />
-<meta name="abstract" content="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta name="description" content="Templates are a chunk of predefined code that you can insert into a DTD file when it is created. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta content="DTDs, creating templates, templates, DTD" name="DC.subject" />
-<meta content="DTDs, creating templates, templates, DTD" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twmacro" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with DTD templates</title>
-</head>
-<body id="twmacro"><a name="twmacro"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with DTD templates</h1>
-
-
-
-
-<div><p>Templates are a chunk of predefined code that you can insert into
-a DTD file when it is created. You may find a template useful when you have
-a certain piece of code you want to reuse several times, and you do not want
-to write it out every time.</p>
-
-<div class="section"><p>To create a new DTD template, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">DTD Files</span> &gt; <span class="uicontrol">Templates</span>
-</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span> in the templates prefereces.</span>
-</li>
-
-<li class="stepexpand"><span>Supply a new template <span class="uicontrol">Name</span> and <span class="uicontrol">Description</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Context</span> for the template.</span>
- This is the context in which the template is available in the proposal
-list when content assist is requested. </li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Pattern</span> for your template using
-the appropriate tags, attributes, or attribute values to be inserted by content
-assist.</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>To insert a variable, click the <span class="uicontrol">Insert
-Variable</span> button and select a variable. </span> For example,
-the <span class="uicontrol">date</span> variable indicates the current date will be
-inserted. </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-
-</ol>
-
-<div class="section">You can edit, remove, import, or export a template by using the same
-preferences page. <p>If you have a template that you do not want to remove,
-but you no longer want the template to appear in the DTD templates list when
-you create a file, clear its checkbox in the templates table.</p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita
deleted file mode 100644
index 5442f67..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="ttaghilt" xml:lang="en-us">

-<title>Setting source highlighting styles</title>

-<titlealts>

-<searchtitle>Setting source highlighting styles for DTD files</searchtitle>

-</titlealts>

-<shortdesc>If desired, you can change various aspects of how the DTD source

-code is displayed in the Source view of the DTD editor, such as the colors

-the tags will be displayed in.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTDs<indexterm>highlighting styles</indexterm></indexterm>

-<indexterm>XML editor<indexterm>DTD highlighting styles</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To set highlighting styles for the DTD code, complete the following

-steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML</uicontrol><uicontrol>DTD Files</uicontrol><uicontrol> Syntax

-Coloring</uicontrol></menucascade>.</cmd></step>

-<step><cmd>In the <uicontrol>Syntax Element</uicontrol> list, select the source

-tag type that you wish to set a highlighting style for. You can also click

-text in the sample text to specify the source tag type that you wish to set

-a highlighting style for.</cmd></step>

-<step><cmd>Click the <uicontrol>Foreground</uicontrol> box and select the

-color that you want the text of the tag to appear in and click <uicontrol>OK</uicontrol>.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Background</uicontrol> box and select the

-color that you want to appear behind the tag and click <uicontrol>OK</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the <uicontrol>Bold</uicontrol>, <uicontrol>Italic</uicontrol>, <uicontrol>Strikethrough</uicontrol>,

-and<uicontrol>Underline</uicontrol> check boxes for additional formatting

-options. </cmd></step>

-<step><cmd>Click <uicontrol>Restore Default</uicontrol> to set the highlighting

-styles back to their default values. If you only want to reset the value for

-a particular content type, select it in the <uicontrol>Content type</uicontrol> field,

-the click the <uicontrol>Restore Default</uicontrol> button next to it. </cmd>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save your changes.</cmd></step>

-</steps>

-<result></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html
deleted file mode 100644
index 817521a..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tedtsrcst.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting source highlighting styles" />
-<meta name="abstract" content="If desired, you can change various aspects of how the DTD source code is displayed in the Source view of the DTD editor, such as the colors the tags will be displayed in." />
-<meta name="description" content="If desired, you can change various aspects of how the DTD source code is displayed in the Source view of the DTD editor, such as the colors the tags will be displayed in." />
-<meta content="DTDs, highlighting styles, XML editor, DTD highlighting styles" name="DC.subject" />
-<meta content="DTDs, highlighting styles, XML editor, DTD highlighting styles" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretdtd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ttaghilt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting source highlighting styles for DTD files</title>
-</head>
-<body id="ttaghilt"><a name="ttaghilt"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting source highlighting styles</h1>
-
-
-
-
-<div><p>If desired, you can change various aspects of how the DTD source
-code is displayed in the Source view of the DTD editor, such as the colors
-the tags will be displayed in.</p>
-
-<div class="section"><p>To set highlighting styles for the DTD code, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">DTD Files</span> &gt; <span class="uicontrol"> Syntax
-Coloring</span></span>.</span></li>
-
-<li><span>In the <span class="uicontrol">Syntax Element</span> list, select the source
-tag type that you wish to set a highlighting style for. You can also click
-text in the sample text to specify the source tag type that you wish to set
-a highlighting style for.</span></li>
-
-<li><span>Click the <span class="uicontrol">Foreground</span> box and select the
-color that you want the text of the tag to appear in and click <span class="uicontrol">OK</span>.</span>
-</li>
-
-<li><span>Click the <span class="uicontrol">Background</span> box and select the
-color that you want to appear behind the tag and click <span class="uicontrol">OK</span>.</span>
-</li>
-
-<li><span>Select the <span class="uicontrol">Bold</span>, <span class="uicontrol">Italic</span>, <span class="uicontrol">Strikethrough</span>,
-and<span class="uicontrol">Underline</span> check boxes for additional formatting
-options. </span></li>
-
-<li><span>Click <span class="uicontrol">Restore Default</span> to set the highlighting
-styles back to their default values. If you only want to reset the value for
-a particular content type, select it in the <span class="uicontrol">Content type</span> field,
-the click the <span class="uicontrol">Restore Default</span> button next to it. </span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span> to save your changes.</span></li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/tcretdtd.html" title="A document type definition (DTD) contains a set of rules that can be used to validate an XML file. After you have created a DTD, you can edit it manually, adding declarations that define elements, attributes, entities, and notations, and how they can be used for any XML files that reference the DTD file.">Creating DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita
deleted file mode 100644
index 937590b..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="timptdtd" xml:lang="en-us">

-<title>Importing DTDs</title>

-<titlealts>

-<searchtitle>Importing DTDs</searchtitle>

-</titlealts>

-<shortdesc>If you want to work with DTD files that you created outside of

-the product, you can import them into the workbench and open them in the DTD

-editor. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTDs<indexterm>importing</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To import a DTD into the workbench, complete the following steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>File</uicontrol><uicontrol>Import</uicontrol>

-</menucascade>. Select <menucascade><uicontrol>General</uicontrol><uicontrol>File

-System</uicontrol></menucascade> and click <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>Fill in the fields in the <uicontrol>Import</uicontrol> wizard

-as necessary.</cmd></step>

-<step><cmd>Click <uicontrol>Finish</uicontrol> to exit the wizard and import

-the files.</cmd></step>

-<step><cmd>Select the DTD file in the Navigator view and double-click it to

-open it in the DTD editor.</cmd></step>

-</steps>

-<result><p>After you have imported a DTD file into the workbench and opened

-it in the DTD editor, you can edit it manually.</p></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
deleted file mode 100644
index e813eb1..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/timptdtd.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing DTDs" />
-<meta name="abstract" content="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor." />
-<meta name="description" content="If you want to work with DTD files that you created outside of the product, you can import them into the workbench and open them in the DTD editor." />
-<meta content="DTDs, importing" name="DC.subject" />
-<meta content="DTDs, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cworkdtds.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="timptdtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing DTDs</title>
-</head>
-<body id="timptdtd"><a name="timptdtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing DTDs</h1>
-
-
-
-
-<div><p>If you want to work with DTD files that you created outside of
-the product, you can import them into the workbench and open them in the DTD
-editor. </p>
-
-<div class="section"><p>To import a DTD into the workbench, complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Import</span>
-</span>. Select <span class="menucascade"><span class="uicontrol">General</span> &gt; <span class="uicontrol">File
-System</span></span> and click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li><span>Fill in the fields in the <span class="uicontrol">Import</span> wizard
-as necessary.</span></li>
-
-<li><span>Click <span class="uicontrol">Finish</span> to exit the wizard and import
-the files.</span></li>
-
-<li><span>Select the DTD file in the Navigator view and double-click it to
-open it in the DTD editor.</span></li>
-
-</ol>
-
-<div class="section"><p>After you have imported a DTD file into the workbench and opened
-it in the DTD editor, you can edit it manually.</p>
-</div>
-
-</div>
-
-<div>
-<div class="familylinks">
-<div class="parentlink"><strong>Parent topic:</strong> <a href="../topics/cworkdtds.html" title="This sections contains information on the following:">Working with DTDs</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita
deleted file mode 100644
index 12c7aa7..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Sty _display FontColor="red"?>

-<task id="tvaldtd" xml:lang="en-us">

-<title>Validating DTDs</title>

-<titlealts>

-<searchtitle>Validating DTDs</searchtitle>

-</titlealts>

-<shortdesc>Validating a DTD file lets you verify that it is well formed

-and does not contain any errors.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DTD<indexterm>validating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-validate a DTD, right-click the DTD in the Navigator view and click <menucascade>

-<uicontrol>Validate</uicontrol></menucascade>. A dialog opens, indicating

-if the DTD file was successfully validated or not. If the file is

-invalid, any errors will appear in the Problems view.<?Pub Caret?></p></context>

-<result><note>If you receive an error message indicating that the

-Problems view is full, you can increase the number of error messages

-allowed in the view. Click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol></menucascade> and select <menucascade>

-<uicontrol>General</uicontrol><uicontrol>Markers</uicontrol>

-</menucascade>. On this preferences page you can increase or decrease

-the number of visible items in the problems view. </note><p>You can

-set up a project's properties so that different types of project resources

-are automatically validated when you save them. Right click on the

-project, click <uicontrol>Properties</uicontrol>, and select <uicontrol>Validation</uicontrol>.

-Any validators you can run against your&nbsp;project will be listed

-in the Validation page.</p></result>

-</taskbody>

-<related-links>

-<link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita"

-scope="peer"><linktext>Validating code in enterprise applications</linktext>

-<desc>General validation information</desc>

-</link>

-</related-links>

-</task>

-<?Pub *0000002105?>

diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html b/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
deleted file mode 100644
index adba40d..0000000
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/topics/tvaldtd.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating DTDs" />
-<meta name="abstract" content="Validating a DTD file lets you verify that it is well formed and does not contain any errors." />
-<meta name="description" content="Validating a DTD file lets you verify that it is well formed and does not contain any errors." />
-<meta content="DTD, validating" name="DC.subject" />
-<meta content="DTD, validating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tvaldtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating DTDs</title>
-</head>
-<body id="tvaldtd"><a name="tvaldtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating DTDs</h1>
-
-
-
-
-<div><p>Validating a DTD file lets you verify that it is well formed
-and does not contain any errors.</p>
-
-<div class="section"><p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-validate a DTD, right-click the DTD in the Navigator view and click <span class="menucascade">
-<span class="uicontrol">Validate</span></span>. A dialog opens, indicating
-if the DTD file was successfully validated or not. If the file is
-invalid, any errors will appear in the Problems view.</p>
-</div>
-
-<div class="section"><div class="note"><span class="notetitle">Note:</span> If you receive an error message indicating that the
-Problems view is full, you can increase the number of error messages
-allowed in the view. Click <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span></span> and select <span class="menucascade">
-<span class="uicontrol">General</span> &gt; <span class="uicontrol">Markers</span>
-</span>. On this preferences page you can increase or decrease
-the number of visible items in the problems view. </div>
-<p>You can
-set up a project's properties so that different types of project resources
-are automatically validated when you save them. Right click on the
-project, click <span class="uicontrol">Properties</span>, and select <span class="uicontrol">Validation</span>.
-Any validators you can run against your project will be listed
-in the Validation page.</p>
-</div>
-
-</div>
-
-<div><div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" title="General validation information">Validating code in enterprise applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.cvsignore b/docs/org.eclipse.wst.html.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.project b/docs/org.eclipse.wst.html.ui.infopop/.project
deleted file mode 100644
index 05aa1b4..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.html.ui.infopop</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.html.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
deleted file mode 100644
index 8b8dc10..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-
-<contexts>
-<context id="misc0170">
-<description>Use this dialog to edit the Web content settings for a Web project. You can specify the default document type, CSS profile, and target device. The public ID and system ID are populated automatically. To restore the defaults, click <b>Restore Defaults</b>.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0030">
-<description>This page lets you specify the line delimiter and the text encoding that will be used when you create, save, or load an HTML file.
-
-Various development platforms use different line delimiters to indicate the start of a new line. Select the operating system that corresponds to your development or deployment platform.
-<b>Note:</b> This delimiter will not automatically be added to any documents that currently exist. It will be added only to documents that you create after you select the line delimiter type and click <b>Apply</b>, or to existing files that you open and then resave after you select the line delimiter type and click <b>Apply</b>.
-
-The encoding attribute is used to specify the default character encoding set that is used when either creating HTML files or loading your HTML files into the editor.  Changing the creating files encoding causes any new HTML files that are created from scratch to use the selected encoding.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0031">
-<description>This page lets you specify the formatting, content assist, and capitalization style that will be used when you edit an HTML file.
-
-Enter a maximum width in the <b>Line width</b> field to specify the line width to break a line to fit onto more than one line when the document is formatted.
-
-Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted. Attributes will return to the same margin as the previous line.
-
-Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation.
-
-If you prefer to use spaces, select <b>Indent using spaces</b>.
-
-You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
-
-Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
-
-To apply these formatting styles, select the <b>Format Document</b> menu item.
-
-If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
-
-Select the Uppercase or Lowercase radio button to determine the case for tag and attribute names that are inserted into the document when using content assist or code generation.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0032">
-<description>This page lets you customize the syntax highlighting that the HTML editor does when you are editing a file.
-
-The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-
-The <b>Foreground</b> and <b>Background</b> push buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-
-Click the <b>Restore Default</b> push button to set the highlighting styles back to their default values.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="webx0033">
-<description>This page lets you create new and edit existing templates that will be used when you edit an HTML file.
-</description>
-<topic label="Adding and removing HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-</context>
-
-<context id="xmlm1100">
-<description>Cleanup options enable you to update a document so that it is well-formed and formatted.
-
-The following cleanup options let you select radio buttons to choose the type of cleanup to be performed:
-- <b>Tag name case for HTML</b>: Unless set to <b>As-is</b>, changes the case of all tags in a file for easier visual parsing and consistency.
-- <b>Attribute name case for HTML</b>: Unless set to <b>As-is</b>, changes the case of all attributes in a file for easier visual parsing and consistency.
-
-The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
-- <b>Insert required attributes</b>: Inserts an missing attributes that are required by the tag to make the element or document well-formed.
-- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
-- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
-- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
-- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml b/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
deleted file mode 100644
index b614187..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/EditorHtmlContexts2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-
-<contexts>
-<context id="htmlsource_source_HelpId">
-<description>The HTML source page editor lets you edit a file that is coded in the Hypertext Markup Language or in XHTML. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-<topic label="Adding and removing HTML templates" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html"/>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/HTMLWizContexts.xml b/docs/org.eclipse.wst.html.ui.infopop/HTMLWizContexts.xml
deleted file mode 100644
index ed68cf2..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/HTMLWizContexts.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<contexts>
-<context id="htmlw0010">
-<description>Select the HTML template checkbox to create your HTML file based on a default template. Choose one of the frameset templates if you are developing a Web site with frames. If you do not select a template, your newly created JSP file will be completely blank.
-</description>
-</context>
-
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 64b43a0..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.html.ui.infopop; singleton:=true
-Bundle-Version: 1.0.100.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.html.ui.infopop/about.html b/docs/org.eclipse.wst.html.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/build.properties b/docs/org.eclipse.wst.html.ui.infopop/build.properties
deleted file mode 100644
index f1a352e..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = plugin.xml,\
-               about.html,\
-               EditorHtmlContexts.xml,\
-               META-INF/,\
-               EditorHtmlContexts2.xml,\
-               plugin.properties
-generateSourceBundle=false
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.properties b/docs/org.eclipse.wst.html.ui.infopop/plugin.properties
deleted file mode 100644
index a24444c..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.html.ui.infopop
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = HTML editor infopops
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
deleted file mode 100644
index 9b085e7..0000000
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorHtmlContexts.xml" plugin ="org.eclipse.wst.html.ui"/>
-       <contexts file="EditorHtmlContexts2.xml" plugin ="org.eclipse.wst.html.core"/>
-         <contexts file="HTMLWizContexts.xml" plugin="org.eclipse.wst.html.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/.cvsignore b/docs/org.eclipse.wst.sse.doc.user/.cvsignore
deleted file mode 100644
index 33a2f88..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.wst.sse.doc.user_1.0.0.jar
-temp
-DitaLink.cat
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/.project b/docs/org.eclipse.wst.sse.doc.user/.project
deleted file mode 100644
index e2d6406..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.doc.user</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.sse.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml b/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml
deleted file mode 100644
index 1a18684..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-	2008-05-05 Kate Price <katep@ca.ibm.com>
-	- modified to add generation of pre-built help index. 
-	- Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="3.3.0" />
-			<property name="args.input" location="sse_toc.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location="" />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 8192061..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.doc.user; singleton:=true
-Bundle-Version: 1.1.0.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.sse.doc.user/about.html b/docs/org.eclipse.wst.sse.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.sse.doc.user/build.properties b/docs/org.eclipse.wst.sse.doc.user/build.properties
deleted file mode 100644
index eec0c0d..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = about.html,\
-               images/,\
-               plugin.xml,\
-               sse_toc.xml,\
-               org.eclipse.wst.sse.doc.userindex.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = *.maplist,\
-               *.ditamap,\
-               topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
-               
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif b/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif
deleted file mode 100644
index d82014f..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/ncontass.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif b/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif
deleted file mode 100644
index 41a141c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/njscdast.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif b/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif
deleted file mode 100644
index 7c135cf..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nlinux.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif b/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif
deleted file mode 100644
index 54a6371..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nmacscrp.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif b/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif
deleted file mode 100644
index 3faa1e2..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nquest.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/images/nwin.gif b/docs/org.eclipse.wst.sse.doc.user/images/nwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/images/nwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs b/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs
deleted file mode 100644
index ca41649..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/_p.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/deletable b/docs/org.eclipse.wst.sse.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions
deleted file mode 100644
index 6ba76dc..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 14 18:56:03 EDT 2008

-org.eclipse.wst.sse.doc.user=org.eclipse.wst.sse.doc.user\n1.1.0.qualifier

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies
deleted file mode 100644
index d2c7a64..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 14 18:56:03 EDT 2008

-lucene=1.9.1.v200803061811

-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs b/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs
deleted file mode 100644
index 885cd48..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,24 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 14 18:56:03 EDT 2008

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html=0

-/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html=0

-/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html=0

-/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html=0

-/org.eclipse.wst.sse.doc.user/topics/cvalidate.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html=0

-/org.eclipse.wst.sse.doc.user/topics/cencoding.html=0

-/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html=0

-/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html=0

diff --git a/docs/org.eclipse.wst.sse.doc.user/index/segments b/docs/org.eclipse.wst.sse.doc.user/index/segments
deleted file mode 100644
index 2d63c4c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.sse.doc.user/myplugin.xml b/docs/org.eclipse.wst.sse.doc.user/myplugin.xml
deleted file mode 100644
index 4715def..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/myplugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<!-- ===================================================== -->
-<!-- This is the plug-in for declaring the help pages      -->
-<!-- for the structured text editors (source editors).     -->
-<!-- ===================================================== -->
-
-<plugin>
-
-    <extension point="org.eclipse.help.toc">
-      <toc file="sse_toc.xml"/>
-       <index path="index/"/>
-   </extension>
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.sse.doc.userindex.xml"/>
-</extension>
-<extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.user.maplist b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.user.maplist
deleted file mode 100644
index b0f4da5..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.user.maplist
+++ /dev/null
@@ -1,7 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="sse_toc.ditamap"/>

-  </nav>

-  <link>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html
deleted file mode 100644
index 10a8886..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_41" href="#IDX1_41">A</a>
-<a name="IDX0_43" href="#IDX1_43">C</a>
-<a name="IDX0_44" href="#IDX1_44">D</a>
-<a name="IDX0_46" href="#IDX1_46">F</a>
-<a name="IDX0_48" href="#IDX1_48">H</a>
-<a name="IDX0_4A" href="#IDX1_4A">J</a>
-<a name="IDX0_4D" href="#IDX1_4D">M</a>
-<a name="IDX0_53" href="#IDX1_53">S</a>
-<a name="IDX0_54" href="#IDX1_54">T</a>
-<a name="IDX0_56" href="#IDX1_56">V</a>
-<a name="IDX0_58" href="#IDX1_58">X</a>
-<hr></hr>
-<strong><a name="IDX1_41" href="#IDX0_41">A</a></strong>
-<ul class="indexlist">
-<li>annotation preferences
-<ul class="indexlist">
-<li><a href="topics/tsrcedt001.html#tsrcedt001">markup language settings</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_43" href="#IDX0_43">C</a></strong>
-<ul class="indexlist">
-<li>character encoding
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">location in files</a>
-</li>
-</ul>
-</li>
-<li>content assistance
-<ul class="indexlist">
-<li><a href="topics/tsrcedt023.html#tsrcedt023">enabling for JSP files</a>
-</li>
-<li><a href="topics/csrcedt006.html#csrcedt006">overview</a>
-</li>
-<li><a href="topics/tsrcedt005.html#tsrcedt005">structured text editors</a>
-</li>
-</ul>
-</li>
-<li>content types
-<ul class="indexlist">
-<li><a href="topics/tcontenttype.html#tcontenttype">mapping file extensions</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
-<ul class="indexlist">
-<li>drawers
-<ul class="indexlist">
-<li><a href="topics/tsrcedt016.html#tsrcedt016">snippets view</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_46" href="#IDX0_46">F</a></strong>
-<ul class="indexlist">
-<li>file extensions
-<ul class="indexlist">
-<li><a href="topics/tcontenttype.html#tcontenttype">mapping content types</a>
-</li>
-</ul>
-</li>
-<li>file types
-<ul class="indexlist">
-<li><a href="topics/tcontenttype.html#tcontenttype">editors</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_48" href="#IDX0_48">H</a></strong>
-<ul class="indexlist">
-<li>HTML
-<ul class="indexlist">
-<li>templates
-<ul class="indexlist">
-<li><a href="topics/tsrcedt024.html#tsrcedt024">adding</a>
-</li>
-<li><a href="topics/tsrcedt024.html#tsrcedt024">removing</a>
-</li>
-</ul>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4A" href="#IDX0_4A">J</a></strong>
-<ul class="indexlist">
-<li>JSP files
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">character encoding</a>
-</li>
-<li><a href="topics/tsrcedt023.html#tsrcedt023">enabling content assistance</a>
-</li>
-</ul>
-</li>
-<li>JSP pages
-<ul class="indexlist">
-<li><a href="topics/tsrcedt028.html#tsrcedt028">templates</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_4D" href="#IDX0_4D">M</a></strong>
-<ul class="indexlist">
-<li>markup languages
-<ul class="indexlist">
-<li><a href="topics/tsrcedt000.html#tsrcedt000">editing text</a>
-</li>
-<li><a href="topics/tsrcedt001.html#tsrcedt001">setting annotation preferences</a>
-</li>
-<li><a href="topics/tsrcedt027.html#tsrcedt027">templates</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_53" href="#IDX0_53">S</a></strong>
-<ul class="indexlist">
-<li>snippet drawers
-<ul class="indexlist">
-<li><a href="topics/tsrcedt015.html#tsrcedt015">adding items</a>
-</li>
-</ul>
-</li>
-<li>snippet items
-<ul class="indexlist">
-<li><a href="topics/tsrcedt015.html#tsrcedt015">adding to drawers</a>
-</li>
-</ul>
-</li>
-<li>snippets
-<ul class="indexlist">
-<li><a href="topics/tsrcedt014.html#tsrcedt014">drawer customization</a>
-</li>
-<li><a href="topics/tsrcedt022.html#tsrcedt022">editing items</a>
-</li>
-<li><a href="topics/tsrcedt016.html#tsrcedt016">modifying drawers</a>
-</li>
-<li><a href="topics/tsrcedt026.html#tsrcedt026">overview</a>
-</li>
-</ul>
-</li>
-<li>Snippets view
-<ul class="indexlist">
-<li><a href="topics/csrcedt001.html#csrcedt001">overview</a>
-</li>
-</ul>
-</li>
-<li>spell check
-<ul class="indexlist">
-<li><a href="topics/tsrcedt010.html#tsrcedt010">structured text editors</a>
-</li>
-</ul>
-</li>
-<li>structured text editors
-<ul class="indexlist">
-<li>content assistance <a href="topics/tsrcedt005.html#tsrcedt005">(1)</a>, <a href="topics/csrcedt006.html#csrcedt006">(2)</a>
-</li>
-<li><a href="topics/csrcedt004.html#csrcedt004">overview</a>
-</li>
-<li><a href="topics/tsrcedt025.html#tsrcedt025">preference setting</a>
-</li>
-<li><a href="topics/tsrcedt010.html#tsrcedt010">spell check</a>
-</li>
-<li><a href="topics/tsrcedt007.html#tsrcedt007">text search</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_54" href="#IDX0_54">T</a></strong>
-<ul class="indexlist">
-<li>templates
-<ul class="indexlist">
-<li><a href="topics/tsrcedt024.html#tsrcedt024">HTML</a>
-</li>
-<li><a href="topics/tsrcedt028.html#tsrcedt028">JSP pages</a>
-</li>
-<li><a href="topics/tsrcedt027.html#tsrcedt027">markup languages</a>
-</li>
-<li><a href="topics/csrcedt004.html#csrcedt004">structured text editors</a>
-</li>
-<li><a href="topics/tsrcedt029.html#tsrcedt027">XML</a>
-</li>
-</ul>
-</li>
-<li>text
-<ul class="indexlist">
-<li><a href="topics/tsrcedt000.html#tsrcedt000">editing in markup languages</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_56" href="#IDX0_56">V</a></strong>
-<ul class="indexlist">
-<li>validation
-<ul class="indexlist">
-<li><a href="topics/cvalidate.html#csrcedt001">source vs batch</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
-<ul class="indexlist">
-<li>XHTML
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">character encoding</a>
-</li>
-</ul>
-</li>
-<li>XML
-<ul class="indexlist">
-<li><a href="topics/cencoding.html#cencoding">character encoding</a>
-</li>
-</ul>
-</li>
-<li>xml templates
-<ul class="indexlist">
-<li><a href="topics/tsrcedt029.html#tsrcedt027">adding</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml b/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml
deleted file mode 100644
index 9723ac5..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/org.eclipse.wst.sse.doc.userindex.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="structured text editors">
-    <entry keyword="overview">
-      <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
-    </entry>
-    <entry keyword="preferences">
-      <topic href="topics/tsrcedt025.html#tsrcedt025" title="Setting preferences for structured text editors"/>
-    </entry>
-    <entry keyword="content assistance">
-      <entry keyword="text editors">
-        <topic href="topics/tsrcedt005.html#tsrcedt005" title="Getting content assistance in structured text editors"/>
-      </entry>
-      <entry keyword="overview">
-        <topic href="topics/csrcedt006.html#csrcedt006" title="Content assist"/>
-      </entry>
-    </entry>
-    <entry keyword="text search">
-      <topic href="topics/tsrcedt007.html#tsrcedt007" title="Searching or finding text within a file"/>
-    </entry>
-    <entry keyword="spell check">
-      <topic href="topics/tsrcedt010.html#tsrcedt010" title="Checking spelling"/>
-    </entry>
-  </entry>
-  <entry keyword="templates">
-    <entry keyword="structured text editors">
-      <topic href="topics/csrcedt004.html#csrcedt004" title="Structured text editors for markup languages"/>
-    </entry>
-    <entry keyword="markup languages">
-      <topic href="topics/tsrcedt027.html#tsrcedt027" title="Adding and removing markup language templates - overview"/>
-    </entry>
-    <entry keyword="HTML">
-      <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
-    </entry>
-    <entry keyword="JSP pages">
-      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
-    </entry>
-    <entry keyword="XML">
-      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
-    </entry>
-  </entry>
-  <entry keyword="markup languages">
-    <entry keyword="editing text">
-      <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
-    </entry>
-    <entry keyword="setting annotation preferences">
-      <topic href="topics/tsrcedt001.html#tsrcedt001" title="Setting annotation preferences for markup languages"/>
-    </entry>
-    <entry keyword="templates">
-      <topic href="topics/tsrcedt027.html#tsrcedt027" title="Adding and removing markup language templates - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="text">
-    <entry keyword="editing in markup languages">
-      <topic href="topics/tsrcedt000.html#tsrcedt000" title="Editing text coded in markup languages - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="validation">
-    <entry keyword="source versus batch">
-      <topic href="topics/cvalidate.html#csrcedt001" title="Source and batch validation"/>
-    </entry>
-  </entry>
-  <entry keyword="annotations">
-    <entry keyword="markup language settings">
-      <topic href="topics/tsrcedt001.html#tsrcedt001" title="Setting annotation preferences for markup languages"/>
-    </entry>
-  </entry>
-  <entry keyword="content assistance">
-    <entry keyword="structured text editors">
-      <topic href="topics/tsrcedt005.html#tsrcedt005" title="Getting content assistance in structured text editors"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/csrcedt006.html#csrcedt006" title="Content assist"/>
-    </entry>
-    <entry keyword="enabling for JSP files">
-      <topic href="topics/tsrcedt023.html#tsrcedt023" title="Enabling content assist for JSP files"/>
-    </entry>
-  </entry>
-  <entry keyword="JSP files">
-    <entry keyword="enabling content assistance">
-      <topic href="topics/tsrcedt023.html#tsrcedt023" title="Enabling content assist for JSP files"/>
-    </entry>
-    <entry keyword="character encoding">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-    <entry keyword="templates">
-      <topic href="topics/tsrcedt028.html#tsrcedt028" title="Adding and removing JSP templates"/>
-    </entry>
-  </entry>
-  <entry keyword="content types">
-    <entry keyword="mapping file extensions">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
-    </entry>
-  </entry>
-  <entry keyword="file extensions">
-    <entry keyword="mapping content types">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
-    </entry>
-  </entry>
-  <entry keyword="file types">
-    <entry keyword="editors">
-      <topic href="topics/tcontenttype.html#tcontenttype" title="Associating editors with additional files types"/>
-    </entry>
-  </entry>
-  <entry keyword="character encoding">
-    <entry keyword="location in files">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-  </entry>
-  <entry keyword="XHTML">
-    <entry keyword="character encoding">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-  </entry>
-  <entry keyword="XML">
-    <entry keyword="character encoding">
-      <topic href="topics/cencoding.html#cencoding" title="File Encoding"/>
-    </entry>
-    <entry keyword="adding templates">
-      <topic href="topics/tsrcedt029.html#tsrcedt027" title="Adding and removing XML templates"/>
-    </entry>
-  </entry>
-  <entry keyword="spell check">
-    <entry keyword="structured text editors">
-      <topic href="topics/tsrcedt010.html#tsrcedt010" title="Checking spelling"/>
-    </entry>
-  </entry>
-  <entry keyword="HTML">
-    <entry keyword="templates">
-      <entry keyword="removing">
-        <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
-      </entry>
-      <entry keyword="adding">
-        <topic href="topics/tsrcedt024.html#tsrcedt024" title="Adding and removing HTML templates"/>
-      </entry>
-    </entry>
-  </entry>
-  <entry keyword="snippets">
-    <entry keyword="overview">
-      <topic href="topics/tsrcedt026.html#tsrcedt026" title="Editing with snippets - overview"/>
-    </entry>
-    <entry keyword="drawer customization">
-      <topic href="topics/tsrcedt014.html#tsrcedt014" title="Adding snippets drawers"/>
-    </entry>
-    <entry keyword="drawers">
-      <topic href="topics/tsrcedt015.html#tsrcedt015" title="Adding items to snippets drawers"/>
-    </entry>
-    <entry keyword="editing items">
-      <topic href="topics/tsrcedt022.html#tsrcedt022" title="Editing snippet items"/>
-    </entry>
-    <entry keyword="modifying drawers">
-      <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
-    </entry>
-  </entry>
-  <entry keyword="Snippets view">
-    <entry keyword="overview">
-      <topic href="topics/csrcedt001.html#csrcedt001" title="Snippets view"/>
-    </entry>
-  </entry>
-  <entry keyword="drawers">
-    <entry keyword="snippets view">
-      <topic href="topics/tsrcedt016.html#tsrcedt016" title="Deleting or hiding snippet items or drawers"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/plugin.properties b/docs/org.eclipse.wst.sse.doc.user/plugin.properties
deleted file mode 100644
index d97c2f1..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.sse.doc.user
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = Structured text editor and snippets documentation
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/plugin.xml b/docs/org.eclipse.wst.sse.doc.user/plugin.xml
deleted file mode 100644
index 4715def..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/plugin.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-
-<!-- ===================================================== -->
-<!-- This is the plug-in for declaring the help pages      -->
-<!-- for the structured text editors (source editors).     -->
-<!-- ===================================================== -->
-
-<plugin>
-
-    <extension point="org.eclipse.help.toc">
-      <toc file="sse_toc.xml"/>
-       <index path="index/"/>
-   </extension>
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.sse.doc.userindex.xml"/>
-</extension>
-<extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
diff --git a/docs/org.eclipse.wst.sse.doc.user/sse_toc.ditamap b/docs/org.eclipse.wst.sse.doc.user/sse_toc.ditamap
deleted file mode 100644
index f80b59b..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/sse_toc.ditamap
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map id="wstssetoc" linking="none" title="Editing text coded in markup languages - overview">

-<topicref href="topics/csrcedt004.dita" navtitle="Structured text editors">

-<topicref href="topics/tsrcedt000.dita" locktitle="yes" navtitle="Editing text coded in markup languages "

-type="task">

-<topicref href="topics/cvalidate.dita" navtitle="Source and batch validation"

-type="concept"></topicref>

-<topicref href="topics/tsrcedt025.dita" navtitle="Setting preferences for structured text editors"

-type="task">

-<topicref href="topics/tsrcedt001.dita" navtitle="Setting annotation preferences for markup languages"

-type="task"></topicref>

-</topicref>

-<topicref href="topics/tsrcedt005.dita" navtitle="Getting content assistance in structured text editors"

-type="task">

-<topicref href="topics/csrcedt006.dita" navtitle="Content assist" type="concept">

-</topicref>

-<topicref href="topics/tsrcedt023.dita" navtitle="Making content assist work for JSP files"

-type="task"></topicref>

-</topicref>

-<topicref href="topics/tcontenttype.dita" navtitle="Associating editors with file types"

-type="task"></topicref>

-<topicref href="topics/cencoding.dita" navtitle="File Encoding" type="concept">

-</topicref>

-<topicref href="topics/tsrcedt007.dita" navtitle="Searching or finding text within a file"

-type="task"></topicref>

-<topicref href="topics/tsrcedt010.dita" navtitle="Checking spelling" type="task">

-</topicref>

-<topicref href="topics/tsrcedt027.dita" navtitle="Adding and removing markup language templates - overview"

-type="task">

-<topicref href="topics/tsrcedt024.dita" navtitle="Adding and removing HTML templates"

-type="task"></topicref>

-<topicref href="topics/tsrcedt028.dita" navtitle="Adding and removing JSP templates"

-type="task"></topicref>

-<topicref href="topics/tsrcedt029.dita" navtitle="Adding and removing XML templates"

-type="task"></topicref>

-</topicref>

-<topicref href="topics/tsrcedt026.dita" navtitle="Editing with snippets - overview"

-type="task">

-<topicref href="topics/csrcedt001.dita" navtitle="Snippets view" type="concept">

-</topicref>

-<topicref href="topics/tsrcedt014.dita" navtitle="Adding snippets drawers"

-type="task"></topicref>

-<topicref href="topics/tsrcedt015.dita" navtitle="Adding items to snippets drawers"

-type="task"></topicref>

-<topicref href="topics/tsrcedt022.dita" navtitle="Editing snippet items" type="task">

-</topicref>

-<topicref href="topics/tsrcedt016.dita" navtitle="Deleting or hiding snippet items or drawers"

-type="task"></topicref>

-</topicref>

-<topicref href="../org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.dita"

-navtitle="Source editor keyboard shortcuts" scope="peer"></topicref>

-</topicref>

-</topicref>

-</map>

diff --git a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml b/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
deleted file mode 100644
index f153618..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Editing text coded in markup languages - overview" topic="topics/csrcedt004.html">
-<topic label="Structured text editors" href="topics/csrcedt004.html">
-<topic label="Editing text coded in markup languages " href="topics/tsrcedt000.html">
-<topic label="Source and batch validation" href="topics/cvalidate.html"/>
-<topic label="Setting preferences for structured text editors" href="topics/tsrcedt025.html">
-<topic label="Setting annotation preferences for markup languages" href="topics/tsrcedt001.html"/>
-</topic>
-<topic label="Getting content assistance in structured text editors" href="topics/tsrcedt005.html">
-<topic label="Content assist" href="topics/csrcedt006.html"/>
-<topic label="Making content assist work for JSP files" href="topics/tsrcedt023.html"/>
-</topic>
-<topic label="Associating editors with file types" href="topics/tcontenttype.html"/>
-<topic label="File Encoding" href="topics/cencoding.html"/>
-<topic label="Searching or finding text within a file" href="topics/tsrcedt007.html"/>
-<topic label="Checking spelling" href="topics/tsrcedt010.html"/>
-<topic label="Adding and removing markup language templates - overview" href="topics/tsrcedt027.html">
-<topic label="Adding and removing HTML templates" href="topics/tsrcedt024.html"/>
-<topic label="Adding and removing JSP templates" href="topics/tsrcedt028.html"/>
-<topic label="Adding and removing XML templates" href="topics/tsrcedt029.html"/>
-</topic>
-<topic label="Editing with snippets - overview" href="topics/tsrcedt026.html">
-<topic label="Snippets view" href="topics/csrcedt001.html"/>
-<topic label="Adding snippets drawers" href="topics/tsrcedt014.html"/>
-<topic label="Adding items to snippets drawers" href="topics/tsrcedt015.html"/>
-<topic label="Editing snippet items" href="topics/tsrcedt022.html"/>
-<topic label="Deleting or hiding snippet items or drawers" href="topics/tsrcedt016.html"/>
-</topic>
-<topic label="Source editor keyboard shortcuts" href="../org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.html"/>
-</topic>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita
deleted file mode 100644
index c7a7322..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.dita
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="cencoding" xml:lang="en-us">

-<title>File Encoding</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>character encoding<indexterm>location in files</indexterm></indexterm>

-<indexterm>JSP files<indexterm>character encoding</indexterm></indexterm>

-<indexterm>XHTML<indexterm>character encoding</indexterm></indexterm>

-<indexterm>XML<indexterm>character encoding</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p> The character encoding in XML, (X)HTML files, and JSP files can be specified

-and invoked in many different ways; however, we recommend that you specify

-the encoding in each one of your source files, for that is where many XML,

-HTML, JSP editors expect to find the encoding.</p>

-<p>For example, for JSP files, you might use the pageEncoding attribute and/or

-the contentType attribute in the page directive, as shown in the following

-example:<codeblock>&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"

-    pageEncoding="ISO-8859-1"%&gt;

-</codeblock></p>

-<p>For XML files, you might use the encoding pseudo-attribute in the xml declaration

-at the start of a document or the text declaration at the start of an entity,

-as in the following example: <codeblock>&lt;?xml version="1.0" encoding="iso-8859-1" ?></codeblock></p>

-<p>For (X)HTML files, you might use the &lt;meta&gt; tag inside the &lt;head&gt;

-tags, as shown in the following example:<codeblock>&lt;meta http-equiv="Content-Type" content="text/html;charset=utf-8" /></codeblock></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html b/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html
deleted file mode 100644
index 1b63f4d..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cencoding.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="File Encoding" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="character encoding, location in files, JSP files, XHTML, XML" name="DC.subject" />
-<meta content="character encoding, location in files, JSP files, XHTML, XML" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cencoding" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>File Encoding</title>
-</head>
-<body id="cencoding"><a name="cencoding"><!-- --></a>
-
-
-<h1 class="topictitle1">File Encoding</h1>
-
-
-
-<div><p />
-
-<p> The character encoding in XML, (X)HTML files, and JSP files can be specified
-and invoked in many different ways; however, we recommend that you specify
-the encoding in each one of your source files, for that is where many XML,
-HTML, JSP editors expect to find the encoding.</p>
-
-<div class="p">For example, for JSP files, you might use the pageEncoding attribute and/or
-the contentType attribute in the page directive, as shown in the following
-example:<pre>&lt;%@ page language="java" contentType="text/html; charset=ISO-8859-1"
-    pageEncoding="ISO-8859-1"%&gt;
-</pre>
-</div>
-
-<div class="p">For XML files, you might use the encoding pseudo-attribute in the xml declaration
-at the start of a document or the text declaration at the start of an entity,
-as in the following example: <pre>&lt;?xml version="1.0" encoding="iso-8859-1" ?&gt;</pre>
-</div>
-
-<div class="p">For (X)HTML files, you might use the &lt;meta&gt; tag inside the &lt;head&gt;
-tags, as shown in the following example:<pre>&lt;meta http-equiv="Content-Type" content="text/html;charset=utf-8" /&gt;</pre>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.dita
deleted file mode 100644
index 7f85c95..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.dita
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt001" xml:lang="en-us">

-<title>Snippets view</title>

-<shortdesc>The Snippets view lets you catalog and organize reusable programming

-objects, such as HTML tagging, <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, and JSP code, along with

-files and custom JSP tags.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>Snippets view<indexterm>overview</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<conbody>

-<p> The Snippets view can be extended based on additional objects that you

-define and include. To view or collapse the objects in a specific drawer,

-click the drawer name.</p>

-<p>The Snippets view has the following features: <ul>

-<li>Drag-and-drop to various source editing pages: You can drag items from

-the view into the active editor and the text will be dropped into the document

-at the cursor location </li>

-<li>Double-click support: You can double-click on an item and have it inserted

-at the current cursor position in the active editor </li>

-<li>User-defined drawers and items: You can define, edit, and remove items

-from view drawers as desired.</li>

-<li>Plug-in-defined drawers and items: Plug-in developers can contribute a

-default list of items to their own drawers.</li>

-<li>Variables in insertions: By default, items will be edited using a dialog

-and, when inserted, you will be prompted for values for each of the variables.</li>

-<li>Customization: You can select which drawers and items are shown in the

-Snippets view.</li>

-<li>Custom insertion: Plug-in developers can customize the behavior of items

-so that when they are dropped during a drag-and-drop action, both the text

-that is inserted and the insertion location are strictly defined.</li>

-</ul></p>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-<link href="tsrcedt000.dita"></link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
deleted file mode 100644
index 0d53f9d..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt001.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Snippets view" />
-<meta name="abstract" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags." />
-<meta name="description" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags." />
-<meta content="Snippets view, overview" name="DC.subject" />
-<meta content="Snippets view, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="csrcedt001" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Snippets view</title>
-</head>
-<body id="csrcedt001"><a name="csrcedt001"><!-- --></a>
-
-
-<h1 class="topictitle1">Snippets view</h1>
-
-
-
-<div><p>The Snippets view lets you catalog and organize reusable programming
-objects, such as HTML tagging, JavaScript™, and JSP code, along with
-files and custom JSP tags.</p>
-
-<p> The Snippets view can be extended based on additional objects that you
-define and include. To view or collapse the objects in a specific drawer,
-click the drawer name.</p>
-
-<div class="p">The Snippets view has the following features: <ul>
-<li>Drag-and-drop to various source editing pages: You can drag items from
-the view into the active editor and the text will be dropped into the document
-at the cursor location </li>
-
-<li>Double-click support: You can double-click on an item and have it inserted
-at the current cursor position in the active editor </li>
-
-<li>User-defined drawers and items: You can define, edit, and remove items
-from view drawers as desired.</li>
-
-<li>Plug-in-defined drawers and items: Plug-in developers can contribute a
-default list of items to their own drawers.</li>
-
-<li>Variables in insertions: By default, items will be edited using a dialog
-and, when inserted, you will be prompted for values for each of the variables.</li>
-
-<li>Customization: You can select which drawers and items are shown in the
-Snippets view.</li>
-
-<li>Custom insertion: Plug-in developers can customize the behavior of items
-so that when they are dropped during a drag-and-drop action, both the text
-that is inserted and the insertion location are strictly defined.</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages - overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita
deleted file mode 100644
index de02cbe..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.dita
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt004" xml:lang="en-us">

-<title>Structured text editors for markup languages</title>

-<titlealts>

-<navtitle>Structured text editors</navtitle>

-</titlealts>

-<shortdesc><q>Structured text editor</q> is any of several text editors that

-you can use to edit various markup languages such as HTML, JavaScript, or

-XML.</shortdesc>

-<prolog><metadata>

-<keywords><keyword>source editors</keyword></keywords>

-</metadata></prolog>

-<conbody>

-<p><indexterm>structured text editors<indexterm>overview</indexterm></indexterm>

-<indexterm>templates<indexterm>structured text editors</indexterm></indexterm>

-

-The structured text editor is represented by various editors that you can

-use to edit files coded with markup tags:</p>

-<table>

-<tgroup cols="3"><colspec colname="col1" colwidth="89*"/><colspec colname="col2"

-colwidth="134*"/><colspec colname="COLSPEC0" colwidth="69*"/>

-<thead>

-<row>

-<entry colname="col1" valign="top">File type</entry>

-<entry colname="col2" valign="top">Editor</entry>

-<entry colname="COLSPEC0" valign="top">Content assist?</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="col1">Cascading style sheet</entry>

-<entry colname="col2">CSS source page editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">Document type definitions</entry>

-<entry colname="col2">DTD source page editor</entry>

-<entry colname="COLSPEC0">No</entry>

-</row>

-<row>

-<entry colname="col1">HTML</entry>

-<entry colname="col2">HTML source page editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1"><tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm></entry>

-<entry colname="col2"><tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> source page editor or source

-tab of JavaScript editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">JSP</entry>

-<entry colname="col2">JSP source page editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">XML</entry>

-<entry colname="col2">Source tab of XML editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-<row>

-<entry colname="col1">XSD (schema)</entry>

-<entry colname="col2">Source tab of XML schema editor</entry>

-<entry colname="COLSPEC0">Yes</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-<p>You can access the structured text editor by right-clicking on a relevant

-file name in Navigator or Package Explorer view and then clicking <uicontrol>Open

-With</uicontrol> and selecting the editor mentioned above.</p>

-<p>The structured text editor provides a consistent interface regardless of

-the markup language with which it is associated. It provides capabilities

-such as find and replace, undo, redo, a spelling checker, and coding assistance

-(unless otherwise noted). It also highlights syntax in different colors. Following

-is a brief description of some of the structured text editor's capabilities:</p>

-<dl><dlentry>

-<dt>syntax highlighting</dt>

-<dd>Each keyword type and syntax type is highlighted differently, enabling

-you to easily find a certain kind of keyword for editing. For example, in

-HTML, element names, attribute names, attribute values, and comments have

-different colors; in <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, function and variable

-names, quoted text strings, and comments have different colors.</dd>

-</dlentry><dlentry>

-<dt>unlimited undo and redo</dt>

-<dd>These options allow you to incrementally undo and redo every change made

-to a file for the entire editing session. For text, changes are incremented

-one character or set of selected characters at a time.</dd>

-</dlentry><dlentry>

-<dt>content assist</dt>

-<dd>Content assist helps you to insert <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> functions, HTML tags, or

-other keywords. Choices available in the content assist list are based on

-functions defined by the syntax of the language in which the file is coded.</dd>

-</dlentry><dlentry>

-<dt>user-defined templates and snippets</dt>

-<dd>By using the Snippets view, you can access user-defined code snippets

-and (for all code types except <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>) templates to help you

-quickly add regularly used text strings.</dd>

-</dlentry><dlentry>

-<dt>function selection</dt>

-<dd>Based on the location of your cursor, the function or tag selection indicator

-highlights the line numbers that include a function or tag in the vertical

-ruler on the left area of the Source page.</dd>

-</dlentry><dlentry>

-<dt>pop-up menu options</dt>

-<dd>These are the same editing options available in the workbench <uicontrol>Edit</uicontrol> menu.</dd>

-</dlentry></dl>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt000.dita"></link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
deleted file mode 100644
index eec0867..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt004.html
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Structured text editors for markup languages" />
-<meta name="abstract" content="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML." />
-<meta name="description" content="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML." />
-<meta content="source editors" name="DC.subject" />
-<meta content="source editors" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="csrcedt004" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Structured text editors for markup languages</title>
-</head>
-<body id="csrcedt004"><a name="csrcedt004"><!-- --></a>
-
-
-<h1 class="topictitle1">Structured text editors for markup languages</h1>
-
-
-
-
-<div><p><span class="q">"Structured text editor"</span> is any of several text editors that
-you can use to edit various markup languages such as HTML, JavaScript, or
-XML.</p>
-
-<p>
-
-
-The structured text editor is represented by various editors that you can
-use to edit files coded with markup tags:</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr>
-<th valign="top" width="30.47945205479452%" id="N10086">File type</th>
-
-<th valign="top" width="45.89041095890411%" id="N1008E">Editor</th>
-
-<th valign="top" width="23.63013698630137%" id="N10096">Content assist?</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N10086 ">Cascading style sheet</td>
-
-<td valign="top" width="45.89041095890411%" headers="N1008E ">CSS source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N10086 ">Document type definitions</td>
-
-<td valign="top" width="45.89041095890411%" headers="N1008E ">DTD source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N10096 ">No</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N10086 ">HTML</td>
-
-<td valign="top" width="45.89041095890411%" headers="N1008E ">HTML source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N10086 ">JavaScript™</td>
-
-<td valign="top" width="45.89041095890411%" headers="N1008E ">JavaScript source page editor or source
-tab of JavaScript editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N10086 ">JSP</td>
-
-<td valign="top" width="45.89041095890411%" headers="N1008E ">JSP source page editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N10086 ">XML</td>
-
-<td valign="top" width="45.89041095890411%" headers="N1008E ">Source tab of XML editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="30.47945205479452%" headers="N10086 ">XSD (schema)</td>
-
-<td valign="top" width="45.89041095890411%" headers="N1008E ">Source tab of XML schema editor</td>
-
-<td valign="top" width="23.63013698630137%" headers="N10096 ">Yes</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-<p>You can access the structured text editor by right-clicking on a relevant
-file name in Navigator or Package Explorer view and then clicking <span class="uicontrol">Open
-With</span> and selecting the editor mentioned above.</p>
-
-<p>The structured text editor provides a consistent interface regardless of
-the markup language with which it is associated. It provides capabilities
-such as find and replace, undo, redo, a spelling checker, and coding assistance
-(unless otherwise noted). It also highlights syntax in different colors. Following
-is a brief description of some of the structured text editor's capabilities:</p>
-
-<dl>
-<dt class="dlterm">syntax highlighting</dt>
-
-<dd>Each keyword type and syntax type is highlighted differently, enabling
-you to easily find a certain kind of keyword for editing. For example, in
-HTML, element names, attribute names, attribute values, and comments have
-different colors; in JavaScript, function and variable
-names, quoted text strings, and comments have different colors.</dd>
-
-
-<dt class="dlterm">unlimited undo and redo</dt>
-
-<dd>These options allow you to incrementally undo and redo every change made
-to a file for the entire editing session. For text, changes are incremented
-one character or set of selected characters at a time.</dd>
-
-
-<dt class="dlterm">content assist</dt>
-
-<dd>Content assist helps you to insert JavaScript functions, HTML tags, or
-other keywords. Choices available in the content assist list are based on
-functions defined by the syntax of the language in which the file is coded.</dd>
-
-
-<dt class="dlterm">user-defined templates and snippets</dt>
-
-<dd>By using the Snippets view, you can access user-defined code snippets
-and (for all code types except JavaScript) templates to help you
-quickly add regularly used text strings.</dd>
-
-
-<dt class="dlterm">function selection</dt>
-
-<dd>Based on the location of your cursor, the function or tag selection indicator
-highlights the line numbers that include a function or tag in the vertical
-ruler on the left area of the Source page.</dd>
-
-
-<dt class="dlterm">pop-up menu options</dt>
-
-<dd>These are the same editing options available in the workbench <span class="uicontrol">Edit</span> menu.</dd>
-
-</dl>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages - overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
deleted file mode 100644
index 2dbfe9d..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt006" xml:lang="en-us">

-<title>Content assist</title>

-<shortdesc>Content assist helps you insert or finish a tag or function or

-finish a line of code in a structured text editor. The placement of the cursor

-in the source file provides the context for the content assist to offer suggestions

-for completion.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="csrcedt006|1|contentassistanceoverview" status="new">content

-assistance<indexterm>overview</indexterm></indexterm><indexterm keyref="csrcedt006|2|structuredtexteditorscontentassistance"

-status="changed">structured text editors<indexterm>content assistance<indexterm>overview</indexterm></indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Most of the structured text editors have content assist. For a list of

-editors that have content assist, see <xref href="csrcedt004.dita" type="concept">Structured

-text editors for markup languages</xref>. For information on how to get content

-assistance, see <xref href="tsrcedt005.dita" type="task">Getting content assistance

-in structured text editors</xref></p>

-<p>The sections below describe specifics of HTML content assist, <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> content

-assist, and JSP content assist.</p>

-<section><title>HTML content assist</title><p>HTML is flexible in that some

-HTML elements allow end tags to be optionally omitted, such as <codeph>P</codeph>, <codeph>DT</codeph>, <codeph>DD</codeph>, <codeph>LI</codeph>, <codeph

->THEAD</codeph>, <codeph>TR</codeph>, <codeph>TD</codeph>, <codeph>TH</codeph>,

-and so on. Other HTML elements that are defined to have no content may require

-the end tag always be omitted, such as <codeph>BR</codeph>, <codeph>HR</codeph>, <codeph>LINK</codeph>, <codeph>META</codeph>,

-and <codeph>IMG</codeph>. This flexibility makes the content assist function

-within the HTML source page editor less precise than it might be with a more

-rigidly constrained markup language.</p><p>HTML content assist is most beneficial

-when you need to complete a tag name, add an attribute name-value pair within

-a start tag, or select from an enumerated list of attribute values.</p><p>Although

-content assist only shows attribute names that have not already been specified

-in a start tag, it does not take into account grammar constraints for tags.

-For example, the <codeph>HEAD</codeph> element in HTML only permits zero or

-one occurrences of a <codeph>TITLE</codeph> tag in its content. If you prompt

-for content assist within a <codeph>HEAD</codeph> content that already contains

-a <codeph>TITLE</codeph> tag, content assist will still show <codeph>TITLE</codeph> in

-its proposal list.</p><p>However, if an attribute is required according to

-the DTD/Schema, that attribute will show up at the top of the list, with a

-yellow circle indicator on its icon.</p><p>If your cursor is in a position

-where content assist is available, a pop-up list of available choices is displayed.

-The list is based on the context. For example, if you use content assist directly

-after an opening paragraph tag (<codeph>&lt;p></codeph>) , the first item

-in the content assist list will be the corresponding closing paragraph (<codeph>&lt;/p></codeph>)

-tag.</p><p>The content assist list displays all available tags for the current

-cursor position, including templates. The picture below shows the default

-content assist list for a paragraph tag example:<image alt="HTML Content assist"

-href="../images/ncontass.gif" placement="break"></image></p><p>Tag proposals

-are listed alphabetically. If you type a <codeph>&lt;</codeph> (to begin a

-new tag) before prompting for content assist, and begin typing the first one

-or two letters of the tag that you want to add, the proposal list automatically

-refreshes to reflect proposals that match the pattern you have typed. If you

-do not type a <codeph>&lt;</codeph> before prompting for content assist, you

-can click within the proposal list and then type the letter that the tag begins

-with, to reduce (somewhat) the amount of scrolling to locate the desired tag.</p><p>As

-you type the first one or two letters of the attribute names or enumerated

-attribute values that you want to add to a tag, the list automatically refreshes

-to reflect proposals that match the pattern you have typed.</p><note type="restriction"><image

-alt="For Linux." href="../images/nlinux.gif"></image> When using Linux (Motif

-or GTK) and a DBCS locale, double-clicking on the content assist list can

-sometimes cause the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> VM to terminate. Instead of double-clicking

-on the list, use the arrows and Enter keys to make the selection from the

-list.</note></section>

-<section><title>JSP content assist</title><p>You have many options for embedding <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> and

-HTML code in your JSP pages by using content assist.</p><p>All of the JSP

-tags are included both in the template list and in XML format (for example, <codeph>&lt;jsp:expression></codeph>).

-To add JSP scriptlet tags, for example, move the cursor to the appropriate

-position in the file and press Ctrl+Space to use content assist. Select <image

-alt="JSP scriptlet content assist" href="../images/nmacscrp.gif" placement="inline">

-</image> from the proposal list to insert <codeph>&lt;% %></codeph>  in the

-document.</p><p>Scriptlets are inserted in a tag <codeph>&lt;% %></codeph>.

-For example: <codeblock>&lt;% System.currentTimeMillis() %></codeblock></p><p>This

-example will evaluate the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> statement to get the current time in

-milliseconds.</p><p>To have the result of the statement inserted in the file,

-put an equals sign (=) in the front of the statement. For example: <codeblock>&lt;b>This is the time : &lt;%= System.currentTimeMillis()%>&lt;/b></codeblock

-></p><p>When you are within a scriptlet you are writing pure <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> code.

-Therefore, content assist works exactly the same as it does for the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> editor.

-For example, if you request content assist after <codeph>System</codeph>,

-content assist displays a list of methods. <note><tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> content assist works only in a Web

-project, because it requires a buildpath to find the appropriate <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> classes.</note></p><p>There

-are also special tags such as useBean. For example: <codeblock>&lt;jsp:useBean id="useBean" class="java.lang.String"/></codeblock></p><p>The

-useBean tag enables you to create a bean called <codeph>aString</codeph> of

-type <codeph>String</codeph>. Then when you use content assist, this is recognized

-as a declared variable. For example, if you use content assist after <codeph>aString</codeph>,

-as follows:</p><p> <codeblock>&lt;% aString. %> </codeblock>the content assist

-list shows available methods. This is because <codeph>aString</codeph> has

-been declared as a bean of type String.</p><p>If you use content assist after

-the <codeph>a</codeph>, as follows: <codeblock>&lt;% a %> </codeblock>content

-assist knows that <codeph>aString</codeph> exists, and it is shown in the

-content assist list.</p></section>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt005.dita"><linktext>Getting content assistance in structured

-text editors</linktext></link>

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html b/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
deleted file mode 100644
index a704679..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/csrcedt006.html
+++ /dev/null
@@ -1,148 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Content assist" />
-<meta name="abstract" content="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion." />
-<meta name="description" content="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion." />
-<meta content="content assistance, overview, structured text editors, content assistance" name="DC.subject" />
-<meta content="content assistance, overview, structured text editors, content assistance" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="csrcedt006" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Content assist</title>
-</head>
-<body id="csrcedt006"><a name="csrcedt006"><!-- --></a>
-
-
-<h1 class="topictitle1">Content assist</h1>
-
-
-
-<div><p>Content assist helps you insert or finish a tag or function or
-finish a line of code in a structured text editor. The placement of the cursor
-in the source file provides the context for the content assist to offer suggestions
-for completion.</p>
-
-<p>Most of the structured text editors have content assist. For a list of
-editors that have content assist, see <a href="csrcedt004.html">Structured text editors for markup languages</a>. For information on how to get content
-assistance, see <a href="tsrcedt005.html">Getting content assistance in structured text editors</a></p>
-
-<p>The sections below describe specifics of HTML content assist, JavaScript™ content
-assist, and JSP content assist.</p>
-
-<div class="section"><h4 class="sectiontitle">HTML content assist</h4><p>HTML is flexible in that some
-HTML elements allow end tags to be optionally omitted, such as <samp class="codeph">P</samp>, <samp class="codeph">DT</samp>, <samp class="codeph">DD</samp>, <samp class="codeph">LI</samp>, <samp class="codeph">THEAD</samp>, <samp class="codeph">TR</samp>, <samp class="codeph">TD</samp>, <samp class="codeph">TH</samp>,
-and so on. Other HTML elements that are defined to have no content may require
-the end tag always be omitted, such as <samp class="codeph">BR</samp>, <samp class="codeph">HR</samp>, <samp class="codeph">LINK</samp>, <samp class="codeph">META</samp>,
-and <samp class="codeph">IMG</samp>. This flexibility makes the content assist function
-within the HTML source page editor less precise than it might be with a more
-rigidly constrained markup language.</p>
-<p>HTML content assist is most beneficial
-when you need to complete a tag name, add an attribute name-value pair within
-a start tag, or select from an enumerated list of attribute values.</p>
-<p>Although
-content assist only shows attribute names that have not already been specified
-in a start tag, it does not take into account grammar constraints for tags.
-For example, the <samp class="codeph">HEAD</samp> element in HTML only permits zero or
-one occurrences of a <samp class="codeph">TITLE</samp> tag in its content. If you prompt
-for content assist within a <samp class="codeph">HEAD</samp> content that already contains
-a <samp class="codeph">TITLE</samp> tag, content assist will still show <samp class="codeph">TITLE</samp> in
-its proposal list.</p>
-<p>However, if an attribute is required according to
-the DTD/Schema, that attribute will show up at the top of the list, with a
-yellow circle indicator on its icon.</p>
-<p>If your cursor is in a position
-where content assist is available, a pop-up list of available choices is displayed.
-The list is based on the context. For example, if you use content assist directly
-after an opening paragraph tag (<samp class="codeph">&lt;p&gt;</samp>) , the first item
-in the content assist list will be the corresponding closing paragraph (<samp class="codeph">&lt;/p&gt;</samp>)
-tag.</p>
-<p>The content assist list displays all available tags for the current
-cursor position, including templates. The picture below shows the default
-content assist list for a paragraph tag example:<br /><img src="../images/ncontass.gif" alt="HTML Content assist" /><br /></p>
-<p>Tag proposals
-are listed alphabetically. If you type a <samp class="codeph">&lt;</samp> (to begin a
-new tag) before prompting for content assist, and begin typing the first one
-or two letters of the tag that you want to add, the proposal list automatically
-refreshes to reflect proposals that match the pattern you have typed. If you
-do not type a <samp class="codeph">&lt;</samp> before prompting for content assist, you
-can click within the proposal list and then type the letter that the tag begins
-with, to reduce (somewhat) the amount of scrolling to locate the desired tag.</p>
-<p>As
-you type the first one or two letters of the attribute names or enumerated
-attribute values that you want to add to a tag, the list automatically refreshes
-to reflect proposals that match the pattern you have typed.</p>
-<div class="restriction"><span class="restrictiontitle">Restriction:</span> <img src="../images/nlinux.gif" alt="For Linux." /> When using Linux (Motif
-or GTK) and a DBCS locale, double-clicking on the content assist list can
-sometimes cause the Java™ VM to terminate. Instead of double-clicking
-on the list, use the arrows and Enter keys to make the selection from the
-list.</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">JSP content assist</h4><p>You have many options for embedding Java and
-HTML code in your JSP pages by using content assist.</p>
-<p>All of the JSP
-tags are included both in the template list and in XML format (for example, <samp class="codeph">&lt;jsp:expression&gt;</samp>).
-To add JSP scriptlet tags, for example, move the cursor to the appropriate
-position in the file and press Ctrl+Space to use content assist. Select <img src="../images/nmacscrp.gif" alt="JSP scriptlet content assist" /> from the proposal list to insert <samp class="codeph">&lt;% %&gt;</samp>  in the
-document.</p>
-<div class="p">Scriptlets are inserted in a tag <samp class="codeph">&lt;% %&gt;</samp>.
-For example: <pre>&lt;% System.currentTimeMillis() %&gt;</pre>
-</div>
-<p>This
-example will evaluate the Java statement to get the current time in
-milliseconds.</p>
-<div class="p">To have the result of the statement inserted in the file,
-put an equals sign (=) in the front of the statement. For example: <pre>&lt;b&gt;This is the time : &lt;%= System.currentTimeMillis()%&gt;&lt;/b&gt;</pre>
-</div>
-<div class="p">When you are within a scriptlet you are writing pure Java code.
-Therefore, content assist works exactly the same as it does for the Java editor.
-For example, if you request content assist after <samp class="codeph">System</samp>,
-content assist displays a list of methods. <div class="note"><span class="notetitle">Note:</span> Java content assist works only in a Web
-project, because it requires a buildpath to find the appropriate Java classes.</div>
-</div>
-<div class="p">There
-are also special tags such as useBean. For example: <pre>&lt;jsp:useBean id="useBean" class="java.lang.String"/&gt;</pre>
-</div>
-<p>The
-useBean tag enables you to create a bean called <samp class="codeph">aString</samp> of
-type <samp class="codeph">String</samp>. Then when you use content assist, this is recognized
-as a declared variable. For example, if you use content assist after <samp class="codeph">aString</samp>,
-as follows:</p>
-<div class="p"> <pre>&lt;% aString. %&gt; </pre>
-the content assist
-list shows available methods. This is because <samp class="codeph">aString</samp> has
-been declared as a bean of type String.</div>
-<div class="p">If you use content assist after
-the <samp class="codeph">a</samp>, as follows: <pre>&lt;% a %&gt; </pre>
-content
-assist knows that <samp class="codeph">aString</samp> exists, and it is shown in the
-content assist list.</div>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured
-text editors</a></div>
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita
deleted file mode 100644
index c430e77..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "..\dtd\concept.dtd">

-<concept id="csrcedt001" xml:lang="en-us">

-<title>Source and batch validation</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="cvalidate|1|validationsourcevsbatch" status="changed">validation<indexterm>source

-versus batch</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>There are two types of validation that can occur when you are working with

-source files in a structured source editor: source validation and batch validation. </p>

-<p>Source validation occurs as you type your code; this validation reflects

-the "unsaved" and "unbuilt" contents of the source you are editing. For example,

-if you were to type the following code in a JSP editor:<lines><codeph>&lt;foo:bar></codeph></lines>where <codeph>foo:bar</codeph>is

-a tag that does not exist, the problem would be discovered immediately and

-would appear underlined in the editor. The advantage of this type of validation

-is that it can alert you to errors instantly.<note>To turn source validation

-on (or off) for all structured text editors, click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol><uicontrol>General</uicontrol><uicontrol>Editors</uicontrol>

-<uicontrol>Structured Text Editors</uicontrol></menucascade> and check (or

-uncheck) <b>Report problems as you type</b>.</note></p>

-<p>Batch validation occurs on saved files. It can catch build process errors

-and other errors that the source validator cannot. For example, suppose you

-typed the following in a JSP editor:<lines>

-<codeph>&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>

-&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%></codeph></lines>In

-this example, the same prefix is used twice. This would prompt the batch validator

-to trigger markers and to generate build warnings in the Problems view and

-in the Navigator. </p>

-<p>Batch validation can uncover errors in multiple files at once and give

-you a comprehensive view of where problematic code can be found in your project.

-Moreover, you do not need to open files in an editor to run batch validation.

-To run batch validation on specific files, select and right click the files

-in the Project Explorer and then select <menucascade><uicontrol>Validate</uicontrol>

-</menucascade> from the popup menu.</p>

-<note>To set preferences for batch validation, click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol><uicontrol>Validation</uicontrol></menucascade></note>

-</conbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-</related-links>

-</concept>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html b/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html
deleted file mode 100644
index 7796212..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/cvalidate.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Source and batch validation" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="validation, source versus batch" name="DC.subject" />
-<meta content="validation, source versus batch" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="csrcedt001" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Source and batch validation</title>
-</head>
-<body id="csrcedt001"><a name="csrcedt001"><!-- --></a>
-
-
-<h1 class="topictitle1">Source and batch validation</h1>
-
-
-
-<div><p />
-
-<p>There are two types of validation that can occur when you are working with
-source files in a structured source editor: source validation and batch validation. </p>
-
-<div class="p">Source validation occurs as you type your code; this validation reflects
-the "unsaved" and "unbuilt" contents of the source you are editing. For example,
-if you were to type the following code in a JSP editor:<p><samp class="codeph">&lt;foo:bar&gt;</samp></p>
-where <samp class="codeph">foo:bar</samp>is
-a tag that does not exist, the problem would be discovered immediately and
-would appear underlined in the editor. The advantage of this type of validation
-is that it can alert you to errors instantly.<div class="note"><span class="notetitle">Note:</span> To turn source validation
-on (or off) for all structured text editors, click <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span>
- &gt; <span class="uicontrol">Structured Text Editors</span></span> and check (or
-uncheck) <strong>Report problems as you type</strong>.</div>
-</div>
-
-<div class="p">Batch validation occurs on saved files. It can catch build process errors
-and other errors that the source validator cannot. For example, suppose you
-typed the following in a JSP editor:<p><br />
-<samp class="codeph">&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%&gt;<br />
-&lt;%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%&gt;</samp></p>
-In
-this example, the same prefix is used twice. This would prompt the batch validator
-to trigger markers and to generate build warnings in the Problems view and
-in the Navigator. </div>
-
-<p>Batch validation can uncover errors in multiple files at once and give
-you a comprehensive view of where problematic code can be found in your project.
-Moreover, you do not need to open files in an editor to run batch validation.
-To run batch validation on specific files, select and right click the files
-in the Project Explorer and then select <span class="menucascade"><span class="uicontrol">Validate</span>
-</span> from the popup menu.</p>
-
-<div class="note"><span class="notetitle">Note:</span> To set preferences for batch validation, click <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Validation</span></span></div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita
deleted file mode 100644
index c63d1e1..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.dita
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tcontenttype" xml:lang="en-us">

-<title>Associating editors with additional files types</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>content types<indexterm>mapping file extensions</indexterm></indexterm>

-<indexterm>file extensions<indexterm>mapping content types</indexterm></indexterm>

-<indexterm>file types<indexterm>editors</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can associate certain editors with a file type by clicking

-on <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>General</uicontrol><uicontrol>Editors</uicontrol><uicontrol>File

-Association</uicontrol></menucascade> and setting up the associations in the

-File Associations Window.</p><p>Some Eclipse-based editors, however, will

-only recognize a file based on the contents of the file. Consequently, if

-you want to associate an additional file type with some editors, you may have

-to first map the content type with its file extension. To map a content type

-with a file extension, complete the following steps: </p><ol>

-<li>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>General</uicontrol>

-<uicontrol>Content Types</uicontrol></menucascade>. The Content Type window

-appears. </li>

-<li>Select a content type in the Content Type window, and then select <b>Add</b> .

-The Define a New File Type window appears.</li>

-<li>Type the name of the file type, and then click <b>OK</b>.</li>

-</ol></context>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html b/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html
deleted file mode 100644
index b5f1861..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tcontenttype.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Associating editors with additional files types" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="content types, mapping file extensions, file extensions, mapping content types, file types, editors" name="DC.subject" />
-<meta content="content types, mapping file extensions, file extensions, mapping content types, file types, editors" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcontenttype" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Associating editors with additional files types</title>
-</head>
-<body id="tcontenttype"><a name="tcontenttype"><!-- --></a>
-
-
-<h1 class="topictitle1">Associating editors with additional files types</h1>
-
-
-
-<div><p />
-
-<div class="section"><p>You can associate certain editors with a file type by clicking
-on <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">General</span> &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">File
-Association</span></span> and setting up the associations in the
-File Associations Window.</p>
-<p>Some Eclipse-based editors, however, will
-only recognize a file based on the contents of the file. Consequently, if
-you want to associate an additional file type with some editors, you may have
-to first map the content type with its file extension. To map a content type
-with a file extension, complete the following steps: </p>
-<ol>
-<li>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">General</span>
- &gt; <span class="uicontrol">Content Types</span></span>. The Content Type window
-appears. </li>
-
-<li>Select a content type in the Content Type window, and then select <strong>Add</strong> .
-The Define a New File Type window appears.</li>
-
-<li>Type the name of the file type, and then click <strong>OK</strong>.</li>
-
-</ol>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita
deleted file mode 100644
index 42b7b97..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.dita
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt000" xml:lang="en-us">

-<title>Editing text coded in markup languages - overview</title>

-<titlealts>

-<navtitle>Editing markup languages - overview</navtitle>

-</titlealts>

-<shortdesc>You can edit text coded in markup languages with a <term>structured

-text editor</term>. This is a generic term for several editors that you can

-use to edit any of several markup languages, such as HTML.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>markup languages<indexterm>editing text</indexterm></indexterm>

-<indexterm>text<indexterm>editing in markup languages</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>In addition to basic editing tasks such as adding, modifying, and

-deleting text, you can perform the following tasks:</context>

-<steps-unordered>

-<step><cmd><xref href="tsrcedt025.dita" type="task">Set preferences for structured

-text editors</xref></cmd></step>

-<step><cmd><xref href="tsrcedt005.dita" type="task">Get content assistance

-in structured text editors</xref></cmd></step>

-<step><cmd><xref href="tsrcedt007.dita" type="task">Search or find text within

-a file</xref></cmd></step>

-<step><cmd><xref href="tsrcedt010.dita" type="task">Check spelling</xref></cmd>

-</step>

-<step><cmd><xref href="tsrcedt027.dita" type="task">Add or remove markup language

-templates</xref></cmd></step>

-<step><cmd><xref href="tsrcedt026.dita" type="task">Edit with snippets</xref></cmd>

-</step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt025.dita"></link>

-<link href="tsrcedt005.dita"></link>

-<link href="tsrcedt007.dita"></link>

-<link href="tsrcedt010.dita"></link>

-<link href="tsrcedt027.dita"></link>

-<link href="tsrcedt026.dita"></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
deleted file mode 100644
index 5094861..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing text coded in markup languages - overview" />
-<meta name="abstract" content="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML." />
-<meta name="description" content="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML." />
-<meta content="markup languages, editing text, text, editing in markup languages" name="DC.subject" />
-<meta content="markup languages, editing text, text, editing in markup languages" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt025.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt007.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt010.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt000" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing text coded in markup languages - overview</title>
-</head>
-<body id="tsrcedt000"><a name="tsrcedt000"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing text coded in markup languages - overview</h1>
-
-
-
-
-<div><p>You can edit text coded in markup languages with a <dfn class="term">structured
-text editor</dfn>. This is a generic term for several editors that you can
-use to edit any of several markup languages, such as HTML.</p>
-
-<div class="section">In addition to basic editing tasks such as adding, modifying, and
-deleting text, you can perform the following tasks:</div>
-
-<ul>
-<li><span><a href="tsrcedt025.html">Set preferences for structured text editors</a></span></li>
-
-<li><span><a href="tsrcedt005.html">Get content assistance in structured text editors</a></span></li>
-
-<li><span><a href="tsrcedt007.html">Search or find text within a file</a></span></li>
-
-<li><span><a href="tsrcedt010.html">Check spelling</a></span>
-</li>
-
-<li><span><a href="tsrcedt027.html">Add or remove markup language templates</a></span></li>
-
-<li><span><a href="tsrcedt026.html">Edit with snippets</a></span>
-</li>
-
-</ul>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt025.html" title="">Setting preferences for structured text editors</a></div>
-<div><a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured text editors</a></div>
-<div><a href="tsrcedt007.html" title="">Searching or finding text within a file</a></div>
-<div><a href="tsrcedt010.html" title="This documentation describes how to check spelling in a structured text editor.">Checking spelling</a></div>
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language templates - overview</a></div>
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita
deleted file mode 100644
index d100c8c..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.dita
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt001" xml:lang="en-us">

-<title>Setting annotation preferences for markup languages</title>

-<titlealts>

-<navtitle>Setting annotation preferences</navtitle>

-</titlealts>

-<shortdesc>This documentation describes how to set <term>annotation preferences</term> for

-Web and XML files. The annotation preferences include whether to analyze the

-syntactic validity of your file while you are typing and what colors to use

-to highlight errors, warnings, tasks, search results, bookmarks, and other

-text.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="tsrcedt001|1|annotationpreferencesmarkuplanguagesettings"

-status="changed">annotations<indexterm>markup language settings</indexterm></indexterm>

-<indexterm keyref="tsrcedt001|2|markuplanguagessettingannotationpreferences"

-status="new">markup languages<indexterm>setting annotation preferences</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>By default, when you edit in a structured text editor, your source

-code is validated as you type it in. Like other Eclipse-based editors, the

-structured text editors for markup languages flag warnings and errors in the

-source code in the editor area. The warnings and errors also show up in the

-Tasks view when you save the file.</p><note>Highlighting is fully dynamic

-with the exception of search results. Search results are highlighted based

-upon what has been saved to disk.</note><note type="tip">You can improve a

-structured text editor's performance by turning off the real-time validation.</note><p>To

-set annotation preferences, complete the following steps:</p> </context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade>.</cmd><stepresult>A Preferences window appears.</stepresult>

-</step>

-<step><cmd>In the Preferences window, click <menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select one of the following options:</cmd>

-<choices>

-<choice>To turn off real-time syntax validation, click <uicontrol>Structured

-Text Editor</uicontrol> and uncheck the <uicontrol>Analyze annotations while

-typing</uicontrol> box.</choice>

-<choice>To control other annotation settings, click <uicontrol>Annotations</uicontrol> and

-select your annotation preferences.</choice>

-</choices>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save your preferences and close

-the page.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt025.dita"><linktext>Setting preferences for structured

-text editors</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
deleted file mode 100644
index 1fca557..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt001.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting annotation preferences for markup languages" />
-<meta name="abstract" content="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text." />
-<meta name="description" content="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text." />
-<meta content="annotations, markup language settings, markup languages, setting annotation preferences" name="DC.subject" />
-<meta content="annotations, markup language settings, markup languages, setting annotation preferences" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt025.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt001" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting annotation preferences for markup languages</title>
-</head>
-<body id="tsrcedt001"><a name="tsrcedt001"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting annotation preferences for markup languages</h1>
-
-
-
-
-<div><p>This documentation describes how to set <dfn class="term">annotation preferences</dfn> for
-Web and XML files. The annotation preferences include whether to analyze the
-syntactic validity of your file while you are typing and what colors to use
-to highlight errors, warnings, tasks, search results, bookmarks, and other
-text.</p>
-
-<div class="section"> <p>By default, when you edit in a structured text editor, your source
-code is validated as you type it in. Like other Eclipse-based editors, the
-structured text editors for markup languages flag warnings and errors in the
-source code in the editor area. The warnings and errors also show up in the
-Tasks view when you save the file.</p>
-<div class="note"><span class="notetitle">Note:</span> Highlighting is fully dynamic
-with the exception of search results. Search results are highlighted based
-upon what has been saved to disk.</div>
-<div class="tip"><span class="tiptitle">Tip:</span> You can improve a
-structured text editor's performance by turning off the real-time validation.</div>
-<p>To
-set annotation preferences, complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span>.</span> A Preferences window appears.
-</li>
-
-<li class="stepexpand"><span>In the Preferences window, click <span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select one of the following options:</span>
-<ul>
-<li>To turn off real-time syntax validation, click <span class="uicontrol">Structured
-Text Editor</span> and uncheck the <span class="uicontrol">Analyze annotations while
-typing</span> box.</li>
-
-<li>To control other annotation settings, click <span class="uicontrol">Annotations</span> and
-select your annotation preferences.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save your preferences and close
-the page.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt025.html" title="">Setting preferences for structured
-text editors</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
deleted file mode 100644
index 5083676..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.dita
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt005" xml:lang="en-us">

-<title>Getting content assistance in structured text editors</title>

-<!--Formerly "Using JavaScript content assist"; moved some JavaScript-specific content to csrcedt006.dita ("Content assist")-->

-<titlealts>

-<navtitle>Getting content assistance</navtitle>

-</titlealts>

-<shortdesc>To get help in adding markup to a file, you can use content assist

-in a structured text editor. Content assist helps you insert or finish a tag

-or function or finish a line of code in a structured text editor.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="tsrcedt005|1|contentassistancestructuredtexteditors"

-status="new">content assistance<indexterm>structured text editors</indexterm></indexterm>

-<indexterm keyref="tsrcedt005|2|structuredtexteditorscontentassistance" status="changed">structured

-text editors<indexterm>content assistance<indexterm>text editors</indexterm></indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>Content assist also enables you to select and insert templates in

-structured text editors. The placement of the cursor in the source file provides

-the context for the content assist to offer suggestions for completion.</context>

-<steps-unordered>

-<step><cmd></cmd><info>You can request content assist in either of the following

-two ways:</info>

-<choices>

-<choice>From the <uicontrol>Edit</uicontrol> menu, select <uicontrol>Content

-Assist</uicontrol></choice>

-<choice>Press Ctrl+Space</choice>

-</choices>

-<info><p>In addition, you can set a preference that causes content assist

-to pop up automatically when certain characters are typed, such as <codeph>.</codeph> in

-the case of <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="JavaScript">JavaScript</tm> or <codeph>&lt;</codeph> in the case

-of HTML and XML. To set this preference, select <uicontrol>Preferences</uicontrol> from

-the <uicontrol>Window</uicontrol> menu, and then select <uicontrol>Web and

-XML Files</uicontrol>, followed by one of the following sequences:<ul>

-<li><menucascade><uicontrol>HTML Files</uicontrol><uicontrol>HTML Source</uicontrol>

-</menucascade></li>

-<li><menucascade><uicontrol>JavaScript Files</uicontrol><uicontrol>JavaScript

-Source</uicontrol></menucascade></li>

-<li><menucascade><uicontrol>XML Files</uicontrol><uicontrol>XML Source</uicontrol>

-</menucascade></li>

-</ul>In the <uicontrol>Content assist</uicontrol> group box, select the <uicontrol>Automatically

-make suggestions</uicontrol> check box, and supply any additional characters

-that should trigger content assist.</p><p>If your cursor is in a position

-where content assist is available, a pop-up list of all available choices

-is displayed. For each of these choices, a brief description of the code is

-provided.</p></info></step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<!--  <link href="contentassist" type="showme" format="viewlet"><linktext>Show Me</linktext></link>  -->

-<linkpool type="concept">

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt023.dita"><linktext>Making content assist work for JSP

-files</linktext></link>

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
deleted file mode 100644
index fb68fc1..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Getting content assistance in structured text editors" />
-<meta name="abstract" content="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor." />
-<meta name="description" content="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor." />
-<meta content="content assistance, structured text editors, structured text editors, text editors" name="DC.subject" />
-<meta content="content assistance, structured text editors, structured text editors, text editors" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt023.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt005" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Getting content assistance in structured text editors</title>
-</head>
-<body id="tsrcedt005"><a name="tsrcedt005"><!-- --></a>
-
-
-<h1 class="topictitle1">Getting content assistance in structured text editors</h1>
-
-
-
-
-
-<div><p>To get help in adding markup to a file, you can use content assist
-in a structured text editor. Content assist helps you insert or finish a tag
-or function or finish a line of code in a structured text editor.</p>
-
-<div class="section">Content assist also enables you to select and insert templates in
-structured text editors. The placement of the cursor in the source file provides
-the context for the content assist to offer suggestions for completion.</div>
-
-
-<div class="p"><span /> You can request content assist in either of the following
-two ways:
-<ul>
-<li>From the <span class="uicontrol">Edit</span> menu, select <span class="uicontrol">Content
-Assist</span></li>
-
-<li>Press Ctrl+Space</li>
-
-</ul>
-
- <div class="p">In addition, you can set a preference that causes content assist
-to pop up automatically when certain characters are typed, such as <samp class="codeph">.</samp> in
-the case of JavaScript™ or <samp class="codeph">&lt;</samp> in the case
-of HTML and XML. To set this preference, select <span class="uicontrol">Preferences</span> from
-the <span class="uicontrol">Window</span> menu, and then select <span class="uicontrol">Web and
-XML Files</span>, followed by one of the following sequences:<ul>
-<li><span class="menucascade"><span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Source</span>
-</span></li>
-
-<li><span class="menucascade"><span class="uicontrol">JavaScript Files</span> &gt; <span class="uicontrol">JavaScript
-Source</span></span></li>
-
-<li><span class="menucascade"><span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML Source</span>
-</span></li>
-
-</ul>
-In the <span class="uicontrol">Content assist</span> group box, select the <span class="uicontrol">Automatically
-make suggestions</span> check box, and supply any additional characters
-that should trigger content assist.</div>
-<p>If your cursor is in a position
-where content assist is available, a pop-up list of all available choices
-is displayed. For each of these choices, a brief description of the code is
-provided.</p>
-</div>
-
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt023.html" title="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files.">Making content assist work for JSP
-files</a></div>
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.dita
deleted file mode 100644
index 38aa8b6..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt007" xml:lang="en-us">

-<title>Searching or finding text within a file</title>

-<prolog><metadata>

-<keywords><indexterm>structured text editors<indexterm>text search</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<prereq><note type="tip">Before you do a Search operation in a structured

-text editor, save the file you are searching. The search function works from

-the most recently saved version of the file rather than from the contents

-that you see in the editor area. You do not need to save your file before

-you do a Find/Replace operation. </note></prereq>

-<context>Each structured text editor provides two ways to locate a text string

-in the file you are editing and optionally replace it with another string: <dl>

-<dlentry>

-<dt>Find/Replace</dt>

-<dd>Lets you locate text in the file currently being edited.</dd>

-</dlentry><dlentry>

-<dt>Search</dt>

-<dd>Lets you locate text in files that have been saved to your workspace.</dd>

-</dlentry></dl><p>To locate and optionally replace text, select one of the

-following menu paths:</p></context>

-<steps-unordered>

-<step><cmd><menucascade><uicontrol>Edit</uicontrol><uicontrol>Find/Replace</uicontrol>

-</menucascade> (or <uicontrol>Ctrl+F</uicontrol>)</cmd><info>This option is

-self-explanatory.</info></step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
deleted file mode 100644
index 2f788ed..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt007.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Searching or finding text within a file" />
-<meta content="structured text editors, text search" name="DC.subject" />
-<meta content="structured text editors, text search" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt007" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Searching or finding text within a file</title>
-</head>
-<body id="tsrcedt007"><a name="tsrcedt007"><!-- --></a>
-
-
-<h1 class="topictitle1">Searching or finding text within a file</h1>
-
-
-<div>
-<div class="p"><div class="tip"><span class="tiptitle">Tip:</span> Before you do a Search operation in a structured
-text editor, save the file you are searching. The search function works from
-the most recently saved version of the file rather than from the contents
-that you see in the editor area. You do not need to save your file before
-you do a Find/Replace operation. </div>
-</div>
-
-<div class="section">Each structured text editor provides two ways to locate a text string
-in the file you are editing and optionally replace it with another string: <dl>
-
-<dt class="dlterm">Find/Replace</dt>
-
-<dd>Lets you locate text in the file currently being edited.</dd>
-
-
-<dt class="dlterm">Search</dt>
-
-<dd>Lets you locate text in files that have been saved to your workspace.</dd>
-
-</dl>
-<p>To locate and optionally replace text, select one of the
-following menu paths:</p>
-</div>
-
-
-<div class="p"><span><span class="menucascade"><span class="uicontrol">Edit</span> &gt; <span class="uicontrol">Find/Replace</span>
-</span> (or <span class="uicontrol">Ctrl+F</span>)</span> This option is
-self-explanatory.</div>
-
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.dita
deleted file mode 100644
index 4ac6d01..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt010" xml:lang="en-us">

-<title>Checking spelling</title>

-<shortdesc>This documentation describes how to check spelling in a structured

-text editor.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>spell check<indexterm>structured text editors</indexterm></indexterm><indexterm>structured text editors<indexterm>spell check</indexterm></indexterm>

-

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>The structured text editors for markup languages (accessed from

-the Project Explorer's pop-up menu or by clicking the Source tab in certain

-editors) provide a spell checking feature.</p><p>To check spelling in an HTML,

-XML, or other file that uses a structured markup language:</p> </context>

-<steps>

-<step><cmd>(Optional) To select the dictionary that will be used, click <menucascade>

-<uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol><uicontrol>Spell

-Check</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Open in a  structured text editor the file whose spelling you want

-to check.</cmd></step>

-<step><cmd>Start the spelling checker by clicking <menucascade><uicontrol>Edit</uicontrol>

-<uicontrol>Spell Check</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Type a new spelling into the <uicontrol>Change to</uicontrol> field,

-or select one of the available options. Click the <uicontrol>Change</uicontrol> button

-to change the current instance of the word in the current document. Click

-the <uicontrol>Change All</uicontrol> button to change all instances of the

-word in the current document. You can also click the <uicontrol>Add</uicontrol> button

-to add the currently selected spelling to your dictionary.</cmd></step>

-<step><cmd>Use the controls in the Spell Check dialog box to ignore, change,

-or add terms to the current dictionary. (To remove a word after it has been

-added to the dictionary, click the <uicontrol>Dictionary</uicontrol> push

-button.)</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
deleted file mode 100644
index adc62d3..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt010.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Checking spelling" />
-<meta name="abstract" content="This documentation describes how to check spelling in a structured text editor." />
-<meta name="description" content="This documentation describes how to check spelling in a structured text editor." />
-<meta content="spell check, structured text editors" name="DC.subject" />
-<meta content="spell check, structured text editors" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt010" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Checking spelling</title>
-</head>
-<body id="tsrcedt010"><a name="tsrcedt010"><!-- --></a>
-
-
-<h1 class="topictitle1">Checking spelling</h1>
-
-
-
-<div><p>This documentation describes how to check spelling in a structured
-text editor.</p>
-
-<div class="section"> <p>The structured text editors for markup languages (accessed from
-the Project Explorer's pop-up menu or by clicking the Source tab in certain
-editors) provide a spell checking feature.</p>
-<p>To check spelling in an HTML,
-XML, or other file that uses a structured markup language:</p>
- </div>
-
-<ol>
-<li><span>(Optional) To select the dictionary that will be used, click <span class="menucascade">
-<span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span> &gt; <span class="uicontrol">Spell
-Check</span></span>.</span></li>
-
-<li><span>Open in a  structured text editor the file whose spelling you want
-to check.</span></li>
-
-<li><span>Start the spelling checker by clicking <span class="menucascade"><span class="uicontrol">Edit</span>
- &gt; <span class="uicontrol">Spell Check</span></span>.</span></li>
-
-<li><span>Type a new spelling into the <span class="uicontrol">Change to</span> field,
-or select one of the available options. Click the <span class="uicontrol">Change</span> button
-to change the current instance of the word in the current document. Click
-the <span class="uicontrol">Change All</span> button to change all instances of the
-word in the current document. You can also click the <span class="uicontrol">Add</span> button
-to add the currently selected spelling to your dictionary.</span></li>
-
-<li><span>Use the controls in the Spell Check dialog box to ignore, change,
-or add terms to the current dictionary. (To remove a word after it has been
-added to the dictionary, click the <span class="uicontrol">Dictionary</span> push
-button.)</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita
deleted file mode 100644
index ce2bb1d..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.dita
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt014" xml:lang="en-us">

-<title>Adding snippets drawers</title>

-<shortdesc>This documentation explains how to customize the Snippets view

-by adding a new drawer.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>snippets<indexterm>drawer customization</indexterm></indexterm>

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To add a new drawer to the Snippets view:</context>

-<steps>

-<step><cmd>Right-click anywhere in the Snippets view and select <uicontrol>Customize</uicontrol> from

-the pop-up menu.</cmd></step>

-<step><cmd>Click <menucascade><uicontrol>New</uicontrol><uicontrol>Category</uicontrol>

-</menucascade> and type the name of the new drawer in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>Optionally, type a description in the <uicontrol>Description</uicontrol> field.</cmd>

-</step>

-<step><cmd>Select the drawer's behavior by checking check boxes as appropriate.

-The check boxes are as follows:</cmd>

-<choicetable>

-<chrow><choption>Hide</choption><chdesc>Do not display the drawer.</chdesc>

-</chrow>

-<chrow><choption>Open drawer at start-up</choption><chdesc>At start-up, display

-the drawer's items.</chdesc></chrow>

-<chrow><choption>Pin drawer open at start-up</choption><chdesc>Keep the drawer

-open.</chdesc></chrow>

-</choicetable>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol>. The new drawer will be added to

-the list of drawers in the Snippets view.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
deleted file mode 100644
index 45145e0..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt014.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding snippets drawers" />
-<meta name="abstract" content="This documentation explains how to customize the Snippets view by adding a new drawer." />
-<meta name="description" content="This documentation explains how to customize the Snippets view by adding a new drawer." />
-<meta content="snippets, drawer customization" name="DC.subject" />
-<meta content="snippets, drawer customization" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt014" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding snippets drawers</title>
-</head>
-<body id="tsrcedt014"><a name="tsrcedt014"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding snippets drawers</h1>
-
-
-
-<div><p>This documentation explains how to customize the Snippets view
-by adding a new drawer.</p>
-
-<div class="section">To add a new drawer to the Snippets view:</div>
-
-<ol>
-<li><span>Right-click anywhere in the Snippets view and select <span class="uicontrol">Customize</span> from
-the pop-up menu.</span></li>
-
-<li><span>Click <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Category</span>
-</span> and type the name of the new drawer in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li><span>Optionally, type a description in the <span class="uicontrol">Description</span> field.</span>
-</li>
-
-<li><span>Select the drawer's behavior by checking check boxes as appropriate.
-The check boxes are as follows:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N10090-option" align="left">Option</th>
-<th valign="bottom" id="N10090-desc" align="left">Description</th></tr></thead>
-<tbody>
-<tr><td valign="top" headers="N10090-option" id="N1009A"><strong>Hide</strong></td>
-<td valign="top" headers="N10090-desc N1009A">Do not display the drawer.</td>
-
-</tr>
-
-<tr><td valign="top" headers="N10090-option" id="N100AA"><strong>Open drawer at start-up</strong></td>
-<td valign="top" headers="N10090-desc N100AA">At start-up, display
-the drawer's items.</td>
-</tr>
-
-<tr><td valign="top" headers="N10090-option" id="N100B9"><strong>Pin drawer open at start-up</strong></td>
-<td valign="top" headers="N10090-desc N100B9">Keep the drawer
-open.</td>
-</tr>
-
-</tbody></table>
-
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>. The new drawer will be added to
-the list of drawers in the Snippets view.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
deleted file mode 100644
index 72bcceb..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.dita
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt015" xml:lang="en-us">

-<title>Adding items to snippets drawers</title>

-<prolog><metadata>

-<keywords><indexterm keyref="tsrcedt015|2|snippetitemsaddingtodrawers" status="changed">snippets<indexterm>drawers</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> To add new items to an existing snippets drawer:</context>

-<steps>

-<step><cmd>Do one of the following choices:</cmd><info><table colsep="0" frame="topbot">

-<tgroup cols="2"><colspec colname="col1" colwidth="72*"/><colspec colname="col2"

-colwidth="127*"/>

-<thead>

-<row>

-<entry colname="col1" valign="top">To start with this:</entry>

-<entry colname="col2" valign="top">Do this:</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="col1">An empty item that you can edit</entry>

-<entry colname="col2">Right-click anywhere in an existing drawer, select <uicontrol>Customize</uicontrol>,

-and click <menucascade><uicontrol>New</uicontrol><uicontrol>New Item</uicontrol>

-</menucascade>.</entry>

-</row>

-<row>

-<entry colname="col1">Existing text pasted into a new item in an existing

-drawer</entry>

-<entry colname="col2">Copy or cut text to the clipboard. In the Snippets view,

-right-click anywhere in an existing drawer and click <uicontrol>Paste</uicontrol>.</entry>

-</row>

-<row>

-<entry colname="col1">Existing text pasted into a new item in a new or existing

-drawer</entry>

-<entry colname="col2">Select the text, right-click, click <uicontrol>Add to

-Snippets</uicontrol>, specify the name of the drawer in the Snippets view

-to which you want to add the item, and click <uicontrol>OK</uicontrol>.</entry>

-</row>

-</tbody>

-</tgroup>

-</table></info><stepresult>A <wintitle>Customize Palette</wintitle> window

-appears.</stepresult></step>

-<step><cmd>Type a name for the new item, and, optionally, provide a description.</cmd>

-<stepresult>The value that you type in the <uicontrol>Name</uicontrol> field

-will appear next to the item's icon in the Snippets view.</stepresult></step>

-<step><cmd>To include in the <uicontrol>Template Pattern</uicontrol> field

-a variable that you have already defined, click <uicontrol>Insert Variable

-Placeholder</uicontrol>. </cmd><info>A variable placeholder is a marker that,

-when tagging is inserted into the active file, will be replaced by the value

-that is entered into the <uicontrol>Insert Template:</uicontrol><varname>Item_name</varname> dialog

-at insertion time. Clicking the <uicontrol>Insert Variable Placeholder</uicontrol> button

-or typing Ctrl+Space activates a pop-up in the text area that prompts you

-with the correct sequences to create a marker for the variable.</info><stepxmp>For

-example, if you create two variables named <varname>uri</varname> and <varname>prefix</varname>,

-and create variable placeholders for both, the template pattern might look

-like this:<codeblock>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %></codeblock></stepxmp>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<result>The new item will be added to the list of items in the appropriate

-drawer.</result>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
deleted file mode 100644
index db15ee8..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt015.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding items to snippets drawers" />
-<meta content="snippets, drawers" name="DC.subject" />
-<meta content="snippets, drawers" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt015" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding items to snippets drawers</title>
-</head>
-<body id="tsrcedt015"><a name="tsrcedt015"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding items to snippets drawers</h1>
-
-
-<div>
-<div class="section"> To add new items to an existing snippets drawer:</div>
-
-<ol>
-<li class="stepexpand"><span>Do one of the following choices:</span> 
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="hsides" border="1" rules="rows">
-<thead align="left">
-<tr>
-<th valign="top" width="36.18090452261307%" id="N10070">To start with this:</th>
-
-<th valign="top" width="63.81909547738693%" id="N10078">Do this:</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" width="36.18090452261307%" headers="N10070 ">An empty item that you can edit</td>
-
-<td valign="top" width="63.81909547738693%" headers="N10078 ">Right-click anywhere in an existing drawer, select <span class="uicontrol">Customize</span>,
-and click <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">New Item</span>
-</span>.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="36.18090452261307%" headers="N10070 ">Existing text pasted into a new item in an existing
-drawer</td>
-
-<td valign="top" width="63.81909547738693%" headers="N10078 ">Copy or cut text to the clipboard. In the Snippets view,
-right-click anywhere in an existing drawer and click <span class="uicontrol">Paste</span>.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="36.18090452261307%" headers="N10070 ">Existing text pasted into a new item in a new or existing
-drawer</td>
-
-<td valign="top" width="63.81909547738693%" headers="N10078 ">Select the text, right-click, click <span class="uicontrol">Add to
-Snippets</span>, specify the name of the drawer in the Snippets view
-to which you want to add the item, and click <span class="uicontrol">OK</span>.</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
- A <span class="wintitle">Customize Palette</span> window
-appears.</li>
-
-<li class="stepexpand"><span>Type a name for the new item, and, optionally, provide a description.</span>
- The value that you type in the <span class="uicontrol">Name</span> field
-will appear next to the item's icon in the Snippets view.</li>
-
-<li class="stepexpand"><span>To include in the <span class="uicontrol">Template Pattern</span> field
-a variable that you have already defined, click <span class="uicontrol">Insert Variable
-Placeholder</span>. </span> A variable placeholder is a marker that,
-when tagging is inserted into the active file, will be replaced by the value
-that is entered into the <span class="uicontrol">Insert Template:</span><var class="varname">Item_name</var> dialog
-at insertion time. Clicking the <span class="uicontrol">Insert Variable Placeholder</span> button
-or typing Ctrl+Space activates a pop-up in the text area that prompts you
-with the correct sequences to create a marker for the variable. For
-example, if you create two variables named <var class="varname">uri</var> and <var class="varname">prefix</var>,
-and create variable placeholders for both, the template pattern might look
-like this:<pre>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %&gt;</pre>
-
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">The new item will be added to the list of items in the appropriate
-drawer.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita
deleted file mode 100644
index fd624af..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt016" xml:lang="en-us">

-<title>Deleting or hiding snippet items or drawers</title>

-<titlealts>

-<navtitle>Deleting and hiding drawers and items</navtitle>

-</titlealts>

-<shortdesc>This documentation describes how to delete or hide drawers and

-items in the Snippets view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>drawers<indexterm>snippets view</indexterm></indexterm>

-<indexterm>snippets<indexterm>modifying drawers</indexterm></indexterm>

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>You can hide any drawer or item that shows up in the Snippets view.

-If the drawer or item is user-defined, you can delete it permanently. To delete

-or hide a drawer or item, complete the following steps:</context>

-<steps>

-<step><cmd>Select the item or drawer that you want to remove.</cmd></step>

-<step><cmd>Right-click and select <uicontrol>Customize</uicontrol> from the

-pop-up menu.</cmd></step>

-<step><cmd>Select the item or drawer and click <uicontrol>Delete</uicontrol> or <uicontrol>Hide</uicontrol>.</cmd>

-</step>

-<step><cmd>Click <uicontrol>OK</uicontrol>. The item or drawer will be deleted

-or hidden from the Snippets view.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
deleted file mode 100644
index f10d376..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt016.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Deleting or hiding snippet items or drawers" />
-<meta name="abstract" content="This documentation describes how to delete or hide drawers and items in the Snippets view." />
-<meta name="description" content="This documentation describes how to delete or hide drawers and items in the Snippets view." />
-<meta content="drawers, snippets view, snippets, modifying drawers" name="DC.subject" />
-<meta content="drawers, snippets view, snippets, modifying drawers" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt016" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Deleting or hiding snippet items or drawers</title>
-</head>
-<body id="tsrcedt016"><a name="tsrcedt016"><!-- --></a>
-
-
-<h1 class="topictitle1">Deleting or hiding snippet items or drawers</h1>
-
-
-
-
-<div><p>This documentation describes how to delete or hide drawers and
-items in the Snippets view.</p>
-
-<div class="section">You can hide any drawer or item that shows up in the Snippets view.
-If the drawer or item is user-defined, you can delete it permanently. To delete
-or hide a drawer or item, complete the following steps:</div>
-
-<ol>
-<li><span>Select the item or drawer that you want to remove.</span></li>
-
-<li><span>Right-click and select <span class="uicontrol">Customize</span> from the
-pop-up menu.</span></li>
-
-<li><span>Select the item or drawer and click <span class="uicontrol">Delete</span> or <span class="uicontrol">Hide</span>.</span>
-</li>
-
-<li><span>Click <span class="uicontrol">OK</span>. The item or drawer will be deleted
-or hidden from the Snippets view.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.dita
deleted file mode 100644
index 63b31bf..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt022" xml:lang="en-us">

-<title>Editing snippet items</title>

-<prolog><metadata>

-<keywords><indexterm>snippets<indexterm>editing items</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> To modify an existing item in a Snippets drawer, complete the steps

-listed below. If you have just completed the task <xref href="tsrcedt015.dita"

-type="task">Adding an item to a snippets drawer</xref> and the <wintitle>Customize

-Palette</wintitle> window is still open, you can skip steps 1 and 2.</context>

-<steps>

-<step><cmd>In the Snippets view, right-click the name of the item that you

-want to modify, and select <uicontrol>Customize</uicontrol>.</cmd></step>

-<step><cmd>Optionally, type a new name and a new description for the item.</cmd>

-</step>

-<step><cmd>To declare a variable, click <uicontrol>New</uicontrol> and type

-the variable's name, description, and default value.</cmd></step>

-<step><cmd>To edit an existing variable, type over the existing values.</cmd>

-</step>

-<step><cmd>To edit the <uicontrol>Template Pattern</uicontrol> field, type

-into the field, cut and paste into the field, or, if you have defined one

-or more variables, click the <uicontrol>Insert Variable Placeholder</uicontrol> button,

-and double-click the name of the variable that you want to insert.</cmd><stepxmp>For

-example, if you have declare variables named <varname>uri</varname> and <varname>prefix</varname>,

-clicking the button brings up a menu that contains those names. Double-clicking <varname>uri</varname> inserts <codeph>${uri}</codeph>,

-as in the following example:<codeblock>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %></codeblock></stepxmp>

-<stepresult>Later, when you insert the snippet into a file, <codeph>${uri}</codeph> and <codeph>${prefix}</codeph> are

-each converted to the default value declared in the Variables table. Users

-can replace the default values in the <uicontrol>Insert Template:</uicontrol><varname>Item_name</varname> dialog

-at insertion time.</stepresult></step>

-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<result>The modified item will be added to the list of items in the appropriate

-drawer.</result>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt026.dita"><linktext>Editing with snippets - overview</linktext>

-</link>

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
deleted file mode 100644
index bd58a0e..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt022.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing snippet items" />
-<meta content="snippets, editing items" name="DC.subject" />
-<meta content="snippets, editing items" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt026.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt022" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing snippet items</title>
-</head>
-<body id="tsrcedt022"><a name="tsrcedt022"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing snippet items</h1>
-
-
-<div>
-<div class="section"> To modify an existing item in a Snippets drawer, complete the steps
-listed below. If you have just completed the task <a href="tsrcedt015.html">Adding an item to a snippets drawer</a> and the <span class="wintitle">Customize
-Palette</span> window is still open, you can skip steps 1 and 2.</div>
-
-<ol>
-<li class="stepexpand"><span>In the Snippets view, right-click the name of the item that you
-want to modify, and select <span class="uicontrol">Customize</span>.</span></li>
-
-<li class="stepexpand"><span>Optionally, type a new name and a new description for the item.</span>
-</li>
-
-<li class="stepexpand"><span>To declare a variable, click <span class="uicontrol">New</span> and type
-the variable's name, description, and default value.</span></li>
-
-<li class="stepexpand"><span>To edit an existing variable, type over the existing values.</span>
-</li>
-
-<li class="stepexpand"><span>To edit the <span class="uicontrol">Template Pattern</span> field, type
-into the field, cut and paste into the field, or, if you have defined one
-or more variables, click the <span class="uicontrol">Insert Variable Placeholder</span> button,
-and double-click the name of the variable that you want to insert.</span> For
-example, if you have declare variables named <var class="varname">uri</var> and <var class="varname">prefix</var>,
-clicking the button brings up a menu that contains those names. Double-clicking <var class="varname">uri</var> inserts <samp class="codeph">${uri}</samp>,
-as in the following example:<pre>&lt;%@ taglib uri="${uri}" prefix="${prefix}" %&gt;</pre>
-
- Later, when you insert the snippet into a file, <samp class="codeph">${uri}</samp> and <samp class="codeph">${prefix}</samp> are
-each converted to the default value declared in the Variables table. Users
-can replace the default values in the <span class="uicontrol">Insert Template:</span><var class="varname">Item_name</var> dialog
-at insertion time.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">The modified item will be added to the list of items in the appropriate
-drawer.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt026.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include.">Editing with snippets - overview</a></div>
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita
deleted file mode 100644
index 0bd8065..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.dita
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt023" xml:lang="en-us">

-<title>Enabling content assist for JSP files</title>

-<shortdesc>Having the proper files defined in the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build class path is essential for content

-assist to work properly in JSP files. It is also essential for the links builder

-to be able to correctly resolve links to servlets or <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans

-in JSP and HTML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>content assistance<indexterm>enabling for JSP files</indexterm></indexterm>

-<indexterm>JSP files<indexterm>enabling content assistance</indexterm></indexterm>

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To enable content assist for JSP files:</context>

-<steps>

-<step><cmd>To determine whether the build path is correct, select <uicontrol>Properties</uicontrol> from

-the project's pop-up menu. </cmd></step>

-<step><cmd>Select <uicontrol>Java Build Path</uicontrol>, and then the <uicontrol>Libraries</uicontrol> page. </cmd>

-<info>You should see the following files:<ul>

-<li>j2ee.jar</li>

-<li>rt.jar </li>

-<li>servlet.jar</li>

-<li>webcontainer.jar</li>

-</ul></info></step>

-<step><cmd>If they are not present, add them as External JAR files. You may

-have your own versions of these files, depending on the level of JDK or Servlet

-API for which you are developing.</cmd></step>

-<step><cmd>If your Web applications reference other JARs, you can place them

-in the build path as follows:</cmd>

-<substeps>

-<substep><cmd>Use the <uicontrol>Add JARs</uicontrol> button on the Library

-page. You must ensure that the JAR file is available to the server by properly

-configuring the server.</cmd></substep>

-<substep><cmd>Add the JARs to the <filepath>WEB-INF/lib</filepath> directory.

-They will be automatically added to the build path and deployed to the server

-in as part of the project WAR.</cmd></substep>

-</substeps>

-</step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt006.dita"><linktext>Content assist</linktext></link>

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt005.dita"><linktext>Getting content assistance in structured

-text editors</linktext></link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
deleted file mode 100644
index 7d0a869..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt023.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Enabling content assist for JSP files" />
-<meta name="abstract" content="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files." />
-<meta name="description" content="Having the proper files defined in the Java build class path is essential for content assist to work properly in JSP files. It is also essential for the links builder to be able to correctly resolve links to servlets or Java beans in JSP and HTML files." />
-<meta content="content assistance, enabling for JSP files, JSP files, enabling content assistance" name="DC.subject" />
-<meta content="content assistance, enabling for JSP files, JSP files, enabling content assistance" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt006.html" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt005.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt023" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Enabling content assist for JSP files</title>
-</head>
-<body id="tsrcedt023"><a name="tsrcedt023"><!-- --></a>
-
-
-<h1 class="topictitle1">Enabling content assist for JSP files</h1>
-
-
-
-<div><p>Having the proper files defined in the Java™ build class path is essential for content
-assist to work properly in JSP files. It is also essential for the links builder
-to be able to correctly resolve links to servlets or Java beans
-in JSP and HTML files.</p>
-
-<div class="section">To enable content assist for JSP files:</div>
-
-<ol>
-<li class="stepexpand"><span>To determine whether the build path is correct, select <span class="uicontrol">Properties</span> from
-the project's pop-up menu. </span></li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Java Build Path</span>, and then the <span class="uicontrol">Libraries</span> page. </span>
- You should see the following files:<ul>
-<li>j2ee.jar</li>
-
-<li>rt.jar </li>
-
-<li>servlet.jar</li>
-
-<li>webcontainer.jar</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>If they are not present, add them as External JAR files. You may
-have your own versions of these files, depending on the level of JDK or Servlet
-API for which you are developing.</span></li>
-
-<li class="stepexpand"><span>If your Web applications reference other JARs, you can place them
-in the build path as follows:</span>
-<ol type="a">
-<li><span>Use the <span class="uicontrol">Add JARs</span> button on the Library
-page. You must ensure that the JAR file is available to the server by properly
-configuring the server.</span></li>
-
-<li><span>Add the JARs to the <span class="filepath">WEB-INF/lib</span> directory.
-They will be automatically added to the build path and deployed to the server
-in as part of the project WAR.</span></li>
-
-</ol>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt006.html" title="Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor. The placement of the cursor in the source file provides the context for the content assist to offer suggestions for completion.">Content assist</a></div>
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt005.html" title="To get help in adding markup to a file, you can use content assist in a structured text editor. Content assist helps you insert or finish a tag or function or finish a line of code in a structured text editor.">Getting content assistance in structured
-text editors</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.dita
deleted file mode 100644
index c475e98..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.dita
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt024" xml:lang="en-us">

-<title>Adding and removing HTML templates</title>

-<shortdesc>HTML content assist provides several templates, or chunks of predefined

-code, that you can insert into a file. You can use the default templates as

-provided, customize the default templates, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>HTML<indexterm>templates<indexterm>removing</indexterm></indexterm></indexterm><indexterm>templates<indexterm>HTML</indexterm></indexterm><indexterm>HTML<indexterm>templates<indexterm>adding</indexterm></indexterm></indexterm>

-

-

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>For example, you may work on a group of HTML pages that should

-all contain a table with a specific appearance. Create a template that contains

-the tags for that table, including the appropriate attributes and attribute

-values for each tag. (You can copy and paste the tags from a structured text

-editor into the template's <uicontrol>Pattern</uicontrol> field.) Then select

-the name of the template from a content assist proposal list whenever you

-want to insert your custom table into an HTML or XHTML file.</p><p>To add

-a new HTML template, complete the following steps:</p> </context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences page, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>HTML Files</uicontrol><uicontrol>HTML Templates</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol>. </cmd></step>

-<step><cmd>Enter the new template name (a text string) and a brief description

-of the template.</cmd></step>

-<step><cmd>Using the <uicontrol>Context</uicontrol> drop-down list, specify

-the context in which the template is available in the proposal list when content

-assist is requested.</cmd></step>

-<step><cmd>In the <uicontrol>Pattern</uicontrol> field, enter the appropriate

-tags, attributes, or attribute values (the content of the template) to be

-inserted by content assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Variable</uicontrol> button

-and select the variable to be inserted.</cmd><stepxmp>For example, the <varname>word_selection</varname> variable

-indicates the word that is selected at the beginning of template insertion,

-and the <varname>cursor</varname> variable determines where the cursor will

-be after the template is inserted in the HTML document.</stepxmp></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save the new template.</cmd>

-</step>

-</steps>

-<postreq><p>You can edit, remove, import, or export a template by using the

-same Preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed.</p><p>If you have a template

-that you do not want to remove but you no longer want the template to appear

-in the content assist list, go to the Templates preferences page and uncheck

-its check box.</p></postreq>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt029.dita"><linktext>Adding and removing XML templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
deleted file mode 100644
index a16a406..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt024.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing HTML templates" />
-<meta name="abstract" content="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta name="description" content="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta content="HTML, templates, removing, adding" name="DC.subject" />
-<meta content="HTML, templates, removing, adding" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt029.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt024" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing HTML templates</title>
-</head>
-<body id="tsrcedt024"><a name="tsrcedt024"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing HTML templates</h1>
-
-
-
-<div><p>HTML content assist provides several templates, or chunks of predefined
-code, that you can insert into a file. You can use the default templates as
-provided, customize the default templates, or create your own templates.</p>
-
-<div class="section"> <p>For example, you may work on a group of HTML pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into an HTML or XHTML file.</p>
-<p>To add
-a new HTML template, complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Templates</span>
-</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span>. </span></li>
-
-<li class="stepexpand"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-
-<li class="stepexpand"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the HTML document.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save the new template.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita
deleted file mode 100644
index e634015..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.dita
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt025" xml:lang="en-us">

-<title>Setting preferences for structured text editors</title>

-<titlealts>

-<navtitle>Setting structured text editor preferences</navtitle>

-</titlealts>

-<prolog><metadata>

-<keywords><indexterm keyref="tsrcedt025|1|structuredtexteditorspreferencesetting"

-status="changed">structured text editors<indexterm>preferences</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>You can customize your working environment by specifying preferences

-for the structured text editor.</context>

-<steps>

-<step><cmd>In the main menu, click <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select one of the choices that are shown in the following table:</cmd>

-<choicetable relcolwidth="10* 30*">

-<chhead><choptionhd>Item</choptionhd><chdeschd>Menu path</chdeschd></chhead>

-<chrow><choption>Annotation settings</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Annotations</uicontrol></menucascade></chdesc>

-</chrow>

-<chrow><choption>Character encoding</choption><chdesc><uicontrol>Web and XML</uicontrol>,

-then one of the following choices: <uicontrol>CSS Files</uicontrol>, <uicontrol>HTML

-Files</uicontrol>, <uicontrol>JSP Files</uicontrol>, <uicontrol>*XML Files

-( *not implemented in WTP)</uicontrol></chdesc></chrow>

-<chrow><choption>Content assist: HTML</choption><chdesc><menucascade><uicontrol>Web

-and XML</uicontrol><uicontrol>HTML Files</uicontrol><uicontrol>HTML Source</uicontrol>

-</menucascade></chdesc></chrow>

-<chrow><choption>Content assist: JavaScript</choption><chdesc><menucascade>

-<uicontrol>Web and XML</uicontrol><uicontrol>JavaScript Files</uicontrol>

-<uicontrol>JavaScript Source</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Content assist: XML</choption><chdesc><menucascade><uicontrol>Web

-and XML</uicontrol><uicontrol>*XML Files (*not implemented in WTP)</uicontrol>

-<uicontrol>XML Source</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Editor appearance</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Appearance</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Editor font</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Colors and Fonts</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-</menucascade></chdesc></chrow>

-<chrow><choption>Editor navigation</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Navigation</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>File-type-specific settings</choption><chdesc><uicontrol>Web

-and XML</uicontrol>, then navigate to the file type and particular setting</chdesc>

-</chrow>

-<chrow><choption>Hover help</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Hovers</uicontrol></menucascade></chdesc></chrow>

-<chrow><choption>Key bindings</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Keys</uicontrol><uicontrol>Keyboard Shortcuts</uicontrol></menucascade> then

-in the <uicontrol>Category</uicontrol> field specify <uicontrol>Source</uicontrol></chdesc>

-</chrow>

-<chrow><choption>Spell checking</choption><chdesc><uicontrol>Spell Check</uicontrol></chdesc>

-</chrow>

-<chrow><choption>Syntax checking</choption><chdesc><menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Editors</uicontrol><uicontrol>Structured Text Editor</uicontrol>

-<uicontrol>Appearance</uicontrol></menucascade> then check or uncheck the <uicontrol>Analyze

-annotations while typing</uicontrol> box.</chdesc></chrow>

-</choicetable>

-<info><note>You cannot set <uicontrol>Web and XML</uicontrol> preferences

-unless the Core XML Support capability (<menucascade><uicontrol>Workbench</uicontrol>

-<uicontrol>Capabilities</uicontrol></menucascade>) is enabled, and you cannot

-set preferences for DTD files unless the XML Development capability is enabled.</note></info>

-</step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt001.dita"><linktext>Setting annotation preferences for

-markup languages</linktext></link>

-<link href="tsrcedt010.dita"><linktext>Checking spelling</linktext></link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
deleted file mode 100644
index 6763db3..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting preferences for structured text editors" />
-<meta content="structured text editors, preferences" name="DC.subject" />
-<meta content="structured text editors, preferences" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt010.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt025" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting preferences for structured text editors</title>
-</head>
-<body id="tsrcedt025"><a name="tsrcedt025"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting preferences for structured text editors</h1>
-
-
-
-<div>
-<div class="section">You can customize your working environment by specifying preferences
-for the structured text editor.</div>
-
-<ol>
-<li class="stepexpand"><span>In the main menu, click <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select one of the choices that are shown in the following table:</span>
-
-<table class="choicetableborder" summary="" cellspacing="0" cellpadding="4" rules="rows" frame="hsides" border="1">
-<thead><tr><th valign="bottom" id="N10070-option">Item</th>
-<th valign="bottom" id="N10070-desc">Menu path</th></tr></thead>
-<tbody>
-
-<tr><td valign="top" headers="N10070-option" id="N1008A"><strong>Annotation settings</strong></td>
-<td valign="top" headers="N10070-desc N1008A"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Annotations</span></span></td>
-
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N100AD"><strong>Character encoding</strong></td>
-<td valign="top" headers="N10070-desc N100AD"><span class="uicontrol">Web and XML</span>,
-then one of the following choices: <span class="uicontrol">CSS Files</span>, <span class="uicontrol">HTML
-Files</span>, <span class="uicontrol">JSP Files</span>, <span class="uicontrol">*XML Files
-( *not implemented in WTP)</span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N100D8"><strong>Content assist: HTML</strong></td>
-<td valign="top" headers="N10070-desc N100D8"><span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">HTML Files</span> &gt; <span class="uicontrol">HTML Source</span>
-</span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N100FA"><strong>Content assist: JavaScript</strong></td>
-<td valign="top" headers="N10070-desc N100FA"><span class="menucascade">
-<span class="uicontrol">Web and XML</span> &gt; <span class="uicontrol">JavaScript Files</span>
- &gt; <span class="uicontrol">JavaScript Source</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N1011D"><strong>Content assist: XML</strong></td>
-<td valign="top" headers="N10070-desc N1011D"><span class="menucascade"><span class="uicontrol">Web
-and XML</span> &gt; <span class="uicontrol">*XML Files (*not implemented in WTP)</span>
- &gt; <span class="uicontrol">XML Source</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N1013F"><strong>Editor appearance</strong></td>
-<td valign="top" headers="N10070-desc N1013F"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Appearance</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N10167"><strong>Editor font</strong></td>
-<td valign="top" headers="N10070-desc N10167"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Colors and Fonts</span> &gt; <span class="uicontrol">Structured Text Editor</span>
-</span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N1018A"><strong>Editor navigation</strong></td>
-<td valign="top" headers="N10070-desc N1018A"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Navigation</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N101B2"><strong>File-type-specific settings</strong></td>
-<td valign="top" headers="N10070-desc N101B2"><span class="uicontrol">Web
-and XML</span>, then navigate to the file type and particular setting</td>
-
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N101C7"><strong>Hover help</strong></td>
-<td valign="top" headers="N10070-desc N101C7"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Hovers</span></span></td>
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N101EF"><strong>Key bindings</strong></td>
-<td valign="top" headers="N10070-desc N101EF"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Keys</span> &gt; <span class="uicontrol">Keyboard Shortcuts</span></span> then
-in the <span class="uicontrol">Category</span> field specify <span class="uicontrol">Source</span></td>
-
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N1021E"><strong>Spell checking</strong></td>
-<td valign="top" headers="N10070-desc N1021E"><span class="uicontrol">Spell Check</span></td>
-
-</tr>
-
-<tr><td valign="top" headers="N10070-option" id="N10232"><strong>Syntax checking</strong></td>
-<td valign="top" headers="N10070-desc N10232"><span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Editors</span> &gt; <span class="uicontrol">Structured Text Editor</span>
- &gt; <span class="uicontrol">Appearance</span></span> then check or uncheck the <span class="uicontrol">Analyze
-annotations while typing</span> box.</td>
-</tr>
-
-</tbody></table>
-
- <div class="note"><span class="notetitle">Note:</span> You cannot set <span class="uicontrol">Web and XML</span> preferences
-unless the Core XML Support capability (<span class="menucascade"><span class="uicontrol">Workbench</span>
- &gt; <span class="uicontrol">Capabilities</span></span>) is enabled, and you cannot
-set preferences for DTD files unless the XML Development capability is enabled.</div>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt001.html" title="This documentation describes how to set annotation preferences for Web and XML files. The annotation preferences include whether to analyze the syntactic validity of your file while you are typing and what colors to use to highlight errors, warnings, tasks, search results, bookmarks, and other text.">Setting annotation preferences for
-markup languages</a></div>
-<div><a href="tsrcedt010.html" title="This documentation describes how to check spelling in a structured text editor.">Checking spelling</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita
deleted file mode 100644
index d7cf927..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.dita
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt026" xml:lang="en-us">

-<title>Editing with snippets - overview</title>

-<shortdesc>The Snippets view lets you catalog and organize reusable programming

-objects, such as HTML tagging, <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, and JSP code, along with

-files and custom JSP tags. The view can be extended based on additional objects

-that you define and include.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>snippets<indexterm>overview</indexterm></indexterm>

-

-

-

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>In the Snippets view you can perform the following tasks:</context>

-<steps-unordered>

-<step><cmd>Add snippets drawers</cmd></step>

-<step><cmd>Add items to snippets drawers</cmd></step>

-<step><cmd>Edit snippet items</cmd></step>

-<step><cmd>Delete or hide snippet items or drawers</cmd></step>

-</steps-unordered>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt001.dita"><linktext>Snippets view</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt014.dita"><linktext>Adding snippets drawers</linktext>

-</link>

-<link href="tsrcedt015.dita"><linktext>Adding items to snippets drawers</linktext>

-</link>

-<link href="tsrcedt022.dita"><linktext>Editing snippet items</linktext></link>

-<link href="tsrcedt016.dita"><linktext>Deleting or hiding snippet items or

-drawers</linktext></link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
deleted file mode 100644
index 2181e1a..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt026.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing with snippets - overview" />
-<meta name="abstract" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include." />
-<meta name="description" content="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags. The view can be extended based on additional objects that you define and include." />
-<meta content="snippets, overview" name="DC.subject" />
-<meta content="snippets, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt001.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt014.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt015.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt022.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt016.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt026" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing with snippets - overview</title>
-</head>
-<body id="tsrcedt026"><a name="tsrcedt026"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing with snippets - overview</h1>
-
-
-
-<div><p>The Snippets view lets you catalog and organize reusable programming
-objects, such as HTML tagging, JavaScript™, and JSP code, along with
-files and custom JSP tags. The view can be extended based on additional objects
-that you define and include.</p>
-
-<div class="section">In the Snippets view you can perform the following tasks:</div>
-
-<ul>
-<li><span>Add snippets drawers</span></li>
-
-<li><span>Add items to snippets drawers</span></li>
-
-<li><span>Edit snippet items</span></li>
-
-<li><span>Delete or hide snippet items or drawers</span></li>
-
-</ul>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt001.html" title="The Snippets view lets you catalog and organize reusable programming objects, such as HTML tagging, JavaScript, and JSP code, along with files and custom JSP tags.">Snippets view</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt014.html" title="This documentation explains how to customize the Snippets view by adding a new drawer.">Adding snippets drawers</a></div>
-<div><a href="tsrcedt015.html" title="">Adding items to snippets drawers</a></div>
-<div><a href="tsrcedt022.html" title="">Editing snippet items</a></div>
-<div><a href="tsrcedt016.html" title="This documentation describes how to delete or hide drawers and items in the Snippets view.">Deleting or hiding snippet items or
-drawers</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita
deleted file mode 100644
index 7d324eb..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt027" xml:lang="en-us">

-<title>Adding and removing markup language templates - overview</title>

-<titlealts>

-<navtitle>Adding markup language templates</navtitle>

-</titlealts>

-<shortdesc>Content assist provides templates, or chunks of predefined code,

-that you can insert into a file. You can use the default templates as provided,

-customize the default templates, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>markup languages<indexterm>templates</indexterm></indexterm>

-<indexterm>templates<indexterm>markup languages</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>Templates are available for the following markup languages:<ul>

-<li>HTML or XHTML</li>

-<li>JSP</li>

-</ul></context>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt029.dita"><linktext>Adding and removing XML templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
deleted file mode 100644
index 801e45f..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt027.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing markup language templates - overview" />
-<meta name="abstract" content="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta name="description" content="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta content="markup languages, templates" name="DC.subject" />
-<meta content="markup languages, templates" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt029.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt027" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing markup language templates - overview</title>
-</head>
-<body id="tsrcedt027"><a name="tsrcedt027"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing markup language templates - overview</h1>
-
-
-
-
-<div><p>Content assist provides templates, or chunks of predefined code,
-that you can insert into a file. You can use the default templates as provided,
-customize the default templates, or create your own templates.</p>
-
-<div class="section">Templates are available for the following markup languages:<ul>
-<li>HTML or XHTML</li>
-
-<li>JSP</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
deleted file mode 100644
index bcf81da..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt028" xml:lang="en-us">

-<title>Adding and removing JSP templates</title>

-<shortdesc>JSP content assist provides several templates, or chunks of predefined

-code, that you can insert into a file. You can use the default templates as

-provided, customize the default templates, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="tsrcedt028|1|JSPpagestemplates" status="changed">JSP

-files<indexterm>templates</indexterm></indexterm><indexterm keyref="tsrcedt028|2|templatesJSPpages"

-status="new">templates<indexterm>JSP pages</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>For example, you may work on a group of JSP pages that should

-all contain a table with a specific appearance. Create a template that contains

-the tags for that table, including the appropriate attributes and attribute

-values for each tag. (You can copy and paste the tags from a structured text

-editor into the template's <uicontrol>Pattern</uicontrol> field.) Then select

-the name of the template from a content assist proposal list whenever you

-want to insert your custom table into a JSP file.</p><p>To add a new JSP template,

-complete the following steps:</p> </context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences page, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>JSP Files</uicontrol><uicontrol>JSP Templates</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol>. </cmd></step>

-<step><cmd>Enter the new template name (a text string) and a brief description

-of the template.</cmd></step>

-<step><cmd>Using the <uicontrol>Context</uicontrol> drop-down list, specify

-the context in which the template is available in the proposal list when content

-assist is requested.</cmd></step>

-<step><cmd>In the <uicontrol>Pattern</uicontrol> field, enter the appropriate

-tags, attributes, or attribute values (the content of the template) to be

-inserted by content assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Variable</uicontrol> button

-and select the variable to be inserted.</cmd><stepxmp>For example, the <varname>word_selection</varname> variable

-indicates the word that is selected at the beginning of template insertion,

-and the <varname>cursor</varname> variable determines where the cursor will

-be after the template is inserted in the HTML document.</stepxmp></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save the new template.</cmd>

-</step>

-</steps>

-<postreq><p>You can edit, remove, import, or export a template by using the

-same Preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed.</p><p>If you have a template

-that you do not want to remove but you no longer want the template to appear

-in the content assist list, go to the Templates preferences page and uncheck

-its check box.</p></postreq>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-<link href="tsrcedt029.dita"><linktext>Adding and removing XML templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
deleted file mode 100644
index 09647fb..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt028.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing JSP templates" />
-<meta name="abstract" content="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta name="description" content="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates." />
-<meta content="JSP files, templates, JSP pages" name="DC.subject" />
-<meta content="JSP files, templates, JSP pages" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt029.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt028" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing JSP templates</title>
-</head>
-<body id="tsrcedt028"><a name="tsrcedt028"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing JSP templates</h1>
-
-
-
-<div><p>JSP content assist provides several templates, or chunks of predefined
-code, that you can insert into a file. You can use the default templates as
-provided, customize the default templates, or create your own templates.</p>
-
-<div class="section"> <p>For example, you may work on a group of JSP pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into a JSP file.</p>
-<p>To add a new JSP template,
-complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">JSP Files</span> &gt; <span class="uicontrol">JSP Templates</span>
-</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span>. </span></li>
-
-<li class="stepexpand"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-
-<li class="stepexpand"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the HTML document.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save the new template.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-<div><a href="tsrcedt029.html" title="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates.">Adding and removing XML templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
deleted file mode 100644
index 30ebb08..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.dita
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "..\dtd\task.dtd">

-<task id="tsrcedt027" xml:lang="en-us">

-<title>Adding and removing XML templates</title>

-<shortdesc>XML content assist provides a comment template, a chunk of predefined

-code that you can insert into a file. You can use the default template as

-provided, customize that template, or create your own templates.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="tsrcedt029|1|templatesXML" status="new">templates<indexterm>XML</indexterm></indexterm>

-<indexterm keyref="tsrcedt029|2|xmltemplatesadding" status="changed">XML<indexterm>adding

-templates</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>For example, you may work on a group of XML pages that should

-all contain a table with a specific appearance. Create a template that contains

-the tags for that table, including the appropriate attributes and attribute

-values for each tag. (You can copy and paste the tags from a structured text

-editor into the template's <uicontrol>Pattern</uicontrol> field.) Then select

-the name of the template from a content assist proposal list whenever you

-want to insert your custom table into an XML file.</p><p>To add a new XML

-template, complete the following steps: </p> </context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences page, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>XML Files</uicontrol><uicontrol>XML Templates</uicontrol>

-</menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol>. </cmd></step>

-<step><cmd>Enter the new template name (a text string) and a brief description

-of the template.</cmd></step>

-<step><cmd>Using the <uicontrol>Context</uicontrol> drop-down list, specify

-the context in which the template is available in the proposal list when content

-assist is requested.</cmd></step>

-<step><cmd>In the <uicontrol>Pattern</uicontrol> field, enter the appropriate

-tags, attributes, or attribute values (the content of the template) to be

-inserted by content assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Variable</uicontrol> button

-and select the variable to be inserted.</cmd><stepxmp>For example, the <varname>word_selection</varname> variable

-indicates the word that is selected at the beginning of template insertion,

-and the <varname>cursor</varname> variable determines where the cursor will

-be after the template is inserted in the XML document.</stepxmp></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save the new template.</cmd>

-</step>

-</steps>

-<postreq><p>You can edit, remove, import, or export a template by using the

-same Preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed.</p><p>If you have a template

-that you do not want to remove but you no longer want the template to appear

-in the content assist list, go to the Templates preferences page and uncheck

-its check box.</p></postreq>

-</taskbody>

-<related-links>

-<linkpool type="concept">

-<link href="csrcedt004.dita"><linktext>Structured text editors for markup

-languages</linktext></link>

-</linkpool>

-<linkpool type="task">

-<link href="tsrcedt027.dita"><linktext>Adding and removing markup language

-templates - overview</linktext></link>

-<link href="tsrcedt024.dita"><linktext>Adding and removing HTML templates</linktext>

-</link>

-<link href="tsrcedt028.dita"><linktext>Adding and removing JSP templates</linktext>

-</link>

-<link href="tsrcedt000.dita"><linktext>Editing text coded in markup languages

-- overview</linktext></link>

-</linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html b/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
deleted file mode 100644
index f674243..0000000
--- a/docs/org.eclipse.wst.sse.doc.user/topics/tsrcedt029.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding and removing XML templates" />
-<meta name="abstract" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates." />
-<meta name="description" content="XML content assist provides a comment template, a chunk of predefined code that you can insert into a file. You can use the default template as provided, customize that template, or create your own templates." />
-<meta content="templates, XML, adding templates" name="DC.subject" />
-<meta content="templates, XML, adding templates" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="csrcedt004.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt027.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt024.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt028.html" />
-<meta scheme="URI" name="DC.Relation" content="tsrcedt000.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tsrcedt027" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding and removing XML templates</title>
-</head>
-<body id="tsrcedt027"><a name="tsrcedt027"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding and removing XML templates</h1>
-
-
-
-<div><p>XML content assist provides a comment template, a chunk of predefined
-code that you can insert into a file. You can use the default template as
-provided, customize that template, or create your own templates.</p>
-
-<div class="section"> <p>For example, you may work on a group of XML pages that should
-all contain a table with a specific appearance. Create a template that contains
-the tags for that table, including the appropriate attributes and attribute
-values for each tag. (You can copy and paste the tags from a structured text
-editor into the template's <span class="uicontrol">Pattern</span> field.) Then select
-the name of the template from a content assist proposal list whenever you
-want to insert your custom table into an XML file.</p>
-<p>To add a new XML
-template, complete the following steps: </p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences page, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">XML Files</span> &gt; <span class="uicontrol">XML Templates</span>
-</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span>. </span></li>
-
-<li class="stepexpand"><span>Enter the new template name (a text string) and a brief description
-of the template.</span></li>
-
-<li class="stepexpand"><span>Using the <span class="uicontrol">Context</span> drop-down list, specify
-the context in which the template is available in the proposal list when content
-assist is requested.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Pattern</span> field, enter the appropriate
-tags, attributes, or attribute values (the content of the template) to be
-inserted by content assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Variable</span> button
-and select the variable to be inserted.</span> For example, the <var class="varname">word_selection</var> variable
-indicates the word that is selected at the beginning of template insertion,
-and the <var class="varname">cursor</var> variable determines where the cursor will
-be after the template is inserted in the XML document.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> to save the new template.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>You can edit, remove, import, or export a template by using the
-same Preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed.</p>
-<p>If you have a template
-that you do not want to remove but you no longer want the template to appear
-in the content assist list, go to the Templates preferences page and uncheck
-its check box.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="csrcedt004.html" title="Structured text editor is any of several text editors that you can use to edit various markup languages such as HTML, JavaScript, or XML.">Structured text editors for markup
-languages</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tsrcedt027.html" title="Content assist provides templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing markup language
-templates - overview</a></div>
-<div><a href="tsrcedt024.html" title="HTML content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing HTML templates</a></div>
-<div><a href="tsrcedt028.html" title="JSP content assist provides several templates, or chunks of predefined code, that you can insert into a file. You can use the default templates as provided, customize the default templates, or create your own templates.">Adding and removing JSP templates</a></div>
-<div><a href="tsrcedt000.html" title="You can edit text coded in markup languages with a structured text editor. This is a generic term for several editors that you can use to edit any of several markup languages, such as HTML.">Editing text coded in markup languages
-- overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.cvsignore b/docs/org.eclipse.wst.sse.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.project b/docs/org.eclipse.wst.sse.ui.infopop/.project
deleted file mode 100644
index 2d9cc84..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.sse.ui.infopop</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.sse.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml b/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml
deleted file mode 100644
index b68067e..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/EditorContexts.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/ -->
-<contexts>
-
-<context id="sted0001">
-<description>This page lets you customize the appearance of the structured text editors.
-When the <b>Highlight matching brackets</b> option is selected, whenever the cursor is next to a bracket or curly braces, its opening or closing counter part is highlighted.
-Select the <b>Report problems as you type</b> check box to update validity annotations (temporary annotations, such as missing required attributes based on a DTD, that go away when the editor is closed, or the problem is fixed) as the user types.
-In the <b>Appearance color options</b> table, you can adjust various editor appearance features.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="sted0003">
-<description>This page lets you customize hover text in the structured text editors.
-</description>
-<topic label="Setting preferences for structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt025.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclispe.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1010">
-<description>Content assist helps you to finish tags or lines of code and insert templates. Depending on the source markup language, the choices that are available in the content assist list are based on tags defined by DTD and schema files, tag library descriptors, or content model standard that is specified for the file being edited. HTML content assist choices are based on the W3C HTML 4.01 content model.
-
-If your cursor is in a position where content assist is available, a pop-up list of available choices is displayed. The content assist list displays all available completions for the current cursor position, including templates. Content assist is also available by pressing Ctrl+Space.
-</description>
-<topic label="Content assist" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt006.html"/>
-<topic label="Getting content assistance in structured text editors" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt005.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1030">
-<description>Select this option to format an entire document. Formatting restores element and attribute indentation and positioning, which may have been offset during editing, to see nesting hierarchies and relationships more clearly in the file. Edit the appropriate Preferences pages to make changes in specific formatting behavior.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1040">
-<description>Select this option to format selected elements. Formatting restores element and attribute indentation and positioning, which may have been offset during editing, to see nesting hierarchies and relationships more clearly in the file.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm1070">
-<description>Select this option to open the <b>Properties</b> view, which displays properties relevant to the current element if any exist.
-</description>
-<topic label="Properties view" href="../org.eclipse.platform.doc.user/concepts/cpropview.htm"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="xmlm2000">
-<description>This structured text editor lets you edit a text file that is coded in a markup language. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting. For a more specific list of editing features, see the first link below.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-
-<context id="webx0000">
-<description>This page lets you customize task tag discovery in the structured text editors.
-</description>
-</context>
-
-<context id="ecss0000">
-<description>The CSS source page editor lets you edit a cascading style sheet. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="misc0180">
- <description>Use this dialog to edit the CSS content settings for a CSS file. You can specify CSS profile or restore the default by clicking <b>Restore Defaults</b>.
- </description>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/EditorCssContexts2.xml b/docs/org.eclipse.wst.sse.ui.infopop/EditorCssContexts2.xml
deleted file mode 100644
index f8bc39d..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/EditorCssContexts2.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<contexts>
-<context id="csssource_source_HelpId">
-<description>The CSS source page editor lets you edit a cascading style sheet. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
-<context id="ecss0000">
-<description>The CSS source page editor lets you edit a cascading style sheet. The editor provides many text editing features, such as content assist, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.
-</description>
-<topic label="Structured text editors for markup languages" href="../org.eclipse.wst.sse.doc.user/topics/csrcedt004.html"/>
-<topic label="Editing text coded in markup languages - overview" href="../org.eclipse.wst.sse.doc.user/topics/tsrcedt000.html"/>
-</context>
- <context id="misc0180">
- <description>Use this dialog to edit the CSS content settings for a CSS file. You can specify CSS profile or restore the default by clicking <b>Restore Defaults</b>.
- </description>
-</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 16a56cf..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.wst.sse.ui.infopop; singleton:=true
-Bundle-Version: 1.0.200.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/about.html b/docs/org.eclipse.wst.sse.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/build.properties b/docs/org.eclipse.wst.sse.ui.infopop/build.properties
deleted file mode 100644
index 94c7f99..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = EditorContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               META-INF/,\
-               EditorCssContexts2.xml,\
-               plugin.properties
-generateSourceBundle=false
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/plugin.properties b/docs/org.eclipse.wst.sse.ui.infopop/plugin.properties
deleted file mode 100644
index 84f306f..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-# properties file for org.eclipse.wst.sse.ui.infopop
-Bundle-Vendor.0 = Eclipse.org
-Bundle-Name.0 = SSE infopops
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml b/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
deleted file mode 100644
index 2a3796f..0000000
--- a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2001, 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
- *******************************************************************************/ -->
-
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorContexts.xml" plugin ="org.eclipse.wst.sse.ui"/>
-       <contexts file="EditorCssContexts2.xml" plugin ="org.eclipse.wst.sse.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore b/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.web.ui.infopop/.project b/docs/org.eclipse.wst.web.ui.infopop/.project
deleted file mode 100644
index 10c4a6e..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web.ui.infopop</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 8a60c52..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Static Web infopop
-Bundle-SymbolicName: org.eclipse.wst.web.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml b/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
deleted file mode 100644
index bf0f403..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/StaticWebWizContexts.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<contexts>
-<context id="webw2000">
-<description> Use this page to name your Web project and specify the file system location (the place where the resources you create are stored.) When the Use default check box is selected, the project will be created in the file system location where your workspace resides. To change the default file system location, clear the checkbox and locate the path using the <b>Browse</b> button. To configure additional options, select the <b>Next</b> button.
-In the Target Runtime field, select the server where you want to publish the Web project. if a server is not already defined, click <b>New</b> to select a server runtime environment. </description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2100">
-<description>Presets are used to define a default set of facet versions that will configure a project for a particular type of development. The Static Web Module facet enables the project to be deployed as a static
-Web module. Click Show Runtimes to view the available runtimes and runtime compositions.</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-<context id="webw2200">
-<description>The Web content folder is where the elements of your Web site such as Web pages, graphics and style sheets are stored. This directory structure is necessary to ensure that the content of your Web site will be included in the WAR file at deployment and that link validation will work correctly.
-</description>
-<topic label="Creating a static Web project" href="../org.eclipse.wst.webtools.doc.user/topics/twcresta.html"/>
-</context>
-
-
-</contexts>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/about.html b/docs/org.eclipse.wst.web.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.web.ui.infopop/build.properties b/docs/org.eclipse.wst.web.ui.infopop/build.properties
deleted file mode 100644
index 0c7c1a9..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-bin.includes = StaticWebWizContexts.xml,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               META-INF/
-src.includes = build.properties
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties b/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
deleted file mode 100644
index b61d2de..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName     = Static Web infopop
-pluginProvider = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml b/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
deleted file mode 100644
index 20ac018..0000000
--- a/docs/org.eclipse.wst.web.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-      <contexts file="StaticWebWizContexts.xml" plugin ="org.eclipse.wst.web.ui"/>
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/.cvsignore b/docs/org.eclipse.wst.webtools.doc.user/.cvsignore
deleted file mode 100644
index d1dca98..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.webtools.doc.user_1.0.0.jar
-temp
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/.project b/docs/org.eclipse.wst.webtools.doc.user/.project
deleted file mode 100644
index bd5b157..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.webtools.doc.user</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.webtools.doc.user/DocBuild.xml b/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml
deleted file mode 100644
index 235ccf2..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-	2008-01-09 Kate Price <katep@ca.ibm.com>
-	- modified for new DITA-OT version
-	2008-05-05 Kate Price <katep@ca.ibm.com>
-	- modified to add generation of pre-built help index. 
-	- Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="3.3.0" />
-			<property name="args.input" location="relatedlinks.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location="" />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 507c0f4..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.webtools.doc.user; singleton:=true
-Bundle-Version: 1.0.400.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Eclipse-LazyStart: true
diff --git a/docs/org.eclipse.wst.webtools.doc.user/about.html b/docs/org.eclipse.wst.webtools.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/build.properties b/docs/org.eclipse.wst.webtools.doc.user/build.properties
deleted file mode 100644
index 1e3a1c7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-bin.includes = plugin.xml,\
-               webtools_toc.xml,\
-               org.eclipse.wst.webtools.doc.userindex.xml,\
-               about.html,\
-               images/,\
-               topics/*htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = *.maplist,\
-               *.ditamap,\
-               topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif b/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif
deleted file mode 100644
index ffafc3d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/fixit.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif b/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif
deleted file mode 100644
index 46d245f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/grptype.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif b/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif
deleted file mode 100644
index 7ef1a62..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/menubutton.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif
deleted file mode 100644
index 7c135cf..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nlinux.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif
deleted file mode 100644
index c2bfdd6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nshowerr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif
deleted file mode 100644
index cf4fdf9..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwarning.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif
deleted file mode 100644
index 895f9ca..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwin.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif
deleted file mode 100644
index 6321433..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkbrk.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif
deleted file mode 100644
index 1a0caf6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkcss.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif
deleted file mode 100644
index 9c73b6a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr-l.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif
deleted file mode 100644
index f3c6261..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkgr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif
deleted file mode 100644
index 943f756..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkind.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif
deleted file mode 100644
index 889c47f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkmal.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif
deleted file mode 100644
index f324a63..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnknum.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif
deleted file mode 100644
index f596591..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkotr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif
deleted file mode 100644
index 345f939..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnkque.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif b/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif
deleted file mode 100644
index 9cd47ee..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/nwlnktsk.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif b/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif
deleted file mode 100644
index 55f5b1b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/skipit.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif b/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif
deleted file mode 100644
index 407b051..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/images/viewlink.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/_10.cfs b/docs/org.eclipse.wst.webtools.doc.user/index/_10.cfs
deleted file mode 100644
index 740c4c5..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/_10.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/deletable b/docs/org.eclipse.wst.webtools.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions
deleted file mode 100644
index f11e1b7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 14 20:03:02 EDT 2008

-org.eclipse.wst.webtools.doc.user=org.eclipse.wst.webtools.doc.user\n1.0.400.qualifier

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies
deleted file mode 100644
index 430c2cb..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 14 20:03:02 EDT 2008

-lucene=1.9.1.v200803061811

-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs b/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs
deleted file mode 100644
index be0097c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,34 +0,0 @@
-#This is a generated file; do not edit.

-#Wed May 14 20:03:02 EDT 2008

-/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.html=0

-/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html=0

-/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twprjset.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.html=0

-/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcresta.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twplib.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html=0

-/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html=0

-/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html=0

-/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html=0

-/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html=0

diff --git a/docs/org.eclipse.wst.webtools.doc.user/index/segments b/docs/org.eclipse.wst.webtools.doc.user/index/segments
deleted file mode 100644
index 4d97698..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.webtools.doc.user/myplugin.xml b/docs/org.eclipse.wst.webtools.doc.user/myplugin.xml
deleted file mode 100644
index b8dc30e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/myplugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?eclipse version="3.0"?> 
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-   <plugin> 
-       <extension point="org.eclipse.help.toc">
-         	<toc file="webtools_toc.xml" /> 
-       <index path="index/"/>
-         	   </extension>  
-         	   
-        <extension point="org.eclipse.help.index">
-            <index file="org.eclipse.wst.webtools.doc.userindex.xml"/>
-   </extension>
-       <extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-    </plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.user.maplist b/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.user.maplist
deleted file mode 100644
index d9d52db..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.user.maplist
+++ /dev/null
@@ -1,8 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="webtools_toc.ditamap"/>

-  </nav>

-  <link>

-    <map file="relatedlinks.ditamap"/>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.xml b/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.xml
deleted file mode 100644
index 42c8a4d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/org.eclipse.wst.webtools.doc.userindex.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="Web applications">
-    <entry keyword="overview">
-      <topic href="topics/ccwtover.html#ccwtover" title="Web application overview"/>
-    </entry>
-    <entry keyword="creating or importing">
-      <topic href="topics/cwebprojects.html#cwebprojects" title="Web projects"/>
-    </entry>
-    <entry keyword="resources">
-      <topic href="topics/twcreprj.html#twcreprj" title="Creating a dynamic Web project"/>
-    </entry>
-    <entry keyword="server targeting">
-      <topic href="topics/tservertarget.html#tservertarget" title="Server targeting for Web applications"/>
-    </entry>
-  </entry>
-  <entry keyword="Web tools">
-    <entry keyword="features">
-      <topic href="topics/cwtfeatures.html#cwtfeatures" title="Web tools features"/>
-    </entry>
-  </entry>
-  <entry keyword="Project Explorer view">
-    <entry keyword="overview">
-      <topic href="topics/ccwebvw.html#ccwebvw" title="Project Explorer view and Web development"/>
-    </entry>
-  </entry>
-  <entry keyword="Web projects">
-    <entry keyword="Project Explorer view">
-      <topic href="topics/ccwebvw.html#ccwebvw" title="Project Explorer view and Web development"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cwebprojects.html#cwebprojects" title="Web projects"/>
-    </entry>
-    <entry keyword="creating dynamic projects">
-      <topic href="topics/twcreprj.html#twcreprj" title="Creating a dynamic Web project"/>
-    </entry>
-    <entry keyword="dynamic projects overview">
-      <topic href="topics/ccwebprj.html#ccwebprj" title="Dynamic Web projects and applications"/>
-    </entry>
-    <entry keyword="creating static">
-      <topic href="topics/twcresta.html#twcresta" title="Creating a static Web project"/>
-    </entry>
-    <entry keyword="converting static to dynamic">
-      <topic href="topics/twpcnvrt.html#twpcnvrt" title="Converting static Web projects to dynamic Web projects"/>
-    </entry>
-    <entry keyword="static">
-      <topic href="topics/ccstatic.html#ccstatic" title="Static Web projects"/>
-    </entry>
-    <entry keyword="exporting WAR files">
-      <topic href="topics/twcrewar.html#twcrewar" title="Exporting Web Archive (WAR) files"/>
-    </entry>
-    <entry keyword="virtual JAR files and projects">
-      <topic href="topics/twplib.html#twplib" title="Adding Web library projects"/>
-    </entry>
-    <entry keyword="properties settings">
-      <topic href="topics/twprjset.html#twprjset" title="Setting Web project properties"/>
-    </entry>
-  </entry>
-  <entry keyword="Web resources">
-    <entry keyword="overview">
-      <topic href="topics/cwebresources.html#cwebresources" title="Web resources"/>
-    </entry>
-  </entry>
-  <entry keyword="Web page design">
-    <entry keyword="overview">
-      <topic href="topics/cwebpagedesign.html#cwebpagedesign" title="Web page design"/>
-    </entry>
-  </entry>
-  <entry keyword="WAR files">
-    <entry keyword="overview">
-      <topic href="topics/cwwarovr.html#cwwarovr" title="Web archive (WAR) files"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/twimpwar.html#twimpwar" title="Importing Web archive (WAR) files"/>
-    </entry>
-    <entry keyword="exporting">
-      <topic href="topics/twcrewar.html#twcrewar" title="Exporting Web Archive (WAR) files"/>
-    </entry>
-  </entry>
-  <entry keyword="enterprise applications">
-    <entry keyword="projects">
-      <entry keyword="dynamic Web projects">
-        <topic href="topics/ccwebprj.html#ccwebprj" title="Dynamic Web projects and applications"/>
-      </entry>
-    </entry>
-  </entry>
-  <entry keyword="static Web projects">
-    <entry keyword="creating">
-      <topic href="topics/twcresta.html#twcresta" title="Creating a static Web project"/>
-    </entry>
-    <entry keyword="converting to dynamic">
-      <topic href="topics/twpcnvrt.html#twpcnvrt" title="Converting static Web projects to dynamic Web projects"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/ccstatic.html#ccstatic" title="Static Web projects"/>
-    </entry>
-  </entry>
-  <entry keyword="exporting">
-    <entry keyword="WAR files">
-      <topic href="topics/twcrewar.html#twcrewar" title="Exporting Web Archive (WAR) files"/>
-    </entry>
-  </entry>
-  <entry keyword="virtual JAR files associations">
-    <entry keyword="Web library projects">
-      <topic href="topics/twplib.html#twplib" title="Adding Web library projects"/>
-    </entry>
-  </entry>
-  <entry keyword="workbench">
-    <entry keyword="Web editors">
-      <topic href="topics/cwwedtvw.html#cwwedtvw" title="Workbench integration with Web editors"/>
-    </entry>
-  </entry>
-  <entry keyword="Web pages">
-    <entry keyword="creating">
-      <topic href="topics/tjdetags.html#tjdetags" title="Creating and editing Web pages - overview"/>
-    </entry>
-  </entry>
-  <entry keyword="framesets">
-    <entry keyword="creating">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-  </entry>
-  <entry keyword="HTML">
-    <entry keyword="creating files">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-    <entry keyword="editing preferences">
-      <topic href="topics/tjprefs.html#tjprefs" title="Defining HTML file preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="WML">
-    <entry keyword="creating files">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-  </entry>
-  <entry keyword="XHTML">
-    <entry keyword="creating files">
-      <topic href="topics/tjcrehtm.html#tjcrehtm" title="Creating HTML and XHTML files and framesets"/>
-    </entry>
-  </entry>
-  <entry keyword="DOCTYPE declarations">
-    <entry keyword="adding automatically">
-      <topic href="topics/tjprefs.html#tjprefs" title="Defining HTML file preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="HTML files">
-    <entry keyword="editing preferences">
-      <topic href="topics/tjprefs.html#tjprefs" title="Defining HTML file preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="style sheets">
-    <entry keyword="creating">
-      <topic href="topics/tstylesheet.html#tstylesheet" title="Creating cascading style sheets"/>
-    </entry>
-  </entry>
-  <entry keyword="JSP files">
-    <entry keyword="creating">
-      <topic href="topics/tjcrejsp.html#tjcrejsp" title="Creating JavaServer Pages (JSP) files"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cpdjsps.html#cpdjsps" title="JavaServer Pages (JSP) technology"/>
-    </entry>
-  </entry>
-  <entry keyword="Web content">
-    <entry keyword="generating dynamically">
-      <topic href="topics/cpdjsps.html#cpdjsps" title="JavaServer Pages (JSP) technology"/>
-    </entry>
-  </entry>
-  <entry keyword="servlets">
-    <entry keyword="creating">
-      <topic href="topics/twsrvwiz.html#twsrvwiz" title="Creating servlets"/>
-      <topic href="topics/twlstwiz.html#twlstwiz" title="Creating Listeners"/>
-      <topic href="topics/twfltwiz.html#twfltwiz" title="Creating Filters"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cwservbn.html#cwservbn" title="Servlets"/>
-    </entry>
-  </entry>
-  <entry keyword="Web servers">
-    <entry keyword="generating dynamic content">
-      <topic href="topics/cwservbn.html#cwservbn" title="Servlets"/>
-    </entry>
-  </entry>
-  <entry keyword="listeners">
-    <entry keyword="overview">
-      <topic href="topics/cwlistbn.html#cwlistbn" title="Listeners"/>
-    </entry>
-  </entry>
-  <entry keyword="filters">
-    <entry keyword="overview">
-      <topic href="topics/cwfiltbn.html#cwfiltbn" title="Listeners"/>
-    </entry>
-  </entry>
-  <entry keyword="build output folders">
-    <entry keyword="ignoring in CVS">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="CVS">
-    <entry keyword="setting repository defaults">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="cvsignore files">
-    <entry keyword="creating">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="repositories">
-    <entry keyword="default CVS settings">
-      <topic href="topics/twcvsr.html#twcvsr" title="Setting CVS repository defaults"/>
-    </entry>
-  </entry>
-  <entry keyword="servers">
-    <entry keyword="targeting">
-      <topic href="topics/tservertarget.html#tservertarget" title="Server targeting for Web applications"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/plugin.properties b/docs/org.eclipse.wst.webtools.doc.user/plugin.properties
deleted file mode 100644
index 5d32518..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-
-pluginName   = Web tools documentation
-providerName = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml b/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
deleted file mode 100644
index b8dc30e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<?eclipse version="3.0"?> 
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-   <plugin> 
-       <extension point="org.eclipse.help.toc">
-         	<toc file="webtools_toc.xml" /> 
-       <index path="index/"/>
-         	   </extension>  
-         	   
-        <extension point="org.eclipse.help.index">
-            <index file="org.eclipse.wst.webtools.doc.userindex.xml"/>
-   </extension>
-       <extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-    </plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap b/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap
deleted file mode 100644
index 4778f32..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.ditamap
+++ /dev/null
@@ -1,482 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map title="Web tools related links">

-<reltable>

-<relheader>

-<relcolspec type="concept"></relcolspec>

-<relcolspec type="task"></relcolspec>

-<relcolspec type="reference"></relcolspec>

-</relheader>

-<relrow>

-<relcell></relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/tjchgxdt.dita" navtitle="Specifying an implicit document type for an HTML, XHTML, or JSP fragment">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjcrehtm.dita" navtitle="Creating HTML and XHTML files and framesets">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cpdjsps.dita" linking="targetonly" navtitle="JavaServer Pages (JSP) technology"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjcrejsp.dita" navtitle="Creating JavaServer Pages (JSP) files">

-</topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell collection-type="family">

-<topicref href="topics/tservertarget.dita" navtitle="Server targeting for Web applications">

-</topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects" scope="peer">

-</topicref>

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcreprj.dita" navtitle="Creating a dynamic Web project">

-</topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects" scope="peer">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcresta.dita" navtitle="Creating a static Web project">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files" scope="peer">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twcrewar.dita" navtitle="Exporting Web Archive (WAR) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/twcvsr.dita" navtitle="Setting CVS repository defaults"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files" scope="peer">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twimpwar.dita" navtitle="Importing Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects" scope="peer">

-</topicref>

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications"

-scope="peer"></topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twpcnvrt.dita" navtitle="Converting static Web projects to dynamic Web projects">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/twplib.dita" navtitle="Adding Web library projects">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/twprjset.dita" navtitle="Setting Web project properties">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwservbn.dita" linking="targetonly" navtitle="Servlets"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twsrvwiz.dita" navtitle="Creating Servlets"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwlistbn.dita" linking="targetonly" navtitle="Listeners"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twlstwiz.dita" navtitle="Creating Listeners"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwfiltbn.dita" linking="targetonly" navtitle="Filters"

-scope="peer"></topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twfltwiz.dita" navtitle="Creating Filters"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwebvw.dita" navtitle="Project Explorer view and Web development">

-</topicref>

-</relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebprojects.dita" navtitle="Web projects" scope="peer">

-</topicref>

-<topicref href="topics/ccwtover.dita" navtitle="Web application overview"

-scope="peer"></topicref>

-<topicref href="topics/cpdjsps.dita" navtitle="JavaServer Pages (JSP) technology"

-scope="peer"></topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twimpwar.dita" linking="targetonly" navtitle="Importing Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwtover.dita" navtitle="Web application overview">

-</topicref>

-<topicref href="topics/cwtfeatures.dita" linking="targetonly" navtitle="Web tools features">

-</topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer">

-<topicref href="topics/tjdetags.dita" linking="targetonly" navtitle="Creating and editing Web pages - overview">

-<topicref href="topics/cwebartifact.dita" linking="targetonly" navtitle="Creating Web Artifacts">

-</topicref>

-</topicref>

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwtfeatures.dita" navtitle="Web tools features"></topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cwebpagedesign.dita" linking="targetonly" navtitle="Web page design">

-</topicref>

-<!-- <topicref href="topics/cwebtechnologies.dita" linking="targetonly" navtitle="Web technologies">

-</topicref> -->

-</relcell>

-<relcell>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-<topicref href="topics/twsrvwiz.dita" linking="targetonly" navtitle="Creating Servlets"

-scope="peer"></topicref>

-<topicref href="topics/twlstwiz.dita" linking="targetonly" navtitle="Creating Listeners"

-scope="peer"></topicref>

-<topicref href="topics/twfltwiz.dita" linking="targetonly" navtitle="Creating Filters"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<!-- <topicref href="topics/cwebtechnologies.dita" navtitle="Web technologies">

-</topicref> -->

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cpdjsps.dita" linking="targetonly" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-</relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cpdjsps.dita" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-<topicref href="topics/cwservbn.dita" linking="targetonly" navtitle="Servlets">

-</topicref>

-<topicref href="topics/cwlistbn.dita" linking="targetonly" navtitle="Listeners">

-</topicref>

-<topicref href="topics/cwfiltbn.dita" linking="targetonly" navtitle="Filters">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwservbn.dita" navtitle="Servlets"></topicref>

-<topicref href="topics/cwlistbn.dita" navtitle="Listeners"></topicref>

-<topicref href="topics/cwfiltbn.dita" navtitle="Filters"></topicref>

-<topicref href="topics/ccwtover.dita" linking="targetonly" navtitle="Web application overview">

-</topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell>

-<topicref href="topics/twsrvwiz.dita" linking="targetonly" navtitle="Creating Servlets"

-scope="peer"></topicref>

-<topicref href="topics/twlstwiz.dita" linking="targetonly" navtitle="Creating Listeners"

-scope="peer"></topicref>

-<topicref href="topics/twfltwiz.dita" linking="targetonly" navtitle="Creating Filters"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" navtitle="Web development tools">

-</topicref> -->

-<topicref href="topics/ccstatic.dita" linking="targetonly" navtitle="Static Web projects">

-</topicref>

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcresta.dita" linking="targetonly" navtitle="Creating a static Web project"

-scope="peer"></topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-<topicref href="topics/tjcrehtm.dita" linking="targetonly" navtitle="Creating HTML and XHTML files and framesets"

-scope="peer"></topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwtover.dita" linking="targetonly" navtitle="Web application overview">

-</topicref>

-<topicref href="topics/cwwedtvw.dita" linking="targetonly" navtitle="Workbench integration with Web editors">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/tjprefs.dita" linking="targetonly" navtitle="Defining HTML file preferences">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cpdjsps.dita" linking="targetonly" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-</relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebprojects.dita" navtitle="Web projects"></topicref>

-<topicref href="topics/ccstatic.dita" linking="targetonly" navtitle="Static Web projects">

-</topicref>

-<topicref href="topics/ccwebprj.dita" linking="targetonly" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcresta.dita" linking="targetonly" navtitle="Creating a static Web project"

-scope="peer"></topicref>

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects"></topicref>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twcresta.dita" linking="targetonly" navtitle="Creating a static Web project"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications">

-</topicref>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/twcreprj.dita" linking="targetonly" navtitle="Creating a dynamic Web project"

-scope="peer"></topicref>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebpagedesign.dita" navtitle="Web page design"></topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjdetags.dita" linking="targetonly" navtitle="Creating and editing Web pages - overview">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebresources.dita" navtitle="Web resources"></topicref>

-<topicref href="topics/cwwarovr.dita" linking="targetonly" navtitle="Web archive (WAR) files">

-</topicref>

-</relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwwedtvw.dita" navtitle="Workbench integration with Web editors">

-</topicref>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-</relcell>

-<relcell></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/tjcrejsp.dita" linking="targetonly" navtitle="Creating JavaServer Pages (JSP) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell collection-type="family">

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files">

-</topicref>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-</relcell>

-<relcell>

-<topicref href="topics/twimpwar.dita" linking="targetonly" navtitle="Importing Web archive (WAR) files"

-scope="peer"></topicref>

-<topicref href="topics/twcrewar.dita" linking="targetonly" navtitle="Exporting Web Archive (WAR) files"

-scope="peer"></topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<topicref href="topics/cwebresources.dita" linking="targetonly" navtitle="Web resources">

-</topicref>

-</relcell>

-<relcell collection-type="family"></relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell>

-<!-- <topicref href="topics/cwebdevelopmenttools.dita" linking="targetonly" navtitle="Web development tools">

-</topicref> -->

-<topicref href="topics/ccwtover.dita" linking="targetonly" navtitle="Web application overview">

-</topicref>

-</relcell>

-<relcell collection-type="family">

-<topicref href="topics/tjdetags.dita" navtitle="Creating and editing Web pages - overview">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-<relrow>

-<relcell></relcell>

-<relcell>

-<topicref href="topics/tjprefs.dita" navtitle="Defining HTML file preferences">

-</topicref>

-</relcell>

-<relcell></relcell>

-</relrow>

-</reltable>

-</map>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.xml b/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.xml
deleted file mode 100644
index 718a329..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/relatedlinks.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Web tools related links"/>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.dita
deleted file mode 100644
index 7e809fb..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.dita
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="ccstatic" xml:lang="en-us">

-<title>Static Web projects</title>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>static</indexterm></indexterm>

-<indexterm>static Web projects<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>If you  want to create a content-based Web application that does not contain

-any dynamic content  (such as servlets, JSP files, filters, and associated

-metadata) you might prefer to create a static Web project, as opposed to a <xref

-href="ccwebprj.dita" scope="peer"><desc></desc>dynamic Web project</xref>.</p>

-<p>Static Web projects have the following characteristics:  <ul>

-<li>a Web content folder (called WebContent) for all publishable resources,

-You can change the name of this folder from the project's pop-up menu.</li>

-<li>a Theme folder, the suggested directory for storing cascading style sheets

-and other style-related objects.</li>

-<li>the ability to define folders outside of the Web content folder, for storing

-intermediate files, such as MIF files</li>

-<li>a conversion path from a static Web project to a dynamic Web project.

-If you decide to <xref href="twpcnvrt.dita" scope="peer"><desc></desc>convert</xref> the

-project, it will be a fully-valid dynamic Web project. </li>

-</ul></p>

-<p>In addition, your project will still have the following features (which

-are common to both static and dynamic Web projects ) : <ul>

-<li>HTML syntax validation</li>

-<li>a broken link fix-up wizard</li>

-<li>a Web site navigation tool</li>

-<li>a new server type, the Static Web server, which makes it easy to publish

-static Web projects</li>

-</ul> </p>

-<p>The folder that a static Web project is published to is modifiable, so

-that when you set the publishing "root" value (called a <i>context root</i>),

-such as <codeph>/web1</codeph>, for a static project, everything in the Web

-content folder will be published to the <filepath>web1</filepath> folder under

-the Web server's doc root. This enables you to group Web resources on a Web

-server in folders that correspond to Web projects in the workbench. When projects

-defined in this way are ready for production, you can publish specific projects

-directly to the doc root by changing the value to <codeph>/</codeph> and all

-publishing, link fixing, and browsing will update automatically.</p>

-<p>Aliases can also be used to specify a context root value. For example,

-suppose that there is an alias that is defined on the target Web server, as

-follows: <codeblock>Alias /scripts/ "/var/www/scripts"</codeblock>In this

-example, in which the current static Web project will contain common <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> files,

-you can set the context root value to be <ph>"scripts"</ph>.  In order for

-the resources in the static Web project to be published to the correct location

-on the Web server, you must add this Alias mapping to the server tools instance

-of the static Web server, as follows.  <ol>

-<li>From the Server view, double-click on the static Web server configuration

-to open the server configuration editor.<note>This assumes that you've already

-defined the static Web server.</note></li>

-<li>Click the <uicontrol>Configuration</uicontrol> editor tab.</li>

-<li>Scroll down to the <uicontrol>Alias Path Mapping</uicontrol> section,

-and add the new Alias mapping.</li>

-</ol>Now that <ph>"scripts"</ph> is defined as an Alias, the Web content in

-the static Web project will be published to the mapped path, <filepath>/var/www/scripts</filepath>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
deleted file mode 100644
index 6dae355..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccstatic.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Static Web projects" />
-<meta content="Web projects, static, static Web projects, overview" name="DC.subject" />
-<meta content="Web projects, static, static Web projects, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwebresources.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwwarovr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcresta.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccstatic" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Static Web projects</title>
-</head>
-<body id="ccstatic"><a name="ccstatic"><!-- --></a>
-
-
-<h1 class="topictitle1">Static Web projects</h1>
-
-
-<div>
-<p>If you  want to create a content-based Web application that does not contain
-any dynamic content  (such as servlets, JSP files, filters, and associated
-metadata) you might prefer to create a static Web project, as opposed to a <a href="ccwebprj.html" title="">dynamic Web project</a>.</p>
-
-<div class="p">Static Web projects have the following characteristics:  <ul>
-<li>a Web content folder (called WebContent) for all publishable resources,
-You can change the name of this folder from the project's pop-up menu.</li>
-
-<li>a Theme folder, the suggested directory for storing cascading style sheets
-and other style-related objects.</li>
-
-<li>the ability to define folders outside of the Web content folder, for storing
-intermediate files, such as MIF files</li>
-
-<li>a conversion path from a static Web project to a dynamic Web project.
-If you decide to <a href="twpcnvrt.html" title="">convert</a> the
-project, it will be a fully-valid dynamic Web project. </li>
-
-</ul>
-</div>
-
-<div class="p">In addition, your project will still have the following features (which
-are common to both static and dynamic Web projects ) : <ul>
-<li>HTML syntax validation</li>
-
-<li>a broken link fix-up wizard</li>
-
-<li>a Web site navigation tool</li>
-
-<li>a new server type, the Static Web server, which makes it easy to publish
-static Web projects</li>
-
-</ul>
- </div>
-
-<p>The folder that a static Web project is published to is modifiable, so
-that when you set the publishing "root" value (called a <em>context root</em>),
-such as <samp class="codeph">/web1</samp>, for a static project, everything in the Web
-content folder will be published to the <span class="filepath">web1</span> folder under
-the Web server's doc root. This enables you to group Web resources on a Web
-server in folders that correspond to Web projects in the workbench. When projects
-defined in this way are ready for production, you can publish specific projects
-directly to the doc root by changing the value to <samp class="codeph">/</samp> and all
-publishing, link fixing, and browsing will update automatically.</p>
-
-<div class="p">Aliases can also be used to specify a context root value. For example,
-suppose that there is an alias that is defined on the target Web server, as
-follows: <pre>Alias /scripts/ "/var/www/scripts"</pre>
-In this
-example, in which the current static Web project will contain common JavaScript™ files,
-you can set the context root value to be <span>"scripts"</span>.  In order for
-the resources in the static Web project to be published to the correct location
-on the Web server, you must add this Alias mapping to the server tools instance
-of the static Web server, as follows.  <ol>
-<li>From the Server view, double-click on the static Web server configuration
-to open the server configuration editor.<div class="note"><span class="notetitle">Note:</span> This assumes that you've already
-defined the static Web server.</div>
-</li>
-
-<li>Click the <span class="uicontrol">Configuration</span> editor tab.</li>
-
-<li>Scroll down to the <span class="uicontrol">Alias Path Mapping</span> section,
-and add the new Alias mapping.</li>
-
-</ol>
-Now that <span>"scripts"</span> is defined as an Alias, the Web content in
-the static Web project will be published to the mapped path, <span class="filepath">/var/www/scripts</span>.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwebresources.html" title="">Web resources</a></div>
-<div><a href="../topics/cwwarovr.html" title="">Web archive (WAR) files</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcresta.html">Creating a static Web project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.dita
deleted file mode 100644
index e15ac5f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.dita
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="ccwebprj" xml:lang="en-us">

-<title>Dynamic Web projects and applications</title>

-<prolog><metadata>

-<keywords><indexterm>enterprise applications<indexterm>projects<indexterm>dynamic

-Web projects</indexterm></indexterm></indexterm><indexterm>Web projects<indexterm>dynamic

-projects overview</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>There are two types of Web projects: dynamic and <xref href="ccstatic.dita"

-scope="peer"><desc></desc>static</xref>. Dynamic web projects can contain

-dynamic Java EE resources such as servlets, JSP files, filters, and associated

-metadata, in addition to static resources such as images and HTML files. Static

-web projects only contains static resources. When you create Web projects,

-you can include cascading style sheets and JSP tag libraries (for dynamic

-Web projects), so that you can begin development with a richer set of project

-resources.</p>

-<p>Dynamic Web projects are always embedded in Enterprise Application projects.

-The wizard that you use to create a dynamic Web project will also create an

-Enterprise Application (EAR) project if it does not already exist. The wizard

-will also update the <filepath>application.xml</filepath> deployment descriptor

-of the specified Enterprise Application project to define the Web project

-as a module element. If you are importing a WAR file rather than creating

-a dynamic Web project new, the WAR Import wizard requires that you specify

-a Web project, which already requires an EAR project. </p>

-<p>Java EE conventions may represent extra overhead if you only want to create

-a static, content-based Web application, which contains no dynamic files,

-such as JSP files or servlets. In this case, when you need only the most basic

-Web project, you might want to use the <i>static</i> Web project type (see <xref

-href="ccstatic.dita" scope="peer"><desc></desc>Static Web projects</xref>).

- Note that static Web projects can  be converted to dynamic Web projects by

-selecting <b>Convert to a Dynamic Web Project</b>, from the Project menu.</p>

-<p>The Java EE model, and more specifically, the <cite>Sun Microsystems <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite>, defines a Web application directory structure that

-specifies the location of Web content files, class files, class paths, deployment

-descriptors, and supporting metadata. The Web project hierarchy mirrors that

-of the Web application created from a project. In the workbench, you can use

-the <ph>New Web Project</ph> wizard to create a new Web project.</p>

-<p>The main project folder contains all development objects related to a Web

-application. The Web content folder contains the elements of the project necessary

-to create a Web application. This folder structure maps to the Web application

-archive (WAR) structure defined by Sun Microsystems.. The following default

-elements are located in the Web project folder hierarchy: <note>In the Project

-Explorer view, Web projects are filtered into folder nodes to customize the

-display of Web resources for easy management during development. For information

-on the filtered structure, see <xref href="ccwebvw.dita" scope="peer"><desc></desc>Project

-Explorer view</xref>.</note><dl><dlentry>

-<dt>Web Deployment Descriptor</dt>

-<dd>The standard Web application deployment descriptor (the <filepath>web.xml</filepath> file).</dd>

-</dlentry><dlentry>

-<dt>JavaSource</dt>

-<dd>Contains the project's <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> source code for classes, beans, and

-servlets. When these resources are added to a Web project, they are automatically

-compiled and the generated files are added to the WEB-INF/classes directory.

-The contents of the source directory are not packaged in WAR files unless

-an option is specified when a WAR file is created. <note>Though the default

-name given to the folder is JavaSources, you can change the name by right

-clicking on the name in the Project Explorer and clicking on <menucascade>

-<uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol></menucascade>.</note></dd>

-</dlentry><dlentry>

-<dt>imported_classes folder</dt>

-<dd>This folder may be created during a WAR import, and contains class files

-that do not have accompanying source.  The <uicontrol>imported_classes</uicontrol> folder

-is a <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> classes

-folder; <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> classes folders can also be created using the Web

-project <uicontrol>Java Build Path</uicontrol> properties page.</dd>

-</dlentry><dlentry>

-<dt>WebContent folder</dt>

-<dd>The mandatory location of all Web resources, including HTML, JSP, graphic

-files, and so on. If the files are not placed in this directory (or in a subdirectory

-structure under this directory), the files will not be available when the

-application is executed on a server. The Web content folder represents the

-contents of the WAR file that will be deployed to the server. Any files not

-under the Web content folder are considered development-time resources (for

-example, .java files, .sql files, and .mif files), and are not deployed when

-the project is unit tested or published. <note>Though the default name given

-to the folder is <filepath>WebContent</filepath>, you can change the name

- in the Project Explorer by right-clicking the folder and selecting <uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol> or

-from the Web page of the project's Properties dialog. In a dynamic Web project,

-changing the folder name will update the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build output directory. </note></dd>

-</dlentry><dlentry>

-<dt>META-INF</dt>

-<dd>This directory contains the <filepath>MANIFEST.MF</filepath> file, which

-is used to map class paths for dependent JAR files that exist in other projects

-in the same Enterprise Application project. An entry in this file will update

-the run-time project class path and <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build settings to include the referenced

-JAR files.</dd>

-</dlentry><dlentry>

-<dt>theme</dt>

-<dd>The suggested directory for cascading style sheets and other style-related

-objects.</dd>

-</dlentry><dlentry>

-<dt>WEB-INF</dt>

-<dd>Based on the <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite>, this

-directory contains the supporting Web resources for a Web application, including

-the <filepath>web.xml</filepath> file and the classes and lib directories.</dd>

-</dlentry><dlentry>

-<dt>/classes</dt>

-<dd>This directory is for servlets, utility classes, and the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler

-output directory. The classes in this directory are used by the application

-class loader to load the classes. Folders in this directory will map package

-and class names, as in: <codeph>/WEB-INF/classes/com/mycorp/servlets/MyServlet.class</codeph>.<p>Do

-not place any .class files directly into this directory. The .class files

-are placed in this directory automatically when the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler

-compiles <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> source files that are in the <filepath>Java Resources</filepath> directory.

-Any files placed directly in this directory will be deleted by the <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> compiler

-when it runs.</p></dd>

-</dlentry><dlentry>

-<dt>/lib</dt>

-<dd>The supporting JAR files that your Web application references. Any classes

-in .jar files placed in this directory will be available for your Web application</dd>

-</dlentry><dlentry>

-<dt>Libraries</dt>

-<dd>The supporting JAR files that your Web application references. This folder

-mirrors the content of the lib folder. In addition, Web Library Projects,

-which are "virtual" JAR files that do not physically reside in the Web project,

-but are associated with <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> projects elsewhere in your workspace,

-are included in this folder. They are packaged with your project when you

-export the application's WAR file.</dd>

-</dlentry></dl> <note>A library entry on the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build path will remain there unless

-the actual JAR file is deleted from the WEB-INF/lib folder. If you remove

-a library path entry but not the JAR file, the library entry will be re-added

-to the path automatically.</note></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html
deleted file mode 100644
index 558e5c2..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebprj.html
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Dynamic Web projects and applications" />
-<meta content="enterprise applications, projects, dynamic Web projects, Web projects, dynamic projects overview" name="DC.subject" />
-<meta content="enterprise applications, projects, dynamic Web projects, Web projects, dynamic projects overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwebresources.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwwarovr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcreprj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcrejsp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccwebprj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Dynamic Web projects and applications</title>
-</head>
-<body id="ccwebprj"><a name="ccwebprj"><!-- --></a>
-
-
-<h1 class="topictitle1">Dynamic Web projects and applications</h1>
-
-
-<div>
-<p>There are two types of Web projects: dynamic and <a href="ccstatic.html" title="">static</a>. Dynamic web projects can contain
-dynamic Java EE resources such as servlets, JSP files, filters, and associated
-metadata, in addition to static resources such as images and HTML files. Static
-web projects only contains static resources. When you create Web projects,
-you can include cascading style sheets and JSP tag libraries (for dynamic
-Web projects), so that you can begin development with a richer set of project
-resources.</p>
-
-<p>Dynamic Web projects are always embedded in Enterprise Application projects.
-The wizard that you use to create a dynamic Web project will also create an
-Enterprise Application (EAR) project if it does not already exist. The wizard
-will also update the <span class="filepath">application.xml</span> deployment descriptor
-of the specified Enterprise Application project to define the Web project
-as a module element. If you are importing a WAR file rather than creating
-a dynamic Web project new, the WAR Import wizard requires that you specify
-a Web project, which already requires an EAR project. </p>
-
-<p>Java EE conventions may represent extra overhead if you only want to create
-a static, content-based Web application, which contains no dynamic files,
-such as JSP files or servlets. In this case, when you need only the most basic
-Web project, you might want to use the <em>static</em> Web project type (see <a href="ccstatic.html" title="">Static Web projects</a>).
- Note that static Web projects can  be converted to dynamic Web projects by
-selecting <strong>Convert to a Dynamic Web Project</strong>, from the Project menu.</p>
-
-<p>The Java EE model, and more specifically, the <cite>Sun Microsystems Java™ Servlet
-2.3 Specification</cite>, defines a Web application directory structure that
-specifies the location of Web content files, class files, class paths, deployment
-descriptors, and supporting metadata. The Web project hierarchy mirrors that
-of the Web application created from a project. In the workbench, you can use
-the <span>New Web Project</span> wizard to create a new Web project.</p>
-
-<div class="p">The main project folder contains all development objects related to a Web
-application. The Web content folder contains the elements of the project necessary
-to create a Web application. This folder structure maps to the Web application
-archive (WAR) structure defined by Sun Microsystems.. The following default
-elements are located in the Web project folder hierarchy: <div class="note"><span class="notetitle">Note:</span> In the Project
-Explorer view, Web projects are filtered into folder nodes to customize the
-display of Web resources for easy management during development. For information
-on the filtered structure, see <a href="ccwebvw.html" title="">Project Explorer view</a>.</div>
-<dl>
-<dt class="dlterm">Web Deployment Descriptor</dt>
-
-<dd>The standard Web application deployment descriptor (the <span class="filepath">web.xml</span> file).</dd>
-
-
-<dt class="dlterm">JavaSource</dt>
-
-<dd>Contains the project's Java source code for classes, beans, and
-servlets. When these resources are added to a Web project, they are automatically
-compiled and the generated files are added to the WEB-INF/classes directory.
-The contents of the source directory are not packaged in WAR files unless
-an option is specified when a WAR file is created. <div class="note"><span class="notetitle">Note:</span> Though the default
-name given to the folder is JavaSources, you can change the name by right
-clicking on the name in the Project Explorer and clicking on <span class="menucascade">
-<span class="uicontrol">Refactor</span> &gt; <span class="uicontrol">Rename</span></span>.</div>
-</dd>
-
-
-<dt class="dlterm">imported_classes folder</dt>
-
-<dd>This folder may be created during a WAR import, and contains class files
-that do not have accompanying source.  The <span class="uicontrol">imported_classes</span> folder
-is a Java classes
-folder; Java classes folders can also be created using the Web
-project <span class="uicontrol">Java Build Path</span> properties page.</dd>
-
-
-<dt class="dlterm">WebContent folder</dt>
-
-<dd>The mandatory location of all Web resources, including HTML, JSP, graphic
-files, and so on. If the files are not placed in this directory (or in a subdirectory
-structure under this directory), the files will not be available when the
-application is executed on a server. The Web content folder represents the
-contents of the WAR file that will be deployed to the server. Any files not
-under the Web content folder are considered development-time resources (for
-example, .java files, .sql files, and .mif files), and are not deployed when
-the project is unit tested or published. <div class="note"><span class="notetitle">Note:</span> Though the default name given
-to the folder is <span class="filepath">WebContent</span>, you can change the name
- in the Project Explorer by right-clicking the folder and selecting <span class="uicontrol">Refactor</span><span class="uicontrol">Rename</span> or
-from the Web page of the project's Properties dialog. In a dynamic Web project,
-changing the folder name will update the Java build output directory. </div>
-</dd>
-
-
-<dt class="dlterm">META-INF</dt>
-
-<dd>This directory contains the <span class="filepath">MANIFEST.MF</span> file, which
-is used to map class paths for dependent JAR files that exist in other projects
-in the same Enterprise Application project. An entry in this file will update
-the run-time project class path and Java build settings to include the referenced
-JAR files.</dd>
-
-
-<dt class="dlterm">theme</dt>
-
-<dd>The suggested directory for cascading style sheets and other style-related
-objects.</dd>
-
-
-<dt class="dlterm">WEB-INF</dt>
-
-<dd>Based on the <cite>Sun Microsystems Java Servlet 2.3 Specification</cite>, this
-directory contains the supporting Web resources for a Web application, including
-the <span class="filepath">web.xml</span> file and the classes and lib directories.</dd>
-
-
-<dt class="dlterm">/classes</dt>
-
-<dd>This directory is for servlets, utility classes, and the Java compiler
-output directory. The classes in this directory are used by the application
-class loader to load the classes. Folders in this directory will map package
-and class names, as in: <samp class="codeph">/WEB-INF/classes/com/mycorp/servlets/MyServlet.class</samp>.<p>Do
-not place any .class files directly into this directory. The .class files
-are placed in this directory automatically when the Java compiler
-compiles Java source files that are in the <span class="filepath">Java Resources</span> directory.
-Any files placed directly in this directory will be deleted by the Java compiler
-when it runs.</p>
-</dd>
-
-
-<dt class="dlterm">/lib</dt>
-
-<dd>The supporting JAR files that your Web application references. Any classes
-in .jar files placed in this directory will be available for your Web application</dd>
-
-
-<dt class="dlterm">Libraries</dt>
-
-<dd>The supporting JAR files that your Web application references. This folder
-mirrors the content of the lib folder. In addition, Web Library Projects,
-which are "virtual" JAR files that do not physically reside in the Web project,
-but are associated with Java projects elsewhere in your workspace,
-are included in this folder. They are packaged with your project when you
-export the application's WAR file.</dd>
-
-</dl>
- <div class="note"><span class="notetitle">Note:</span> A library entry on the Java build path will remain there unless
-the actual JAR file is deleted from the WEB-INF/lib folder. If you remove
-a library path entry but not the JAR file, the library entry will be re-added
-to the path automatically.</div>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwebresources.html" title="">Web resources</a></div>
-<div><a href="../topics/cwwarovr.html" title="">Web archive (WAR) files</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcreprj.html">Creating a dynamic Web project</a></div>
-<div><a href="../topics/tjcrejsp.html">Creating JavaServer Pages (JSP) files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita
deleted file mode 100644
index 4c043e0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="ccwebvw" xml:lang="en-us">

-<title>Project Explorer view and Web development</title>

-<prolog><metadata>

-<keywords><indexterm keyref="ccwebvw|1|ProjectExplorerviewoverview" status="new">Project

-Explorer view<indexterm>overview</indexterm></indexterm><indexterm keyref="ccwebvw|2|WebdevelopmentProjectExplorerview"

-status="changed">Web projects<indexterm>Project Explorer view</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<section><p>The Project Explorer view provides the following notable features: <ul>

-<li><image alt="For Windows" href="../images/nwin.gif" placement="inline">

-</image> You can drag and drop files from <tm tmclass="special" tmowner="Microsoft Corporation"

-tmtype="reg" trademark="Windows">Windows</tm> Explorer or the desktop into

-the Navigator view.</li>

-<li>View filtering is supported by selecting <ph><uicontrol>Filters</uicontrol></ph> from

-the Navigator view <ph><uicontrol>Menu</uicontrol></ph> button. Resources

-can be filtered by name, project type or content type. Files beginning with

-a period are filtered out by default.</li>

-<li>The status line shows the full path of the selected resource.</li>

-<li>Dragging a .java file from the Navigator view into a JSP file will insert

-a usebean tag, the same behavior that is exhibited when a .class file is dragged

-into a JSP file.</li>

-<li>Errors and warnings on resources (including <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm>, HTML/JSP, and Links Builder errors

-and warnings) are indicated with a red error <image alt="Error icon" href="../images/nshowerr.gif"

-placement="inline"></image> or yellow warning <image alt="Warning icon" href="../images/nwarning.gif"

-placement="inline"></image> next to the resource with the error, as well as

-the parent containers up to the project. This applies for all project types,

-not only Web projects.</li>

-<li>Items available from the <ph><uicontrol>New</uicontrol></ph> cascading

-menu in the project pop-up menu are context sensitive.  All menus will have <ph><uicontrol>Project</uicontrol></ph> and <ph><uicontrol>Other</uicontrol

-></ph> options.</li>

-</ul></p></section>

-<section><title>Organization of the Project Explorer view</title><p>The Project

-Explorer view shows a custom view of all Web projects. The following are some

-of the notable top-level objects that appear beneath the project node (based

-on default folder names).</p><p><b>Web content folder</b> - This folder contains

-items to be published to the server. By default, this folder will be named <b>WebContent</b> for

-newly created static and dynamic Web projects. <note>You can change the name

-in the creation wizard Web facet page.</note><ul>

-<li><b>META-INF</b> - This directory contains the <filepath>MANIFEST.MF</filepath> file,

-which is used to map class paths for dependent JAR files that exist in other

-projects in the same Enterprise Application project. An entry in this file

-will update the run-time project class path and <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build settings to include the referenced

-JAR files.</li>

-</ul><ul>

-<li><b>WEB-INF</b> - The directory where supporting Web resources for a Web

-application are kept (for example: .xmi files, .xml files, and web.xml.) </li>

-</ul> </p> </section>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
deleted file mode 100644
index abf57ac..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwebvw.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Project Explorer view and Web development" />
-<meta content="Project Explorer view, overview, Web projects, Project Explorer view" name="DC.subject" />
-<meta content="Project Explorer view, overview, Web projects, Project Explorer view" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccwebvw" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Project Explorer view and Web development</title>
-</head>
-<body id="ccwebvw"><a name="ccwebvw"><!-- --></a>
-
-
-<h1 class="topictitle1">Project Explorer view and Web development</h1>
-
-
-<div>
-<div class="section"><div class="p">The Project Explorer view provides the following notable features: <ul>
-<li><img src="../images/nwin.gif" alt="For Windows" /> You can drag and drop files from Windows<sup>®</sup> Explorer or the desktop into
-the Navigator view.</li>
-
-<li>View filtering is supported by selecting <span><span class="uicontrol">Filters</span></span> from
-the Navigator view <span><span class="uicontrol">Menu</span></span> button. Resources
-can be filtered by name, project type or content type. Files beginning with
-a period are filtered out by default.</li>
-
-<li>The status line shows the full path of the selected resource.</li>
-
-<li>Dragging a .java file from the Navigator view into a JSP file will insert
-a usebean tag, the same behavior that is exhibited when a .class file is dragged
-into a JSP file.</li>
-
-<li>Errors and warnings on resources (including Java™, HTML/JSP, and Links Builder errors
-and warnings) are indicated with a red error <img src="../images/nshowerr.gif" alt="Error icon" /> or yellow warning <img src="../images/nwarning.gif" alt="Warning icon" /> next to the resource with the error, as well as
-the parent containers up to the project. This applies for all project types,
-not only Web projects.</li>
-
-<li>Items available from the <span><span class="uicontrol">New</span></span> cascading
-menu in the project pop-up menu are context sensitive.  All menus will have <span><span class="uicontrol">Project</span></span> and <span><span class="uicontrol">Other</span></span> options.</li>
-
-</ul>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Organization of the Project Explorer view</h4><p>The Project
-Explorer view shows a custom view of all Web projects. The following are some
-of the notable top-level objects that appear beneath the project node (based
-on default folder names).</p>
-<div class="p"><strong>Web content folder</strong> - This folder contains
-items to be published to the server. By default, this folder will be named <strong>WebContent</strong> for
-newly created static and dynamic Web projects. <div class="note"><span class="notetitle">Note:</span> You can change the name
-in the creation wizard Web facet page.</div>
-<ul>
-<li><strong>META-INF</strong> - This directory contains the <span class="filepath">MANIFEST.MF</span> file,
-which is used to map class paths for dependent JAR files that exist in other
-projects in the same Enterprise Application project. An entry in this file
-will update the run-time project class path and Java build settings to include the referenced
-JAR files.</li>
-
-</ul>
-<ul>
-<li><strong>WEB-INF</strong> - The directory where supporting Web resources for a Web
-application are kept (for example: .xmi files, .xml files, and web.xml.) </li>
-
-</ul>
- </div>
- </div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.dita
deleted file mode 100644
index 880cc3a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.dita
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<!-- ArborText, Inc., 1988-2002, v.4002 -->

-<concept id="ccwtover" xml:lang="en-us">

-<title>Web application overview</title>

-<prolog><metadata>

-<keywords><indexterm>Web applications<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The Web development environment provides the tools you need to develop

-Web applications as defined in the <cite>Sun Microsystems <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite> and the <cite>Sun Microsystems JSP 1.2 Specification</cite>.

-Web applications can be simple (consisting of only static Web pages) or they

-can be more advanced and include JavaServer Pages (JSP) files and <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> servlets.

-These resources, along with an XML deployment descriptor (and other <xref

-href="cwebresources.dita" scope="peer"><desc></desc> Web resources</xref>, are contained

-within a Web project during development. When you are ready to publish the

-Web application to the Web, you deploy the Web project to the server in the

-form of a Web archive (WAR) file . The end user can then view the Web application

-as a Web site from a URL.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html b/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html
deleted file mode 100644
index d886e37..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/ccwtover.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web application overview" />
-<meta content="Web applications, overview" name="DC.subject" />
-<meta content="Web applications, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwtfeatures.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcreprj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjdetags.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwebartifact.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ccwtover" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web application overview</title>
-</head>
-<body id="ccwtover"><a name="ccwtover"><!-- --></a>
-
-
-<h1 class="topictitle1">Web application overview</h1>
-
-
-<div>
-<p>The Web development environment provides the tools you need to develop
-Web applications as defined in the <cite>Sun Microsystems Java™ Servlet
-2.3 Specification</cite> and the <cite>Sun Microsystems JSP 1.2 Specification</cite>.
-Web applications can be simple (consisting of only static Web pages) or they
-can be more advanced and include JavaServer Pages (JSP) files and Java servlets.
-These resources, along with an XML deployment descriptor (and other <a href="cwebresources.html" title="">Web resources</a>, are contained
-within a Web project during development. When you are ready to publish the
-Web application to the Web, you deploy the Web project to the server in the
-form of a Web archive (WAR) file . The end user can then view the Web application
-as a Web site from a URL.</p>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwtfeatures.html" title="The integrated Web development environment makes it easy to cooperatively create, assemble, publish, deploy and maintain dynamic, interactive Web applications.">Web tools features</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcreprj.html">Creating a dynamic Web project</a></div>
-<div><a href="../topics/tjdetags.html">Creating and editing Web pages - overview</a></div>
-<div><a href="../topics/cwebartifact.html">Creating Web Artifacts</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita
deleted file mode 100644
index d7224f0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cpdjsps" xml:lang="en-us">

-<title>JavaServer Pages (JSP) technology</title>

-<prolog><metadata>

-<keywords><indexterm keyref="cpdjsps|1|JSPpagesoverview" status="changed">JSP

-files<indexterm>overview</indexterm></indexterm><indexterm keyref="cpdjsps|2|Webcontentgeneratingdynamically"

-status="new">Web content<indexterm>generating dynamically</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The JavaServer Pages technology enables you to generate dynamic web content,

-such as HTML, DHTML, XHTML, and XML files, to include in a Web application.

-JSP files are one way to implement server-side dynamic page content. JSP files

-allow a Web server, such as Apache Tomcat, to add content dynamically to your

-HTML pages before they are sent to a requesting browser.</p>

-<p>When you deploy a JSP file to a Web server that provides a servlet engine,

-it is preprocessed into a servlet that runs on the Web server. This is in

-contrast with client-side <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> (within <codeph>&lt;SCRIPT></codeph> tags),

-which is run in a browser. A JSP page is ideal for tasks that are better suited

-to execution on the server, such as accessing databases or calling Enterprise <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans.</p>

-<p>You can create and edit a JSP file in the HTML editor by adding your own

-text and images using HTML, JSP tagging, or <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm>, including <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source

-code inside of scriptlet tags. Typically, JSP files have the file extension

-.jsp. Additionally, the JSP specification suggests that JSP fragment files

-should have file extension .jspf. If this convention is not followed, the

-JSP validator will treat JSP fragments as regular standalone JSP files, and

-compilation errors might be reported.</p>

-<p>The <cite>Sun Microsystems JSP 1.2 Specification</cite> provides the ability

-to create custom JSP tags. Custom tags simplify complex actions and  provide

-developers with greater control over page content. Custom tags are collected

-into a library (taglib). A tag library descriptor file (taglib.tld) is an

-XML document that provides information about the tag library, including the

-taglib short name, library description, and tag descriptions. Refer to the <cite>Sun

-Microsystems JSP 1.2 Specification</cite> for more details.</p>

-<p>To use JSP 1.2 custom taglibs, you can import the tag library .tld and

-.jar files into your project to use them, or associate them as Web Library

-projects. You can also reference a TLD file by using a URI.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
deleted file mode 100644
index 50dc629..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cpdjsps.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="JavaServer Pages (JSP) technology" />
-<meta content="JSP files, overview, Web content, generating dynamically" name="DC.subject" />
-<meta content="JSP files, overview, Web content, generating dynamically" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwservbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwlistbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwfiltbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcrejsp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cpdjsps" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>JavaServer Pages (JSP) technology</title>
-</head>
-<body id="cpdjsps"><a name="cpdjsps"><!-- --></a>
-
-
-<h1 class="topictitle1">JavaServer Pages (JSP) technology</h1>
-
-
-<div>
-<p>The JavaServer Pages technology enables you to generate dynamic web content,
-such as HTML, DHTML, XHTML, and XML files, to include in a Web application.
-JSP files are one way to implement server-side dynamic page content. JSP files
-allow a Web server, such as Apache Tomcat, to add content dynamically to your
-HTML pages before they are sent to a requesting browser.</p>
-
-<p>When you deploy a JSP file to a Web server that provides a servlet engine,
-it is preprocessed into a servlet that runs on the Web server. This is in
-contrast with client-side JavaScript™ (within <samp class="codeph">&lt;SCRIPT&gt;</samp> tags),
-which is run in a browser. A JSP page is ideal for tasks that are better suited
-to execution on the server, such as accessing databases or calling Enterprise Java™ beans.</p>
-
-<p>You can create and edit a JSP file in the HTML editor by adding your own
-text and images using HTML, JSP tagging, or JavaScript, including Java source
-code inside of scriptlet tags. Typically, JSP files have the file extension
-.jsp. Additionally, the JSP specification suggests that JSP fragment files
-should have file extension .jspf. If this convention is not followed, the
-JSP validator will treat JSP fragments as regular standalone JSP files, and
-compilation errors might be reported.</p>
-
-<p>The <cite>Sun Microsystems JSP 1.2 Specification</cite> provides the ability
-to create custom JSP tags. Custom tags simplify complex actions and  provide
-developers with greater control over page content. Custom tags are collected
-into a library (taglib). A tag library descriptor file (taglib.tld) is an
-XML document that provides information about the tag library, including the
-taglib short name, library description, and tag descriptions. Refer to the <cite>Sun
-Microsystems JSP 1.2 Specification</cite> for more details.</p>
-
-<p>To use JSP 1.2 custom taglibs, you can import the tag library .tld and
-.jar files into your project to use them, or associate them as Web Library
-projects. You can also reference a TLD file by using a URI.</p>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwservbn.html" title="">Servlets</a></div>
-<div><a href="../topics/cwlistbn.html" title="">Listeners</a></div>
-<div><a href="../topics/cwfiltbn.html" title="">Listeners</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjcrejsp.html">Creating JavaServer Pages (JSP) files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.dita
deleted file mode 100644
index 1b4bdaf..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.dita
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<!-- ArborText, Inc., 1988-2002, v.4002 -->

-<concept id="cwebartifact" xml:lang="en-us">

-<title>Creating Web Artifacts</title>

-<conbody>

-<p>Contents:</p>

-<ul>

-<li><xref href="twsrvwiz.dita" scope="peer"><desc></desc>Creating Servlets</xref></li>

-<li><xref href="twlstwiz.dita" scope="peer"><desc></desc>Creating Listeners</xref></li>

-<li><xref href="twfltwiz.dita" scope="peer"><desc></desc>Creating Filters</xref></li>

-</ul>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.html
deleted file mode 100644
index 0adf749..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebartifact.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Creating Web Artifacts" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwebartifact" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Web Artifacts</title>
-</head>
-<body id="cwebartifact"><a name="cwebartifact"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Web Artifacts</h1>
-
-<div>
-<p>Contents:</p>
-
-<ul>
-<li><a href="twsrvwiz.html" title="">Creating Servlets</a></li>
-
-<li><a href="twlstwiz.html" title="">Creating Listeners</a></li>
-
-<li><a href="twfltwiz.html" title="">Creating Filters</a></li>
-
-</ul>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.dita
deleted file mode 100644
index 3f1624f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.dita
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwebpagedesign" xml:lang="en-us">

-<title>Web page design</title>

-<prolog><metadata>

-<keywords><indexterm>Web page design<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Web pages are an integral part of every Web application. Each Web page

-should serve to help achieve the overall goal of the entire Web site.</p>

-<p> There are many types of Web pages, ranging from simple HTML pages that

-contain no dynamic elements, to advanced Java-based pages that make use of

-servlets, scripts, forms, or data access components.</p>

-<p>A few of the many items you should consider when designing your pages are

-markup language, links, images, and style sheets.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html
deleted file mode 100644
index b2e217f..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebpagedesign.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web page design" />
-<meta content="Web page design, overview" name="DC.subject" />
-<meta content="Web page design, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjdetags.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwebpagedesign" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web page design</title>
-</head>
-<body id="cwebpagedesign"><a name="cwebpagedesign"><!-- --></a>
-
-
-<h1 class="topictitle1">Web page design</h1>
-
-
-<div>
-<p>Web pages are an integral part of every Web application. Each Web page
-should serve to help achieve the overall goal of the entire Web site.</p>
-
-<p> There are many types of Web pages, ranging from simple HTML pages that
-contain no dynamic elements, to advanced Java-based pages that make use of
-servlets, scripts, forms, or data access components.</p>
-
-<p>A few of the many items you should consider when designing your pages are
-markup language, links, images, and style sheets.</p>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjdetags.html" title="">Creating and editing Web pages - overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.dita
deleted file mode 100644
index 4058610..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.dita
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwebprojects" xml:lang="en-us">

-<title>Web projects</title>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>overview</indexterm></indexterm>

-<indexterm>Web applications<indexterm>creating or importing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Web projects hold all of the Web resources that are created and used when

-developing your Web application. The first step to creating or importing a

-Web application is to create either a static or a dynamic Web project. Static

-Web projects are meant to contain only simple Web site resources, such as

-HTML files. Dynamic Web projects are used to structure Web applications that

-will use more complicated, dynamic Web technologies, such as JavaServer Pages

-files, and possibly data access resources.</p>

-<p>Though the Web project is structured on your file system in compliance

-with the Java EE Web application standard for deployment purposes, the Project

-Explorer view is designed to show the most convenient display of project resources

-for use while you are actually developing the Web application. When you are

-finished developing your Web application, you use the Web project to deploy

-the correct resources to the server. These resources will be packaged in a

-file called a Web archive, or WAR file.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html
deleted file mode 100644
index 09bfae2..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebprojects.html
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web projects" />
-<meta content="Web projects, overview, Web applications, creating or importing" name="DC.subject" />
-<meta content="Web projects, overview, Web applications, creating or importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccstatic.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwebprj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwwarovr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcresta.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcreprj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwebprojects" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web projects</title>
-</head>
-<body id="cwebprojects"><a name="cwebprojects"><!-- --></a>
-
-
-<h1 class="topictitle1">Web projects</h1>
-
-
-<div>
-<p>Web projects hold all of the Web resources that are created and used when
-developing your Web application. The first step to creating or importing a
-Web application is to create either a static or a dynamic Web project. Static
-Web projects are meant to contain only simple Web site resources, such as
-HTML files. Dynamic Web projects are used to structure Web applications that
-will use more complicated, dynamic Web technologies, such as JavaServer Pages
-files, and possibly data access resources.</p>
-
-<p>Though the Web project is structured on your file system in compliance
-with the Java EE Web application standard for deployment purposes, the Project
-Explorer view is designed to show the most convenient display of project resources
-for use while you are actually developing the Web application. When you are
-finished developing your Web application, you use the Web project to deploy
-the correct resources to the server. These resources will be packaged in a
-file called a Web archive, or WAR file.</p>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/ccstatic.html" title="">Static Web projects</a></div>
-<div><a href="../topics/ccwebprj.html" title="">Dynamic Web projects and applications</a></div>
-<div><a href="../topics/cwwarovr.html" title="">Web archive (WAR) files</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcresta.html">Creating a static Web project</a></div>
-<div><a href="../topics/twcreprj.html">Creating a dynamic Web project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.dita
deleted file mode 100644
index 05f8d71..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.dita
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwebresources" xml:lang="en-us">

-<title>Web resources</title>

-<prolog><metadata>

-<keywords><indexterm>Web resources<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>In most cases, all of the resources that you need to create for your Web

-application are developed during Web site or Web page design; however, there

-are additional resources that you may need to include in your Web project

-if you are using more advanced Web technologies in your application.</p>

-<p>These Web resources are not typical Web page files, and are often not the

-resources that you consider part of the final Web site. For example, tag libraries

-and <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> resources,

-such as JAR files, are resources you might need to include in your Web project. </p>

-<p>In fact, even the WAR file itself could be considered a Web resource, if

-you consider importing or exporting the resource.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html
deleted file mode 100644
index 1d3300b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwebresources.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web resources" />
-<meta content="Web resources, overview" name="DC.subject" />
-<meta content="Web resources, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwwarovr.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwebresources" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web resources</title>
-</head>
-<body id="cwebresources"><a name="cwebresources"><!-- --></a>
-
-
-<h1 class="topictitle1">Web resources</h1>
-
-
-<div>
-<p>In most cases, all of the resources that you need to create for your Web
-application are developed during Web site or Web page design; however, there
-are additional resources that you may need to include in your Web project
-if you are using more advanced Web technologies in your application.</p>
-
-<p>These Web resources are not typical Web page files, and are often not the
-resources that you consider part of the final Web site. For example, tag libraries
-and Java™ resources,
-such as JAR files, are resources you might need to include in your Web project. </p>
-
-<p>In fact, even the WAR file itself could be considered a Web resource, if
-you consider importing or exporting the resource.</p>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwwarovr.html" title="">Web archive (WAR) files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.dita
deleted file mode 100644
index 5cd875a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwfiltbn" xml:lang="en-us">

-<title>Listeners</title>

-<prolog><metadata>

-<keywords><indexterm>filters<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Filters are new in the <cite>Sun Microsystems Java Servlet

-2.3 Specification</cite>. They enable you to intercept to intercept a

-request before it reaches a resource. In other words, a filter gives you

-access to the HttpServletRequest and the HttpServletResponse objects

-before they are passed on to a servlet.</p>

-<p>Filters can be very useful. For example, you can write a filter

-that records all incoming requests and logs the IP addresses of the

-computers from which the requests originate. You also can use a filter

-as an encryption and decryption device. Other uses include user

-authentication, data compression, user input validation, and so on.</p>

-<p>You also can put a set of filters in a chain. The first filter in

-the chain will be called first and then pass control to the second

-filter, and so on. Filter chaining ensures that you can write a filter

-that does a specific task but adds some functionality in another filter.</p>

-<p>When writing a filter, you basically deal with the

-following three interfaces in the javax.servlet package:

-<ul>

-	<li><b>javax.servlet.Filter:</b> represents the

-	life-cycle of the filter.</li>

-	<li><b>javax.servlet.FilterConfig:</b> represents the

-	configuration of the filter.</li>

-	<li><b>javax.servlet.FilterChain:</b> object provided by

-	the servlet container to the developer giving a view into the

-	invocation chain of a filtered request for a resource.</li>

-</ul></p>

-<p>For more information about filters, refer to the <cite>Sun Microsystems <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite> at <codeph>java.sun.com/products/servlet/download.html</codeph>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.html
deleted file mode 100644
index 54a5228..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwfiltbn.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Listeners" />
-<meta content="filters, overview" name="DC.subject" />
-<meta content="filters, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwservbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwlistbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwtover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twsrvwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twlstwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twfltwiz.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwfiltbn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Listeners</title>
-</head>
-<body id="cwfiltbn"><a name="cwfiltbn"><!-- --></a>
-
-
-<h1 class="topictitle1">Listeners</h1>
-
-
-<div>
-<p>Filters are new in the <cite>Sun Microsystems Java Servlet
-2.3 Specification</cite>. They enable you to intercept to intercept a
-request before it reaches a resource. In other words, a filter gives you
-access to the HttpServletRequest and the HttpServletResponse objects
-before they are passed on to a servlet.</p>
-
-<p>Filters can be very useful. For example, you can write a filter
-that records all incoming requests and logs the IP addresses of the
-computers from which the requests originate. You also can use a filter
-as an encryption and decryption device. Other uses include user
-authentication, data compression, user input validation, and so on.</p>
-
-<p>You also can put a set of filters in a chain. The first filter in
-the chain will be called first and then pass control to the second
-filter, and so on. Filter chaining ensures that you can write a filter
-that does a specific task but adds some functionality in another filter.</p>
-
-<div class="p">When writing a filter, you basically deal with the
-following three interfaces in the javax.servlet package:
-<ul>
-	<li><strong>javax.servlet.Filter:</strong> represents the
-	life-cycle of the filter.</li>
-
-	<li><strong>javax.servlet.FilterConfig:</strong> represents the
-	configuration of the filter.</li>
-
-	<li><strong>javax.servlet.FilterChain:</strong> object provided by
-	the servlet container to the developer giving a view into the
-	invocation chain of a filtered request for a resource.</li>
-
-</ul>
-</div>
-
-<p>For more information about filters, refer to the <cite>Sun Microsystems Java™ Servlet
-2.3 Specification</cite> at <samp class="codeph">java.sun.com/products/servlet/download.html</samp>.</p>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwservbn.html" title="">Servlets</a></div>
-<div><a href="../topics/cwlistbn.html" title="">Listeners</a></div>
-<div><a href="../topics/ccwtover.html" title="">Web application overview</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twsrvwiz.html">Creating Servlets</a></div>
-<div><a href="../topics/twlstwiz.html">Creating Listeners</a></div>
-<div><a href="../topics/twfltwiz.html">Creating Filters</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.dita
deleted file mode 100644
index c7a5132..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwlistbn" xml:lang="en-us">

-<title>Listeners</title>

-<prolog><metadata>

-<keywords><indexterm>listeners<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>Listeners are new feature in the <cite>Sun

-Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> Servlet 2.3 Specification</cite>. A listener can be used to monitor and

-react to events in a servlet's life-cycle by defining methods that get

-invoked when life-cycle events occur. Support for application level

-events is defined in the Java Servlet Specification 2.3.</p>

-<p>Application event listeners are classes that

-implement one or more of the servlet event listener interfaces. Servlet

-event listeners support notification for state changes in the

-<b>ServletContext</b> and <b>HttpSession</b> objects, specifically:

-<ul>

-	<li><b>Servlet context listeners</b> are used to manage resources or state held at a VM

-	level for the application.</li>

-	<li><b>HTTP session	listeners</b> are used to manage state or resources associated with a

-	series of requests made in a Web application from the same client or

-	user.</li>

-</ul></p>

-<p>For more information about listeners, refer to the <cite>Sun Microsystems <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite> at <codeph>java.sun.com/products/servlet/download.html</codeph>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.html
deleted file mode 100644
index c21109d..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwlistbn.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Listeners" />
-<meta content="listeners, overview" name="DC.subject" />
-<meta content="listeners, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwservbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwfiltbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwtover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twsrvwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twlstwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twfltwiz.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwlistbn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Listeners</title>
-</head>
-<body id="cwlistbn"><a name="cwlistbn"><!-- --></a>
-
-
-<h1 class="topictitle1">Listeners</h1>
-
-
-<div>
-<p>Listeners are new feature in the <cite>Sun
-Microsystems Java™ Servlet 2.3 Specification</cite>. A listener can be used to monitor and
-react to events in a servlet's life-cycle by defining methods that get
-invoked when life-cycle events occur. Support for application level
-events is defined in the Java Servlet Specification 2.3.</p>
-
-<div class="p">Application event listeners are classes that
-implement one or more of the servlet event listener interfaces. Servlet
-event listeners support notification for state changes in the
-<strong>ServletContext</strong> and <strong>HttpSession</strong> objects, specifically:
-<ul>
-	<li><strong>Servlet context listeners</strong> are used to manage resources or state held at a VM
-	level for the application.</li>
-
-	<li><strong>HTTP session	listeners</strong> are used to manage state or resources associated with a
-	series of requests made in a Web application from the same client or
-	user.</li>
-
-</ul>
-</div>
-
-<p>For more information about listeners, refer to the <cite>Sun Microsystems Java Servlet
-2.3 Specification</cite> at <samp class="codeph">java.sun.com/products/servlet/download.html</samp>.</p>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwservbn.html" title="">Servlets</a></div>
-<div><a href="../topics/cwfiltbn.html" title="">Listeners</a></div>
-<div><a href="../topics/ccwtover.html" title="">Web application overview</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twsrvwiz.html">Creating Servlets</a></div>
-<div><a href="../topics/twlstwiz.html">Creating Listeners</a></div>
-<div><a href="../topics/twfltwiz.html">Creating Filters</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita
deleted file mode 100644
index 41b5813..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.dita
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwservbn" xml:lang="en-us">

-<title>Servlets</title>

-<prolog><metadata>

-<keywords><indexterm>servlets<indexterm>overview</indexterm></indexterm><indexterm>Web

-servers<indexterm>generating dynamic content</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>Servlets are server-side <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> programs that use the <cite>Sun Microsystems <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-API</cite> and its associated classes and methods, as defined in the <cite>Sun

-Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> Servlet 2.3 Specification</cite>. These <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> programs

-extend the functionality of a Web server by generating dynamic content and

-responding to Web client requests. When a browser sends a request to the server,

-the server can send the request information to a servlet, so that the servlet

-can construct the response that is sent back to the browser.</p>

-<p>Just as applets run on a Web browser and extend the browser's capabilities,

-servlets run on a Java-enabled Web server and extend the server's capabilities.

-Because of their flexibility and scalability, servlets are commonly used to

-enable businesses to connect databases to the Web.</p>

-<p>Although a servlet can be a completely self-contained program, you can

-split application development into two portions:  <ul>

-<li>The business logic (content generation), which governs the relationship

-between input, processing, and output</li>

-<li>The presentation logic (content presentation, or graphic design rules),

-which determines how information is presented to the user</li>

-</ul>Using this paradigm, you may choose to have business logic handled by <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> beans,

-the presentation logic handled by JavaServer Pages (JSP) or HTML files, and

-the HTTP protocol handled by a servlet.</p>

-<note>JSP files can be used to manage both the presentation and business logic

-for a Web application. JSP files use structured markup for presentation, and

-supply servlet model behavior at run time.</note>

-<p>You can develop, debug, and deploy servlets, set breakpoints within servlet

-objects, and step through code to make changes that are dynamically folded

-into the running servlet on a running server, without having to restart each

-time.</p>

-<p>For more information about servlets, refer to the <cite>Sun Microsystems <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet

-2.3 Specification</cite> at <codeph>java.sun.com/products/servlet/download.html</codeph>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
deleted file mode 100644
index a471e78..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwservbn.html
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Servlets" />
-<meta content="servlets, overview, Web servers, generating dynamic content" name="DC.subject" />
-<meta content="servlets, overview, Web servers, generating dynamic content" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwlistbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwfiltbn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwtover.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twsrvwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twlstwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twfltwiz.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwservbn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Servlets</title>
-</head>
-<body id="cwservbn"><a name="cwservbn"><!-- --></a>
-
-
-<h1 class="topictitle1">Servlets</h1>
-
-
-<div>
-<p>Servlets are server-side Java™ programs that use the <cite>Sun Microsystems Java Servlet
-API</cite> and its associated classes and methods, as defined in the <cite>Sun
-Microsystems Java Servlet 2.3 Specification</cite>. These Java programs
-extend the functionality of a Web server by generating dynamic content and
-responding to Web client requests. When a browser sends a request to the server,
-the server can send the request information to a servlet, so that the servlet
-can construct the response that is sent back to the browser.</p>
-
-<p>Just as applets run on a Web browser and extend the browser's capabilities,
-servlets run on a Java-enabled Web server and extend the server's capabilities.
-Because of their flexibility and scalability, servlets are commonly used to
-enable businesses to connect databases to the Web.</p>
-
-<div class="p">Although a servlet can be a completely self-contained program, you can
-split application development into two portions:  <ul>
-<li>The business logic (content generation), which governs the relationship
-between input, processing, and output</li>
-
-<li>The presentation logic (content presentation, or graphic design rules),
-which determines how information is presented to the user</li>
-
-</ul>
-Using this paradigm, you may choose to have business logic handled by Java beans,
-the presentation logic handled by JavaServer Pages (JSP) or HTML files, and
-the HTTP protocol handled by a servlet.</div>
-
-<div class="note"><span class="notetitle">Note:</span> JSP files can be used to manage both the presentation and business logic
-for a Web application. JSP files use structured markup for presentation, and
-supply servlet model behavior at run time.</div>
-
-<p>You can develop, debug, and deploy servlets, set breakpoints within servlet
-objects, and step through code to make changes that are dynamically folded
-into the running servlet on a running server, without having to restart each
-time.</p>
-
-<p>For more information about servlets, refer to the <cite>Sun Microsystems Java Servlet
-2.3 Specification</cite> at <samp class="codeph">java.sun.com/products/servlet/download.html</samp>.</p>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwlistbn.html" title="">Listeners</a></div>
-<div><a href="../topics/cwfiltbn.html" title="">Listeners</a></div>
-<div><a href="../topics/ccwtover.html" title="">Web application overview</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twsrvwiz.html">Creating Servlets</a></div>
-<div><a href="../topics/twlstwiz.html">Creating Listeners</a></div>
-<div><a href="../topics/twfltwiz.html">Creating Filters</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.dita
deleted file mode 100644
index a26e416..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<!-- ArborText, Inc., 1988-2002, v.4002 -->

-<concept id="cwtfeatures" xml:lang="en-us">

-<title>Web tools features</title>

-<shortdesc> The integrated Web development environment makes it easy to cooperatively

-create, assemble, publish, deploy and maintain dynamic, interactive Web applications.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>Web tools<indexterm>features</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The Web development environment provides the following high-level capabilities:

- <ul>

-<li>Dynamic Web project creation, using the Java EE-defined hierarchy, or

-a static version that reduces project overhead when dynamic elements are not

-required.  Static Web projects can later be converted to dynamic Web projects.<p></p></li>

-<li>Creation and editing of a Web application deployment descriptor (<filepath>web.xml</filepath>)

- file<p></p></li>

-<li>JSP and HTML file creation, validation, editing, and debugging<p></p></li>

-<li>An extensible view, called the Snippets view, which allows users to catalog

- and organize reusable programming objects, such as HTML, <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm>,

- and JSP markup, along with files and custom tags, that can be embedded in

- existing files<p></p></li>

-<li>Dynamic tag help (content assist) , which displays tag usage and attribute

-information for  HTML, JSP, and <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="JavaScript">JavaScript</tm> tags based on cursor location

- in the Source page. (You invoke Content Assist by pressing (Ctrl+Spacebar)

-)<p></p></li>

-<li>Cascading style sheet (CSS) editing support<p></p></li>

-<li>HTTP/FTP import<p></p></li>

-<li>FTP export (simple resource copy) to a server<p></p></li>

-<li>WAR file import, export, and validation<p></p></li>

-<li>Servlet creation, which employs the Servlet Wizard to create new servlets.<p></p></li>

-</ul></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
deleted file mode 100644
index 6532e5a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwtfeatures.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web tools features" />
-<meta name="abstract" content="The integrated Web development environment makes it easy to cooperatively create, assemble, publish, deploy and maintain dynamic, interactive Web applications." />
-<meta name="description" content="The integrated Web development environment makes it easy to cooperatively create, assemble, publish, deploy and maintain dynamic, interactive Web applications." />
-<meta content="Web tools, features" name="DC.subject" />
-<meta content="Web tools, features" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwebprj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwebpagedesign.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcreprj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcrejsp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twsrvwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twlstwiz.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twfltwiz.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwtfeatures" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web tools features</title>
-</head>
-<body id="cwtfeatures"><a name="cwtfeatures"><!-- --></a>
-
-
-<h1 class="topictitle1">Web tools features</h1>
-
-
-
-<div><p> The integrated Web development environment makes it easy to cooperatively
-create, assemble, publish, deploy and maintain dynamic, interactive Web applications.</p>
-
-<div class="p">The Web development environment provides the following high-level capabilities:
- <ul>
-<li>Dynamic Web project creation, using the Java EE-defined hierarchy, or
-a static version that reduces project overhead when dynamic elements are not
-required.  Static Web projects can later be converted to dynamic Web projects.<p />
-</li>
-
-<li>Creation and editing of a Web application deployment descriptor (<span class="filepath">web.xml</span>)
- file<p />
-</li>
-
-<li>JSP and HTML file creation, validation, editing, and debugging<p />
-</li>
-
-<li>An extensible view, called the Snippets view, which allows users to catalog
- and organize reusable programming objects, such as HTML, JavaScript™,
- and JSP markup, along with files and custom tags, that can be embedded in
- existing files<p />
-</li>
-
-<li>Dynamic tag help (content assist) , which displays tag usage and attribute
-information for  HTML, JSP, and JavaScript tags based on cursor location
- in the Source page. (You invoke Content Assist by pressing (Ctrl+Spacebar)
-)<p />
-</li>
-
-<li>Cascading style sheet (CSS) editing support<p />
-</li>
-
-<li>HTTP/FTP import<p />
-</li>
-
-<li>FTP export (simple resource copy) to a server<p />
-</li>
-
-<li>WAR file import, export, and validation<p />
-</li>
-
-<li>Servlet creation, which employs the Servlet Wizard to create new servlets.<p />
-</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/ccwebprj.html" title="">Dynamic Web projects and applications</a></div>
-<div><a href="../topics/cwebpagedesign.html" title="">Web page design</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcreprj.html">Creating a dynamic Web project</a></div>
-<div><a href="../topics/tjcrejsp.html">Creating JavaServer Pages (JSP) files</a></div>
-<div><a href="../topics/twsrvwiz.html">Creating Servlets</a></div>
-<div><a href="../topics/twlstwiz.html">Creating Listeners</a></div>
-<div><a href="../topics/twfltwiz.html">Creating Filters</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.dita
deleted file mode 100644
index 6f1adf5..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.dita
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwwarovr" xml:lang="en-us">

-<title>Web archive (WAR) files</title>

-<prolog><metadata>

-<keywords><indexterm>WAR files<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p> A Web application is a group of HTML pages, JSP pages, servlets, resources

-and source file, which can be managed as a single unit. A Web archive (WAR)

-file is a packaged Web application. WAR files can be used to import a Web

-application into a Web server.</p>

-<p>In addition to project resources, the WAR file includes a Web deployment

-descriptor file. The Web deployment descriptor is an XML file that contains

-deployment information, MIME types, session configuration details, and other

-settings for a Web application. The Web deployment descriptor file (<filepath>web.xml</filepath>)

-provides information about the WAR file is shared with the developers, assemblers,

-and deployers in a Java EE environment.</p>

-<p>The Web development environment provides facilities for importing and exporting

-WAR files, using the following wizards: <ul>

-<li><ph>Import Resources from a WAR File</ph>, which requires that you to

-specify a Web project. You can use existing projects or create them as you

-use the wizard.</li>

-<li><ph>Export Resources to a WAR File</ph>, which requires only an export

-location and some optional settings</li>

-</ul></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html
deleted file mode 100644
index d5b5d63..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwarovr.html
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Web archive (WAR) files" />
-<meta content="WAR files, overview" name="DC.subject" />
-<meta content="WAR files, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwebresources.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twimpwar.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcrewar.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwwarovr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Web archive (WAR) files</title>
-</head>
-<body id="cwwarovr"><a name="cwwarovr"><!-- --></a>
-
-
-<h1 class="topictitle1">Web archive (WAR) files</h1>
-
-
-<div>
-<p> A Web application is a group of HTML pages, JSP pages, servlets, resources
-and source file, which can be managed as a single unit. A Web archive (WAR)
-file is a packaged Web application. WAR files can be used to import a Web
-application into a Web server.</p>
-
-<p>In addition to project resources, the WAR file includes a Web deployment
-descriptor file. The Web deployment descriptor is an XML file that contains
-deployment information, MIME types, session configuration details, and other
-settings for a Web application. The Web deployment descriptor file (<span class="filepath">web.xml</span>)
-provides information about the WAR file is shared with the developers, assemblers,
-and deployers in a Java EE environment.</p>
-
-<div class="p">The Web development environment provides facilities for importing and exporting
-WAR files, using the following wizards: <ul>
-<li><span>Import Resources from a WAR File</span>, which requires that you to
-specify a Web project. You can use existing projects or create them as you
-use the wizard.</li>
-
-<li><span>Export Resources to a WAR File</span>, which requires only an export
-location and some optional settings</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwebresources.html" title="">Web resources</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twimpwar.html">Importing Web archive (WAR) files</a></div>
-<div><a href="../topics/twcrewar.html">Exporting Web Archive (WAR) files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita
deleted file mode 100644
index d3733dd..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.dita
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwwedtvw" xml:lang="en-us">

-<title>Workbench integration with Web editors</title>

-<prolog><metadata>

-<keywords><indexterm keyref="cwwedtvw|1|Webeditorsworkbenchintegration" status="changed">workbench<indexterm>Web

-editors</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>There are several editors for use in various contexts for various file

-types. To edit a file using its default editor, double-click on the file name

-in the Project Explorer view, or right-click on the file and select <uicontrol>Open</uicontrol>.

-The editor that is last used to open a file becomes the default for that particular

-file. To edit the file with a different editor, right-click on the file and

-select <uicontrol>Open With</uicontrol> to choose from a list of available

-editors.</p>

-<p>In the workbench, you can associate file-name extensions for different

-types of resources with various editors. A resource extension can have more

-than one editor associated with it; the last editor used for a particular

-extension type is indicated by a black dot before it in the <uicontrol>Open

-With</uicontrol> pop-up menu. You can associate extensions that are known

-to the workbench with additional editors, by using the <b>File Associations</b> preferences

-page, accessed by selecting <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Workbench</uicontrol><uicontrol>File Associations</uicontrol></menucascade>.</p>

-<p>The Properties view provides general capabilities that are advantageous

-to Web editor users. <dl><dlentry>

-<dt>Properties view</dt>

-<dd>The Properties view (<menucascade><uicontrol>Window</uicontrol><uicontrol>Show

-View</uicontrol><uicontrol>Properties</uicontrol></menucascade>) contains

-a list of attributes and editable attribute values. For example, when you

-select an image tag <uicontrol>img</uicontrol> , the width and height values

-appear for editing. In addition, any other attributes allowed by the standard

-specified in the DOCTYPE for the file (such as the HTML 4.0.1 DTD) are listed.

-When you click the value column of a property, you can select from among the

-list of available attribute values. <p>The pop-up menu in the Properties view

-enables you to undo, cut, copy, paste, delete, and select all. The options

-that are available at a given time depends on where the cursor is located

-when you right-click to display the pop-up menu. To see the pop-up menu that

-contains undo, cut, and so on, the property value field must be active. (This

-is accomplished by selecting the property and then selecting its value.) Otherwise,

-the pop-up menu will contain different options.</p> <p>Use the <uicontrol>Restore

-Default Value</uicontrol> button to change any value back to the default setting.</p> <p>After

-you are in the Properties view, you can modify other property values for specific

-tags. To edit another tag using the Properties view, move the cursor within

-the editing area of the Source page or Design page to the tag you want to

-edit. The appropriate properties and values are displayed in the Properties

-view.</p></dd>

-</dlentry></dl></p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html b/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
deleted file mode 100644
index a911f51..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/cwwedtvw.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Workbench integration with Web editors" />
-<meta content="workbench, Web editors" name="DC.subject" />
-<meta content="workbench, Web editors" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwwedtvw" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Workbench integration with Web editors</title>
-</head>
-<body id="cwwedtvw"><a name="cwwedtvw"><!-- --></a>
-
-
-<h1 class="topictitle1">Workbench integration with Web editors</h1>
-
-
-<div>
-<p>There are several editors for use in various contexts for various file
-types. To edit a file using its default editor, double-click on the file name
-in the Project Explorer view, or right-click on the file and select <span class="uicontrol">Open</span>.
-The editor that is last used to open a file becomes the default for that particular
-file. To edit the file with a different editor, right-click on the file and
-select <span class="uicontrol">Open With</span> to choose from a list of available
-editors.</p>
-
-<p>In the workbench, you can associate file-name extensions for different
-types of resources with various editors. A resource extension can have more
-than one editor associated with it; the last editor used for a particular
-extension type is indicated by a black dot before it in the <span class="uicontrol">Open
-With</span> pop-up menu. You can associate extensions that are known
-to the workbench with additional editors, by using the <strong>File Associations</strong> preferences
-page, accessed by selecting <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Workbench</span> &gt; <span class="uicontrol">File Associations</span></span>.</p>
-
-<div class="p">The Properties view provides general capabilities that are advantageous
-to Web editor users. <dl>
-<dt class="dlterm">Properties view</dt>
-
-<dd>The Properties view (<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Show
-View</span> &gt; <span class="uicontrol">Properties</span></span>) contains
-a list of attributes and editable attribute values. For example, when you
-select an image tag <span class="uicontrol">img</span> , the width and height values
-appear for editing. In addition, any other attributes allowed by the standard
-specified in the DOCTYPE for the file (such as the HTML 4.0.1 DTD) are listed.
-When you click the value column of a property, you can select from among the
-list of available attribute values. <p>The pop-up menu in the Properties view
-enables you to undo, cut, copy, paste, delete, and select all. The options
-that are available at a given time depends on where the cursor is located
-when you right-click to display the pop-up menu. To see the pop-up menu that
-contains undo, cut, and so on, the property value field must be active. (This
-is accomplished by selecting the property and then selecting its value.) Otherwise,
-the pop-up menu will contain different options.</p>
- <p>Use the <span class="uicontrol">Restore
-Default Value</span> button to change any value back to the default setting.</p>
- <p>After
-you are in the Properties view, you can modify other property values for specific
-tags. To edit another tag using the Properties view, move the cursor within
-the editing area of the Source page or Design page to the tag you want to
-edit. The appropriate properties and values are displayed in the Properties
-view.</p>
-</dd>
-
-</dl>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.dita
deleted file mode 100644
index c35c3f6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjchgxdt" xml:lang="en-us">

-<title>Specifying an implicit document type for an HTML, XHTML, or JSP fragment</title>

-<prolog><metadata>

-<keywords><indexterm>DOCTYPE declarations<indexterm>implicit for fragments</indexterm></indexterm>

-<indexterm>document types<indexterm>implicit for fragments</indexterm></indexterm>

-<indexterm>HTML fragments<indexterm>implicit document types</indexterm></indexterm>

-<indexterm>JSP fragments<indexterm>implicit document types</indexterm></indexterm>

-<indexterm>XHTML fragments<indexterm>implicit document type for fragments</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>An <i>implicit</i> document type is used for content assist (CTRL+Spacebar),

-the Properties view, and other editing contexts when no DOCTYPE declaration

-is specified in an HTML, XHTML, or JSP file. Typically, this feature is used

-for a fragment (partial document) that can be included in other pages using

-JSP include or server-side include.</p><p>To assign an implicit document type

-to an HTML, XHTML, or JSP fragment, do the following: </p> </context>

-<steps>

-<step><cmd>From the Project Explorer view, select the HTML, XHTML, or JSP

-fragment.</cmd></step>

-<step><cmd>Select <ph><uicontrol>Properties</uicontrol></ph> from the file's

-pop-up menu.</cmd></step>

-<step><cmd>In the <uicontrol>Web Content Settings</uicontrol> page, select

-the desired DOCTYPE from the <ph><uicontrol>Document type</uicontrol></ph> drop-down

-list.</cmd><info><p>The <ph><uicontrol>Properties</uicontrol></ph> dialog

-for Web projects also includes an <ph><uicontrol>Web Content Settings</uicontrol></ph> page,

-where you can specify project-default HTML document type. This setting will

-be used if no DOCTYPE declaration is specified in the file, and no default

-document type is specified in the <ph><uicontrol>Web Content Settings</uicontrol></ph> page

-on the <ph><uicontrol>Properties</uicontrol></ph> dialog for the file.</p></info>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html
deleted file mode 100644
index 4ecbf9a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjchgxdt.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Specifying an implicit document type for an HTML, XHTML, or JSP fragment" />
-<meta content="DOCTYPE declarations, implicit for fragments, document types, HTML fragments, implicit document types, JSP fragments, XHTML fragments, implicit document type for fragments" name="DC.subject" />
-<meta content="DOCTYPE declarations, implicit for fragments, document types, HTML fragments, implicit document types, JSP fragments, XHTML fragments, implicit document type for fragments" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjchgxdt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Specifying an implicit document type for an HTML, XHTML, or JSP fragment</title>
-</head>
-<body id="tjchgxdt"><a name="tjchgxdt"><!-- --></a>
-
-
-<h1 class="topictitle1">Specifying an implicit document type for an HTML, XHTML, or JSP fragment</h1>
-
-
-<div>
-<div class="section"> <p>An <em>implicit</em> document type is used for content assist (CTRL+Spacebar),
-the Properties view, and other editing contexts when no DOCTYPE declaration
-is specified in an HTML, XHTML, or JSP file. Typically, this feature is used
-for a fragment (partial document) that can be included in other pages using
-JSP include or server-side include.</p>
-<p>To assign an implicit document type
-to an HTML, XHTML, or JSP fragment, do the following: </p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>From the Project Explorer view, select the HTML, XHTML, or JSP
-fragment.</span></li>
-
-<li class="stepexpand"><span>Select <span><span class="uicontrol">Properties</span></span> from the file's
-pop-up menu.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Web Content Settings</span> page, select
-the desired DOCTYPE from the <span><span class="uicontrol">Document type</span></span> drop-down
-list.</span> <p>The <span><span class="uicontrol">Properties</span></span> dialog
-for Web projects also includes an <span><span class="uicontrol">Web Content Settings</span></span> page,
-where you can specify project-default HTML document type. This setting will
-be used if no DOCTYPE declaration is specified in the file, and no default
-document type is specified in the <span><span class="uicontrol">Web Content Settings</span></span> page
-on the <span><span class="uicontrol">Properties</span></span> dialog for the file.</p>
-
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.dita
deleted file mode 100644
index 516efe1..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjcrehtm" xml:lang="en-us">

-<title>Creating HTML and XHTML files and framesets</title>

-<shortdesc>You can use the New HTML File wizard to create HTML and XHTML files

-and framesets. </shortdesc>

-<prolog><metadata>

-<keywords>

-<indexterm>framesets<indexterm>creating</indexterm></indexterm>

-<indexterm>HTML<indexterm>creating files</indexterm></indexterm>

-<indexterm>WML<indexterm>creating files</indexterm></indexterm>

-<indexterm>XHTML<indexterm>creating files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> </context>

-<steps>

-<step><cmd>Create a static or a dynamic Web project if you have not already

-done so.</cmd></step>

-<step><cmd>In the Project Explorer, expand your project and right click on

-your WebContent folder or on a subfolder under WebContent.  </cmd><info>Note

-that if you choose any other folder in which to create the HTML file, then

-it will not be included in the WAR file that is deployed to the server. In

-addition, link validation will not encompass files that are not under the

-WebContent folder.</info></step>

-<step><cmd>From the context menu, select <menucascade><uicontrol>New</uicontrol>

-<uicontrol>Other</uicontrol><uicontrol>Web</uicontrol><uicontrol>HTML</uicontrol>

-</menucascade>.</cmd><stepresult>The New HTML Page window appears with your

-folder selected</stepresult></step>

-<step><cmd>Type a file name into the File name field, making sure you include

-an html extension (html, htm, xhtml, htpl, wml, shtml, or shtm) in the file

-name.</cmd></step>

-<step><cmd> You have several options for proceeding:</cmd>

-<choices>

-<choice>To accept the defaults associated with a new HTML file, select <uicontrol>Finish.</uicontrol></choice>

-<choice> To use a template file for the initial content of your HTML page,

-select <uicontrol>Next</uicontrol>. The Select HTML Template window appears.

-Select the <uicontrol>Use HTML Template</uicontrol> check box, and then select

-one of the sample templates. You can also select the <uicontrol>HTML Templates</uicontrol> link

-to add or remove HTML templates to your list of templates.</choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html
deleted file mode 100644
index e75e8f8..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrehtm.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating HTML and XHTML files and framesets" />
-<meta name="abstract" content="You can use the New HTML File wizard to create HTML and XHTML files and framesets." />
-<meta name="description" content="You can use the New HTML File wizard to create HTML and XHTML files and framesets." />
-<meta content="framesets, creating, HTML, creating files, WML, XHTML" name="DC.subject" />
-<meta content="framesets, creating, HTML, creating files, WML, XHTML" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjcrehtm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating HTML and XHTML files and framesets</title>
-</head>
-<body id="tjcrehtm"><a name="tjcrehtm"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating HTML and XHTML files and framesets</h1>
-
-
-
-<div><p>You can use the New HTML File wizard to create HTML and XHTML files
-and framesets. </p>
-
-<div class="section"> </div>
-
-<ol>
-<li class="stepexpand"><span>Create a static or a dynamic Web project if you have not already
-done so.</span></li>
-
-<li class="stepexpand"><span>In the Project Explorer, expand your project and right click on
-your WebContent folder or on a subfolder under WebContent.  </span> Note
-that if you choose any other folder in which to create the HTML file, then
-it will not be included in the WAR file that is deployed to the server. In
-addition, link validation will not encompass files that are not under the
-WebContent folder.</li>
-
-<li class="stepexpand"><span>From the context menu, select <span class="menucascade"><span class="uicontrol">New</span>
- &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Web</span> &gt; <span class="uicontrol">HTML</span>
-</span>.</span> The New HTML Page window appears with your
-folder selected</li>
-
-<li class="stepexpand"><span>Type a file name into the File name field, making sure you include
-an html extension (html, htm, xhtml, htpl, wml, shtml, or shtm) in the file
-name.</span></li>
-
-<li class="stepexpand"><span> You have several options for proceeding:</span>
-<ul>
-<li>To accept the defaults associated with a new HTML file, select <span class="uicontrol">Finish.</span></li>
-
-<li> To use a template file for the initial content of your HTML page,
-select <span class="uicontrol">Next</span>. The Select HTML Template window appears.
-Select the <span class="uicontrol">Use HTML Template</span> check box, and then select
-one of the sample templates. You can also select the <span class="uicontrol">HTML Templates</span> link
-to add or remove HTML templates to your list of templates.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.dita
deleted file mode 100644
index 5e75b31..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjcrejsp" xml:lang="en-us">

-<title>Creating JavaServer Pages (JSP) files</title>

-<prolog><metadata>

-<keywords><indexterm>JSP files<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>Most types of JSP files can be created using the New JSP File

-wizard. To create a basic JSP file using the wizard, complete the following

-steps: </p></context>

-<steps>

-<step><cmd>Create a dynamic Web project if you have not already done so.</cmd>

-</step>

-<step><cmd>In the Project Explorer, expand your project and right click on

-your WebContent folder or on a subfolder under WebContent.  Note that if you

-choose any other folder in which to create the JSP, then it will not be included

-in the WAR file that is deployed to the server. In addition, link validation

-will not encompass files that are not under the WebContent folder.</cmd></step>

-<step><cmd>From the context menu, select <menucascade><uicontrol>New</uicontrol>

-<uicontrol>JSP</uicontrol></menucascade>.</cmd><stepresult>The New Java Server

-Page window appears with your folder selected</stepresult></step>

-<step><cmd>Type a file name into the File name field, making sure you include

-the jsp extension (jsp, jsv, jtpl, or jspx) in the file name.</cmd></step>

-<step><cmd> You have several options for proceeding:</cmd>

-<choices>

-<choice>To accept the defaults associated with a new JSP file, select <uicontrol>Finish.</uicontrol></choice>

-<choice>To link to a file in the file system and specify path variables, select <uicontrol>Advanced</uicontrol> and

-then make your selections using the <uicontrol>Browse</uicontrol> and <uicontrol>Variables</uicontrol> buttons. </choice>

-<choice> To use a template file for the initial content of your JSP page,

-select <uicontrol>Next</uicontrol>. The Select JSP Template window appears.

-Select the <uicontrol>Use JSP Template</uicontrol> check box, and then select

-one of the sample templates. You can also select the <uicontrol>JSP Templates</uicontrol> link

-to add or remove JSP templates to your list of templates.</choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
deleted file mode 100644
index f037f4b..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjcrejsp.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating JavaServer Pages (JSP) files" />
-<meta content="JSP files, creating" name="DC.subject" />
-<meta content="JSP files, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcreprj.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cpdjsps.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjcrejsp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating JavaServer Pages (JSP) files</title>
-</head>
-<body id="tjcrejsp"><a name="tjcrejsp"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating JavaServer Pages (JSP) files</h1>
-
-
-<div>
-<div class="section"><p>Most types of JSP files can be created using the New JSP File
-wizard. To create a basic JSP file using the wizard, complete the following
-steps: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Create a dynamic Web project if you have not already done so.</span>
-</li>
-
-<li class="stepexpand"><span>In the Project Explorer, expand your project and right click on
-your WebContent folder or on a subfolder under WebContent.  Note that if you
-choose any other folder in which to create the JSP, then it will not be included
-in the WAR file that is deployed to the server. In addition, link validation
-will not encompass files that are not under the WebContent folder.</span></li>
-
-<li class="stepexpand"><span>From the context menu, select <span class="menucascade"><span class="uicontrol">New</span>
- &gt; <span class="uicontrol">JSP</span></span>.</span> The New Java Server
-Page window appears with your folder selected</li>
-
-<li class="stepexpand"><span>Type a file name into the File name field, making sure you include
-the jsp extension (jsp, jsv, jtpl, or jspx) in the file name.</span></li>
-
-<li class="stepexpand"><span> You have several options for proceeding:</span>
-<ul>
-<li>To accept the defaults associated with a new JSP file, select <span class="uicontrol">Finish.</span></li>
-
-<li>To link to a file in the file system and specify path variables, select <span class="uicontrol">Advanced</span> and
-then make your selections using the <span class="uicontrol">Browse</span> and <span class="uicontrol">Variables</span> buttons. </li>
-
-<li> To use a template file for the initial content of your JSP page,
-select <span class="uicontrol">Next</span>. The Select JSP Template window appears.
-Select the <span class="uicontrol">Use JSP Template</span> check box, and then select
-one of the sample templates. You can also select the <span class="uicontrol">JSP Templates</span> link
-to add or remove JSP templates to your list of templates.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cpdjsps.html">JavaServer Pages (JSP) technology</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcreprj.html" title="You create and maintain the resources for your Web applications in Web projects.">Creating a dynamic Web project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.dita
deleted file mode 100644
index deffb67..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.dita
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjdetags" xml:lang="en-us">

-<title>Creating and editing Web pages - overview</title>

-<prolog><metadata>

-<keywords><indexterm>Web pages<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>To aid in Web site development and editing, there is local tag

-hover help for all supported tag sets, as well as <xref href="../../org.eclipse.wst.sse.doc.user/topics/csrcedt006.dita"

-scope="peer"><desc></desc>content assist</xref> (Ctrl+Spacebar), a tool that

-helps you insert or finish a tag or function or finish a line of code in a

-structured text editor.</p><p> You can toggle among various viewing modes

-(which are determined by file type) to visually design pages, work with HTML, <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="JavaScript">JavaScript</tm> or

-JSP content, and preview your pages. To help you create the visual impact

-you want on your Web sites, the editor includes its own library of reusable

-graphics and two graphic programs for creating, editing, and animating image

-files. </p><note>Use either uppercase or lowercase alphanumeric characters

-consistently when naming HTML files and embedded files (such as image files)

-used in your Web pages, because some server operating systems are case sensitive.

-Do not use spaces or special characters such as exclamation points or question

-marks in file names.</note> </context>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html
deleted file mode 100644
index e14ff9c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjdetags.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating and editing Web pages - overview" />
-<meta content="Web pages, creating" name="DC.subject" />
-<meta content="Web pages, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwtover.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjdetags" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating and editing Web pages - overview</title>
-</head>
-<body id="tjdetags"><a name="tjdetags"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating and editing Web pages - overview</h1>
-
-
-<div>
-<div class="section"> <p>To aid in Web site development and editing, there is local tag
-hover help for all supported tag sets, as well as <a href="../../org.eclipse.wst.sse.doc.user/topics/csrcedt006.html" title="">content assist</a> (Ctrl+Spacebar), a tool that
-helps you insert or finish a tag or function or finish a line of code in a
-structured text editor.</p>
-<p> You can toggle among various viewing modes
-(which are determined by file type) to visually design pages, work with HTML, JavaScript™ or
-JSP content, and preview your pages. To help you create the visual impact
-you want on your Web sites, the editor includes its own library of reusable
-graphics and two graphic programs for creating, editing, and animating image
-files. </p>
-<div class="note"><span class="notetitle">Note:</span> Use either uppercase or lowercase alphanumeric characters
-consistently when naming HTML files and embedded files (such as image files)
-used in your Web pages, because some server operating systems are case sensitive.
-Do not use spaces or special characters such as exclamation points or question
-marks in file names.</div>
- </div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/ccwtover.html" title="">Web application overview</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita
deleted file mode 100644
index 02c73d4..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.dita
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tjprefs" xml:lang="en-us">

-<title>Defining HTML file preferences</title>

-<prolog><metadata>

-<keywords><indexterm keyref="tjprefs|1|DOCTYPEdeclarationsaddingautomatically"

-status="new">DOCTYPE declarations<indexterm>adding automatically</indexterm></indexterm>

-<indexterm keyref="tjprefs|2|HTMLfileseditingpreferences" status="changed">HTML<indexterm>editing

-preferences</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p><indexterm>DOCTYPE declarations<indexterm>adding automatically</indexterm></indexterm> <indexterm>HTML

-files<indexterm>editing preferences</indexterm></indexterm> To define general

-HTML file preferences, complete the following steps:</p></context>

-<steps>

-<step><cmd>From the <uicontrol>Window</uicontrol> menu, select <uicontrol>Preferences</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Preferences window, select <menucascade><uicontrol>Web and

-XML</uicontrol><uicontrol>HTML Files</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Specify the following settings related to saving an HTML source

-page. The defaults are recommended and should only be modified when there

-is a specific reason to do so. </cmd><info><dl><dlentry>

-<dt>Line delimiter</dt>

-<dd>Specify the appropriate EOL character for your environment. The default

-is <uicontrol>No translation</uicontrol>.</dd>

-</dlentry><dlentry>

-<dt>Add this suffix</dt>

-<dd>Specify a default suffix for files that you save. The default is <userinput>html</userinput>.</dd>

-</dlentry><dlentry>

-<dt>Encoding, IANA, (Use workbench default)</dt>

-<dd>Specify the default encoding (code page) for files that you create. The

-default is the Workbench's encoding preference. </dd>

-</dlentry><dlentry>

-<dt>Insert DOCTYPE declaration</dt>

-<dd>Optionally, you can automatically add a DOCTYPE declaration to HTML files.

-The default DOCTYPE is determined when you create an HTML file or a JSP file

-using a wizard. If you add the DOCTYPE declaration, you should include at

-least a Public ID specification, and, optionally, a System ID.</dd>

-</dlentry><dlentry>

-<dt>Insert GENERATOR with META tag</dt>

-<dd>Optionally, select the check box to specify GENERATOR in a META tag in

-the HTML file header.</dd>

-</dlentry><dlentry>

-<dt>Loading files</dt>

-<dd>Specify the default encoding (code page) for files that you open. The

-default is the Workbench's encoding preference. Deselect the <uicontrol>Use

-workbench default</uicontrol> check box to select another encoding.   <note>Encoding

-detection (when loading files) is performed in the following order:   <ul>

-<li>Locate the encoding name embedded in the document.</li>

-<li>When no encoding is embedded in the document, an automatic encoding detector

-attempts to determine encoding used in the document.</li>

-<li>If the encoding still cannot be determined, the encoding defined in the <uicontrol>Encoding</uicontrol> field

-is used.</li>

-</ul> </note> </dd>

-</dlentry></dl> </info></step>

-<step><cmd>Click <uicontrol>Apply</uicontrol> then <uicontrol>OK</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
deleted file mode 100644
index 772f123..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tjprefs.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining HTML file preferences" />
-<meta content="DOCTYPE declarations, adding automatically, HTML, editing preferences" name="DC.subject" />
-<meta content="DOCTYPE declarations, adding automatically, HTML, editing preferences" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tjprefs" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining HTML file preferences</title>
-</head>
-<body id="tjprefs"><a name="tjprefs"><!-- --></a>
-
-
-<h1 class="topictitle1">Defining HTML file preferences</h1>
-
-
-<div>
-<div class="section"> <p>  To define general
-HTML file preferences, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>From the <span class="uicontrol">Window</span> menu, select <span class="uicontrol">Preferences</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Preferences window, select <span class="menucascade"><span class="uicontrol">Web and
-XML</span> &gt; <span class="uicontrol">HTML Files</span></span>.</span></li>
-
-<li class="stepexpand"><span>Specify the following settings related to saving an HTML source
-page. The defaults are recommended and should only be modified when there
-is a specific reason to do so. </span> <dl>
-<dt class="dlterm">Line delimiter</dt>
-
-<dd>Specify the appropriate EOL character for your environment. The default
-is <span class="uicontrol">No translation</span>.</dd>
-
-
-<dt class="dlterm">Add this suffix</dt>
-
-<dd>Specify a default suffix for files that you save. The default is <kbd class="userinput">html</kbd>.</dd>
-
-
-<dt class="dlterm">Encoding, IANA, (Use workbench default)</dt>
-
-<dd>Specify the default encoding (code page) for files that you create. The
-default is the Workbench's encoding preference. </dd>
-
-
-<dt class="dlterm">Insert DOCTYPE declaration</dt>
-
-<dd>Optionally, you can automatically add a DOCTYPE declaration to HTML files.
-The default DOCTYPE is determined when you create an HTML file or a JSP file
-using a wizard. If you add the DOCTYPE declaration, you should include at
-least a Public ID specification, and, optionally, a System ID.</dd>
-
-
-<dt class="dlterm">Insert GENERATOR with META tag</dt>
-
-<dd>Optionally, select the check box to specify GENERATOR in a META tag in
-the HTML file header.</dd>
-
-
-<dt class="dlterm">Loading files</dt>
-
-<dd>Specify the default encoding (code page) for files that you open. The
-default is the Workbench's encoding preference. Deselect the <span class="uicontrol">Use
-workbench default</span> check box to select another encoding.   <div class="note"><span class="notetitle">Note:</span> Encoding
-detection (when loading files) is performed in the following order:   <ul>
-<li>Locate the encoding name embedded in the document.</li>
-
-<li>When no encoding is embedded in the document, an automatic encoding detector
-attempts to determine encoding used in the document.</li>
-
-<li>If the encoding still cannot be determined, the encoding defined in the <span class="uicontrol">Encoding</span> field
-is used.</li>
-
-</ul>
- </div>
- </dd>
-
-</dl>
- </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.dita
deleted file mode 100644
index 9671718..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.dita
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="tservertarget" xml:lang="en-us">

-<title>Server targeting for Web applications</title>

-<prolog><metadata>

-<keywords><indexterm>servers<indexterm>targeting</indexterm></indexterm><indexterm>Web

-applications<indexterm>server targeting</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>To support different Java EE application servers, the Java EE tooling allows

-you to target a specific server during your Enterprise Application (EAR) project

-development. In most cases, a Web project must target the same server as the

-EAR project in order to deploy the Web application to the server properly. </p>

-<p>After you have a Web project created, you can modify the target server

-using the project's properties dialog. To do this, right-click on the project

-in the Project Explorer view, and select <menucascade><uicontrol>Properties</uicontrol>

-<uicontrol>Server</uicontrol></menucascade>.</p>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html
deleted file mode 100644
index 808fc08..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tservertarget.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Server targeting for Web applications" />
-<meta content="servers, targeting, Web applications, server targeting" name="DC.subject" />
-<meta content="servers, targeting, Web applications, server targeting" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcreprj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tservertarget" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Server targeting for Web applications</title>
-</head>
-<body id="tservertarget"><a name="tservertarget"><!-- --></a>
-
-
-<h1 class="topictitle1">Server targeting for Web applications</h1>
-
-
-<div>
-<p>To support different Java EE application servers, the Java EE tooling allows
-you to target a specific server during your Enterprise Application (EAR) project
-development. In most cases, a Web project must target the same server as the
-EAR project in order to deploy the Web application to the server properly. </p>
-
-<p>After you have a Web project created, you can modify the target server
-using the project's properties dialog. To do this, right-click on the project
-in the Project Explorer view, and select <span class="menucascade"><span class="uicontrol">Properties</span>
- &gt; <span class="uicontrol">Server</span></span>.</p>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcreprj.html" title="You create and maintain the resources for your Web applications in Web projects.">Creating a dynamic Web project</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.dita
deleted file mode 100644
index bef37e2..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tstylesheet" xml:lang="en-us">

-<title>Creating cascading style sheets</title>

-<shortdesc>Cascading style sheets enable you to define a consistent look and

-feel throughout your Web site by maintaining the contents (Web pages) and

-the design (the style sheet) separately.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>style sheets<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To create a new cascading style sheet:</context>

-<steps>

-<step><cmd>Create a static or a dynamic Web project if you have not already

-done so.</cmd></step>

-<step><cmd>In the Project Explorer, expand your project and right click on

-your WebContent folder or on a subfolder under WebContent.  </cmd><info>Note

-that if you choose any other folder in which to create the CSS file, then

-it will not be included in the WAR file that is deployed to the server. </info>

-</step>

-<step><cmd>From the context menu, select <menucascade><uicontrol>New</uicontrol>

-<uicontrol>Other</uicontrol><uicontrol>Web</uicontrol><uicontrol>CSS</uicontrol>

-</menucascade>.</cmd><stepresult>The New Cascading Style Sheet window appears

-with your folder selected</stepresult></step>

-<step><cmd>Type a file name into the File name field, making sure you include

-a css extension in the file name.</cmd></step>

-<step><cmd> You have several options for proceeding:</cmd>

-<choices>

-<choice>To accept the defaults associated with a new CSS file, select <uicontrol>Finish.</uicontrol></choice>

-<choice> To use a template file for the initial content of your CSS file,

-select <uicontrol>Next</uicontrol>. The Select CSS Template window appears.

-Select the <uicontrol>Use CSS Template</uicontrol> check box, and then select

-one of the sample templates. You can also select the <uicontrol>CSS Templates</uicontrol> link

-to add or remove HTML templates to your list of templates.</choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html b/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html
deleted file mode 100644
index 46f0a0c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/tstylesheet.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating cascading style sheets" />
-<meta name="abstract" content="Cascading style sheets enable you to define a consistent look and feel throughout your Web site by maintaining the contents (Web pages) and the design (the style sheet) separately." />
-<meta name="description" content="Cascading style sheets enable you to define a consistent look and feel throughout your Web site by maintaining the contents (Web pages) and the design (the style sheet) separately." />
-<meta content="style sheets, creating" name="DC.subject" />
-<meta content="style sheets, creating" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tstylesheet" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating cascading style sheets</title>
-</head>
-<body id="tstylesheet"><a name="tstylesheet"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating cascading style sheets</h1>
-
-
-
-<div><p>Cascading style sheets enable you to define a consistent look and
-feel throughout your Web site by maintaining the contents (Web pages) and
-the design (the style sheet) separately.</p>
-
-<div class="section">To create a new cascading style sheet:</div>
-
-<ol>
-<li class="stepexpand"><span>Create a static or a dynamic Web project if you have not already
-done so.</span></li>
-
-<li class="stepexpand"><span>In the Project Explorer, expand your project and right click on
-your WebContent folder or on a subfolder under WebContent.  </span> Note
-that if you choose any other folder in which to create the CSS file, then
-it will not be included in the WAR file that is deployed to the server. 
-</li>
-
-<li class="stepexpand"><span>From the context menu, select <span class="menucascade"><span class="uicontrol">New</span>
- &gt; <span class="uicontrol">Other</span> &gt; <span class="uicontrol">Web</span> &gt; <span class="uicontrol">CSS</span>
-</span>.</span> The New Cascading Style Sheet window appears
-with your folder selected</li>
-
-<li class="stepexpand"><span>Type a file name into the File name field, making sure you include
-a css extension in the file name.</span></li>
-
-<li class="stepexpand"><span> You have several options for proceeding:</span>
-<ul>
-<li>To accept the defaults associated with a new CSS file, select <span class="uicontrol">Finish.</span></li>
-
-<li> To use a template file for the initial content of your CSS file,
-select <span class="uicontrol">Next</span>. The Select CSS Template window appears.
-Select the <span class="uicontrol">Use CSS Template</span> check box, and then select
-one of the sample templates. You can also select the <span class="uicontrol">CSS Templates</span> link
-to add or remove HTML templates to your list of templates.</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.dita
deleted file mode 100644
index 7cc3b3a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.dita
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<!-- ArborText, Inc., 1988-2002, v.4002-->

-<task id="twcreprj" xml:lang="en-us">

-<title>Creating a dynamic Web project</title>

-<shortdesc>You create and maintain the resources for your Web applications

-in Web projects.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>creating dynamic projects</indexterm></indexterm>

-<indexterm>Web applications<indexterm>resources</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p> Unlike with <xref href="twcresta.dita" scope="peer"><desc></desc>static</xref> Web

-projects,  dynamic Web projects enable you to create resources such as JavaServer

-Pages and servlets.</p><p>To create a new dynamic Web project, complete the

-following steps:</p></context>

-<steps>

-<step><cmd>Open the Java EE perspective.</cmd></step>

-<step><cmd>In the Project Explorer, right click on Dynamic Web Projects, and

-select <menucascade><uicontrol>New</uicontrol><uicontrol>Dynamic Web Project</uicontrol>

-</menucascade> from the context menu. The New Dynamic Web Project wizard starts.</cmd>

-</step>

-<step><cmd>Follow the project wizard prompts.</cmd></step>

-</steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<dt>Project Facets </dt>

-<dd>A facet represents a unit of functionality in a Web project. For example,

-the Dynamic Web Module facet enables the project to be deployed as a dynamic

-Web module. A brief description of a project facet appears in the wizard when

-you select it.  Note that in many instances, you can view the constraints

-for a project facet by right clicking on the facet and selecting project constraints

-from the pop up menu.  </dd>

-</dlentry><dlentry>

-<dt>Target Runtime</dt>

-<dd>Use this field to define a new installed runtime environment. Runtimes

-are used at build time to compile projects.</dd>

-</dlentry><dlentry>

-<dt>Enterprise Application project (EAR Project)</dt>

-<dd>A new or existing Enterprise Application project (EAR Project) must be

-associated with your new Web project to facilitate deployment. If you want

-to override the default settings for the Enterprise Application project, you

-can do so using the wizard. When your Web project is created at the end of

-the wizard, the new Enterprise Application project is also created with the

-name specified in the EAR project field. Note that the default is the name

-of the web project appended with EAR (unless the ear project was selected

-when you opened the wizard.)</dd>

-</dlentry><dlentry>

-<dt>Context Root</dt>

-<dd>The context root is the Web application root, which is the top-level directory

-of your application when it is deployed to the Web server. You can change

-the context root after you create a project using the project Properties dialog,

-which you access from the project's pop-up menu. The context root can also

-be used by the links builder to ensure that your links remain ready to publish

-as you move and rename files inside your project.</dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
deleted file mode 100644
index 07ae7d1..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcreprj.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a dynamic Web project" />
-<meta name="abstract" content="You create and maintain the resources for your Web applications in Web projects." />
-<meta name="description" content="You create and maintain the resources for your Web applications in Web projects." />
-<meta content="Web projects, creating dynamic projects, Web applications, resources" name="DC.subject" />
-<meta content="Web projects, creating dynamic projects, Web applications, resources" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tjcrejsp.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccstatic.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwebprj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcreprj" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a dynamic Web project</title>
-</head>
-<body id="twcreprj"><a name="twcreprj"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a dynamic Web project</h1>
-
-
-
-<div><p>You create and maintain the resources for your Web applications
-in Web projects.</p>
-
-<div class="section"> <p> Unlike with <a href="twcresta.html" title="">static</a> Web
-projects,  dynamic Web projects enable you to create resources such as JavaServer
-Pages and servlets.</p>
-<p>To create a new dynamic Web project, complete the
-following steps:</p>
-</div>
-
-<ol>
-<li><span>Open the Java EE perspective.</span></li>
-
-<li><span>In the Project Explorer, right click on Dynamic Web Projects, and
-select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Dynamic Web Project</span>
-</span> from the context menu. The New Dynamic Web Project wizard starts.</span>
-</li>
-
-<li><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">Project Facets </dt>
-
-<dd>A facet represents a unit of functionality in a Web project. For example,
-the Dynamic Web Module facet enables the project to be deployed as a dynamic
-Web module. A brief description of a project facet appears in the wizard when
-you select it.  Note that in many instances, you can view the constraints
-for a project facet by right clicking on the facet and selecting project constraints
-from the pop up menu.  </dd>
-
-
-<dt class="dlterm">Target Runtime</dt>
-
-<dd>Use this field to define a new installed runtime environment. Runtimes
-are used at build time to compile projects.</dd>
-
-
-<dt class="dlterm">Enterprise Application project (EAR Project)</dt>
-
-<dd>A new or existing Enterprise Application project (EAR Project) must be
-associated with your new Web project to facilitate deployment. If you want
-to override the default settings for the Enterprise Application project, you
-can do so using the wizard. When your Web project is created at the end of
-the wizard, the new Enterprise Application project is also created with the
-name specified in the EAR project field. Note that the default is the name
-of the web project appended with EAR (unless the ear project was selected
-when you opened the wizard.)</dd>
-
-
-<dt class="dlterm">Context Root</dt>
-
-<dd>The context root is the Web application root, which is the top-level directory
-of your application when it is deployed to the Web server. You can change
-the context root after you create a project using the project Properties dialog,
-which you access from the project's pop-up menu. The context root can also
-be used by the links builder to ensure that your links remain ready to publish
-as you move and rename files inside your project.</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/ccstatic.html">Static Web projects</a></div>
-<div><a href="../topics/ccwebprj.html">Dynamic Web projects and applications</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tjcrejsp.html" title="">Creating JavaServer Pages (JSP) files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.dita
deleted file mode 100644
index 8be5130..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.dita
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twcresta" xml:lang="en-us">

-<title>Creating a static Web project</title>

-<shortdesc></shortdesc>

-<prolog><metadata>

-<keywords><indexterm>static Web projects<indexterm>creating</indexterm></indexterm>

-<indexterm>Web projects<indexterm>creating static</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> In the workbench, you create and maintain resources for Web applications

-in Web projects. If you want to create a static, content-based Web application

-that contains no dynamic elements, such as JSP files or servlets, use the <ph><uicontrol>New

-Static Web Project</uicontrol></ph> wizard. </p><p>To create a new static

-Web project, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open the Java EE perspective </cmd><info></info></step>

-<step><cmd>In the Project Explorer, right click on Other Projects and select <b>New->Other->Web->Static

-Web Project</b> from the context menu. The New Static Web Project wizard starts. </cmd>

-</step>

-<step><cmd>Follow the project wizard prompts</cmd><info></info></step>

-</steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<dt>Project Facets </dt>

-<dd>A facet represents a unit of functionality in a Web project. For example,

-the Static Web Module facet enables the project to be deployed as a static

-Web module. A brief description of a project facet appears in the wizard when

-you select it.  Note that in many instances, you can view the constraints

-for a project facet by right clicking on the facet and selecting project constraints

-from the pop up menu.  </dd>

-</dlentry><dlentry>

-<dt>Target Runtime</dt>

-<dd>Use this field to define a new installed runtime environment. Runtimes

-are used at build time to compile projects. </dd>

-</dlentry></dl><dl><dlentry>

-<dt>Web Content Folder</dt>

-<dd>The folder in which you want to store your publishable resources. </dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
deleted file mode 100644
index dd9af08..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcresta.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating a static Web project" />
-<meta name="abstract" content="" />
-<meta name="description" content="" />
-<meta content="static Web projects, creating, Web projects, creating static" name="DC.subject" />
-<meta content="static Web projects, creating, Web projects, creating static" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccstatic.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcresta" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating a static Web project</title>
-</head>
-<body id="twcresta"><a name="twcresta"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating a static Web project</h1>
-
-
-
-<div><p />
-
-<div class="section"><p> In the workbench, you create and maintain resources for Web applications
-in Web projects. If you want to create a static, content-based Web application
-that contains no dynamic elements, such as JSP files or servlets, use the <span><span class="uicontrol">New
-Static Web Project</span></span> wizard. </p>
-<p>To create a new static
-Web project, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the Java EE perspective </span> </li>
-
-<li class="stepexpand"><span>In the Project Explorer, right click on Other Projects and select <strong>New-&gt;Other-&gt;Web-&gt;Static
-Web Project</strong> from the context menu. The New Static Web Project wizard starts. </span>
-</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts</span> </li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">Project Facets </dt>
-
-<dd>A facet represents a unit of functionality in a Web project. For example,
-the Static Web Module facet enables the project to be deployed as a static
-Web module. A brief description of a project facet appears in the wizard when
-you select it.  Note that in many instances, you can view the constraints
-for a project facet by right clicking on the facet and selecting project constraints
-from the pop up menu.  </dd>
-
-
-<dt class="dlterm">Target Runtime</dt>
-
-<dd>Use this field to define a new installed runtime environment. Runtimes
-are used at build time to compile projects. </dd>
-
-</dl>
-<dl>
-<dt class="dlterm">Web Content Folder</dt>
-
-<dd>The folder in which you want to store your publishable resources. </dd>
-
-</dl>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/ccstatic.html">Static Web projects</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.dita
deleted file mode 100644
index 86699ab..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twcrewar" xml:lang="en-us">

-<title>Exporting Web Archive (WAR) files</title>

-<prolog><metadata>

-<keywords><indexterm>exporting<indexterm>WAR files</indexterm></indexterm>

-<indexterm>WAR files<indexterm>exporting</indexterm></indexterm>

-<indexterm>Web projects<indexterm>exporting WAR files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p> A Web archive (WAR) file is a packaged Web application that

-can be exported to test, publish, and deploy the resources developed within

-a Web project.</p><p>To export a WAR file from a Web project, do the following: </p></context>

-<steps>

-<step><cmd>Right click on a Web project folder and select <b>Export</b> from

-the pop-up menu. Then select<b> WAR file</b> in the Export window and then

-select <b>Next</b>.</cmd></step>

-<step><cmd>Specify the Web project you want to export (this field is primed

-if you used the pop-up menu to open the wizard), and specify a location for

-the new WAR file</cmd></step>

-<step importance="optional"><cmd>Optionally, supply WAR export <ph>Options</ph>,

-such as whether or not to include <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> source files in the WAR, and whether

-to overwrite any existing resources during the export process. </cmd><info>Source

-files are not usually included in a WAR file, because they are not necessary

-for the server to run the web application.</info></step>

-<step><cmd>Click <ph><uicontrol>Finish</uicontrol></ph>.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html
deleted file mode 100644
index a3a6576..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcrewar.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Exporting Web Archive (WAR) files" />
-<meta content="exporting, WAR files, Web projects, exporting WAR files" name="DC.subject" />
-<meta content="exporting, WAR files, Web projects, exporting WAR files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwwarovr.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcrewar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Exporting Web Archive (WAR) files</title>
-</head>
-<body id="twcrewar"><a name="twcrewar"><!-- --></a>
-
-
-<h1 class="topictitle1">Exporting Web Archive (WAR) files</h1>
-
-
-<div>
-<div class="section"> <p> A Web archive (WAR) file is a packaged Web application that
-can be exported to test, publish, and deploy the resources developed within
-a Web project.</p>
-<p>To export a WAR file from a Web project, do the following: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Right click on a Web project folder and select <strong>Export</strong> from
-the pop-up menu. Then select<strong> WAR file</strong> in the Export window and then
-select <strong>Next</strong>.</span></li>
-
-<li class="stepexpand"><span>Specify the Web project you want to export (this field is primed
-if you used the pop-up menu to open the wizard), and specify a location for
-the new WAR file</span></li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Optionally, supply WAR export <span>Options</span>,
-such as whether or not to include Java™ source files in the WAR, and whether
-to overwrite any existing resources during the export process. </span> Source
-files are not usually included in a WAR file, because they are not necessary
-for the server to run the web application.</li>
-
-<li class="stepexpand"><span>Click <span><span class="uicontrol">Finish</span></span>.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwwarovr.html">Web archive (WAR) files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.dita
deleted file mode 100644
index 66cfcc8..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.dita
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twcvsr" xml:lang="en-us">

-<title>Setting CVS repository defaults</title>

-<prolog><metadata>

-<keywords><indexterm>build output folders<indexterm>ignoring in CVS</indexterm></indexterm>

-<indexterm>CVS<indexterm>setting repository defaults</indexterm></indexterm>

-<indexterm>cvsignore files<indexterm>creating</indexterm></indexterm>

-<indexterm>repositories<indexterm>default CVS settings</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>When you use a CVS repository during team development, you might

-want to use the following setup to ensure that the CVS versioning support

-ignores the project's build output folder:</p> </context>

-<steps>

-<step><cmd>Create a file called .cvsignore in your project's <filepath>WebContent/WEB-INF</filepath> folder.</cmd>

-</step>

-<step><cmd>In this file, add a line with the name of the build output folder

-(for example, <codeph>classes</codeph>).</cmd><info><p>Currently, you have

-the option of creating this file automatically (as a feature) when using the

-New Dynamic Web Project wizard.</p><p>When you synchronize with a CVS team

-stream, the output folder will be ignored.</p></info></step>

-<step><cmd>In addition, you should turn off the <ph><uicontrol>Prune empty

-directories</uicontrol></ph> option. Select <ph><menucascade><uicontrol>Windows</uicontrol>

-<uicontrol>Preferences</uicontrol></menucascade></ph>, switch to the <ph><menucascade>

-<uicontrol>Team</uicontrol><uicontrol>CVS</uicontrol></menucascade></ph> properties

-page, and ensure that the <ph><uicontrol>Prune empty directories</uicontrol></ph> check

-box is not checked.</cmd><info><p>If this option is enabled and your Web project's

-source directory is empty, it will be deleted when the project is added to

-your workspace from a CVS repository, causing a <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build error.</p></info></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html
deleted file mode 100644
index 236e52e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twcvsr.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting CVS repository defaults" />
-<meta content="build output folders, ignoring in CVS, CVS, setting repository defaults, cvsignore files, creating, repositories, default CVS settings" name="DC.subject" />
-<meta content="build output folders, ignoring in CVS, CVS, setting repository defaults, cvsignore files, creating, repositories, default CVS settings" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcvsr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting CVS repository defaults</title>
-</head>
-<body id="twcvsr"><a name="twcvsr"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting CVS repository defaults</h1>
-
-
-<div>
-<div class="section"> <p>When you use a CVS repository during team development, you might
-want to use the following setup to ensure that the CVS versioning support
-ignores the project's build output folder:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Create a file called .cvsignore in your project's <span class="filepath">WebContent/WEB-INF</span> folder.</span>
-</li>
-
-<li class="stepexpand"><span>In this file, add a line with the name of the build output folder
-(for example, <samp class="codeph">classes</samp>).</span> <p>Currently, you have
-the option of creating this file automatically (as a feature) when using the
-New Dynamic Web Project wizard.</p>
-<p>When you synchronize with a CVS team
-stream, the output folder will be ignored.</p>
-</li>
-
-<li class="stepexpand"><span>In addition, you should turn off the <span><span class="uicontrol">Prune empty
-directories</span></span> option. Select <span><span class="menucascade"><span class="uicontrol">Windows</span>
- &gt; <span class="uicontrol">Preferences</span></span></span>, switch to the <span><span class="menucascade">
-<span class="uicontrol">Team</span> &gt; <span class="uicontrol">CVS</span></span></span> properties
-page, and ensure that the <span><span class="uicontrol">Prune empty directories</span></span> check
-box is not checked.</span> <p>If this option is enabled and your Web project's
-source directory is empty, it will be deleted when the project is added to
-your workspace from a CVS repository, causing a Java™ build error.</p>
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.dita
deleted file mode 100644
index 23c92fe..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twfltwiz" xml:lang="en-us">

-<title>Creating Filters</title>

-<shortdesc>The filters wizard helps you to create <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> servlet filters by walking you through

-the creation process and by providing you with output files that you can use

-or that you can modify for use with your Web application. The filters can

-run on Java EE-compliant Web servers.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>servlets<indexterm>creating</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>To create a filter, complete the following steps: </p></context>

-<steps>

-<step><cmd>In the Java EE perspective, expand your  <xref href="ccwebprj.dita"

-scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd>

-</step>

-<step><cmd>Right click on the <b>Filter</b> icon, and select <menucascade>

-<uicontrol>New</uicontrol><uicontrol>Filter</uicontrol></menucascade> from

-the pop-up menu.</cmd><stepresult> The <uicontrol>Create Filter</uicontrol> wizard

-appears.</stepresult></step>

-<step><cmd>Follow the project wizard prompts.</cmd></step>

-</steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<dt>Modifiers</dt>

-<dd>The <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite> states

-that a Servlet class must be <b>public</b> and not <b>abstract</b>. Therefore,

-you cannot change these modifiers. The only one available for change is the <b>final</b> modifier.</dd>

-</dlentry><dlentry>

-<dt>Interfaces</dt>

-<dd>There is one obligatory interface that filter classes must implement: <b>javax.servlet.Filter</b>.

-This interface is provided by javax.servlet package and is used to represent

-the life-cycle of the filter. This interface has three methods: init, doFilter

-and destroy. <ul>

-<li>The <b>init</b> method is called by the servlet container only once, when

-it finishes instantiating the filter.</li>

-<li>The<b>doFilter</b> method is where the filtering is performed and is called

-every time a user requests a resource, such as a servlet, to which the filter

-is mapped.</li>

-<li>The <b>destroy</b> method is called by the servlet container to tell the

-filter that it will be taken out of service.</li>

-</ul> Although, that the javax.servlet.Filter interface is provided in the <b>Interfaces</b> field

-by default, you can add additional interfaces to implement by using the <b>Add</b> button.</dd>

-</dlentry><dlentry>

-<dt>Interface selection dialog</dt>

-<dd>This dialog appears if you select to add an interface to your filter.

-As you type the name of the interface that you are adding, a list of available

-interfaces listed in the <b>Matching items</b> list box updates dynamically

-to display only the interfaces that match the pattern. Choose an interface

-to see the qualifier, and then click <b>OK</b> when finished.</dd>

-</dlentry><dlentry>

-<dt>Filter Mappings</dt>

-<dd>For a filter to intercept a request to a servlet, you must: <ol>

-<li>declare the filter with a <b>&lt;filter&gt;</b> element in the deployment

-descriptor</li>

-<li>map the filter to the servlet using the <b>&lt;filter-mapping&gt;</b> 

-element.</li>

-</ol> Sometimes you want a filter to work on multiple servlets. You can do

-this by mapping a filter to a URL pattern so that any request that matches

-that URL pattern will be filtered. All this is made automatically if you use

-the <b>Filter Mappings</b> field.</dd>

-</dlentry><dlentry>

-<dt>Method stubs</dt>

-<dd>Because each filter must implement the javax.servlet.Filter interface,

-the <b>Inherited abstract methods</b> option is always checked and cannot

-be changed.</dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html
deleted file mode 100644
index fcb8aa0..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twfltwiz.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating Filters" />
-<meta name="abstract" content="The filters wizard helps you to create Java servlet filters by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The filters can run on Java EE-compliant Web servers." />
-<meta name="description" content="The filters wizard helps you to create Java servlet filters by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The filters can run on Java EE-compliant Web servers." />
-<meta content="servlets, creating" name="DC.subject" />
-<meta content="servlets, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwfiltbn.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twfltwiz" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Filters</title>
-</head>
-<body id="twfltwiz"><a name="twfltwiz"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Filters</h1>
-
-
-
-<div><p>The filters wizard helps you to create Java™ servlet filters by walking you through
-the creation process and by providing you with output files that you can use
-or that you can modify for use with your Web application. The filters can
-run on Java EE-compliant Web servers.</p>
-
-<div class="section"> <p>To create a filter, complete the following steps: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Java EE perspective, expand your  <a href="ccwebprj.html" title="">dynamic project</a> in the Project Explorer view.</span>
-</li>
-
-<li class="stepexpand"><span>Right click on the <strong>Filter</strong> icon, and select <span class="menucascade">
-<span class="uicontrol">New</span> &gt; <span class="uicontrol">Filter</span></span> from
-the pop-up menu.</span>  The <span class="uicontrol">Create Filter</span> wizard
-appears.</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">Modifiers</dt>
-
-<dd>The <cite>Sun Microsystems Java Servlet 2.3 Specification</cite> states
-that a Servlet class must be <strong>public</strong> and not <strong>abstract</strong>. Therefore,
-you cannot change these modifiers. The only one available for change is the <strong>final</strong> modifier.</dd>
-
-
-<dt class="dlterm">Interfaces</dt>
-
-<dd>There is one obligatory interface that filter classes must implement: <strong>javax.servlet.Filter</strong>.
-This interface is provided by javax.servlet package and is used to represent
-the life-cycle of the filter. This interface has three methods: init, doFilter
-and destroy. <ul>
-<li>The <strong>init</strong> method is called by the servlet container only once, when
-it finishes instantiating the filter.</li>
-
-<li>The<strong>doFilter</strong> method is where the filtering is performed and is called
-every time a user requests a resource, such as a servlet, to which the filter
-is mapped.</li>
-
-<li>The <strong>destroy</strong> method is called by the servlet container to tell the
-filter that it will be taken out of service.</li>
-
-</ul>
- Although, that the javax.servlet.Filter interface is provided in the <strong>Interfaces</strong> field
-by default, you can add additional interfaces to implement by using the <strong>Add</strong> button.</dd>
-
-
-<dt class="dlterm">Interface selection dialog</dt>
-
-<dd>This dialog appears if you select to add an interface to your filter.
-As you type the name of the interface that you are adding, a list of available
-interfaces listed in the <strong>Matching items</strong> list box updates dynamically
-to display only the interfaces that match the pattern. Choose an interface
-to see the qualifier, and then click <strong>OK</strong> when finished.</dd>
-
-
-<dt class="dlterm">Filter Mappings</dt>
-
-<dd>For a filter to intercept a request to a servlet, you must: <ol>
-<li>declare the filter with a <strong>&lt;filter&gt;</strong> element in the deployment
-descriptor</li>
-
-<li>map the filter to the servlet using the <strong>&lt;filter-mapping&gt;</strong> 
-element.</li>
-
-</ol>
- Sometimes you want a filter to work on multiple servlets. You can do
-this by mapping a filter to a URL pattern so that any request that matches
-that URL pattern will be filtered. All this is made automatically if you use
-the <strong>Filter Mappings</strong> field.</dd>
-
-
-<dt class="dlterm">Method stubs</dt>
-
-<dd>Because each filter must implement the javax.servlet.Filter interface,
-the <strong>Inherited abstract methods</strong> option is always checked and cannot
-be changed.</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwfiltbn.html">Filters</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.dita
deleted file mode 100644
index 309c061..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twimpwar" xml:lang="en-us">

-<title>Importing Web archive (WAR) files</title>

-<prolog><metadata>

-<keywords><indexterm>WAR files<indexterm>importing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>A Web Archive (WAR) file is a portable, packaged Web application

-that you can import into your workspace. </p><p> Before importing a WAR file,

-you should first determine if the WAR file contains needed <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> source

-files. When importing a WAR file into an existing Web project, the imported

-Web deployment descriptor files are either not changed or overwritten by the

-ones included in the imported WAR file, based on your response to the prompt

-that is provided.  In either case, this action does <i>not</i> represent a

-merging of the two sets of deployment descriptors.  </p>  <p>To import the

-Web project resources in a WAR file into your workspace, complete the following

-steps:</p></context>

-<steps>

-<step><cmd>Select <ph><menucascade><uicontrol>File</uicontrol><uicontrol>Import</uicontrol>

-</menucascade></ph>.</cmd></step>

-<step><cmd> In the Import dialog, select <ph><uicontrol>WAR file</uicontrol></ph> and

-then click <ph><uicontrol>Next</uicontrol></ph>. </cmd></step>

-<step><cmd>Locate the WAR file that you want to import using the <ph><uicontrol>Browse</uicontrol></ph> button.</cmd>

-</step>

-<step><cmd> The wizard assumes you want to create a new Web project with the

-same name as the WAR file. If you accept this choice, the project will be

-created with the same servlet version as specified by the WAR file and in

-the same location. If you want to override these settings, you can click <b>New</b> and

-specify your new settings in the Dynamic Web Project wizard.</cmd></step>

-<step><cmd>Click <ph><uicontrol>Finish</uicontrol></ph> to populate the Web

-project.</cmd></step>

-</steps>

-</taskbody>

-<related-links>

-<linkpool type="concept"></linkpool>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html
deleted file mode 100644
index 90dfb8a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twimpwar.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing Web archive (WAR) files" />
-<meta content="WAR files, importing" name="DC.subject" />
-<meta content="WAR files, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwwarovr.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twimpwar" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing Web archive (WAR) files</title>
-</head>
-<body id="twimpwar"><a name="twimpwar"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing Web archive (WAR) files</h1>
-
-
-<div>
-<div class="section"> <p>A Web Archive (WAR) file is a portable, packaged Web application
-that you can import into your workspace. </p>
-<p> Before importing a WAR file,
-you should first determine if the WAR file contains needed Java™ source
-files. When importing a WAR file into an existing Web project, the imported
-Web deployment descriptor files are either not changed or overwritten by the
-ones included in the imported WAR file, based on your response to the prompt
-that is provided.  In either case, this action does <em>not</em> represent a
-merging of the two sets of deployment descriptors.  </p>
-  <p>To import the
-Web project resources in a WAR file into your workspace, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li><span>Select <span><span class="menucascade"><span class="uicontrol">File</span> &gt; <span class="uicontrol">Import</span>
-</span></span>.</span></li>
-
-<li><span> In the Import dialog, select <span><span class="uicontrol">WAR file</span></span> and
-then click <span><span class="uicontrol">Next</span></span>. </span></li>
-
-<li><span>Locate the WAR file that you want to import using the <span><span class="uicontrol">Browse</span></span> button.</span>
-</li>
-
-<li><span> The wizard assumes you want to create a new Web project with the
-same name as the WAR file. If you accept this choice, the project will be
-created with the same servlet version as specified by the WAR file and in
-the same location. If you want to override these settings, you can click <strong>New</strong> and
-specify your new settings in the Dynamic Web Project wizard.</span></li>
-
-<li><span>Click <span><span class="uicontrol">Finish</span></span> to populate the Web
-project.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwwarovr.html">Web archive (WAR) files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.dita
deleted file mode 100644
index f8b1edb..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN" "task.dtd">

-<task id="twlstwiz" xml:lang="en-us">

-<title>Creating Listeners</title>

-<shortdesc>The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>servlets<indexterm>creating</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>To create a listener, complete the following steps: </p></context>

-<steps>

-<step><cmd>From the Java EE perspective, expand your  <xref href="ccwebprj.dita" scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd></step>

-<step><cmd>Right click on the <b>Listener</b> icon, and select <menucascade><uicontrol>New</uicontrol><uicontrol>Listener</uicontrol></menucascade> from the pop-up menu.</cmd><stepresult> The <uicontrol>Create Listener</uicontrol> wizard appears.</stepresult></step>

-<step><cmd>Follow the project wizard prompts.</cmd></step>

-</steps>

-<postreq><dl><dlentry>

-<dt>Application lifecycle listeners</dt>

-<dd>The <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite>defines the 	following interfaces that represent that application lifecycle 	listeners. You should select at least one of the intefaces. 	<ul>

-<li><b>javax.servlet.ServletContextListener:</b> This interface is provided by javax.servlet package and can be used to listen to the ServletContext life-cycle events. This interface has two methods: contextInitialized and contextDestroyed. The <b><i>contextInitialized</i></b> method is called when the web application is ready to service requests and the <b><i>contextDestroyed</i></b> method is invoked when the servlet context is about to be shut down.</li>

-<li><b>javax.servlet.ServletContextAttributeListener:</b> This interface is provided by javax.servlet package. It can be used to be notified when any attribute is added to the ServletContext or if any of the ServletContext's attributes are changed or removed. This inetface has three methods: <b><i>attributeAdded, attributeRemoved</i></b> and <b><i>attributeReplaced</i></b>.</li>

-<li><b>javax.servlet.ServletRequestListener:</b> This interface is provided by javax.servlet package. It can be used to be notified when a request is coming in or out of scope in a Web component. This interface has two methods: requestInitialized and requestDestroyed. The <b><i>requestInitialized</i></b> method is called when it is about to enter the first servlet or filter in each Web application. The <b><i>requestDestroyed</i></b> method is called when it exits the last servlet or the first filter in the chain.</li>

-<li><b>javax.servlet.ServletRequestAttributeListener:</b> This interface is provided by javax.servlet package and can be used to be notified when any request attribute is changed. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <b><i>attributteAdded</i></b> method is called when a new attribute was added to servlet request. The <b><i>attributeRemoved</i></b> method is called when an existing attribute has been removed from the servlet request. The <b><i>attributeReplaced</i></b> method is called when an attribute was replaced on the servlet request.</li>

-<li><b>javax.servlet.http.HttpSessionListener:</b> This interface is provided by javax.servlet.http package and can be used to listen to a sessions life cycle events. This interface has two methods: sessionCreated and sessionDestroyed. The <b><i>sessionCreated</i></b>  	method is called when an HttpSession object is created. The <b><i>sessionDestroyed</i></b> method is called when an HttpSession object is invalidated.</li>

-<li><b>javax.servlet.http.HttpSessionActivationListener:</b> This interface is provided by javax.servlet.http package. It can be used to listen to a container events notifying that sessions will be passivated or activated. This interface has two methods: sessionDidActivate and sessionWillPasivate. The <b><i>sessionDidActivate</i></b> is called when the session has just been activated and the <b><i>sessionWillPasivate</i></b> is called when the session is about to be passivated.</li>

-<li><b>javax.servlet.http.HttpSessionAttributeListener:</b> This interface is provided by javax.servlet.http package and can be used to listen to events related to session attributes. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <b><i>attributeAdded</i></b> method is called when an attribute is added to an HttpSession object. The <b><i>attributeRemoved</i></b> and <b><i>attributeReplaced</i></b> methods are called when an HttpSession attribute is removed or replaced, respectively.</li>

-<li><b>javax.servlet.http.HttpSessionBindingListener:</b> This interface is provided by javax.servlet.http package and can be used to be notified when an object is bound to or unbound from a session. This interface has two methods: valueBound and valueUnbound. The <b><i>valueBound</i></b> method is called when the object is being bound to a session and identifies the session. The <b><i>valueUnbound</i></b> method is called when the object is being unbound from a session and identifies the session.</li>

-</ul> 	</dd>

-</dlentry><dlentry>

-<dt>Modifiers</dt>

-<dd>The <cite>Sun Microsystems <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Servlet 2.3 Specification</cite> states that a 	Listener class must be <b>public</b> and not <b>abstract</b>. Therefore, 	you cannot change these modifiers. The only one available for change is 	the <b>final</b> modifier.</dd>

-</dlentry><dlentry>

-<dt>Interfaces</dt>

-<dd>The interfaces that you selected in the previous page of the wizard 	are provided as default values in the <b>Interfaces</b> field. To add 	additional interfaces, click the <b>Add</b> button next to this field.</dd>

-</dlentry><dlentry>

-<dt>Interface selection dialog</dt>

-<dd>This dialog appears if you select to add an interface to your 	servlet. As you type the name of the interface that you are adding, a 	list of available interfaces listed in the <b>Matching items</b> list box 	updates dynamically to display only the interfaces that match the 	pattern. Choose an interface to see the qualifier, and then click <b>OK</b> 	when finished.</dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html
deleted file mode 100644
index 1462cc6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twlstwiz.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating Listeners" />
-<meta name="abstract" content="The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers." />
-<meta name="description" content="The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers." />
-<meta content="servlets, creating" name="DC.subject" />
-<meta content="servlets, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwlistbn.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twlstwiz" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating Listeners</title>
-</head>
-<body id="twlstwiz"><a name="twlstwiz"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating Listeners</h1>
-
-
-
-<div><p>The listener wizard helps you create application lifecycle listeners by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The listeners can run on Java EE-compliant Web servers.</p>
-
-<div class="section"> <p>To create a listener, complete the following steps: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>From the Java EE perspective, expand your  <a href="ccwebprj.html" title="">dynamic project</a> in the Project Explorer view.</span></li>
-
-<li class="stepexpand"><span>Right click on the <strong>Listener</strong> icon, and select <span class="menucascade"><span class="uicontrol">New</span> &gt; <span class="uicontrol">Listener</span></span> from the pop-up menu.</span>  The <span class="uicontrol">Create Listener</span> wizard appears.</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><dl>
-<dt class="dlterm">Application lifecycle listeners</dt>
-
-<dd>The <cite>Sun Microsystems Java™ Servlet 2.3 Specification</cite>defines the 	following interfaces that represent that application lifecycle 	listeners. You should select at least one of the intefaces. 	<ul>
-<li><strong>javax.servlet.ServletContextListener:</strong> This interface is provided by javax.servlet package and can be used to listen to the ServletContext life-cycle events. This interface has two methods: contextInitialized and contextDestroyed. The <strong><em>contextInitialized</em></strong> method is called when the web application is ready to service requests and the <strong><em>contextDestroyed</em></strong> method is invoked when the servlet context is about to be shut down.</li>
-
-<li><strong>javax.servlet.ServletContextAttributeListener:</strong> This interface is provided by javax.servlet package. It can be used to be notified when any attribute is added to the ServletContext or if any of the ServletContext's attributes are changed or removed. This inetface has three methods: <strong><em>attributeAdded, attributeRemoved</em></strong> and <strong><em>attributeReplaced</em></strong>.</li>
-
-<li><strong>javax.servlet.ServletRequestListener:</strong> This interface is provided by javax.servlet package. It can be used to be notified when a request is coming in or out of scope in a Web component. This interface has two methods: requestInitialized and requestDestroyed. The <strong><em>requestInitialized</em></strong> method is called when it is about to enter the first servlet or filter in each Web application. The <strong><em>requestDestroyed</em></strong> method is called when it exits the last servlet or the first filter in the chain.</li>
-
-<li><strong>javax.servlet.ServletRequestAttributeListener:</strong> This interface is provided by javax.servlet package and can be used to be notified when any request attribute is changed. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <strong><em>attributteAdded</em></strong> method is called when a new attribute was added to servlet request. The <strong><em>attributeRemoved</em></strong> method is called when an existing attribute has been removed from the servlet request. The <strong><em>attributeReplaced</em></strong> method is called when an attribute was replaced on the servlet request.</li>
-
-<li><strong>javax.servlet.http.HttpSessionListener:</strong> This interface is provided by javax.servlet.http package and can be used to listen to a sessions life cycle events. This interface has two methods: sessionCreated and sessionDestroyed. The <strong><em>sessionCreated</em></strong>  	method is called when an HttpSession object is created. The <strong><em>sessionDestroyed</em></strong> method is called when an HttpSession object is invalidated.</li>
-
-<li><strong>javax.servlet.http.HttpSessionActivationListener:</strong> This interface is provided by javax.servlet.http package. It can be used to listen to a container events notifying that sessions will be passivated or activated. This interface has two methods: sessionDidActivate and sessionWillPasivate. The <strong><em>sessionDidActivate</em></strong> is called when the session has just been activated and the <strong><em>sessionWillPasivate</em></strong> is called when the session is about to be passivated.</li>
-
-<li><strong>javax.servlet.http.HttpSessionAttributeListener:</strong> This interface is provided by javax.servlet.http package and can be used to listen to events related to session attributes. This interface has three methods: attributeAdded, attributeRemoved and attributeReplaced. The <strong><em>attributeAdded</em></strong> method is called when an attribute is added to an HttpSession object. The <strong><em>attributeRemoved</em></strong> and <strong><em>attributeReplaced</em></strong> methods are called when an HttpSession attribute is removed or replaced, respectively.</li>
-
-<li><strong>javax.servlet.http.HttpSessionBindingListener:</strong> This interface is provided by javax.servlet.http package and can be used to be notified when an object is bound to or unbound from a session. This interface has two methods: valueBound and valueUnbound. The <strong><em>valueBound</em></strong> method is called when the object is being bound to a session and identifies the session. The <strong><em>valueUnbound</em></strong> method is called when the object is being unbound from a session and identifies the session.</li>
-
-</ul>
- 	</dd>
-
-
-<dt class="dlterm">Modifiers</dt>
-
-<dd>The <cite>Sun Microsystems Java Servlet 2.3 Specification</cite> states that a 	Listener class must be <strong>public</strong> and not <strong>abstract</strong>. Therefore, 	you cannot change these modifiers. The only one available for change is 	the <strong>final</strong> modifier.</dd>
-
-
-<dt class="dlterm">Interfaces</dt>
-
-<dd>The interfaces that you selected in the previous page of the wizard 	are provided as default values in the <strong>Interfaces</strong> field. To add 	additional interfaces, click the <strong>Add</strong> button next to this field.</dd>
-
-
-<dt class="dlterm">Interface selection dialog</dt>
-
-<dd>This dialog appears if you select to add an interface to your 	servlet. As you type the name of the interface that you are adding, a 	list of available interfaces listed in the <strong>Matching items</strong> list box 	updates dynamically to display only the interfaces that match the 	pattern. Choose an interface to see the qualifier, and then click <strong>OK</strong> 	when finished.</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwlistbn.html">Listeners</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.dita
deleted file mode 100644
index 1a9890c..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.dita
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twpcnvrt" xml:lang="en-us">

-<title>Converting static Web projects to dynamic Web projects</title>

-<prolog><metadata>

-<keywords><indexterm>static Web projects<indexterm>converting to dynamic</indexterm></indexterm>

-<indexterm>Web projects<indexterm>converting static to dynamic</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p> If you want to add dynamic elements to a static web project,

-such as <tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm"

-trademark="Java">Java</tm> servlets and JSP files, you must convert the project

-from a static to a dynamic one. To convert a static Web project to a dynamic

-Web project, complete the following steps:</p> </context>

-<steps>

-<step><cmd>Select the project in the Project Explorer view, and then select <ph><uicontrol>Convert

-to a Dynamic Web Project</uicontrol></ph> from the <b>Project</b> menu.</cmd>

-<info>This conversion assumes the  project name and location will be the same.

-The conversion does not change the CSS file specified in the original static

-project, so it will be included in the resulting dynamic Web project. </info>

-</step>

-<step><cmd> Specify the project properties that are available when  <xref

-href="twcreprj.dita" scope="peer"><desc></desc>Creating a Dynamic Web project.</xref></cmd>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html
deleted file mode 100644
index 80efb29..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twpcnvrt.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Converting static Web projects to dynamic Web projects" />
-<meta content="static Web projects, converting to dynamic, Web projects, converting static to dynamic" name="DC.subject" />
-<meta content="static Web projects, converting to dynamic, Web projects, converting static to dynamic" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccstatic.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ccwebprj.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twpcnvrt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Converting static Web projects to dynamic Web projects</title>
-</head>
-<body id="twpcnvrt"><a name="twpcnvrt"><!-- --></a>
-
-
-<h1 class="topictitle1">Converting static Web projects to dynamic Web projects</h1>
-
-
-<div>
-<div class="section"> <p> If you want to add dynamic elements to a static web project,
-such as Java™ servlets and JSP files, you must convert the project
-from a static to a dynamic one. To convert a static Web project to a dynamic
-Web project, complete the following steps:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Select the project in the Project Explorer view, and then select <span><span class="uicontrol">Convert
-to a Dynamic Web Project</span></span> from the <strong>Project</strong> menu.</span>
- This conversion assumes the  project name and location will be the same.
-The conversion does not change the CSS file specified in the original static
-project, so it will be included in the resulting dynamic Web project. 
-</li>
-
-<li class="stepexpand"><span> Specify the project properties that are available when  <a href="twcreprj.html" title="">Creating a Dynamic Web project.</a></span>
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/ccstatic.html">Static Web projects</a></div>
-<div><a href="../topics/ccwebprj.html">Dynamic Web projects and applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita
deleted file mode 100644
index 511bd33..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twplib" xml:lang="en-us">

-<title>Adding Web library projects</title>

-<prolog><metadata>

-<keywords><indexterm keyref="twplib|1|WeblibraryprojectsvirtualJARfilesandprojects"

-status="changed">Web projects<indexterm>virtual JAR files and projects</indexterm></indexterm>

-<indexterm keyref="twplib|2|virtualJARfilesassociationsWeblibraryprojects"

-status="new">virtual JAR files associations<indexterm>Web library projects</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>Web library projects allow you to associate <tm tmclass="special"

-tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> projects

-with "virtual" JAR files in a Web project's WEB-INF/lib directory. You can

-reference JAR files that exist elsewhere in the Enterprise Application project

-that contains your Web project, if they are in the Web project's build path,

-and avoid the need to explicitly copy these JAR files into the project's lib

-folder before you publish the Web application to a server.</p><p>To set up

-these associations:</p> </context>

-<steps>

-<step><cmd>Right click on a Web project and select <uicontrol>Properties</uicontrol> from

-the pop-up menu.</cmd><info></info></step>

-<step><cmd>Click on <uicontrol>Java EE Module Dependencies</uicontrol></cmd>

-</step>

-<step><cmd>Set up your associations in the Java EE Module Dependencies window</cmd>

-</step>

-<step><cmd>Click <ph><uicontrol>OK</uicontrol></ph> when you are done.</cmd>

-</step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
deleted file mode 100644
index e4987c7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twplib.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding Web library projects" />
-<meta content="Web projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="DC.subject" />
-<meta content="Web projects, virtual JAR files and projects, virtual JAR files associations, Web library projects" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twplib" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding Web library projects</title>
-</head>
-<body id="twplib"><a name="twplib"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding Web library projects</h1>
-
-
-<div>
-<div class="section"> <p>Web library projects allow you to associate Java™ projects
-with "virtual" JAR files in a Web project's WEB-INF/lib directory. You can
-reference JAR files that exist elsewhere in the Enterprise Application project
-that contains your Web project, if they are in the Web project's build path,
-and avoid the need to explicitly copy these JAR files into the project's lib
-folder before you publish the Web application to a server.</p>
-<p>To set up
-these associations:</p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Right click on a Web project and select <span class="uicontrol">Properties</span> from
-the pop-up menu.</span> </li>
-
-<li class="stepexpand"><span>Click on <span class="uicontrol">Java EE Module Dependencies</span></span>
-</li>
-
-<li class="stepexpand"><span>Set up your associations in the Java EE Module Dependencies window</span>
-</li>
-
-<li class="stepexpand"><span>Click <span><span class="uicontrol">OK</span></span> when you are done.</span>
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.dita
deleted file mode 100644
index dc28269..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.dita
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twprjset" xml:lang="en-us">

-<title>Setting Web project properties</title>

-<prolog><metadata>

-<keywords><indexterm>Web projects<indexterm>properties settings</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>There are many Web project properties that you can set that affect

-the phases in the lifecycle of your project and its dependencies on other

-Web resources and Web development processes. You might want to verify or update

-these properties after you have updated an existing project or have imported

-Web resources into a project .</p><p>To view or set Web project properties,

-do the following: </p> </context>

-<steps>

-<step><cmd>Right-click on a Web Project, and from the pop-up menu select <ph><uicontrol>Properties</uicontrol></ph>.</cmd>

-</step>

-<step><cmd>Select a property type in the left pane of the Properties dialog

-to view or update properties in the Web project. For each property, you can

-apply changes and modify default settings. Based on whether you have a static

-or a dynamic Web project, the following property types are available:</cmd>

-<info><dl><dlentry>

-<dt>Info</dt>

-<dd>Provides general information about project type, location, and modification

-status. </dd>

-</dlentry><dlentry>

-<dt>BeanInfo Path (Dynamic Web project only)</dt>

-<dd>If you select the Enable Beaninfo Introspection on this project, you can

-specify the contents and order of <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> Bean search paths to provide Bean information

-relevant to the project. You can add, remove, and reorder (using the <ph>Up</ph> and <ph>Down</ph> buttons)

-the packages used to include Bean information.</dd>

-</dlentry><dlentry>

-<dt>Builders</dt>

-<dd>Add, remove, or reorder external tools in the build order. When you select <uicontrol>New</uicontrol> to

-create a new external tool to the list, the New External Tool wizard opens,

-so that you can define the new build tool.</dd>

-</dlentry><dlentry>

-<dt>Java EE (Dynamic Web project only)</dt>

-<dd>Identify Web level specification and modify context root and Web content

-folder name</dd>

-</dlentry><dlentry>

-<dt><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Build

-Path (Dynamic Web project only)</dt>

-<dd>View or change the information about the <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> build path that you supplied when creating

-the project using the <ph>Create a DynamicWeb Project</ph> wizard. Whenever

-the Web project is rebuilt, any class files that are created or updated will

-be output to the specified output folder. <note>A library entry on the <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> build

-path will remain there unless the actual JAR file is deleted from the WEB-INF/lib

-folder. If you remove a library path entry but not the JAR file, the library

-entry will be re-added to the path automatically.</note></dd>

-</dlentry><dlentry>

-<dt><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> Compiler

-(Dynamic Web project only)</dt>

-<dd>Define whether to use workspace settings or project setting for compiling <tm

-tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> code,

-including settings for Problems, Style, Compliance and Classfiles, and Build

-Path.</dd>

-</dlentry><dlentry>

-<dt>Javadoc Location (Dynamic Web project only)</dt>

-<dd>Define a default location (URL) for any Javadoc available to the project.</dd>

-</dlentry><dlentry>

-<dt><tm tmclass="special" tmowner="Sun Microsystems, Inc." tmtype="tm" trademark="Java">Java</tm> JAR

-Dependencies (Dynamic Web project only)</dt>

-<dd>Define and reorder JAR dependencies for the project. Note that these dependencies

-may differ based on a Web project's association with multiple Enterprise application

-projects.</dd>

-</dlentry><dlentry>

-<dt>JSP Task Tags</dt>

-<dd>Add, edit, or remove JSP task tags and assign tag priorities. These "to

-do" items appear in your Tasks view.</dd>

-</dlentry><dlentry>

-<dt>JSP Compilation</dt>

-<dd>Specify when in the build process a JSP should be set to compile</dd>

-</dlentry><dlentry>

-<dt>JSP Fragment (dynamic Web project only)</dt>

-<dd>Define default encoding, page directive, and content type values for JSP

-fragment documents in the web project.</dd>

-</dlentry><dlentry>

-<dt>Links Validation/Refactoring</dt>

-<dd>Define project-level link management and validation settings. These settings

-override corresponding settings in the Workbench Preference settings for the

-current project.</dd>

-</dlentry><dlentry>

-<dt>Project References</dt>

-<dd>Reference other Web projects that exist on your workbench workspace.</dd>

-</dlentry><dlentry>

-<dt>Server</dt>

-<dd>Select the server instance used to perform necessary development, test,

-and publishing functions for the project.</dd>

-</dlentry><dlentry>

-<dt>Validation</dt>

-<dd>Specify which validators should run for the project, and whether validation

-should occur automatically when resource updates are written to the project.

-The available validators are based on the types of resources in your project.

-By default, validators are automatically run when you save resources in a

-Web project. If you do not want validators to run automatically when you save

-these resources, enable the <uicontrol>Override validation</uicontrol> preferences

-option and disable the <uicontrol>Run validation automatically when you save

-changes to resources</uicontrol> option. <note>You can also  disable automatic

-validation (and builds) for all projects by disabling <uicontrol>Perform build

- automatically on resource modification</uicontrol> from the <uicontrol>Workbench</uicontrol> properties.

-If  you disable automatic builds, you can manually  run a build (and validation)

-by selecting  <menucascade><uicontrol>Project</uicontrol><uicontrol>Rebuild

-project</uicontrol></menucascade>.</note></dd>

-</dlentry><dlentry>

-<dt>Web Content Settings</dt>

-<dd>Provide any applicable Web content settings for a Web project. You can

-specify the document type, CSS profile, and target device.</dd>

-</dlentry><dlentry>

-<dt>Web Project Features</dt>

-<dd>Select the features you want to be enabled for your Web project, such

-as Page Template support.</dd>

-</dlentry></dl></info></step>

-<step><cmd>When you have completed updates to Web project settings, click <ph><uicontrol>OK</uicontrol></ph> to

-save and close the Properties dialog.</cmd></step>

-</steps>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html
deleted file mode 100644
index b1d1e40..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twprjset.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting Web project properties" />
-<meta content="Web projects, properties settings" name="DC.subject" />
-<meta content="Web projects, properties settings" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twprjset" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting Web project properties</title>
-</head>
-<body id="twprjset"><a name="twprjset"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting Web project properties</h1>
-
-
-<div>
-<div class="section"> <p>There are many Web project properties that you can set that affect
-the phases in the lifecycle of your project and its dependencies on other
-Web resources and Web development processes. You might want to verify or update
-these properties after you have updated an existing project or have imported
-Web resources into a project .</p>
-<p>To view or set Web project properties,
-do the following: </p>
- </div>
-
-<ol>
-<li class="stepexpand"><span>Right-click on a Web Project, and from the pop-up menu select <span><span class="uicontrol">Properties</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select a property type in the left pane of the Properties dialog
-to view or update properties in the Web project. For each property, you can
-apply changes and modify default settings. Based on whether you have a static
-or a dynamic Web project, the following property types are available:</span>
- <dl>
-<dt class="dlterm">Info</dt>
-
-<dd>Provides general information about project type, location, and modification
-status. </dd>
-
-
-<dt class="dlterm">BeanInfo Path (Dynamic Web project only)</dt>
-
-<dd>If you select the Enable Beaninfo Introspection on this project, you can
-specify the contents and order of Java™ Bean search paths to provide Bean information
-relevant to the project. You can add, remove, and reorder (using the <span>Up</span> and <span>Down</span> buttons)
-the packages used to include Bean information.</dd>
-
-
-<dt class="dlterm">Builders</dt>
-
-<dd>Add, remove, or reorder external tools in the build order. When you select <span class="uicontrol">New</span> to
-create a new external tool to the list, the New External Tool wizard opens,
-so that you can define the new build tool.</dd>
-
-
-<dt class="dlterm">Java EE (Dynamic Web project only)</dt>
-
-<dd>Identify Web level specification and modify context root and Web content
-folder name</dd>
-
-
-<dt class="dlterm">Java Build
-Path (Dynamic Web project only)</dt>
-
-<dd>View or change the information about the Java build path that you supplied when creating
-the project using the <span>Create a DynamicWeb Project</span> wizard. Whenever
-the Web project is rebuilt, any class files that are created or updated will
-be output to the specified output folder. <div class="note"><span class="notetitle">Note:</span> A library entry on the Java build
-path will remain there unless the actual JAR file is deleted from the WEB-INF/lib
-folder. If you remove a library path entry but not the JAR file, the library
-entry will be re-added to the path automatically.</div>
-</dd>
-
-
-<dt class="dlterm">Java Compiler
-(Dynamic Web project only)</dt>
-
-<dd>Define whether to use workspace settings or project setting for compiling Java code,
-including settings for Problems, Style, Compliance and Classfiles, and Build
-Path.</dd>
-
-
-<dt class="dlterm">Javadoc Location (Dynamic Web project only)</dt>
-
-<dd>Define a default location (URL) for any Javadoc available to the project.</dd>
-
-
-<dt class="dlterm">Java JAR
-Dependencies (Dynamic Web project only)</dt>
-
-<dd>Define and reorder JAR dependencies for the project. Note that these dependencies
-may differ based on a Web project's association with multiple Enterprise application
-projects.</dd>
-
-
-<dt class="dlterm">JSP Task Tags</dt>
-
-<dd>Add, edit, or remove JSP task tags and assign tag priorities. These "to
-do" items appear in your Tasks view.</dd>
-
-
-<dt class="dlterm">JSP Compilation</dt>
-
-<dd>Specify when in the build process a JSP should be set to compile</dd>
-
-
-<dt class="dlterm">JSP Fragment (dynamic Web project only)</dt>
-
-<dd>Define default encoding, page directive, and content type values for JSP
-fragment documents in the web project.</dd>
-
-
-<dt class="dlterm">Links Validation/Refactoring</dt>
-
-<dd>Define project-level link management and validation settings. These settings
-override corresponding settings in the Workbench Preference settings for the
-current project.</dd>
-
-
-<dt class="dlterm">Project References</dt>
-
-<dd>Reference other Web projects that exist on your workbench workspace.</dd>
-
-
-<dt class="dlterm">Server</dt>
-
-<dd>Select the server instance used to perform necessary development, test,
-and publishing functions for the project.</dd>
-
-
-<dt class="dlterm">Validation</dt>
-
-<dd>Specify which validators should run for the project, and whether validation
-should occur automatically when resource updates are written to the project.
-The available validators are based on the types of resources in your project.
-By default, validators are automatically run when you save resources in a
-Web project. If you do not want validators to run automatically when you save
-these resources, enable the <span class="uicontrol">Override validation</span> preferences
-option and disable the <span class="uicontrol">Run validation automatically when you save
-changes to resources</span> option. <div class="note"><span class="notetitle">Note:</span> You can also  disable automatic
-validation (and builds) for all projects by disabling <span class="uicontrol">Perform build
- automatically on resource modification</span> from the <span class="uicontrol">Workbench</span> properties.
-If  you disable automatic builds, you can manually  run a build (and validation)
-by selecting  <span class="menucascade"><span class="uicontrol">Project</span> &gt; <span class="uicontrol">Rebuild
-project</span></span>.</div>
-</dd>
-
-
-<dt class="dlterm">Web Content Settings</dt>
-
-<dd>Provide any applicable Web content settings for a Web project. You can
-specify the document type, CSS profile, and target device.</dd>
-
-
-<dt class="dlterm">Web Project Features</dt>
-
-<dd>Select the features you want to be enabled for your Web project, such
-as Page Template support.</dd>
-
-</dl>
-</li>
-
-<li class="stepexpand"><span>When you have completed updates to Web project settings, click <span><span class="uicontrol">OK</span></span> to
-save and close the Properties dialog.</span></li>
-
-</ol>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.dita b/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.dita
deleted file mode 100644
index 15092e7..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twsrvwiz" xml:lang="en-us">

-<title>Creating servlets</title>

-<shortdesc>The servlet wizard helps you create <tm tmclass="special" tmowner="Sun Microsystems, Inc."

-tmtype="tm" trademark="Java">Java</tm> servlets by walking you through the

-creation process and by providing you with output files that you can use or

-that you can modify for use with your Web application. The servlets can run

-on Java EE-compliant Web servers.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>servlets<indexterm>creating</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context> <p>To create a servlet, complete the following steps: </p></context>

-<steps>

-<step><cmd>From the Java EE perspective, expand your  <xref href="ccwebprj.dita"

-scope="peer"><desc></desc>dynamic project</xref> in the Project Explorer view.</cmd>

-</step>

-<step><cmd>Right click on the <b>Servlet</b> icon, and select <menucascade>

-<uicontrol>New</uicontrol><uicontrol>Servlet</uicontrol></menucascade> from

-the pop-up menu.</cmd><stepresult> The <uicontrol>Create Servlet</uicontrol> wizard

-appears.</stepresult></step>

-<step><cmd>Follow the project wizard prompts.</cmd></step>

-</steps>

-<postreq><p><b>General Information</b></p><dl><dlentry>

-<dt>Modifiers</dt>

-<dd>You can select a modifier in the wizard to specify whether your servlet

-class is public, abstract, or final. Note that classes cannot be both abstract

-and final.</dd>

-</dlentry><dlentry>

-<dt>javax.servlet.Servlet</dt>

-<dd>Although javax.servlet.Servlet is provided as the default interface, you

-can use the wizard to add additional interfaces to implement.</dd>

-</dlentry><dlentry>

-<dt>Interface selection dialog</dt>

-<dd>This dialog appears if you elect to add an interface to your servlet.

-As you type the name of the interface that you are adding, a list of available

-interfaces listed in the Matching types list box updates dynamically to display

-only the interfaces that match the pattern. You should choose an interface

-to see the qualifier, and then click OK when finished.</dd>

-</dlentry><dlentry>

-<dt>Method stubs</dt>

-<dd>You can select any appropriate method stubs to be created in the servlet

-file. The stubs created by using the Inherited abstract methods option must

-be implemented if you do not intend to create an abstract servlet. Note that

-this is not true for Constructors from superclass</dd>

-</dlentry></dl></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html b/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
deleted file mode 100644
index a1a1ac6..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/topics/twsrvwiz.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating servlets" />
-<meta name="abstract" content="The servlet wizard helps you create Java servlets by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The servlets can run on Java EE-compliant Web servers." />
-<meta name="description" content="The servlet wizard helps you create Java servlets by walking you through the creation process and by providing you with output files that you can use or that you can modify for use with your Web application. The servlets can run on Java EE-compliant Web servers." />
-<meta content="servlets, creating" name="DC.subject" />
-<meta content="servlets, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwservbn.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twsrvwiz" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating servlets</title>
-</head>
-<body id="twsrvwiz"><a name="twsrvwiz"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating servlets</h1>
-
-
-
-<div><p>The servlet wizard helps you create Java™ servlets by walking you through the
-creation process and by providing you with output files that you can use or
-that you can modify for use with your Web application. The servlets can run
-on Java EE-compliant Web servers.</p>
-
-<div class="section"> <p>To create a servlet, complete the following steps: </p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>From the Java EE perspective, expand your  <a href="ccwebprj.html" title="">dynamic project</a> in the Project Explorer view.</span>
-</li>
-
-<li class="stepexpand"><span>Right click on the <strong>Servlet</strong> icon, and select <span class="menucascade">
-<span class="uicontrol">New</span> &gt; <span class="uicontrol">Servlet</span></span> from
-the pop-up menu.</span>  The <span class="uicontrol">Create Servlet</span> wizard
-appears.</li>
-
-<li class="stepexpand"><span>Follow the project wizard prompts.</span></li>
-
-</ol>
-
-<div class="section"><p><strong>General Information</strong></p>
-<dl>
-<dt class="dlterm">Modifiers</dt>
-
-<dd>You can select a modifier in the wizard to specify whether your servlet
-class is public, abstract, or final. Note that classes cannot be both abstract
-and final.</dd>
-
-
-<dt class="dlterm">javax.servlet.Servlet</dt>
-
-<dd>Although javax.servlet.Servlet is provided as the default interface, you
-can use the wizard to add additional interfaces to implement.</dd>
-
-
-<dt class="dlterm">Interface selection dialog</dt>
-
-<dd>This dialog appears if you elect to add an interface to your servlet.
-As you type the name of the interface that you are adding, a list of available
-interfaces listed in the Matching types list box updates dynamically to display
-only the interfaces that match the pattern. You should choose an interface
-to see the qualifier, and then click OK when finished.</dd>
-
-
-<dt class="dlterm">Method stubs</dt>
-
-<dd>You can select any appropriate method stubs to be created in the servlet
-file. The stubs created by using the Inherited abstract methods option must
-be implemented if you do not intend to create an abstract servlet. Note that
-this is not true for Constructors from superclass</dd>
-
-</dl>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwservbn.html">Servlets</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.ditamap b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.ditamap
deleted file mode 100644
index 262591e..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.ditamap
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map id="webappdevelopment" linking="none" title="Web application development">

-<topicref href="topics/ccwtover.dita" navtitle="Web application overview">

-<topicref href="topics/cwtfeatures.dita" navtitle="Web tools features">

-<topicref href="topics/ccwebvw.dita" navtitle="Project Explorer view and Web development">

-</topicref>

-<topicref href="topics/cwebresources.dita" navtitle="Web resources"></topicref>

-<topicref href="topics/cwebpagedesign.dita" navtitle="Web page design"></topicref>

-</topicref>

-</topicref>

-<topicref href="topics/cwebprojects.dita" navtitle="Web projects">

-<topicref href="topics/cwwarovr.dita" navtitle="Web archive (WAR) files">

-</topicref>

-<topicref href="topics/twcreprj.dita" navtitle="Creating a dynamic Web project">

-<topicref href="topics/ccwebprj.dita" navtitle="Dynamic Web projects and applications">

-</topicref>

-</topicref>

-<topicref href="topics/twcresta.dita" navtitle="Creating a static Web project">

-<topicref href="topics/twpcnvrt.dita" navtitle="Converting static Web projects to dynamic Web projects">

-</topicref>

-<topicref href="topics/ccstatic.dita" navtitle="Static Web projects"></topicref>

-</topicref>

-<topicref href="topics/twimpwar.dita" navtitle="Importing Web archive (WAR) files">

-</topicref>

-<topicref href="topics/twcrewar.dita" navtitle="Exporting Web Archive (WAR) files">

-</topicref>

-<topicref href="topics/twplib.dita" navtitle="Adding Web library projects">

-</topicref>

-<topicref href="topics/twprjset.dita" navtitle="Setting Web project properties">

-</topicref>

-</topicref>

-<topicref href="topics/cwwedtvw.dita" navtitle="Workbench integration with Web editors">

-</topicref>

-<topicref href="topics/tjdetags.dita" navtitle="Creating and editing Web pages - overview">

-<topicref href="topics/tjcrehtm.dita" navtitle="Creating HTML and XHTML files and framesets">

-</topicref>

-<topicref href="topics/tjprefs.dita" navtitle="Defining HTML file preferences">

-</topicref>

-<topicref href="topics/tstylesheet.dita" navtitle="Creating cascading style sheets">

-</topicref>

-<topicref href="topics/tjcrejsp.dita" navtitle="Creating JavaServer Pages (JSP) files">

-<topicref href="topics/cpdjsps.dita" navtitle="JavaServer Pages (JSP) technology">

-</topicref>

-</topicref>

-<topicref href="topics/cwebartifact.dita" navtitle="Creating Web Artifacts">

-<topicref href="topics/twsrvwiz.dita" navtitle="Creating servlets">

-<topicref href="topics/cwservbn.dita" navtitle="Servlets"></topicref>

-</topicref>

-<topicref href="topics/twlstwiz.dita" navtitle="Creating Listeners">

-<topicref href="topics/cwlistbn.dita" navtitle="Listeners"></topicref>

-</topicref>

-<topicref href="topics/twfltwiz.dita" navtitle="Creating Filters">

-<topicref href="topics/cwfiltbn.dita" navtitle="Filters"></topicref>

-</topicref>

-</topicref>

-</topicref>

-<topicref href="topics/twcvsr.dita" navtitle="Setting CVS repository defaults">

-</topicref>

-<topicref href="topics/tservertarget.dita" navtitle="Server targeting for Web applications">

-</topicref>

-</map>

diff --git a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
deleted file mode 100644
index 83e1f6a..0000000
--- a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Web application development" topic="topics/ccwtover.html">
-<topic label="Web application overview" href="topics/ccwtover.html">
-<topic label="Web tools features" href="topics/cwtfeatures.html">
-<topic label="Project Explorer view and Web development" href="topics/ccwebvw.html"/>
-<topic label="Web resources" href="topics/cwebresources.html"/>
-<topic label="Web page design" href="topics/cwebpagedesign.html"/>
-</topic>
-</topic>
-<topic label="Web projects" href="topics/cwebprojects.html">
-<topic label="Web archive (WAR) files" href="topics/cwwarovr.html"/>
-<topic label="Creating a dynamic Web project" href="topics/twcreprj.html">
-<topic label="Dynamic Web projects and applications" href="topics/ccwebprj.html"/>
-</topic>
-<topic label="Creating a static Web project" href="topics/twcresta.html">
-<topic label="Converting static Web projects to dynamic Web projects" href="topics/twpcnvrt.html"/>
-<topic label="Static Web projects" href="topics/ccstatic.html"/>
-</topic>
-<topic label="Importing Web archive (WAR) files" href="topics/twimpwar.html"/>
-<topic label="Exporting Web Archive (WAR) files" href="topics/twcrewar.html"/>
-<topic label="Adding Web library projects" href="topics/twplib.html"/>
-<topic label="Setting Web project properties" href="topics/twprjset.html"/>
-</topic>
-<topic label="Workbench integration with Web editors" href="topics/cwwedtvw.html"/>
-<topic label="Creating and editing Web pages - overview" href="topics/tjdetags.html">
-<topic label="Creating HTML and XHTML files and framesets" href="topics/tjcrehtm.html"/>
-<topic label="Defining HTML file preferences" href="topics/tjprefs.html"/>
-<topic label="Creating cascading style sheets" href="topics/tstylesheet.html"/>
-<topic label="Creating JavaServer Pages (JSP) files" href="topics/tjcrejsp.html">
-<topic label="JavaServer Pages (JSP) technology" href="topics/cpdjsps.html"/>
-</topic>
-<topic label="Creating Web Artifacts" href="topics/cwebartifact.html">
-<topic label="Creating servlets" href="topics/twsrvwiz.html">
-<topic label="Servlets" href="topics/cwservbn.html"/>
-</topic>
-<topic label="Creating Listeners" href="topics/twlstwiz.html">
-<topic label="Listeners" href="topics/cwlistbn.html"/>
-</topic>
-<topic label="Creating Filters" href="topics/twfltwiz.html">
-<topic label="Listeners" href="topics/cwfiltbn.html"/>
-</topic>
-</topic>
-</topic>
-<topic label="Setting CVS repository defaults" href="topics/twcvsr.html"/>
-<topic label="Server targeting for Web applications" href="topics/tservertarget.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.cvsignore b/docs/org.eclipse.wst.xml.ui.infopop/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.project b/docs/org.eclipse.wst.xml.ui.infopop/.project
deleted file mode 100644
index 110ff69..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml.ui.infopop</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.xml.ui.infopop/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
deleted file mode 100644
index c62b4a2..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts.xml
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-<!--plugin: org.eclipse.wst.xml.ui -->
-<contexts>
-	<context id="csh_outer_container">
-		<description />
-	</context>
-	<context id="webx0060"><!-- XML Files preference page  -->
-		<description>
-			<p>This page lets you specify the file suffix and text encoding that will be used when you create or save an XML related file.</p>
-
-			<p>The encoding attribute is used to specify the default character encoding set that is used when creating XML related files (DTDs, XML files, XML schemas). Changing the encoding causes any new, XML related files that are created from scratch to use the selected encoding.</p>
-
-			<p>You can also set the type of message that will appear in the problems view when a resource is validated with no specified grammar.</p>
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html" label="Specifying XML default encoding and line delimiters" />
-	</context>
-	<context id="webx0061"><!-- Editor preferences page -->
-		<description>
-			<p>This page lets you specify the formatting and content assist preferences that will be used when editing an XML file.</p>
-
-			<p>Enter a maximum width in the <b>Line width</b> field to specify when a line should be broken to fit onto more than one line. This will be applied when the document is formatted.
-			</p>
-		
-
-			<p>Select <b>Split multiple attributes each on a new line</b> to start every attribute on a new line when the document is formatted.
-			</p>
-
-			<p>
-				Select <b>Clear all blank lines</b> to remove blank lines when the document is formatted.
-			</p>
-
-			<p>
-				Select <b>Indent using tabs</b> if you want to use tab characters (\t) as the standard formatting indentation. If you prefer to use spaces, select <b>Indent using spaces</b>.
-			</p>
-
-			<p>
-				You can also specify the <b>Indentation size</b> which is the number of tabs or space characters used for formatting indentation.
-			</p>
-
-			<p>
-				To apply these formatting styles, right-click in your XML document, and click <b>Format &gt; Document</b>.
-			</p>
-
-			<p>
-				If the <b>Automatically make suggestions</b> check box is selected, you can specify that certain characters will cause the content assist list to pop up automatically. Specify these characters in the <b>Prompt when these characters are inserted</b> field.
-			</p>
-
-			<p>
-				If you select <b>Strict</b> from the <b>Suggestion strategy</b> list, suggestions that are grammatically valid will be shown first (with bold icons) in the content assist list. Other suggestions that are applicable to the element scope, but not grammatically valid, will be shown below them with a de-emphasized icon. The default value for this field is <b>Lax</b>.
-			</p>
-
-			<p>
-				If a DTD or schema (or other model) is not specified for an XML file, selecting <b>Use inferred grammar in absence of DTD/Schema</b> allows the editor to "guess" what elements or attributes are available based on existing content.
-			</p>
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html" label="Defining XML editor preferences" />
-	</context>
-	<context id="webx0062"><!-- Syntax Coloring preference page -->
-		<description>
-			<p>This page lets you customize the syntax highlighting that the XML editor does when you are editing a file.</p>
-
-			<p>
-				The <b>Content type</b> field contains a list of all the source types that you can select a highlighting style for. You can either select the content type that you want to work with from the drop-down list, or click text in the text sample window that corresponds to the content type for which you want to change the text highlighting.
-			</p>
-
-			<p>
-				The <b>Foreground</b> and <b>Background</b> buttons open <b>Color</b> dialog boxes that allow you to specify text foreground and background colors, respectively. Select the <b>Bold</b> check box to make the specified content type appear in bold.
-			</p>
-
-			<p>
-				Click the <b>Restore Defaults</b> button to set the highlighting styles back to their default values. If you only want to reset the value for a particular content type, select it in the <b>Content type</b> field, the click the <b>Restore Default</b> button next to it.
-			</p>
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html" label="Setting source highlighting styles" />
-	</context>
-	<context id="webx0063"><!-- Templates preference page -->
-		<description>
-			<p>This page lets you create new templates and edit existing ones that can be used when editing an XML file. A template is a chunk of predefined code that you can insert into a file.</p>
-
-			<p>Click <b>New</b> if you want to create a completely new template.
-			</p>
-
-			<p>Supply a new template <b>Name</b> and <b>Description</b>. The <b>Context</b> for the template is the context in which the template is available in the proposal list when content assist is requested. Specify the <b>Pattern</b> for your template using the appropriate tags, attributes, or attribute values to be inserted by content assist.
-			</p>
-
-			<p>
-				If you want to insert a variable, click the <b>Insert Variable</b> button and select the variable to be inserted. For example, the <b>date</b> variable indicates the current date will be inserted.
-			</p>
-
-			<p>You can edit, remove, import, or export a template by using the same Preferences page. If you have modified a default template, you can restore it to its default value. You can also restore a removed template if you have not exited from the workbench since it was removed.</p>
-
-			<p>
-				If you have a template that you do not want to remove but you no longer want it to appear in the content assist list, clear its check box in the <b>Templates</b> preferences page.
-			</p>
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html" label="Working with XML templates" />
-	</context>
-	<context id="xmlm1200"><!-- doesn't exist in xml preferences -->
-		<description>
-			Cleanup options enable you to update a document so that it is well-formed and consistently formatted.
-
-			The following cleanup options can be set to on or off, so that you can limit the type of cleanup performed:
-
-			- <b>Compress empty element tags</b>: Compress element tags with no content to one tag with an end tag delimiter (ie: change &lt;tag&gt;&lt;/tag&gt; to &lt;tag/&gt;).
-
-			- <b>Insert required attributes</b>: Inserts any missing attributes that are required by the tag to make the element or document well-formed.
-
-			- <b>Insert missing tags</b>: Completes any missing tags (such as adding an end tag) necessary to make the element or document well-formed.
-
-			- <b>Quote attribute values</b>: Appropriately adds double- or single-quotes before and after attribute values if they are missing.
-
-			- <b>Format source</b>: Formats the document just as the <b>Format Document</b> context menu option does, immediately after performing any other specified <b>Cleanup</b> options.
-
-			- <b>Convert line delimiters to</b>: Converts all line delimiters in the file to the selected operating system's type.
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html" label="Editing in the Source view" />
-	</context>
-	<context id="xcui0500"><!-- add new attribute dialog -->
-		<description>
-			Enter the name of the attribute in the <b>Name</b> field, then enter the value of the attribute in the <b>Value</b> field. Click <b>OK</b>. The attribute will be added to the file.
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-	</context>
-	<context id="xcui0010"><!--  -->
-		<description>
-			The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can use the <b>Public ID</b> field to create an association using an XML Catalog entry or the <b>System ID</b> field to create an association using a file in the workbench.
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations" />
-	</context>
-	<context id="xcui0020"><!-- edit doctype declaration dialog -->
-		<description>This should match the name of your XML file's root element.</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations" />
-	</context>
-	<context id="xcui0030"><!-- edit doctype declaration dialog -->
-		<description>The value in this field is the Public Identifier. It is used to associate the XML file (using an XML catalog entry) with a DTD file by providing a hint to the XML processor.</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations" />
-	</context>
-	<context id="xcui0050"><!-- edit doctype declaration dialog -->
-		<description>The value in this field is the DTD the XML file is associated with. You can change the DTD the file is associated with by editing this field. The XML processor will try to use the Public ID to locate the DTD, and if this fails, it will use the System ID to find it.</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html" label="Editing DOCTYPE declarations" />
-	</context>
-	<context id="xcui0600"><!-- add element dialog -->
-		<description>
-			Enter the name of the element in the <b>Element name</b> field, then click <b>OK</b>. The element will be added to the file.
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-	</context>
-	<context id="xcui0300"><!-- edit processing instruction dialog -->
-		<description>
-			A processing instruction is a syntax in XML for passing instructions along to the application using an XML document. The <b>Target</b> field is used to identify the application the instructions belongs to. The <b>Data</b> field contains the instructions.
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html" label="Editing XML processing instructions" />
-	</context>
-	<context id="xcui0100"><!-- edit schema information (namespace declaration) dialog -->
-		<description>
-			This is a read-only dialog. Select the entry you want to edit and click <b>Edit</b>.
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing your namespace information" />
-	</context>
-	<context id="xcui0200"><!-- add namespace declaration dialog -->
-		<description>
-			The value in the <b>Namespace Name</b> field is the namespace the XML file belongs to.
-
-			All qualified elements and attributes in the XML file associated with the namespace will be prefixed with the <b>Prefix</b> value.
-
-			The <b>Location Hint</b> field contains the location of the XML schema the XML file is associated with. An XML Catalog ID or a URI can be specified in this field. You can search for the schema you want to use by clicking <b>Browse</b>. Once you select a file, the <b>Namespace Name</b> and <b>Prefix</b> fields will automatically be filled with the appropriate values from the schema (you must leave the fields blank for this to occur).
-
-			<b>Note</b> : If you are creating an XML file from an XML schema, you cannot change the <b>Namespace Name</b> or <b>Location Hint</b> values.
-		</description>
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing in the Design view" />
-		<topic href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html" label="Editing your namespace information" />
-	</context>
-	<context id="xcui0400"><!--  -->
-		<description>An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a URI (which contains information about a DTD or XML schema's location). Select the catalog entry you want to associate your XML file with.</description>
-	</context>
-</contexts>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml b/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
deleted file mode 100644
index e8504ef..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/EditorXmlContexts2.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-<contexts>
-	<context id="csh_outer_container">
-		<description />
-	</context>
-	<context id="xml_source_HelpId">
-		<description>The XML source view lets you edit a file that is coded in the Extensible Markup Language. The editor provides many text editing features, such as content assist, user-defined templates, syntax highlighting, unlimited undo and redo, element selection and formatting, and document formatting.</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html"
-			label="Editing in the Source view" />
-	</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF
deleted file mode 100644
index 0c58dbc..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/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.xml.ui.infopop; singleton:=true
-Bundle-Version: 1.0.300.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml b/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml
deleted file mode 100644
index a662efb..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/TableTree.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-
-<contexts>
-	<context id="csh_outer_container">
-		<description />
-	</context>
-	<context id="xmlm3000">
-		<description>The Design view of the XML editor represents your file simultaneously as a table and a tree, which helps make navigation and editing easier. Depending on the kind of file you are working with, content and attribute values can be edited directly in table cells, while pop-up menus on tree elements give alternatives that are valid for that location.</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html"
-			label="Editing in the Design view" />
-	</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/WSDLContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/WSDLContexts.xml
deleted file mode 100644
index 31462b7..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/WSDLContexts.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-
-<!-- plugin: org.eclipse.wst.wsdl.ui -->
-
-<contexts>
-	<context id="csh_outer_container">
-		<description />
-	</context>
-	<context id=""><!-- change later, this has no id atm -->
-		<description>
-			Select the project or folder that will contain the WSDL file. In the <b>File name</b> field, type the name of the WSDL file, for example <i>NewWSDLFile.wsdl</i>. The name of your WSDL file must end in <i>.wsdl</i>.
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0000">
-		<description>
-			<b>Target namespace</b> is used for the names of messages and the port type, binding and service defined in the WSDL file. The value must take the form of a valid URI (for example, http://www.mycompany.com/myservice/).
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0001">
-		<description>
-			<b>Prefix</b> is the prefix associated with the target namespace.
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0002">
-		<description>
-			<b>Create WSDL Skeleton</b> will generate the WSDL elements required for your service, including bindings, ports and messages. You can then modify these to meet the requirements of your Web service.
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0003">
-		<description>If you have chosen to create a WSDL skeleton, select the binding options you want to use in the Protocol drop down. The options are SOAP and HTTP. Use the SOAP protocol when you want to exchange structured and typed information. Use the HTTP protocol when you want your application client to just request or update information.</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0010">
-		<description>
-			If you select SOAP you can then select the encoding style you want to use:
-			<ul>
-				<li>
-					<b>document literal</b>: Document style messages, literal encoding. Use this style of binding when you want to send SOAP messages that can be validated by an XML validator. All the data types in the SOAP message body are defined in a schema, so the WSDL parts must point to schema elements.
-				</li>
-			</ul>
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0011">
-		<description>
-			<ul>
-				<li>
-					<b>rpc literal</b>: RPC style messages, literal encoding. Use this style of binding when you want to specify the operation method names in your SOAP messages so a server can dispatch the specified methods. Data types must be defined, so the WSDL parts must point to XSD types.
-				</li>
-			</ul>
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0012">
-		<description>
-			<ul>
-				<li>
-					<b>rpc encoded</b>: RPC style messages and SOAP encoding. Use this style of binding when you want to encode data graphs in your SOAP messages so a server can deserialize the object data. Data types must be defined, so the WSDL parts must point to XSD types.
-				</li>
-			</ul>
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0013">
-		<description>
-			If you select HTTP you can select whether to create an HTTP getter or setter:
-			<ul>
-				<li>
-					<b>HTTP GET</b>: A GET request fetches data from a Web server based on an URL value and a set of HTTP headers. Use this method when you want to retrieve information specified in the request.
-				</li>
-			</ul>
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-	<context id="wsdlu0014">
-		<description>
-			<ul>
-				<li>
-					<b>HTTP POST</b>: A POST request sends additional data to the server, specified after the URL and the headers. Use this method when you want to send data enclosed in the body of the request.
-				</li>
-			</ul>
-		</description>
-		<topic
-			href="../org.eclipse.wst.wsdl.ui.doc.user/tasks/tcrtwsdl.html"
-			label="" />
-	</context>
-</contexts>
-
-
-
-
-
-
-
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml
deleted file mode 100644
index f5bb914..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/XMLWizardContexts.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-
-<contexts>
-	<context id="csh_outer_container">
-		<description />
-	</context>
-	<context id="xmlc0101">
-		<description>
-			Select the <b>Create XML file from a DTD file</b> radio button to create an XML file from a DTD file. The file will contain the selected root element, populated with any required elements and attributes.
-		</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-	</context>
-	<context id="xmlc0102">
-		<description>
-			Select the <b>Create XML file from an XML schema file</b> radio button to create an XML file from an XML schema. The file will contain the selected root element of the XML schema and any elements or attributes it contains.
-		</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html"
-			label="Generating XML files from XML schemas" />
-	</context>
-	<context id="xmlc0103">
-		<description>
-			Select the <b>Create XML file from scratch</b> radio button if you want to create an XML file not associated with any XML schema or DTD file.
-		</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html"
-			label="Creating empty XML files" />
-	</context>
-	<context id="xmlc0500">
-		<description>
-			Select the <b>Select file from workbench</b> radio button if you want to create your XML file from a DTD or XML schema that is in the workbench.
-
-			Select the <b>Select XML Catalog entry</b> radio button if you want to use a file listed in the XML Catalog to create your XML file.
-		</description>
-	</context>
-	<context id="xmlc0410">
-		<description>
-			The root element of an XML file is the element that contains all other elements in that file. All elements defined in the DTD or all global elements defined in the XML schema are included in this list.
-
-			<b>Note</b>: If you do not have any elements in your DTD or any global elements in your XML schema, you cannot create an XML file from it.
-		</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html"
-			label="Generating XML files from XML schemas" />
-	</context>
-	<context id="xmlc0441">
-		<description>If you select this check box, both mandatory and optional attributes will be generated. If you do not select it, only mandatory attributes will be generated.</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html"
-			label="Generating XML files from XML schemas" />
-	</context>
-	<context id="xmlc0442">
-		<description>If you select this check box, both the mandatory and optional elements will be generated. If you do not select it, only mandatory elements will be generated.</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html"
-			label="Generating XML files from XML schemas" />
-	</context>
-	<context id="xmlc0443">
-		<description>
-			If you select this check box, the first choice of a required choice will be generated in your XML file.
-
-			For example, if you have the following code in your source file:
-
-			<b>&lt;choice&gt; &lt;element name="a" type="string&gt; &lt;element name="b" type="integer&gt; &lt;/choice&gt;</b>
-
-			and you select this check box, an element such as the following will be created in your XML file:
-
-			<b>&lt;a&gt;hello&lt;/a&gt;</b>
-		</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html"
-			label="Generating XML files from XML schemas" />
-	</context>
-	<context id="xmlc0444">
-		<description>
-			If you select this check box, any elements and attributes generated will be filled with sample data, such as <b>&lt;text&gt;EmptyText&lt;/text&gt;.</b> Otherwise, they will be empty - that is, <b>&lt;text&gt;&lt;/text&gt;.</b>
-		</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html"
-			label="Generating XML files from XML schemas" />
-	</context>
-	<context id="xmlc0210">
-		<description>The System ID value corresponds to the URI (physical location) of the DTD file. The Public ID value can refer to a DTD entry in an XML Catalog.</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-	</context>
-	<context id="xmlc0220">
-		<description>The System ID value corresponds to the URI (physical location) of the DTD file. The Public ID value can refer to a DTD entry in an XML Catalog.</description>
-		<topic
-			href="../org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html"
-			label="Generating XML files from DTDs" />
-	</context>
-</contexts>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/XSDContexts.xml b/docs/org.eclipse.wst.xml.ui.infopop/XSDContexts.xml
deleted file mode 100644
index a2ea89e..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/XSDContexts.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?NLS type="org.eclipse.help.contexts"?>
-<!-- /*******************************************************************************
-	* Copyright (c) 2000, 2008 IBM Corporation and others.
-	* All rights reserved. This program and the accompanying materials
-	* are made available under the terms of the Eclipse Public License v1.0
-	* which accompanies this distribution, and is available at
-	* http://www.eclipse.org/legal/epl-v10.html
-	* 
-	* Contributors:
-	*     IBM Corporation - initial API and implementation
-	*******************************************************************************/ -->
-
-<!-- plugins: org.eclipse.ui.ide and org.eclipse.wst.xsd.ui.internal -->
-
-<contexts>
-	<context id="csh_outer_container">
-		<description />
-	</context>
-	<context id="new_file_wizard_page_context"><!-- fix this, there is no context id atm -->
-		<description>
-			Select the project or folder that will contain the XML schema. In the <b>File name</b> field, type the name of the XML schema, for example <i>MyXMLSchema.xsd</i>. The name of your XML schema must end in <i>.xsd</i>.
-		</description>
-		<topic
-			href="../org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html"
-			label="Creating XML schemas" />
-	</context>
-	<context id="xsdp0010">
-		<description>
-			Select the <b>Qualify XML schema language constructs</b> check box if you want a prefix applied to all XML Schema language constructs in your XML schema.
-
-			In the <b>XML schema language constructs prefix</b> field, type the prefix you want applied to XML Schema language constructs in your XML schema. The prefix <i>xsd</i> is used by convention to denote the XML Schema namespace, but any prefix can be used. The purpose of the association is to identify the elements and simple types as belonging to the vocabulary of the XML Schema language rather than the vocabulary of the schema author.
-
-			<b>Note:</b> This prefix will not appear in any schemas that currently exist - it will only appear in new schemas you create after you type the prefix and click <b>Apply</b>. Any schemas that already exist will have the prefix specified in the schema applied to the XML schema language constructs.
-
-			You can change the <b>Default Target Namespace</b> value. The value specified in this field will be the default target namespace for any new XML schema files created.
-
-		</description>
-		<topic
-			href="../org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html"
-			label="Editing XML schema file prefereces" />
-	</context>
-</contexts>
-
-
-
-
-
-
-
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/about.html b/docs/org.eclipse.wst.xml.ui.infopop/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/build.properties b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
deleted file mode 100644
index 780ce89..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-bin.includes = META-INF/,\
-               EditorXmlContexts.xml,\
-               EditorXmlContexts2.xml,\
-               about.html,\
-               plugin.properties,\
-               plugin.xml,\
-               XMLWizardContexts.xml,\
-               TableTree.xml,\
-               WSDLContexts.xml,\
-               XSDContexts.xml
-               
-generateSourceBundle=false
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties b/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
deleted file mode 100644
index 8725f94..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName     = XML infopops
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml b/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
deleted file mode 100644
index ccf4c5a..0000000
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.1"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<plugin>
-
-<extension point="org.eclipse.help.contexts">
-       <contexts file="EditorXmlContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
-       <contexts file="EditorXmlContexts2.xml" plugin ="org.eclipse.core.runtime"/>
-       <contexts file="TableTree.xml" plugin ="org.eclipse.wst.xml.ui"/>
-       <contexts file="XMLWizardContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
-       <contexts file="WSDLContexts.xml" plugin ="org.eclipse.wst.wsdl.ui"/>
-       <contexts file="XSDContexts.xml" plugin ="org.eclipse.wst.xsd.ui"/>
-
-</extension>
-
-
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.cvsignore b/docs/org.eclipse.wst.xmleditor.doc.user/.cvsignore
deleted file mode 100644
index b53298e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-build.xml
-org.eclipse.wst.xmleditor.doc.user_1.0.0.jar
-bak
-temp
-DitaLink.cat
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.project b/docs/org.eclipse.wst.xmleditor.doc.user/.project
deleted file mode 100644
index 2e33af6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xmleditor.doc.user</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.xmleditor.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/DocBuild.xml b/docs/org.eclipse.wst.xmleditor.doc.user/DocBuild.xml
deleted file mode 100644
index fc89e9f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-	2008-01-09 Kate Price <katep@ca.ibm.com>
-	- modified for new DITA-OT version
-	2008-05-05 Kate Price <katep@ca.ibm.com>
-	- modified to add generation of pre-built help index. 
-	- Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="3.3.0" />
-			<property name="args.input" location="XMLBuildermap_toc.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location="" />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 4d930bc..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,8 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.wst.xmleditor.doc.user; singleton:=true
-Bundle-Version: 1.0.600.qualifier
-Bundle-Vendor: %pluginProvider
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap
deleted file mode 100644
index fcf32d5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.ditamap
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map collection-type="sequence" id="xmleditordocumentation" title="Developing XML files">

-<topicref href="topics/cworkXML.dita" linking="sourceonly" navtitle="Working with XML files">

-<anchor id="xml_post_cworkXML"/>

-<topicref href="topics/ccreatxm.dita" navtitle="Creating XML files">

-<anchor id="xml_post_ccreatxm"/>

-<topicref href="topics/tcretxml.dita" id="xmlcretxml" navtitle="Creating empty XML files">

-</topicref>

-<anchor id="xml_post_tcretxml"/>

-<topicref href="topics/tcrexdtd.dita" navtitle="Generating XML files from DTDs">

-</topicref>

-<anchor id="xml_post_tcrexdtd"/>

-<topicref href="topics/tcrexxsd.dita" navtitle="Generating XML files from XML schemas">

-</topicref>

-<anchor id="xml_post_tcrexxsd"/></topicref>

-<topicref href="topics/rlimitations_slushXML.dita" navtitle="Limitations of XML Editor"

-toc="no"></topicref>

-<anchor id="xml_post_rlimitations_slushXML"/>

-<topicref href="topics/txedttag.dita" navtitle="Editing XML files">

-<anchor id="xml_post_txedttag"/>

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor">

-<anchor id="xml_post_cwxmledt"/>

-<topicref href="topics/txprefs.dita" navtitle="Defining XML editor preferences">

-<anchor id="xml_post_txprefs"/>

-<topicref href="topics/ttaghilt.dita" id="taghilt" navtitle="Setting source highlighting styles">

-</topicref>

-<anchor id="xml_post_ttaghilt"/>

-<topicref href="topics/tedtenc.dita" navtitle="Specifying XML default encoding line delimiters">

-<anchor id="xml_post_tedtenc"/>

-<topicref href="topics/cxmlenc.dita" navtitle="XML and HTML encodings"></topicref>

-<anchor id="xml_post_cxmlenc"/></topicref>

-<topicref href="topics/tsugstrat.dita" navtitle="Setting the XML source suggestion strategy used by content assist">

-</topicref>

-<anchor id="xml_post_tsugstrat"/></topicref>

-</topicref>

-<topicref href="topics/txedtdes.dita" id="txedtdes" linking="none" navtitle="Editing in the Design view">

-<anchor id="xml_post_txedtdes"/>

-<topicref href="topics/tedtdoc.dita" id="tedtdoc" navtitle="Editing DOCTYPE declarations">

-</topicref>

-<anchor id="xml_post_tedtdoc"/>

-<topicref href="topics/tedtsch.dita" id="tedtsch" navtitle="Editing namespace information">

-</topicref>

-<anchor id="xml_post_tedtsch"/>

-<topicref href="topics/tedtproc.dita" id="tedtproc" navtitle="Editing XML processing instructions">

-</topicref>

-<anchor id="xml_post_tedtproc"/></topicref>

-<topicref href="topics/txedtsrc.dita" id="txedsrc" linking="none" navtitle="Editing in the Source view">

-<anchor id="xml_post_txedtsrc"/>

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-<anchor id="xml_post_twcdast"/>

-<topicref href="topics/twmacro.dita" id="twmacro" navtitle="Working with XML templates">

-</topicref>

-<anchor id="xml_post_twmacro"/></topicref>

-<topicref href="topics/tedtcnst.dita" id="tedtcnt" navtitle="Editing with DTD or XML schema constraints">

-</topicref>

-<anchor id="xml_post_tedtcnst"/>

-<topicref href="topics/txsityp.dita" navtitle="Using xsi:type"></topicref>

-<anchor id="xml_post_txsityp"/>

-<topicref href="topics/rextctn.dita" id="rextctn" navtitle="Editing XML documents with multiple namespaces">

-</topicref>

-<anchor id="xml_post_rextctn"/></topicref>

-<topicref href="topics/twxvalid.dita" id="xmlvalid" navtitle="Validating XML files">

-</topicref>

-<anchor id="xml_post_twxvalid"/>

-<topicref href="topics/cxmlcat.dita" linking="none" navtitle="XML file associations with DTDs and XML schemas">

-<anchor id="xml_post_cxmlcat"/>

-<topicref href="topics/txmlcat.dita" id="txmlcat" navtitle="Adding entries to the XML Catalog">

-</topicref>

-<anchor id="xml_post_txmlcat"/>

-<topicref href="topics/tedtgram.dita" id="tedtgram" navtitle="Updating XML files with changes made to DTDs and schemas">

-</topicref>

-<topicref href="topics/rxmlcatkey.dita" id="rxmlcatkey" navtitle="XML Catalog keyboard shortcuts">

-</topicref>

-<anchor id="xml_post_rxmlcatkey"/>

-<topicref href="topics/rxmltoolskey.dita" navtitle="XML editor keyboard shortcuts">

-</topicref>

-<anchor id="xml_post_tedtgram"/></topicref>

-<topicref href="topics/rxmlbicons.dita" id="ricons" navtitle="Icons used in the XML editor">

-</topicref>

-<anchor id="xml_post_rxmlbicons"/></topicref>

-</map>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
deleted file mode 100644
index 929c809..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="Developing XML files" topic="topics/cworkXML.html">
-<topic label="Working with XML files" href="topics/cworkXML.html">
-<anchor id="xml_post_cworkXML"/>
-<topic label="Creating XML files" href="topics/ccreatxm.html">
-<anchor id="xml_post_ccreatxm"/>
-<topic label="Creating XML files" href="topics/tcretxml.html"/>
-<anchor id="xml_post_tcretxml"/>
-<topic label="Generating XML files from DTDs" href="topics/tcrexdtd.html"/>
-<anchor id="xml_post_tcrexdtd"/>
-<topic label="Generating XML files from XML schemas" href="topics/tcrexxsd.html"/>
-<anchor id="xml_post_tcrexxsd"/>
-</topic>
-<anchor id="xml_post_rlimitations_slushXML"/>
-<topic label="Editing XML files" href="topics/txedttag.html">
-<anchor id="xml_post_txedttag"/>
-<topic label="XML editor" href="topics/cwxmledt.html">
-<anchor id="xml_post_cwxmledt"/>
-<topic label="Defining XML editor preferences" href="topics/txprefs.html">
-<anchor id="xml_post_txprefs"/>
-<topic label="Setting source highlighting styles" href="topics/ttaghilt.html"/>
-<anchor id="xml_post_ttaghilt"/>
-<topic label="Specifying XML default encoding line delimiters" href="topics/tedtenc.html">
-<anchor id="xml_post_tedtenc"/>
-<topic label="XML and HTML encodings" href="topics/cxmlenc.html"/>
-<anchor id="xml_post_cxmlenc"/>
-</topic>
-<topic label="Setting the XML source suggestion strategy used by content assist" href="topics/tsugstrat.html"/>
-<anchor id="xml_post_tsugstrat"/>
-</topic>
-</topic>
-<topic label="Editing in the Design view" href="topics/txedtdes.html">
-<anchor id="xml_post_txedtdes"/>
-<topic label="Editing DOCTYPE declarations" href="topics/tedtdoc.html"/>
-<anchor id="xml_post_tedtdoc"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<anchor id="xml_post_tedtsch"/>
-<topic label="Editing XML processing instructions" href="topics/tedtproc.html"/>
-<anchor id="xml_post_tedtproc"/>
-</topic>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html">
-<anchor id="xml_post_txedtsrc"/>
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<anchor id="xml_post_twcdast"/>
-<topic label="Working with XML templates" href="topics/twmacro.html"/>
-<anchor id="xml_post_twmacro"/>
-</topic>
-<topic label="Editing with DTD or XML schema constraints" href="topics/tedtcnst.html"/>
-<anchor id="xml_post_tedtcnst"/>
-<topic label="Using xsi:type" href="topics/txsityp.html"/>
-<anchor id="xml_post_txsityp"/>
-<topic label="Editing XML documents with multiple namespaces" href="topics/rextctn.html"/>
-<anchor id="xml_post_rextctn"/>
-</topic>
-<topic label="Validating XML files" href="topics/twxvalid.html"/>
-<anchor id="xml_post_twxvalid"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html">
-<anchor id="xml_post_cxmlcat"/>
-<topic label="Adding entries to the XML Catalog" href="topics/txmlcat.html"/>
-<anchor id="xml_post_txmlcat"/>
-<topic label="Updating XML files with changes made to DTDs and schemas" href="topics/tedtgram.html"/>
-<topic label="XML Catalog keyboard shortcuts" href="topics/rxmlcatkey.html"/>
-<anchor id="xml_post_rxmlcatkey"/>
-<topic label="Source editor and XML tools keyboard shortcuts" href="topics/rxmltoolskey.html"/>
-<anchor id="xml_post_tedtgram"/>
-</topic>
-<topic label="Icons used in the XML editor" href="topics/rxmlbicons.html"/>
-<anchor id="xml_post_rxmlbicons"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap
deleted file mode 100644
index fdaba04..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.ditamap
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map id="xmleditorreltable">

-<topicgroup collection-type="family">

-<topicref href="topics/tcretxml.dita" id="xmlcretxml" navtitle="Creating empty XML files">

-</topicref>

-<topicref href="topics/tcrexdtd.dita" navtitle="Generating XML files from DTDs">

-</topicref>

-<topicref href="topics/tcrexxsd.dita" navtitle="Generating XML files from XML schemas">

-</topicref>

-<topicref href="topics/txedttag.dita" linking="targetonly" navtitle="Editing XML files">

-</topicref>

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedttag.dita" linking="sourceonly" navtitle="Editing XML files">

-</topicref>

-<topicref href="topics/cwxmledt.dita" linking="targetonly" navtitle="XML editor">

-</topicref>

-<topicref href="topics/txedtdes.dita" linking="targetonly" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/txedtsrc.dita" linking="targetonly" navtitle="Editing in the Source view">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-<topicref href="topics/tedtcnst.dita" navtitle="Editing with DTD or XML schema constraints">

-</topicref>

-<topicref href="topics/tedtdoc.dita" navtitle="Editing DOCTYPE declarations">

-</topicref>

-<topicref href="topics/txmlcat.dita" id="txmlcat" navtitle="Adding entries to the XML Catalog">

-</topicref>

-<topicref href="topics/tedtgram.dita" id="tedtgram" navtitle="Updating XML files with changes made to DTDs and schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-<topicref href="topics/tedtcnst.dita" navtitle="Editing with DTD or XML schema constraints">

-</topicref>

-<topicref href="topics/tedtsch.dita" navtitle="Editing namespace information">

-</topicref>

-<topicref href="topics/txmlcat.dita" navtitle="Adding entries to the XML Catalog">

-</topicref>

-<topicref href="topics/tedtgram.dita" navtitle="Updating XML files with changes made to DTDs and schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family" linking="normal">

-<topicref href="topics/tedtproc.dita" id="tedtproc" linking="targetonly" navtitle="Editing XML processing instructions">

-</topicref>

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family" linking="normal">

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor"></topicref>

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/txedtsrc.dita" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/cxmlcat.dita" navtitle="XML file associations with DTDs and XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family" linking="normal">

-<topicref href="topics/twxvalid.dita" navtitle="Validating XML files"></topicref>

-<topicref href="topics/cwxmledt.dita" navtitle="XML editor"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tcrexxsd.dita" navtitle="Generating XML files from XML schemas">

-</topicref>

-<topicref href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita"

-linking="targetonly" navtitle="XML namespaces" scope="peer"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tedtsch.dita" navtitle="Editing namespace information">

-</topicref>

-<topicref href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita"

-linking="targetonly" navtitle="XML namespaces" scope="peer"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtsrc.dita" id="txedsrc" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtsrc.dita" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/twmacro.dita" navtitle="Working with XML templates">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtsrc.dita" navtitle="Editing in the Source view">

-</topicref>

-<topicref href="topics/ttaghilt.dita" navtitle="Setting source highlighting styles">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-<topicref href="topics/twmacro.dita" navtitle="Working with XML templates">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/twcdast.dita" navtitle="Using XML content assist">

-</topicref>

-<topicref href="topics/tsugstrat.dita" navtitle="XML source suggestion strategy">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/tedtdoc.dita" navtitle="Editing DOCTYPE declarations">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/tedtsch.dita" navtitle="Editing namespace information">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/tedtproc.dita" navtitle="Editing XML processing instructions">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/txedtdes.dita" navtitle="Editing in the Design view">

-</topicref>

-<topicref href="topics/rxmlbicons.dita" navtitle="Icons used in the XML editor">

-</topicref>

-</topicgroup>

-</map>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.xml b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.xml
deleted file mode 100644
index 400ab50..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuilderrel.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc topic="topics/tcretxml.html">
-<topic label="Creating XML files" href="topics/tcretxml.html"/>
-<topic label="Generating XML files from DTDs" href="topics/tcrexdtd.html"/>
-<topic label="Generating XML files from XML schemas" href="topics/tcrexxsd.html"/>
-<topic label="Editing XML files" href="topics/txedttag.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Editing XML files" href="topics/txedttag.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="Editing with DTD or XML schema constraints" href="topics/tedtcnst.html"/>
-<topic label="Editing DOCTYPE declarations" href="topics/tedtdoc.html"/>
-<topic label="Adding entries to the XML Catalog" href="topics/txmlcat.html"/>
-<topic label="Updating XML files with changes made to DTDs and schemas" href="topics/tedtgram.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="Editing with DTD or XML schema constraints" href="topics/tedtcnst.html"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<topic label="Adding entries to the XML Catalog" href="topics/txmlcat.html"/>
-<topic label="Updating XML files with changes made to DTDs and schemas" href="topics/tedtgram.html"/>
-<topic label="Editing XML processing instructions" href="topics/tedtproc.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="XML file associations with DTDs and XML schemas" href="topics/cxmlcat.html"/>
-<topic label="Validating XML files" href="topics/twxvalid.html"/>
-<topic label="XML editor" href="topics/cwxmledt.html"/>
-<topic label="Generating XML files from XML schemas" href="topics/tcrexxsd.html"/>
-<topic label="XML namespaces" href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<topic label="XML namespaces" href="../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="Working with XML templates" href="topics/twmacro.html"/>
-<topic label="Editing in the Source view" href="topics/txedtsrc.html"/>
-<topic label="Setting source highlighting styles" href="topics/ttaghilt.html"/>
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<topic label="Working with XML templates" href="topics/twmacro.html"/>
-<topic label="Using XML content assist" href="topics/twcdast.html"/>
-<topic label="Setting the XML source suggestion strategy used by content assist" href="topics/tsugstrat.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing DOCTYPE declarations" href="topics/tedtdoc.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing namespace information" href="topics/tedtsch.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Editing XML processing instructions" href="topics/tedtproc.html"/>
-<topic label="Editing in the Design view" href="topics/txedtdes.html"/>
-<topic label="Icons used in the XML editor" href="topics/rxmlbicons.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/about.html b/docs/org.eclipse.wst.xmleditor.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties b/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
deleted file mode 100644
index 9f51d54..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = XMLBuildermap_toc.xml,\
-               about.html,\
-               images/,\
-               org.eclipse.wst.xmleditor.doc.userindex.xml,\
-               plugin.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
-               *.ditamap,\
-		       topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif
deleted file mode 100644
index 6b0872c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/cdatasection.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif
deleted file mode 100644
index 7dc0de5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/collapse_all.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif
deleted file mode 100644
index 28c2ccb..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/comment_obj.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif
deleted file mode 100644
index 3300f82..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/doctype.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif
deleted file mode 100644
index 492c14f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/expand_all.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif
deleted file mode 100644
index bea9974..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nattrib.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif
deleted file mode 100644
index afabdda..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nelem.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif
deleted file mode 100644
index 4742b8c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/nrstrval.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif
deleted file mode 100644
index 74436d8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/proinst_obj.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif
deleted file mode 100644
index 049cac6..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/rldgrmr.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/images/suggestion.gif b/docs/org.eclipse.wst.xmleditor.doc.user/images/suggestion.gif
deleted file mode 100644
index b4ea849..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/images/suggestion.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/_w.cfs b/docs/org.eclipse.wst.xmleditor.doc.user/index/_w.cfs
deleted file mode 100644
index a028898..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/_w.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable b/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions
deleted file mode 100644
index 2552ccf..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Tue May 20 11:13:05 EDT 2008

-org.eclipse.wst.xmleditor.doc.user=org.eclipse.wst.xmleditor.doc.user\n1.0.400.qualifier

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies
deleted file mode 100644
index 2d09d4e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Tue May 20 11:13:05 EDT 2008

-lucene=1.9.1.v200803061811

-analyzer=org.eclipse.help.base\#3.3.100.v20080425?locale\=en

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs
deleted file mode 100644
index 6420de2..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,31 +0,0 @@
-#This is a generated file; do not edit.

-#Tue May 20 11:13:05 EDT 2008

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html=0

-/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html=0

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/index/segments b/docs/org.eclipse.wst.xmleditor.doc.user/index/segments
deleted file mode 100644
index a4a692b..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml
deleted file mode 100644
index da5fafa..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/myplugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XMLBuildermap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-<extension
-        point="org.eclipse.help.index">
-        <index file="org.eclipse.wst.xmleditor.doc.userindex.xml"/>     
-  </extension>
-  <extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.user.maplist b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.user.maplist
deleted file mode 100644
index 6c3e248..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.user.maplist
+++ /dev/null
@@ -1,8 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="XMLBuildermap_toc.ditamap"/>

-  </nav>

-  <link>

-    <map file="XMLBuilderrel.ditamap"/>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml b/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
deleted file mode 100644
index 2218ba0..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/org.eclipse.wst.xmleditor.doc.userindex.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="XML files">
-    <entry keyword="creating">
-      <topic href="topics/tcretxml.html#tcretxml" title="Creating XML files"/>
-    </entry>
-    <entry keyword="generating from DTDs">
-      <topic href="topics/tcrexdtd.html#tcrexdtd" title="Generating XML files from DTDs"/>
-    </entry>
-    <entry keyword="generating from XML schemas">
-      <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
-    </entry>
-    <entry keyword="schemas">
-      <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
-    </entry>
-    <entry keyword="editing">
-      <topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
-    </entry>
-    <entry keyword="specifying line delimiters">
-      <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
-    </entry>
-    <entry keyword="namespace information">
-      <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
-    </entry>
-    <entry keyword="processing instructions">
-      <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
-    </entry>
-    <entry keyword="content assist">
-      <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
-    </entry>
-    <entry keyword="templates">
-      <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
-    </entry>
-    <entry keyword="editing with constraints">
-      <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
-    </entry>
-    <entry keyword="validating">
-      <topic href="topics/twxvalid.html#twxvalid" title="Validating XML files"/>
-    </entry>
-    <entry keyword="associations">
-      <topic href="topics/cxmlcat.html#cxmlcat" title="XML file associations with DTDs and XML schemas"/>
-    </entry>
-    <entry keyword="updating with associated changes">
-      <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
-    </entry>
-  </entry>
-  <entry keyword="DTDs">
-    <entry keyword="generating XML files">
-      <topic href="topics/tcrexdtd.html#tcrexdtd" title="Generating XML files from DTDs"/>
-    </entry>
-  </entry>
-  <entry keyword="schemas">
-    <entry keyword="generating XML files">
-      <topic href="topics/tcrexxsd.html#tcrexxsd" title="Generating XML files from XML schemas"/>
-    </entry>
-  </entry>
-  <entry keyword="XML editor">
-    <entry keyword="XML files">
-      <topic href="topics/txedttag.html#txedttag" title="Editing XML files"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cwxmledt.html#cwxmledt" title="XML editor"/>
-    </entry>
-    <entry keyword="preferences">
-      <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
-    </entry>
-    <entry keyword="setting source highlighting styles">
-      <topic href="topics/ttaghilt.html#ttaghilt" title="Setting source highlighting styles"/>
-    </entry>
-    <entry keyword="source suggestion strategy">
-      <topic href="topics/tsugstrat.html#xmlsourcesuggestionstrategy" title="Setting the XML source suggestion strategy used by content assist"/>
-    </entry>
-    <entry keyword="Design view">
-      <topic href="topics/txedtdes.html#txedtdes" title="Editing in the Design view"/>
-    </entry>
-    <entry keyword="DOCTYPE declarations">
-      <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
-    </entry>
-    <entry keyword="namespace information">
-      <topic href="topics/tedtsch.html#tedtsch" title="Editing namespace information"/>
-    </entry>
-    <entry keyword="processing instructions">
-      <topic href="topics/tedtproc.html#tedtproc" title="Editing XML processing instructions"/>
-    </entry>
-    <entry keyword="Source view">
-      <topic href="topics/txedtsrc.html#txedtsrc" title="Editing in the Source view"/>
-    </entry>
-    <entry keyword="content assist">
-      <topic href="topics/twcdast.html#twcdast" title="Using XML content assist"/>
-    </entry>
-    <entry keyword="editing with constraints">
-      <topic href="topics/tedtcnst.html#tedtcnst" title="Editing with DTD or XML schema constraints"/>
-    </entry>
-    <entry keyword="updating XML files">
-      <topic href="topics/tedtgram.html#tedtgram" title="Updating XML files with changes made to DTDs and schemas"/>
-    </entry>
-    <entry keyword="accessibility">
-      <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
-    </entry>
-    <entry keyword="keyboard shortcuts">
-      <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
-    </entry>
-    <entry keyword="icons">
-      <topic href="topics/rxmlbicons.html#ricons" title="Icons used in the XML editor"/>
-    </entry>
-  </entry>
-  <entry keyword="preferences">
-    <entry keyword="XML editor">
-      <topic href="topics/txprefs.html#txprefs" title="Defining XML editor preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="line delimiters">
-    <entry keyword="XML files">
-      <topic href="topics/tedtenc.html#tedtenc" title="Specifying XML default encoding line delimiters"/>
-    </entry>
-  </entry>
-  <entry keyword="character encoding">
-    <entry keyword="supported character sets">
-      <topic href="topics/cxmlenc.html#cxmlenc" title="XML and HTML encodings"/>
-    </entry>
-  </entry>
-  <entry keyword="DOCTYPE declarations">
-    <entry keyword="XML editor">
-      <topic href="topics/tedtdoc.html#tedtdoc" title="Editing DOCTYPE declarations"/>
-    </entry>
-  </entry>
-  <entry keyword="templates">
-    <entry keyword="working with predefined XML code">
-      <topic href="topics/twmacro.html#twmacro" title="Working with XML templates"/>
-    </entry>
-  </entry>
-  <entry keyword="XML catalog">
-    <entry keyword="overview">
-      <topic href="topics/cxmlcat.html#cxmlcat" title="XML file associations with DTDs and XML schemas"/>
-    </entry>
-    <entry keyword="adding entries">
-      <topic href="topics/txmlcat.html#txmlcat" title="Adding entries to the XML Catalog"/>
-    </entry>
-  </entry>
-  <entry keyword="accessibility">
-    <entry keyword="keyboard shortcuts">
-      <entry keyword="XML editor">
-        <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
-      </entry>
-    </entry>
-  </entry>
-  <entry keyword="keyboard shortcuts">
-    <entry keyword="XML editor">
-      <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
-    </entry>
-  </entry>
-  <entry keyword="shortcuts">
-    <entry keyword="keyboard">
-      <entry keyword="XML editor">
-        <topic href="topics/rxmlcatkey.html#xmlcatalogkeyboardshortcuts" title="XML Catalog keyboard shortcuts"/>
-      </entry>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties
deleted file mode 100644
index 13ed1ee..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.properties
+++ /dev/null
@@ -1,13 +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
-###############################################################################
-
-pluginName     = XML editor
-pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
deleted file mode 100644
index da5fafa..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2007 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XMLBuildermap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-<extension
-        point="org.eclipse.help.index">
-        <index file="org.eclipse.wst.xmleditor.doc.userindex.xml"/>     
-  </extension>
-  <extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita
deleted file mode 100644
index 9019048..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.dita
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<?Pub Inc?>

-<concept id="creatingxmlfiles" xml:lang="en-us">

-<title>Creating XML files</title>

-<shortdesc>This section contains information on creating XML files:</shortdesc>

-<conbody></conbody>

-<related-links>

-<linklist>

-<link href="tcretxml.dita"><linktext>Creating empty XML files</linktext></link>

-<link href="tcrexdtd.dita"><linktext>Generating XML files from a DTDs</linktext>

-</link>

-<link href="tcrexxsd.dita"><linktext>Generating XML files from XML

-schemas</linktext></link>

-</linklist>

-</related-links>

-</concept>

-<?Pub *0000000718?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
deleted file mode 100644
index ef49057..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ccreatxm.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Creating XML files" />
-<meta name="abstract" content="This section contains information on creating XML files:" />
-<meta name="description" content="This section contains information on creating XML files:" />
-<meta scheme="URI" name="DC.Relation" content="tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrexxsd.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="creatingxmlfiles" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating XML files</title>
-</head>
-<body id="creatingxmlfiles"><a name="creatingxmlfiles"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating XML files</h1>
-
-
-<div><p>This section contains information on creating XML files:</p>
-</div>
-
-<div>
-<div class="linklist">
-<div><a href="tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating empty XML files</a></div>
-<div><a href="tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from a DTDs</a></div>
-<div><a href="tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML
-schemas</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
deleted file mode 100644
index 9775da8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkXML.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Working with XML files" />
-<meta name="abstract" content="This section contains information on the following:" />
-<meta name="description" content="This section contains information on the following:" />
-<meta scheme="URI" name="DC.Relation" content="ccreatxm.html" />
-<meta scheme="URI" name="DC.Relation" content="txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="twxvalid.html" />
-<meta scheme="URI" name="DC.Relation" content="cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="rxmlbicons.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="workingwithxmlfiles" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with XML files</title>
-</head>
-<body id="workingwithxmlfiles"><a name="workingwithxmlfiles"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with XML files</h1>
-
-
-<div><p>This section contains information on the following:</p>
-</div>
-
-<div>
-<div class="linklist">
-<div><a href="ccreatxm.html" title="This section contains information on creating XML files:">Creating XML files</a></div>
-<div><a href="txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-<div><a href="twxvalid.html" title="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed.">Validating XML files</a></div>
-<div><a href="cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML
-schema</a></div>
-<div><a href="rxmlbicons.html" title="The following XML editor icons appear in the Outline and Design view.">Icons used in the XML editor</a></div></div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita
deleted file mode 100644
index a6fa3e1..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cworkxml.dita
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<?Pub Inc?>

-<concept id="workingwithxmlfiles" xml:lang="en-us">

-<title>Working with XML files</title>

-<shortdesc>This section contains information on the following:</shortdesc>

-<conbody></conbody>

-<related-links>

-<linklist>

-<link href="ccreatxm.dita"><linktext>Creating XML files</linktext></link>

-<link href="txedttag.dita"><linktext>Editing XML files</linktext>

-</link>

-<link href="twxvalid.dita"><linktext>Validating XML files</linktext></link>

-<link href="cxmlcat.dita"><linktext>XML file associations with DTDs and XML

-schema</linktext></link>

-<link href="rxmlbicons.dita"><linktext>Icons used in the XML editor</linktext>

-</link>

-</linklist>

-</related-links>

-</concept>

-<?Pub *0000000871?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
deleted file mode 100644
index 654b609..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cwxmledt" xml:lang="en-us">

-<title>XML editor</title>

-<titlealts>

-<searchtitle>XML editor</searchtitle>

-</titlealts>

-<shortdesc>The XML editor is a tool for creating and viewing XML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>You can use it to perform a variety of tasks such as:</p>

-<ul>

-<li>Creating new, empty XML files or generating them from existing DTDs or

-existing XML schemas</li>

-<li>Editing XML files</li>

-<li>Importing existing XML files for structured viewing</li>

-<li>Associating XML files with DTDs or XML schemas</li>

-</ul>

-<p>The XML editor has two main views - the Source view and the Design view.

-You can also use the Outline view to insert and delete elements.</p>

-<section><title>Source view</title><p>The Source view enables you to view

-and work directly with a file's source code. Many of the XML editing features

-in the XML editor Source view are very similar to those available in the Source

-view of Page Designer.</p><p>The Source view has many text editing features,

-such as: <ul>

-<li> Syntax highlighting, unlimited undo/redo, and user-defined templates.</li>

-<li> Content assist, which uses the information in a DTD or schema content

-model to provide a list of acceptable continuations depending on where the

-cursor is located in an XML file, or what has just been typed.</li>

-<li>"Smart" double-clicking behavior. If your cursor is placed in an attribute

-value, one double-click selects that value, another double click selects the

-attribute-value pair, and a third double-click selects the entire tag. This

-makes it easier to copy and paste commonly used pieces of XML.</li>

-</ul></p></section>

-<section><title>Design view</title><p>The XML editor also has a Design view.

-This view has the following features:<ul>

-<li>The XML file is represented simultaneously as a table and a tree. This

-helps make navigation and editing easier.</li>

-<li>Content and attribute values can be edited directly in the table cells,

-while pop-up menus on the tree nodes give alternatives that are valid for

-that location.  For example, the <uicontrol>Add Child</uicontrol> menu item

-will list only those elements from a DTD or XML schema which would be valid

-children at that point (as long as grammar constraints are on).</li>

-</ul></p><p>The Design view is especially helpful if you are new to XML, or

-need to do form-oriented editing. For example, you could use the Create XML

-File wizard to create a template XML file for a job description form from

-a job description DTD. After those steps are completed, you would only have

-to fill in the form data using the Design view.</p></section>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
deleted file mode 100644
index 6d73a83..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cwxmledt.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML editor" />
-<meta name="abstract" content="The XML editor is a tool for creating and viewing XML files." />
-<meta name="description" content="The XML editor is a tool for creating and viewing XML files." />
-<meta content="XML editor, overview" name="DC.subject" />
-<meta content="XML editor, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrexxsd.html" />
-<meta scheme="URI" name="DC.Relation" content="txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="twxvalid.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cwxmledt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML editor</title>
-</head>
-<body id="cwxmledt"><a name="cwxmledt"><!-- --></a>
-
-
-<h1 class="topictitle1">XML editor</h1>
-
-
-
-
-<div><p>The XML editor is a tool for creating and viewing XML files.</p>
-
-<p>You can use it to perform a variety of tasks such as:</p>
-
-<ul>
-<li>Creating new, empty XML files or generating them from existing DTDs or
-existing XML schemas</li>
-
-<li>Editing XML files</li>
-
-<li>Importing existing XML files for structured viewing</li>
-
-<li>Associating XML files with DTDs or XML schemas</li>
-
-</ul>
-
-<p>The XML editor has two main views - the Source view and the Design view.
-You can also use the Outline view to insert and delete elements.</p>
-
-<div class="section"><h4 class="sectiontitle">Source view</h4><p>The Source view enables you to view
-and work directly with a file's source code. Many of the XML editing features
-in the XML editor Source view are very similar to those available in the Source
-view of Page Designer.</p>
-<div class="p">The Source view has many text editing features,
-such as: <ul>
-<li> Syntax highlighting, unlimited undo/redo, and user-defined templates.</li>
-
-<li> Content assist, which uses the information in a DTD or schema content
-model to provide a list of acceptable continuations depending on where the
-cursor is located in an XML file, or what has just been typed.</li>
-
-<li>"Smart" double-clicking behavior. If your cursor is placed in an attribute
-value, one double-click selects that value, another double click selects the
-attribute-value pair, and a third double-click selects the entire tag. This
-makes it easier to copy and paste commonly used pieces of XML.</li>
-
-</ul>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Design view</h4><div class="p">The XML editor also has a Design view.
-This view has the following features:<ul>
-<li>The XML file is represented simultaneously as a table and a tree. This
-helps make navigation and editing easier.</li>
-
-<li>Content and attribute values can be edited directly in the table cells,
-while pop-up menus on the tree nodes give alternatives that are valid for
-that location.  For example, the <span class="uicontrol">Add Child</span> menu item
-will list only those elements from a DTD or XML schema which would be valid
-children at that point (as long as grammar constraints are on).</li>
-
-</ul>
-</div>
-<p>The Design view is especially helpful if you are new to XML, or
-need to do form-oriented editing. For example, you could use the Create XML
-File wizard to create a template XML file for a job description form from
-a job description DTD. After those steps are completed, you would only have
-to fill in the form data using the Design view.</p>
-<p />
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating XML files</a></div>
-<div><a href="tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from DTDs</a></div>
-<div><a href="tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML schemas</a></div>
-<div><a href="txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-<div><a href="txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="twxvalid.html" title="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed.">Validating XML files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
deleted file mode 100644
index 78efa4f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.dita
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cxmlcat" xml:lang="en-us">

-<title>XML file associations with DTDs and XML schemas</title>

-<titlealts>

-<searchtitle>XML file associations with DTDs and XML schemas</searchtitle>

-</titlealts>

-<shortdesc>When an XML file is associated with a DTD or XML schema, it is

-bound by any structural rules contained in the DTD or XML schema. To be considered

-a valid XML file, a document must be accompanied by a DTD or an XML schema,

-and conform to all of the declarations in the DTD or the XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML catalog<indexterm>overview</indexterm></indexterm>

-<indexterm>XML files<indexterm>associations</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>There are two different ways to associate XML files with DTDs or XML schemas.</p>

-<ol>

-<li>Direct association - The XML file contains either the name of a DTD in

-its doctype declaration (for example, &lt;!DOCTYPE root-element SYSTEM "<varname>dtdfile.dtd</varname>"

->, where <varname>dtdfile.dtd</varname> is the name of the DTD file) or it

-contains the path of an XML schema in the schemaLocation attribute of the

-XML file root element (for example, &lt;xsi:schemaLocation="http://www.ibm.com/<varname>schema.xsd</varname>">,

-where  <varname>schema.xsd</varname> is the name of the XML schema.</li>

-<li>XML Catalog entry - You can register DTD and XML schema files in the XML

-Catalog and associate them with a  Key that represents them. You can then

-refer to a DTD or XML schema file Key from an XML file instead of referring

-directly to the DTD or XML schema file. An XML Catalog entry contains two

-parts - the Key (which represents the DTD or XML schema) and a URI (which

-contains information about the DTD or XML schema location).</li>

-</ol>

-<section><title>How an association works</title><b>Associating an XML file

-with a DTD </b><p>If an XML file is associated with a DTD, a DOCTYPE tag such

-as the following one is included in the XML file:<codeblock>&lt;!DOCTYPE root-name PUBLIC "<varname>InvoiceId</varname>" "<varname>C:\mydtds\Invoice.dtd</varname

->">

-</codeblock></p><p>InvoiceId is the public identifier of the DTD file. It

-is used to associate the XML file with a DTD file (in this case, the DTD file

-is Invoice.dtd). If the public identifier InvoiceId corresponds to the Key

-of the XML Catalog entry for Invoice.dtd, then the U<?Pub Caret?>RI of the

-XML Catalog entry (which contains information about the location of Invoice.dtd)

-is used to locate the DTD. Otherwise, the DOCTYPE's system identifier ("C:\mydtds\Invoice.dtd"),

-which refers directly to the file system location of the DTD, is used to locate

-the DTD.</p><note>You can also use a system identifier as a Key in an XML

-Catalog entry. If you use a system identifier as a Key, a DOCTYPE tag such

-as the following one is included in an XML file:</note><codeblock>&lt;!DOCTYPE Root-name SYSTEM "MyDTD.dtd"> </codeblock><p>where

-MyDTD.dtd is the system identifier that corresponds to the Key of an XML Catalog

-entry.</p></section>

-<section><b>Associating an XML file with an XML schema</b><p>If an XML file

-is associated with an XML schema, one or more schema location attributes are

-included in the XML file. The information in the schemaLocation is provided

-as a "hint" to the XML processor. The following examples show schemaLocation

-attributes:</p><p> <b>Example 1 </b><codeblock>&lt;purchaseOrder xmlns="http://www.ibm.com"

-xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd">

-&lt;shipTo country="US">

-...</codeblock>    </p><p><b>Example 2 </b><codeblock>&lt;purchaseOrder xmlns="http://www.ibm.com"

-xsi:schemaLocation="http://www.ibm.com PO.xsd">

-&lt;shipTo country="US">

-....</codeblock>  </p><p>In Example 1, the schemaLocation 'hint' ('C:\myschemas\PurchaseOrder.xsd')

-refers directly to the file system location or URI of the XML schema. In this

-case, the schema file will be located by the XML processor directly.</p><p>In

-Example 2, the schemaLocation 'hint' ('PO.xsd') refers to an XML Catalog entry.

-PO.xsd corresponds to the  <varname>Key</varname> of the XML Catalog entry

-for PurchaseOrder.xsd, and the URI of the XML Catalog entry (which contains

-information about the location of PurchaseOrder.xsd) will be used to located

-the XML schema.</p><p>In both examples, <codeph>http://www.ibm.com</codeph> in

-the <codeph>xsi:schemaLocation</codeph> tag is a URI that identifies the namespace

-for the XML schema.</p><p>You can also use a namespace as a Key for an XML

-Catalog entry. If you use a namespace as a Key, a schemaLocation tag such

-as the following one is included in an XML file:<codeblock>&lt;purchaseOrder xmlns:="www.ibm.com"

-xsi:schemaLocation="http://www.ibm.com po/xsd/PurchaseOrder.xsd "></codeblock></p><p>The

-schemaLocation attribute points to both the Key and the actual location of

-the schema.</p><p><b>DTD or XML schema resides on a remote server</b></p><p>Several

-functions in the XML editor, such as validation and content assist, require

-the availability of a DTD or an XML schema. The product documentation provides

-usage information for cases when the DTD or XML schema resides on your local

-machine. However, in many cases, the DTD or XML schema can reside on a remote

-server, for example:</p><p><codeph>&lt;!DOCTYPE Catalog PUBLIC "abc/Catalog"

-"http://xyz.abc.org/dtds/catalog.dtd"></codeph></p><p>Normally, this case

-poses no problem, because the DTD or XML schema can be retrieved from the

-remote server. However, if you are behind a firewall, and do not have a SOCKSified

-system, the workbench currently does not provide a way for you to specify

-a socks server for retrieving a DTD or XML schema. If you are unable to SOCKSify

-your system, the workaround for this problem is to retrieve a copy of the

-DTD or XML schema (using a Web browser, for example) and save that copy on

-your local machine. Then, you can either place a local copy in the same project

-as your XML file, or use the XML Catalog to associate a public identifier

-with the DTD's (local) location.</p><note>If you have an XML file associated

-with an XML schema or DTD that is elsewhere in the network, and you are working

-on a machine disconnected from the network, you can follow the steps described

-previously if you want to use content assist or validate your XML file.  </note></section>

-<section><title>Advantages of XML Catalog entry associations</title><p>If

-you create a direct association between an XML file and an XML schema or DTD

-file, any time you change the location of the schema or DTD you have to track

-down and update all of the referencing XML files with the new location of

-the DTD or schema. If, however, you associate an XML file with an XML schema

-or DTD Key, then, when you change the location of the schema or DTD, you only

-have to update the XML Catalog entry, instead of each individual XML file.</p><p>For

-example, you have a DTD called Building.dtd, which is associated with five

-XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.

-You move the DTD file Building.dtd to a new location. If you have a direction

-association between Building.dtd and all the XML files, you will have to update

-the &lt;DOCTTYPE> declaration in each XML file to reflect the new location

-of Building.dtd. If, however, you have an XML Catalog association, and all

-the XML files just refer to the Key of Building.dtd, then you only have to

-update the URI and all the XML files will point to the new location of Building.dtd.</p></section>

-<section><title>Updating an entry in the XML Catalog</title><p>After you have

-updated an entry in the XML Catalog, you might need to refresh the XML editor

-view so that it uses the new information. To do this, click the <uicontrol>Reload

-Dependencies</uicontrol> toolbar button <image href="../images/rldgrmr.gif">

-<alt>This graphic is the Reload Dependencies toolbar button</alt></image> and

-the view will be updated using the current XML Catalog settings. You only

-need to refresh the XML editor view when you have an XML file open that references

-the XML Catalog entry that was updated.</p><p>For more information, refer

-to the related tasks.</p></section>

-</conbody>

-</concept>

-<?Pub *0000008359?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
deleted file mode 100644
index c50b8a2..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlcat.html
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML file associations with DTDs and XML schemas" />
-<meta name="abstract" content="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema." />
-<meta name="description" content="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema." />
-<meta content="XML catalog, overview, XML files, associations" name="DC.subject" />
-<meta content="XML catalog, overview, XML files, associations" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtproc.html" />
-<meta scheme="URI" name="DC.Relation" content="cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="txedtsrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cxmlcat" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML file associations with DTDs and XML schemas</title>
-</head>
-<body id="cxmlcat"><a name="cxmlcat"><!-- --></a>
-
-
-<h1 class="topictitle1">XML file associations with DTDs and XML schemas</h1>
-
-
-
-
-<div><p>When an XML file is associated with a DTD or XML schema, it is
-bound by any structural rules contained in the DTD or XML schema. To be considered
-a valid XML file, a document must be accompanied by a DTD or an XML schema,
-and conform to all of the declarations in the DTD or the XML schema.</p>
-
-<p>There are two different ways to associate XML files with DTDs or XML schemas.</p>
-
-<ol>
-<li>Direct association - The XML file contains either the name of a DTD in
-its doctype declaration (for example, &lt;!DOCTYPE root-element SYSTEM "<var class="varname">dtdfile.dtd</var>"
-&gt;, where <var class="varname">dtdfile.dtd</var> is the name of the DTD file) or it
-contains the path of an XML schema in the schemaLocation attribute of the
-XML file root element (for example, &lt;xsi:schemaLocation="http://www.ibm.com/<var class="varname">schema.xsd</var>"&gt;,
-where  <var class="varname">schema.xsd</var> is the name of the XML schema.</li>
-
-<li>XML Catalog entry - You can register DTD and XML schema files in the XML
-Catalog and associate them with a  Key that represents them. You can then
-refer to a DTD or XML schema file Key from an XML file instead of referring
-directly to the DTD or XML schema file. An XML Catalog entry contains two
-parts - the Key (which represents the DTD or XML schema) and a URI (which
-contains information about the DTD or XML schema location).</li>
-
-</ol>
-
-<div class="section"><h4 class="sectiontitle">How an association works</h4><strong>Associating an XML file
-with a DTD </strong><div class="p">If an XML file is associated with a DTD, a DOCTYPE tag such
-as the following one is included in the XML file:<pre>&lt;!DOCTYPE root-name PUBLIC "<var class="varname">InvoiceId</var>" "<var class="varname">C:\mydtds\Invoice.dtd</var>"&gt;
-</pre>
-</div>
-<p>InvoiceId is the public identifier of the DTD file. It
-is used to associate the XML file with a DTD file (in this case, the DTD file
-is Invoice.dtd). If the public identifier InvoiceId corresponds to the Key
-of the XML Catalog entry for Invoice.dtd, then the URI of the
-XML Catalog entry (which contains information about the location of Invoice.dtd)
-is used to locate the DTD. Otherwise, the DOCTYPE's system identifier ("C:\mydtds\Invoice.dtd"),
-which refers directly to the file system location of the DTD, is used to locate
-the DTD.</p>
-<div class="note"><span class="notetitle">Note:</span> You can also use a system identifier as a Key in an XML
-Catalog entry. If you use a system identifier as a Key, a DOCTYPE tag such
-as the following one is included in an XML file:</div>
-<pre>&lt;!DOCTYPE Root-name SYSTEM "MyDTD.dtd"&gt; </pre>
-<p>where
-MyDTD.dtd is the system identifier that corresponds to the Key of an XML Catalog
-entry.</p>
-</div>
-
-<div class="section"><strong>Associating an XML file with an XML schema</strong><p>If an XML file
-is associated with an XML schema, one or more schema location attributes are
-included in the XML file. The information in the schemaLocation is provided
-as a "hint" to the XML processor. The following examples show schemaLocation
-attributes:</p>
-<div class="p"> <strong>Example 1 </strong><pre>&lt;purchaseOrder xmlns="http://www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com C:\myschemas\PurchaseOrder.xsd"&gt;
-&lt;shipTo country="US"&gt;
-...</pre>
-    </div>
-<div class="p"><strong>Example 2 </strong><pre>&lt;purchaseOrder xmlns="http://www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com PO.xsd"&gt;
-&lt;shipTo country="US"&gt;
-....</pre>
-  </div>
-<p>In Example 1, the schemaLocation 'hint' ('C:\myschemas\PurchaseOrder.xsd')
-refers directly to the file system location or URI of the XML schema. In this
-case, the schema file will be located by the XML processor directly.</p>
-<p>In
-Example 2, the schemaLocation 'hint' ('PO.xsd') refers to an XML Catalog entry.
-PO.xsd corresponds to the  <var class="varname">Key</var> of the XML Catalog entry
-for PurchaseOrder.xsd, and the URI of the XML Catalog entry (which contains
-information about the location of PurchaseOrder.xsd) will be used to located
-the XML schema.</p>
-<p>In both examples, <samp class="codeph">http://www.ibm.com</samp> in
-the <samp class="codeph">xsi:schemaLocation</samp> tag is a URI that identifies the namespace
-for the XML schema.</p>
-<div class="p">You can also use a namespace as a Key for an XML
-Catalog entry. If you use a namespace as a Key, a schemaLocation tag such
-as the following one is included in an XML file:<pre>&lt;purchaseOrder xmlns:="www.ibm.com"
-xsi:schemaLocation="http://www.ibm.com po/xsd/PurchaseOrder.xsd "&gt;</pre>
-</div>
-<p>The
-schemaLocation attribute points to both the Key and the actual location of
-the schema.</p>
-<p><strong>DTD or XML schema resides on a remote server</strong></p>
-<p>Several
-functions in the XML editor, such as validation and content assist, require
-the availability of a DTD or an XML schema. The product documentation provides
-usage information for cases when the DTD or XML schema resides on your local
-machine. However, in many cases, the DTD or XML schema can reside on a remote
-server, for example:</p>
-<p><samp class="codeph">&lt;!DOCTYPE Catalog PUBLIC "abc/Catalog"
-"http://xyz.abc.org/dtds/catalog.dtd"&gt;</samp></p>
-<p>Normally, this case
-poses no problem, because the DTD or XML schema can be retrieved from the
-remote server. However, if you are behind a firewall, and do not have a SOCKSified
-system, the workbench currently does not provide a way for you to specify
-a socks server for retrieving a DTD or XML schema. If you are unable to SOCKSify
-your system, the workaround for this problem is to retrieve a copy of the
-DTD or XML schema (using a Web browser, for example) and save that copy on
-your local machine. Then, you can either place a local copy in the same project
-as your XML file, or use the XML Catalog to associate a public identifier
-with the DTD's (local) location.</p>
-<div class="note"><span class="notetitle">Note:</span> If you have an XML file associated
-with an XML schema or DTD that is elsewhere in the network, and you are working
-on a machine disconnected from the network, you can follow the steps described
-previously if you want to use content assist or validate your XML file.  </div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Advantages of XML Catalog entry associations</h4><p>If
-you create a direct association between an XML file and an XML schema or DTD
-file, any time you change the location of the schema or DTD you have to track
-down and update all of the referencing XML files with the new location of
-the DTD or schema. If, however, you associate an XML file with an XML schema
-or DTD Key, then, when you change the location of the schema or DTD, you only
-have to update the XML Catalog entry, instead of each individual XML file.</p>
-<p>For
-example, you have a DTD called Building.dtd, which is associated with five
-XML files - Office.xml, House.xml, Apartment.xml, Bank.xml, and PostOffice.xml.
-You move the DTD file Building.dtd to a new location. If you have a direction
-association between Building.dtd and all the XML files, you will have to update
-the &lt;DOCTTYPE&gt; declaration in each XML file to reflect the new location
-of Building.dtd. If, however, you have an XML Catalog association, and all
-the XML files just refer to the Key of Building.dtd, then you only have to
-update the URI and all the XML files will point to the new location of Building.dtd.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Updating an entry in the XML Catalog</h4><p>After you have
-updated an entry in the XML Catalog, you might need to refresh the XML editor
-view so that it uses the new information. To do this, click the <span class="uicontrol">Reload
-Dependencies</span> toolbar button <img src="../images/rldgrmr.gif" alt="This graphic is the Reload Dependencies toolbar button" /> and
-the view will be updated using the current XML Catalog settings. You only
-need to refresh the XML editor view when you have an XML file open that references
-the XML Catalog entry that was updated.</p>
-<p>For more information, refer
-to the related tasks.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-<div><a href="tedtproc.html" title="If you have instructions you want to send to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
-<div><a href="txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
deleted file mode 100644
index b5f74d8..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.dita
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cxmlenc" xml:lang="en-us">

-<title>XML and HTML encodings</title>

-<titlealts>

-<searchtitle>XML and HTML encodings</searchtitle>

-</titlealts>

-<shortdesc>Encodings enable you to specify what character encoding your text

-is in.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="cxmlenc|1|characterencodingtextinfiles" status="changed">character

-encoding<indexterm>supported character sets</indexterm></indexterm></keywords>

-</metadata></prolog>

-<conbody>

-<p>The IANA name is used in the encoding statement of an XML file, or charset

-directive in an HTML file.</p>

-<p>The HTML and XML editors support the following encodings:</p>

-<table rowheader="firstcol">

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<thead>

-<row>

-<entry colname="COLSPEC0" valign="top"> <p><b>XML Encoding (IANA Name)</b></p> </entry>

-<entry colname="COLSPEC1" valign="top"> <p><b>Description</b></p> </entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry> <p>BIG5</p> </entry>

-<entry> <p>Big5, Traditional Chinese</p> </entry>

-</row>

-<row>

-<entry> <p>EUC-JP</p> </entry>

-<entry> <p>EUC encoding, Japanese</p> </entry>

-</row>

-<row>

-<entry> <p>EUC-KR</p> </entry>

-<entry> <p>EUC encoding, Korean</p> </entry>

-</row>

-<row>

-<entry>GB18030</entry>

-<entry>National Standard, Chinese</entry>

-</row>

-<row>

-<entry> <p>ISO-2022-JP</p> </entry>

-<entry> <p>ISO 2022, Japanese</p> </entry>

-</row>

-<row>

-<entry> <p>ISO-2022-KR</p> </entry>

-<entry> <p>ISO 2022, Korean</p> </entry>

-</row>

-<row>

-<entry> <p>ISO-8859-1</p> </entry>

-<entry> <p>ISO Latin-1</p> </entry>

-</row>

-<row>

-<entry>ISO-8859-2</entry>

-<entry>Central/East European (Slavic)</entry>

-</row>

-<row>

-<entry>ISO-8859-3</entry>

-<entry>Southern European</entry>

-</row>

-<row>

-<entry>ISO-8859-4</entry>

-<entry>ISO 8859-4, Cyrillic</entry>

-</row>

-<row>

-<entry>ISO-8859-5</entry>

-<entry>ISO 8859-5, Cyrillic</entry>

-</row>

-<row>

-<entry> <p>ISO-8859-6</p> </entry>

-<entry> <p>Arabic (Logical)</p> </entry>

-</row>

-<row>

-<entry>ISO-8859-7</entry>

-<entry>Greek</entry>

-</row>

-<row>

-<entry> <p>ISO-8859-8</p> </entry>

-<entry> <p>Hebrew (Visual) (encoding supported, but not supported by the Page

-Designer Design page)</p> </entry>

-</row>

-<row>

-<entry>ISO-8859-9</entry>

-<entry>Turkish</entry>

-</row>

-<row>

-<entry> <p>SHIFT_JIS</p> </entry>

-<entry> <p>Shift-JIS, Japanese</p> </entry>

-</row>

-<row>

-<entry>TIS-620</entry>

-<entry>TISI, Thai</entry>

-</row>

-<row>

-<entry> <p>US-ASCII</p> </entry>

-<entry> <p>US ASCII</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-8</p> </entry>

-<entry> <p>ISO 10646/Unicode, one-byte encoding</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-16</p> </entry>

-<entry> <p>ISO 10646/Unicode, two-byte encoding</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-16BE</p> </entry>

-<entry> <p>Unicode BigEndian</p> </entry>

-</row>

-<row>

-<entry> <p>UTF-16LE</p> </entry>

-<entry> <p>Unicode LittleEndian</p> </entry>

-</row>

-<row>

-<entry colname="COLSPEC0"><p>WINDOWS-31J</p></entry>

-<entry colname="COLSPEC1"><p>Japanese, Windows-31J</p></entry>

-</row>

-<row>

-<entry> <p>WINDOWS-1255</p> </entry>

-<entry> <p>Hebrew</p> </entry>

-</row>

-<row>

-<entry> <p>WINDOWS-1256</p> </entry>

-<entry> <p>Arabic</p> </entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</conbody>

-</concept>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
deleted file mode 100644
index 5fa5774..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmlenc.html
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML and HTML encodings" />
-<meta name="abstract" content="Encodings enable you to specify what character encoding your text is in." />
-<meta name="description" content="Encodings enable you to specify what character encoding your text is in." />
-<meta content="character encoding, supported character sets" name="DC.subject" />
-<meta content="character encoding, supported character sets" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cxmlenc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML and HTML encodings</title>
-</head>
-<body id="cxmlenc"><a name="cxmlenc"><!-- --></a>
-
-
-<h1 class="topictitle1">XML and HTML encodings</h1>
-
-
-
-
-<div><p>Encodings enable you to specify what character encoding your text
-is in.</p>
-
-<p>The IANA name is used in the encoding statement of an XML file, or charset
-directive in an HTML file.</p>
-
-<p>The HTML and XML editors support the following encodings:</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr>
-<th valign="top" class="firstcol" id="N10072"> <p><strong>XML Encoding (IANA Name)</strong></p>
- </th>
-
-<th valign="top" id="N10084"> <p><strong>Description</strong></p>
- </th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<th valign="top" class="firstcol" id="N100A2" headers="N10072 "> <p>BIG5</p>
- </th>
-
-<td valign="top" headers="N100A2 N10084 "> <p>Big5, Traditional Chinese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N100C2" headers="N10072 "> <p>EUC-JP</p>
- </th>
-
-<td valign="top" headers="N100C2 N10084 "> <p>EUC encoding, Japanese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N100E2" headers="N10072 "> <p>EUC-KR</p>
- </th>
-
-<td valign="top" headers="N100E2 N10084 "> <p>EUC encoding, Korean</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10102" headers="N10072 ">GB18030</th>
-
-<td valign="top" headers="N10102 N10084 ">National Standard, Chinese</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10116" headers="N10072 "> <p>ISO-2022-JP</p>
- </th>
-
-<td valign="top" headers="N10116 N10084 "> <p>ISO 2022, Japanese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10136" headers="N10072 "> <p>ISO-2022-KR</p>
- </th>
-
-<td valign="top" headers="N10136 N10084 "> <p>ISO 2022, Korean</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10156" headers="N10072 "> <p>ISO-8859-1</p>
- </th>
-
-<td valign="top" headers="N10156 N10084 "> <p>ISO Latin-1</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10176" headers="N10072 ">ISO-8859-2</th>
-
-<td valign="top" headers="N10176 N10084 ">Central/East European (Slavic)</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1018A" headers="N10072 ">ISO-8859-3</th>
-
-<td valign="top" headers="N1018A N10084 ">Southern European</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1019E" headers="N10072 ">ISO-8859-4</th>
-
-<td valign="top" headers="N1019E N10084 ">ISO 8859-4, Cyrillic</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101B2" headers="N10072 ">ISO-8859-5</th>
-
-<td valign="top" headers="N101B2 N10084 ">ISO 8859-5, Cyrillic</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101C6" headers="N10072 "> <p>ISO-8859-6</p>
- </th>
-
-<td valign="top" headers="N101C6 N10084 "> <p>Arabic (Logical)</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101E6" headers="N10072 ">ISO-8859-7</th>
-
-<td valign="top" headers="N101E6 N10084 ">Greek</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N101FA" headers="N10072 "> <p>ISO-8859-8</p>
- </th>
-
-<td valign="top" headers="N101FA N10084 "> <p>Hebrew (Visual) (encoding supported, but not supported by the Page
-Designer Design page)</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1021A" headers="N10072 ">ISO-8859-9</th>
-
-<td valign="top" headers="N1021A N10084 ">Turkish</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1022E" headers="N10072 "> <p>SHIFT_JIS</p>
- </th>
-
-<td valign="top" headers="N1022E N10084 "> <p>Shift-JIS, Japanese</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1024E" headers="N10072 ">TIS-620</th>
-
-<td valign="top" headers="N1024E N10084 ">TISI, Thai</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10262" headers="N10072 "> <p>US-ASCII</p>
- </th>
-
-<td valign="top" headers="N10262 N10084 "> <p>US ASCII</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10282" headers="N10072 "> <p>UTF-8</p>
- </th>
-
-<td valign="top" headers="N10282 N10084 "> <p>ISO 10646/Unicode, one-byte encoding</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N102A2" headers="N10072 "> <p>UTF-16</p>
- </th>
-
-<td valign="top" headers="N102A2 N10084 "> <p>ISO 10646/Unicode, two-byte encoding</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N102C2" headers="N10072 "> <p>UTF-16BE</p>
- </th>
-
-<td valign="top" headers="N102C2 N10084 "> <p>Unicode BigEndian</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N102E2" headers="N10072 "> <p>UTF-16LE</p>
- </th>
-
-<td valign="top" headers="N102E2 N10084 "> <p>Unicode LittleEndian</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N10302" headers="N10072 "><p>WINDOWS-31J</p>
-</th>
-
-<td valign="top" headers="N10302 N10084 "><p>Japanese, Windows-31J</p>
-</td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1031E" headers="N10072 "> <p>WINDOWS-1255</p>
- </th>
-
-<td valign="top" headers="N1031E N10084 "> <p>Hebrew</p>
- </td>
-
-</tr>
-
-<tr>
-<th valign="top" class="firstcol" id="N1033E" headers="N10072 "> <p>WINDOWS-1256</p>
- </th>
-
-<td valign="top" headers="N1033E N10084 "> <p>Arabic</p>
- </td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita
deleted file mode 100644
index dbfc5b2..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.dita
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"  "concept.dtd">

-<concept id="cxmltool" xml:lang="en-us">

-<title>XML tools - overview</title>

-<titlealts>

-<searchtitle>XML tools - overview</searchtitle>

-</titlealts>

-<shortdesc>This product provides a comprehensive visual XML development environment.

-The tool set includes components for building DTDs, XML schemas, and XML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML tools<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>The following XML tools are available. </p>

-<p>The <b>XML editor</b> is a tool for creating and viewing XML files. You

-can use it to create new XML files, either from scratch, existing DTDs, or

-existing XML schemas. You can also use it to edit XML files, associate them

-with DTDs or schemas, and validate them. </p>

-<p> The <b>DTD editor</b> is a tool for creating and viewing DTDs.   </p>

-<p>The <b>XML schema editor</b> is a tool for creating, viewing, and validating

-XML schemas. You can use the XML schema editor to perform tasks such as creating

-XML schema components and importing and viewing XML schemas. </p>

-<p><b>Notes:</b></p>

-<section>Exercise caution when opening large files with any of the XML editors.

-If the memory limits of the workbench are exceeded, it will abruptly close

-without saving any data (and without warning or error messages). The number

-of elements in an XML file, not its size, is the best indicator of how much

-memory will be required. Memory requirements also depend on what else is open

-in the workbench - in some cases you can open a fifteen megabytes file, but

-in other cases a one megabyte file might cause problems. Therefore, we recommend

-you save all data in the workbench before opening large XML files. This is

-a permanent restriction.</section>

-<section conref="rlimitations_slushXML.dita#rlimitations_slushXML/unresolv_URI"></section>

-</conbody>

-</concept>

-<?Pub *0000002064?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
deleted file mode 100644
index 7669633..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/cxmltool.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>XML tools - overview</title>
-</head>
-<body id="cxmltool"><a name="cxmltool"><!-- --></a>
-
-<h1 class="topictitle1">XML tools - overview</h1>
-<div><p>This product provides a comprehensive visual XML development environment.
-The tool set includes components for building DTDs, XML schemas, and XML files.</p><p>The following XML tools are available:</p>
-<p>The <b>XML editor</b> is a tool for creating and viewing XML files. You
-can use it to create new XML files, either from scratch, existing DTDs, or
-existing XML schemas. You can also use it to edit XML files, associate them
-with DTDs or schemas, and validate them.</p>
-<p>The <b>DTD editor</b> is a tool for creating and viewing DTDs. </p>
-<p>The <b>XML schema editor</b> is a tool for creating, viewing, and validating 
-XML schemas. You can use the XML schema editor to perform tasks such as creating 
-XML schema components and importing and viewing XML schemas. </p>
-<div class="skipspace">Exercise caution when opening large files with any of the XML editors.
-If the memory limits of the workbench are exceeded, it will abruptly close
-without saving any data (and without warning or error messages). The number
-of elements in an XML file, not its size, is the best indicator of how much
-memory will be required. Memory requirements also depend on what else is open
-in the workbench - in some cases you can open a 15 megabytes file, but in
-other cases a one-megabyte file may cause problems. Therefore, we recommend
-you save all data in the workbench before opening large XML files. This is
-a permanent restriction.</div>
-<div class="skipspace"><p>The
-behavior of the XML parser when encountering an unresolvable URI (for example,
-in a DOCTYPE declaration) is to report a fatal IO error and stop any further
-processing. An unresolved URI is seen neither as a syntactic nor a semantic
-error and as such, the parser does not attempt to handle it. Essentially,
-the document remains unchecked. This is a known problem.</p>
-</div>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.dita
deleted file mode 100644
index b2be714..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.dita
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rextctn" xml:lang="en-us">

-<title>Editing XML documents with multiple namespaces</title>

-<titlealts>

-<searchtitle>Editing XML documents with multiple namespaces</searchtitle>

-</titlealts>

-<shortdesc>You can use the XML schema <codeph>any</codeph> element to extend

-the content model of an XML document.</shortdesc>

-<refbody>

-<section><p>For example, you have an XML schema file called Book.xsd that

-contains a complex type called BookType. BookType contains 4 elements (title,

-author, year, and ISBN) and one  <codeph>any</codeph> element. The namespace

-for the <codeph>any</codeph>  element is  <codeph>##any</codeph>. This means

-that in an instance document, you can insert any XML element to extend the

-definition of the BookType.</p><p>You can also provide a more specific namespace.

-For example, you have another schema called My_Book.xsd, which contains a

-complex type called My_BookType. My_BookType contains 4 elements (title, author,

-year, and ISBN) and one  <codeph>any</codeph> element, but in this case the

-namespace for the  BookType element is www.wesley.com. This means that in

-an instance document, you can insert any XML element to extend the definition

-of the BookType, provided that they belong to the namespace http://www.wesley.com.</p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
deleted file mode 100644
index 0b7ff5b..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rextctn.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML documents with multiple namespaces" />
-<meta name="abstract" content="You can use the XML schema any element to extend the content model of an XML document." />
-<meta name="description" content="You can use the XML schema any element to extend the content model of an XML document." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rextctn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML documents with multiple namespaces</title>
-</head>
-<body id="rextctn"><a name="rextctn"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML documents with multiple namespaces</h1>
-
-
-
-<div><p>You can use the XML schema <samp class="codeph">any</samp> element to extend
-the content model of an XML document.</p>
-
-<div class="section"><p>For example, you have an XML schema file called Book.xsd that
-contains a complex type called BookType. BookType contains 4 elements (title,
-author, year, and ISBN) and one  <samp class="codeph">any</samp> element. The namespace
-for the <samp class="codeph">any</samp>  element is  <samp class="codeph">##any</samp>. This means
-that in an instance document, you can insert any XML element to extend the
-definition of the BookType.</p>
-<p>You can also provide a more specific namespace.
-For example, you have another schema called My_Book.xsd, which contains a
-complex type called My_BookType. My_BookType contains 4 elements (title, author,
-year, and ISBN) and one  <samp class="codeph">any</samp> element, but in this case the
-namespace for the  BookType element is www.wesley.com. This means that in
-an instance document, you can insert any XML element to extend the definition
-of the BookType, provided that they belong to the namespace http://www.wesley.com.</p>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.dita
deleted file mode 100644
index c7ee4b0..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.dita
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rlimitations_slushXML" xml:lang="en-us">

-<title>Limitations of XML Editor</title>

-<titlealts>

-<searchtitle>Limitations of XML Editor</searchtitle>

-</titlealts>

-<shortdesc>This section describes known product aspect limitations and workarounds.</shortdesc>

-<refbody>

-<!--Use this template to single source the readme information.  The content for the readme information is maintained in this topic and is inserted into the related topic using the conref attribute. This file will not be surfaced in your navigation.-->

-<section id="unresolv_URI"><!--No defect associated with this. It is from the 5.1. readme.--><p>The

-behavior of the XML parser when encountering an unresolvable URI (for example,

-in a DOCTYPE declaration) is to report a fatal IO error and stop any further

-processing. An unresolved URI is seen neither as a syntactic nor a semantic

-error and as such, the parser does not attempt to handle it. Essentially,

-the document remains unchecked. This is a known problem.</p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
deleted file mode 100644
index e9b23f5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rlimitations_slushXML.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Limitations of XML Editor" />
-<meta name="abstract" content="This section describes known product aspect limitations and workarounds." />
-<meta name="description" content="This section describes known product aspect limitations and workarounds." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rlimitations_slushXML" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Limitations of XML Editor</title>
-</head>
-<body id="rlimitations_slushXML"><a name="rlimitations_slushXML"><!-- --></a>
-
-
-<h1 class="topictitle1">Limitations of XML Editor</h1>
-
-
-
-<div><p>This section describes known product aspect limitations and workarounds.</p>
-
-
-<div class="section" id="rlimitations_slushXML__unresolv_URI"><a name="rlimitations_slushXML__unresolv_URI"><!-- --></a><p>The
-behavior of the XML parser when encountering an unresolvable URI (for example,
-in a DOCTYPE declaration) is to report a fatal IO error and stop any further
-processing. An unresolved URI is seen neither as a syntactic nor a semantic
-error and as such, the parser does not attempt to handle it. Essentially,
-the document remains unchecked. This is a known problem.</p>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita
deleted file mode 100644
index a398b07..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.dita
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<?Pub Inc?>

-<reference id="ricons" xml:lang="en-us">

-<title>Icons used in the XML editor</title>

-<titlealts>

-<searchtitle>Icons used in the XML editor</searchtitle>

-</titlealts>

-<shortdesc>The following XML editor icons appear in the Outline and Design

-view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>icons</indexterm></indexterm></keywords>

-</metadata></prolog>

-<refbody>

-<table>

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<tbody>

-<row>

-<entry colname="COLSPEC0" valign="bottom"><b>Icon</b></entry>

-<entry colname="COLSPEC1" valign="bottom"><b>Description</b></entry>

-</row>

-<row>

-<entry> <image href="../images/nattrib.gif"><alt>This graphic is the attribute

-icon</alt></image> </entry>

-<entry>attribute</entry>

-</row>

-<row>

-<entry> <image href="../images/cdatasection.gif"><alt>This graphic is the

-character data icon</alt></image></entry>

-<entry>character data (CDATA) section</entry>

-</row>

-<row>

-<entry> <image href="../images/comment_obj.gif"><alt>This graphic is the comment

-icon</alt></image></entry>

-<entry>comment</entry>

-</row>

-<row>

-<entry> <image href="../images/doctype.gif"><alt>This graphic is the DOCTYPE

-icon</alt></image></entry>

-<entry>DOCTYPE declaration</entry>

-</row>

-<row>

-<entry> <image href="../images/nelem.gif"><alt>This graphic is the element

-icon</alt></image> </entry>

-<entry>element</entry>

-</row>

-<row>

-<entry> <image href="../images/proinst_obj.gif"><alt>This graphic is the processing

-instructions icon</alt></image></entry>

-<entry>processing instructions</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</refbody>

-</reference>

-<?Pub *0000001824?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
deleted file mode 100644
index 660543a..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlbicons.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Icons used in the XML editor" />
-<meta name="abstract" content="The following XML editor icons appear in the Outline and Design view." />
-<meta name="description" content="The following XML editor icons appear in the Outline and Design view." />
-<meta content="XML editor, icons" name="DC.subject" />
-<meta content="XML editor, icons" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ricons" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Icons used in the XML editor</title>
-</head>
-<body id="ricons"><a name="ricons"><!-- --></a>
-
-
-<h1 class="topictitle1">Icons used in the XML editor</h1>
-
-
-
-
-<div><p>The following XML editor icons appear in the Outline and Design
-view.</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<tbody>
-<tr>
-<td valign="bottom"><strong>Icon</strong></td>
-
-<td valign="bottom"><strong>Description</strong></td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/nattrib.gif" alt="This graphic is the attribute&#10;icon" /> </td>
-
-<td valign="top">attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/cdatasection.gif" alt="This graphic is the&#10;character data icon" /></td>
-
-<td valign="top">character data (CDATA) section</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/comment_obj.gif" alt="This graphic is the comment&#10;icon" /></td>
-
-<td valign="top">comment</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/doctype.gif" alt="This graphic is the DOCTYPE&#10;icon" /></td>
-
-<td valign="top">DOCTYPE declaration</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/nelem.gif" alt="This graphic is the element&#10;icon" /> </td>
-
-<td valign="top">element</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/proinst_obj.gif" alt="This graphic is the processing&#10;instructions icon" /></td>
-
-<td valign="top">processing instructions</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.dita
deleted file mode 100644
index 4952c8d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.dita
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="xmlcatalogkeyboardshortcuts" xml:lang="en-us">

-<title outputclass="id_title">XML Catalog keyboard shortcuts</title>

-<shortdesc outputclass="id_shortdesc">Accelerator keys can be used in the

-catalog tree structure and catalog entry wizard by first pressing and holding

-the Alt key.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>accessibility<indexterm>keyboard shortcuts<indexterm>XML

-catalog wizard</indexterm></indexterm></indexterm><indexterm>keyboard shortcuts<indexterm>XML

-catalog wizard</indexterm></indexterm><indexterm>shortcuts<indexterm>keyboard<indexterm>XML

-catalog wizard</indexterm></indexterm></indexterm><indexterm>XML catalog wizard<indexterm>accessibility</indexterm></indexterm>

-<indexterm>XML catalog wizard<indexterm>keyboard shortcuts</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<table frame="all">

-<tgroup cols="2"><colspec colname="col1" colwidth="84*"/><colspec colname="col3"

-colwidth="93*"/>

-<thead>

-<row valign="bottom">

-<entry colname="col1">Key Combination</entry>

-<entry colname="col3">Function</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="col1">Alt+A</entry>

-<entry colname="col3">Add catalog entry</entry>

-</row>

-<row>

-<entry colname="col1">Alt+E</entry>

-<entry colname="col3">Edit selected catalog entry</entry>

-</row>

-<row>

-<entry colname="col1">Alt+R</entry>

-<entry colname="col3">Remove selected catalog entry</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.html
deleted file mode 100644
index 8584f9f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmlcatkey.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="XML Catalog keyboard shortcuts" />
-<meta name="abstract" content="Accelerator keys can be used in the catalog tree structure and catalog entry wizard by first pressing and holding the Alt key." />
-<meta name="description" content="Accelerator keys can be used in the catalog tree structure and catalog entry wizard by first pressing and holding the Alt key." />
-<meta content="accessibility, keyboard shortcuts, XML catalog wizard, shortcuts, keyboard, XML catalog wizard" name="DC.subject" />
-<meta content="accessibility, keyboard shortcuts, XML catalog wizard, shortcuts, keyboard, XML catalog wizard" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="xmlcatalogkeyboardshortcuts" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML Catalog keyboard shortcuts</title>
-</head>
-<body id="xmlcatalogkeyboardshortcuts"><a name="xmlcatalogkeyboardshortcuts"><!-- --></a>
-
-
-<h1 class="id_title">XML Catalog keyboard shortcuts</h1>
-
-
-
-<div><p class="id_shortdesc">Accelerator keys can be used in the
-catalog tree structure and catalog entry wizard by first pressing and holding
-the Alt key.</p>
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr valign="bottom">
-<th valign="bottom" width="47.45762711864407%" id="N10091">Key Combination</th>
-
-<th valign="bottom" width="52.54237288135594%" id="N10098">Function</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10091 ">Alt+A</td>
-
-<td valign="top" width="52.54237288135594%" headers="N10098 ">Add catalog entry</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10091 ">Alt+E</td>
-
-<td valign="top" width="52.54237288135594%" headers="N10098 ">Edit selected catalog entry</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="47.45762711864407%" headers="N10091 ">Alt+R</td>
-
-<td valign="top" width="52.54237288135594%" headers="N10098 ">Remove selected catalog entry</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.dita
deleted file mode 100644
index b0edc3f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.dita
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="xmltoolskeyboardshortcuts" xml:lang="en-us">

-<title>Source editor and XML tools keyboard shortcuts</title>

-<shortdesc>The following keyboard shortcuts are available for the XML, XSD,

-WSDL, HTML, JSP, CSS and DTD editors.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>accessibility<indexterm>keyboard shortcuts<indexterm>XML

-editor</indexterm></indexterm></indexterm><indexterm>accessibility<indexterm>keyboard

-shortcuts<indexterm>source editor</indexterm></indexterm></indexterm><indexterm>keyboard

-shortcuts<indexterm>XML editor</indexterm></indexterm><indexterm>shortcuts<indexterm>keyboard<indexterm>XML

-editor</indexterm></indexterm></indexterm><indexterm>XML editor<indexterm>accessibility</indexterm></indexterm>

-<indexterm>XML editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-<indexterm>XSD editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-<indexterm>WSDL editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-<indexterm>HTML editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-<indexterm>JSP editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-<indexterm>CSS editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-<indexterm>DTD editor<indexterm>keyboard shortcuts</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<section><title>Shortcuts available in all source editors</title><simpletable>

-<sthead>

-<stentry>Command</stentry>

-<stentry>Shortcut</stentry>

-</sthead>

-<strow>

-<stentry>Go To Matching Bracket</stentry>

-<stentry>Ctrl+Shift+P</stentry>

-</strow>

-<strow>

-<stentry>Restore Last Selection</stentry>

-<stentry>Atl+Shift+Down</stentry>

-</strow>

-<strow>

-<stentry>Select Enclosing Element</stentry>

-<stentry>Alt+Shift+Up</stentry>

-</strow>

-<strow>

-<stentry>Select Next Element</stentry>

-<stentry>Alt+Shift+Right</stentry>

-</strow>

-<strow>

-<stentry>Select Previous Element</stentry>

-<stentry>Alt+Shift+Left</stentry>

-</strow>

-</simpletable></section>

-<section><title>Shortcuts available in the XML, XSD, WSDL, HTML, JSP, and

-CSS editors (excludes the DTD editor)</title><simpletable>

-<sthead>

-<stentry>Command</stentry>

-<stentry>Shortcut</stentry>

-</sthead>

-<strow>

-<stentry>Format</stentry>

-<stentry>Ctrl+Shift+F</stentry>

-</strow>

-<strow>

-<stentry>Format Active Elements</stentry>

-<stentry>Ctrl+I</stentry>

-</strow>

-</simpletable></section>

-<section><title>Shortcuts available in the XML, XSD, WSDL, HTML, and JSP editors

-(excludes the DTD and CSS editors)</title><simpletable>

-<sthead>

-<stentry>Command</stentry>

-<stentry>Shortcut</stentry>

-</sthead>

-<strow>

-<stentry>Add Block Comment</stentry>

-<stentry>Ctrl+Shift+/</stentry>

-</strow>

-<strow>

-<stentry>Go To Matching Tag</stentry>

-<stentry>Ctrl+Shift+></stentry>

-</strow>

-<strow>

-<stentry>Go To Next Sibling</stentry>

-<stentry>Ctrl+Shift+Down</stentry>

-</strow>

-<strow>

-<stentry>Occurrences in File</stentry>

-<stentry>Ctrl+Shift+A</stentry>

-</strow>

-<strow>

-<stentry>Open Selection</stentry>

-<stentry>F3</stentry>

-</strow>

-<strow>

-<stentry>Go To Previous Sibling</stentry>

-<stentry>Ctrl+Shift+Up</stentry>

-</strow>

-<strow>

-<stentry>Remove Block Comment</stentry>

-<stentry>Ctrl+Shift+\</stentry>

-</strow>

-<strow>

-<stentry>Toggle Comment</stentry>

-<stentry>Ctrl+Shift+C</stentry>

-</strow>

-</simpletable></section>

-<section><title>Shortcuts available in the design view of the XSD and WSDL

-editors</title><simpletable>

-<sthead>

-<stentry>Command</stentry>

-<stentry>Shortcut</stentry>

-</sthead>

-<strow>

-<stentry>Zoom In</stentry>

-<stentry>Ctrl+=</stentry>

-</strow>

-<strow>

-<stentry>Zoom Out</stentry>

-<stentry>Ctrl+-</stentry>

-</strow>

-</simpletable></section>

-<section><title>Shortcuts available in the design view of the WSDL editor</title><simpletable>

-<sthead>

-<stentry>Command</stentry>

-<stentry>Shortcut</stentry>

-</sthead>

-<strow>

-<stentry>Export Diagram as Image</stentry>

-<stentry>Ctrl+Shift+X</stentry>

-</strow>

-</simpletable></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.html
deleted file mode 100644
index 2036f18..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/rxmltoolskey.html
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Source editor and XML tools keyboard shortcuts" />
-<meta name="abstract" content="The following keyboard shortcuts are available for the XML, XSD, WSDL, HTML, JSP, CSS and DTD editors." />
-<meta name="description" content="The following keyboard shortcuts are available for the XML, XSD, WSDL, HTML, JSP, CSS and DTD editors." />
-<meta content="accessibility, keyboard shortcuts, XML editor, keyboard shortcuts, source editor, XML editor, shortcuts, keyboard, XSD editor, WSDL editor, HTML editor, JSP editor, CSS editor, DTD editor" name="DC.subject" />
-<meta content="accessibility, keyboard shortcuts, XML editor, keyboard shortcuts, source editor, XML editor, shortcuts, keyboard, XSD editor, WSDL editor, HTML editor, JSP editor, CSS editor, DTD editor" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="xmltoolskeyboardshortcuts" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Source editor and XML tools keyboard shortcuts</title>
-</head>
-<body id="xmltoolskeyboardshortcuts"><a name="xmltoolskeyboardshortcuts"><!-- --></a>
-
-
-<h1 class="topictitle1">Source editor and XML tools keyboard shortcuts</h1>
-
-
-
-<div><p>The following keyboard shortcuts are available for the XML, XSD,
-WSDL, HTML, JSP, CSS and DTD editors.</p>
-
-<div class="section"><h4 class="sectiontitle">Shortcuts available in all source editors</h4><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
-<tr>
-<th valign="bottom" align="left" id="N100D0">Command</th>
-
-<th valign="bottom" align="left" id="N100D6">Shortcut</th>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100D0">Go To Matching Bracket</td>
-
-<td valign="top" headers="N100D6">Ctrl+Shift+P</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100D0">Restore Last Selection</td>
-
-<td valign="top" headers="N100D6">Atl+Shift+Down</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100D0">Select Enclosing Element</td>
-
-<td valign="top" headers="N100D6">Alt+Shift+Up</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100D0">Select Next Element</td>
-
-<td valign="top" headers="N100D6">Alt+Shift+Right</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100D0">Select Previous Element</td>
-
-<td valign="top" headers="N100D6">Alt+Shift+Left</td>
-
-</tr>
-
-</table>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Shortcuts available in the XML, XSD, WSDL, HTML, JSP, and
-CSS editors (excludes the DTD editor)</h4><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
-<tr>
-<th valign="bottom" align="left" id="N1014B">Command</th>
-
-<th valign="bottom" align="left" id="N10151">Shortcut</th>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N1014B">Format</td>
-
-<td valign="top" headers="N10151">Ctrl+Shift+F</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N1014B">Format Active Elements</td>
-
-<td valign="top" headers="N10151">Ctrl+I</td>
-
-</tr>
-
-</table>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Shortcuts available in the XML, XSD, WSDL, HTML, and JSP editors
-(excludes the DTD and CSS editors)</h4><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
-<tr>
-<th valign="bottom" align="left" id="N10190">Command</th>
-
-<th valign="bottom" align="left" id="N10196">Shortcut</th>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Add Block Comment</td>
-
-<td valign="top" headers="N10196">Ctrl+Shift+/</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Go To Matching Tag</td>
-
-<td valign="top" headers="N10196">Ctrl+Shift+&gt;</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Go To Next Sibling</td>
-
-<td valign="top" headers="N10196">Ctrl+Shift+Down</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Occurrences in File</td>
-
-<td valign="top" headers="N10196">Ctrl+Shift+A</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Open Selection</td>
-
-<td valign="top" headers="N10196">F3</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Go To Previous Sibling</td>
-
-<td valign="top" headers="N10196">Ctrl+Shift+Up</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Remove Block Comment</td>
-
-<td valign="top" headers="N10196">Ctrl+Shift+\</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10190">Toggle Comment</td>
-
-<td valign="top" headers="N10196">Ctrl+Shift+C</td>
-
-</tr>
-
-</table>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Shortcuts available in the design view of the XSD and WSDL
-editors</h4><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
-<tr>
-<th valign="bottom" align="left" id="N10241">Command</th>
-
-<th valign="bottom" align="left" id="N10247">Shortcut</th>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10241">Zoom In</td>
-
-<td valign="top" headers="N10247">Ctrl+=</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10241">Zoom Out</td>
-
-<td valign="top" headers="N10247">Ctrl+-</td>
-
-</tr>
-
-</table>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Shortcuts available in the design view of the WSDL editor</h4><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
-<tr>
-<th valign="bottom" align="left" id="N10286">Command</th>
-
-<th valign="bottom" align="left" id="N1028C">Shortcut</th>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N10286">Export Diagram as Image</td>
-
-<td valign="top" headers="N1028C">Ctrl+Shift+X</td>
-
-</tr>
-
-</table>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita
deleted file mode 100644
index d7c76ab..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.dita
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="tcretxml" xml:lang="en-us">

-<title>Creating XML files</title>

-<titlealts>

-<searchtitle>Creating XML files</searchtitle>

-</titlealts>

-<shortdesc>You can create a new XML file which you can then edit in the XML

-editor. You create a new XML file that is not associated with a DTD or XML

-schema file, so there are no restrictions on the kind of content it can contain.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To create a new

-XML file, complete the following steps:</p></context>

-<steps>

-<step><cmd>Create a project to contain the XML file if one does not exist

-already.</cmd></step>

-<step><cmd>In the workbench, click <menucascade><uicontrol>File</uicontrol>

-<uicontrol>New</uicontrol><uicontrol>Other</uicontrol></menucascade> and select <menucascade>

-<uicontrol>XML</uicontrol><uicontrol>XML</uicontrol></menucascade>. Click <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the project or folder that will contain the XML file.</cmd>

-</step>

-<step><cmd>In the <uicontrol>File name</uicontrol> field, type the name of

-the XML file and click <uicontrol>Next</uicontrol>. The name of your XML file

-must end in <userinput>.xml</userinput>.</cmd></step>

-<step><cmd>Select the <uicontrol>Create XML file from an XML template</uicontrol> radio

-button and click <uicontrol>Next.</uicontrol>.</cmd></step>

-<step importance="optional"><cmd>You may choose to view and edit the XML templates

-that will be used in your new XML file.</cmd></step>

-<step><cmd>Click  <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-<postreq><?Pub Caret?></postreq>

-</taskbody>

-</task>

-<?Pub *0000002004?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
deleted file mode 100644
index b39f102..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcretxml.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating XML files" />
-<meta name="abstract" content="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain." />
-<meta name="description" content="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain." />
-<meta content="XML files, creating" name="DC.subject" />
-<meta content="XML files, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="tcrexxsd.html" />
-<meta scheme="URI" name="DC.Relation" content="txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="cwxmledt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcretxml" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating XML files</title>
-</head>
-<body id="tcretxml"><a name="tcretxml"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating XML files</h1>
-
-
-
-
-<div><p>You can create a new XML file which you can then edit in the XML
-editor. You create a new XML file that is not associated with a DTD or XML
-schema file, so there are no restrictions on the kind of content it can contain.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To create a new
-XML file, complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>Create a project to contain the XML file if one does not exist
-already.</span></li>
-
-<li><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File</span>
- &gt; <span class="uicontrol">New</span> &gt; <span class="uicontrol">Other</span></span> and select <span class="menucascade">
-<span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML</span></span>. Click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li><span>Select the project or folder that will contain the XML file.</span>
-</li>
-
-<li><span>In the <span class="uicontrol">File name</span> field, type the name of
-the XML file and click <span class="uicontrol">Next</span>. The name of your XML file
-must end in <kbd class="userinput">.xml</kbd>.</span></li>
-
-<li><span>Select the <span class="uicontrol">Create XML file from an XML template</span> radio
-button and click <span class="uicontrol">Next.</span>.</span></li>
-
-<li><strong>Optional: </strong><span>You may choose to view and edit the XML templates
-that will be used in your new XML file.</span></li>
-
-<li><span>Click  <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from DTDs</a></div>
-<div><a href="tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML schemas</a></div>
-<div><a href="txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
deleted file mode 100644
index e1efde5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.dita
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tcrexdtd" xml:lang="en-us">

-<title>Generating XML files from DTDs</title>

-<titlealts>

-<searchtitle>Generate an XML file from a DTD</searchtitle>

-</titlealts>

-<shortdesc>You can generate an XML file from your DTD if you want to quickly

-create an XML file based on your DTD file. Generating an XML file from your

-DTD saves you time by creating an XML file that is already associated with

-your DTD, and contains at least some of the elements and attributes in your

-DTD.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="tcrexdtd|1|XMLfilesgeneratingfromDTDs" status="new">XML

-files<indexterm>generating from DTDs</indexterm></indexterm><indexterm keyref="tcrexdtd|2|DTDgeneratingXMLfiles"

-status="changed">DTDs<indexterm>generating XML files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>After you have generated your XML file, you can further customize

-it in the XML editor.</p><p>The following instructions were written for the

-Resource perspective, but they will also work in many other perspectives.</p><p>To

-create an XML file from a DTD file, complete the following steps:</p></context>

-<steps>

-<step><cmd>In the Navigator view, right-click the DTD file that you want to

-work with and select <menucascade><uicontrol>Generate</uicontrol><uicontrol>XML

-File</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select a project or folder to contain the XML file and type a name

-for the file in the <uicontrol>File Name</uicontrol> field, then click <uicontrol>Next</uicontrol>.</cmd>

-<info>The name of the file must end in <userinput>.xml</userinput>.</info>

-</step>

-<step><cmd>Select the <uicontrol>Root element</uicontrol> of the XML file.</cmd>

-<info>The root element of an XML file is the element that contains all other

-elements in that file. All the elements that you have defined in the DTD will

-be shown in the <uicontrol>Root element</uicontrol> list.</info></step>

-<step><cmd>Select from the following content options:  </cmd>

-<choices>

-<choice><uicontrol>Create optional attributes</uicontrol>: both mandatory

-and optional attributes will be generated.</choice>

-<choice><uicontrol>Create optional elements</uicontrol>: both mandatory and

-optional elements will be generated.</choice>

-<choice><uicontrol>Create first choice of required choice</uicontrol>: the

-first option of a required choice will be generated in your XML file.</choice>

-<choice><uicontrol>Fill elements and attributes with data</uicontrol>: any

-elements and attributes generated will be filled with sample data.</choice>

-</choices>

-<info> If you do not select any of these options, then only the minimum amount

-of content required for the XML file will be created.</info></step>

-<step><cmd>Specify the <uicontrol>Public ID</uicontrol> or <uicontrol>System

-ID</uicontrol>.</cmd><info>You do not need to specify both. If you do, the

-Public ID will be used before the System ID. </info></step>

-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-<result><p>The XML file will only contain the selected root element and any

-elements or attributes contained in the root element. You can now add elements,

-attributes, entities, and notations to the XML file, however, they must follow

-the rules established in the DTD that you used to create the XML file.</p></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
deleted file mode 100644
index 3a44cf4..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexdtd.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Generating XML files from DTDs" />
-<meta name="abstract" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
-<meta name="description" content="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD." />
-<meta content="XML files, generating from DTDs, DTDs, generating XML files" name="DC.subject" />
-<meta content="XML files, generating from DTDs, DTDs, generating XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexxsd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcrexdtd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Generate an XML file from a DTD</title>
-</head>
-<body id="tcrexdtd"><a name="tcrexdtd"><!-- --></a>
-
-
-<h1 class="topictitle1">Generating XML files from DTDs</h1>
-
-
-
-
-<div><p>You can generate an XML file from your DTD if you want to quickly
-create an XML file based on your DTD file. Generating an XML file from your
-DTD saves you time by creating an XML file that is already associated with
-your DTD, and contains at least some of the elements and attributes in your
-DTD.</p>
-
-<div class="section"><p>After you have generated your XML file, you can further customize
-it in the XML editor.</p>
-<p>The following instructions were written for the
-Resource perspective, but they will also work in many other perspectives.</p>
-<p>To
-create an XML file from a DTD file, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Navigator view, right-click the DTD file that you want to
-work with and select <span class="menucascade"><span class="uicontrol">Generate</span> &gt; <span class="uicontrol">XML
-File</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select a project or folder to contain the XML file and type a name
-for the file in the <span class="uicontrol">File Name</span> field, then click <span class="uicontrol">Next</span>.</span>
- The name of the file must end in <kbd class="userinput">.xml</kbd>.
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Root element</span> of the XML file.</span>
- The root element of an XML file is the element that contains all other
-elements in that file. All the elements that you have defined in the DTD will
-be shown in the <span class="uicontrol">Root element</span> list.</li>
-
-<li class="stepexpand"><span>Select from the following content options:  </span>
-<ul>
-<li><span class="uicontrol">Create optional attributes</span>: both mandatory
-and optional attributes will be generated.</li>
-
-<li><span class="uicontrol">Create optional elements</span>: both mandatory and
-optional elements will be generated.</li>
-
-<li><span class="uicontrol">Create first choice of required choice</span>: the
-first option of a required choice will be generated in your XML file.</li>
-
-<li><span class="uicontrol">Fill elements and attributes with data</span>: any
-elements and attributes generated will be filled with sample data.</li>
-
-</ul>
-
-  If you do not select any of these options, then only the minimum amount
-of content required for the XML file will be created.</li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Public ID</span> or <span class="uicontrol">System
-ID</span>.</span> You do not need to specify both. If you do, the
-Public ID will be used before the System ID. </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section"><p>The XML file will only contain the selected root element and any
-elements or attributes contained in the root element. You can now add elements,
-attributes, entities, and notations to the XML file, however, they must follow
-the rules established in the DTD that you used to create the XML file.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating XML files</a></div>
-<div><a href="../topics/tcrexxsd.html" title="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema.">Generating XML files from XML schemas</a></div>
-<div><a href="../topics/txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
deleted file mode 100644
index 6ba3873..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.dita
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tcrexxsd" xml:lang="en-us">

-<title>Generating XML files from XML schemas</title>

-<titlealts>

-<searchtitle>Generating an XML file from an XML schema</searchtitle>

-</titlealts>

-<shortdesc>You can generate an XML file from your XML schema if you want to

-quickly create an XML file based on your XML schema file. Generating an XML

-file from your XML schema saves you time by creating an XML file that is already

-associated with your XML schema, and contains at least some of the elements

-and attributes in your XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="tcrexxsd|1|XMLfilesgeneratingfromXMLschemas"

-status="new">XML files<indexterm>generating from XML schemas</indexterm></indexterm>

-<indexterm keyref="tcrexxsd|2|XMLschemasgeneratingXMLfiles" status="changed">schemas<indexterm>generating

-XML files</indexterm></indexterm></keywords>

-</metadata><metadata>

-<keywords><indexterm keyref="tcrexxsd|11|XMLfilesschemas" status="new">XML

-files<indexterm>schemas</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>After you have generated your XML file, you can further customize

-it in the XML editor.</p><p>The following instructions were written for the

-Resource perspective, but they will also work in many other perspectives.</p><p>To

-generate an XML file from a schema file follow these steps:</p></context>

-<steps>

-<step><cmd>In the Navigator view, right-click the XML schema file that you

-want to work with and select <menucascade><uicontrol>Generate</uicontrol>

-<uicontrol>XML File</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select a project or folder to contain the XML file and type a name

-for the file in the <uicontrol>File Name</uicontrol> field, then click <uicontrol>Next</uicontrol>.</cmd>

-<info>The name of the file must end in <userinput>.xml</userinput>.</info>

-</step>

-<step><cmd>Select the <uicontrol>Root element</uicontrol> of the XML file.</cmd>

-<info>The root element of an XML file is the element that contains all other

-elements in that file. All of the global elements you have defined in the

-XML schema will be included in the Root element list. If you do not have any

-global elements in your XML schema, you cannot create an XML file from it.</info>

-</step>

-<step><cmd>Select from the following content options:</cmd>

-<choices>

-<choice><uicontrol>Create optional attributes</uicontrol>: both mandatory

-and optional attributes will be generated.</choice>

-<choice><uicontrol>Create optional elements</uicontrol>: both mandatory and

-optional elements will be generated.</choice>

-<choice><uicontrol>Create first choice of required choice</uicontrol>: the

-first option of a required choice will be generated in your XML file.</choice>

-<choice><uicontrol>Fill elements and attributes with data</uicontrol>: any

-elements and attributes generated will be filled with sample data.</choice>

-</choices>

-<info>If you do not select any of these options, then only the minimum amount

-of content required for the XML file will be created.</info></step>

-<step><cmd>The Namespace Information section contains information about the

-target namespace of the XML schema, its prefix, and the schema location. Select

-the entry you want to edit and click <uicontrol>Edit</uicontrol>.</cmd><info><ul>

-<li>The value in the <uicontrol>Namespace Name</uicontrol> field is the target

-namespace of the XML schema. Your XML file should be associated with the same

-namespace as its XML schema is associated with.</li>

-<li>All qualified elements and attributes in the XML file associated with

-the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</li>

-<li>The  <uicontrol>Location Hint</uicontrol> field contains the location

-of the XML schema.</li>

-</ul>For more information about namespaces and namespace prefixes, refer to

-the related references.</info></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> and then <uicontrol>Finish</uicontrol>.</cmd>

-</step>

-</steps>

-<result><p>The XML file will contain the selected root element and any elements

-or attributes contained in the root element. It also contains information

-about the XML file namespace and location. You can now add elements and attributes

-to the XML file.</p><note>In certain cases, when an XML file is generated

-from a complex XML schema file, the XML file might not be valid. If this occurs,

-you can open the generated file in the XML editor and correct any errors that

-occur. Usually, only a few errors need to be fixed. The following XML schema

-constructs might present problems:</note><ul>

-<li>Restrictions: sometimes restricted elements are erroneously generated. </li>

-<li>Facets: default generated data values might not conform to complex facets

-(for example, patterns).</li>

-<li>Abstract elements: abstract elements are sometimes erroneously generated.</li>

-</ul></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
deleted file mode 100644
index 6a533af..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tcrexxsd.html
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Generating XML files from XML schemas" />
-<meta name="abstract" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
-<meta name="description" content="You can generate an XML file from your XML schema if you want to quickly create an XML file based on your XML schema file. Generating an XML file from your XML schema saves you time by creating an XML file that is already associated with your XML schema, and contains at least some of the elements and attributes in your XML schema." />
-<meta content="XML files, generating from XML schemas, schemas, generating XML files, XML files" name="DC.subject" />
-<meta content="XML files, generating from XML schemas, schemas, generating XML files, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcretxml.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcrexdtd.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedttag.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcrexxsd" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Generating an XML file from an XML schema</title>
-</head>
-<body id="tcrexxsd"><a name="tcrexxsd"><!-- --></a>
-
-
-<h1 class="topictitle1">Generating XML files from XML schemas</h1>
-
-
-
-
-<div><p>You can generate an XML file from your XML schema if you want to
-quickly create an XML file based on your XML schema file. Generating an XML
-file from your XML schema saves you time by creating an XML file that is already
-associated with your XML schema, and contains at least some of the elements
-and attributes in your XML schema.</p>
-
-<div class="section"><p>After you have generated your XML file, you can further customize
-it in the XML editor.</p>
-<p>The following instructions were written for the
-Resource perspective, but they will also work in many other perspectives.</p>
-<p>To
-generate an XML file from a schema file follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Navigator view, right-click the XML schema file that you
-want to work with and select <span class="menucascade"><span class="uicontrol">Generate</span>
- &gt; <span class="uicontrol">XML File</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select a project or folder to contain the XML file and type a name
-for the file in the <span class="uicontrol">File Name</span> field, then click <span class="uicontrol">Next</span>.</span>
- The name of the file must end in <kbd class="userinput">.xml</kbd>.
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Root element</span> of the XML file.</span>
- The root element of an XML file is the element that contains all other
-elements in that file. All of the global elements you have defined in the
-XML schema will be included in the Root element list. If you do not have any
-global elements in your XML schema, you cannot create an XML file from it.
-</li>
-
-<li class="stepexpand"><span>Select from the following content options:</span>
-<ul>
-<li><span class="uicontrol">Create optional attributes</span>: both mandatory
-and optional attributes will be generated.</li>
-
-<li><span class="uicontrol">Create optional elements</span>: both mandatory and
-optional elements will be generated.</li>
-
-<li><span class="uicontrol">Create first choice of required choice</span>: the
-first option of a required choice will be generated in your XML file.</li>
-
-<li><span class="uicontrol">Fill elements and attributes with data</span>: any
-elements and attributes generated will be filled with sample data.</li>
-
-</ul>
-
- If you do not select any of these options, then only the minimum amount
-of content required for the XML file will be created.</li>
-
-<li class="stepexpand"><span>The Namespace Information section contains information about the
-target namespace of the XML schema, its prefix, and the schema location. Select
-the entry you want to edit and click <span class="uicontrol">Edit</span>.</span> <ul>
-<li>The value in the <span class="uicontrol">Namespace Name</span> field is the target
-namespace of the XML schema. Your XML file should be associated with the same
-namespace as its XML schema is associated with.</li>
-
-<li>All qualified elements and attributes in the XML file associated with
-the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value.</li>
-
-<li>The  <span class="uicontrol">Location Hint</span> field contains the location
-of the XML schema.</li>
-
-</ul>
-For more information about namespaces and namespace prefixes, refer to
-the related references.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> and then <span class="uicontrol">Finish</span>.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>The XML file will contain the selected root element and any elements
-or attributes contained in the root element. It also contains information
-about the XML file namespace and location. You can now add elements and attributes
-to the XML file.</p>
-<div class="note"><span class="notetitle">Note:</span> In certain cases, when an XML file is generated
-from a complex XML schema file, the XML file might not be valid. If this occurs,
-you can open the generated file in the XML editor and correct any errors that
-occur. Usually, only a few errors need to be fixed. The following XML schema
-constructs might present problems:</div>
-<ul>
-<li>Restrictions: sometimes restricted elements are erroneously generated. </li>
-
-<li>Facets: default generated data values might not conform to complex facets
-(for example, patterns).</li>
-
-<li>Abstract elements: abstract elements are sometimes erroneously generated.</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcretxml.html" title="You can create a new XML file which you can then edit in the XML editor. You create a new XML file that is not associated with a DTD or XML schema file, so there are no restrictions on the kind of content it can contain.">Creating XML files</a></div>
-<div><a href="../topics/tcrexdtd.html" title="You can generate an XML file from your DTD if you want to quickly create an XML file based on your DTD file. Generating an XML file from your DTD saves you time by creating an XML file that is already associated with your DTD, and contains at least some of the elements and attributes in your DTD.">Generating XML files from DTDs</a></div>
-<div><a href="../topics/txedttag.html" title="This file contains information about editing XML files.">Editing XML files</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
deleted file mode 100644
index c3d43ce..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.dita
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tedtcnst" xml:lang="en-us">

-<title>Editing with DTD or XML schema constraints</title>

-<titlealts>

-<searchtitle>Editing with DTD or XML schema constraints</searchtitle>

-</titlealts>

-<shortdesc>In the Design view, when you edit an XML file that has a set of

-constraints or rules defined by a DTD or an XML schema, you can turn the constraints

-on and off to provide flexibility in the way you edit, but still maintain

-the validity of the document periodically.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>editing with constraints</indexterm></indexterm>

-<indexterm>XML files<indexterm>editing with constraints</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> When the constraints are turned on, and you are working in the

-Design view, the XML editor prevents you from inserting elements, attributes,

-or attribute values not permitted by the rules of the XML schema or DTD, and

-from removing necessary or predefined sets of tags and values. In this mode,

-an element's content must be valid to use the XML editor's guided editing

-options.</p><p>You might want to turn the constraints off for an XML file

-if you need more flexibility. For example, you want to try working with elements

-or attributes not permitted by the associated DTD or XML schema, without actually

-removing the association with the DTD or XML schema.</p><p>To turn the constraints

-for an XML file off, click <menucascade><uicontrol>XML</uicontrol><uicontrol>Turn

-Grammar Constraints Off</uicontrol></menucascade> in the toolbar. After you

-have turned the constraints off for a file, you can insert or delete any element

-or attribute regardless of the DTD or XML schema rules. You can create new

-elements or attributes that are not in the DTD or schema - these Design view

-prompts will only appear when you have turned constraints off. The file might

-not be valid, however, if you do this. </p><p>The following example shows

-what you can do if you turn the constraints of a DTD off:</p></context>

-<steps>

-<step><cmd>Open the XML file in the XML editor (right-click the file in the

-Navigator view and click <uicontrol>Open With > XML Editor</uicontrol>). </cmd>

-</step>

-<step><cmd>You have a DTD that specifies that an element requires at least

-one of a specific child element:  </cmd><info><codeblock>&lt;!ELEMENT parentElement (childElement+)>

-</codeblock></info></step>

-<step><cmd>If, in an XML file associated with your DTD, you attempt to remove

-the final child element of the element with the DTD constraints turned on,

-the editor will not allow you to do this, as it will make the document invalid.</cmd>

-<info>You can confirm this by using the element's pop-up menu to verify that

-the <uicontrol>Remove</uicontrol> option is grayed out.</info></step>

-<step><cmd>To turn the DTD constraints off, click <uicontrol>XML > Turn Grammar

-Constraints Off</uicontrol>. </cmd></step>

-<step><cmd>If you attempt to remove the same child element with constraints

-off, the editor will allow you to.</cmd></step>

-<step><cmd>To correct the invalid document, you will have to re-add the necessary

-element, or remove the invalid tagging or value.</cmd></step>

-</steps>

-<result><?Pub Caret?><p>If you introduce errors into your files, you must

-save and validate the file in order to see a list of the errors you have introduced.

-They will be listed in the Problems view. After you fix the errors, you must

-save and validate your file again to see if the file is now valid.</p><p>These

-instructions were written for the Resource perspective, but they will also

-work in many other perspectives.</p></result>

-</taskbody>

-</task>

-<?Pub *0000003814?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
deleted file mode 100644
index 3574b49..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtcnst.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing with DTD or XML schema constraints" />
-<meta name="abstract" content="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
-<meta name="description" content="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically." />
-<meta content="XML editor, editing with constraints, XML files" name="DC.subject" />
-<meta content="XML editor, editing with constraints, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtcnst" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing with DTD or XML schema constraints</title>
-</head>
-<body id="tedtcnst"><a name="tedtcnst"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing with DTD or XML schema constraints</h1>
-
-
-
-
-<div><p>In the Design view, when you edit an XML file that has a set of
-constraints or rules defined by a DTD or an XML schema, you can turn the constraints
-on and off to provide flexibility in the way you edit, but still maintain
-the validity of the document periodically.</p>
-
-<div class="section"><p> When the constraints are turned on, and you are working in the
-Design view, the XML editor prevents you from inserting elements, attributes,
-or attribute values not permitted by the rules of the XML schema or DTD, and
-from removing necessary or predefined sets of tags and values. In this mode,
-an element's content must be valid to use the XML editor's guided editing
-options.</p>
-<p>You might want to turn the constraints off for an XML file
-if you need more flexibility. For example, you want to try working with elements
-or attributes not permitted by the associated DTD or XML schema, without actually
-removing the association with the DTD or XML schema.</p>
-<p>To turn the constraints
-for an XML file off, click <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">Turn
-Grammar Constraints Off</span></span> in the toolbar. After you
-have turned the constraints off for a file, you can insert or delete any element
-or attribute regardless of the DTD or XML schema rules. You can create new
-elements or attributes that are not in the DTD or schema - these Design view
-prompts will only appear when you have turned constraints off. The file might
-not be valid, however, if you do this. </p>
-<p>The following example shows
-what you can do if you turn the constraints of a DTD off:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the XML file in the XML editor (right-click the file in the
-Navigator view and click <span class="uicontrol">Open With &gt; XML Editor</span>). </span>
-</li>
-
-<li class="stepexpand"><span>You have a DTD that specifies that an element requires at least
-one of a specific child element:  </span> <pre>&lt;!ELEMENT parentElement (childElement+)&gt;
-</pre>
-</li>
-
-<li class="stepexpand"><span>If, in an XML file associated with your DTD, you attempt to remove
-the final child element of the element with the DTD constraints turned on,
-the editor will not allow you to do this, as it will make the document invalid.</span>
- You can confirm this by using the element's pop-up menu to verify that
-the <span class="uicontrol">Remove</span> option is grayed out.</li>
-
-<li class="stepexpand"><span>To turn the DTD constraints off, click <span class="uicontrol">XML &gt; Turn Grammar
-Constraints Off</span>. </span></li>
-
-<li class="stepexpand"><span>If you attempt to remove the same child element with constraints
-off, the editor will allow you to.</span></li>
-
-<li class="stepexpand"><span>To correct the invalid document, you will have to re-add the necessary
-element, or remove the invalid tagging or value.</span></li>
-
-</ol>
-
-<div class="section"><p>If you introduce errors into your files, you must
-save and validate the file in order to see a list of the errors you have introduced.
-They will be listed in the Problems view. After you fix the errors, you must
-save and validate your file again to see if the file is now valid.</p>
-<p>These
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
deleted file mode 100644
index aec0531..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tedtdoc" xml:lang="en-us">

-<title>Editing DOCTYPE declarations</title>

-<titlealts>

-<searchtitle>Editing DOCTYPE declarations</searchtitle>

-</titlealts>

-<shortdesc>The DOCTYPE declaration in an XML file is used at the beginning

-of it to associate it with a DTD file. You can edit your DOCTYPE declaration

-to change the DTD file your XML file is associated with.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>DOCTYPE declarations<indexterm>XML editor</indexterm></indexterm>

-<indexterm>XML editor<indexterm>DOCTYPE declarations</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To edit your DOCTYPE

-declaration, complete the following steps:</p></context>

-<steps>

-<step><cmd>In the Design view of the XML editor, right-click <uicontrol>DOCTYPE</uicontrol> and

-click <uicontrol>Edit DOCTYPE</uicontrol>.</cmd></step>

-<step><cmd>The value in the <uicontrol>Root element name</uicontrol> field

-should match the root element of your XML file exactly.</cmd><info>You should

-only edit the value in this field if your root element changes.</info></step>

-<step><cmd>You can select a Public ID for any existing XML Catalog entries

-by clicking <uicontrol>Browse</uicontrol>. </cmd><info>The value in the <uicontrol>Public

-ID</uicontrol> field is the Public Identifier. It is used to associate the

-XML file (using an XML Catalog entry) with a DTD file. For more information,

-see <xref format="dita" href="txmlcat.dita" scope="local">Adding entries to

-the XML Catalog</xref>.</info></step>

-<step><cmd>The value in the <uicontrol>System ID</uicontrol> field is the

-DTD the XML file is associated with. Type the path of the DTD file (or browse

-for it) you want the XML file associated with in this field. </cmd><info> <note>When

-the XML file is processed by the XML processor, it will first try to use the

-Public ID to locate the DTD, and if this fails, it will use the System ID

-to find it.</note></info></step>

-<step><cmd>Click  <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<postreq>If you do not have a DOCTYPE declaration in your XML file, you can

-right-click in the Design view and click <uicontrol>Add DTD Information</uicontrol> to

-add one.</postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
deleted file mode 100644
index 3bac0b7..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtdoc.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing DOCTYPE declarations" />
-<meta name="abstract" content="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with." />
-<meta name="description" content="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with." />
-<meta content="DOCTYPE declarations, XML editor" name="DC.subject" />
-<meta content="DOCTYPE declarations, XML editor" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtdoc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing DOCTYPE declarations</title>
-</head>
-<body id="tedtdoc"><a name="tedtdoc"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing DOCTYPE declarations</h1>
-
-
-
-
-<div><p>The DOCTYPE declaration in an XML file is used at the beginning
-of it to associate it with a DTD file. You can edit your DOCTYPE declaration
-to change the DTD file your XML file is associated with.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit your DOCTYPE
-declaration, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view of the XML editor, right-click <span class="uicontrol">DOCTYPE</span> and
-click <span class="uicontrol">Edit DOCTYPE</span>.</span></li>
-
-<li class="stepexpand"><span>The value in the <span class="uicontrol">Root element name</span> field
-should match the root element of your XML file exactly.</span> You should
-only edit the value in this field if your root element changes.</li>
-
-<li class="stepexpand"><span>You can select a Public ID for any existing XML Catalog entries
-by clicking <span class="uicontrol">Browse</span>. </span> The value in the <span class="uicontrol">Public
-ID</span> field is the Public Identifier. It is used to associate the
-XML file (using an XML Catalog entry) with a DTD file. For more information,
-see <a href="txmlcat.html">Adding entries to the XML Catalog</a>.</li>
-
-<li class="stepexpand"><span>The value in the <span class="uicontrol">System ID</span> field is the
-DTD the XML file is associated with. Type the path of the DTD file (or browse
-for it) you want the XML file associated with in this field. </span>  <div class="note"><span class="notetitle">Note:</span> When
-the XML file is processed by the XML processor, it will first try to use the
-Public ID to locate the DTD, and if this fails, it will use the System ID
-to find it.</div>
-</li>
-
-<li class="stepexpand"><span>Click  <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section">If you do not have a DOCTYPE declaration in your XML file, you can
-right-click in the Design view and click <span class="uicontrol">Add DTD Information</span> to
-add one.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
deleted file mode 100644
index acbee1d..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="tedtenc" xml:lang="en-us">

-<title>Specifying XML default encoding line delimiters</title>

-<titlealts>

-<searchtitle>Specifying line delimiters</searchtitle>

-</titlealts>

-<shortdesc>This page lets you specify the line delimiter and the text encoding

-that will be used when you create or save an XML related file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>specifying line delimiters</indexterm></indexterm>

-<indexterm>line delimiters<indexterm>XML files</indexterm></indexterm></keywords>

-<keywords></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To specify the line delimiter you want to use, complete the following

-steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML

-Files</uicontrol></menucascade>.</cmd></step>

-<step><cmd>From the <uicontrol>Encoding</uicontrol> field, specify the default

-character encoding set that is used when creating XML related files (DTDs,

-XML files, XML schemas). Changing the encoding causes any new, XML related

-files that are created from scratch to use the selected encoding.</cmd></step>

-<step><cmd>Select <menucascade><uicontrol>General</uicontrol><uicontrol>Workspace</uicontrol>

-</menucascade> in the left pane of the Preferences window and chose either <uicontrol>Default</uicontrol> or <uicontrol>Other</uicontrol> in

-the <uicontrol>New text file line delimiter </uicontrol>section. Select the

-operating system that applies to your development or deployment platform from

-the <uicontrol>Other</uicontrol> drop down list.</cmd></step><?Pub Caret?>

-<step><cmd>Click  <uicontrol>Apply</uicontrol>, then <uicontrol>OK</uicontrol>.</cmd>

-</step>

-</steps>

-<result></result>

-</taskbody>

-</task>

-<?Pub *0000002002?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
deleted file mode 100644
index 39a6c98..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtenc.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Specifying XML default encoding line delimiters" />
-<meta name="abstract" content="This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file." />
-<meta name="description" content="This page lets you specify the line delimiter and the text encoding that will be used when you create or save an XML related file." />
-<meta content="XML files, specifying line delimiters, line delimiters" name="DC.subject" />
-<meta content="XML files, specifying line delimiters, line delimiters" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtenc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Specifying line delimiters</title>
-</head>
-<body id="tedtenc"><a name="tedtenc"><!-- --></a>
-
-
-<h1 class="topictitle1">Specifying XML default encoding line delimiters</h1>
-
-
-
-
-<div><p>This page lets you specify the line delimiter and the text encoding
-that will be used when you create or save an XML related file.</p>
-
-<div class="section"><p>To specify the line delimiter you want to use, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
-Files</span></span>.</span></li>
-
-<li><span>From the <span class="uicontrol">Encoding</span> field, specify the default
-character encoding set that is used when creating XML related files (DTDs,
-XML files, XML schemas). Changing the encoding causes any new, XML related
-files that are created from scratch to use the selected encoding.</span></li>
-
-<li><span>Select <span class="menucascade"><span class="uicontrol">General</span> &gt; <span class="uicontrol">Workspace</span>
-</span> in the left pane of the Preferences window and chose either <span class="uicontrol">Default</span> or <span class="uicontrol">Other</span> in
-the <span class="uicontrol">New text file line delimiter </span>section. Select the
-operating system that applies to your development or deployment platform from
-the <span class="uicontrol">Other</span> drop down list.</span></li>
-
-<li><span>Click  <span class="uicontrol">Apply</span>, then <span class="uicontrol">OK</span>.</span>
-</li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
deleted file mode 100644
index 978815c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.dita
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tedtgram" xml:lang="en-us">

-<title>Updating XML files with changes made to DTDs and schemas</title>

-<titlealts>

-<searchtitle>Updating XML files with changes made to DTDs and schemas</searchtitle>

-</titlealts>

-<shortdesc>If you make changes to a DTD file or XML schema associated with

-an XML file (that is currently open), click <uicontrol>XML > Reload Dependencies</uicontrol> to

-update the XML file with these changes. The changes will be reflected in the

-guided editing mechanisms available in the editor, such as content assist.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>updating XML files</indexterm></indexterm>

-<indexterm>XML files<indexterm>updating with associated changes</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>For example, you have a DTD file called "Contact.dtd" and an XML

-file called "Contact.xml" associated with it. Contact.dtd contains a root

-element called <userinput>Contact</userinput> that can contain any of the

-following children elements:  <userinput>Name</userinput>, <userinput>PostalAddress</userinput>,<?Pub Caret?> <userinput>Email</userinput>.

-If you remove the child element  <userinput>Email</userinput> from the DTD,

-you will no longer be able to add an  <userinput>Email</userinput> child element

-to your root element Contact in your Contact.xml file. This change, however,

-will not come into effect until you save your changes in the DTD and click <uicontrol>XML

-> Reload Dependencies</uicontrol> in the XML editor. Until you click it, you

-will still be able to add <userinput>Email</userinput> elements to Contact.xml.</p><p>This

-feature is very handy when you are making updates to both DTDs and XML schemas

-and XML files that are associated with DTDs and XML schemas.</p></context>

-</taskbody>

-</task>

-<?Pub *0000001987?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
deleted file mode 100644
index 686e23b..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtgram.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Updating XML files with changes made to DTDs and schemas" />
-<meta name="abstract" content="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist." />
-<meta name="description" content="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist." />
-<meta content="XML editor, updating XML files, XML files, updating with associated changes" name="DC.subject" />
-<meta content="XML editor, updating XML files, XML files, updating with associated changes" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtgram" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Updating XML files with changes made to DTDs and schemas</title>
-</head>
-<body id="tedtgram"><a name="tedtgram"><!-- --></a>
-
-
-<h1 class="topictitle1">Updating XML files with changes made to DTDs and schemas</h1>
-
-
-
-
-<div><p>If you make changes to a DTD file or XML schema associated with
-an XML file (that is currently open), click <span class="uicontrol">XML &gt; Reload Dependencies</span> to
-update the XML file with these changes. The changes will be reflected in the
-guided editing mechanisms available in the editor, such as content assist.</p>
-
-<div class="section"><p>For example, you have a DTD file called "Contact.dtd" and an XML
-file called "Contact.xml" associated with it. Contact.dtd contains a root
-element called <kbd class="userinput">Contact</kbd> that can contain any of the
-following children elements:  <kbd class="userinput">Name</kbd>, <kbd class="userinput">PostalAddress</kbd>, <kbd class="userinput">Email</kbd>.
-If you remove the child element  <kbd class="userinput">Email</kbd> from the DTD,
-you will no longer be able to add an  <kbd class="userinput">Email</kbd> child element
-to your root element Contact in your Contact.xml file. This change, however,
-will not come into effect until you save your changes in the DTD and click <span class="uicontrol">XML
-&gt; Reload Dependencies</span> in the XML editor. Until you click it, you
-will still be able to add <kbd class="userinput">Email</kbd> elements to Contact.xml.</p>
-<p>This
-feature is very handy when you are making updates to both DTDs and XML schemas
-and XML files that are associated with DTDs and XML schemas.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
deleted file mode 100644
index 1799d11..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tedtproc" xml:lang="en-us">

-<title>Editing XML processing instructions</title>

-<titlealts>

-<searchtitle>Editing XML processing instructions</searchtitle>

-</titlealts>

-<shortdesc>If you have instructions you want to send to an application using

-an XML document, you can use a processing instruction. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>processing instructions</indexterm></indexterm>

-<indexterm>XML files<indexterm>processing instructions</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To create a new processing instruction, right-click in the Design

-view, and click <uicontrol>Add Child</uicontrol>, <uicontrol>Add Before</uicontrol> or <uicontrol>Add

-After</uicontrol>, then click <uicontrol>Add Processing Instruction</uicontrol>.</p><p>To

-edit a processing instruction in the XML editor Design view, right-click your

-processing instruction, and click <uicontrol>Edit Processing Instruction</uicontrol>.

-You can change the values in the following fields:</p><ul>

-<li>The <uicontrol>Target</uicontrol> field is used to identify the application

-the instructions belongs to.</li>

-<li>The <uicontrol>Data</uicontrol> field contains the instructions.</li>

-</ul></context>

-<postreq>Click <uicontrol>OK</uicontrol> to save your settings.<note>These<?Pub Caret?>

-instructions were written for the Resource perspective, but they will also

-work in many other perspectives.</note></postreq>

-</taskbody>

-</task>

-<?Pub *0000001650?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
deleted file mode 100644
index e5de866..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtproc.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML processing instructions" />
-<meta name="abstract" content="If you have instructions you want to send to an application using an XML document, you can use a processing instruction." />
-<meta name="description" content="If you have instructions you want to send to an application using an XML document, you can use a processing instruction." />
-<meta content="XML editor, processing instructions, XML files" name="DC.subject" />
-<meta content="XML editor, processing instructions, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtproc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML processing instructions</title>
-</head>
-<body id="tedtproc"><a name="tedtproc"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML processing instructions</h1>
-
-
-
-
-<div><p>If you have instructions you want to send to an application using
-an XML document, you can use a processing instruction. </p>
-
-<div class="section"><p>To create a new processing instruction, right-click in the Design
-view, and click <span class="uicontrol">Add Child</span>, <span class="uicontrol">Add Before</span> or <span class="uicontrol">Add
-After</span>, then click <span class="uicontrol">Add Processing Instruction</span>.</p>
-<p>To
-edit a processing instruction in the XML editor Design view, right-click your
-processing instruction, and click <span class="uicontrol">Edit Processing Instruction</span>.
-You can change the values in the following fields:</p>
-<ul>
-<li>The <span class="uicontrol">Target</span> field is used to identify the application
-the instructions belongs to.</li>
-
-<li>The <span class="uicontrol">Data</span> field contains the instructions.</li>
-
-</ul>
-</div>
-
-<div class="section">Click <span class="uicontrol">OK</span> to save your settings.<div class="note"><span class="notetitle">Note:</span> These
-instructions were written for the Resource perspective, but they will also
-work in many other perspectives.</div>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
deleted file mode 100644
index 82985d3..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.dita
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tedtsch" xml:lang="en-us">

-<title>Editing namespace information</title>

-<titlealts>

-<searchtitle>Editing namespace information</searchtitle>

-</titlealts>

-<shortdesc>Your namespace information is used to provide various information

-about the XML file, such as the XML schema and namespace it is associated

-with. If desired, you can change the schema and namespace your XML file is

-associated with or add a new association. Modifying any associations can impact

-what content is allowed in the XML file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>namespace information</indexterm></indexterm>

-<indexterm>XML files<indexterm>namespace information</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To edit your schema

-information, complete the following steps:</p></context>

-<steps>

-<step><cmd>In the Design view of the XML editor, right-click your root element

-and click <uicontrol>Edit Namespaces</uicontrol>.</cmd></step>

-<step><cmd>Your XML file can be associated with more than one namespace or

-schema.</cmd><info>Select the entry you want to edit and click <uicontrol>Edit</uicontrol>.</info>

-</step>

-<step><cmd>The value in the <uicontrol>Namespace Name</uicontrol> field is

-a namespace the XML file is associated with.</cmd><info>Your XML file should

-be associated with the same namespace(s) its XML schema is associated with.

-For more information about namespaces, refer to the related reference. For

-more information, see <xref format="html" href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita"

-scope="peer">XML namespaces</xref>.</info></step>

-<step><cmd>All qualified elements and attributes in the XML file associated

-with the namespace will be prefixed with the <uicontrol>Prefix</uicontrol> value.</cmd>

-</step>

-<step><cmd>The <uicontrol>Location Hint</uicontrol> field contains the location

-of the XML schema the XML file is associated with.</cmd><info>An XML Catalog

-Key or a namespace name can be specified in this field. Click <uicontrol>Browse</uicontrol> to

-view all XML schemas in the workbench and XML Catalog.</info></step>

-<step><cmd>Click <uicontrol>OK</uicontrol>, then click <uicontrol>OK</uicontrol> again.</cmd>

-</step>

-</steps>

-<result><p>If you want to create a new association, click <uicontrol>Add</uicontrol> instead

-of <uicontrol>Edit</uicontrol>. You can then either select the <uicontrol>Specify

-From Registered Namespace</uicontrol> radio button and select the namespace

-declarations you want to add or select the <uicontrol>Specify New Namespace</uicontrol> radio

-button and fill in the fields as necessary.</p></result>

-<postreq>If you do not have namespace information in your XML file, you can

-right-click your root element in the Design view and click <uicontrol>Edit

-Namespaces</uicontrol> to add it. If you do not have a root element, you must

-create one before you can add the namespace information.</postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
deleted file mode 100644
index 683577c..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tedtsch.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing namespace information" />
-<meta name="abstract" content="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file." />
-<meta name="description" content="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file." />
-<meta content="XML editor, namespace information, XML files" name="DC.subject" />
-<meta content="XML editor, namespace information, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtsch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing namespace information</title>
-</head>
-<body id="tedtsch"><a name="tedtsch"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing namespace information</h1>
-
-
-
-
-<div><p>Your namespace information is used to provide various information
-about the XML file, such as the XML schema and namespace it is associated
-with. If desired, you can change the schema and namespace your XML file is
-associated with or add a new association. Modifying any associations can impact
-what content is allowed in the XML file.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To edit your schema
-information, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view of the XML editor, right-click your root element
-and click <span class="uicontrol">Edit Namespaces</span>.</span></li>
-
-<li class="stepexpand"><span>Your XML file can be associated with more than one namespace or
-schema.</span> Select the entry you want to edit and click <span class="uicontrol">Edit</span>.
-</li>
-
-<li class="stepexpand"><span>The value in the <span class="uicontrol">Namespace Name</span> field is
-a namespace the XML file is associated with.</span> Your XML file should
-be associated with the same namespace(s) its XML schema is associated with.
-For more information about namespaces, refer to the related reference. For
-more information, see <a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html">XML namespaces</a>.</li>
-
-<li class="stepexpand"><span>All qualified elements and attributes in the XML file associated
-with the namespace will be prefixed with the <span class="uicontrol">Prefix</span> value.</span>
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Location Hint</span> field contains the location
-of the XML schema the XML file is associated with.</span> An XML Catalog
-Key or a namespace name can be specified in this field. Click <span class="uicontrol">Browse</span> to
-view all XML schemas in the workbench and XML Catalog.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>, then click <span class="uicontrol">OK</span> again.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>If you want to create a new association, click <span class="uicontrol">Add</span> instead
-of <span class="uicontrol">Edit</span>. You can then either select the <span class="uicontrol">Specify
-From Registered Namespace</span> radio button and select the namespace
-declarations you want to add or select the <span class="uicontrol">Specify New Namespace</span> radio
-button and fill in the fields as necessary.</p>
-</div>
-
-<div class="section">If you do not have namespace information in your XML file, you can
-right-click your root element in the Design view and click <span class="uicontrol">Edit
-Namespaces</span> to add it. If you do not have a root element, you must
-create one before you can add the namespace information.</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/txmlcat.html" title="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key">Adding entries to the XML Catalog</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
deleted file mode 100644
index 00b8f28..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.dita
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="xmlsourcesuggestionstrategy" xml:lang="en-us">

-<title>Setting the XML source suggestion strategy used by content assist</title>

-<shortdesc>You can customize the formatting of the suggestions given by content

-assist by choosing a suggestion strategy preference. When the suggestion strategy

-is set to Strict, suggestions that are grammatically valid will be displayed

-first in the list of options and highlighted by bold icons. Other suggestions

-that are applicable to this element's scope but are not grammatically valid

-will be displayed lower in the list with de-emphasized icons. When the suggestion

-strategy is set to Lax, all suggestions will displayed in the list with de-emphasized

-icons.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>source suggestion strategy</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To set the suggestion strategy used by content assist, complete the

-following steps:</context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML

-Files</uicontrol><uicontrol>Editor</uicontrol></menucascade></cmd></step>

-<step><cmd>Beside <uicontrol>Suggestion strategy</uicontrol> in the Content

-assist section, select the appropriate setting (Strict or Lax).</cmd></step><?Pub Caret?>

-<step><cmd>Click <uicontrol>Apply</uicontrol>, then <uicontrol>OK</uicontrol> to

-save your settings</cmd></step>

-</steps>

-<example><p>The following screen capture demonstrates content assist with

-the suggestion strategy set to "Strict":</p><image href="../images/suggestion.gif"

-placement="break"><alt>Example of Strict Suggestion Strategy</alt></image></example>

-</taskbody>

-</task>

-<?Pub *0000001950?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html
deleted file mode 100644
index 70a8055..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/tsugstrat.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting the XML source suggestion strategy used by content assist" />
-<meta name="abstract" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to Strict, suggestions that are grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to Lax, all suggestions will displayed in the list with de-emphasized icons." />
-<meta name="description" content="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to Strict, suggestions that are grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to Lax, all suggestions will displayed in the list with de-emphasized icons." />
-<meta content="XML editor, source suggestion strategy" name="DC.subject" />
-<meta content="XML editor, source suggestion strategy" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="xmlsourcesuggestionstrategy" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting the XML source suggestion strategy used by content assist</title>
-</head>
-<body id="xmlsourcesuggestionstrategy"><a name="xmlsourcesuggestionstrategy"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting the XML source suggestion strategy used by content assist</h1>
-
-
-
-<div><p>You can customize the formatting of the suggestions given by content
-assist by choosing a suggestion strategy preference. When the suggestion strategy
-is set to Strict, suggestions that are grammatically valid will be displayed
-first in the list of options and highlighted by bold icons. Other suggestions
-that are applicable to this element's scope but are not grammatically valid
-will be displayed lower in the list with de-emphasized icons. When the suggestion
-strategy is set to Lax, all suggestions will displayed in the list with de-emphasized
-icons.</p>
-
-<div class="section">To set the suggestion strategy used by content assist, complete the
-following steps:</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
-Files</span> &gt; <span class="uicontrol">Editor</span></span></span></li>
-
-<li><span>Beside <span class="uicontrol">Suggestion strategy</span> in the Content
-assist section, select the appropriate setting (Strict or Lax).</span></li>
-
-<li><span>Click <span class="uicontrol">Apply</span>, then <span class="uicontrol">OK</span> to
-save your settings</span></li>
-
-</ol>
-
-<div class="example"><p>The following screen capture demonstrates content assist with
-the suggestion strategy set to "Strict":</p>
-<br /><img src="../images/suggestion.gif" alt="Example of Strict Suggestion Strategy" /><br /></div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
deleted file mode 100644
index 85a8914..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="ttaghilt" xml:lang="en-us">

-<title>Setting source highlighting styles</title>

-<titlealts>

-<searchtitle>Setting source highlighting styles</searchtitle>

-</titlealts>

-<shortdesc>If desired, you can change various aspects of how the XML source

-code is displayed in the Source view of the XML editor, such as the colors

-the tags will be displayed in.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>setting source highlighting styles</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To set highlighting styles for the XML code, complete the following

-steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML

-Files</uicontrol><uicontrol> Syntax Coloring</uicontrol></menucascade>.</cmd>

-</step>

-<step><cmd>In the <uicontrol>Syntax Element</uicontrol> list, select the source

-tag type that you wish to set a highlighting style for. You can also click

-text in the <uicontrol>Sample text</uicontrol> box to specify the source tag

-type that you wish to set a highlighting style for.</cmd></step>

-<step><cmd>Click the <uicontrol>Foreground</uicontrol> box, select the color

-that you want the text of the tag to appear in, and click <uicontrol>OK</uicontrol>.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Background</uicontrol> box, select the color

-that you want to appear behind the tag, and click <uicontrol>OK</uicontrol>.</cmd>

-</step>

-<step><cmd>Select the <uicontrol>Bold</uicontrol> check box if you want to

-make the type bold.</cmd></step>

-<step><cmd> </cmd></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> to save your changes.</cmd></step>

-</steps>

-<result>To set the highlight<?Pub Caret?>ing styles back to their default

-values, click <uicontrol>Restore Default</uicontrol>. If you only want to

-reset the value for a particular content type, select it in the <uicontrol>Syntax

-Element</uicontrol> field, then click the <uicontrol>Restore Default</uicontrol> button.</result>

-</taskbody>

-</task>

-<?Pub *0000002290?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
deleted file mode 100644
index a461cfb..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/ttaghilt.html
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Setting source highlighting styles" />
-<meta name="abstract" content="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in." />
-<meta name="description" content="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in." />
-<meta content="XML editor, setting source highlighting styles" name="DC.subject" />
-<meta content="XML editor, setting source highlighting styles" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ttaghilt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Setting source highlighting styles</title>
-</head>
-<body id="ttaghilt"><a name="ttaghilt"><!-- --></a>
-
-
-<h1 class="topictitle1">Setting source highlighting styles</h1>
-
-
-
-
-<div><p>If desired, you can change various aspects of how the XML source
-code is displayed in the Source view of the XML editor, such as the colors
-the tags will be displayed in.</p>
-
-<div class="section"><p>To set highlighting styles for the XML code, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
-Files</span> &gt; <span class="uicontrol"> Syntax Coloring</span></span>.</span>
-</li>
-
-<li><span>In the <span class="uicontrol">Syntax Element</span> list, select the source
-tag type that you wish to set a highlighting style for. You can also click
-text in the <span class="uicontrol">Sample text</span> box to specify the source tag
-type that you wish to set a highlighting style for.</span></li>
-
-<li><span>Click the <span class="uicontrol">Foreground</span> box, select the color
-that you want the text of the tag to appear in, and click <span class="uicontrol">OK</span>.</span>
-</li>
-
-<li><span>Click the <span class="uicontrol">Background</span> box, select the color
-that you want to appear behind the tag, and click <span class="uicontrol">OK</span>.</span>
-</li>
-
-<li><span>Select the <span class="uicontrol">Bold</span> check box if you want to
-make the type bold.</span></li>
-
-<li><span> </span></li>
-
-<li><span>Click <span class="uicontrol">OK</span> to save your changes.</span></li>
-
-</ol>
-
-<div class="section">To set the highlighting styles back to their default
-values, click <span class="uicontrol">Restore Default</span>. If you only want to
-reset the value for a particular content type, select it in the <span class="uicontrol">Syntax
-Element</span> field, then click the <span class="uicontrol">Restore Default</span> button.</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
deleted file mode 100644
index 0e94754..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.dita
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="twcdast" xml:lang="en-us">

-<title>Using XML content assist</title>

-<titlealts>

-<searchtitle>Using XML content assist</searchtitle>

-</titlealts>

-<shortdesc>You can use content assist to help you finish a tag or line of

-code in the Source view of the XML editor. You can also use content assist

-to insert templates into your XML code.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>content assist</indexterm></indexterm>

-<indexterm>XML files<indexterm>content assist</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The placement of the cursor in your source file provides the context

-for the content assist to offer suggestions for completion.</p><p>You can

-launch content assist in either of the following ways:</p><ul>

-<li>From the <uicontrol>Edit</uicontrol> menu, click <uicontrol>Content Assist</uicontrol>,

-or</li>

-<li>Press Ctrl+Space</li>

-</ul><p>In addition, you can set up an option that causes content assist to

-pop up automatically when certain characters are typed. To set up this option,

-click <menucascade><uicontrol>Window</uicontrol><uicontrol> Preferences</uicontrol>

-</menucascade> to open the Preferences window, then select <menucascade><uicontrol>XML</uicontrol>

-<uicontrol>XML Files </uicontrol><uicontrol>Editor</uicontrol></menucascade> .

-In the <uicontrol>Content assist</uicontrol> group box, select the <uicontrol>Automatically

-make suggestions</uicontrol> check box, and supply any additional characters

-that should trigger content assist.</p><p>If your cursor is in a position

-where content assist is available, a pop-up list of available choices is displayed

-when you launch content assist. The list is based on the context and whether

-a DTD or XML schema is associated with the XML file being edited. For example,

-if you have an Address element that can contain any of the following children

-elements: Name, Street, City, Zip Code, Country, and Province, and you place

-your cursor after any of them and launch content assist, all of the child

-elements will be listed in the content assist list.</p><p>The content assist

-list displays all valid tags for the current cursor position, including templates.

-If your grammar constraints are turned off, all available tags, not just valid

-ones, are displayed. </p><p>As you type the first one or two letters of the

-tag that you want, the list automatically refreshes with alphabetized choices

-that match your input. Scroll down and select the tag that you want to use

-by double-clicking on it.<?Pub Caret?></p><note>The list only refreshes as

-described if you first type <userinput>&lt;</userinput> before prompting for

-content assist.</note></context>

-</taskbody>

-</task>

-<?Pub *0000002891?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
deleted file mode 100644
index 57be527..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twcdast.html
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Using XML content assist" />
-<meta name="abstract" content="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code." />
-<meta name="description" content="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code." />
-<meta content="XML editor, content assist, XML files" name="DC.subject" />
-<meta content="XML editor, content assist, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twmacro.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tsugstrat.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twcdast" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Using XML content assist</title>
-</head>
-<body id="twcdast"><a name="twcdast"><!-- --></a>
-
-
-<h1 class="topictitle1">Using XML content assist</h1>
-
-
-
-
-<div><p>You can use content assist to help you finish a tag or line of
-code in the Source view of the XML editor. You can also use content assist
-to insert templates into your XML code.</p>
-
-<div class="section"><p>The placement of the cursor in your source file provides the context
-for the content assist to offer suggestions for completion.</p>
-<p>You can
-launch content assist in either of the following ways:</p>
-<ul>
-<li>From the <span class="uicontrol">Edit</span> menu, click <span class="uicontrol">Content Assist</span>,
-or</li>
-
-<li>Press Ctrl+Space</li>
-
-</ul>
-<p>In addition, you can set up an option that causes content assist to
-pop up automatically when certain characters are typed. To set up this option,
-click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol"> Preferences</span>
-</span> to open the Preferences window, then select <span class="menucascade"><span class="uicontrol">XML</span>
- &gt; <span class="uicontrol">XML Files </span> &gt; <span class="uicontrol">Editor</span></span> .
-In the <span class="uicontrol">Content assist</span> group box, select the <span class="uicontrol">Automatically
-make suggestions</span> check box, and supply any additional characters
-that should trigger content assist.</p>
-<p>If your cursor is in a position
-where content assist is available, a pop-up list of available choices is displayed
-when you launch content assist. The list is based on the context and whether
-a DTD or XML schema is associated with the XML file being edited. For example,
-if you have an Address element that can contain any of the following children
-elements: Name, Street, City, Zip Code, Country, and Province, and you place
-your cursor after any of them and launch content assist, all of the child
-elements will be listed in the content assist list.</p>
-<p>The content assist
-list displays all valid tags for the current cursor position, including templates.
-If your grammar constraints are turned off, all available tags, not just valid
-ones, are displayed. </p>
-<p>As you type the first one or two letters of the
-tag that you want, the list automatically refreshes with alphabetized choices
-that match your input. Scroll down and select the tag that you want to use
-by double-clicking on it.</p>
-<div class="note"><span class="notetitle">Note:</span> The list only refreshes as
-described if you first type <kbd class="userinput">&lt;</kbd> before prompting for
-content assist.</div>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
-<div><a href="../topics/tsugstrat.html" title="You can customize the formatting of the suggestions given by content assist by choosing a suggestion strategy preference. When the suggestion strategy is set to Strict, suggestions that are grammatically valid will be displayed first in the list of options and highlighted by bold icons. Other suggestions that are applicable to this element's scope but are not grammatically valid will be displayed lower in the list with de-emphasized icons. When the suggestion strategy is set to Lax, all suggestions will displayed in the list with de-emphasized icons.">Setting the XML source suggestion strategy used by content assist</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
deleted file mode 100644
index 7a1b4c5..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.dita
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twmacro" xml:lang="en-us">

-<title>Working with XML templates</title>

-<titlealts>

-<searchtitle>Working with XML templates</searchtitle>

-</titlealts>

-<shortdesc>XML content assist provides a comment template, a section of predefined

-code that you can insert into a file. You may find a template useful when

-you have a certain piece of code you want to reuse several times, and you

-do not want to write it out every time.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="twmacro|1|XMLtemplatesworkingwithpredefinedcode"

-status="changed">templates<indexterm>working with predefined XML code</indexterm></indexterm>

-</keywords>

-</metadata><metadata>

-<keywords><indexterm keyref="twmacro|10|XMLfilestemplates" status="new">XML

-files<indexterm>templates</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can use a default template as provided, customize that template,

-or create your own templates.</p><p>For example, you can work on a group of

-XML pages that should all contain a table with a specific appearance. Create

-a template that contains the tags for that table, including the appropriate

-attributes and attribute values for each tag. (You can copy and paste the

-tags from a structured text editor into the template's <uicontrol>Pattern</uicontrol> field.)

-Then select the name of the template from a content assist proposal list whenever

-you want to insert your custom table into an XML file.</p><p>To create a new

-XML template, complete the following steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML

-Files</uicontrol><uicontrol>Templates</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Click <uicontrol>New</uicontrol> if you want to create a completely

-new template.</cmd></step>

-<step><cmd>Supply a new template <uicontrol>Name</uicontrol> and <uicontrol>Description</uicontrol>.</cmd>

-</step>

-<step><cmd>Specify the <uicontrol>Context</uicontrol> for the template.</cmd>

-<info>This is the context in which the template is available in the proposal

-list when content assist is requested. </info></step>

-<step><cmd>Specify the <uicontrol>Pattern</uicontrol> for your template using

-the appropriate tags, attributes, or attribute values to be inserted by content

-assist.</cmd></step>

-<step><cmd>If you want to insert a variable, click the <uicontrol>Insert Variable</uicontrol> button

-and select the variable to be inserted. </cmd><info>For example, the <b>date</b> variable

-indicates the current date will be inserted. </info></step>

-<step><cmd>Click <uicontrol>OK</uicontrol> and then <uicontrol>Apply</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-<postreq>You can edit, remove, import, or export a template by using the same

-preferences page. If you have modified a default template, you can restore

-it to its default value. You can also restore a removed template if you have

-not exited from the workbench since it was removed. <p>If you have a template

-that you do not want to remove but you no longer want it to appear in the

-content assist list, clear its check box in the table on the Templates preferences

-page.</p></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
deleted file mode 100644
index 2a953c3..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twmacro.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Working with XML templates" />
-<meta name="abstract" content="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta name="description" content="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time." />
-<meta content="templates, working with predefined XML code, XML files" name="DC.subject" />
-<meta content="templates, working with predefined XML code, XML files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twmacro" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with XML templates</title>
-</head>
-<body id="twmacro"><a name="twmacro"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with XML templates</h1>
-
-
-
-
-<div><p>XML content assist provides a comment template, a section of predefined
-code that you can insert into a file. You may find a template useful when
-you have a certain piece of code you want to reuse several times, and you
-do not want to write it out every time.</p>
-
-<div class="section"><p>You can use a default template as provided, customize that template,
-or create your own templates.</p>
-<p>For example, you can work on a group of
-XML pages that should all contain a table with a specific appearance. Create
-a template that contains the tags for that table, including the appropriate
-attributes and attribute values for each tag. (You can copy and paste the
-tags from a structured text editor into the template's <span class="uicontrol">Pattern</span> field.)
-Then select the name of the template from a content assist proposal list whenever
-you want to insert your custom table into an XML file.</p>
-<p>To create a new
-XML template, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
-Files</span> &gt; <span class="uicontrol">Templates</span></span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">New</span> if you want to create a completely
-new template.</span></li>
-
-<li class="stepexpand"><span>Supply a new template <span class="uicontrol">Name</span> and <span class="uicontrol">Description</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Context</span> for the template.</span>
- This is the context in which the template is available in the proposal
-list when content assist is requested. </li>
-
-<li class="stepexpand"><span>Specify the <span class="uicontrol">Pattern</span> for your template using
-the appropriate tags, attributes, or attribute values to be inserted by content
-assist.</span></li>
-
-<li class="stepexpand"><span>If you want to insert a variable, click the <span class="uicontrol">Insert Variable</span> button
-and select the variable to be inserted. </span> For example, the <strong>date</strong> variable
-indicates the current date will be inserted. </li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span> and then <span class="uicontrol">Apply</span> to
-save your changes.</span></li>
-
-</ol>
-
-<div class="section">You can edit, remove, import, or export a template by using the same
-preferences page. If you have modified a default template, you can restore
-it to its default value. You can also restore a removed template if you have
-not exited from the workbench since it was removed. <p>If you have a template
-that you do not want to remove but you no longer want it to appear in the
-content assist list, clear its check box in the table on the Templates preferences
-page.</p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
deleted file mode 100644
index 1adfec2..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="twxvalid" xml:lang="en-us">

-<title>Validating XML files</title>

-<titlealts>

-<searchtitle>Validating XML files</searchtitle>

-</titlealts>

-<shortdesc>When you validate your XML file, the XML validator will check to

-see that your file is valid and well-formed.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML files<indexterm>validating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The XML editor will process XML files that are invalid or not

-well-formed. The editor uses heuristics to open a file using the best interpretation

-of the tagging that it can. For example, an element with a missing end tag

-is simply assumed to end at the end of the document. As you make updates to

-a file, the editor incrementally reinterprets your document, changing the

-highlighting, tree view, and so on. Many formation errors are easy to spot

-in the syntax highlighting, so you can easily correct obvious errors on-the-fly.

-However, there will be other cases when it will be beneficial to perform formal

-validation on your documents.</p><p>You can validate your file by selecting

-it in the Navigator view, right-clicking it, and clicking <uicontrol>Validate</uicontrol>.

-Any validation problems are indicated in the Problems view. You can double-click

-on individual errors, and you will be taken to the invalid tag in the file,

-so that you can make corrections.</p></context>

-<postreq><note> If you receive an error message indicating that the Problems

-view is full, you can increase the number of error messages allowed by clicking <menucascade>

-<uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol></menucascade> and

-selecting <menucascade><uicontrol>General</uicontrol><uicontrol>Markers</uicontrol>

-</menucascade>. Select the <uicontrol>Use marker limits</uicontrol> check

-box and change the number in the <uicontrol>Limit visible items per group</uicontrol> <?Pub Caret?>field.</note><p>You

-can set up a project's properties so that different types of project resources

-are automatically validated when you save them. From a project's pop-up menu,

-click <uicontrol>Properties</uicontrol>, then select <uicontrol>Validation</uicontrol>.

-Any validators you can run against your project will be listed in the Validation

-page.</p></postreq>

-</taskbody>

-<related-links>

-<link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita" scope="peer">

-<linktext>Validating code in enterprise applications</linktext></link>

-</related-links>

-</task>

-<?Pub *0000002658?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
deleted file mode 100644
index ce22a1e..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/twxvalid.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating XML files" />
-<meta name="abstract" content="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed." />
-<meta name="description" content="When you validate your XML file, the XML validator will check to see that your file is valid and well-formed." />
-<meta content="XML files, validating" name="DC.subject" />
-<meta content="XML files, validating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="twxvalid" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating XML files</title>
-</head>
-<body id="twxvalid"><a name="twxvalid"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating XML files</h1>
-
-
-
-
-<div><p>When you validate your XML file, the XML validator will check to
-see that your file is valid and well-formed.</p>
-
-<div class="section"><p>The XML editor will process XML files that are invalid or not
-well-formed. The editor uses heuristics to open a file using the best interpretation
-of the tagging that it can. For example, an element with a missing end tag
-is simply assumed to end at the end of the document. As you make updates to
-a file, the editor incrementally reinterprets your document, changing the
-highlighting, tree view, and so on. Many formation errors are easy to spot
-in the syntax highlighting, so you can easily correct obvious errors on-the-fly.
-However, there will be other cases when it will be beneficial to perform formal
-validation on your documents.</p>
-<p>You can validate your file by selecting
-it in the Navigator view, right-clicking it, and clicking <span class="uicontrol">Validate</span>.
-Any validation problems are indicated in the Problems view. You can double-click
-on individual errors, and you will be taken to the invalid tag in the file,
-so that you can make corrections.</p>
-</div>
-
-<div class="section"><div class="note"><span class="notetitle">Note:</span>  If you receive an error message indicating that the Problems
-view is full, you can increase the number of error messages allowed by clicking <span class="menucascade">
-<span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span></span> and
-selecting <span class="menucascade"><span class="uicontrol">General</span> &gt; <span class="uicontrol">Markers</span>
-</span>. Select the <span class="uicontrol">Use marker limits</span> check
-box and change the number in the <span class="uicontrol">Limit visible items per group</span> field.</div>
-<p>You
-can set up a project's properties so that different types of project resources
-are automatically validated when you save them. From a project's pop-up menu,
-click <span class="uicontrol">Properties</span>, then select <span class="uicontrol">Validation</span>.
-Any validators you can run against your project will be listed in the Validation
-page.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html">Validating code in enterprise applications</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
deleted file mode 100644
index 620e459..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.dita
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="txedtdes" xml:lang="en-us">

-<title>Editing in the Design view</title>

-<titlealts>

-<searchtitle>Editing in the Design view</searchtitle>

-</titlealts>

-<shortdesc>The XML editor has a Design view, which represents the XML file

-simultaneously as a table and a tree. This helps make navigation and editing

-easier. Content and attribute values can be edited directly in the table cells,

-while pop-up menus on the tree elements give alternatives that are valid for

-that particular element.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>Design view</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>For example, the <uicontrol>Add child</uicontrol> menu item will

-list only those elements from a DTD or XML schema which would be valid children

-at that point.</p><p>When you have an XML file associated with an XML schema

-or DTD file, certain tags and rules for that file have already been established,

-which is why the Design view can provide prompts (via a pop-up menu) for those

-tags. When you create an XML file that is not associated with an XML schema

-or DTD file, it has no tags or rules associated with it, so the Design view

-cannot provide prompts for specific tags, but it can provide prompts to create

-new elements and attributes.</p><p>For any XML file associated with an XML

-schema or DTD file, you can use the Design view to add any items defined in

-the XML schema or DTD (such as elements and attributes) to the XML file. You

-can also use it to add processing instructions and comments to all XML files.</p><p>To

-open and edit a XML file in the XML editor, right-click the file in the Navigator

-view and click <uicontrol>Open With > XML Editor</uicontrol>. If necessary,

-click the <uicontrol>Design</uicontrol> tab to open the Design view.</p><p>To

-expand all the items in your XML file, click <menucascade><uicontrol>XML</uicontrol>

-<uicontrol>Expand All</uicontrol></menucascade> <image href="../images/expand_all.gif">

-<alt>This graphic is the Expand All toolbar button</alt></image> on the toolbar.

-To collapse them, click the <menucascade><uicontrol>XML</uicontrol><uicontrol>Collapse

-All</uicontrol></menucascade> <image href="../images/collapse_all.gif"><alt>This

-graphic is the Collapse All toolbar button</alt></image> on the toolbar.</p><p>If

-you right-click the item that you want to work with, some or all of the following

-options (as applicable) will be available from the pop-up menu that appears:</p><table>

-<tgroup cols="2"><colspec colname="col1" colwidth="48*"/><colspec colname="col2"

-colwidth="150*"/>

-<thead>

-<row valign="bottom">

-<entry colname="col1">Select this</entry>

-<entry colname="col2">If you want to do this</entry>

-</row>

-</thead>

-<tbody>

-<row>

-<entry colname="col1">Add DTD Information</entry>

-<entry colname="col2">Associate the XML file with a DTD.</entry>

-</row>

-<row>

-<entry colname="col1">Edit DOCTYPE</entry>

-<entry colname="col2">Edit the DOCTYPE declaration. Refer to the related task

-for more details. For more information, see <xref format="dita" href="tedtdoc.dita"

-scope="local">Editing DOCTYPE declarations</xref>.</entry>

-</row>

-<row>

-<entry colname="col1">Edit Namespaces</entry>

-<entry colname="col2">Edit the existing namespace information or create a

-new association with a namespace. Refer to the related task for more details.

-For more information, see <xref format="dita" href="tedtsch.dita" scope="local">Editing

-namespace information</xref>.</entry>

-</row>

-<row>

-<entry colname="col1">Edit Processing Instruction</entry>

-<entry colname="col2">Edit the processing instruction. Refer to the related

-task for more details. For more information, see <xref format="dita" href="tedtproc.dita"

-scope="local">Editing XML processing instructions</xref>.</entry>

-</row>

-<row>

-<entry colname="col1">Remove</entry>

-<entry colname="col2">Remove the item that you have selected from the XML

-file. If the selected item or related items are defined so that the item must

-exist in the file, this option will not be available. For example, in your

-DTD, if you have declared that "One or more" of the item must always exist

-in your XML file, and the item you have selected is the only one that exists

-in your XML file.</entry>

-</row>

-<row>

-<entry colname="col1">Add Attribute</entry>

-<entry colname="col2">Add an attribute to the element that you selected. Any

-attributes you are allowed to add to the element will be listed. After you

-have added the attribute to the XML file, you can click in the right-hand

-column to change the value of the attribute. If the attribute has set values,

-they will appear in a list.</entry>

-</row>

-<row>

-<entry colname="col1">Add Child</entry>

-<entry colname="col2">Add another element, a comment, or a processing instruction

-as a child of the parent element.</entry>

-</row>

-<row>

-<entry colname="col1">Add Before</entry>

-<entry colname="col2">Add a child element, comment, or processing instruction

-that can go before the item you have selected. For example, if you have a

-parent element called <userinput>CD Collections</userinput> that can contain

-an unlimited amount of children called <userinput>CD</userinput>, you could

-click a <userinput>CD</userinput> element and click <menucascade><uicontrol>Add

-Before</uicontrol><uicontrol> CD</uicontrol></menucascade> , as a <userinput>CD</userinput> element

-can go before another <userinput>CD</userinput> element.</entry>

-</row>

-<row>

-<entry colname="col1">Add After</entry>

-<entry colname="col2">Add a child element, comment, or processing instruction

-that can go after the item you have selected. For example, if you have a parent

-element called <userinput>CD Collections</userinput> that can contain an unlimited

-amount of children called <userinput>CD</userinput>, you could click a <userinput>CD</userinput> element

-and click  <menucascade><uicontrol>Add After</uicontrol><uicontrol> CD</uicontrol>

-</menucascade>, as a <userinput>CD</userinput> element can go after another <userinput>CD</userinput> element.</entry>

-</row>

-<row>

-<entry colname="col1">Replace With</entry>

-<entry colname="col2">Replace one item with another. This option is not available

-if you turn grammar constraints off or if there are no valid alternatives

-for you to replace the item with.</entry>

-</row>

-</tbody>

-</tgroup>

-</table></context>

-<result><p>Any changes you make in the Design view are also reflected in the

-Source view and the Outline view.</p><note>These instructions were written

-for the Resource perspective, but they will also work in many other perspectives.</note></result>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
deleted file mode 100644
index 8615d37..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtdes.html
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing in the Design view" />
-<meta name="abstract" content="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element." />
-<meta name="description" content="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element." />
-<meta content="XML editor, Design view" name="DC.subject" />
-<meta content="XML editor, Design view" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtproc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rxmlbicons.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txedtdes" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing in the Design view</title>
-</head>
-<body id="txedtdes"><a name="txedtdes"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing in the Design view</h1>
-
-
-
-
-<div><p>The XML editor has a Design view, which represents the XML file
-simultaneously as a table and a tree. This helps make navigation and editing
-easier. Content and attribute values can be edited directly in the table cells,
-while pop-up menus on the tree elements give alternatives that are valid for
-that particular element.</p>
-
-<div class="section"><p>For example, the <span class="uicontrol">Add child</span> menu item will
-list only those elements from a DTD or XML schema which would be valid children
-at that point.</p>
-<p>When you have an XML file associated with an XML schema
-or DTD file, certain tags and rules for that file have already been established,
-which is why the Design view can provide prompts (via a pop-up menu) for those
-tags. When you create an XML file that is not associated with an XML schema
-or DTD file, it has no tags or rules associated with it, so the Design view
-cannot provide prompts for specific tags, but it can provide prompts to create
-new elements and attributes.</p>
-<p>For any XML file associated with an XML
-schema or DTD file, you can use the Design view to add any items defined in
-the XML schema or DTD (such as elements and attributes) to the XML file. You
-can also use it to add processing instructions and comments to all XML files.</p>
-<p>To
-open and edit a XML file in the XML editor, right-click the file in the Navigator
-view and click <span class="uicontrol">Open With &gt; XML Editor</span>. If necessary,
-click the <span class="uicontrol">Design</span> tab to open the Design view.</p>
-<p>To
-expand all the items in your XML file, click <span class="menucascade"><span class="uicontrol">XML</span>
- &gt; <span class="uicontrol">Expand All</span></span> <img src="../images/expand_all.gif" alt="This graphic is the Expand All toolbar button" /> on the toolbar.
-To collapse them, click the <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">Collapse
-All</span></span> <img src="../images/collapse_all.gif" alt="This graphic is the Collapse All toolbar button" /> on the
-toolbar.</p>
-<p>If you right-click the item that you want to work with, some
-or all of the following options (as applicable) will be available from the
-pop-up menu that appears:</p>
-<p />
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<thead align="left">
-<tr valign="bottom">
-<th valign="bottom" width="24.242424242424242%" id="N100D8">Select this</th>
-
-<th valign="bottom" width="75.75757575757575%" id="N100DF">If you want to do this</th>
-
-</tr>
-
-</thead>
-
-<tbody>
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add DTD Information</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Associate the XML file with a DTD.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Edit DOCTYPE</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Edit the DOCTYPE declaration. Refer to the related task
-for more details. For more information, see <a href="tedtdoc.html">Editing DOCTYPE declarations</a>.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Edit Namespaces</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Edit the existing namespace information or create a
-new association with a namespace. Refer to the related task for more details.
-For more information, see <a href="tedtsch.html">Editing namespace information</a>.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Edit Processing Instruction</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Edit the processing instruction. Refer to the related
-task for more details. For more information, see <a href="tedtproc.html">Editing XML processing instructions</a>.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Remove</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Remove the item that you have selected from the XML
-file. If the selected item or related items are defined so that the item must
-exist in the file, this option will not be available. For example, in your
-DTD, if you have declared that "One or more" of the item must always exist
-in your XML file, and the item you have selected is the only one that exists
-in your XML file.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add Attribute</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Add an attribute to the element that you selected. Any
-attributes you are allowed to add to the element will be listed. After you
-have added the attribute to the XML file, you can click in the right-hand
-column to change the value of the attribute. If the attribute has set values,
-they will appear in a list.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add Child</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Add another element, a comment, or a processing instruction
-as a child of the parent element.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add Before</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Add a child element, comment, or processing instruction
-that can go before the item you have selected. For example, if you have a
-parent element called <kbd class="userinput">CD Collections</kbd> that can contain
-an unlimited amount of children called <kbd class="userinput">CD</kbd>, you could
-click a <kbd class="userinput">CD</kbd> element and click <span class="menucascade"><span class="uicontrol">Add
-Before</span> &gt; <span class="uicontrol"> CD</span></span> , as a <kbd class="userinput">CD</kbd> element
-can go before another <kbd class="userinput">CD</kbd> element.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Add After</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Add a child element, comment, or processing instruction
-that can go after the item you have selected. For example, if you have a parent
-element called <kbd class="userinput">CD Collections</kbd> that can contain an unlimited
-amount of children called <kbd class="userinput">CD</kbd>, you could click a <kbd class="userinput">CD</kbd> element
-and click  <span class="menucascade"><span class="uicontrol">Add After</span> &gt; <span class="uicontrol"> CD</span>
-</span>, as a <kbd class="userinput">CD</kbd> element can go after another <kbd class="userinput">CD</kbd> element.</td>
-
-</tr>
-
-<tr>
-<td valign="top" width="24.242424242424242%" headers="N100D8 ">Replace With</td>
-
-<td valign="top" width="75.75757575757575%" headers="N100DF ">Replace one item with another. This option is not available
-if you turn grammar constraints off or if there are no valid alternatives
-for you to replace the item with.</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-</div>
-
-<div class="section"><p>Any changes you make in the Design view are also reflected in the
-Source view and the Outline view.</p>
-<div class="note"><span class="notetitle">Note:</span> These instructions were written
-for the Resource perspective, but they will also work in many other perspectives.</div>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-<div><a href="../topics/tedtproc.html" title="If you have instructions you want to send to an application using an XML document, you can use a processing instruction.">Editing XML processing instructions</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rxmlbicons.html" title="The following XML editor icons appear in the Outline and Design view.">Icons used in the XML editor</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
deleted file mode 100644
index 81a8fac..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.dita
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="txedtsrc" xml:lang="en-us">

-<title>Editing in the Source view</title>

-<titlealts>

-<searchtitle>Editing in the Source view</searchtitle>

-</titlealts>

-<shortdesc>You can use the Source view to view and work with a file's source

-code directly.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>Source view</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> The Source view has many text editing features, such as:</p><dl>

-<dlentry>

-<dt>Syntax highlighting</dt>

-<dd>Each tag type is highlighted differently, enabling you to easily find

-a certain kind of tag for editing. In addition, syntax highlighting is valuable

-in locating syntax errors. For example, if you begin a comment in the middle

-of the document with <codeph>&lt;!--</codeph> everything until the next <codeph>--></codeph> is

-considered a comment, and will be highlighted accordingly. The large highlighted

-area will indicate that you need to add <codeph>--></codeph> to close the

-comment.<p>You can customize the syntax highlighting. Refer to the related

-tasks for more information.</p></dd>

-</dlentry></dl><dl><dlentry>

-<dt>Unlimited undo and redo</dt>

-<dd>These options allow you to incrementally undo and redo every change made

-to a file for the entire editing session. For text, changes are incremented

-one character or set of selected characters at a time.</dd>

-</dlentry><dlentry>

-<dt>Content assist</dt>

-<dd>Content assist helps you finish tags and insert macros. Refer to the related

-task for more details.</dd>

-</dlentry><dlentry>

-<dt>Template</dt>

-<dd>You can access templates (using content assist) to help you quickly add

-regularly-used tagging combinations. Refer to the related task for more details.</dd>

-</dlentry><dlentry>

-<dt>Node selection</dt>

-<dd>Based on the location of your cursor (or selection in the Outline view),

-the node selection indicator highlights the line numbers that include a node

-(for example, an element or attribute), in the vertical ruler in the left

-area of the Source view.</dd>

-</dlentry><dlentry>

-<dt>Pop-up menu options</dt>

-<dd>From the editor's pop-up menu, you have many of the same editing options

-available as you do from the workbench  <b>Edit</b> menu. You can select menu

-options such as: <uicontrol>Cleanup Document,</uicontrol> to open the <uicontrol>Cleanup</uicontrol> 

-dialog, which contains settings to update a document so that it is well-formed

-and formatted and <uicontrol>Format,</uicontrol> which formats either the

-entire document or selected elements.</dd>

-</dlentry><dlentry>

-<dt>"Smart" double clicking</dt>

-<dd>You can use double-click to select attribute values, attribute-value pairs,

-and entire tag sets to quickly update, copy, or remove content.</dd>

-</dlentry></dl><p>To open an XML file to edit, right-click the file in the

-Navigator view and select <uicontrol>Open With > XML Editor</uicontrol>. Click

-the <uicontrol>Source</uicontrol> to see the Source view.</p><p>Edit the code

-as necessary, using any of the available features. As you move the cursor

-within your XML file (or select items from the Outline view), the node selection

-indicator will highlight the line numbers that encompass the node (for example,

-an element or attribute). You can use smart double-clicking behavior to select

-attribute values, attribute-value pairs, and entire tag sets to quickly update,

-copy, or remove content. <?Pub Caret?>If desired, validate and save the XML

-file.</p></context>

-<result><p>Any changes you make in the Source view are also reflected in the

-Design view and the Outline view.</p></result>

-</taskbody>

-</task>

-<?Pub *0000003781?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
deleted file mode 100644
index 1095260..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedtsrc.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing in the Source view" />
-<meta name="abstract" content="You can use the Source view to view and work with a file's source code directly." />
-<meta name="description" content="You can use the Source view to view and work with a file's source code directly." />
-<meta content="XML editor, Source view" name="DC.subject" />
-<meta content="XML editor, Source view" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twcdast.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/twmacro.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/ttaghilt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txedtsrc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing in the Source view</title>
-</head>
-<body id="txedtsrc"><a name="txedtsrc"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing in the Source view</h1>
-
-
-
-
-<div><p>You can use the Source view to view and work with a file's source
-code directly.</p>
-
-<div class="section"><p> The Source view has many text editing features, such as:</p>
-<dl>
-
-<dt class="dlterm">Syntax highlighting</dt>
-
-<dd>Each tag type is highlighted differently, enabling you to easily find
-a certain kind of tag for editing. In addition, syntax highlighting is valuable
-in locating syntax errors. For example, if you begin a comment in the middle
-of the document with <samp class="codeph">&lt;!--</samp> everything until the next <samp class="codeph">--&gt;</samp> is
-considered a comment, and will be highlighted accordingly. The large highlighted
-area will indicate that you need to add <samp class="codeph">--&gt;</samp> to close the
-comment.<p>You can customize the syntax highlighting. Refer to the related
-tasks for more information.</p>
-</dd>
-
-</dl>
-<dl>
-<dt class="dlterm">Unlimited undo and redo</dt>
-
-<dd>These options allow you to incrementally undo and redo every change made
-to a file for the entire editing session. For text, changes are incremented
-one character or set of selected characters at a time.</dd>
-
-
-<dt class="dlterm">Content assist</dt>
-
-<dd>Content assist helps you finish tags and insert macros. Refer to the related
-task for more details.</dd>
-
-
-<dt class="dlterm">Template</dt>
-
-<dd>You can access templates (using content assist) to help you quickly add
-regularly-used tagging combinations. Refer to the related task for more details.</dd>
-
-
-<dt class="dlterm">Node selection</dt>
-
-<dd>Based on the location of your cursor (or selection in the Outline view),
-the node selection indicator highlights the line numbers that include a node
-(for example, an element or attribute), in the vertical ruler in the left
-area of the Source view.</dd>
-
-
-<dt class="dlterm">Pop-up menu options</dt>
-
-<dd>From the editor's pop-up menu, you have many of the same editing options
-available as you do from the workbench  <strong>Edit</strong> menu. You can select menu
-options such as: <span class="uicontrol">Cleanup Document,</span> to open the <span class="uicontrol">Cleanup</span> 
-dialog, which contains settings to update a document so that it is well-formed
-and formatted and <span class="uicontrol">Format,</span> which formats either the
-entire document or selected elements.</dd>
-
-
-<dt class="dlterm">"Smart" double clicking</dt>
-
-<dd>You can use double-click to select attribute values, attribute-value pairs,
-and entire tag sets to quickly update, copy, or remove content.</dd>
-
-</dl>
-<p>To open an XML file to edit, right-click the file in the
-Navigator view and select <span class="uicontrol">Open With &gt; XML Editor</span>. Click
-the <span class="uicontrol">Source</span> to see the Source view.</p>
-<p>Edit the code
-as necessary, using any of the available features. As you move the cursor
-within your XML file (or select items from the Outline view), the node selection
-indicator will highlight the line numbers that encompass the node (for example,
-an element or attribute). You can use smart double-clicking behavior to select
-attribute values, attribute-value pairs, and entire tag sets to quickly update,
-copy, or remove content. If desired, validate and save the XML
-file.</p>
-</div>
-
-<div class="section"><p>Any changes you make in the Source view are also reflected in the
-Design view and the Outline view.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="../topics/twcdast.html" title="You can use content assist to help you finish a tag or line of code in the Source view of the XML editor. You can also use content assist to insert templates into your XML code.">Using XML content assist</a></div>
-<div><a href="../topics/twmacro.html" title="XML content assist provides a comment template, a section of predefined code that you can insert into a file. You may find a template useful when you have a certain piece of code you want to reuse several times, and you do not want to write it out every time.">Working with XML templates</a></div>
-<div><a href="../topics/ttaghilt.html" title="If desired, you can change various aspects of how the XML source code is displayed in the Source view of the XML editor, such as the colors the tags will be displayed in.">Setting source highlighting styles</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
deleted file mode 100644
index 4a65ff0..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.dita
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="txedttag" xml:lang="en-us">

-<title>Editing XML files</title>

-<titlealts>

-<searchtitle>Editing XML files</searchtitle>

-</titlealts>

-<shortdesc>This file contains information about editing XML files.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>XML files</indexterm></indexterm>

-<indexterm>XML files<indexterm>editing</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To open an XML file in the XML editor, right-click it in the Navigator

-view and select <menucascade><uicontrol>Open With</uicontrol><uicontrol>XML

-Editor</uicontrol></menucascade>. </p><p>We recommend working in the Resource

-perspective when you are developing XML files. The views that appear by default

-in this perspective (such as the Outline view) help facilitate XML development.</p><p>The

-XML editor enables you to directly edit XML files. There are several different

-views you can use to edit your files:</p><ul>

-<li><b>Source view</b>: you can manually insert, edit, and delete elements

-and attributes in the Source view of the XML editor. To facilitate this effort,

-you can use content assist while you are in the Source view.</li>

-<li><b>Design view</b>: you can insert, delete, and edit elements, attributes,

-comments, and processing instructions in this view.</li>

-<li><b>Outline view</b>: you can insert and delete elements attributes, comments,

-and processing instructions in this view.</li>

-</ul><p>Often, you may find that you have more than one way to perform a specific

-task. For example, you have an XML file "MySchoolSubjects.xml" associated

-with an XML schema file "SchoolSubjects.xsd", which list all the subjects

-taught in a school. You want to insert a new element "Math" into your file.

-You can do so in the following ways:</p><ul>

-<li>In the Outline or Design view, right-click the appropriate parent element

-and select <menucascade><uicontrol>Add Child</uicontrol><uicontrol>Math</uicontrol>

-</menucascade> or <uicontrol>New Element</uicontrol> and enter the name of

-the child element<?Pub Caret?>.</li>

-<li>In the Source view, use content assist to help you find the appropriate

-location and code for the <uicontrol>Math</uicontrol> element.</li>

-<li>In the Source view, type the code for the <uicontrol>Math</uicontrol> element

-in the file.</li>

-</ul></context>

-<postreq></postreq>

-</taskbody>

-</task>

-<?Pub *0000002530?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
deleted file mode 100644
index 178a1aa..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txedttag.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML files" />
-<meta name="abstract" content="This file contains information about editing XML files." />
-<meta name="description" content="This file contains information about editing XML files." />
-<meta content="XML editor, XML files, editing" name="DC.subject" />
-<meta content="XML editor, XML files, editing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cwxmledt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtdes.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/txedtsrc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txedttag" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML files</title>
-</head>
-<body id="txedttag"><a name="txedttag"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML files</h1>
-
-
-
-
-<div><p>This file contains information about editing XML files.</p>
-
-<div class="section"><p>To open an XML file in the XML editor, right-click it in the Navigator
-view and select <span class="menucascade"><span class="uicontrol">Open With</span> &gt; <span class="uicontrol">XML
-Editor</span></span>. </p>
-<p>We recommend working in the Resource
-perspective when you are developing XML files. The views that appear by default
-in this perspective (such as the Outline view) help facilitate XML development.</p>
-<p>The
-XML editor enables you to directly edit XML files. There are several different
-views you can use to edit your files:</p>
-<ul>
-<li><strong>Source view</strong>: you can manually insert, edit, and delete elements
-and attributes in the Source view of the XML editor. To facilitate this effort,
-you can use content assist while you are in the Source view.</li>
-
-<li><strong>Design view</strong>: you can insert, delete, and edit elements, attributes,
-comments, and processing instructions in this view.</li>
-
-<li><strong>Outline view</strong>: you can insert and delete elements attributes, comments,
-and processing instructions in this view.</li>
-
-</ul>
-<p>Often, you may find that you have more than one way to perform a specific
-task. For example, you have an XML file "MySchoolSubjects.xml" associated
-with an XML schema file "SchoolSubjects.xsd", which list all the subjects
-taught in a school. You want to insert a new element "Math" into your file.
-You can do so in the following ways:</p>
-<ul>
-<li>In the Outline or Design view, right-click the appropriate parent element
-and select <span class="menucascade"><span class="uicontrol">Add Child</span> &gt; <span class="uicontrol">Math</span>
-</span> or <span class="uicontrol">New Element</span> and enter the name of
-the child element.</li>
-
-<li>In the Source view, use content assist to help you find the appropriate
-location and code for the <span class="uicontrol">Math</span> element.</li>
-
-<li>In the Source view, type the code for the <span class="uicontrol">Math</span> element
-in the file.</li>
-
-</ul>
-</div>
-
-<div class="section" />
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cwxmledt.html" title="The XML editor is a tool for creating and viewing XML files.">XML editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/txedtdes.html" title="The XML editor has a Design view, which represents the XML file simultaneously as a table and a tree. This helps make navigation and editing easier. Content and attribute values can be edited directly in the table cells, while pop-up menus on the tree elements give alternatives that are valid for that particular element.">Editing in the Design view</a></div>
-<div><a href="../topics/txedtsrc.html" title="You can use the Source view to view and work with a file's source code directly.">Editing in the Source view</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
deleted file mode 100644
index 015673f..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.dita
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="txmlcat" xml:lang="en-us">

-<title>Adding entries to the XML Catalog</title>

-<titlealts>

-<searchtitle>Adding entries to the XML Catalog</searchtitle>

-</titlealts>

-<shortdesc>An XML Catalog entry contains two parts - a Key (which represents

-a DTD or XML schema) and a Location (similar to a URI, which contains information

-about a DTD or XML schema's location). You can place the Key in an XML file.

-When the XML processor encounters it, it will use the XML Catalog entry to

-find the location of the DTD or XML schema associated with the Key</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML catalog<indexterm>adding entries</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>XML Catalog entries can be used in various situations. For example,

-you are working on an XML file on your main desktop computer and point its <codeph>schemaLocation</codeph> towards

-a schema called <codeph>c:\MySchema.xsd</codeph>. You then save it to your

-laptop computer so you can work on it later. When you open the file on your

-laptop, however, you encounter a problem - the XML editor cannot find the <codeph>MySchema.xsd</codeph> schema

-because it is actually installed on your D drive. You will have to edit the <codeph>schemaLocation</codeph> to

-point to <codeph>d:\MySchema.xsd</codeph>. When you have finished editing

-the XML file and are ready to publish it on the Web, you will need to edit

-the URI again so that it points to a resource that is accessible on the Web.

-By now, the problem is obvious. A URI used within an XML file is not as portable

-as you would like it to be. To avoid making frequent changes to your XML document,

-you can use the XML Catalog.</p><p>An XML Catalog entry is used by an XML

-processor when resolving entity references. You can provide rules to the catalog

-to specify how entities should be resolved. If you consider the preceding

-example, you could specify a rule that redirects an Internet resource reference

-(for example,  <codeph>"http://www.ibm.com/published-schemas/MySchema.xsd"</codeph>)

-so that it points to a resource on the developer's local machine (for example,

- <codeph>"file:///C:/MySchema.xsd"</codeph>). Now, instead of frequently editing

-XML documents to update the URIs or locations (especially when there are many

-documents in your project), you only need to update a single rule in your

-XML Catalog.</p><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-add an entry to the XML Catalog, follow these steps:</p></context>

-<steps>

-<step><cmd>Open the XML file that you want to associate with a DTD or XML

-schema.</cmd></step>

-<step><cmd>Click  <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML

-Catalog</uicontrol></menucascade>.</cmd><info>The  <uicontrol>XML Catalog

-Entries</uicontrol> section contains a list of any user-defined and plug-in

-defined catalog entries. Select any entry to see information about it in the <uicontrol>Details</uicontrol> section.</info>

-</step>

-<step><cmd>Click <uicontrol>Add</uicontrol> to create a new catalog entry.</cmd>

-</step>

-<step><cmd>In the <uicontrol>Location</uicontrol> field, enter or browse for

-the location or URI of the DTD or XML schema file. This uses your computer's

-path style to describe the location of the file.</cmd></step>

-<step><cmd>Select a key type for the catalog entry from the <uicontrol>Key

-Type</uicontrol> drop down.</cmd><info>The values in this list will change

-depending on the type of file you specified in the <uicontrol>Location</uicontrol> field:<ul>

-<li>If you specified a DTD: select <uicontrol>Public ID</uicontrol>, <uicontrol>System

-ID</uicontrol>, or <uicontrol>URI</uicontrol> from the <uicontrol>Key Type</uicontrol> field.

-If you select <uicontrol>Public ID,</uicontrol> the value you enter in the <uicontrol>Key</uicontrol> field

-should be the same as the Public ID in the XML file's DOCTYPE declaration.

-If you select <uicontrol>System ID</uicontrol>, the value you enter should

-correspond to the System ID in an XML file's DOCTYPE declaration. If you select <uicontrol>URI</uicontrol>,

-the value you enter must be a fully qualified URI.</li>

-<li>If you specified an XML schema: select either <uicontrol>Namespace Name</uicontrol> or

- <uicontrol>Schema Location</uicontrol> from the <uicontrol>Key Type</uicontrol> field.

-If the schema defines a target namespace, it will automatically appear in

-the <uicontrol>Key</uicontrol> field. Otherwise, you can enter the schema

-location in the <uicontrol>Key</uicontrol> field.</li>

-</ul></info></step>

-<step><cmd>Select the <uicontrol>Specify alternative Web address</uicontrol> check

-box if you want to be able to specify an alternate Web address for the resource.</cmd>

-<info>This Web address is used when an XML instance is generated from this

-catalog entry.<note>This option is only available if you select <uicontrol>Public

-ID</uicontrol> (for a DTD) or  <uicontrol>Namespace Name</uicontrol> (for

-a schema) in the  <uicontrol>Key type</uicontrol> field.</note></info></step>

-<step><cmd>If you want to refer to another catalog without importing it into

-the workbench, click <uicontrol>Next Catalog</uicontrol>. Type or browse for

-the XML catalog you want to refer to. </cmd></step>

-<step><cmd>When you are done creating catalog entries, click <uicontrol>OK</uicontrol> to

-close the Add XML Catalog Entry dialog. Click <uicontrol>OK</uicontrol> again

-to save your settings.</cmd></step>

-<step><cmd>Make sure the XML file is in focus and click the <uicontrol>Reload

-dependencies</uicontrol> toolbar button. </cmd></step>

-</steps>

-<result>The XML file is now associated with the latest version of the XML

-schema or DTD.</result>

-<postreq><p>You can also export and import XML Catalog information:<?Pub Caret?> </p><p>To

-export, click <uicontrol>File > Export</uicontrol> and select <uicontrol>XML

-> XML Catalog</uicontrol>. You will be prompted to select a project and provide

-a file name to store your catalog entries in an .xmlcatalog file, which can

-be opened from the Navigator view. Since your catalog entries are stored in

-an .xmlcatalog file, you can check them in and out and share them like any

-other project resource.</p><p>To import, click <uicontrol>File > Import</uicontrol> and

-select <uicontrol>XML > XML Catalog</uicontrol>. Then specify the file that

-will be used to load the XML Catalog settings. When you import a .xmlcatalog

-file, any entries in it will be loaded into the XML Catalog (and any existing

-entries will be overwritten). </p></postreq>

-</taskbody>

-</task>

-<?Pub *0000006868?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
deleted file mode 100644
index 025015b..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txmlcat.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding entries to the XML Catalog" />
-<meta name="abstract" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
-<meta name="description" content="An XML Catalog entry contains two parts - a Key (which represents a DTD or XML schema) and a Location (similar to a URI, which contains information about a DTD or XML schema's location). You can place the Key in an XML file. When the XML processor encounters it, it will use the XML Catalog entry to find the location of the DTD or XML schema associated with the Key" />
-<meta content="XML catalog, adding entries" name="DC.subject" />
-<meta content="XML catalog, adding entries" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtdoc.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlcat.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtcnst.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtgram.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txmlcat" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding entries to the XML Catalog</title>
-</head>
-<body id="txmlcat"><a name="txmlcat"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding entries to the XML Catalog</h1>
-
-
-
-
-<div><p>An XML Catalog entry contains two parts - a Key (which represents
-a DTD or XML schema) and a Location (similar to a URI, which contains information
-about a DTD or XML schema's location). You can place the Key in an XML file.
-When the XML processor encounters it, it will use the XML Catalog entry to
-find the location of the DTD or XML schema associated with the Key</p>
-
-<div class="section"><p>XML Catalog entries can be used in various situations. For example,
-you are working on an XML file on your main desktop computer and point its <samp class="codeph">schemaLocation</samp> towards
-a schema called <samp class="codeph">c:\MySchema.xsd</samp>. You then save it to your
-laptop computer so you can work on it later. When you open the file on your
-laptop, however, you encounter a problem - the XML editor cannot find the <samp class="codeph">MySchema.xsd</samp> schema
-because it is actually installed on your D drive. You will have to edit the <samp class="codeph">schemaLocation</samp> to
-point to <samp class="codeph">d:\MySchema.xsd</samp>. When you have finished editing
-the XML file and are ready to publish it on the Web, you will need to edit
-the URI again so that it points to a resource that is accessible on the Web.
-By now, the problem is obvious. A URI used within an XML file is not as portable
-as you would like it to be. To avoid making frequent changes to your XML document,
-you can use the XML Catalog.</p>
-<p>An XML Catalog entry is used by an XML
-processor when resolving entity references. You can provide rules to the catalog
-to specify how entities should be resolved. If you consider the preceding
-example, you could specify a rule that redirects an Internet resource reference
-(for example,  <samp class="codeph">"http://www.ibm.com/published-schemas/MySchema.xsd"</samp>)
-so that it points to a resource on the developer's local machine (for example,
- <samp class="codeph">"file:///C:/MySchema.xsd"</samp>). Now, instead of frequently editing
-XML documents to update the URIs or locations (especially when there are many
-documents in your project), you only need to update a single rule in your
-XML Catalog.</p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-add an entry to the XML Catalog, follow these steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open the XML file that you want to associate with a DTD or XML
-schema.</span></li>
-
-<li class="stepexpand"><span>Click  <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
-Catalog</span></span>.</span> The  <span class="uicontrol">XML Catalog
-Entries</span> section contains a list of any user-defined and plug-in
-defined catalog entries. Select any entry to see information about it in the <span class="uicontrol">Details</span> section.
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Add</span> to create a new catalog entry.</span>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Location</span> field, enter or browse for
-the location or URI of the DTD or XML schema file. This uses your computer's
-path style to describe the location of the file.</span></li>
-
-<li class="stepexpand"><span>Select a key type for the catalog entry from the <span class="uicontrol">Key
-Type</span> drop down.</span> The values in this list will change
-depending on the type of file you specified in the <span class="uicontrol">Location</span> field:<ul>
-<li>If you specified a DTD: select <span class="uicontrol">Public ID</span>, <span class="uicontrol">System
-ID</span>, or <span class="uicontrol">URI</span> from the <span class="uicontrol">Key Type</span> field.
-If you select <span class="uicontrol">Public ID,</span> the value you enter in the <span class="uicontrol">Key</span> field
-should be the same as the Public ID in the XML file's DOCTYPE declaration.
-If you select <span class="uicontrol">System ID</span>, the value you enter should
-correspond to the System ID in an XML file's DOCTYPE declaration. If you select <span class="uicontrol">URI</span>,
-the value you enter must be a fully qualified URI.</li>
-
-<li>If you specified an XML schema: select either <span class="uicontrol">Namespace Name</span> or
- <span class="uicontrol">Schema Location</span> from the <span class="uicontrol">Key Type</span> field.
-If the schema defines a target namespace, it will automatically appear in
-the <span class="uicontrol">Key</span> field. Otherwise, you can enter the schema
-location in the <span class="uicontrol">Key</span> field.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Specify alternative Web address</span> check
-box if you want to be able to specify an alternate Web address for the resource.</span>
- This Web address is used when an XML instance is generated from this
-catalog entry.<div class="note"><span class="notetitle">Note:</span> This option is only available if you select <span class="uicontrol">Public
-ID</span> (for a DTD) or  <span class="uicontrol">Namespace Name</span> (for
-a schema) in the  <span class="uicontrol">Key type</span> field.</div>
-</li>
-
-<li class="stepexpand"><span>If you want to refer to another catalog without importing it into
-the workbench, click <span class="uicontrol">Next Catalog</span>. Type or browse for
-the XML catalog you want to refer to. </span></li>
-
-<li class="stepexpand"><span>When you are done creating catalog entries, click <span class="uicontrol">OK</span> to
-close the Add XML Catalog Entry dialog. Click <span class="uicontrol">OK</span> again
-to save your settings.</span></li>
-
-<li class="stepexpand"><span>Make sure the XML file is in focus and click the <span class="uicontrol">Reload
-dependencies</span> toolbar button. </span></li>
-
-</ol>
-
-<div class="section">The XML file is now associated with the latest version of the XML
-schema or DTD.</div>
-
-<div class="section"><p>You can also export and import XML Catalog information: </p>
-<p>To
-export, click <span class="uicontrol">File &gt; Export</span> and select <span class="uicontrol">XML
-&gt; XML Catalog</span>. You will be prompted to select a project and provide
-a file name to store your catalog entries in an .xmlcatalog file, which can
-be opened from the Navigator view. Since your catalog entries are stored in
-an .xmlcatalog file, you can check them in and out and share them like any
-other project resource.</p>
-<p>To import, click <span class="uicontrol">File &gt; Import</span> and
-select <span class="uicontrol">XML &gt; XML Catalog</span>. Then specify the file that
-will be used to load the XML Catalog settings. When you import a .xmlcatalog
-file, any entries in it will be loaded into the XML Catalog (and any existing
-entries will be overwritten). </p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlcat.html" title="When an XML file is associated with a DTD or XML schema, it is bound by any structural rules contained in the DTD or XML schema. To be considered a valid XML file, a document must be accompanied by a DTD or an XML schema, and conform to all of the declarations in the DTD or the XML schema.">XML file associations with DTDs and XML schemas</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtcnst.html" title="In the Design view, when you edit an XML file that has a set of constraints or rules defined by a DTD or an XML schema, you can turn the constraints on and off to provide flexibility in the way you edit, but still maintain the validity of the document periodically.">Editing with DTD or XML schema constraints</a></div>
-<div><a href="../topics/tedtdoc.html" title="The DOCTYPE declaration in an XML file is used at the beginning of it to associate it with a DTD file. You can edit your DOCTYPE declaration to change the DTD file your XML file is associated with.">Editing DOCTYPE declarations</a></div>
-<div><a href="../topics/tedtgram.html" title="If you make changes to a DTD file or XML schema associated with an XML file (that is currently open), click XML &gt; Reload Dependencies to update the XML file with these changes. The changes will be reflected in the guided editing mechanisms available in the editor, such as content assist.">Updating XML files with changes made to DTDs and schemas</a></div>
-<div><a href="../topics/tedtsch.html" title="Your namespace information is used to provide various information about the XML file, such as the XML schema and namespace it is associated with. If desired, you can change the schema and namespace your XML file is associated with or add a new association. Modifying any associations can impact what content is allowed in the XML file.">Editing namespace information</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
deleted file mode 100644
index b9d9ffd..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.dita
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="txprefs" xml:lang="en-us">

-<title>Defining XML editor preferences</title>

-<titlealts>

-<searchtitle>Defining XML editor preferences</searchtitle>

-</titlealts>

-<shortdesc>You can set various preferences for the Source view of the XML

-editor such as the formatter indentation style, line wrapping rules, and content

-assist rules. To apply the formatting styles, right-click in the Source view

-for your XML document, and click <menucascade><uicontrol>Format</uicontrol>

-<uicontrol>Document</uicontrol></menucascade>.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML editor<indexterm>preferences</indexterm></indexterm>

-<indexterm>preferences<indexterm>XML editor</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To define XML preferences, complete the following steps:</p></context>

-<steps>

-<step><cmd>Click  <menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML

-Files</uicontrol><uicontrol>Editor</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Enter a maximum width for formatted lines in the <uicontrol>Line

-width</uicontrol> field</cmd><info>The default value is 72.</info></step>

-<step><cmd>Select <uicontrol>Split multiple attributes each on a new line</uicontrol> to

-start every attribute on a new line.</cmd></step>

-<step><cmd>Select <uicontrol>Preserve whitespace in tags with PCDATA content</uicontrol> to

-prevent the editor from deleting whitespace in elements that contain parsed

-character data.</cmd></step>

-<step><cmd>If you want blank lines to be removed when the document is formatted,

-select the <uicontrol>Clear all blank lines</uicontrol> check box. </cmd>

-<info>By default, blank lines are preserved in a formatted document.</info>

-</step>

-<step><cmd>Select <uicontrol>Indent using tabs</uicontrol> if you want to

-use tab characters (\t) as the standard formatting indentation, or, if you

-prefer to use spaces, select <uicontrol>Indent using spaces</uicontrol>.</cmd>

-</step>

-<step><cmd>You can also specify the <uicontrol>Indentation size</uicontrol> which

-is the number of tabs or space characters used for formatting indentation.</cmd>

-</step>

-<step><cmd>You can specify certain characters (the default command<?Pub Caret?>

-is &lt;=) that will cause the content assist list to pop up automatically.

-Ensure the <uicontrol>Automatically make suggestions</uicontrol> check box

-is selected and specify the characters in the <uicontrol>Prompt when these

-characters are inserted</uicontrol> field. </cmd></step>

-<step><cmd>If you select <b>Strict</b> from the <b>Suggestion strategy</b> list,

-suggestions that are grammatically valid will be shown first (with bold icons)

-in the content assist list. Other suggestions that are applicable to the element

-scope, but not grammatically valid, will be shown below them with a de-emphasized

-icon. The default value for this field is <b>Strict</b>.</cmd></step>

-<step><cmd>The <uicontrol>Use inferred grammar in absence of DTD/Schema</uicontrol> check

-box is selected by default. </cmd><info>If this box is selected, when you

-have an XML file that is not associated with a DTD or XML schema, you will

-still be able to get content assist - the tool will infer what should come

-next in your file based on the existing content.</info></step>

-<step><cmd>Click <uicontrol>Apply</uicontrol> and then <uicontrol>OK</uicontrol> to

-save your changes.</cmd></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000003659?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
deleted file mode 100644
index 466eaaa..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txprefs.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Defining XML editor preferences" />
-<meta name="abstract" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in the Source view for your XML document, and click Format &gt; Document." />
-<meta name="description" content="You can set various preferences for the Source view of the XML editor such as the formatter indentation style, line wrapping rules, and content assist rules. To apply the formatting styles, right-click in the Source view for your XML document, and click Format &gt; Document." />
-<meta content="XML editor, preferences" name="DC.subject" />
-<meta content="XML editor, preferences" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txprefs" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Defining XML editor preferences</title>
-</head>
-<body id="txprefs"><a name="txprefs"><!-- --></a>
-
-
-<h1 class="topictitle1">Defining XML editor preferences</h1>
-
-
-
-
-<div><p>You can set various preferences for the Source view of the XML
-editor such as the formatter indentation style, line wrapping rules, and content
-assist rules. To apply the formatting styles, right-click in the Source view
-for your XML document, and click <span class="menucascade"><span class="uicontrol">Format</span>
- &gt; <span class="uicontrol">Document</span></span>.</p>
-
-<div class="section"><p>To define XML preferences, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click  <span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
-Files</span> &gt; <span class="uicontrol">Editor</span></span>.</span></li>
-
-<li class="stepexpand"><span>Enter a maximum width for formatted lines in the <span class="uicontrol">Line
-width</span> field</span> The default value is 72.</li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Split multiple attributes each on a new line</span> to
-start every attribute on a new line.</span></li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Preserve whitespace in tags with PCDATA content</span> to
-prevent the editor from deleting whitespace in elements that contain parsed
-character data.</span></li>
-
-<li class="stepexpand"><span>If you want blank lines to be removed when the document is formatted,
-select the <span class="uicontrol">Clear all blank lines</span> check box. </span>
- By default, blank lines are preserved in a formatted document.
-</li>
-
-<li class="stepexpand"><span>Select <span class="uicontrol">Indent using tabs</span> if you want to
-use tab characters (\t) as the standard formatting indentation, or, if you
-prefer to use spaces, select <span class="uicontrol">Indent using spaces</span>.</span>
-</li>
-
-<li class="stepexpand"><span>You can also specify the <span class="uicontrol">Indentation size</span> which
-is the number of tabs or space characters used for formatting indentation.</span>
-</li>
-
-<li class="stepexpand"><span>You can specify certain characters (the default command
-is &lt;=) that will cause the content assist list to pop up automatically.
-Ensure the <span class="uicontrol">Automatically make suggestions</span> check box
-is selected and specify the characters in the <span class="uicontrol">Prompt when these
-characters are inserted</span> field. </span></li>
-
-<li class="stepexpand"><span>If you select <strong>Strict</strong> from the <strong>Suggestion strategy</strong> list,
-suggestions that are grammatically valid will be shown first (with bold icons)
-in the content assist list. Other suggestions that are applicable to the element
-scope, but not grammatically valid, will be shown below them with a de-emphasized
-icon. The default value for this field is <strong>Strict</strong>.</span></li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Use inferred grammar in absence of DTD/Schema</span> check
-box is selected by default. </span> If this box is selected, when you
-have an XML file that is not associated with a DTD or XML schema, you will
-still be able to get content assist - the tool will infer what should come
-next in your file based on the existing content.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Apply</span> and then <span class="uicontrol">OK</span> to
-save your changes.</span></li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita
deleted file mode 100644
index 32ed973..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="txsityp" xml:lang="en-us">

-<title>Using xsi:type</title>

-<titlealts>

-<searchtitle>Using xsi:type</searchtitle>

-</titlealts>

-<shortdesc>If you have elements in your XML file whose type is a complex type,

-xsi:type support in the XML editor lets you choose between the complex type

-and any other complex types derived from it.</shortdesc>

-<taskbody>

-<context><p>The XML Schema specification allows you to derive types by extension.

-See the following steps as an example<?Pub Caret?>:</p></context>

-<steps>

-<step><cmd>Create an XML schema and create a complex type for it called  <userinput>Address</userinput>. </cmd>

-</step>

-<step><cmd>Add some basic elements to <userinput>Address</userinput>, such

-as <userinput>streetName</userinput> and <userinput>city</userinput>.</cmd>

-</step>

-<step><cmd>Derive (by extension) two new complex types from <userinput>Address</userinput>: <userinput>USAddress</userinput> and <userinput>UKAddress</userinput

->. </cmd></step>

-<step><cmd>Add a new element to <userinput>USAddress</userinput> called  <userinput>state</userinput>,

-and also a new element to <userinput>UKAddress</userinput> called <userinput>postcode</userinput>.</cmd>

-</step>

-<step><cmd>Create two more elements: <userinput>billTo</userinput> and <userinput>shipTo</userinput>,

-as  <systemoutput>Address</systemoutput> types.</cmd></step>

-<step><cmd>When you create an XML instance document for an element such as

- <systemoutput>billTo</systemoutput> or  <userinput>Address</userinput>, an

-xsi:type attribute will automatically be added to it.</cmd><info>For example, <codeblock>&lt;billTo xsi:type="ipo:Address"></codeblock>The

-xsi:type attribute is used to identify derived complex types (as well as complex

-types that have been derived from).</info></step>

-<step><cmd>In the Design view of the XML editor, a list will be available,

-letting you select the appropriate type definition (<uicontrol>Address</uicontrol>, <uicontrol>USAddress</uicontrol>,

-or  <uicontrol>UKAddress</uicontrol>). The guided editing for the content

-model will reflect the type definition that you choose. For example, if you

-select  <uicontrol>USAddress</uicontrol> , your <codeph>billTo</codeph> element

-can contain a <codeph>state</codeph> element, but it cannot contain a <codeph>postcode</codeph> element.</cmd>

-</step>

-</steps>

-<postreq><p>The XML example "Editing and validating XML files" demonstrates <b>xsi:type</b> support.</p><p>For

-more information about xsi:type, refer to the <b>Using Derived Types in Instance

-Documents</b> section in <xref format="html" href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs"

-scope="external">XML Schema Part 0: Primer.</xref></p><p>For more information

-about validation semantics when xsi:type is used, refer to the <b>Schema-Related

-Markup in Documents Being Validated</b> section in  <xref format="html" href="http://www.w3.org/TR/xmlschema-1/#xsi_type"

-scope="external">XML Schema Part 1: Structures</xref> </p></postreq>

-</taskbody>

-</task>

-<?Pub *0000003154?>

diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html b/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
deleted file mode 100644
index dfc4641..0000000
--- a/docs/org.eclipse.wst.xmleditor.doc.user/topics/txsityp.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2008 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2008" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Using xsi:type" />
-<meta name="abstract" content="If you have elements in your XML file whose type is a complex type, xsi:type support in the XML editor lets you choose between the complex type and any other complex types derived from it." />
-<meta name="description" content="If you have elements in your XML file whose type is a complex type, xsi:type support in the XML editor lets you choose between the complex type and any other complex types derived from it." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="txsityp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Using xsi:type</title>
-</head>
-<body id="txsityp"><a name="txsityp"><!-- --></a>
-
-
-<h1 class="topictitle1">Using xsi:type</h1>
-
-
-
-<div><p>If you have elements in your XML file whose type is a complex type,
-xsi:type support in the XML editor lets you choose between the complex type
-and any other complex types derived from it.</p>
-
-<div class="section"><p>The XML Schema specification allows you to derive types by extension.
-See the following steps as an example:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Create an XML schema and create a complex type for it called  <kbd class="userinput">Address</kbd>. </span>
-</li>
-
-<li class="stepexpand"><span>Add some basic elements to <kbd class="userinput">Address</kbd>, such
-as <kbd class="userinput">streetName</kbd> and <kbd class="userinput">city</kbd>.</span>
-</li>
-
-<li class="stepexpand"><span>Derive (by extension) two new complex types from <kbd class="userinput">Address</kbd>: <kbd class="userinput">USAddress</kbd> and <kbd class="userinput">UKAddress</kbd>. </span></li>
-
-<li class="stepexpand"><span>Add a new element to <kbd class="userinput">USAddress</kbd> called  <kbd class="userinput">state</kbd>,
-and also a new element to <kbd class="userinput">UKAddress</kbd> called <kbd class="userinput">postcode</kbd>.</span>
-</li>
-
-<li class="stepexpand"><span>Create two more elements: <kbd class="userinput">billTo</kbd> and <kbd class="userinput">shipTo</kbd>,
-as  <tt class="sysout">Address</tt> types.</span></li>
-
-<li class="stepexpand"><span>When you create an XML instance document for an element such as
- <tt class="sysout">billTo</tt> or  <kbd class="userinput">Address</kbd>, an
-xsi:type attribute will automatically be added to it.</span> For example, <pre>&lt;billTo xsi:type="ipo:Address"&gt;</pre>
-The
-xsi:type attribute is used to identify derived complex types (as well as complex
-types that have been derived from).</li>
-
-<li class="stepexpand"><span>In the Design view of the XML editor, a list will be available,
-letting you select the appropriate type definition (<span class="uicontrol">Address</span>, <span class="uicontrol">USAddress</span>,
-or  <span class="uicontrol">UKAddress</span>). The guided editing for the content
-model will reflect the type definition that you choose. For example, if you
-select  <span class="uicontrol">USAddress</span> , your <samp class="codeph">billTo</samp> element
-can contain a <samp class="codeph">state</samp> element, but it cannot contain a <samp class="codeph">postcode</samp> element.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>The XML example "Editing and validating XML files" demonstrates <strong>xsi:type</strong> support.</p>
-<p>For
-more information about xsi:type, refer to the <strong>Using Derived Types in Instance
-Documents</strong> section in <a href="http://www.w3.org/TR/xmlschema-0/#UseDerivInInstDocs" target="_blank">XML Schema Part 0: Primer.</a></p>
-<p>For more information
-about validation semantics when xsi:type is used, refer to the <strong>Schema-Related
-Markup in Documents Being Validated</strong> section in  <a href="http://www.w3.org/TR/xmlschema-1/#xsi_type" target="_blank">XML Schema Part 1: Structures</a> </p>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.cvsignore b/docs/org.eclipse.wst.xsdeditor.doc.user/.cvsignore
deleted file mode 100644
index 4166228..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-org.eclipse.wst.xsdeditor.doc.user_1.0.0.jar
-temp
-DitaLink.cat
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.project b/docs/org.eclipse.wst.xsdeditor.doc.user/.project
deleted file mode 100644
index 82170b5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xsdeditor.doc.user</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.xsdeditor.doc.user/.settings/org.eclipse.core.resources.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index afa5c91..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2dd8b5c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,80 +0,0 @@
-#Sun Apr 16 14:37:21 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.builder.cleanOutputFolder=clean
-org.eclipse.jdt.core.builder.duplicateResourceTask=warning
-org.eclipse.jdt.core.builder.invalidClasspath=ignore
-org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
-org.eclipse.jdt.core.circularClasspath=error
-org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
-org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.maxProblemPerUnit=100
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
-org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=error
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=error
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=error
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=error
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=ignore
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.incompatibleJDKLevel=ignore
-org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index ef2ac65..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:39 EDT 2006
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
deleted file mode 100644
index c59368c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.ltk.core.refactoring.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Tue Apr 04 03:36:32 EDT 2006
-eclipse.preferences.version=1
-org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.pde.prefs b/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index f724958..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sun Apr 16 14:05:29 EDT 2006
-compilers.p.build=0
-compilers.p.deprecated=1
-compilers.p.illegal-att-value=0
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=0
-compilers.p.unknown-attribute=0
-compilers.p.unknown-class=0
-compilers.p.unknown-element=0
-compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.p.unused-element-or-attribute=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/DocBuild.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/DocBuild.xml
deleted file mode 100644
index 07cf32d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/DocBuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!-- 
-
-	This script build the Help plug-in by transforming the DITA source files into HTML.
-	
-	To use this script, you must install DITA-OT on your machine in the directory
-	defined by the dita.ot.dir property.
-	
-	Run the default target after you edit the DITA source files to regenerate the HTML.
-	
-	To customize this script for other Help plug-ins, modify the value of the args.input property
-	to be the DITA map file for the plug-in.
-	
-	NOTE: This script assumes that links to sibling Help plug-ins have scope="peer", otherwise the
-	output directory structure will be shifted incorrectly.
-	
-	NOTE: This script assumes that you hand code your plugin.xml file in myplugin.xml. This file
-	will be copied over the generated plugin.xml which is currently not being generated correctly
-	by DITA-OT.
-	
-	ChangeLog:
-	2006-04-05 Arthur Ryman <ryman@ca.ibm.com>
-	- Created.
-	2008-01-09 Kate Price <katep@ca.ibm.com>
-	- modified for new DITA-OT version
-	2008-05-05 Kate Price <katep@ca.ibm.com>
-	- modified to add generation of pre-built help index. 
-	- Must delete /index folder before running build
--->
-<project name="eclipsehelp" default="all">
-
-	<property name="dita.ot.dir" location="C:/DITA-OT1.2.2" />
-
-	<path id="dost.class.path">
-		<pathelement location="${dita.ot.dir}${file.separator}lib${file.separator}dost.jar" />
-	</path>
-
-	<taskdef name="integrate" classname="org.dita.dost.platform.IntegratorTask">
-		<classpath refid="dost.class.path" />
-	</taskdef>
-	<target name="all" depends="integrate, eclipsehelp">
-	</target>
-	<target name="integrate">
-		<integrate ditadir="${dita.ot.dir}" />
-	</target>
-
-	<!-- revise below here -->
-	<target name="eclipsehelp">
-		<ant antfile="${dita.ot.dir}${file.separator}conductor.xml" target="init" dir="${dita.ot.dir}">
-			<property name="args.copycss" value="no" />
-			<property name="args.csspath" value="../org.eclipse.wst.doc.user" />
-			<property name="args.eclipse.provider" value="Eclipse.org" />
-			<property name="args.eclipse.version" value="3.4.0" />
-			<property name="args.input" location="XSDLeditorrel.ditamap" />    		
-			<property name="clean.temp" value="true" />
-			<property name="dita.extname" value=".dita" />
-			<property name="dita.temp.dir" location="temp" />
-			<property name="output.dir" location="" />
-			<property name="transtype" value="eclipsehelp" />
-		</ant>
-		<copy file="myplugin.xml" tofile="plugin.xml" overwrite="yes" />
-	</target>
-	<target name="build.index" description="Builds search index for the plug-in" if="eclipse.running">
-	     <help.buildHelpIndex manifest="plugin.xml" destination="."/>
-	</target>
-</project>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
deleted file mode 100644
index 5d5acc7..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,7 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
-Bundle-SymbolicName: org.eclipse.wst.xsdeditor.doc.user; singleton:=true
-Bundle-Version: 1.0.700.qualifier
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.ditamap b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.ditamap
deleted file mode 100644
index a13ee00..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.ditamap
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

- <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">

-<map>

-<topicgroup collection-type="family">

-<topicref href="topics/tcxmlsch.dita" navtitle="Creating XML schemas"></topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/cxmlsced.dita" id="xsdconcepts" linking="targetonly"

-navtitle="XML schema editor"></topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/timpschm.dita" navtitle="Importing XML schemas"></topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-<topicref href="topics/taddimpt.dita" linking="targetonly" navtitle="Adding import elements">

-</topicref>

-<topicref href="topics/taddincl.dita" linking="targetonly" navtitle="Adding include elements">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tnavsrc.dita" navtitle="Navigating XML schemas"></topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/cxmlsced.dita" linking="normal" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tcxmlsch.dita" linking="targetonly" navtitle="Creating XML schemas">

-</topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/tvdtschm.dita" linking="targetonly" navtitle="Validating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddcmxt.dita" navtitle="Adding complex types"></topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddglem.dita" navtitle="Adding global elements"></topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelm.dita" navtitle="Adding elements"></topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelmr.dita" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddglem.dita" navtitle="Adding global elements"></topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddgrup.dita" navtitle="Adding groups"></topicref>

-<topicref href="topics/taddgrpr.dita" linking="targetonly" navtitle="Adding group references">

-</topicref>

-<topicref href="topics/taddcmod.dita" linking="targetonly" navtitle="Adding content models">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddgrpr.dita" linking="normal" navtitle="Adding group references">

-</topicref>

-<topicref href="topics/taddgrup.dita" linking="targetonly" navtitle="Adding groups">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddimpt.dita" navtitle="Adding import elements"></topicref>

-<topicref href="topics/taddincl.dita" navtitle="Adding include elements">

-</topicref>

-<topicref href="topics/taddrdfn.dita" navtitle="Adding redefine elements">

-</topicref>

-<topicref href="topics/rnmspc.dita" linking="targetonly" navtitle="XML namespaces">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tvdtschm.dita" navtitle="Validating XML schemas"></topicref>

-<topicref href="topics/tcxmlsch.dita" linking="targetonly" navtitle="Creating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-<topicref href="topics/tcxmlsch.dita" linking="targetonly" navtitle="Creating XML schemas">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/rrefintg.dita" navtitle="Referential integrity in the XML schema editor">

-</topicref>

-<topicref href="topics/cxmlsced.dita" linking="targetonly" navtitle="XML schema editor">

-</topicref>

-<topicref href="topics/tedtschm.dita" linking="targetonly" navtitle="Editing XML schema properties">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/rnmspc.dita" navtitle="XML namespaces"></topicref>

-<topicref href="topics/tedtpref.dita" linking="targetonly" navtitle="Editing XML schema file preferences">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddsmpt.dita" navtitle="Adding simple types"></topicref>

-<topicref href="topics/taddreg.dita" navtitle="Adding pattern facets to simple types">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddcmod.dita" navtitle="Adding content models"></topicref>

-<topicref href="topics/taddanye.dita" linking="targetonly" navtitle="Adding an any element">

-</topicref>

-<topicref href="topics/taddelm.dita" linking="targetonly" navtitle="Adding elements">

-</topicref>

-<topicref href="topics/taddelmr.dita" linking="targetonly" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddgrpr.dita" linking="targetonly" navtitle="Adding group references">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/tdelscmp.dita" navtitle="Deleting XML schema components">

-</topicref>

-<topicref href="topics/rrefintg.dita" navtitle="Referential integrity in the XML schema editor">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelm.dita" linking="sourceonly" navtitle="Adding elements">

-</topicref>

-<topicref href="topics/taddelmr.dita" linking="targetonly" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddanye.dita" linking="targetonly" navtitle="Adding an any element">

-</topicref>

-<topicref href="topics/taddglba.dita" linking="targetonly" navtitle="Adding global attributes">

-</topicref>

-</topicgroup>

-<topicgroup collection-type="family">

-<topicref href="topics/taddelmr.dita" linking="sourceonly" navtitle="Adding element references">

-</topicref>

-<topicref href="topics/taddelm.dita" linking="targetonly" navtitle="Adding elements">

-</topicref>

-<topicref href="topics/taddanye.dita" linking="targetonly" navtitle="Adding an any element">

-</topicref>

-<topicref href="topics/taddglba.dita" linking="targetonly" navtitle="Adding global attributes">

-</topicref>

-</topicgroup>

-</map>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.xml
deleted file mode 100644
index cbac6ff..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDLeditorrel.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc topic="topics/tcxmlsch.html">
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Importing XML schemas" href="topics/timpschm.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Adding import elements" href="topics/taddimpt.html"/>
-<topic label="Adding include elements" href="topics/taddincl.html"/>
-<topic label="Navigating XML schemas" href="topics/tnavsrc.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Adding complex types" href="topics/taddcmxt.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding global elements" href="topics/taddglem.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding global elements" href="topics/taddglem.html"/>
-<topic label="Adding groups" href="topics/taddgrup.html"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-<topic label="Adding groups" href="topics/taddgrup.html"/>
-<topic label="Adding import elements" href="topics/taddimpt.html"/>
-<topic label="Adding include elements" href="topics/taddincl.html"/>
-<topic label="Adding redefine elements" href="topics/taddrdfn.html"/>
-<topic label="XML namespaces" href="topics/rnmspc.html"/>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html"/>
-<topic label="XML namespaces" href="topics/rnmspc.html"/>
-<topic label="Editing XML schema file preferences" href="topics/tedtpref.html"/>
-<topic label="Adding simple types" href="topics/taddsmpt.html"/>
-<topic label="Adding pattern facets to simple types" href="topics/taddreg.html"/>
-<topic label="Adding content models" href="topics/taddcmod.html"/>
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-<topic label="Deleting XML schema components" href="topics/tdelscmp.html"/>
-<topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<topic label="Adding global attributes" href="topics/taddglba.html"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<topic label="Adding global attributes" href="topics/taddglba.html"/>
-</toc>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.ditamap b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.ditamap
deleted file mode 100644
index 3207c05..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.ditamap
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"

- "map.dtd">

-<map collection-type="sequence" id="wstxsdtoc" title="XML schemas">

-<topicref href="topics/cworkXSD.dita" linking="sourceonly" navtitle="Working with XML schemas (XSDs)">

-<anchor id="xsd_post_cworkXSD"/>

-<topicref href="topics/tcxmlsch.dita" navtitle="Creating XML schemas"></topicref>

-<anchor id="xsd_post_tcxmlsch"/>

-<topicref href="topics/rlimitations_slushXSD.dita" navtitle="XSD Slush file"

-toc="no"></topicref>

-<anchor id="xsd_post_rlimitations_slushXSD"/>

-<topicref href="topics/timpschm.dita" navtitle="Importing an XML schema">

-</topicref>

-<anchor id="xsd_post_timpschm"/>

-<topicref href="topics/tnavsrc.dita" navtitle="Navigating XML schemas"></topicref>

-<anchor id="xsd_post_tnavsrc"/>

-<topicref href="topics/trefactrXSD.dita" navtitle="Refactoring in XML Schemas">

-</topicref>

-<anchor id="xsd_post_trefactr"/>

-<topicref href="topics/tedtpref.dita" navtitle="Editing XML schema  editor preferences">

-</topicref>

-<anchor id="xsd_post_teditpref"/>

-<topicref href="topics/tedtschm.dita" linking="none" navtitle="Editing XML schema properties">

-<anchor id="xsd_post_teditschm"/>

-<topicref href="topics/cxmlsced.dita" id="xsdconcepts" navtitle="XML schema editor">

-</topicref>

-<anchor id="xsd_post_cxmlsced"/>

-<topicref href="topics/taddagrp.dita" navtitle="Adding an attribute group">

-</topicref>

-<anchor id="xsd_post_taddgrp"/>

-<topicref href="topics/taddcmxt.dita" navtitle="Adding a complex type"></topicref>

-<anchor id="xsd_post_taddcmxt"/>

-<topicref href="topics/taddcmod.dita" navtitle="Adding a content model">

-<anchor id="xsd_post_taddcmod"/>

-<topicref href="topics/taddanye.dita" navtitle="Adding an any element"></topicref>

-<anchor id="xsd_post_taddanye"/>

-<topicref href="topics/taddelm.dita" navtitle="Adding an element"></topicref>

-<anchor id="xsd_post_taddelm"/>

-<topicref href="topics/taddelmr.dita" navtitle="Adding an element reference">

-</topicref>

-<anchor id="xsd_post_taddelmr"/>

-<topicref href="topics/taddgrpr.dita" navtitle="Adding a group reference">

-</topicref>

-<anchor id="xsd_post_taddgrpr"/></topicref>

-<topicref href="topics/taddglba.dita" navtitle="Adding a global attribute">

-</topicref>

-<anchor id="xsd_post_taddglba"/>

-<topicref href="topics/taddglem.dita" navtitle="Adding a global element">

-</topicref>

-<anchor id="xsd_post_taddglem"/>

-<topicref href="topics/taddgrup.dita" navtitle="Adding a group"></topicref>

-<anchor id="xsd_post_taddgrup"/>

-<topicref href="topics/taddimpt.dita" navtitle="Adding an import element">

-</topicref>

-<anchor id="xsd_post_taddimpt"/>

-<topicref href="topics/taddincl.dita" navtitle="Adding an include element">

-</topicref>

-<anchor id="xsd_post_taddincl"/>

-<topicref href="topics/taddrdfn.dita" navtitle="Adding a redefine element">

-</topicref>

-<anchor id="xsd_post_taddrdfn"/>

-<topicref href="topics/taddsmpt.dita" navtitle="Adding a simple type">

-<anchor id="xsd_post_taddsmpt"/>

-<topicref href="topics/taddreg.dita" navtitle="Adding a pattern facet to a simple type">

-</topicref>

-<anchor id="xsd_post_taddreg"/></topicref>

-</topicref>

-<topicref href="topics/rxsdicons.dita" id="xsdicons" navtitle="Icons used in the XML schema editor">

-</topicref>

-<anchor id="xsd_post_rxsdicons"/>

-<topicref href="topics/tdelscmp.dita" navtitle="Deleting XML schema components">

-<anchor id="xsd_post_tdelscmp"/>

-<topicref href="topics/rrefintg.dita" navtitle="Referential integrity in the XML schema editor">

-</topicref>

-<anchor id="xsd_post_rrefintg"/></topicref>

-<topicref href="topics/tvdtschm.dita" navtitle="Validating an XML schema">

-</topicref>

-<anchor id="xsd_post_tvtschm"/>

-<topicref href="topics/rnmspc.dita" navtitle="XML namespaces"></topicref>

-<anchor id="xsd_post_rnmspc"/></topicref>

-</map>

-<?Pub *0000003828?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
deleted file mode 100644
index d23e2a2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?NLS TYPE="org.eclipse.help.toc"?>
-
-<toc label="XML schemas" topic="topics/cworkXSD.html">
-<topic label="Working with XML schemas" href="topics/cworkXSD.html">
-<anchor id="xsd_post_cworkXSD"/>
-<topic label="Creating XML schemas" href="topics/tcxmlsch.html"/>
-<anchor id="xsd_post_tcxmlsch"/>
-<anchor id="xsd_post_rlimitations_slushXSD"/>
-<topic label="Importing XML schemas" href="topics/timpschm.html"/>
-<anchor id="xsd_post_timpschm"/>
-<topic label="Navigating XML schemas" href="topics/tnavsrc.html"/>
-<anchor id="xsd_post_tnavsrc"/>
-<topic label="Refactoring in XML Schema Files" href="topics/trefactrXSD.html"/>
-<anchor id="xsd_post_trefactr"/>
-<topic label="Editing XML schema file preferences" href="topics/tedtpref.html"/>
-<anchor id="xsd_post_teditpref"/>
-<topic label="Editing XML schema properties" href="topics/tedtschm.html">
-<anchor id="xsd_post_teditschm"/>
-<topic label="XML schema editor" href="topics/cxmlsced.html"/>
-<anchor id="xsd_post_cxmlsced"/>
-<topic label="Adding attribute groups" href="topics/taddagrp.html"/>
-<anchor id="xsd_post_taddgrp"/>
-<topic label="Adding complex types" href="topics/taddcmxt.html"/>
-<anchor id="xsd_post_taddcmxt"/>
-<topic label="Adding content models" href="topics/taddcmod.html">
-<anchor id="xsd_post_taddcmod"/>
-<topic label="Adding an any element" href="topics/taddanye.html"/>
-<anchor id="xsd_post_taddanye"/>
-<topic label="Adding elements" href="topics/taddelm.html"/>
-<anchor id="xsd_post_taddelm"/>
-<topic label="Adding element references" href="topics/taddelmr.html"/>
-<anchor id="xsd_post_taddelmr"/>
-<topic label="Adding group references" href="topics/taddgrpr.html"/>
-<anchor id="xsd_post_taddgrpr"/>
-</topic>
-<topic label="Adding global attributes" href="topics/taddglba.html"/>
-<anchor id="xsd_post_taddglba"/>
-<topic label="Adding global elements" href="topics/taddglem.html"/>
-<anchor id="xsd_post_taddglem"/>
-<topic label="Adding groups" href="topics/taddgrup.html"/>
-<anchor id="xsd_post_taddgrup"/>
-<topic label="Adding import elements" href="topics/taddimpt.html"/>
-<anchor id="xsd_post_taddimpt"/>
-<topic label="Adding include elements" href="topics/taddincl.html"/>
-<anchor id="xsd_post_taddincl"/>
-<topic label="Adding redefine elements" href="topics/taddrdfn.html"/>
-<anchor id="xsd_post_taddrdfn"/>
-<topic label="Adding simple types" href="topics/taddsmpt.html">
-<anchor id="xsd_post_taddsmpt"/>
-<topic label="Adding pattern facets to simple types" href="topics/taddreg.html"/>
-<anchor id="xsd_post_taddreg"/>
-</topic>
-</topic>
-<topic label="Icons used in the XML schema editor" href="topics/rxsdicons.html"/>
-<anchor id="xsd_post_rxsdicons"/>
-<topic label="Deleting XML schema components" href="topics/tdelscmp.html">
-<anchor id="xsd_post_tdelscmp"/>
-<topic label="Referential integrity in the XML schema editor" href="topics/rrefintg.html"/>
-<anchor id="xsd_post_rrefintg"/>
-</topic>
-<topic label="Validating XML schemas" href="topics/tvdtschm.html"/>
-<anchor id="xsd_post_tvtschm"/>
-<topic label="XML namespaces" href="topics/rnmspc.html"/>
-<anchor id="xsd_post_rnmspc"/>
-</topic>
-</toc>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html b/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
deleted file mode 100644
index 2199df3..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>June, 2008</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in 
-("Content"). Unless otherwise indicated below, the Content is provided to you 
-under the terms and conditions of the Eclipse Public License Version 1.0 
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the 
-Content is being redistributed by another party ("Redistributor") and different 
-terms and conditions may apply to your use of any object code in the Content. 
-Check the RedistributorÂ’s license that was provided with the Content. If no such 
-license exists, contact the Redistributor. Unless otherwise indicated below, the 
-terms and conditions of the EPL still apply to any source code in the Content 
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
deleted file mode 100644
index 695623e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-bin.includes = XSDeditormap_toc.xml,\
-               about.html,\
-               org.eclipse.wst.xsdeditor.doc.userindex.xml,\
-               images/,\
-               plugin.xml,\
-               topics/*.htm*,\
-               index/,\
-               META-INF/,\
-               plugin.properties
-src.includes = build.properties,\
-		       *.maplist,\
-               *.ditamap,\
-		       topics/*.dita
-bin.excludes = DocBuild.xml,\
-               myPlugin*.xml
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/Browse.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/Browse.gif
deleted file mode 100644
index 63211bf..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/Browse.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/More.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/More.gif
deleted file mode 100644
index 63211bf..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/More.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif
deleted file mode 100644
index da37fba..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAll.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif
deleted file mode 100644
index a39f93c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAny.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif
deleted file mode 100644
index 5280cc2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAnyAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif
deleted file mode 100644
index 5a8df73..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroup.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif
deleted file mode 100644
index b2c1db9..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif
deleted file mode 100644
index 8365af2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDAttributeRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif
deleted file mode 100644
index 8af583f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDChoice.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif
deleted file mode 100644
index 878b94f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDComplexType.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElement.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif
deleted file mode 100644
index 749acfc..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDElementRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif
deleted file mode 100644
index 79d49d0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalAttribute.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif
deleted file mode 100644
index dd45f08..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGlobalElement.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif
deleted file mode 100644
index 462c2d4..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroup.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif
deleted file mode 100644
index 068987b..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDGroupRef.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif
deleted file mode 100644
index 9e44ce5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDImport.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif
deleted file mode 100644
index b26c527..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDInclude.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif
deleted file mode 100644
index 56964c1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDRedefine.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif
deleted file mode 100644
index 16b8612..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSequence.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif
deleted file mode 100644
index 11d7958..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleEnum.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif
deleted file mode 100644
index a113cf4..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimplePattern.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif b/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif
deleted file mode 100644
index 2e74430..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/images/XSDSimpleType.gif
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs b/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs
deleted file mode 100644
index f075c79..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/_v.cfs
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable b/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable
deleted file mode 100644
index 593f470..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/deletable
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions
deleted file mode 100644
index 0b2a149..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_contributions
+++ /dev/null
@@ -1,3 +0,0 @@
-#This is a generated file; do not edit.

-#Mon May 18 17:38:24 EDT 2009

-org.eclipse.wst.xsdeditor.doc.user=org.eclipse.wst.xsdeditor.doc.user\n1.0.700.qualifier

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies
deleted file mode 100644
index f2b76ee..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_dependencies
+++ /dev/null
@@ -1,4 +0,0 @@
-#This is a generated file; do not edit.

-#Mon May 18 17:38:24 EDT 2009

-lucene=1.9.1.v20080530-1600

-analyzer=org.eclipse.help.base\#3.3.101.M20080728_34x?locale\=en

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs b/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs
deleted file mode 100644
index 8f7fef4..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/indexed_docs
+++ /dev/null
@@ -1,30 +0,0 @@
-#This is a generated file; do not edit.

-#Mon May 18 17:38:24 EDT 2009

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html=0

-/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html=0

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments b/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments
deleted file mode 100644
index 66564c5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/index/segments
+++ /dev/null
Binary files differ
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/myplugin.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/myplugin.xml
deleted file mode 100644
index 15d23ab..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/myplugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XSDeditormap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.xsdeditor.doc.userindex.xml"/>
-</extension>
-       <extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.user.maplist b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.user.maplist
deleted file mode 100644
index 626f463..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.user.maplist
+++ /dev/null
@@ -1,9 +0,0 @@
-<maplist version="3.6.2">

-  <nav>

-    <map file="XSDeditormap_toc.ditamap"/>

-  </nav>

-  <link>

-    <map file="XSDeditormap_toc.ditamap"/>

-    <map file="XSDLeditorrel.ditamap"/>

-  </link>

-</maplist>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html
deleted file mode 100644
index 2f07600..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="copyright" content="(C) Copyright IBM Corporation 2007" />
-<meta name="security" content="public" />
-<meta name="Robots" content="index,follow" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta name="DC.Format" content="XHTML" />
-<!-- All rights reserved. Licensed Materials Property of IBM -->
-<!-- US Government Users Restricted Rights -->
-<!-- Use, duplication or disclosure restricted by -->
-<!-- GSA ADP Schedule Contract with IBM Corp. -->
-<link rel="stylesheet" type="text/css" href="ibmdita.css" />
-<title>Index</title>
-</head>
-<body>
-<h1>Index</h1>
-<a name="IDX0_44" href="#IDX1_44">D</a>
-<a name="IDX0_50" href="#IDX1_50">P</a>
-<a name="IDX0_52" href="#IDX1_52">R</a>
-<a name="IDX0_58" href="#IDX1_58">X</a>
-<hr></hr>
-<strong><a name="IDX1_44" href="#IDX0_44">D</a></strong>
-<ul class="indexlist">
-<li>dependent artifacts
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">refactorting XML schema files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_50" href="#IDX0_50">P</a></strong>
-<ul class="indexlist">
-<li>preferences
-<ul class="indexlist">
-<li><a href="topics/tedtpref.html#tedtpref">XML schema files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_52" href="#IDX0_52">R</a></strong>
-<ul class="indexlist">
-<li>refactoring
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">XML schema files</a>
-</li>
-</ul>
-</li>
-<li>renaming
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">XML schema files</a>
-</li>
-</ul>
-</li>
-</ul>
-<strong><a name="IDX1_58" href="#IDX0_58">X</a></strong>
-<ul class="indexlist">
-<li>XML namespaces
-<ul class="indexlist">
-<li><a href="topics/rnmspc.html#rnmspc">overview</a>
-</li>
-</ul>
-</li>
-<li>XML schema editor
-<ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">adding an any element</a>
-</li>
-<li><a href="topics/taddrdfn.html#taddrdfn">adding redefine elements</a>
-</li>
-<li><a href="topics/taddagrp.html#taddagrp">attribute groups</a>
-</li>
-<li><a href="topics/rrefintg.html#rrefintg">clean up in</a>
-</li>
-<li><a href="topics/taddcmxt.html#taddcmxt">complex types</a>
-</li>
-<li><a href="topics/taddcmod.html#taddcmod">content models</a>
-</li>
-<li><a href="topics/tdelscmp.html#tdelscmp">deleting components</a>
-</li>
-<li><a href="topics/taddelmr.html#taddelmr">element references</a>
-</li>
-<li><a href="topics/taddelm.html#taddelm">elements</a>
-</li>
-<li><a href="topics/taddglba.html#taddglba">global attributes</a>
-</li>
-<li><a href="topics/taddglem.html#taddglem">global elements</a>
-</li>
-<li><a href="topics/taddgrpr.html#taddgrpr">group features</a>
-</li>
-<li><a href="topics/taddgrup.html#taddgrup">groups</a>
-</li>
-<li><a href="topics/rxsdicons.html#ricons">icons</a>
-</li>
-<li><a href="topics/taddimpt.html#taddimpt">import elements</a>
-</li>
-<li><a href="topics/taddincl.html#taddincl">include elements</a>
-</li>
-<li><a href="topics/cxmlsced.html#cxmlsced">overview</a>
-</li>
-<li><a href="topics/taddreg.html#taddreg">pattern facets</a>
-</li>
-<li><a href="topics/rrefintg.html#rrefintg">referential integrity</a>
-</li>
-<li><a href="topics/taddsmpt.html#taddsmpt">simple types</a>
-</li>
-<li><a href="topics/tedtschm.html#tedtschm">XML schema properties</a>
-</li>
-</ul>
-</li>
-<li>XML schema files
-<ul class="indexlist">
-<li><a href="topics/taddanye.html#taddanye">adding an any element</a>
-</li>
-<li><a href="topics/taddrdfn.html#taddrdfn">adding redefine elements</a>
-</li>
-<li><a href="topics/taddagrp.html#taddagrp">attribute groups</a>
-</li>
-<li><a href="topics/taddcmxt.html#taddcmxt">complex types</a>
-</li>
-<li><a href="topics/taddcmod.html#taddcmod">content models</a>
-</li>
-<li><a href="topics/tcxmlsch.html#tcxmlsch">creating</a>
-</li>
-<li><a href="topics/tdelscmp.html#tdelscmp">deleting components</a>
-</li>
-<li><a href="topics/tedtpref.html#tedtpref">editing preferences</a>
-</li>
-<li><a href="topics/tedtschm.html#tedtschm">editing properties</a>
-</li>
-<li><a href="topics/taddelmr.html#taddelmr">element references</a>
-</li>
-<li><a href="topics/taddelm.html#taddelm">elements</a>
-</li>
-<li><a href="topics/taddglba.html#taddglba">global attributes</a>
-</li>
-<li><a href="topics/taddglem.html#taddglem">global elements</a>
-</li>
-<li><a href="topics/taddgrpr.html#taddgrpr">group features</a>
-</li>
-<li><a href="topics/taddgrup.html#taddgrup">groups</a>
-</li>
-<li><a href="topics/taddimpt.html#taddimpt">import elements</a>
-</li>
-<li><a href="topics/timpschm.html#timpschm">importing</a>
-</li>
-<li><a href="topics/taddincl.html#taddincl">include elements</a>
-</li>
-<li><a href="topics/tnavsrc.html#tnavsrc">navigating</a>
-</li>
-<li><a href="topics/taddreg.html#taddreg">pattern facets</a>
-</li>
-<li><a href="topics/taddsmpt.html#taddsmpt">simple types</a>
-</li>
-<li><a href="topics/tvdtschm.html#tvdtschm">validating</a>
-</li>
-</ul>
-</li>
-<li>XML schemas
-<ul class="indexlist">
-<li><a href="topics/trefactrXSD.html#refactoring">editing</a>
-</li>
-</ul>
-</li>
-</ul>
-</body></html>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml
deleted file mode 100644
index 4cdd883..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/org.eclipse.wst.xsdeditor.doc.userindex.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<index>
-  <entry keyword="XML schema files">
-    <entry keyword="creating">
-      <topic href="topics/tcxmlsch.html#tcxmlsch" title="Creating XML schemas"/>
-    </entry>
-    <entry keyword="importing">
-      <topic href="topics/timpschm.html#timpschm" title="Importing XML schemas"/>
-    </entry>
-    <entry keyword="navigating">
-      <topic href="topics/tnavsrc.html#tnavsrc" title="Navigating XML schemas"/>
-    </entry>
-    <entry keyword="editing preferences">
-      <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
-    </entry>
-    <entry keyword="editing properties">
-      <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
-    </entry>
-    <entry keyword="attribute groups">
-      <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-    </entry>
-    <entry keyword="complex types">
-      <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-    </entry>
-    <entry keyword="content models">
-      <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-    </entry>
-    <entry keyword="adding an any element">
-      <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-    </entry>
-    <entry keyword="elements">
-      <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-    </entry>
-    <entry keyword="element references">
-      <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-    </entry>
-    <entry keyword="group features">
-      <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-    </entry>
-    <entry keyword="global attributes">
-      <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-    </entry>
-    <entry keyword="global elements">
-      <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-    </entry>
-    <entry keyword="groups">
-      <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-    </entry>
-    <entry keyword="import elements">
-      <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-    </entry>
-    <entry keyword="include elements">
-      <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-    </entry>
-    <entry keyword="adding redefine elements">
-      <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-    </entry>
-    <entry keyword="simple types">
-      <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-    </entry>
-    <entry keyword="pattern facets">
-      <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-    </entry>
-    <entry keyword="deleting components">
-      <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
-    </entry>
-    <entry keyword="validating">
-      <topic href="topics/tvdtschm.html#tvdtschm" title="Validating XML schemas"/>
-    </entry>
-  </entry>
-  <entry keyword="dependent artifacts">
-    <entry keyword="refactoring XML schema files">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="refactoring">
-    <entry keyword="XML schema files">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="renaming">
-    <entry keyword="XML schema files">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="schemas">
-    <entry keyword="editing">
-      <topic href="topics/trefactrXSD.html#refactoring" title="Refactoring in XML Schema Files"/>
-    </entry>
-  </entry>
-  <entry keyword="preferences">
-    <entry keyword="XML schema files">
-      <topic href="topics/tedtpref.html#tedtpref" title="Editing XML schema file preferences"/>
-    </entry>
-  </entry>
-  <entry keyword="XML schema editor">
-    <entry keyword="XML schema properties">
-      <topic href="topics/tedtschm.html#tedtschm" title="Editing XML schema properties"/>
-    </entry>
-    <entry keyword="overview">
-      <topic href="topics/cxmlsced.html#cxmlsced" title="XML schema editor"/>
-    </entry>
-    <entry keyword="attribute groups">
-      <topic href="topics/taddagrp.html#taddagrp" title="Adding attribute groups"/>
-    </entry>
-    <entry keyword="complex types">
-      <topic href="topics/taddcmxt.html#taddcmxt" title="Adding complex types"/>
-    </entry>
-    <entry keyword="content models">
-      <topic href="topics/taddcmod.html#taddcmod" title="Adding content models"/>
-    </entry>
-    <entry keyword="adding an any element">
-      <topic href="topics/taddanye.html#taddanye" title="Adding an any element"/>
-    </entry>
-    <entry keyword="elements">
-      <topic href="topics/taddelm.html#taddelm" title="Adding elements"/>
-    </entry>
-    <entry keyword="element references">
-      <topic href="topics/taddelmr.html#taddelmr" title="Adding element references"/>
-    </entry>
-    <entry keyword="group features">
-      <topic href="topics/taddgrpr.html#taddgrpr" title="Adding group references"/>
-    </entry>
-    <entry keyword="global attributes">
-      <topic href="topics/taddglba.html#taddglba" title="Adding global attributes"/>
-    </entry>
-    <entry keyword="global elements">
-      <topic href="topics/taddglem.html#taddglem" title="Adding global elements"/>
-    </entry>
-    <entry keyword="groups">
-      <topic href="topics/taddgrup.html#taddgrup" title="Adding groups"/>
-    </entry>
-    <entry keyword="import elements">
-      <topic href="topics/taddimpt.html#taddimpt" title="Adding import elements"/>
-    </entry>
-    <entry keyword="include elements">
-      <topic href="topics/taddincl.html#taddincl" title="Adding include elements"/>
-    </entry>
-    <entry keyword="adding redefine elements">
-      <topic href="topics/taddrdfn.html#taddrdfn" title="Adding redefine elements"/>
-    </entry>
-    <entry keyword="simple types">
-      <topic href="topics/taddsmpt.html#taddsmpt" title="Adding simple types"/>
-    </entry>
-    <entry keyword="pattern facets">
-      <topic href="topics/taddreg.html#taddreg" title="Adding pattern facets to simple types"/>
-    </entry>
-    <entry keyword="icons">
-      <topic href="topics/rxsdicons.html#ricons" title="Icons used in the XML schema editor"/>
-    </entry>
-    <entry keyword="deleting components">
-      <topic href="topics/tdelscmp.html#tdelscmp" title="Deleting XML schema components"/>
-    </entry>
-    <entry keyword="referential integrity">
-      <topic href="topics/rrefintg.html#rrefintg" title="Referential integrity in the XML schema editor"/>
-    </entry>
-    <entry keyword="clean up in">
-      <topic href="topics/rrefintg.html#rrefintg" title="Referential integrity in the XML schema editor"/>
-    </entry>
-  </entry>
-  <entry keyword="XML namespaces">
-    <entry keyword="overview">
-      <topic href="topics/rnmspc.html#rnmspc" title="XML namespaces"/>
-    </entry>
-  </entry>
-</index>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties
deleted file mode 100644
index 6d5cdc8..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# NLS_MESSAGEFORMAT_VAR 
-# NLS_ENCODING=UTF-8 
-Plugin.name = XML schema editor
-
-Bundle-Vendor.0 = Eclipse.org
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
deleted file mode 100644
index 15d23ab..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<?NLS TYPE="org.eclipse.help.toc"?>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/ -->
-<!-- ================================================= -->
-<!-- This is the plugin for declaring the help         -->
-<!-- contributions for using the tool.                 -->
-<!-- ================================================= -->
-
-<plugin>
-
-<extension point="org.eclipse.help.toc">
-    <toc file="XSDeditormap_toc.xml"/>
-       <index path="index/"/>
-      
-</extension>
-
-	<extension point="org.eclipse.help.index">
-      <index file="org.eclipse.wst.xsdeditor.doc.userindex.xml"/>
-</extension>
-       <extension point="org.eclipse.help.base.luceneSearchParticipants">
-      <binding participantId="org.eclipse.help.base.xhtml"/>
-   </extension>
-</plugin>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
deleted file mode 100644
index fe80409..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.dita
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<?Pub Inc?>

-<concept id="workingwithxmlschemas" xml:lang="en-us">

-<title>Working with XML schemas</title>

-<shortdesc>XML schemas are an XML language for describing and constraining

-the content of XML files.</shortdesc>

-<conbody>

-<p>This sections contains information on the following:</p>

-</conbody>

-<related-links>

-<link href="tcxmlsch.dita"><linktext>Creating XML schemas</linktext></link>

-<link href="timpschm.dita"><linktext>Importing XML schemas</linktext></link>

-<link href="tnavsrc.dita"><linktext>Navigating XML schemas</linktext></link>

-<link href="trefactrXSD.dita"><linktext>Refactoring in XML schemas</linktext>

-</link>

-<link href="tedtpref.dita"><linktext>Editing XML schema file preferences</linktext>

-</link>

-<link href="rxsdicons.dita"><linktext>Icons used in the XML schema editor</linktext>

-</link>

-<link href="tdelscmp.dita"><linktext>Deleting XML schema components</linktext>

-</link>

-<link href="tvdtschm.dita"><linktext>Validating XML schemas</linktext></link>

-<link href="rnmspc.dita"><linktext>XML namespaces</linktext></link>

-</related-links>

-</concept>

-<?Pub *0000001267?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html
deleted file mode 100644
index 558def2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cworkXSD.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="Working with XML schemas" />
-<meta name="abstract" content="XML schemas are an XML language for describing and constraining the content of XML files." />
-<meta name="description" content="XML schemas are an XML language for describing and constraining the content of XML files." />
-<meta scheme="URI" name="DC.Relation" content="tcxmlsch.html" />
-<meta scheme="URI" name="DC.Relation" content="timpschm.html" />
-<meta scheme="URI" name="DC.Relation" content="tnavsrc.html" />
-<meta scheme="URI" name="DC.Relation" content="trefactrXSD.html" />
-<meta scheme="URI" name="DC.Relation" content="tedtpref.html" />
-<meta scheme="URI" name="DC.Relation" content="rxsdicons.html" />
-<meta scheme="URI" name="DC.Relation" content="tdelscmp.html" />
-<meta scheme="URI" name="DC.Relation" content="tvdtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="workingwithxmlschemas" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Working with XML schemas</title>
-</head>
-<body id="workingwithxmlschemas"><a name="workingwithxmlschemas"><!-- --></a>
-
-
-<h1 class="topictitle1">Working with XML schemas</h1>
-
-
-<div><p>XML schemas are an XML language for describing and constraining
-the content of XML files.</p>
-
-<p>This sections contains information on the following:</p>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations.">Creating XML schemas</a></div>
-<div><a href="timpschm.html" title="If you want to work with XML schema files that you created outside of the product, you can import them into the workbench and open them in the XML schema editor. The XML schema editor provides you with a structured view of the XML schema.">Importing XML schemas</a></div>
-<div><a href="tnavsrc.html" title="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and pressing F3 to jump to the item it refers to.">Navigating XML schemas</a></div>
-<div><a href="trefactrXSD.html" title="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts.">Refactoring in XML schemas</a></div>
-<div><a href="tedtpref.html" title="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used.">Editing XML schema file preferences</a></div>
-<div><a href="tdelscmp.html" title="If you have created any XML schema components you no longer need, you can delete them.">Deleting XML schema components</a></div>
-<div><a href="tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="rxsdicons.html" title="The following XML schema editor icons appear in the Outline, Design, and Properties view.">Icons used in the XML schema editor</a></div>
-<div><a href="rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
deleted file mode 100644
index edaab3f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.dita
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"

- "concept.dtd">

-<concept id="cxmlsced" xml:lang="en-us">

-<title>XML schema editor</title>

-<titlealts>

-<searchtitle>XML schema editor</searchtitle>

-</titlealts>

-<shortdesc>This product provides an XML schema editor for creating, viewing,

-and validating XML schemas. XML schemas are a formal specification of element

-names that indicates which elements are allowed in an XML file, and in which

-combinations. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<conbody>

-<p>A schema is functionally equivalent to a DTD, but is written in XML. A

-schema also provides extended functionality such as data typing, inheritance,

-and presentation rules.</p>

-<p>For more information on XML schema, see the following:</p>

-<ul>

-<li> <xref format="html" href="http://www.w3.org/TR/xmlschema-0/" scope="external">http://www.w3.org/TR/xmlschema-0/</xref> </li>

-<li> <xref format="html" href="http://www.w3.org/TR/xmlschema-1/" scope="external">http://www.w3.org/TR/xmlschema-1/</xref> </li>

-<li> <xref format="html" href="http://www.w3.org/TR/xmlschema-2/" scope="external">http://www.w3.org/TR/xmlschema-2/</xref> </li>

-</ul>

-<p>Using the XML schema editor, you can:</p>

-<ul>

-<li>Create and delete XML schema components such as complex types, simple

-types, elements, attributes, attribute groups, and groups.</li>

-<li>Edit XML schemas.</li>

-<li>Import existing XML schemas for structured viewing.</li>

-</ul>

-<p>The XML Schema specification from the W3C Web site is used for validation.</p>

-<section><title>XML schema editor views - Design, Outline, Properties, and

-Source</title>There are four main views you can work with in the XML schema

-editor:<ul>

-<li>Design - the Design view provides a graphical way to edit your schema</li>

-<li>Outline - the Outline view shows you the main components in your XML schema.

-You can use this view to add and remove certain components.</li>

-<li>Properties - the Properties view enables you to edit the properties of

-your XML schema components</li>

-<li>Source - the Source view enables you to edit your source code directly</li>

-</ul></section>

-<section><title>Status of the XML schema</title><p></p><p>Three status indicators

-for the schema are available. They are in the bottom right corner:</p><ul>

-<li> <uicontrol>Writable</uicontrol> or <uicontrol>Read Only</uicontrol>. </li>

-<li> (Source view only) <uicontrol>Smart Insert</uicontrol> or <uicontrol>Overwrite</uicontrol>.

-To toggle between these modes, press the <uicontrol>Insert</uicontrol> button

-on your keyboard.</li>

-<li> Line and column number (displayed in the format <?Pub Caret?><userinput>column

-# : line #</userinput>)</li>

-</ul></section>

-</conbody>

-</concept>

-<?Pub *0000002906?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
deleted file mode 100644
index d6a9914..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/cxmlsced.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="concept" name="DC.Type" />
-<meta name="DC.Title" content="XML schema editor" />
-<meta name="abstract" content="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta name="description" content="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta content="XML schema editor, overview" name="DC.subject" />
-<meta content="XML schema editor, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcxmlsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvdtschm.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="cxmlsced" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML schema editor</title>
-</head>
-<body id="cxmlsced"><a name="cxmlsced"><!-- --></a>
-
-
-<h1 class="topictitle1">XML schema editor</h1>
-
-
-
-
-<div><p>This product provides an XML schema editor for creating, viewing,
-and validating XML schemas. XML schemas are a formal specification of element
-names that indicates which elements are allowed in an XML file, and in which
-combinations. </p>
-
-<p>A schema is functionally equivalent to a DTD, but is written in XML. A
-schema also provides extended functionality such as data typing, inheritance,
-and presentation rules.</p>
-
-<p>For more information on XML schema, see the following:</p>
-
-<ul>
-<li> <a href="http://www.w3.org/TR/xmlschema-0/" target="_blank">http://www.w3.org/TR/xmlschema-0/</a> </li>
-
-<li> <a href="http://www.w3.org/TR/xmlschema-1/" target="_blank">http://www.w3.org/TR/xmlschema-1/</a> </li>
-
-<li> <a href="http://www.w3.org/TR/xmlschema-2/" target="_blank">http://www.w3.org/TR/xmlschema-2/</a> </li>
-
-</ul>
-
-<p>Using the XML schema editor, you can:</p>
-
-<ul>
-<li>Create and delete XML schema components such as complex types, simple
-types, elements, attributes, attribute groups, and groups.</li>
-
-<li>Edit XML schemas.</li>
-
-<li>Import existing XML schemas for structured viewing.</li>
-
-</ul>
-
-<p>The XML Schema specification from the W3C Web site is used for validation.</p>
-
-<div class="section"><h4 class="sectiontitle">XML schema editor views - Design, Outline, Properties, and
-Source</h4>There are four main views you can work with in the XML schema
-editor:<ul>
-<li>Design - the Design view provides a graphical way to edit your schema</li>
-
-<li>Outline - the Outline view shows you the main components in your XML schema.
-You can use this view to add and remove certain components.</li>
-
-<li>Properties - the Properties view enables you to edit the properties of
-your XML schema components</li>
-
-<li>Source - the Source view enables you to edit your source code directly</li>
-
-</ul>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Status of the XML schema</h4><p />
-<p>Three status indicators
-for the schema are available. They are in the bottom right corner:</p>
-<ul>
-<li> <span class="uicontrol">Writable</span> or <span class="uicontrol">Read Only</span>. </li>
-
-<li> (Source view only) <span class="uicontrol">Smart Insert</span> or <span class="uicontrol">Overwrite</span>.
-To toggle between these modes, press the <span class="uicontrol">Insert</span> button
-on your keyboard.</li>
-
-<li> Line and column number (displayed in the format <kbd class="userinput">column
-# : line #</kbd>)</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations.">Creating XML schemas</a></div>
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.dita
deleted file mode 100644
index e50260d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.dita
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference  PUBLIC "-//OASIS//DTD DITA Reference//EN" "reference.dtd">

-<reference id="rlimitations_slushXSD" xml:lang="en-us">

-<title>Limitations of XML schema editor</title>

-<titlealts>

-<searchtitle>Limitations of XML schema editor</searchtitle>

-</titlealts>

-<shortdesc>This section describes known product aspect limitations and workarounds.</shortdesc>

-<refbody>

-<!--Use this template to single source the readme information.  The content for the readme information is maintained in this topic and is inserted into the related topic using the conref attribute. This file will not be surfaced in your navigation.-->

-<section><title>Hebrew Logical encoding</title><p id="encoding"><!--There is no defect associated with this entry. It is from the 5.1 readme.-->When

-Hebrew Logical (ISO-8859-8-I) encoding is selected as a preference for encoding

-of HTML files (<menucascade><uicontrol>Window</uicontrol><uicontrol>Preferences</uicontrol>

-<uicontrol>Web and XML Files</uicontrol><uicontrol>HTML files</uicontrol>

-</menucascade> in the "When creating files" section), the HTML documentation

-files generated from an XML schema file will still have a UTF-8 encoding.

-This is a known problem.</p></section>

-</refbody>

-</reference>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html
deleted file mode 100644
index 142fc28..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rlimitations_slushXSD.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Limitations of XML schema editor" />
-<meta name="abstract" content="This section describes known product aspect limitations and workarounds." />
-<meta name="description" content="This section describes known product aspect limitations and workarounds." />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rlimitations_slushXSD" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Limitations of XML schema editor</title>
-</head>
-<body id="rlimitations_slushXSD"><a name="rlimitations_slushXSD"><!-- --></a>
-
-
-<h1 class="topictitle1">Limitations of XML schema editor</h1>
-
-
-
-<div><p>This section describes known product aspect limitations and workarounds.</p>
-
-
-<div class="section"><h4 class="sectiontitle">Hebrew Logical encoding</h4><p id="rlimitations_slushXSD__encoding"><a name="rlimitations_slushXSD__encoding"><!-- --></a>When
-Hebrew Logical (ISO-8859-8-I) encoding is selected as a preference for encoding
-of HTML files (<span class="menucascade"><span class="uicontrol">Window</span> &gt; <span class="uicontrol">Preferences</span>
- &gt; <span class="uicontrol">Web and XML Files</span> &gt; <span class="uicontrol">HTML files</span>
-</span> in the "When creating files" section), the HTML documentation
-files generated from an XML schema file will still have a UTF-8 encoding.
-This is a known problem.</p>
-</div>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita
deleted file mode 100644
index 315331d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.dita
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="rnmspc" xml:lang="en-us">

-<title>XML namespaces</title>

-<titlealts>

-<searchtitle>XML namespaces</searchtitle>

-</titlealts>

-<shortdesc>An XML namespace is a collection of names, identified by a URI

-reference, which are used in XML documents as element types and attribute

-names.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML namespaces<indexterm>overview</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<section>XML namespaces are defined by a W3C recommendation, dating 16 August

-2006, called <xref format="html" href="http://www.w3.org/TR/2006/REC-xml-names-20060816/"

-scope="external">Namespaces in XML</xref>. XML tag names should be globally

-unique, as well as short for performance reasons. In order to resolve this

-conflict, the W3C namespace recommendation defines an attribute <b>xmlns</b> which

-can amend any XML element. If it is present in an element, it identifies the

-namespace for this element.</section>

-<section><p>The xmlns attribute has the following syntax:</p><p><codeph>xmlns:<varname>prefix</varname>=namespace</codeph> </p><p>where <codeph>namespace</codeph

-> is a unique URI (such as www.ibm.com) and where <codeph><varname>prefix</varname></codeph> represents

-the namespace and provides a pointer to it.</p><p>In the following customer

-element definition, an accounting namespace is defined in order to be able

-to distinguish the element tags from those appearing in customer records created

-by other business applications:</p><p><codeblock>&lt;acct:customer xmlns:acct="http://www.my.com/acct-REV10">

-	&lt;acct:name>Corporation&lt;/acct:name>

-	&lt;acct:order acct:ref="5566"/>

-	&lt;acct:status>invoice&lt;/acct:status>

-&lt;/acct:customer>  </codeblock> </p><p>The namespace definition in the first

-line assigns the namespace http://www.my.com/acct-REV10 to the prefix. This

-prefix is used on the element names such as name in order to attach them to

-the namespace. A second application, for example, a fulfillment system, can

-assign a different namespace to its customer elements:</p><p><codeblock>&lt;ful:customer xmlns:ful="http://www.your.com/ful">

-	&lt;ful:name>Corporation&lt;/ful:name>

-	&lt;ful:order ful:ref="A98756"/>

-	&lt;ful:status>shipped&lt;/ful:status>

- &lt;/ful:customer></codeblock> </p><p>An application processing both data

-structures is now able to treat the accounting and the fulfillment data differently.

-There is a default namespace. It is set if no local name is assigned in the

-namespace definition:</p><p><codeblock>&lt;acct:customer xmlns="http://www.my.com/acct-REV10" xmlns:acct="http://www.my.com/acct-REV10 ">

-&lt;name>Corporation&lt;/name>

-&lt;order acct:ref="5566"/>

-&lt;status>invoice&lt;/status>

-&lt;/customer></codeblock></p><p>In this example, all tags in the customer

-record are qualified to reside in the namespace http://www.my.com/acct-REV10.

-No explicit prefix is needed because the default namespace is used. Note that

-the default namespace applies to any attributes definitions.</p></section>

-<section><title>XML schemas and namespaces</title><p>In the following XML

-schema, the default namespace for the schema is defined as the standard XML

-schema namespace http://www.w3.org/2001/XMLSchema; there is also a schema

-specific namespace http://www.ibm.com.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:TestSchema="http://www.ibm.com">

- &lt;simpleType name="ZipCodeType">

- &lt;restriction base="integer">

-  &lt;minInclusive value="10000"/>

- &lt;maxInclusive value="99999"/>

-&lt;/restriction>

- &lt;/simpleType> 

- &lt;!--element definitions skipped -->  

-&lt;/schema>  </codeblock></p><p>Assuming that the preceding XML schema is

-saved as <filepath>C:\temp\TestSchema.xsd</filepath>, a sample XML file that

-validates against this schema is:</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;x:addressList xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd">

- xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd">

-&lt;x:address>

- &lt;x:street>x:Vangerowstrasse&lt;/x:street>

-  &lt;x:zipCode>69115&lt;/x:zipCode>

- &lt;x:city>x:Heidelberg&lt;/x:city>

- &lt;/x:address>

-    &lt;x:address> 

-&lt;x:street>x:Bernal Road&lt;/x:street> 

-&lt;x:zipCode>90375&lt;/x:zipCode>

-     &lt;x:city>x:San Jose&lt;/x:city>

- &lt;/x:address>

-&lt;/x:addressList> </codeblock></p></section>

-<section><title>Target namespace</title><p> The target namespace serves to

-identify the namespace within which the association between the element and

-its name exists. In the case of declarations, this association determines

-the namespace of the elements in XML files conforming to the schema. An XML

-file importing a schema must reference its target namespace in the schemaLocation

-attribute. Any mismatches between the target and the actual namespace of an

-element are reported as schema validation errors. In our example, the target

-namespace is http://www.ibm.com; it is defined in the  XML schema file and

-referenced twice in the XML file. Any mismatch between these three occurrences

-of the namespace lead to validation errors.</p><p> The following examples

-show how target namespaces and namespace prefixes work in XML schemas and

-their corresponding XML instance documents.</p></section>

-<section><title>Sample 1 - A schema with both a default and target namespace

-and unqualified locals</title><p>The XML schema:  </p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com">

-&lt;complexType name="AddressType">

-&lt;sequence>

-&lt;element name="name" type="string">&lt;/element>

-&lt;/sequence>

-&lt;/complexType>

-&lt;element name="MyAddress" type="x:AddressType">&lt;/element>

-&lt;/schema> </codeblock> </p><p>A valid XML instance document created from

-this schema looks like this. Local elements and attributes are unqualified.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com x.xsd ">

-&lt;name>Peter Smith&lt;/name>

-&lt;/x:MyAddress> </codeblock></p><p>When local elements (such as the "name"

-element) and attributes are unqualified in an XML file, then only the root

-element is qualified. So, in this example, the "x" namespace prefix is assigned

-to the root element "MyAddress", associating it with the namespace "http://www.ibm.com",

-but the"x" prefix is not assigned to the local element "name".</p></section>

-<section><title>Sample 2 - A schema with both a default and target namespace

-and qualified locals</title><p><codeblock>&lt;?xml version="1.0"?>

-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com" elementFormDefault="qualified">

-&lt;complexType name="AddressType">

-&lt;sequence>

-&lt;element name="name" type="string">&lt;/element>

-&lt;/sequence>

-&lt;/complexType>

-&lt;element name="MyAddress" type="x:AddressType">&lt;/element>

- &lt;/schema>  </codeblock></p><p>A valid XML instance document created from

-this schema looks like this. Local elements and attributes are qualified This

-is because the elementFormDefault attribute is set to qualified in the XML

-schema.</p><p><codeblock>&lt;?xml version="1.0"?>

-  &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

- xsi:schemaLocation="http://www.ibm.com x.xsd "> 

-&lt;x:name>Peter Smith&lt;/x:name>

- &lt;/x:MyAddress></codeblock> </p><p>In this example, the "x" namespace prefix

-is assigned to both the root element "MyAddress" and the local element "name",

-associating them with the namespace "http://www.ibm.com",.</p></section>

-<section><title>Sample 3 - Schema with target Namespace, and explicitly defines

-xmlns:xsd</title><p>This XML schema adds this attribute:  </p><codeph>xmlns:xsd="http://www.w3.org/2001/XMLSchema </codeph><p>What

-this means is that each of the constructs that are defined by the XML schema

-language will need to be qualified with the "xsd" prefix. For example, xsd:complexType

-and  xsd:string</p><p>. Note that you can chose any other prefixes such as

-"xs" or "foobar" in your declaration and usage.</p><p>You can specify this

-prefix in the XML schema preferences page. For more information, refer to

-the related tasks.</p><p>All user defined types belong to the namespace  http://www.ibm.com

-as defined by the targetNamespace attribute, and the prefix is "x" as defined

-by the xmlns:x attribute.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com">

-&lt;xsd:complexType name="AddressType">

-&lt;xsd:sequence>

-		 &lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;/xsd:sequence>

- &lt;/xsd:complexType>

- &lt;xsd:element name="MyAddress" type="x:AddressType">&lt;/xsd:element>

-&lt;/xsd:schema></codeblock> </p><p>A valid XML instance document created

-from this schema looks like this. Local elements and attributes are unqualified.

-The semantics of qualification is the same as Sample 1.</p><p><codeblock>&lt;?xml version="1.0"?>

- &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://www.ibm.com x.xsd ">

-&lt;name>Peter Smith&lt;/name>

- &lt;/x:MyAddress></codeblock></p></section>

-<section><title>Sample 4 - Schema with undeclared target Namespace that explicitly

-defines xmlns:xsd</title><p>This XML schema has no target namespace for itself.

-In this case, it is highly recommended that all XML schema constructs be explicitly

-qualified with a prefix such as "xsd". The definitions and declarations from

-this schema such as AddressType are referenced without namespace qualification

-since there is no namespace prefix.  </p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">

-&lt;xsd:complexType name="AddressType">

-&lt;xsd:sequence>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element> 

-&lt;/xsd:sequence> 

-&lt;/xsd:complexType>

-&lt;xsd:element name="MyAddress" type="AddressType">&lt;/xsd:element> 

-&lt;/xsd:schema> </codeblock></p><p>A valid XML instance document created

-from the schema looks like this. All elements are unqualified.</p><p><codeblock>&lt;?xml version="1.0"?>

-&lt;MyAddress xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="x.xsd">

-&lt;name>name&lt;/name>

-&lt;/MyAddress></codeblock>  </p></section>

-<section><title>Sample 5 - A schema where the target namespace is the default

-namespace</title><p>This is an XML schema where the target namespace is the

-default namespace. As well, the namespace has no namespace prefix.</p><p><codeblock>&lt;?xml version="1.0"?>

- &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns="http://www.ibm.com">

-&lt;xsd:complexType name="AddressType">

-&lt;xsd:sequence>

-&lt;xsd:element name="name" type="xsd:string">&lt;/xsd:element>

-&lt;/xsd:sequence>

-&lt;/xsd:complexType>

- &lt;xsd:element name="MyAddress" type="AddressType">&lt;/xsd:element>

- &lt;/xsd:schema> </codeblock> </p><p>A valid XML instance document created

-from the schema looks like this:</p><p><codeblock>&lt;?xml version="1.0" encoding="UTF-8"?>

-&lt;MyAddress xmlns="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com NewXMLSchema.xsd">

-&lt;name>name&lt;/name>

- &lt;/MyAddress>  </codeblock> </p></section>

-</refbody>

-</reference><?Pub Caret?>

-<?Pub *0000012002?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
deleted file mode 100644
index 1e81024..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rnmspc.html
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="XML namespaces" />
-<meta name="abstract" content="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names." />
-<meta name="description" content="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names." />
-<meta content="XML namespaces, overview" name="DC.subject" />
-<meta content="XML namespaces, overview" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtpref.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rnmspc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML namespaces</title>
-</head>
-<body id="rnmspc"><a name="rnmspc"><!-- --></a>
-
-
-<h1 class="topictitle1">XML namespaces</h1>
-
-
-
-
-<div><p>An XML namespace is a collection of names, identified by a URI
-reference, which are used in XML documents as element types and attribute
-names.</p>
-
-<div class="section">XML namespaces are defined by a W3C recommendation, dating 16 August
-2006, called <a href="http://www.w3.org/TR/2006/REC-xml-names-20060816/" target="_blank">Namespaces in XML</a>. XML tag names should be globally
-unique, as well as short for performance reasons. In order to resolve this
-conflict, the W3C namespace recommendation defines an attribute <strong>xmlns</strong> which
-can amend any XML element. If it is present in an element, it identifies the
-namespace for this element.</div>
-
-<div class="section"><p>The xmlns attribute has the following syntax:</p>
-<p><samp class="codeph">xmlns:<var class="varname">prefix</var>=namespace</samp> </p>
-<p>where <samp class="codeph">namespace</samp> is a unique URI (such as www.ibm.com) and where <samp class="codeph"><var class="varname">prefix</var></samp> represents
-the namespace and provides a pointer to it.</p>
-<p>In the following customer
-element definition, an accounting namespace is defined in order to be able
-to distinguish the element tags from those appearing in customer records created
-by other business applications:</p>
-<div class="p"><pre>&lt;acct:customer xmlns:acct="http://www.my.com/acct-REV10"&gt;
-	&lt;acct:name&gt;Corporation&lt;/acct:name&gt;
-	&lt;acct:order acct:ref="5566"/&gt;
-	&lt;acct:status&gt;invoice&lt;/acct:status&gt;
-&lt;/acct:customer&gt;  </pre>
- </div>
-<p>The namespace definition in the first
-line assigns the namespace http://www.my.com/acct-REV10 to the prefix. This
-prefix is used on the element names such as name in order to attach them to
-the namespace. A second application, for example, a fulfillment system, can
-assign a different namespace to its customer elements:</p>
-<div class="p"><pre>&lt;ful:customer xmlns:ful="http://www.your.com/ful"&gt;
-	&lt;ful:name&gt;Corporation&lt;/ful:name&gt;
-	&lt;ful:order ful:ref="A98756"/&gt;
-	&lt;ful:status&gt;shipped&lt;/ful:status&gt;
- &lt;/ful:customer&gt;</pre>
- </div>
-<p>An application processing both data
-structures is now able to treat the accounting and the fulfillment data differently.
-There is a default namespace. It is set if no local name is assigned in the
-namespace definition:</p>
-<div class="p"><pre>&lt;acct:customer xmlns="http://www.my.com/acct-REV10" xmlns:acct="http://www.my.com/acct-REV10 "&gt;
-&lt;name&gt;Corporation&lt;/name&gt;
-&lt;order acct:ref="5566"/&gt;
-&lt;status&gt;invoice&lt;/status&gt;
-&lt;/customer&gt;</pre>
-</div>
-<p>In this example, all tags in the customer
-record are qualified to reside in the namespace http://www.my.com/acct-REV10.
-No explicit prefix is needed because the default namespace is used. Note that
-the default namespace applies to any attributes definitions.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">XML schemas and namespaces</h4><p>In the following XML
-schema, the default namespace for the schema is defined as the standard XML
-schema namespace http://www.w3.org/2001/XMLSchema; there is also a schema
-specific namespace http://www.ibm.com.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:TestSchema="http://www.ibm.com"&gt;
- &lt;simpleType name="ZipCodeType"&gt;
- &lt;restriction base="integer"&gt;
-  &lt;minInclusive value="10000"/&gt;
- &lt;maxInclusive value="99999"/&gt;
-&lt;/restriction&gt;
- &lt;/simpleType&gt; 
- &lt;!--element definitions skipped --&gt;  
-&lt;/schema&gt;  </pre>
-</div>
-<p>Assuming that the preceding XML schema is
-saved as <span class="filepath">C:\temp\TestSchema.xsd</span>, a sample XML file that
-validates against this schema is:</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;x:addressList xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd"&gt;
- xsi:schemaLocation="http://www.ibm.com file:///C:/temp/TestSchema.xsd"&gt;
-&lt;x:address&gt;
- &lt;x:street&gt;x:Vangerowstrasse&lt;/x:street&gt;
-  &lt;x:zipCode&gt;69115&lt;/x:zipCode&gt;
- &lt;x:city&gt;x:Heidelberg&lt;/x:city&gt;
- &lt;/x:address&gt;
-    &lt;x:address&gt; 
-&lt;x:street&gt;x:Bernal Road&lt;/x:street&gt; 
-&lt;x:zipCode&gt;90375&lt;/x:zipCode&gt;
-     &lt;x:city&gt;x:San Jose&lt;/x:city&gt;
- &lt;/x:address&gt;
-&lt;/x:addressList&gt; </pre>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Target namespace</h4><p> The target namespace serves to
-identify the namespace within which the association between the element and
-its name exists. In the case of declarations, this association determines
-the namespace of the elements in XML files conforming to the schema. An XML
-file importing a schema must reference its target namespace in the schemaLocation
-attribute. Any mismatches between the target and the actual namespace of an
-element are reported as schema validation errors. In our example, the target
-namespace is http://www.ibm.com; it is defined in the  XML schema file and
-referenced twice in the XML file. Any mismatch between these three occurrences
-of the namespace lead to validation errors.</p>
-<p> The following examples
-show how target namespaces and namespace prefixes work in XML schemas and
-their corresponding XML instance documents.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 1 - A schema with both a default and target namespace
-and unqualified locals</h4><p>The XML schema:  </p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com"&gt;
-&lt;complexType name="AddressType"&gt;
-&lt;sequence&gt;
-&lt;element name="name" type="string"&gt;&lt;/element&gt;
-&lt;/sequence&gt;
-&lt;/complexType&gt;
-&lt;element name="MyAddress" type="x:AddressType"&gt;&lt;/element&gt;
-&lt;/schema&gt; </pre>
- </div>
-<p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are unqualified.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
-&lt;name&gt;Peter Smith&lt;/name&gt;
-&lt;/x:MyAddress&gt; </pre>
-</div>
-<p>When local elements (such as the "name"
-element) and attributes are unqualified in an XML file, then only the root
-element is qualified. So, in this example, the "x" namespace prefix is assigned
-to the root element "MyAddress", associating it with the namespace "http://www.ibm.com",
-but the"x" prefix is not assigned to the local element "name".</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 2 - A schema with both a default and target namespace
-and qualified locals</h4><div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com" elementFormDefault="qualified"&gt;
-&lt;complexType name="AddressType"&gt;
-&lt;sequence&gt;
-&lt;element name="name" type="string"&gt;&lt;/element&gt;
-&lt;/sequence&gt;
-&lt;/complexType&gt;
-&lt;element name="MyAddress" type="x:AddressType"&gt;&lt;/element&gt;
- &lt;/schema&gt;  </pre>
-</div>
-<p>A valid XML instance document created from
-this schema looks like this. Local elements and attributes are qualified This
-is because the elementFormDefault attribute is set to qualified in the XML
-schema.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-  &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.ibm.com x.xsd "&gt; 
-&lt;x:name&gt;Peter Smith&lt;/x:name&gt;
- &lt;/x:MyAddress&gt;</pre>
- </div>
-<p>In this example, the "x" namespace prefix
-is assigned to both the root element "MyAddress" and the local element "name",
-associating them with the namespace "http://www.ibm.com",.</p>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 3 - Schema with target Namespace, and explicitly defines
-xmlns:xsd</h4><p>This XML schema adds this attribute:  </p>
-<samp class="codeph">xmlns:xsd="http://www.w3.org/2001/XMLSchema </samp><p>What
-this means is that each of the constructs that are defined by the XML schema
-language will need to be qualified with the "xsd" prefix. For example, xsd:complexType
-and  xsd:string</p>
-<p>. Note that you can chose any other prefixes such as
-"xs" or "foobar" in your declaration and usage.</p>
-<p>You can specify this
-prefix in the XML schema preferences page. For more information, refer to
-the related tasks.</p>
-<p>All user defined types belong to the namespace  http://www.ibm.com
-as defined by the targetNamespace attribute, and the prefix is "x" as defined
-by the xmlns:x attribute.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns:x="http://www.ibm.com"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-		 &lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:sequence&gt;
- &lt;/xsd:complexType&gt;
- &lt;xsd:element name="MyAddress" type="x:AddressType"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:schema&gt;</pre>
- </div>
-<p>A valid XML instance document created
-from this schema looks like this. Local elements and attributes are unqualified.
-The semantics of qualification is the same as Sample 1.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
- &lt;x:MyAddress xmlns:x="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"xsi:schemaLocation="http://www.ibm.com x.xsd "&gt;
-&lt;name&gt;Peter Smith&lt;/name&gt;
- &lt;/x:MyAddress&gt;</pre>
-</div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 4 - Schema with undeclared target Namespace that explicitly
-defines xmlns:xsd</h4><p>This XML schema has no target namespace for itself.
-In this case, it is highly recommended that all XML schema constructs be explicitly
-qualified with a prefix such as "xsd". The definitions and declarations from
-this schema such as AddressType are referenced without namespace qualification
-since there is no namespace prefix.  </p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt; 
-&lt;/xsd:sequence&gt; 
-&lt;/xsd:complexType&gt;
-&lt;xsd:element name="MyAddress" type="AddressType"&gt;&lt;/xsd:element&gt; 
-&lt;/xsd:schema&gt; </pre>
-</div>
-<p>A valid XML instance document created
-from the schema looks like this. All elements are unqualified.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
-&lt;MyAddress xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="x.xsd"&gt;
-&lt;name&gt;name&lt;/name&gt;
-&lt;/MyAddress&gt;</pre>
-  </div>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Sample 5 - A schema where the target namespace is the default
-namespace</h4><p>This is an XML schema where the target namespace is the
-default namespace. As well, the namespace has no namespace prefix.</p>
-<div class="p"><pre>&lt;?xml version="1.0"?&gt;
- &lt;xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.ibm.com" xmlns="http://www.ibm.com"&gt;
-&lt;xsd:complexType name="AddressType"&gt;
-&lt;xsd:sequence&gt;
-&lt;xsd:element name="name" type="xsd:string"&gt;&lt;/xsd:element&gt;
-&lt;/xsd:sequence&gt;
-&lt;/xsd:complexType&gt;
- &lt;xsd:element name="MyAddress" type="AddressType"&gt;&lt;/xsd:element&gt;
- &lt;/xsd:schema&gt; </pre>
- </div>
-<p>A valid XML instance document created
-from the schema looks like this:</p>
-<div class="p"><pre>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
-&lt;MyAddress xmlns="http://www.ibm.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.ibm.com NewXMLSchema.xsd"&gt;
-&lt;name&gt;name&lt;/name&gt;
- &lt;/MyAddress&gt;  </pre>
- </div>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtpref.html" title="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used.">Editing XML schema file preferences</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita
deleted file mode 100644
index 812b302..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="rrefintg" xml:lang="en-us">

-<title>Referential integrity in the XML schema editor</title>

-<titlealts>

-<searchtitle>Referential integrity</searchtitle>

-</titlealts>

-<shortdesc>The XML schema editor has a built-in mechanism to handle referential

-integrity issues. When you delete certain nodes, clean up for any nodes affected

-will automatically occur.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>referential integrity</indexterm></indexterm>

-<indexterm>XML schema editor<indexterm>clean up in</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<section>When you define a complex type, you can add a content model to it

-and reference a global element. <p>For example:<codeblock>&lt;schema>

- &lt;element name="comment" type="string">

-	&lt;complexType name="Items">

-		&lt;sequence>

-<?Pub Caret?>				&lt;element ref="comment">

-		 &lt;/sequence>

-	 &lt;/complexType>

-&lt;/schema></codeblock></p><p>If the global element (comment) was deleted,

-all references to it would be in error. However, when you delete the global

-element, the XML schema editor will clean up using the following algorithm:</p><ul>

-<li>If there are one or more global elements in the schema, it will change

-all existing references to the first global element.</li>

-<li>If there is no global element, then it will delete the element reference

-from the content model.</li>

-</ul></section>

-<section><title>Deleting included and imported schema</title><p>If an included

-or imported schema is deleted, you must manually reset the following type

-references as appropriate: <ul>

-<li>Global element and element's type.</li>

-<li>Attribute type.</li>

-<li>Complex type derivation.</li>

-<li>Simple type derivation.</li>

-</ul>They will not automatically be reset if an included or imported schema

-is deleted.</p></section>

-</refbody>

-</reference>

-<?Pub *0000002046?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
deleted file mode 100644
index 1d7b42d..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rrefintg.html
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Referential integrity in the XML schema editor" />
-<meta name="abstract" content="The XML schema editor has a built-in mechanism to handle referential integrity issues. When you delete certain nodes, clean up for any nodes affected will automatically occur." />
-<meta name="description" content="The XML schema editor has a built-in mechanism to handle referential integrity issues. When you delete certain nodes, clean up for any nodes affected will automatically occur." />
-<meta content="XML schema editor, referential integrity, clean up in" name="DC.subject" />
-<meta content="XML schema editor, referential integrity, clean up in" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tdelscmp.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="rrefintg" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Referential integrity</title>
-</head>
-<body id="rrefintg"><a name="rrefintg"><!-- --></a>
-
-
-<h1 class="topictitle1">Referential integrity in the XML schema editor</h1>
-
-
-
-
-<div><p>The XML schema editor has a built-in mechanism to handle referential
-integrity issues. When you delete certain nodes, clean up for any nodes affected
-will automatically occur.</p>
-
-<div class="section">When you define a complex type, you can add a content model to it
-and reference a global element. <div class="p">For example:<pre>&lt;schema&gt;
- &lt;element name="comment" type="string"&gt;
-	&lt;complexType name="Items"&gt;
-		&lt;sequence&gt;
-				&lt;element ref="comment"&gt;
-		 &lt;/sequence&gt;
-	 &lt;/complexType&gt;
-&lt;/schema&gt;</pre>
-</div>
-<p>If the global element (comment) was deleted,
-all references to it would be in error. However, when you delete the global
-element, the XML schema editor will clean up using the following algorithm:</p>
-<ul>
-<li>If there are one or more global elements in the schema, it will change
-all existing references to the first global element.</li>
-
-<li>If there is no global element, then it will delete the element reference
-from the content model.</li>
-
-</ul>
-</div>
-
-<div class="section"><h4 class="sectiontitle">Deleting included and imported schema</h4><div class="p">If an included
-or imported schema is deleted, you must manually reset the following type
-references as appropriate: <ul>
-<li>Global element and element's type.</li>
-
-<li>Attribute type.</li>
-
-<li>Complex type derivation.</li>
-
-<li>Simple type derivation.</li>
-
-</ul>
-They will not automatically be reset if an included or imported schema
-is deleted.</div>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tdelscmp.html" title="If you have created any XML schema components you no longer need, you can delete them.">Deleting XML schema components</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
deleted file mode 100644
index 93dea39..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.dita
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"

- "reference.dtd">

-<reference id="ricons" xml:lang="en-us">

-<title>Icons used in the XML schema editor</title>

-<titlealts>

-<searchtitle>XML schema editor icons</searchtitle>

-</titlealts>

-<shortdesc>The following XML schema editor icons appear in the Outline, Design,

-and Properties view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>icons</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<refbody>

-<section></section>

-<table>

-<tgroup cols="2"><colspec colname="COLSPEC0"/><colspec colname="COLSPEC1"/>

-<tbody>

-<row>

-<entry colname="COLSPEC0" valign="bottom"><b>Icon</b></entry>

-<entry colname="COLSPEC1" valign="bottom"><b>Description</b></entry>

-</row>

-<row>

-<entry><image href="../images/XSDAnyAttribute.gif"><alt>This graphic is the

-any attribute icon </alt></image></entry>

-<entry><codeph>any</codeph> attribute</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAny.gif"><alt>This graphic is the any element

-icon </alt></image></entry>

-<entry><codeph>any</codeph> element</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttribute.gif"><alt>This graphic is the attribute

-icon </alt></image></entry>

-<entry>attribute</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttributeGroup.gif"><alt>This graphic is

-the attribute group icon </alt></image></entry>

-<entry>attribute group</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttributeGroupRef.gif"><alt>This graphic

-is the attribute group reference icon </alt></image></entry>

-<entry>attribute group reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAttributeRef.gif"><alt>This graphic is the

-attribute reference icon </alt></image></entry>

-<entry>attribute reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDAll.gif"><alt>This graphic is the content

-model - all icon </alt></image></entry>

-<entry>content model - all</entry>

-</row>

-<row>

-<entry colname="COLSPEC0"><image href="../images/XSDChoice.gif"><alt>This

-graphic is the content model - choice icon </alt></image></entry>

-<entry colname="COLSPEC1">content model - choice</entry>

-</row>

-<row>

-<entry colname="COLSPEC0"><image href="../images/XSDSequence.gif"><alt>This

-graphic is the content model - sequence icon </alt></image></entry>

-<entry colname="COLSPEC1">content model - sequence</entry>

-</row>

-<row>

-<entry><image href="../images/XSDComplexType.gif"><alt>This graphic is the

-any element icon </alt></image></entry>

-<entry>complex type</entry>

-</row>

-<row>

-<entry><image href="../images/XSDElement.gif"><alt>This graphic is the element

-icon </alt></image></entry>

-<entry>element</entry>

-</row>

-<row>

-<entry><image href="../images/XSDElementRef.gif"><alt>This graphic is the

-element reference icon </alt></image></entry>

-<entry>element reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDSimpleEnum.gif"><alt>This graphic is the

-enumeration icon </alt></image></entry>

-<entry>enumeration</entry>

-</row>

-<row>

-<entry><image href="../images/XSDGlobalAttribute.gif"><alt>This graphic is

-the global attribute icon </alt></image></entry>

-<entry>global attribute</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDGlobalElement.gif"><alt>This graphic is

-the global element icon </alt></image></entry>

-<entry>global element</entry>

-</row>

-<row>

-<entry> <image href="../images/XSDGroup.gif"><alt>This graphic is the group

-icon </alt></image></entry>

-<entry>group</entry>

-</row>

-<row>

-<entry><image href="../images/XSDGroupRef.gif"><alt>This graphic is the group

-reference icon </alt></image></entry>

-<entry>group reference</entry>

-</row>

-<row>

-<entry><image href="../images/XSDImport.gif"><alt>This graphic is the import

-icon </alt></image></entry>

-<entry>import</entry>

-</row>

-<row>

-<entry><image href="../images/XSDInclude.gif"><alt>This graphic is the include

-icon </alt></image></entry>

-<entry>include</entry>

-</row>

-<row>

-<entry><image href="../images/XSDSimplePattern.gif"><alt>This graphic is the

-pattern icon </alt></image></entry>

-<entry>pattern</entry>

-</row>

-<row>

-<entry><image href="../images/XSDRedefine.gif"><alt>This graphic is the redefine

-icon </alt></image></entry>

-<entry>redefine</entry>

-</row>

-<row>

-<entry><image href="../images/XSDSimpleType.gif"><alt>This graphic is the

-simple type icon </alt></image></entry>

-<entry>simple type</entry>

-</row>

-</tbody>

-</tgroup>

-</table>

-</refbody>

-</reference>

-<?Pub *0000004581?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html
deleted file mode 100644
index b6cce03..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/rxsdicons.html
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="reference" name="DC.Type" />
-<meta name="DC.Title" content="Icons used in the XML schema editor" />
-<meta name="abstract" content="The following XML schema editor icons appear in the Outline, Design, and Properties view." />
-<meta name="description" content="The following XML schema editor icons appear in the Outline, Design, and Properties view." />
-<meta content="XML schema editor, icons" name="DC.subject" />
-<meta content="XML schema editor, icons" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="ricons" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>XML schema editor icons</title>
-</head>
-<body id="ricons"><a name="ricons"><!-- --></a>
-
-
-<h1 class="topictitle1">Icons used in the XML schema editor</h1>
-
-
-
-
-<div><p>The following XML schema editor icons appear in the Outline, Design,
-and Properties view.</p>
-
-<div class="section" />
-
-
-<div class="tablenoborder"><table summary="" cellspacing="0" cellpadding="4" frame="border" border="1" rules="all">
-<tbody>
-<tr>
-<td valign="bottom"><strong>Icon</strong></td>
-
-<td valign="bottom"><strong>Description</strong></td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAnyAttribute.gif" alt="This graphic is the&#10;any attribute icon " /></td>
-
-<td valign="top"><samp class="codeph">any</samp> attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAny.gif" alt="This graphic is the any element&#10;icon " /></td>
-
-<td valign="top"><samp class="codeph">any</samp> element</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttribute.gif" alt="This graphic is the attribute&#10;icon " /></td>
-
-<td valign="top">attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttributeGroup.gif" alt="This graphic is&#10;the attribute group icon " /></td>
-
-<td valign="top">attribute group</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttributeGroupRef.gif" alt="This graphic&#10;is the attribute group reference icon " /></td>
-
-<td valign="top">attribute group reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAttributeRef.gif" alt="This graphic is the&#10;attribute reference icon " /></td>
-
-<td valign="top">attribute reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDAll.gif" alt="This graphic is the content&#10;model - all icon " /></td>
-
-<td valign="top">content model - all</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDChoice.gif" alt="This&#10;graphic is the content model - choice icon " /></td>
-
-<td valign="top">content model - choice</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSequence.gif" alt="This&#10;graphic is the content model - sequence icon " /></td>
-
-<td valign="top">content model - sequence</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDComplexType.gif" alt="This graphic is the&#10;any element icon " /></td>
-
-<td valign="top">complex type</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDElement.gif" alt="This graphic is the element&#10;icon " /></td>
-
-<td valign="top">element</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDElementRef.gif" alt="This graphic is the&#10;element reference icon " /></td>
-
-<td valign="top">element reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSimpleEnum.gif" alt="This graphic is the&#10;enumeration icon " /></td>
-
-<td valign="top">enumeration</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDGlobalAttribute.gif" alt="This graphic is&#10;the global attribute icon " /></td>
-
-<td valign="top">global attribute</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/XSDGlobalElement.gif" alt="This graphic is&#10;the global element icon " /></td>
-
-<td valign="top">global element</td>
-
-</tr>
-
-<tr>
-<td valign="top"> <img src="../images/XSDGroup.gif" alt="This graphic is the group&#10;icon " /></td>
-
-<td valign="top">group</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDGroupRef.gif" alt="This graphic is the group&#10;reference icon " /></td>
-
-<td valign="top">group reference</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDImport.gif" alt="This graphic is the import&#10;icon " /></td>
-
-<td valign="top">import</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDInclude.gif" alt="This graphic is the include&#10;icon " /></td>
-
-<td valign="top">include</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSimplePattern.gif" alt="This graphic is the&#10;pattern icon " /></td>
-
-<td valign="top">pattern</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDRedefine.gif" alt="This graphic is the redefine&#10;icon " /></td>
-
-<td valign="top">redefine</td>
-
-</tr>
-
-<tr>
-<td valign="top"><img src="../images/XSDSimpleType.gif" alt="This graphic is the&#10;simple type icon " /></td>
-
-<td valign="top">simple type</td>
-
-</tr>
-
-</tbody>
-
-</table>
-</div>
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
deleted file mode 100644
index ad61517..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.dita
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddagrp" xml:lang="en-us">

-<title>Adding attribute groups</title>

-<titlealts>

-<searchtitle>Adding attribute groups</searchtitle>

-</titlealts>

-<shortdesc>An attribute group definition is an association between

-a name and a set of attribute declarations. Named groups of attribute

-declarations can greatly facilitate the maintenance and reuse of common

-attribute declarations in an XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>attribute groups</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>attribute groups</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-add an attribute group to an XML schema, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click the <uicontrol>Attributes</uicontrol> folder

-and click  <uicontrol>Add Attribute Group</uicontrol>. </cmd><info>It

-appears in the <uicontrol>Attributes</uicontrol> folder.</info></step>

-<step><cmd>Select your new group, and in the Design view, right-click

-the attribute group and select <menucascade><uicontrol>Refactor</uicontrol>

-<uicontrol>Rename</uicontrol></menucascade>. In the <uicontrol>New

-Name</uicontrol> field, type a name for the attribute group and click <uicontrol>OK</uicontrol>.</cmd>

-</step>

-<step><cmd>To add an attribute, right-click your attribute group in

-the Outline view, click <uicontrol>Add Attribute</uicontrol>. </cmd>

-<info>The attribute appears below the attribute group in the Outline

-view.</info>

-<substeps>

-<substep><cmd>Select the attribute, and in the Design view, click

-the current (default) name of the attribute, then type the new <uicontrol>Name</uicontrol>.</cmd>

-</substep>

-<substep><cmd>In the Design view, click the current (default) attribute

-type and select a type from the menu. Alternately, you can select

-browse to invoke the Set Type menu for more options. </cmd><info>The

-Set Type dialog lists all built-in and user-defined types currently

-available. You can change the <uicontrol>Scope</uicontrol> of the

-list by selecting one of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>. Lists all of the types available

-in your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>. Lists all of the types

-available in the project that contains your file. </li>

-<li><uicontrol>Current Resource</uicontrol> (default). List all of

-the types available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>. List all the types available

-within the selected working set.</li>

-</ul></info></substep>

-</substeps>

-</step>

-<step><cmd>An attribute reference provides a reference to a global

-attribute. To add an attribute reference, in the Design view, right-click

-the complex type containing the element, and click <uicontrol>Add

-Attribute Ref</uicontrol>. </cmd><info>A declaration that references

-a global attribute enables the referenced attribute to appear in the

-instance document in the context of the referencing declaration. Select

-the reference, then in the Properties view, select the attribute you

-want it to reference from the <uicontrol>Reference</uicontrol> list.<?Pub

-Caret?></info></step>

-<step><cmd>An attribute group reference provides a reference to an

-attribute group. To add an attribute group reference, in the Design

-view, right-click the complex type containing the element, and click <uicontrol>Add

-Attribute Group Ref</uicontrol>. </cmd><info>A declaration that references

-a global attribute enables the referenced attribute to appear in the

-instance document in the context of the referencing declaration. Select

-the reference, then in the Properties view, select the attribute group

-you want it to reference from the <uicontrol>Reference</uicontrol> list.</info>

-</step>

-<step><cmd>An <codeph>any</codeph> element enables element content

-according to namespaces, and the corresponding <codeph>any</codeph> attribute

-element enables attributes to appear in elements. To add an <codeph>any</codeph> attribute,

-right-click your attribute group and click <uicontrol>Add Any Attribute</uicontrol>. </cmd>

-<info>The <codeph>any</codeph> appears below the attribute group in

-the Outline view. You can specify the following values for an <codeph>any</codeph> attribute:</info>

-<choices>

-<choice>For a <uicontrol>Namespace</uicontrol> value, you can select:<ul>

-<li><b>##any</b>: this allows any well-formed XML from any namespace.</li>

-<li><b>##local </b>: this allows any well-formed XML that is not declared

-to be in a namespace.</li>

-<li><b>##other</b>: this allows any well-formed XML that is not from

-the target namespace of the type being defined.</li>

-<li><b>##targetNamespace </b>: this is shorthand for the target namespace

-of the type being defined.</li>

-</ul></choice>

-<choice>For a <uicontrol>Process Contents</uicontrol> value, you can

-select:<ul>

-<li><b>skip</b>: the XML processor will not validate the attribute

-content at all.</li>

-<li><b>lax</b>: the XML processor will validate the attribute content

-as much as it can.</li>

-<li><b>strict</b>: the XML processor will validate all the attribute

-content.</li>

-</ul></choice>

-</choices>

-</step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000005544?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
deleted file mode 100644
index 723b39a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddagrp.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding attribute groups" />
-<meta name="abstract" content="An attribute group definition is an association between a name and a set of attribute declarations. Named groups of attribute declarations can greatly facilitate the maintenance and reuse of common attribute declarations in an XML schema." />
-<meta name="description" content="An attribute group definition is an association between a name and a set of attribute declarations. Named groups of attribute declarations can greatly facilitate the maintenance and reuse of common attribute declarations in an XML schema." />
-<meta content="XML schema editor, attribute groups, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, attribute groups, XML schema files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddagrp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding attribute groups</title>
-</head>
-<body id="taddagrp"><a name="taddagrp"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding attribute groups</h1>
-
-
-
-
-<div><p>An attribute group definition is an association between
-a name and a set of attribute declarations. Named groups of attribute
-declarations can greatly facilitate the maintenance and reuse of common
-attribute declarations in an XML schema.</p>
-
-<div class="section"><p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-add an attribute group to an XML schema, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, right-click the <span class="uicontrol">Attributes</span> folder
-and click  <span class="uicontrol">Add Attribute Group</span>. </span> It
-appears in the <span class="uicontrol">Attributes</span> folder.</li>
-
-<li class="stepexpand"><span>Select your new group, and in the Design view, right-click
-the attribute group and select <span class="menucascade"><span class="uicontrol">Refactor</span>
- &gt; <span class="uicontrol">Rename</span></span>. In the <span class="uicontrol">New
-Name</span> field, type a name for the attribute group and click <span class="uicontrol">OK</span>.</span>
-</li>
-
-<li class="stepexpand"><span>To add an attribute, right-click your attribute group in
-the Outline view, click <span class="uicontrol">Add Attribute</span>. </span>
- The attribute appears below the attribute group in the Outline
-view.
-<ol type="a">
-<li class="substepexpand"><span>Select the attribute, and in the Design view, click
-the current (default) name of the attribute, then type the new <span class="uicontrol">Name</span>.</span>
-</li>
-
-<li class="substepexpand"><span>In the Design view, click the current (default) attribute
-type and select a type from the menu. Alternately, you can select
-browse to invoke the Set Type menu for more options. </span> The
-Set Type dialog lists all built-in and user-defined types currently
-available. You can change the <span class="uicontrol">Scope</span> of the
-list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>. Lists all of the types available
-in your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>. Lists all of the types
-available in the project that contains your file. </li>
-
-<li><span class="uicontrol">Current Resource</span> (default). List all of
-the types available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>. List all the types available
-within the selected working set.</li>
-
-</ul>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>An attribute reference provides a reference to a global
-attribute. To add an attribute reference, in the Design view, right-click
-the complex type containing the element, and click <span class="uicontrol">Add
-Attribute Ref</span>. </span> A declaration that references
-a global attribute enables the referenced attribute to appear in the
-instance document in the context of the referencing declaration. Select
-the reference, then in the Properties view, select the attribute you
-want it to reference from the <span class="uicontrol">Reference</span> list.</li>
-
-<li class="stepexpand"><span>An attribute group reference provides a reference to an
-attribute group. To add an attribute group reference, in the Design
-view, right-click the complex type containing the element, and click <span class="uicontrol">Add
-Attribute Group Ref</span>. </span> A declaration that references
-a global attribute enables the referenced attribute to appear in the
-instance document in the context of the referencing declaration. Select
-the reference, then in the Properties view, select the attribute group
-you want it to reference from the <span class="uicontrol">Reference</span> list.
-</li>
-
-<li class="stepexpand"><span>An <samp class="codeph">any</samp> element enables element content
-according to namespaces, and the corresponding <samp class="codeph">any</samp> attribute
-element enables attributes to appear in elements. To add an <samp class="codeph">any</samp> attribute,
-right-click your attribute group and click <span class="uicontrol">Add Any Attribute</span>. </span>
- The <samp class="codeph">any</samp> appears below the attribute group in
-the Outline view. You can specify the following values for an <samp class="codeph">any</samp> attribute:
-<ul>
-<li>For a <span class="uicontrol">Namespace</span> value, you can select:<ul>
-<li><strong>##any</strong>: this allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>: this allows any well-formed XML that is not declared
-to be in a namespace.</li>
-
-<li><strong>##other</strong>: this allows any well-formed XML that is not from
-the target namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace </strong>: this is shorthand for the target namespace
-of the type being defined.</li>
-
-</ul>
-</li>
-
-<li>For a <span class="uicontrol">Process Contents</span> value, you can
-select:<ul>
-<li><strong>skip</strong>: the XML processor will not validate the attribute
-content at all.</li>
-
-<li><strong>lax</strong>: the XML processor will validate the attribute content
-as much as it can.</li>
-
-<li><strong>strict</strong>: the XML processor will validate all the attribute
-content.</li>
-
-</ul>
-</li>
-
-</ul>
-
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
deleted file mode 100644
index c18c7cd..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.dita
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddanye" xml:lang="en-us">

-<title>Adding an any element</title>

-<titlealts>

-<searchtitle>Adding an any element</searchtitle>

-</titlealts>

-<shortdesc>You can use the <codeph>any</codeph> element in a similar

-way as a DTD's ANY content model, however, it must be done in conjunction

-with namespaces. This enables you to include any well-formed XML content,

-such as an HTML Web page that conforms to XHTML 1.0 syntax.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>adding an any element</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>adding an any element</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>For example:</p><p><codeblock>&lt;element name = "MyWebPage">

-&lt;complexType>

-&lt;any namespace="http://www.w3.org/1999/xhtml"

-   minOccurs="1" maxOccurs="unbounded" processContents="skip"/>

-&lt;/complexType>

-&lt;/element></codeblock></p><p>The preceding schema fragment allows

-a <codeph>&lt;MyWebPage></codeph> element to contain any well-formed

-XHTML data that appears in the specified namespace.</p><p>The following

-instructions were written for the Resource perspective, but they will

-also work in many other perspectives.</p><p>To add an <codeph>any</codeph> element,

-complete the following steps:</p></context>

-<steps>

-<step><cmd>In the Outline view, right-click the content model that

-you want to work with and click <uicontrol>Add Any</uicontrol>. </cmd>

-</step>

-<step><cmd>Select the new <codeph>any</codeph> element.</cmd></step>

-<step><cmd>In the Properties view, for a <uicontrol>Namespace</uicontrol> value,

-you can select:</cmd>

-<choices>

-<choice><b>##any</b>: this allows any well-formed XML from any namespace.</choice>

-<choice><b>##local </b>: this allows any well-formed XML that is not

-declared to be in a namespace.</choice>

-<choice><b>##other </b>: this allows any well-formed XML that is not

-from the target namespace of the type being defined.</choice>

-<choice><b>##targetNamespace</b>: this is shorthand for the target

-namespace of the type being defined.</choice>

-</choices>

-</step>

-<step><cmd>For a <uicontrol>Process Contents</uicontrol> value, you

-can select:</cmd>

-<choices>

-<choice><b>skip</b>: the XML processor will not validate the content

-at all.</choice>

-<choice><b>lax</b>: the XML processor will validate the content as

-much as it can.</choice>

-<choice><b>strict</b>: the XML processor will validate all the content.</choice>

-</choices>

-</step>

-<step><cmd>The <uicontrol>Minimum Occurrence</uicontrol> value is

-the number of times the <codeph>any</codeph> element must appear in

-an instance document. You can select <uicontrol>0</uicontrol> if you

-want the element to be optional; otherwise, select <uicontrol>1</uicontrol>. </cmd>

-</step>

-<step><cmd>The <uicontrol>Maximum Occurrence</uicontrol> value is

-the maximum number of times an <codeph>any</codeph> element can appear

-in an instance document. You can select <uicontrol>0</uicontrol>, <uicontrol>1</uicontrol>,

-or, to indicate there is no maximum number of occurrences, <uicontrol>unbounded</uicontrol>.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you

-want to provide any information about this element. <?Pub Caret?></cmd>

-<info>The <uicontrol>Documentation</uicontrol> page is used for human

-readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. </cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</step>

-</steps>

-<postreq><draft-comment>(c) Copyright 2001, World Wide Web (Massachusetts

-Institute of Technology, Institut National de Recherche en Informatique

-et en Automatique, Keio University).</draft-comment></postreq>

-</taskbody>

-</task>

-<?Pub *0000004086?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
deleted file mode 100644
index 625b7a5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddanye.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding an any element" />
-<meta name="abstract" content="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax." />
-<meta name="description" content="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax." />
-<meta content="XML schema editor, adding an any element, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding an any element, XML schema files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddanye" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding an any element</title>
-</head>
-<body id="taddanye"><a name="taddanye"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding an any element</h1>
-
-
-
-
-<div><p>You can use the <samp class="codeph">any</samp> element in a similar
-way as a DTD's ANY content model, however, it must be done in conjunction
-with namespaces. This enables you to include any well-formed XML content,
-such as an HTML Web page that conforms to XHTML 1.0 syntax.</p>
-
-<div class="section"><p>For example:</p>
-<div class="p"><pre>&lt;element name = "MyWebPage"&gt;
-&lt;complexType&gt;
-&lt;any namespace="http://www.w3.org/1999/xhtml"
-   minOccurs="1" maxOccurs="unbounded" processContents="skip"/&gt;
-&lt;/complexType&gt;
-&lt;/element&gt;</pre>
-</div>
-<p>The preceding schema fragment allows
-a <samp class="codeph">&lt;MyWebPage&gt;</samp> element to contain any well-formed
-XHTML data that appears in the specified namespace.</p>
-<p>The following
-instructions were written for the Resource perspective, but they will
-also work in many other perspectives.</p>
-<p>To add an <samp class="codeph">any</samp> element,
-complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Outline view, right-click the content model that
-you want to work with and click <span class="uicontrol">Add Any</span>. </span>
-</li>
-
-<li class="stepexpand"><span>Select the new <samp class="codeph">any</samp> element.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, for a <span class="uicontrol">Namespace</span> value,
-you can select:</span>
-<ul>
-<li><strong>##any</strong>: this allows any well-formed XML from any namespace.</li>
-
-<li><strong>##local </strong>: this allows any well-formed XML that is not
-declared to be in a namespace.</li>
-
-<li><strong>##other </strong>: this allows any well-formed XML that is not
-from the target namespace of the type being defined.</li>
-
-<li><strong>##targetNamespace</strong>: this is shorthand for the target
-namespace of the type being defined.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>For a <span class="uicontrol">Process Contents</span> value, you
-can select:</span>
-<ul>
-<li><strong>skip</strong>: the XML processor will not validate the content
-at all.</li>
-
-<li><strong>lax</strong>: the XML processor will validate the content as
-much as it can.</li>
-
-<li><strong>strict</strong>: the XML processor will validate all the content.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Minimum Occurrence</span> value is
-the number of times the <samp class="codeph">any</samp> element must appear in
-an instance document. You can select <span class="uicontrol">0</span> if you
-want the element to be optional; otherwise, select <span class="uicontrol">1</span>. </span>
-</li>
-
-<li class="stepexpand"><span>The <span class="uicontrol">Maximum Occurrence</span> value is
-the maximum number of times an <samp class="codeph">any</samp> element can appear
-in an instance document. You can select <span class="uicontrol">0</span>, <span class="uicontrol">1</span>,
-or, to indicate there is no maximum number of occurrences, <span class="uicontrol">unbounded</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you
-want to provide any information about this element. </span>
- The <span class="uicontrol">Documentation</span> page is used for human
-readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
deleted file mode 100644
index 7f69dda..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.dita
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddcmod" xml:lang="en-us">

-<title>Adding content models</title>

-<titlealts>

-<searchtitle>Adding content models</searchtitle>

-</titlealts>

-<shortdesc>A content model is the representation of any data that can be contained

-inside an element, global element, complex type, or group. It is a formal

-description of the structure and permissible content of an element, global

-element, complex type, or group, which may be used to validate a document

-instance.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>content models</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>content models</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>There are three different kinds of content models:<ul>

-<li><b>Sequence</b>, which means that all the content model's children can

-appear in an instance of the XML schema. They must, however, appear in the

-order they are listed in the content model.</li>

-<li><b>Choice</b>, which means that only one of the content model's children

-can appear in an instance of the XML schema.</li>

-<li><b>All</b>, which means that all of the content model's children can appear

-once or not at all, and they can appear in any order. If you select this option,

-all of the contents model's children must be individual elements and no element

-in the content model can appear more than once.</li>

-</ul></p><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add a content

-model to an element, global element, complex type, or group, complete the

-following steps:</p></context>

-<steps>

-<step><cmd>In the Design view, select your complex type, or group:</cmd>

-<choices>

-<choice>If you selected a complex type, you can right-click it and click <uicontrol>Add

-Sequence</uicontrol>, or <uicontrol>Add Choice</uicontrol> to add the type

-of content model you want to your complex type. If you wish to use the <uicontrol>all</uicontrol> content

-model, you can change the model by clicking the model in the Design view,

-and in properties, select <uicontrol>all</uicontrol> as the <uicontrol>Kind</uicontrol>.

-Your content model is automatically added as a child of your complex type

-- expand in the Outline view to see it. <b>Note:</b> These options will not

-appear if you have set a base type for your complex type. You can either set

-a base type for your complex type, or you add a content model to it, but you

-cannot do both.</choice>

-<choice>Your group is automatically created with a sequence content model

-child. Expand it in the Outline view to see it and select it. In the Properties

-view, you can select to change it to a <uicontrol>choice</uicontrol> or <uicontrol>all</uicontrol> content

-model by selecting these options from the <uicontrol>Kind</uicontrol> drop-down.</choice>

-</choices>

-</step>

-<step importance="optional"><cmd>Select the appropriate value in the <uicontrol>Minimum

-Occurr<?Pub Caret?>ence</uicontrol> field.</cmd><info>This is the minimum

-number of times the content model must appear. If you want the content model

-to be optional, select <uicontrol>0</uicontrol>. Otherwise, select <uicontrol>1</uicontrol>. </info>

-</step>

-<step importance="optional"><cmd>Select the appropriate value in the <uicontrol>Maximum

-Occurrence</uicontrol> field.</cmd><info>This is the maximum number of times

-a content model can appear. You can select <uicontrol>unbounded</uicontrol> to

-indicate there is no maximum number of occurrences.</info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this content model.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-<postreq><p>You can add the following items to a content object model: </p><ul>

-<li>Another content model.</li>

-<li>A group reference which enables the referenced group to appear in the

-instance document in the context of the referencing declaration. This menu

-option only appears if there are global groups defined elsewhere in the document

-or if groups are defined in included schemas.</li>

-<li>An element, fundamental building blocks in XML.</li>

-<li>An element reference, which provides a reference to a global element.

-This menu option only appears if there are global elements defined elsewhere

-in the document.</li>

-<li>An <codeph>any</codeph> element. You can use an <codeph>any</codeph> element

-to extend your content model by any elements belonging to a specified namespace.</li>

-</ul></postreq>

-</taskbody>

-</task>

-<?Pub *0000005101?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
deleted file mode 100644
index 06915be..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmod.html
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding content models" />
-<meta name="abstract" content="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance." />
-<meta name="description" content="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance." />
-<meta content="XML schema editor, content models, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, content models, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddgrpr.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddcmod" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding content models</title>
-</head>
-<body id="taddcmod"><a name="taddcmod"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding content models</h1>
-
-
-
-
-<div><p>A content model is the representation of any data that can be contained
-inside an element, global element, complex type, or group. It is a formal
-description of the structure and permissible content of an element, global
-element, complex type, or group, which may be used to validate a document
-instance.</p>
-
-<div class="section"><div class="p">There are three different kinds of content models:<ul>
-<li><strong>Sequence</strong>, which means that all the content model's children can
-appear in an instance of the XML schema. They must, however, appear in the
-order they are listed in the content model.</li>
-
-<li><strong>Choice</strong>, which means that only one of the content model's children
-can appear in an instance of the XML schema.</li>
-
-<li><strong>All</strong>, which means that all of the content model's children can appear
-once or not at all, and they can appear in any order. If you select this option,
-all of the contents model's children must be individual elements and no element
-in the content model can appear more than once.</li>
-
-</ul>
-</div>
-<p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add a content
-model to an element, global element, complex type, or group, complete the
-following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, select your complex type, or group:</span>
-<ul>
-<li>If you selected a complex type, you can right-click it and click <span class="uicontrol">Add
-Sequence</span>, or <span class="uicontrol">Add Choice</span> to add the type
-of content model you want to your complex type. If you wish to use the <span class="uicontrol">all</span> content
-model, you can change the model by clicking the model in the Design view,
-and in properties, select <span class="uicontrol">all</span> as the <span class="uicontrol">Kind</span>.
-Your content model is automatically added as a child of your complex type
-- expand in the Outline view to see it. <strong>Note:</strong> These options will not
-appear if you have set a base type for your complex type. You can either set
-a base type for your complex type, or you add a content model to it, but you
-cannot do both.</li>
-
-<li>Your group is automatically created with a sequence content model
-child. Expand it in the Outline view to see it and select it. In the Properties
-view, you can select to change it to a <span class="uicontrol">choice</span> or <span class="uicontrol">all</span> content
-model by selecting these options from the <span class="uicontrol">Kind</span> drop-down.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the appropriate value in the <span class="uicontrol">Minimum
-Occurrence</span> field.</span> This is the minimum
-number of times the content model must appear. If you want the content model
-to be optional, select <span class="uicontrol">0</span>. Otherwise, select <span class="uicontrol">1</span>. 
-</li>
-
-<li class="stepexpand"><strong>Optional: </strong><span>Select the appropriate value in the <span class="uicontrol">Maximum
-Occurrence</span> field.</span> This is the maximum number of times
-a content model can appear. You can select <span class="uicontrol">unbounded</span> to
-indicate there is no maximum number of occurrences.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this content model.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-<div class="section"><p>You can add the following items to a content object model: </p>
-<ul>
-<li>Another content model.</li>
-
-<li>A group reference which enables the referenced group to appear in the
-instance document in the context of the referencing declaration. This menu
-option only appears if there are global groups defined elsewhere in the document
-or if groups are defined in included schemas.</li>
-
-<li>An element, fundamental building blocks in XML.</li>
-
-<li>An element reference, which provides a reference to a global element.
-This menu option only appears if there are global elements defined elsewhere
-in the document.</li>
-
-<li>An <samp class="codeph">any</samp> element. You can use an <samp class="codeph">any</samp> element
-to extend your content model by any elements belonging to a specified namespace.</li>
-
-</ul>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddanye.html" title="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax.">Adding an any element</a></div>
-<div><a href="../topics/taddelm.html" title="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements.">Adding elements</a></div>
-<div><a href="../topics/taddelmr.html" title="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration.">Adding element references</a></div>
-<div><a href="../topics/taddgrpr.html" title="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration.">Adding group references</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
deleted file mode 100644
index b8bd7eb..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.dita
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Sty _display FontColor="red"?>

-<?Pub Inc?>

-<task id="taddcmxt" xml:lang="en-us">

-<title>Adding complex types</title>

-<titlealts>

-<searchtitle>Adding complex types</searchtitle>

-</titlealts>

-<shortdesc>A complex type allows elements in its content and can carry

-attributes. Complex types can be used to help determine the appropriate

-content for any instance documents generated from or associated with

-your XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>complex types</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>complex types</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can add as many complex types as you want to an XML

-schema.</p><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-add a complex type to an XML schema, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>Right-click the Types category in the Design view, click <uicontrol>Add

-Complex Type</uicontrol> and type the name for the complex type. If

-you need to change the name later, you can edit it in the <uicontrol>General</uicontrol> tab

-of the Properties view.</cmd></step>

-<step><cmd>To set a base type for the complex type, right-click the

-type in the Design view and click <uicontrol>Set Base Type</uicontrol>. </cmd>

-<info>You can either set a base type for your complex type, or you

-can add a content model to it (which represents any data that can

-be contained inside an element), but you cannot do both. For more

-information about content models, see <xref href="taddcmod.dita"

-scope="peer">Adding content models</xref>.</info></step>

-<step><cmd>Your new type can be derived from its base type either

-by extension or restriction. By default, the derivation is set to

-extension. To change how the type is derived, click the <uicontrol>General</uicontrol> tab

-in the Properties view and select <uicontrol>restriction</uicontrol> or <uicontrol>extension</uicontrol> from

-the <uicontrol>Inherited By</uicontrol> list. </cmd></step>

-<step><cmd>To add attributes to your complex type, in the Design view,

-right-click your complex type and select <uicontrol>Add Attribute</uicontrol>. </cmd>

-<info>An attribute associates an attribute name with a specific type

-and value. </info><?Pub Caret1?>

-<substeps>

-<substep><cmd>To set the name of the attribute, in the Design view,

-double-click the name of the attribute and type the name.</cmd>

-</substep>

-<substep><cmd>To set the type of the attribute, in the Design view,

-double-click the attribute type and then select the new type from

-the list.</cmd></substep>

-</substeps>

-<info>For information about adding attributes, attribute references,

-and <userinput>any</userinput> attributes, see <xref href="taddagrp.dita"

-scope="peer">Adding attribute groups</xref>.</info></step>

-<step><cmd>You can further define your complex type in the Properties

-view:</cmd>

-<substeps>

-<substep><cmd>Click the <uicontrol>Documentation</uicontrol> tab if

-you want to provide any information about this complex type. </cmd>

-<info>The <uicontrol>Documentation</uicontrol> page is used for human

-readable material, such as a description.</info></substep>

-<substep><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. </cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</substep>

-</substeps>

-</step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000003841?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
deleted file mode 100644
index 78ee6f3..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddcmxt.html
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding complex types" />
-<meta name="abstract" content="A complex type allows elements in its content and can carry attributes. Complex types can be used to help determine the appropriate content for any instance documents generated from or associated with your XML schema." />
-<meta name="description" content="A complex type allows elements in its content and can carry attributes. Complex types can be used to help determine the appropriate content for any instance documents generated from or associated with your XML schema." />
-<meta content="XML schema editor, complex types, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, complex types, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddcmxt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding complex types</title>
-</head>
-<body id="taddcmxt"><a name="taddcmxt"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding complex types</h1>
-
-
-
-
-<div><p>A complex type allows elements in its content and can carry
-attributes. Complex types can be used to help determine the appropriate
-content for any instance documents generated from or associated with
-your XML schema.</p>
-
-<div class="section"><p>You can add as many complex types as you want to an XML
-schema.</p>
-<p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-add a complex type to an XML schema, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>Right-click the Types category in the Design view, click <span class="uicontrol">Add
-Complex Type</span> and type the name for the complex type. If
-you need to change the name later, you can edit it in the <span class="uicontrol">General</span> tab
-of the Properties view.</span></li>
-
-<li class="stepexpand"><span>To set a base type for the complex type, right-click the
-type in the Design view and click <span class="uicontrol">Set Base Type</span>. </span>
- You can either set a base type for your complex type, or you
-can add a content model to it (which represents any data that can
-be contained inside an element), but you cannot do both. For more
-information about content models, see <a href="taddcmod.html">Adding content models</a>.</li>
-
-<li class="stepexpand"><span>Your new type can be derived from its base type either
-by extension or restriction. By default, the derivation is set to
-extension. To change how the type is derived, click the <span class="uicontrol">General</span> tab
-in the Properties view and select <span class="uicontrol">restriction</span> or <span class="uicontrol">extension</span> from
-the <span class="uicontrol">Inherited By</span> list. </span></li>
-
-<li class="stepexpand"><span>To add attributes to your complex type, in the Design view,
-right-click your complex type and select <span class="uicontrol">Add Attribute</span>. </span>
- An attribute associates an attribute name with a specific type
-and value. 
-<ol type="a">
-<li><span>To set the name of the attribute, in the Design view,
-double-click the name of the attribute and type the name.</span>
-</li>
-
-<li><span>To set the type of the attribute, in the Design view,
-double-click the attribute type and then select the new type from
-the list.</span></li>
-
-</ol>
-
- For information about adding attributes, attribute references,
-and <kbd class="userinput">any</kbd> attributes, see <a href="taddagrp.html">Adding attribute groups</a>.</li>
-
-<li class="stepexpand"><span>You can further define your complex type in the Properties
-view:</span>
-<ol type="a">
-<li class="substepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if
-you want to provide any information about this complex type. </span>
- The <span class="uicontrol">Documentation</span> page is used for human
-readable material, such as a description.</li>
-
-<li class="substepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-</ol>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
deleted file mode 100644
index 8b19bf5..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.dita
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddelm" xml:lang="en-us">

-<title>Adding elements</title>

-<titlealts>

-<searchtitle>Adding elements</searchtitle>

-</titlealts>

-<shortdesc>Elements are fundamental building blocks in XML. Element

-declarations provide value constraints, provide a description that

-can be used for validation, establish constraining relationships between

-related elements and attributes, and control the substitution of elements.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-add an element, complete the following steps:</p></context>

-<steps>

-<step><cmd>To add an element, in the Design view, right-click the

-content model (sequence, choice, or all element) you want to work

-with and click <uicontrol>Add Element</uicontrol>.</cmd><info>The

-element appears attached to the content model in the Design view.</info>

-<substeps>

-<substep><cmd>In the Design view, select the element, and click the

-current (default) name of the element, which puts you in direct editing

-mode, then type the new <uicontrol>Name</uicontrol> and press enter.</cmd>

-</substep>

-<substep><cmd>In the Design view, click the current (default) element

-type and select a type from the menu. Alternately, you can select

-browse to invoke the Set Type dialog for more options.</cmd><info>The

-Set Type dialog lists all built-in and user-defined types currently

-available. You can change the <uicontrol>Scope</uicontrol> of the

-list by selecting one of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>: lists all of the types available

-in your workspace.</li>

-<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types

-available in the project that contains your file.</li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>: list all of

-the types available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>: list all the types available

-within the selected working set.</li>

-</ul></info></substep>

-</substeps>

-</step>

-<step><cmd>(Optional) In the Properties view, select the appropriate

-value in the <uicontrol>Minimum Occurrence</uicontrol> field. </cmd>

-<info>This is the number of times the element can appear in an instance

-document. If you want the element to be optional, select <uicontrol>0</uicontrol>.

-Otherwise, select <uicontrol>1</uicontrol>. </info></step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>Maximum

-Occurrence</uicontrol> field. </cmd><info>This is the maximum number

-of times the element can appear in an instance document. Select <uicontrol>unbounded</uicontrol> to

-indicate there is no maximum number of occurrences.</info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you

-want to provide any information about this element. </cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info>

-</step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. <?Pub Caret?></cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</step>

-</steps>

-<postreq>You can add a content model to an element, which is the representation

-of any data that can be contained inside the element. For more information

-about working with content models, refer to the related tasks.</postreq>

-</taskbody>

-</task>

-<?Pub *0000003893?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
deleted file mode 100644
index 4b15f37..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelm.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding elements" />
-<meta name="abstract" content="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements." />
-<meta name="description" content="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements." />
-<meta content="XML schema editor, elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddglba.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddelm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding elements</title>
-</head>
-<body id="taddelm"><a name="taddelm"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding elements</h1>
-
-
-
-
-<div><p>Elements are fundamental building blocks in XML. Element
-declarations provide value constraints, provide a description that
-can be used for validation, establish constraining relationships between
-related elements and attributes, and control the substitution of elements.</p>
-
-<div class="section"><p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-add an element, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>To add an element, in the Design view, right-click the
-content model (sequence, choice, or all element) you want to work
-with and click <span class="uicontrol">Add Element</span>.</span> The
-element appears attached to the content model in the Design view.
-<ol type="a">
-<li class="substepexpand"><span>In the Design view, select the element, and click the
-current (default) name of the element, which puts you in direct editing
-mode, then type the new <span class="uicontrol">Name</span> and press enter.</span>
-</li>
-
-<li class="substepexpand"><span>In the Design view, click the current (default) element
-type and select a type from the menu. Alternately, you can select
-browse to invoke the Set Type dialog for more options.</span> The
-Set Type dialog lists all built-in and user-defined types currently
-available. You can change the <span class="uicontrol">Scope</span> of the
-list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>: lists all of the types available
-in your workspace.</li>
-
-<li><span class="uicontrol">Enclosing Project</span>: lists all of the types
-available in the project that contains your file.</li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>: list all of
-the types available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>: list all the types available
-within the selected working set.</li>
-
-</ul>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>(Optional) In the Properties view, select the appropriate
-value in the <span class="uicontrol">Minimum Occurrence</span> field. </span>
- This is the number of times the element can appear in an instance
-document. If you want the element to be optional, select <span class="uicontrol">0</span>.
-Otherwise, select <span class="uicontrol">1</span>. </li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">Maximum
-Occurrence</span> field. </span> This is the maximum number
-of times the element can appear in an instance document. Select <span class="uicontrol">unbounded</span> to
-indicate there is no maximum number of occurrences.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you
-want to provide any information about this element. </span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-</ol>
-
-<div class="section">You can add a content model to an element, which is the representation
-of any data that can be contained inside the element. For more information
-about working with content models, refer to the related tasks.</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-<div><a href="../topics/taddelmr.html" title="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration.">Adding element references</a></div>
-<div><a href="../topics/taddanye.html" title="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax.">Adding an any element</a></div>
-<div><a href="../topics/taddglba.html" title="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference.">Adding global attributes</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
deleted file mode 100644
index 21c66d3..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.dita
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddelmr" xml:lang="en-us">

-<title>Adding element references</title>

-<titlealts>

-<searchtitle>Adding element references</searchtitle>

-</titlealts>

-<shortdesc>An element reference provides a reference to a global element.

-A declaration that references a global element enables the referenced global

-element to appear in the instance document in the context of the referencing

-declaration.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>element references</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>element references</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add an element

-reference, complete the following steps:</p></context>

-<steps>

-<step><cmd>In the Design view, right-click the content model (sequence, choice,

-or all element) you want to work with and click <uicontrol>Add Element Ref</uicontrol>.</cmd>

-<stepresult>If no global element is defined in the document, a new global

-element is created for you, and the element reference will point to it.</stepresult>

-</step>

-<step><cmd>Select the element reference. To specify values for an element

-reference:</cmd>

-<choices>

-<choice>Click the name of the element reference in the Design view. Enter

-the name of the element reference.</choice>

-<choice>Click the element reference type in the Design view. Select a type

-from the menu, or select <uicontrol>Browse</uicontrol> for more options.</choice>

-</choices>

-</step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>Minimum

-Occurrence</uicontrol> field.</cmd><info>This is the number of times the global

-element referenced can appear in an instance document. If you want the element

-to be optional, select <uicontrol>0</uicontrol>. Otherwise, select <uicontrol>1</uicontrol>. </info>

-</step>

-<step><cmd>(Optional) Select the appropriate value in the <uicontrol>Maximum

-Occurrence<?Pub Caret?></uicontrol> field.</cmd><info>This is the maximum

-number of times the global element referenced can appear. You can select <uicontrol>unbounded</uicontrol> to

-indicate there is no maximum number of occurrences.</info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this element reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000003039?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
deleted file mode 100644
index a85ec38..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddelmr.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding element references" />
-<meta name="abstract" content="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration." />
-<meta name="description" content="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration." />
-<meta content="XML schema editor, element references, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, element references, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddglem.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddanye.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddglba.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddelmr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding element references</title>
-</head>
-<body id="taddelmr"><a name="taddelmr"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding element references</h1>
-
-
-
-
-<div><p>An element reference provides a reference to a global element.
-A declaration that references a global element enables the referenced global
-element to appear in the instance document in the context of the referencing
-declaration.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add an element
-reference, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click the content model (sequence, choice,
-or all element) you want to work with and click <span class="uicontrol">Add Element Ref</span>.</span>
- If no global element is defined in the document, a new global
-element is created for you, and the element reference will point to it.
-</li>
-
-<li class="stepexpand"><span>Select the element reference. To specify values for an element
-reference:</span>
-<ul>
-<li>Click the name of the element reference in the Design view. Enter
-the name of the element reference.</li>
-
-<li>Click the element reference type in the Design view. Select a type
-from the menu, or select <span class="uicontrol">Browse</span> for more options.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">Minimum
-Occurrence</span> field.</span> This is the number of times the global
-element referenced can appear in an instance document. If you want the element
-to be optional, select <span class="uicontrol">0</span>. Otherwise, select <span class="uicontrol">1</span>. 
-</li>
-
-<li class="stepexpand"><span>(Optional) Select the appropriate value in the <span class="uicontrol">Maximum
-Occurrence</span> field.</span> This is the maximum
-number of times the global element referenced can appear. You can select <span class="uicontrol">unbounded</span> to
-indicate there is no maximum number of occurrences.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this element reference.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddglem.html" title="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model.">Adding global elements</a></div>
-<div><a href="../topics/taddelm.html" title="Elements are fundamental building blocks in XML. Element declarations provide value constraints, provide a description that can be used for validation, establish constraining relationships between related elements and attributes, and control the substitution of elements.">Adding elements</a></div>
-<div><a href="../topics/taddanye.html" title="You can use the any element in a similar way as a DTD's ANY content model, however, it must be done in conjunction with namespaces. This enables you to include any well-formed XML content, such as an HTML Web page that conforms to XHTML 1.0 syntax.">Adding an any element</a></div>
-<div><a href="../topics/taddglba.html" title="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference.">Adding global attributes</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
deleted file mode 100644
index e3ad077..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.dita
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddglba" xml:lang="en-us">

-<title>Adding global attributes</title>

-<titlealts>

-<searchtitle>Adding global attributes</searchtitle>

-</titlealts>

-<shortdesc>A global attribute is an attribute that can be recognized anywhere

-in a document. Once declared, a global attribute can be referenced in one

-or more declarations using an attribute reference.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>global attributes</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>global attributes</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add a global

-attribute, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Design view, right-click in the <b>Attributes</b> section

-and click <uicontrol>Add Attribute</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, enter a name for the attribute in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>In the Properties view, you can select the attribute <uicontrol>Type</uicontrol> from

-the predefined list in the menu next to the <uicontrol>Type</uicontrol> field.</cmd>

-<info><p>Alternatively, you can select <uicontrol>Browse</uicontrol> from

-the list for more options. </p><p>The Set Type dialog will appear, and lists

-all built-in and user-defined types currently available. You can change the <uicontrol>Scope</uicontrol> of

-the list by selecting one of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>: lists all of the types available in

-your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types available

-in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>: list all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>: l<?Pub Caret?>ist all the types available

-within the selected working set.</li>

-</ul></p><p>Select the type you want in the type list, then click <uicontrol>OK</uicontrol>. </p></info>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this global attribute.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002983?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
deleted file mode 100644
index f7b145b..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglba.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding global attributes" />
-<meta name="abstract" content="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference." />
-<meta name="description" content="A global attribute is an attribute that can be recognized anywhere in a document. Once declared, a global attribute can be referenced in one or more declarations using an attribute reference." />
-<meta content="XML schema editor, global attributes, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, global attributes, XML schema files" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddglba" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding global attributes</title>
-</head>
-<body id="taddglba"><a name="taddglba"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding global attributes</h1>
-
-
-
-
-<div><p>A global attribute is an attribute that can be recognized anywhere
-in a document. Once declared, a global attribute can be referenced in one
-or more declarations using an attribute reference.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add a global
-attribute, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Design view, right-click in the <strong>Attributes</strong> section
-and click <span class="uicontrol">Add Attribute</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, enter a name for the attribute in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, you can select the attribute <span class="uicontrol">Type</span> from
-the predefined list in the menu next to the <span class="uicontrol">Type</span> field.</span>
- <p>Alternatively, you can select <span class="uicontrol">Browse</span> from
-the list for more options. </p>
-<div class="p">The Set Type dialog will appear, and lists
-all built-in and user-defined types currently available. You can change the <span class="uicontrol">Scope</span> of
-the list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>: lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>: lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>: list all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>: list all the types available
-within the selected working set.</li>
-
-</ul>
-</div>
-<p>Select the type you want in the type list, then click <span class="uicontrol">OK</span>. </p>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this global attribute.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
deleted file mode 100644
index 90abd00..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.dita
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddglem" xml:lang="en-us">

-<title>Adding global elements</title>

-<titlealts>

-<searchtitle>Adding global elements</searchtitle>

-</titlealts>

-<shortdesc>A global element is an element with a global scope. It is one that

-has been declared as part of the main schema rather than as part of a content

-model.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>global elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>global elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add a global

-element, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, select your schema.</cmd><info>The entire

-schema and its contents are displayed in the Design view.</info></step>

-<step><cmd>In the Design view, right-click in the <b>Elements</b> section

-and click <uicontrol>Add Element</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab,

-and type a new name for the global element in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>In the Properties view, you can select the attribute type from

-the predefined list in the menu next to the <uicontrol>Type</uicontrol> field.</cmd>

-<info><p>Alternatively, you can select <uicontrol>Browse</uicontrol> from

-the list for more options. </p><p>The <uicontrol>Set Type</uicontrol> dialog

-box appears, and lists all built-in and user-defined types currently available.

-You can change the <uicontrol>Scope</uicontrol> of the list by selecting one

-of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>: lists all of the types available in

-your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types available

-in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>: list all of the types

-available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>: list all the types available within

-the selected working set.</li>

-</ul></p><p>Select the type you want in the type list, then click <uicontrol>OK</uicontrol>. </p></info>

-</step>

-<step><cmd>Click the <uicontrol>Advanced</uicontrol> tab.</cmd><info>In this

-page, you can specify the following various values for the global element: </info>

-<choices>

-<choice><uicontrol>Abstract</uicontrol>: click <b>true</b> if you want the

-global element to be abstract. When a global element is declared to be abstract,

-it cannot be used in an instance document. Instead, a member of that global

-element's substitution group must appear in the instance document.</choice>

-<choice><uicontrol>Block</uicontrol>: determines whether the global element

-may be replaced by an element derived from it.</choice>

-<choice><uicontrol>Final</uicontrol>: determines whether this global element

-may be derived from.</choice>

-<choice><uicontrol>Substitution Group</uicontrol>: a substitution group allows

-elements to be substituted for other elements.</choice>

-<choice><uicontrol>Nillable</uicontrol>: select <b>true</b> if you do not

-want the global element to be able to have any child elements, only attributes. </choice>

-</choices>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab to provide any

-information about this global element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab to add application

-information elements to your annotations of schema components.</cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</step><?Pub Caret?>

-</steps>

-<postreq>You can add a content model to a global element, which is the representation

-of any data that can be contained inside the global element. For more information

-about working with content models, refer to the related tasks.</postreq>

-</taskbody>

-</task>

-<?Pub *0000004383?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
deleted file mode 100644
index 2ba1df3..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddglem.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding global elements" />
-<meta name="abstract" content="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model." />
-<meta name="description" content="A global element is an element with a global scope. It is one that has been declared as part of the main schema rather than as part of a content model." />
-<meta content="XML schema editor, global elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, global elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddelmr.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddglem" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding global elements</title>
-</head>
-<body id="taddglem"><a name="taddglem"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding global elements</h1>
-
-
-
-
-<div><p>A global element is an element with a global scope. It is one that
-has been declared as part of the main schema rather than as part of a content
-model.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add a global
-element, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select your schema.</span> The entire
-schema and its contents are displayed in the Design view.</li>
-
-<li class="stepexpand"><span>In the Design view, right-click in the <strong>Elements</strong> section
-and click <span class="uicontrol">Add Element</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">General</span> tab,
-and type a new name for the global element in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, you can select the attribute type from
-the predefined list in the menu next to the <span class="uicontrol">Type</span> field.</span>
- <p>Alternatively, you can select <span class="uicontrol">Browse</span> from
-the list for more options. </p>
-<div class="p">The <span class="uicontrol">Set Type</span> dialog
-box appears, and lists all built-in and user-defined types currently available.
-You can change the <span class="uicontrol">Scope</span> of the list by selecting one
-of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>: lists all of the types available in
-your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>: lists all of the types available
-in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>: list all of the types
-available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>: list all the types available within
-the selected working set.</li>
-
-</ul>
-</div>
-<p>Select the type you want in the type list, then click <span class="uicontrol">OK</span>. </p>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Advanced</span> tab.</span> In this
-page, you can specify the following various values for the global element: 
-<ul>
-<li><span class="uicontrol">Abstract</span>: click <strong>true</strong> if you want the
-global element to be abstract. When a global element is declared to be abstract,
-it cannot be used in an instance document. Instead, a member of that global
-element's substitution group must appear in the instance document.</li>
-
-<li><span class="uicontrol">Block</span>: determines whether the global element
-may be replaced by an element derived from it.</li>
-
-<li><span class="uicontrol">Final</span>: determines whether this global element
-may be derived from.</li>
-
-<li><span class="uicontrol">Substitution Group</span>: a substitution group allows
-elements to be substituted for other elements.</li>
-
-<li><span class="uicontrol">Nillable</span>: select <strong>true</strong> if you do not
-want the global element to be able to have any child elements, only attributes. </li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab to provide any
-information about this global element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab to add application
-information elements to your annotations of schema components.</span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-</ol>
-
-<div class="section">You can add a content model to a global element, which is the representation
-of any data that can be contained inside the global element. For more information
-about working with content models, refer to the related tasks.</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-<div><a href="../topics/taddelmr.html" title="An element reference provides a reference to a global element. A declaration that references a global element enables the referenced global element to appear in the instance document in the context of the referencing declaration.">Adding element references</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
deleted file mode 100644
index 6f0ec02..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.dita
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddgrpr" xml:lang="en-us">

-<title>Adding group references</title>

-<titlealts>

-<searchtitle>Adding group references</searchtitle>

-</titlealts>

-<shortdesc>A group reference is a declaration that references a group. It

-enables the referenced group to appear in the instance document in the context

-of the referencing declaration.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>group features</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>group features</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>The menu option to add a group reference only appears if there are

-groups defined elsewhere in the document.<p>The following instructions were

-written for the Resource perspective, but they will also work in many other

-perspectives.</p><p>To add a group reference, complete the following steps<?Pub Caret?>:</p></context>

-<steps>

-<step><cmd>In the Design view, right-click the content model you want to work

-with and select <uicontrol>Add Group Ref</uicontrol>.</cmd></step>

-<step><cmd>Select the new group reference.</cmd></step>

-<step><cmd>In the Properties view, select the group you want to refer to in

-the <uicontrol>ref</uicontrol> list.</cmd></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this group reference.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002007?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
deleted file mode 100644
index fe0d7bb..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrpr.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding group references" />
-<meta name="abstract" content="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration." />
-<meta name="description" content="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration." />
-<meta content="XML schema editor, group features, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, group features, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddgrup.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddgrpr" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding group references</title>
-</head>
-<body id="taddgrpr"><a name="taddgrpr"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding group references</h1>
-
-
-
-
-<div><p>A group reference is a declaration that references a group. It
-enables the referenced group to appear in the instance document in the context
-of the referencing declaration.</p>
-
-<div class="section">The menu option to add a group reference only appears if there are
-groups defined elsewhere in the document.<p>The following instructions were
-written for the Resource perspective, but they will also work in many other
-perspectives.</p>
-<p>To add a group reference, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, right-click the content model you want to work
-with and select <span class="uicontrol">Add Group Ref</span>.</span></li>
-
-<li class="stepexpand"><span>Select the new group reference.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, select the group you want to refer to in
-the <span class="uicontrol">ref</span> list.</span></li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this group reference.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddgrup.html" title="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references.">Adding groups</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
deleted file mode 100644
index e79721b..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.dita
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddgrup" xml:lang="en-us">

-<title>Adding groups</title>

-<titlealts>

-<searchtitle>Adding groups</searchtitle>

-</titlealts>

-<shortdesc>When you create a group, it automatically contains a content model.

-The content model is a representation of any data that can be grouped together

-by the group, such as elements, element references, and group references.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>groups</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>groups</indexterm></indexterm></keywords>

-</metadata></prolog>

-<taskbody>

-<context><p></p><p>The following instructions were written for the Resource

-perspective, but they ws<?Pub Caret?>ill also work in many other perspectives.</p><p>To

-add a group, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click <b>Groups</b>, and click <uicontrol>Add

-Group</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, type a new name for the group in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this group element.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info></step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-<step><cmd>In the Outline view, expand the <uicontrol>Groups</uicontrol> folder

-and your new group.</cmd><info>Your group automatically contains a content

-model. A group's content model is the representation of any data that can

-be contained inside the group. For more information about working with content

-models, refer to the related tasks.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002232?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
deleted file mode 100644
index f3a6f3c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddgrup.html
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding groups" />
-<meta name="abstract" content="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references." />
-<meta name="description" content="When you create a group, it automatically contains a content model. The content model is a representation of any data that can be grouped together by the group, such as elements, element references, and group references." />
-<meta content="XML schema editor, groups, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, groups, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddgrpr.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddcmod.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddgrup" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding groups</title>
-</head>
-<body id="taddgrup"><a name="taddgrup"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding groups</h1>
-
-
-
-
-<div><p>When you create a group, it automatically contains a content model.
-The content model is a representation of any data that can be grouped together
-by the group, such as elements, element references, and group references.</p>
-
-<div class="section"><p />
-<p>The following instructions were written for the Resource
-perspective, but they wsill also work in many other perspectives.</p>
-<p>To
-add a group, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, right-click <strong>Groups</strong>, and click <span class="uicontrol">Add
-Group</span>.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, type a new name for the group in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you want
-to provide any information about this group element.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you want to
-add application information elements to your annotations of schema components.</span>
- The <span class="uicontrol">Extensions</span> page allows you to specify the
-schema and add XML content to your annotations.</li>
-
-<li class="stepexpand"><span>In the Outline view, expand the <span class="uicontrol">Groups</span> folder
-and your new group.</span> Your group automatically contains a content
-model. A group's content model is the representation of any data that can
-be contained inside the group. For more information about working with content
-models, refer to the related tasks.</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddgrpr.html" title="A group reference is a declaration that references a group. It enables the referenced group to appear in the instance document in the context of the referencing declaration.">Adding group references</a></div>
-<div><a href="../topics/taddcmod.html" title="A content model is the representation of any data that can be contained inside an element, global element, complex type, or group. It is a formal description of the structure and permissible content of an element, global element, complex type, or group, which may be used to validate a document instance.">Adding content models</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
deleted file mode 100644
index cf0d158..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.dita
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddimpt" xml:lang="en-us">

-<title>Adding import elements</title>

-<titlealts>

-<searchtitle>Adding import elements</searchtitle>

-</titlealts>

-<shortdesc>If your schemas are large, you might choose to divide their

-content among several schema documents to make them easier to maintain,

-reuse, and read. You can use an <codeph>import</codeph> element to

-bring in definitions and declarations from an imported schema into

-the current schema. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>import elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>import elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can import a schema from a different namespace than

-the current schema. You can add multiple import elements to an XML

-schema; however, an imported schema cannot have the same namespace

-or prefix as another imported schema.</p><p>The following instructions

-were written for the Resource perspective, but they will also work

-in many other perspectives.</p><p>To add an import element, complete

-the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Design view, right-click in the <b>Directives</b> section

-and click <uicontrol>Add Import</uicontrol>.</cmd></step>

-<step><cmd>In the Select XML schema file wizard, you can import an

-XML schema that is located in your workspace or you can import a schema

-from an HTTP Web address.</cmd>

-<choices>

-<choice>If you want to import an XML schema located in your workspace:<ol>

-<li>Select <uicontrol>Workbench projects</uicontrol> and click <uicontrol>Next</uicontrol>. </li>

-<li>Select the schema that you want to import and click <uicontrol>Finish</uicontrol>.</li>

-</ol></choice>

-<choice>If you want to import an XML schema located at an HTTP Web

-address:<ol>

-<li>Select <uicontrol>HTTP</uicontrol> and click <uicontrol>Next</uicontrol>.</li>

-<li>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.<note>A

-local copy of the schema is not stored in your workspace. If you validate

-your schema, the schema's contents are checked from the URL that you

-specify.</note></li>

-</ol></choice>

-</choices>

-</step>

-<step importance="optional"><cmd>Use the Properties view to define

-additional properties for your import element.</cmd>

-<substeps>

-<substep><cmd>If you want to add a unique prefix for this namespace,

-click the <uicontrol>General</uicontrol> tab and type the prefix in

-the <uicontrol>Prefix</uicontrol> field.</cmd></substep>

-<substep><cmd>Click the <uicontrol>Documentation</uicontrol> tab if

-you want to provide any information about this import element. </cmd>

-<info>The <uicontrol>Documentation</uicontrol> page is used for human

-readable material, such as a description.</info></substep>

-<substep><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. </cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</substep>

-</substeps>

-</step>

-</steps><?Pub Caret1?>

-<result><p>Once you have added an import element to your XML schema,

-when you define new elements, attributes, complex types, or simple

-types where you can specify type information, any declarations from

-the included schema will be available in the <uicontrol>Type</uicontrol> list

-for the element, attribute, complex or simple type.</p></result>

-<postreq></postreq>

-</taskbody>

-</task>

-<?Pub *0000003756?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
deleted file mode 100644
index ec0083a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddimpt.html
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding import elements" />
-<meta name="abstract" content="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use an import element to bring in definitions and declarations from an imported schema into the current schema." />
-<meta name="description" content="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use an import element to bring in definitions and declarations from an imported schema into the current schema." />
-<meta content="XML schema editor, import elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, import elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddrdfn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddimpt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding import elements</title>
-</head>
-<body id="taddimpt"><a name="taddimpt"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding import elements</h1>
-
-
-
-
-<div><p>If your schemas are large, you might choose to divide their
-content among several schema documents to make them easier to maintain,
-reuse, and read. You can use an <samp class="codeph">import</samp> element to
-bring in definitions and declarations from an imported schema into
-the current schema. </p>
-
-<div class="section"><p>You can import a schema from a different namespace than
-the current schema. You can add multiple import elements to an XML
-schema; however, an imported schema cannot have the same namespace
-or prefix as another imported schema.</p>
-<p>The following instructions
-were written for the Resource perspective, but they will also work
-in many other perspectives.</p>
-<p>To add an import element, complete
-the following steps:</p>
-</div>
-
-<ol>
-<li><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li><span>In the Design view, right-click in the <strong>Directives</strong> section
-and click <span class="uicontrol">Add Import</span>.</span></li>
-
-<li><span>In the Select XML schema file wizard, you can import an
-XML schema that is located in your workspace or you can import a schema
-from an HTTP Web address.</span>
-<ul>
-<li>If you want to import an XML schema located in your workspace:<ol type="a">
-<li>Select <span class="uicontrol">Workbench projects</span> and click <span class="uicontrol">Next</span>. </li>
-
-<li>Select the schema that you want to import and click <span class="uicontrol">Finish</span>.</li>
-
-</ol>
-</li>
-
-<li>If you want to import an XML schema located at an HTTP Web
-address:<ol type="a">
-<li>Select <span class="uicontrol">HTTP</span> and click <span class="uicontrol">Next</span>.</li>
-
-<li>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.<div class="note"><span class="notetitle">Note:</span> A
-local copy of the schema is not stored in your workspace. If you validate
-your schema, the schema's contents are checked from the URL that you
-specify.</div>
-</li>
-
-</ol>
-</li>
-
-</ul>
-
-</li>
-
-<li><strong>Optional: </strong><span>Use the Properties view to define
-additional properties for your import element.</span>
-<ol type="a">
-<li class="substepexpand"><span>If you want to add a unique prefix for this namespace,
-click the <span class="uicontrol">General</span> tab and type the prefix in
-the <span class="uicontrol">Prefix</span> field.</span></li>
-
-<li class="substepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if
-you want to provide any information about this import element. </span>
- The <span class="uicontrol">Documentation</span> page is used for human
-readable material, such as a description.</li>
-
-<li class="substepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-</ol>
-
-</li>
-
-</ol>
-
-<div class="section"><p>Once you have added an import element to your XML schema,
-when you define new elements, attributes, complex types, or simple
-types where you can specify type information, any declarations from
-the included schema will be available in the <span class="uicontrol">Type</span> list
-for the element, attribute, complex or simple type.</p>
-</div>
-
-<div class="section" />
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddincl.html" title="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema.">Adding include elements</a></div>
-<div><a href="../topics/taddrdfn.html" title="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents.">Adding redefine elements</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
deleted file mode 100644
index be011ed..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.dita
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddincl" xml:lang="en-us">

-<title>Adding include elements</title>

-<titlealts>

-<searchtitle>Adding include elements</searchtitle>

-</titlealts>

-<shortdesc>If your schemas are large, you might choose to divide their

-content among several schema documents to make them easier to maintain,

-reuse, and read.  You can use the <codeph>include</codeph> element

-to bring in definitions and declarations from the included schema

-into the current schema. The included schema must be in the same target

-namespace as the including schema. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>include elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>include elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource

-perspective, but they will also work in many other perspectives.</p><p>To

-add an include element, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Design view, right-click in the <b>Directives</b> section

-and click <uicontrol>Add Include</uicontrol>.</cmd></step>

-<step><cmd>In the Select XML schema file wizard, you can include an

-XML schema that is located in your workspace or you can include a

-schema from an HTTP Web address. The XML schema file that you select

-must have the same namespace as the current schema.</cmd>

-<choices>

-<choice>If you want to include an XML schema located in your workspace:<ol>

-<li>Select <uicontrol>Workbench projects</uicontrol> and click <uicontrol>Next</uicontrol>. </li>

-<li>Select the schema that you want to import and click <uicontrol>Finish</uicontrol>.</li>

-</ol></choice>

-<choice>If you want to include an XML schema located at an HTTP Web

-address:<ol>

-<li>Select <uicontrol>HTTP</uicontrol> and click <uicontrol>Next</uicontrol>.</li>

-<li>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.<note>A

-local copy of the schema is not stored in your workspace. If you validate

-your schema, the schema's contents are checked from the URL that you

-specify.</note></li>

-</ol></choice>

-</choices>

-</step>

-<step importance="optional"><cmd>Use the Properties view to define

-additional properties for your import element.</cmd>

-<substeps>

-<substep><cmd>If you want to edit the location of the included XML

-schema file, click the <uicontrol>General</uicontrol> tab and type

-the new location display in the <uicontrol>Schema location</uicontrol> field.</cmd>

-</substep>

-<substep><cmd>Click the <uicontrol>Documentation</uicontrol> tab if

-you want to provide any information about this include<?Pub Caret?>

-element. </cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info>

-</substep>

-<substep><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. </cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</substep>

-</substeps>

-</step>

-</steps>

-<result><p>Once you have added the include element to your XML schema,

-when you define new elements, attributes, complex types, or simple

-types where you can specify type information, any declarations from

-the included schema will be available in the <uicontrol>Type</uicontrol> list

-for the element, attribute, complex or simple type.</p><p>For example,

-if Address.xsd has the following content:</p><codeblock>&lt;complexType name="Address">

-    &lt;sequence>

-        &lt;element name="name" type="string">

-        &lt;element name="street" type="string">

-    &lt;/sequence>

-&lt;/complexType>

-</codeblock>and you have an XML schema called PurchaseOrder.xsd that

-has added an include for Address.xsd, then when defining a new element

-in  PurchaseOrder, you can select Address as its type.  </result>

-</taskbody>

-</task>

-<?Pub *0000004174?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
deleted file mode 100644
index 0b9d52f..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddincl.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding include elements" />
-<meta name="abstract" content="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema." />
-<meta name="description" content="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema." />
-<meta content="XML schema editor, include elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, include elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddrdfn.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddincl" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding include elements</title>
-</head>
-<body id="taddincl"><a name="taddincl"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding include elements</h1>
-
-
-
-
-<div><p>If your schemas are large, you might choose to divide their
-content among several schema documents to make them easier to maintain,
-reuse, and read.  You can use the <samp class="codeph">include</samp> element
-to bring in definitions and declarations from the included schema
-into the current schema. The included schema must be in the same target
-namespace as the including schema. </p>
-
-<div class="section"><p>The following instructions were written for the Resource
-perspective, but they will also work in many other perspectives.</p>
-<p>To
-add an include element, complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li><span>In the Design view, right-click in the <strong>Directives</strong> section
-and click <span class="uicontrol">Add Include</span>.</span></li>
-
-<li><span>In the Select XML schema file wizard, you can include an
-XML schema that is located in your workspace or you can include a
-schema from an HTTP Web address. The XML schema file that you select
-must have the same namespace as the current schema.</span>
-<ul>
-<li>If you want to include an XML schema located in your workspace:<ol type="a">
-<li>Select <span class="uicontrol">Workbench projects</span> and click <span class="uicontrol">Next</span>. </li>
-
-<li>Select the schema that you want to import and click <span class="uicontrol">Finish</span>.</li>
-
-</ol>
-</li>
-
-<li>If you want to include an XML schema located at an HTTP Web
-address:<ol type="a">
-<li>Select <span class="uicontrol">HTTP</span> and click <span class="uicontrol">Next</span>.</li>
-
-<li>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.<div class="note"><span class="notetitle">Note:</span> A
-local copy of the schema is not stored in your workspace. If you validate
-your schema, the schema's contents are checked from the URL that you
-specify.</div>
-</li>
-
-</ol>
-</li>
-
-</ul>
-
-</li>
-
-<li><strong>Optional: </strong><span>Use the Properties view to define
-additional properties for your import element.</span>
-<ol type="a">
-<li class="substepexpand"><span>If you want to edit the location of the included XML
-schema file, click the <span class="uicontrol">General</span> tab and type
-the new location display in the <span class="uicontrol">Schema location</span> field.</span>
-</li>
-
-<li class="substepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if
-you want to provide any information about this include
-element. </span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
-
-<li class="substepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-</ol>
-
-</li>
-
-</ol>
-
-<div class="section"><p>Once you have added the include element to your XML schema,
-when you define new elements, attributes, complex types, or simple
-types where you can specify type information, any declarations from
-the included schema will be available in the <span class="uicontrol">Type</span> list
-for the element, attribute, complex or simple type.</p>
-<p>For example,
-if Address.xsd has the following content:</p>
-<pre>&lt;complexType name="Address"&gt;
-    &lt;sequence&gt;
-        &lt;element name="name" type="string"&gt;
-        &lt;element name="street" type="string"&gt;
-    &lt;/sequence&gt;
-&lt;/complexType&gt;
-</pre>
-and you have an XML schema called PurchaseOrder.xsd that
-has added an include for Address.xsd, then when defining a new element
-in  PurchaseOrder, you can select Address as its type.  </div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddimpt.html" title="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use an import element to bring in definitions and declarations from an imported schema into the current schema.">Adding import elements</a></div>
-<div><a href="../topics/taddrdfn.html" title="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents.">Adding redefine elements</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
deleted file mode 100644
index 2728d05..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.dita
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2005, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddnot" xml:lang="en-us">

-<title>Adding notations</title>

-<titlealts>

-<searchtitle>Adding notations</searchtitle>

-</titlealts>

-<shortdesc>A notation is a means of associating a binary description with

-an entity or attribute. The most common uses of notations are to include familiar

-types of binary references, such as GIFs and JPGs, in an XML file.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>notations</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>notations</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>For example, you are making a catalogue of your clothing and want

-to include an image of one of your shirts. You would have to create a notation

-like this:  <userinput>&lt;notation name="My_Shirt" system="GIF">&lt;/notation></userinput> which

-defines a notation for a GIF image.</p><p>The following instructions were

-written for the Resource perspective, but they will also work in many other

-perspectives.</p><p>To create a notation, follow these steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click your XML schema and click <uicontrol>Add

-Notation</uicontrol>.</cmd></step>

-<step><cmd>In the Properties view, type the name of the notation in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>Click the <uicontrol>Other</uicontrol> tab.</cmd></step>

-<step><cmd>In the <uicontrol>public</uicontrol> field, type a public identifier.</cmd>

-<info> This is optional if you enter a value in the <uicontrol>system</uicontrol> field.</info>

-</step>

-<step><cmd>In the <uicontrol>system</uicontrol> field, type a URI reference.</cmd>

-<info> This is optional if you enter a value in the <uicontrol>public</uicontrol> field.</info>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you want

-to provide any information about this notation.</cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description. <uicontrol>App

-Info</uicontrol> page can be used to provide information for applications.</info>

-</step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you want to

-add application information elements to your annotations of schema components.</cmd>

-<info>The <uicontrol>Extensions</uicontrol> page allows you to specify the

-schema and add XML content to your annotations.</info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002959?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html
deleted file mode 100644
index 75078b0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddnot.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
-  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<!-- /*******************************************************************************
- * Copyright (c) 2000, 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
- *******************************************************************************/ -->
-<link rel="stylesheet" type="text/css" href="../../org.eclipse.wst.doc.user/common.css" />
-<title>Adding notations</title>
-</head>
-<body id="taddnot"><a name="taddnot"><!-- --></a>
-
-<h1 class="topictitle1">Adding notations</h1>
-<div><p>A notation is a means of associating a binary description with
-an entity or attribute. The most common uses of notations are to include familiar
-types of binary references, such as GIFs and JPGs, in an XML file.</p>
-<div class="section"><p>For example, you are making a catalogue of your clothing and want
-to include an image of one of your shirts. You would have to create a notation
-like this:  <kbd class="userinput">&lt;notation name="My_Shirt" system="GIF"&gt;&lt;/notation&gt;</kbd> which
-defines a notation for a GIF image.</p>
-<p>The following instructions were written for the Resource perspective, but 
-they will also work in many other perspectives.</p>
-<p>To
-create a notation, follow these steps:</p>
-</div>
-<ol><li class="skipspace"><span>Open your XML schema in the XML schema editor.</span></li>
-<li class="skipspace"><span>In the Outline view, right-click your XML schema and click 
-<b> <span class="uicontrol">Add
-Notation</span></b>.</span></li>
-<li class="skipspace"><span>In the Properties view, type the name of the notation in the 
-<b> <span class="uicontrol">Name</span></b> field.</span></li>
-<li class="skipspace"><span>Click the <b> <span class="uicontrol">Other</span></b> tab.</span></li>
-<li class="skipspace"><span>In the <b> <span class="uicontrol">public</span></b> field, type a public identifier.</span>  This is optional if you enter a value in the 
-<b> <span class="uicontrol">system</span></b> field.</li>
-<li class="skipspace"><span>In the <b> <span class="uicontrol">system</span></b> field, type a URI reference.</span>  This is optional if you enter a value in the 
-<b> <span class="uicontrol">public</span></b> field.</li>
-<li class="skipspace"><span>Click the <b> <span class="uicontrol">Documentation</span></b> tab if you want
-to provide any information about this notation.</span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description, and the <span class="uicontrol">App
-Info</span> page can be used to provide information for applications.</li>
-</ol>
-</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
deleted file mode 100644
index 085e62e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.dita
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddrdfn" xml:lang="en-us">

-<title>Adding redefine elements</title>

-<titlealts>

-<searchtitle>Adding redefine elements</searchtitle>

-</titlealts>

-<shortdesc>You can use the <codeph>redefine</codeph> mechanism to

-redefine simple and complex types, groups, and attribute groups obtained

-from external schema files. When you redefine a component, you are

-modifying its contents.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>adding redefine elements</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>adding redefine elements</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>Like the <codeph>include</codeph> mechanism, <codeph>redefine</codeph> requires

-the external components to be in the same target namespace as the

-redefining schema, although external components from schemas that

-have no namespace can also be redefined.</p><p>The following instructions

-were written for the Resource perspective, but they will also work

-in many other perspectives.</p><p>To add a redefine element, complete

-the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Design view, right-click in the <b>Directives</b> section

-and click <uicontrol>Add Redefine</uicontrol>.</cmd></step>

-<step><cmd>In the Select XML schema file wizard, you can import an

-XML schema that is located in your workspace or you can import a schema

-from an HTTP Web address. The XML schema file that you select must

-have the same namespace as the current schema.</cmd>

-<choices>

-<choice>If you want to import an XML schema located in your workspace:<ol>

-<li>Select <uicontrol>Workbench projects</uicontrol> and click <uicontrol>Next</uicontrol>. </li>

-<li>Select the schema that you want to import and click <uicontrol>Finish</uicontrol>.</li>

-</ol></choice>

-<choice>If you want to import an XML schema located at an HTTP Web

-address:<ol>

-<li>Select <uicontrol>HTTP</uicontrol> and click <uicontrol>Next</uicontrol>.</li>

-<li>Type the URL of the XML schema and click <uicontrol>Finish</uicontrol>.<note>A

-local copy of the schema is not stored in your workspace. If you validate

-your schema, the schema's contents are checked from the URL that you

-specify.</note></li>

-</ol></choice>

-</choices>

-</step>

-<step importance="optional"><cmd>Use the Properties view to define

-additional properties for your import element.</cmd>

-<substeps>

-<substep><cmd>If you want to edit the location of the included XML

-schema file, click the <uicontrol>General</uicontrol> tab and type

-the new location display in the <uicontrol>Schema location</uicontrol> field.</cmd>

-</substep>

-<substep><cmd>Click the <uicontrol>Documentation</uicontrol> tab if

-you want to provide any information about this redefine element. </cmd>

-<info>The <uicontrol>Documentation</uicontrol> page is used for human

-readable material, such as a description.</info></substep>

-<substep><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. </cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</substep>

-</substeps>

-</step>

-</steps><?Pub Caret1?>

-<result><p>Once you have added the redefine element to your XML schema,

-you can redefine any of the simple and complex types, groups, and

-attribute groups in the XML schema you selected in the redefine element. </p></result>

-</taskbody>

-</task>

-<?Pub *0000003721?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
deleted file mode 100644
index ef66d4a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddrdfn.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding redefine elements" />
-<meta name="abstract" content="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents." />
-<meta name="description" content="You can use the redefine mechanism to redefine simple and complex types, groups, and attribute groups obtained from external schema files. When you redefine a component, you are modifying its contents." />
-<meta content="XML schema editor, adding redefine elements, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, adding redefine elements, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rnmspc.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddrdfn" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding redefine elements</title>
-</head>
-<body id="taddrdfn"><a name="taddrdfn"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding redefine elements</h1>
-
-
-
-
-<div><p>You can use the <samp class="codeph">redefine</samp> mechanism to
-redefine simple and complex types, groups, and attribute groups obtained
-from external schema files. When you redefine a component, you are
-modifying its contents.</p>
-
-<div class="section"><p>Like the <samp class="codeph">include</samp> mechanism, <samp class="codeph">redefine</samp> requires
-the external components to be in the same target namespace as the
-redefining schema, although external components from schemas that
-have no namespace can also be redefined.</p>
-<p>The following instructions
-were written for the Resource perspective, but they will also work
-in many other perspectives.</p>
-<p>To add a redefine element, complete
-the following steps:</p>
-</div>
-
-<ol>
-<li><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li><span>In the Design view, right-click in the <strong>Directives</strong> section
-and click <span class="uicontrol">Add Redefine</span>.</span></li>
-
-<li><span>In the Select XML schema file wizard, you can import an
-XML schema that is located in your workspace or you can import a schema
-from an HTTP Web address. The XML schema file that you select must
-have the same namespace as the current schema.</span>
-<ul>
-<li>If you want to import an XML schema located in your workspace:<ol type="a">
-<li>Select <span class="uicontrol">Workbench projects</span> and click <span class="uicontrol">Next</span>. </li>
-
-<li>Select the schema that you want to import and click <span class="uicontrol">Finish</span>.</li>
-
-</ol>
-</li>
-
-<li>If you want to import an XML schema located at an HTTP Web
-address:<ol type="a">
-<li>Select <span class="uicontrol">HTTP</span> and click <span class="uicontrol">Next</span>.</li>
-
-<li>Type the URL of the XML schema and click <span class="uicontrol">Finish</span>.<div class="note"><span class="notetitle">Note:</span> A
-local copy of the schema is not stored in your workspace. If you validate
-your schema, the schema's contents are checked from the URL that you
-specify.</div>
-</li>
-
-</ol>
-</li>
-
-</ul>
-
-</li>
-
-<li><strong>Optional: </strong><span>Use the Properties view to define
-additional properties for your import element.</span>
-<ol type="a">
-<li class="substepexpand"><span>If you want to edit the location of the included XML
-schema file, click the <span class="uicontrol">General</span> tab and type
-the new location display in the <span class="uicontrol">Schema location</span> field.</span>
-</li>
-
-<li class="substepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if
-you want to provide any information about this redefine element. </span>
- The <span class="uicontrol">Documentation</span> page is used for human
-readable material, such as a description.</li>
-
-<li class="substepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-</ol>
-
-</li>
-
-</ol>
-
-<div class="section"><p>Once you have added the redefine element to your XML schema,
-you can redefine any of the simple and complex types, groups, and
-attribute groups in the XML schema you selected in the redefine element. </p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddimpt.html" title="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use an import element to bring in definitions and declarations from an imported schema into the current schema.">Adding import elements</a></div>
-<div><a href="../topics/taddincl.html" title="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema.">Adding include elements</a></div>
-</div>
-<div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rnmspc.html" title="An XML namespace is a collection of names, identified by a URI reference, which are used in XML documents as element types and attribute names.">XML namespaces</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
deleted file mode 100644
index df9d7b1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.dita
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="taddreg" xml:lang="en-us">

-<title>Adding pattern facets to simple types</title>

-<titlealts>

-<searchtitle>Adding pattern facets to simple types</searchtitle>

-</titlealts>

-<shortdesc>A pattern facet can be used to constrain the value of a type's

-lexical space (the set of string literals that represent the values of a type),

-which indirectly constrains the value space.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>pattern facets</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>pattern facets</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p> The value of the pattern is called a regular expression. You

-can specify it using the <uicontrol>Regular Expression</uicontrol> wizard.</p><p>To

-add a pattern to a simple type, complete the following steps:</p></context>

-<steps>

-<step><cmd>In the Design view, select the simple type you want to work with.</cmd>

-</step>

-<step><cmd>In the Properties view, click the <uicontrol>Constraints</uicontrol> tab,

-then <uicontrol>Patterns</uicontrol>.</cmd></step>

-<step><cmd>Click <uicontrol>Add</uicontrol>.</cmd><info>The Regular Expression

-wizard opens.</info></step>

-<step><cmd>Select the token you want to add to the expression.</cmd></step>

-<step><cmd>Indicate how often you want the token to appear in order for a

-match to succeed:</cmd>

-<choices>

-<choice>If you want the token to repeat, click <uicontrol>Repeat</uicontrol> and

-specify the number of times the token must appear.</choice>

-</choices>

-<choices>

-<choice> If you want to specify a minimum and maximum number of times the

-token can appear, click <uicontrol>Range</uicontrol> and enter a minimum and

-maximum value.</choice>

-</choices>

-</step>

-<step><cmd>To add the token to the regular expression, click <uicontrol>Add</uicontrol>. </cmd>

-</step>

-<step><cmd>To create the entire expression, repeat steps 4 - 6 as necessary.</cmd>

-</step>

-<step><cmd>When you are finished, click <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>T<?Pub Caret1?>o test against the regular expression and see if

-a match occurs, enter sample text.</cmd></step>

-<step><cmd>Click <uicontrol>Finish</uicontrol>.</cmd><stepresult> The regular

-expression will appear in the Patterns page. <note type="tip"> To edit an

-existing pattern, select it in the Patterns page and click <uicontrol>Edit</uicontrol>.

-To delete an existing pattern, select it in the Patterns page and click <uicontrol>Delete</uicontrol>. </note></stepresult>

-</step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002703?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
deleted file mode 100644
index 845f4f7..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddreg.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding pattern facets to simple types" />
-<meta name="abstract" content="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space." />
-<meta name="description" content="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space." />
-<meta content="XML schema editor, pattern facets, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, pattern facets, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddsmpt.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddreg" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding pattern facets to simple types</title>
-</head>
-<body id="taddreg"><a name="taddreg"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding pattern facets to simple types</h1>
-
-
-
-
-<div><p>A pattern facet can be used to constrain the value of a type's
-lexical space (the set of string literals that represent the values of a type),
-which indirectly constrains the value space.</p>
-
-<div class="section"><p> The value of the pattern is called a regular expression. You
-can specify it using the <span class="uicontrol">Regular Expression</span> wizard.</p>
-<p>To
-add a pattern to a simple type, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>In the Design view, select the simple type you want to work with.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">Constraints</span> tab,
-then <span class="uicontrol">Patterns</span>.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Add</span>.</span> The Regular Expression
-wizard opens.</li>
-
-<li class="stepexpand"><span>Select the token you want to add to the expression.</span></li>
-
-<li class="stepexpand"><span>Indicate how often you want the token to appear in order for a
-match to succeed:</span>
-<ul>
-<li>If you want the token to repeat, click <span class="uicontrol">Repeat</span> and
-specify the number of times the token must appear.</li>
-
-</ul>
-
-<ul>
-<li> If you want to specify a minimum and maximum number of times the
-token can appear, click <span class="uicontrol">Range</span> and enter a minimum and
-maximum value.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>To add the token to the regular expression, click <span class="uicontrol">Add</span>. </span>
-</li>
-
-<li class="stepexpand"><span>To create the entire expression, repeat steps 4 - 6 as necessary.</span>
-</li>
-
-<li class="stepexpand"><span>When you are finished, click <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>To test against the regular expression and see if
-a match occurs, enter sample text.</span></li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Finish</span>.</span>  The regular
-expression will appear in the Patterns page. <div class="tip"><span class="tiptitle">Tip:</span>  To edit an
-existing pattern, select it in the Patterns page and click <span class="uicontrol">Edit</span>.
-To delete an existing pattern, select it in the Patterns page and click <span class="uicontrol">Delete</span>. </div>
-
-</li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddsmpt.html" title="Simple types are used to create derived data types. They provide a set of constraints on the value space (a set of values) and the lexical space (a set of valid literals) of a datatype.">Adding simple types</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
deleted file mode 100644
index 9ca3d6c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.dita
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="taddsmpt" xml:lang="en-us">

-<title>Adding simple types</title>

-<titlealts>

-<searchtitle>Adding simple types</searchtitle>

-</titlealts>

-<shortdesc>Simple types are used to create derived data types. They

-provide a set of constraints on the value space (a set of values)

-and the lexical space (a set of valid literals) of a datatype.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>simple types</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>simple types</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>A simple type cannot have element content and cannot carry

-attributes. Elements that contain numbers (and strings, and dates,

-and so on) but do not contain any sub-elements have a simple type.</p><p>The

-following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To add a

-simple type, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, right-click <b>Types</b>, and click <uicontrol>Add

-Simple Type</uicontrol>.</cmd></step>

-<step><cmd>In the Outline view, select the new simple type.</cmd></step>

-<step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab.</cmd>

-</step>

-<step><cmd>Type a new name for the simple type in the <uicontrol>Name</uicontrol> field.</cmd>

-</step>

-<step><cmd>You can select the following options from the <uicontrol>Variety</uicontrol> list:</cmd>

-<choices>

-<choice><uicontrol>atomic</uicontrol>: atomic types are all the simple

-types built into the XML schema language.</choice>

-<choice><uicontrol>list</uicontrol>: list types are comprised of sequences

-of atomic types. They have values that are comprised of finite-length

-sequences of atomic values. </choice>

-<choice><uicontrol>union</uicontrol>: union types enable an element

-or attribute value to be one or more instances of one type drawn from

-the union of multiple atomic and list types.</choice>

-</choices>

-</step>

-<step><cmd>If you selected <uicontrol>atomic</uicontrol> or <uicontrol>list</uicontrol> from

-the <uicontrol>Variety</uicontrol> list, click <uicontrol>Browse</uicontrol> <image

-href="../images/Browse.gif"><alt>This graphic is the Browse button</alt>

-</image> next to the <uicontrol>Base type</uicontrol> or <uicontrol>Item

-type</uicontrol> field to specify a base type for the simple type. </cmd>

-<info>The Set Type dialog box lists all built-in and user-defined

-types currently available. You can change the <uicontrol>Scope</uicontrol> of

-the list by selecting one of the following options:<ul>

-<li><uicontrol>Workspace</uicontrol>: lists all of the types available

-in your workspace. </li>

-<li><uicontrol>Enclosing Project</uicontrol>: lists all of the types

-available in the project that contains your file. </li>

-<li>(Default) <uicontrol>Current Resource</uicontrol>: lists all of

-the types available in your current file.</li>

-<li><uicontrol>Working Sets</uicontrol>: lists all the types available

-within the selected working set.</li>

-</ul></info></step>

-<step><cmd>If you selected <uicontrol>union</uicontrol> from the <uicontrol>Variety</uicontrol> list,

-click <uicontrol>Browse</uicontrol> <image href="../images/Browse.gif">

-<alt>This graphic is the Browse button</alt></image> next to the <uicontrol>Member

-types</uicontrol> field to specify the member types for the simple

-type. </cmd><info>You can select to add both <uicontrol>Built-in simple

-types</uicontrol> and <uicontrol>User-defined simple types</uicontrol> to

-the member types value list. </info></step>

-<step><cmd>To set specific constraint values on your simple type,

-such as length constraints, enumerations, and patterns, click the <uicontrol>Constraints</uicontrol> tab.</cmd>

-<substeps>

-<substep><cmd>You can use <i>enumerations</i> to define a set of valid

-values for simple types. They are the actual values the simple type

-can take as valid values in the instance document. You can add one

-enumeration or several enumerations at a time:</cmd><info><ul>

-<li>To add one enumeration at a time, under <uicontrol>Specific constraint

-values</uicontrol>, select <uicontrol>Enumerations</uicontrol> and

-click <uicontrol>Add</uicontrol> and specify a value for the enumeration.</li>

-<li>To add several enumerations at one time:<ol>

-<li>Select <uicontrol>Enumerations</uicontrol> and click <uicontrol>Add</uicontrol>.</li>

-<li>Enter the value of each enumeration. Each value must be separated

-by the <uicontrol>Delimiter character</uicontrol>. For example: <codeph>First,

-Second</codeph> will create two enumerations, one with the value "First"

-and one with the value "Second".</li>

-<li>Select the <uicontrol>Preserve leading and trailing whitespace</uicontrol> check

-box if you want any white space around your enumeration values to

-be preserved. If you select this check box, the values of <codeph>First,

-Second</codeph> will show up as "First" and " Second" (there is a

-space before Second) because you put a space before "Second" when

-entering the value.</li>

-<li>Click <uicontrol>OK</uicontrol>. Your enumerations will be created

-and appear in the Properties view.</li>

-</ol></li>

-</ul></info></substep>

-<substep><cmd>You can use <i>patterns</i> to place certain constraints

-regarding allowable values. </cmd><info>For example, you could restrict

-the field to only accept input which follows the pattern "five digits

-followed by two upper-case ASCII letters". To set a pattern constraint:<ol>

-<li>Select <uicontrol>Patterns</uicontrol> and click <uicontrol>Add</uicontrol>.</li>

-<li>Create the regular expression pattern you wish to use as your

-constraint using the <uicontrol>Regular Expression</uicontrol> wizard.</li>

-<li>Click <uicontrol>Finish</uicontrol>.</li>

-</ol></info></substep>

-</substeps>

-</step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you

-want to provide any information about this simple type. </cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info>

-</step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. </cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</step>

-<step><cmd>If you do not want the simple type to be used to derive

-other types, click the <uicontrol>Advanced</uicontrol> tab and, in

-the <uicontrol>Final</uicontrol> list, select if derivations should

-be prevented by <uicontrol>list</uicontrol>, <uicontrol>restriction</uicontrol>, <uicontrol>union</uicontrol> or <uicontrol>#all</uicontrol>.</cmd><?Pub

-Caret1?></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000006999?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
deleted file mode 100644
index 9f09ca2..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/taddsmpt.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Adding simple types" />
-<meta name="abstract" content="Simple types are used to create derived data types. They provide a set of constraints on the value space (a set of values) and the lexical space (a set of valid literals) of a datatype." />
-<meta name="description" content="Simple types are used to create derived data types. They provide a set of constraints on the value space (a set of values) and the lexical space (a set of valid literals) of a datatype." />
-<meta content="XML schema editor, simple types, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, simple types, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddreg.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="taddsmpt" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Adding simple types</title>
-</head>
-<body id="taddsmpt"><a name="taddsmpt"><!-- --></a>
-
-
-<h1 class="topictitle1">Adding simple types</h1>
-
-
-
-
-<div><p>Simple types are used to create derived data types. They
-provide a set of constraints on the value space (a set of values)
-and the lexical space (a set of valid literals) of a datatype.</p>
-
-<div class="section"><p>A simple type cannot have element content and cannot carry
-attributes. Elements that contain numbers (and strings, and dates,
-and so on) but do not contain any sub-elements have a simple type.</p>
-<p>The
-following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To add a
-simple type, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, right-click <strong>Types</strong>, and click <span class="uicontrol">Add
-Simple Type</span>.</span></li>
-
-<li class="stepexpand"><span>In the Outline view, select the new simple type.</span></li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">General</span> tab.</span>
-</li>
-
-<li class="stepexpand"><span>Type a new name for the simple type in the <span class="uicontrol">Name</span> field.</span>
-</li>
-
-<li class="stepexpand"><span>You can select the following options from the <span class="uicontrol">Variety</span> list:</span>
-<ul>
-<li><span class="uicontrol">atomic</span>: atomic types are all the simple
-types built into the XML schema language.</li>
-
-<li><span class="uicontrol">list</span>: list types are comprised of sequences
-of atomic types. They have values that are comprised of finite-length
-sequences of atomic values. </li>
-
-<li><span class="uicontrol">union</span>: union types enable an element
-or attribute value to be one or more instances of one type drawn from
-the union of multiple atomic and list types.</li>
-
-</ul>
-
-</li>
-
-<li class="stepexpand"><span>If you selected <span class="uicontrol">atomic</span> or <span class="uicontrol">list</span> from
-the <span class="uicontrol">Variety</span> list, click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> next to the <span class="uicontrol">Base type</span> or <span class="uicontrol">Item
-type</span> field to specify a base type for the simple type. </span>
- The Set Type dialog box lists all built-in and user-defined
-types currently available. You can change the <span class="uicontrol">Scope</span> of
-the list by selecting one of the following options:<ul>
-<li><span class="uicontrol">Workspace</span>: lists all of the types available
-in your workspace. </li>
-
-<li><span class="uicontrol">Enclosing Project</span>: lists all of the types
-available in the project that contains your file. </li>
-
-<li>(Default) <span class="uicontrol">Current Resource</span>: lists all of
-the types available in your current file.</li>
-
-<li><span class="uicontrol">Working Sets</span>: lists all the types available
-within the selected working set.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>If you selected <span class="uicontrol">union</span> from the <span class="uicontrol">Variety</span> list,
-click <span class="uicontrol">Browse</span> <img src="../images/Browse.gif" alt="This graphic is the Browse button" /> next to the <span class="uicontrol">Member
-types</span> field to specify the member types for the simple
-type. </span> You can select to add both <span class="uicontrol">Built-in simple
-types</span> and <span class="uicontrol">User-defined simple types</span> to
-the member types value list. </li>
-
-<li class="stepexpand"><span>To set specific constraint values on your simple type,
-such as length constraints, enumerations, and patterns, click the <span class="uicontrol">Constraints</span> tab.</span>
-<ol type="a">
-<li class="substepexpand"><span>You can use <em>enumerations</em> to define a set of valid
-values for simple types. They are the actual values the simple type
-can take as valid values in the instance document. You can add one
-enumeration or several enumerations at a time:</span> <ul>
-<li>To add one enumeration at a time, under <span class="uicontrol">Specific constraint
-values</span>, select <span class="uicontrol">Enumerations</span> and
-click <span class="uicontrol">Add</span> and specify a value for the enumeration.</li>
-
-<li>To add several enumerations at one time:<ol type="i">
-<li>Select <span class="uicontrol">Enumerations</span> and click <span class="uicontrol">Add</span>.</li>
-
-<li>Enter the value of each enumeration. Each value must be separated
-by the <span class="uicontrol">Delimiter character</span>. For example: <samp class="codeph">First,
-Second</samp> will create two enumerations, one with the value "First"
-and one with the value "Second".</li>
-
-<li>Select the <span class="uicontrol">Preserve leading and trailing whitespace</span> check
-box if you want any white space around your enumeration values to
-be preserved. If you select this check box, the values of <samp class="codeph">First,
-Second</samp> will show up as "First" and " Second" (there is a
-space before Second) because you put a space before "Second" when
-entering the value.</li>
-
-<li>Click <span class="uicontrol">OK</span>. Your enumerations will be created
-and appear in the Properties view.</li>
-
-</ol>
-</li>
-
-</ul>
-</li>
-
-<li class="substepexpand"><span>You can use <em>patterns</em> to place certain constraints
-regarding allowable values. </span> For example, you could restrict
-the field to only accept input which follows the pattern "five digits
-followed by two upper-case ASCII letters". To set a pattern constraint:<ol type="i">
-<li>Select <span class="uicontrol">Patterns</span> and click <span class="uicontrol">Add</span>.</li>
-
-<li>Create the regular expression pattern you wish to use as your
-constraint using the <span class="uicontrol">Regular Expression</span> wizard.</li>
-
-<li>Click <span class="uicontrol">Finish</span>.</li>
-
-</ol>
-</li>
-
-</ol>
-
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you
-want to provide any information about this simple type. </span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-<li class="stepexpand"><span>If you do not want the simple type to be used to derive
-other types, click the <span class="uicontrol">Advanced</span> tab and, in
-the <span class="uicontrol">Final</span> list, select if derivations should
-be prevented by <span class="uicontrol">list</span>, <span class="uicontrol">restriction</span>, <span class="uicontrol">union</span> or <span class="uicontrol">#all</span>.</span></li>
-
-</ol>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/taddreg.html" title="A pattern facet can be used to constrain the value of a type's lexical space (the set of string literals that represent the values of a type), which indirectly constrains the value space.">Adding pattern facets to simple types</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita
deleted file mode 100644
index 50abd13..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.dita
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tcxmlsch" xml:lang="en-us">

-<title>Creating XML schemas</title>

-<titlealts>

-<searchtitle>Creating XML schemas</searchtitle>

-</titlealts>

-<shortdesc>You can create an XML schema and then edit it using the XML schema

-editor. Using the XML schema editor, you can specify element names that indicates

-which elements are allowed in an XML file, and in which combinations.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>creating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context>To create an XML schema, complete the following steps<?Pub Caret?>:</context>

-<steps>

-<step><cmd>Create a project to contain the XML schema.</cmd></step>

-<step><cmd>In the workbench, click <menucascade><uicontrol>File > New > Other</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML > XML Schema</uicontrol>

-</menucascade>. Click <uicontrol>Next</uicontrol>.</cmd></step>

-<step><cmd>Select the project or folder that will contain the XML schema.

-In the </cmd><info><uicontrol>File name</uicontrol> field, type the name of

-the XML schema, for example <userinput>MyXMLSchema.xsd</userinput>. The name

-of your XML schema must end in <systemoutput>.xsd</systemoutput>.</info></step>

-<step><cmd>Click  <uicontrol>Finish</uicontrol>.</cmd></step>

-</steps>

-<result>The XML schema opens in the XML schema editor. </result>

-</taskbody>

-</task>

-<?Pub *0000001558?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
deleted file mode 100644
index 9b57492..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tcxmlsch.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Creating XML schemas" />
-<meta name="abstract" content="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta name="description" content="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations." />
-<meta content="XML schema files, creating" name="DC.subject" />
-<meta content="XML schema files, creating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvdtschm.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tcxmlsch" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Creating XML schemas</title>
-</head>
-<body id="tcxmlsch"><a name="tcxmlsch"><!-- --></a>
-
-
-<h1 class="topictitle1">Creating XML schemas</h1>
-
-
-
-
-<div><p>You can create an XML schema and then edit it using the XML schema
-editor. Using the XML schema editor, you can specify element names that indicates
-which elements are allowed in an XML file, and in which combinations.</p>
-
-<div class="section">To create an XML schema, complete the following steps:</div>
-
-<ol>
-<li class="stepexpand"><span>Create a project to contain the XML schema.</span></li>
-
-<li class="stepexpand"><span>In the workbench, click <span class="menucascade"><span class="uicontrol">File &gt; New &gt; Other</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML &gt; XML Schema</span>
-</span>. Click <span class="uicontrol">Next</span>.</span></li>
-
-<li class="stepexpand"><span>Select the project or folder that will contain the XML schema.
-In the </span> <span class="uicontrol">File name</span> field, type the name of
-the XML schema, for example <kbd class="userinput">MyXMLSchema.xsd</kbd>. The name
-of your XML schema must end in <tt class="sysout">.xsd</tt>.</li>
-
-<li class="stepexpand"><span>Click  <span class="uicontrol">Finish</span>.</span></li>
-
-</ol>
-
-<div class="section">The XML schema opens in the XML schema editor. </div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
deleted file mode 100644
index b13288c..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.dita
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tdelscmp" xml:lang="en-us">

-<title>Deleting XML schema components</title>

-<titlealts>

-<searchtitle>Deleting XML schema components</searchtitle>

-</titlealts>

-<shortdesc>If you have created any XML schema components you no longer need,

-you can delete them.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>deleting components</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>deleting components</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To delete an XML

-schema component, complete the following steps:</p></context>

-<steps>

-<step><cmd>Open your XML schema in the XML schema editor.</cmd></step>

-<step><cmd>In the Outline view, click the item to delete.</cmd></step>

-<step><cmd>Right-click the item, and, from its pop-up menu, click <uicontrol>Delete</uicontrol>.</cmd>

-</step>

-</steps>

-<result><p>The XML schema editor has a built-in mechanism to handle referential

-integrity issues. When you delete certain components, cleanup will automatically

-occur.</p></result>

-</taskbody>

-</task><?Pub Caret?>

-<?Pub *0000001384?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
deleted file mode 100644
index ef880c1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tdelscmp.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Deleting XML schema components" />
-<meta name="abstract" content="If you have created any XML schema components you no longer need, you can delete them." />
-<meta name="description" content="If you have created any XML schema components you no longer need, you can delete them." />
-<meta content="XML schema editor, deleting components, XML schema files" name="DC.subject" />
-<meta content="XML schema editor, deleting components, XML schema files" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/rrefintg.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tdelscmp" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Deleting XML schema components</title>
-</head>
-<body id="tdelscmp"><a name="tdelscmp"><!-- --></a>
-
-
-<h1 class="topictitle1">Deleting XML schema components</h1>
-
-
-
-
-<div><p>If you have created any XML schema components you no longer need,
-you can delete them.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To delete an XML
-schema component, complete the following steps:</p>
-</div>
-
-<ol>
-<li><span>Open your XML schema in the XML schema editor.</span></li>
-
-<li><span>In the Outline view, click the item to delete.</span></li>
-
-<li><span>Right-click the item, and, from its pop-up menu, click <span class="uicontrol">Delete</span>.</span>
-</li>
-
-</ol>
-
-<div class="section"><p>The XML schema editor has a built-in mechanism to handle referential
-integrity issues. When you delete certain components, cleanup will automatically
-occur.</p>
-</div>
-
-</div>
-
-<div><div class="relref"><strong>Related reference</strong><br />
-<div><a href="../topics/rrefintg.html" title="The XML schema editor has a built-in mechanism to handle referential integrity issues. When you delete certain nodes, clean up for any nodes affected will automatically occur.">Referential integrity in the XML schema editor</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
deleted file mode 100644
index 2c84134..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.dita
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tedtpref" xml:lang="en-us">

-<title>Editing XML schema file preferences</title>

-<titlealts>

-<searchtitle>Editing XML schema file preferences</searchtitle>

-</titlealts>

-<shortdesc>You can set various preferences for XML schema files such as the

-default target namespace and XML Schema language constructs prefix used.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>editing preferences</indexterm></indexterm>

-<indexterm>preferences<indexterm>XML schema files</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>To define XML schema file preferences, complete the following

-steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>Window > Preferences</uicontrol>

-</menucascade> and select <menucascade><uicontrol>XML</uicontrol><uicontrol>XML

-Schema Files</uicontrol></menucascade>.</cmd></step>

-<step><cmd>Select the <uicontrol>Qualify XML schema language constructs</uicontrol> check

-box if you want a prefix applied to all XML Schema language constructs in

-your XML schema.</cmd></step>

-<step><cmd>In the <uicontrol>XML schema language constructs prefix</uicontrol> field,

-type the prefix you want applied to XML Schema language constructs in your

-XML schema.</cmd><info>The prefix <uicontrol>xsd</uicontrol> is used by convention

-to denote the XML Schema namespace, but any prefix can be used. The purpose

-of the association is to identify the elements and simple types as belonging

-to the vocabulary of the XML Schema language rather than the vocabulary of

-the schema author.  <note>This prefix will not appear in any schemas that

-currently exist - it will only appear in new schemas you create after you

-type the prefix and click <uicontrol>Apply</uicontrol>. Any schemas that already

-exist will have the prefix specified in the schema applied to the XML schema

-language constructs.</note></info></step>

-<step><cmd>You can change the <uicontrol>Default Target Namespace</uicontrol> value.</cmd>

-<info>The value specified in this field will be the default target namespace

-for any new XML schema files created.</info></step>

-<step><cmd>Click <uicontrol>OK</uicontrol>.</cmd></step>

-</steps>

-<result></result>

-</taskbody>

-</task>

-<?Pub *0000002381?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
deleted file mode 100644
index bb329ed..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtpref.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML schema file preferences" />
-<meta name="abstract" content="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used." />
-<meta name="description" content="You can set various preferences for XML schema files such as the default target namespace and XML Schema language constructs prefix used." />
-<meta content="XML schema files, editing preferences, preferences" name="DC.subject" />
-<meta content="XML schema files, editing preferences, preferences" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtpref" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML schema file preferences</title>
-</head>
-<body id="tedtpref"><a name="tedtpref"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML schema file preferences</h1>
-
-
-
-
-<div><p>You can set various preferences for XML schema files such as the
-default target namespace and XML Schema language constructs prefix used.</p>
-
-<div class="section"><p>To define XML schema file preferences, complete the following
-steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">Window &gt; Preferences</span>
-</span> and select <span class="menucascade"><span class="uicontrol">XML</span> &gt; <span class="uicontrol">XML
-Schema Files</span></span>.</span></li>
-
-<li class="stepexpand"><span>Select the <span class="uicontrol">Qualify XML schema language constructs</span> check
-box if you want a prefix applied to all XML Schema language constructs in
-your XML schema.</span></li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">XML schema language constructs prefix</span> field,
-type the prefix you want applied to XML Schema language constructs in your
-XML schema.</span> The prefix <span class="uicontrol">xsd</span> is used by convention
-to denote the XML Schema namespace, but any prefix can be used. The purpose
-of the association is to identify the elements and simple types as belonging
-to the vocabulary of the XML Schema language rather than the vocabulary of
-the schema author.  <div class="note"><span class="notetitle">Note:</span> This prefix will not appear in any schemas that
-currently exist - it will only appear in new schemas you create after you
-type the prefix and click <span class="uicontrol">Apply</span>. Any schemas that already
-exist will have the prefix specified in the schema applied to the XML schema
-language constructs.</div>
-</li>
-
-<li class="stepexpand"><span>You can change the <span class="uicontrol">Default Target Namespace</span> value.</span>
- The value specified in this field will be the default target namespace
-for any new XML schema files created.</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">OK</span>.</span></li>
-
-</ol>
-
-<div class="section" />
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
deleted file mode 100644
index 1cf2b95..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.dita
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--Arbortext, Inc., 1988-2008, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<?Pub Inc?>

-<task id="tedtschm" xml:lang="en-us">

-<title>Editing XML schema properties</title>

-<titlealts>

-<searchtitle>Editing XML schema properties</searchtitle>

-</titlealts>

-<shortdesc>After you create an XML schema, you can edit its various

-properties, such as its namespace and prefix.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema editor<indexterm>XML schema properties</indexterm></indexterm>

-<indexterm>XML schema files<indexterm>editing properties</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p><?Pub Caret1?>The following instructions were written

-for the Resource perspective, but they will also work in many other

-perspectives.</p><p>To edit an XML schema's properties, complete the

-following steps:</p></context>

-<steps>

-<step><cmd>Create a new XML schema or double-click an existing schema

-in the Navigator view.</cmd><info> It will automatically open in the

-XML schema editor.</info></step>

-<step><cmd>In the Outline view, click <uicontrol>Directives</uicontrol>.</cmd>

-</step>

-<step><cmd>In the Properties view, click the <uicontrol>General</uicontrol> tab.</cmd>

-</step>

-<step><cmd>You can change the <uicontrol>Prefix</uicontrol> associated

-with the current namespace. </cmd><info>Element and attribute names

-that are associated with this namespace will be prefixed with this

-value.</info></step>

-<step><cmd>You can also edit the <uicontrol>Target namespace</uicontrol> for

-this schema.</cmd><info> A namespace is a URI that provides a unique

-name to associate with all the elements and type definitions in a

-schema.</info></step>

-<step><cmd>Click the <uicontrol>Documentation</uicontrol> tab if you

-want to provide any information about this XML schema. </cmd><info>The <uicontrol>Documentation</uicontrol> page

-is used for human readable material, such as a description.</info>

-</step>

-<step><cmd>Click the <uicontrol>Extensions</uicontrol> tab if you

-want to add application information elements to your annotations of

-schema components. </cmd><info>The <uicontrol>Extensions</uicontrol> page

-allows you to specify the schema and add XML content to your annotations.</info>

-</step>

-<step><cmd>Click the <uicontrol>Advanced</uicontrol> tab if you want

-to define the following additional schema attributes: </cmd><info><ul>

-<li><uicontrol>Prefix for elements</uicontrol> (elementFormDefault)</li>

-<li><uicontrol>Prefix for attributes</uicontrol> (attributeFormDefault)</li>

-<li><uicontrol>Block default</uicontrol> (blockDefault)</li>

-<li><uicontrol>Final default</uicontrol> (finalDefault)</li>

-</ul></info></step>

-</steps>

-</taskbody>

-</task>

-<?Pub *0000002780?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
deleted file mode 100644
index aed5ae6..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tedtschm.html
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Editing XML schema properties" />
-<meta name="abstract" content="After you create an XML schema, you can edit its various properties, such as its namespace and prefix." />
-<meta name="description" content="After you create an XML schema, you can edit its various properties, such as its namespace and prefix." />
-<meta content="XML schema editor, XML schema properties, XML schema files, editing properties" name="DC.subject" />
-<meta content="XML schema editor, XML schema properties, XML schema files, editing properties" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tedtschm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Editing XML schema properties</title>
-</head>
-<body id="tedtschm"><a name="tedtschm"><!-- --></a>
-
-
-<h1 class="topictitle1">Editing XML schema properties</h1>
-
-
-
-
-<div><p>After you create an XML schema, you can edit its various
-properties, such as its namespace and prefix.</p>
-
-<div class="section"><p>The following instructions were written
-for the Resource perspective, but they will also work in many other
-perspectives.</p>
-<p>To edit an XML schema's properties, complete the
-following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Create a new XML schema or double-click an existing schema
-in the Navigator view.</span>  It will automatically open in the
-XML schema editor.</li>
-
-<li class="stepexpand"><span>In the Outline view, click <span class="uicontrol">Directives</span>.</span>
-</li>
-
-<li class="stepexpand"><span>In the Properties view, click the <span class="uicontrol">General</span> tab.</span>
-</li>
-
-<li class="stepexpand"><span>You can change the <span class="uicontrol">Prefix</span> associated
-with the current namespace. </span> Element and attribute names
-that are associated with this namespace will be prefixed with this
-value.</li>
-
-<li class="stepexpand"><span>You can also edit the <span class="uicontrol">Target namespace</span> for
-this schema.</span>  A namespace is a URI that provides a unique
-name to associate with all the elements and type definitions in a
-schema.</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Documentation</span> tab if you
-want to provide any information about this XML schema. </span> The <span class="uicontrol">Documentation</span> page
-is used for human readable material, such as a description.
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Extensions</span> tab if you
-want to add application information elements to your annotations of
-schema components. </span> The <span class="uicontrol">Extensions</span> page
-allows you to specify the schema and add XML content to your annotations.
-</li>
-
-<li class="stepexpand"><span>Click the <span class="uicontrol">Advanced</span> tab if you want
-to define the following additional schema attributes: </span> <ul>
-<li><span class="uicontrol">Prefix for elements</span> (elementFormDefault)</li>
-
-<li><span class="uicontrol">Prefix for attributes</span> (attributeFormDefault)</li>
-
-<li><span class="uicontrol">Block default</span> (blockDefault)</li>
-
-<li><span class="uicontrol">Final default</span> (finalDefault)</li>
-
-</ul>
-</li>
-
-</ol>
-
-</div>
-
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
deleted file mode 100644
index 90014ec..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.dita
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="timpschm" xml:lang="en-us">

-<title>Importing XML schemas</title>

-<titlealts>

-<searchtitle>Importing XML schemas</searchtitle>

-</titlealts>

-<shortdesc>If you want to work with XML schema files that you created outside

-of the product, you can import them into the workbench and open them in the

-XML schema editor. The XML schema editor provides you with a structured view

-of the XML schema.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>importing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To import an XML

-schema into the workbench, complete the following steps:</p></context>

-<steps>

-<step><cmd>Click <menucascade><uicontrol>File > Import</uicontrol></menucascade>.</cmd>

-</step>

-<step><cmd>Select <menucascade><uicontrol>General</uicontrol><uicontrol>File

-System</uicontrol></menucascade> and click  <uicontrol>Next</uicontrol>.</cmd>

-</step>

-<step><cmd>Click <uicontrol>Browse</uicontrol> on the next page of the wizard

-to select the directories from which you would like to add the XML schema.</cmd>

-</step>

-<step><cmd>In the import selection panes, use the following methods to select

-exactly the resources you want to add:  </cmd><info><ul>

-<li>Expand the hierarchies in the left pane and select or clear the checkboxes

-that represent the folders in the selected directory. Then in the right pane,

-select or clear check boxes for individual files.</li>

-<li>Click <uicontrol>Filter Types</uicontrol> to filter the current selection

-for files of a specific type.</li>

-<li>Click <uicontrol>Select All</uicontrol> to select all resources in the

-directory, then go through and deselect the ones that you do not want to add.</li>

-<li>Click <uicontrol>Deselect All</uicontrol> to deselect all resources in

-the directory, then go through and choose individual resources to add.</li>

-</ul></info></step>

-<step><cmd>In the <uicontrol>Into folder</uicontrol> field, specify the Workbench

-project or folder that will be the import destination.</cmd></step>

-<step><cmd>When you have finished specifying your import options, click <uicontrol>Finish.</uicontrol></cmd>

-</step>

-</steps><?Pub Caret1?>

-<result><p>The imported schema now appears in the Navigator view. Double-click

-it to open it in the XML schema editor.</p></result>

-</taskbody>

-</task>

-<?Pub *0000002616?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
deleted file mode 100644
index 44f38a8..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/timpschm.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Importing XML schemas" />
-<meta name="abstract" content="If you want to work with XML schema files that you created outside of the product, you can import them into the workbench and open them in the XML schema editor. The XML schema editor provides you with a structured view of the XML schema." />
-<meta name="description" content="If you want to work with XML schema files that you created outside of the product, you can import them into the workbench and open them in the XML schema editor. The XML schema editor provides you with a structured view of the XML schema." />
-<meta content="XML schema files, importing" name="DC.subject" />
-<meta content="XML schema files, importing" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tedtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tvdtschm.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddimpt.html" />
-<meta scheme="URI" name="DC.Relation" content="../topics/taddincl.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="timpschm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Importing XML schemas</title>
-</head>
-<body id="timpschm"><a name="timpschm"><!-- --></a>
-
-
-<h1 class="topictitle1">Importing XML schemas</h1>
-
-
-
-
-<div><p>If you want to work with XML schema files that you created outside
-of the product, you can import them into the workbench and open them in the
-XML schema editor. The XML schema editor provides you with a structured view
-of the XML schema.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To import an XML
-schema into the workbench, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Click <span class="menucascade"><span class="uicontrol">File &gt; Import</span></span>.</span>
-</li>
-
-<li class="stepexpand"><span>Select <span class="menucascade"><span class="uicontrol">General</span> &gt; <span class="uicontrol">File
-System</span></span> and click  <span class="uicontrol">Next</span>.</span>
-</li>
-
-<li class="stepexpand"><span>Click <span class="uicontrol">Browse</span> on the next page of the wizard
-to select the directories from which you would like to add the XML schema.</span>
-</li>
-
-<li class="stepexpand"><span>In the import selection panes, use the following methods to select
-exactly the resources you want to add:  </span> <ul>
-<li>Expand the hierarchies in the left pane and select or clear the checkboxes
-that represent the folders in the selected directory. Then in the right pane,
-select or clear check boxes for individual files.</li>
-
-<li>Click <span class="uicontrol">Filter Types</span> to filter the current selection
-for files of a specific type.</li>
-
-<li>Click <span class="uicontrol">Select All</span> to select all resources in the
-directory, then go through and deselect the ones that you do not want to add.</li>
-
-<li>Click <span class="uicontrol">Deselect All</span> to deselect all resources in
-the directory, then go through and choose individual resources to add.</li>
-
-</ul>
-</li>
-
-<li class="stepexpand"><span>In the <span class="uicontrol">Into folder</span> field, specify the Workbench
-project or folder that will be the import destination.</span></li>
-
-<li class="stepexpand"><span>When you have finished specifying your import options, click <span class="uicontrol">Finish.</span></span>
-</li>
-
-</ol>
-
-<div class="section"><p>The imported schema now appears in the Navigator view. Double-click
-it to open it in the XML schema editor.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-<div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tedtschm.html" title="After you create an XML schema, you can edit its various properties, such as its namespace and prefix.">Editing XML schema properties</a></div>
-<div><a href="../topics/tvdtschm.html" title="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view.">Validating XML schemas</a></div>
-<div><a href="../topics/taddimpt.html" title="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use an import element to bring in definitions and declarations from an imported schema into the current schema.">Adding import elements</a></div>
-<div><a href="../topics/taddincl.html" title="If your schemas are large, you might choose to divide their content among several schema documents to make them easier to maintain, reuse, and read. You can use the include element to bring in definitions and declarations from the included schema into the current schema. The included schema must be in the same target namespace as the including schema.">Adding include elements</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita
deleted file mode 100644
index 60386d1..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.dita
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tnavsrc" xml:lang="en-us">

-<title>Navigating XML schemas</title>

-<titlealts>

-<searchtitle>Navigating XML schemas</searchtitle>

-</titlealts>

-<shortdesc>When you are working in the Source view, you can use F3 to navigate

-through the file by placing your cursor in the appropriate item and pressing

-F3 to jump to the item it refers to. </shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>navigating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>You can jump to any of the following items:</p><ul>

-<li>Element or attribute declaration's type</li>

-<li>Element references</li>

-<li>Group references</li>

-<li>Attribute references</li>

-<li>Attribute group references</li>

-<li>Import, include, and redefine element (the external schema will open in

-the XML schema editor. This only works with schemas in the workspace).</li>

-<li></li>

-</ul><p>You<?Pub Caret?> must place your cursor exactly in the location of

-the reference (for example between the double quotes for <systemoutput>type

-= " "</systemoutput> or  <systemoutput>base = " "</systemoutput>).</p><p>For

-example, if you place your cursor anywhere in the following text and press

-F3:</p><p> <systemoutput>&lt;element name="shipTo" type="po:USAddress">&lt;/element></systemoutput> </p><p>the

-cursor will automatically jump to the location in the file where the type

-USAddress is defined.</p><p>Or, if you place your cursor anywhere in the following

-text and click F3:</p><p> <systemoutput>&lt;element ref="po:ContactElement">&lt;/element></systemoutput> </p><p>the

-cursor will automatically jump to the location in the file where the global

-element ContactElement is defined.</p><p>This works across files. For example,

-if the type you have selected is defined in another XML schema and you click

-F3, you will automatically be taken to that file.</p></context>

-</taskbody>

-</task>

-<?Pub *0000002066?>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
deleted file mode 100644
index 21e4df0..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tnavsrc.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Navigating XML schemas" />
-<meta name="abstract" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and pressing F3 to jump to the item it refers to." />
-<meta name="description" content="When you are working in the Source view, you can use F3 to navigate through the file by placing your cursor in the appropriate item and pressing F3 to jump to the item it refers to." />
-<meta content="XML schema files, navigating" name="DC.subject" />
-<meta content="XML schema files, navigating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/cxmlsced.html" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tnavsrc" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Navigating XML schemas</title>
-</head>
-<body id="tnavsrc"><a name="tnavsrc"><!-- --></a>
-
-
-<h1 class="topictitle1">Navigating XML schemas</h1>
-
-
-
-
-<div><p>When you are working in the Source view, you can use F3 to navigate
-through the file by placing your cursor in the appropriate item and pressing
-F3 to jump to the item it refers to. </p>
-
-<div class="section"><p>You can jump to any of the following items:</p>
-<ul>
-<li>Element or attribute declaration's type</li>
-
-<li>Element references</li>
-
-<li>Group references</li>
-
-<li>Attribute references</li>
-
-<li>Attribute group references</li>
-
-<li>Import, include, and redefine element (the external schema will open in
-the XML schema editor. This only works with schemas in the workspace).</li>
-
-<li />
-
-</ul>
-<p>You must place your cursor exactly in the location of
-the reference (for example between the double quotes for <tt class="sysout">type
-= " "</tt> or  <tt class="sysout">base = " "</tt>).</p>
-<p>For
-example, if you place your cursor anywhere in the following text and press
-F3:</p>
-<p> <tt class="sysout">&lt;element name="shipTo" type="po:USAddress"&gt;&lt;/element&gt;</tt> </p>
-<p>the
-cursor will automatically jump to the location in the file where the type
-USAddress is defined.</p>
-<p>Or, if you place your cursor anywhere in the following
-text and click F3:</p>
-<p> <tt class="sysout">&lt;element ref="po:ContactElement"&gt;&lt;/element&gt;</tt> </p>
-<p>the
-cursor will automatically jump to the location in the file where the global
-element ContactElement is defined.</p>
-<p>This works across files. For example,
-if the type you have selected is defined in another XML schema and you click
-F3, you will automatically be taken to that file.</p>
-</div>
-
-</div>
-
-<div><div class="relconcepts"><strong>Related concepts</strong><br />
-<div><a href="../topics/cxmlsced.html" title="This product provides an XML schema editor for creating, viewing, and validating XML schemas. XML schemas are a formal specification of element names that indicates which elements are allowed in an XML file, and in which combinations.">XML schema editor</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
deleted file mode 100644
index 8736a4a..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.dita
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="refactoring" xml:lang="en-us">

-<title>Refactoring in XML Schema Files</title>

-<titlealts>

-<searchtitle>Refactoring in XML Schema Files</searchtitle>

-</titlealts>

-<shortdesc>Within an XML Schema file, refactoring allows authors to make a

-single artifact change, and have that change implemented throughout all other

-dependant artifacts.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm keyref="trefactrXSD|1|dependentartifactsrefactortingXMLschemafiles"

-status="new">dependent artifacts<indexterm>refactoring XML schema files</indexterm></indexterm>

-<indexterm keyref="trefactrXSD|2|refactoringXMLschemafiles" status="new">refactoring<indexterm>XML

-schema files</indexterm></indexterm><indexterm keyref="trefactrXSD|3|renamingXMLschemafiles"

-status="new">renaming<indexterm>XML schema files</indexterm></indexterm><indexterm

-keyref="trefactrXSD|4|XMLschemasediting" status="changed">schemas<indexterm>editing</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<prereq></prereq>

-<context>Refactoring eliminates the need for the tedious editing necessary

-to recover broken dependencies caused by artifact changes which cause ripple

-effects on other dependant artifacts (such as renaming an XML Schema element).</context>

-<steps>

-<step><cmd>Create a new XML schema or double-click an existing schema in the

-Navigator view.</cmd><info> It will automatically open in the XML schema editor.</info>

-</step>

-<step><cmd>To refactor an artifact, position cursor within the artifact, right-click

-the artifact, click <menucascade><uicontrol>Refactor</uicontrol><uicontrol>Rename</uicontrol>

-</menucascade></cmd><info>A popup dialog will request the entry of a new name

-for that artifact</info>

-<substeps>

-<substep><cmd>Type in the new name of the artifact.</cmd></substep>

-<substep><cmd>(Optional) Click <b>Preview</b>.</cmd><info>A window will open

-indicating all of the changes which will take place due to the refactoring.</info>

-</substep>

-<substep><cmd>Click <uicontrol>OK.</uicontrol></cmd></substep>

-</substeps>

-</step>

-</steps>

-<result>The new name will be entered in the opened XSD source, as well as

-in all dependant artifacts.</result>

-<example><b><u>Component References in XML Schema</u></b><simpletable>

-<sthead>

-<stentry>Global named components</stentry>

-<stentry>Reference</stentry>

-</sthead>

-<strow>

-<stentry><ul>

-<li>&lt;element name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;element ref="foo"></li>

-<li>&lt;element substitutionGroup="foo"</li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;simple/complexType name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;element type="foo"></li>

-<li>&lt;attribute type="foo"></li>

-<li>&lt;restriction base="foo"></li>

-<li>&lt;substitution base="foo"></li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;attribute name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;attribute ref="foo"></li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;attributeGroup name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;attributeGroup ref="foo"></li>

-</ul></stentry>

-</strow>

-<strow>

-<stentry><ul>

-<li>&lt;group name="foo"></li>

-</ul></stentry>

-<stentry><ul>

-<li>&lt;group ref="foo"></li>

-</ul></stentry>

-</strow>

-</simpletable></example>

-<postreq></postreq>

-</taskbody>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
deleted file mode 100644
index 521a937..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/trefactrXSD.html
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Refactoring in XML Schema Files" />
-<meta name="abstract" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
-<meta name="description" content="Within an XML Schema file, refactoring allows authors to make a single artifact change, and have that change implemented throughout all other dependant artifacts." />
-<meta content="dependent artifacts, refactoring XML schema files, refactoring, XML schema files, renaming, XML schema files, schemas, editing" name="DC.subject" />
-<meta content="dependent artifacts, refactoring XML schema files, refactoring, XML schema files, renaming, XML schema files, schemas, editing" name="keywords" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="refactoring" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Refactoring in XML Schema Files</title>
-</head>
-<body id="refactoring"><a name="refactoring"><!-- --></a>
-
-
-<h1 class="topictitle1">Refactoring in XML Schema Files</h1>
-
-
-
-
-<div><p>Within an XML Schema file, refactoring allows authors to make a
-single artifact change, and have that change implemented throughout all other
-dependant artifacts.</p>
-
-<div class="p" />
-
-<div class="section">Refactoring eliminates the need for the tedious editing necessary
-to recover broken dependencies caused by artifact changes which cause ripple
-effects on other dependant artifacts (such as renaming an XML Schema element).</div>
-
-<ol>
-<li class="stepexpand"><span>Create a new XML schema or double-click an existing schema in the
-Navigator view.</span>  It will automatically open in the XML schema editor.
-</li>
-
-<li class="stepexpand"><span>To refactor an artifact, position cursor within the artifact, right-click
-the artifact, click <span class="menucascade"><span class="uicontrol">Refactor</span> &gt; <span class="uicontrol">Rename</span>
-</span></span> A popup dialog will request the entry of a new name
-for that artifact
-<ol type="a">
-<li class="substepexpand"><span>Type in the new name of the artifact.</span></li>
-
-<li class="substepexpand"><span>(Optional) Click <strong>Preview</strong>.</span> A window will open
-indicating all of the changes which will take place due to the refactoring.
-</li>
-
-<li class="substepexpand"><span>Click <span class="uicontrol">OK.</span></span></li>
-
-</ol>
-
-</li>
-
-</ol>
-
-<div class="section">The new name will be entered in the opened XSD source, as well as
-in all dependant artifacts.</div>
-
-<div class="example"><strong><u>Component References in XML Schema</u></strong><table summary="" cellspacing="0" cellpadding="4" border="1" class="simpletableborder">
-<tr>
-<th valign="bottom" align="left" id="N100FE">Global named components</th>
-
-<th valign="bottom" align="left" id="N10104">Reference</th>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100FE"><ul>
-<li>&lt;element name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N10104"><ul>
-<li>&lt;element ref="foo"&gt;</li>
-
-<li>&lt;element substitutionGroup="foo"</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100FE"><ul>
-<li>&lt;simple/complexType name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N10104"><ul>
-<li>&lt;element type="foo"&gt;</li>
-
-<li>&lt;attribute type="foo"&gt;</li>
-
-<li>&lt;restriction base="foo"&gt;</li>
-
-<li>&lt;substitution base="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100FE"><ul>
-<li>&lt;attribute name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N10104"><ul>
-<li>&lt;attribute ref="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100FE"><ul>
-<li>&lt;attributeGroup name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N10104"><ul>
-<li>&lt;attributeGroup ref="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-<tr>
-<td valign="top" headers="N100FE"><ul>
-<li>&lt;group name="foo"&gt;</li>
-
-</ul>
-</td>
-
-<td valign="top" headers="N10104"><ul>
-<li>&lt;group ref="foo"&gt;</li>
-
-</ul>
-</td>
-
-</tr>
-
-</table>
-</div>
-
-<div class="section" />
-
-</div>
-
-<div />
-
-</body>
-</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
deleted file mode 100644
index 4573f7e..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.dita
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<!--Arbortext, Inc., 1988-2006, v.4002-->

-<!DOCTYPE task PUBLIC "-//OASIS//DTD DITA Task//EN"

- "task.dtd">

-<task id="tvdtschm" xml:lang="en-us">

-<title>Validating XML schemas</title>

-<titlealts>

-<searchtitle>Validating XML schemas</searchtitle>

-</titlealts>

-<shortdesc>Validating an XML schema determines whether the current state of

-the XML schema file is semantically valid. Any errors will be displayed in

-the Problems view.</shortdesc>

-<prolog><metadata>

-<keywords><indexterm>XML schema files<indexterm>validating</indexterm></indexterm>

-</keywords>

-</metadata></prolog>

-<taskbody>

-<context><p>The following instructions were written for the Resource perspective,

-but they will also work in many other perspectives.</p><p>To validate an XML

-schema, complete the following steps:</p></context>

-<steps>

-<step><cmd>Right-click your file in the Navigator view and click <uicontrol>Validate</uicontrol>.</cmd>

-</step>

-<step><cmd> If validation was not successful, you can refer to the Problems

-view to see what problems were logged. </cmd><info> <note> If you receive

-an error message indicating that the Problems view is full, you can increase

-the number of error messages allowed by clicking <menucascade><uicontrol>Window</uicontrol>

-<uicontrol>Preferences</uicontrol></menucascade> and selecting <menucascade>

-<uicontrol>General</uicontrol><uicontrol>Markers</uicontrol></menucascade>.

-Select the <uicontrol>Use marker limits</uicontrol> check box and change the

-number in the <uicontrol>Limit visible items per group</uicontrol> field.</note></info>

-</step>

-</steps>

-<result><p>The XML schema support in the XML schema editor is based on the

-W3C XML Schema Recommendation Specification. The XML Schema specifications

-XML Schema Part 1: Structures and XML Schema Part 2: Datatypes from the W3C

-Web site are used for validation.</p><p>Certain error messages contain a reference

-to the schema constraints listed in Appendix C of the XML Schema Part 1: Structures

-document. Each constraint has a unique name that will be referenced in the

-error message. For example, if you receive an error message with this text: <systemoutput>ct-props-correct</systemoutput> and

-you searched in the Structure document for the text, you would find that it

-is for the section "Schema Component Constraint: Complex Type Definition Properties

-Correct". </p><p>You can set up a project's properties so that different types

-of project resources are automatically validated when you save them (this

-is set for all resources by default). From a project's pop-up menu select <uicontrol>Properties</uicontrol>,

-then select <uicontrol>Validation</uicontrol>. Any validators you can run

-against your project will be listed in the Validation page.</p></result>

-</taskbody>

-<related-links>

-<link href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.dita" scope="peer">

-<linktext>Validating code in enterprise applications</linktext>

-<desc>General validation information</desc>

-</link>

-<link href="http://www.w3.org/TR/xmlschema-1" scope="external"><linktext>XML

-Schema Part 1: Structures</linktext>

-<desc>See the W3C Web site for more information on XML Schema specifications</desc>

-</link>

-<link href="http://www.w3.org/TR/xmlschema-2" scope="external"><linktext>XML

-Schema Part 2: Datatypes</linktext>

-<desc>See the W3C Web site for more information on XML Schema specifications</desc>

-</link>

-</related-links>

-</task>

diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html b/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
deleted file mode 100644
index 179c169..0000000
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/topics/tvdtschm.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="en-us" xml:lang="en-us">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
-<meta name="copyright" content="Copyright (c) 2000, 2009 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html. Contributors: IBM Corporation - initial API and implementation" />
-<meta name="DC.rights.owner" content="(C) Copyright 2000, 2009" />
-<meta content="public" name="security" />
-<meta content="index,follow" name="Robots" />
-<meta http-equiv="PICS-Label" content='(PICS-1.1 "http://www.icra.org/ratingsv02.html" l gen true r (cz 1 lz 1 nz 1 oz 1 vz 1) "http://www.rsac.org/ratingsv01.html" l gen true r (n 0 s 0 v 0 l 0) "http://www.classify.org/safesurf/" l gen true r (SS~~000 1))' />
-<meta content="task" name="DC.Type" />
-<meta name="DC.Title" content="Validating XML schemas" />
-<meta name="abstract" content="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view." />
-<meta name="description" content="Validating an XML schema determines whether the current state of the XML schema file is semantically valid. Any errors will be displayed in the Problems view." />
-<meta content="XML schema files, validating" name="DC.subject" />
-<meta content="XML schema files, validating" name="keywords" />
-<meta scheme="URI" name="DC.Relation" content="../topics/tcxmlsch.html" />
-<meta scheme="URI" name="DC.Relation" content="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" />
-<meta scheme="URI" name="DC.Relation" content="http://www.w3.org/TR/xmlschema-1" />
-<meta scheme="URI" name="DC.Relation" content="http://www.w3.org/TR/xmlschema-2" />
-<meta content="XHTML" name="DC.Format" />
-<meta content="tvdtschm" name="DC.Identifier" />
-<meta content="en-us" name="DC.Language" />
-<link href="../../org.eclipse.wst.doc.user/common.css" type="text/css" rel="stylesheet" />
-<title>Validating XML schemas</title>
-</head>
-<body id="tvdtschm"><a name="tvdtschm"><!-- --></a>
-
-
-<h1 class="topictitle1">Validating XML schemas</h1>
-
-
-
-
-<div><p>Validating an XML schema determines whether the current state of
-the XML schema file is semantically valid. Any errors will be displayed in
-the Problems view.</p>
-
-<div class="section"><p>The following instructions were written for the Resource perspective,
-but they will also work in many other perspectives.</p>
-<p>To validate an XML
-schema, complete the following steps:</p>
-</div>
-
-<ol>
-<li class="stepexpand"><span>Right-click your file in the Navigator view and click <span class="uicontrol">Validate</span>.</span>
-</li>
-
-<li class="stepexpand"><span> If validation was not successful, you can refer to the Problems
-view to see what problems were logged. </span>  <div class="note"><span class="notetitle">Note:</span>  If you receive
-an error message indicating that the Problems view is full, you can increase
-the number of error messages allowed by clicking <span class="menucascade"><span class="uicontrol">Window</span>
- &gt; <span class="uicontrol">Preferences</span></span> and selecting <span class="menucascade">
-<span class="uicontrol">General</span> &gt; <span class="uicontrol">Markers</span></span>.
-Select the <span class="uicontrol">Use marker limits</span> check box and change the
-number in the <span class="uicontrol">Limit visible items per group</span> field.</div>
-
-</li>
-
-</ol>
-
-<div class="section"><p>The XML schema support in the XML schema editor is based on the
-W3C XML Schema Recommendation Specification. The XML Schema specifications
-XML Schema Part 1: Structures and XML Schema Part 2: Datatypes from the W3C
-Web site are used for validation.</p>
-<p>Certain error messages contain a reference
-to the schema constraints listed in Appendix C of the XML Schema Part 1: Structures
-document. Each constraint has a unique name that will be referenced in the
-error message. For example, if you receive an error message with this text: <tt class="sysout">ct-props-correct</tt> and
-you searched in the Structure document for the text, you would find that it
-is for the section "Schema Component Constraint: Complex Type Definition Properties
-Correct". </p>
-<p>You can set up a project's properties so that different types
-of project resources are automatically validated when you save them (this
-is set for all resources by default). From a project's pop-up menu select <span class="uicontrol">Properties</span>,
-then select <span class="uicontrol">Validation</span>. Any validators you can run
-against your project will be listed in the Validation page.</p>
-</div>
-
-</div>
-
-<div><div class="reltasks"><strong>Related tasks</strong><br />
-<div><a href="../topics/tcxmlsch.html" title="You can create an XML schema and then edit it using the XML schema editor. Using the XML schema editor, you can specify element names that indicates which elements are allowed in an XML file, and in which combinations.">Creating XML schemas</a></div>
-</div>
-<div class="relinfo"><strong>Related information</strong><br />
-<div><a href="../../org.eclipse.jst.j2ee.doc.user/topics/tjval.html" title="General validation information">Validating code in enterprise applications</a></div>
-<div><a href="http://www.w3.org/TR/xmlschema-1" target="_blank" title="See the W3C Web site for more information on XML Schema specifications">XML
-Schema Part 1: Structures</a></div>
-<div><a href="http://www.w3.org/TR/xmlschema-2" target="_blank" title="See the W3C Web site for more information on XML Schema specifications">XML
-Schema Part 2: Datatypes</a></div>
-</div>
-</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_core.feature.patch/.project b/features/org.eclipse.wst.web_core.feature.patch/.project
deleted file mode 100644
index 1825661..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_core.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_core.feature.patch/build.properties b/features/org.eclipse.wst.web_core.feature.patch/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html b/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
deleted file mode 100644
index 60c3bc4..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/buildnotes_org.eclipse.wst.xml_ui.feature.patch.html
+++ /dev/null
@@ -1,19 +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="Build" content="Build">
-   <title>WTP 1.5.5 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 1.5.5 Patches</h1>
-
-<h2>org.eclipse.jst.web_ui.feature</h2>
-
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=185402'>185402</a>. JSP validation fails because of defaulted attribute flush on jsp:include</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=203711'>203711</a>. taglib declarations in JSP fragments</p>
-<p>Bug <a href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=199053'>199053</a>. Syntax errors outside of scripting areas not reported</p>
-
diff --git a/features/org.eclipse.wst.web_core.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.wst.web_core.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature.patch/epl-v10.html b/features/org.eclipse.wst.web_core.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_core.feature.patch/feature.properties b/features/org.eclipse.wst.web_core.feature.patch/feature.properties
deleted file mode 100644
index 7997b4a..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/feature.properties
+++ /dev/null
@@ -1,156 +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=WTP Patch for wst.xml_ui
-
-# "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=\
-A patch for sse.ui\n\
-This patch fixes problems described in the following bugs: \n\
-\n\
-Bug 185402 JSP validation fails because of defaulted attribute flush on jsp:include  \n\
-See bug 185402 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=185402)) \n\
-\n\
-Bug 203711 taglib declarations in JSP fragments  \n\
-See bug 203711 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=203711)) \n\
-\n\
-Bug 199053 Syntax errors outside of scripting areas not reported  \n\
-See bug 199053 (https://bugs.eclipse.org/bugs/show_bug.cgi?id=199053)) \n\
-\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-October, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_core.feature.patch/feature.xml b/features/org.eclipse.wst.web_core.feature.patch/feature.xml
deleted file mode 100644
index a781364..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_core.feature.patch"
-      label="%featureName"
-      version="1.5.5.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.wst.web_core.feature" version="1.5.5.v200708090518--4hNDDiEnJWDdRQ" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.wst.html.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_core.feature.patch/license.html b/features/org.eclipse.wst.web_core.feature.patch/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.wst.web_core.feature.patch/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.wst.web_core.feature/.cvsignore b/features/org.eclipse.wst.web_core.feature/.cvsignore
deleted file mode 100644
index 8a9b065..0000000
--- a/features/org.eclipse.wst.web_core.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_core.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.web_core.feature/.project b/features/org.eclipse.wst.web_core.feature/.project
deleted file mode 100644
index fa0ce1f..0000000
--- a/features/org.eclipse.wst.web_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_core.feature/build.properties b/features/org.eclipse.wst.web_core.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.web_core.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/features/org.eclipse.wst.web_core.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/epl-v10.html b/features/org.eclipse.wst.web_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_core.feature/feature.properties b/features/org.eclipse.wst.web_core.feature/feature.properties
deleted file mode 100644
index 2cbed5c..0000000
--- a/features/org.eclipse.wst.web_core.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Core
-
-# "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=Web tools core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_core.feature/feature.xml b/features/org.eclipse.wst.web_core.feature/feature.xml
deleted file mode 100644
index d4a99de..0000000
--- a/features/org.eclipse.wst.web_core.feature/feature.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_core.feature"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.jsdt.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.common_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_core.feature"
-         version="0.0.0"/>
-
-
-   <plugin
-         id="org.eclipse.wst.css.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.html.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_core.feature/license.html b/features/org.eclipse.wst.web_core.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_core.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.html b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/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@
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 61f1e6e..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web Core\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/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index c9d38d6..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/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
-###############################################################################
-pluginName=Web Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/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>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 57260a4..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Core Developer Resources
-
-# "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=Source code zips for WST Web core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-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>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<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>
-	<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>	
-	<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>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/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@

diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 61f1e6e..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web Core\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/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index c9d38d6..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/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
-###############################################################################
-pluginName=Web Standard Tools - Web Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.web_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/.cvsignore b/features/org.eclipse.wst.web_sdk.feature/.cvsignore
deleted file mode 100644
index 2ad302e..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-build.xml
-features
-plugins
-org.eclipse.wst.web_sdk.feature_1.0.0.bin.dist.zip
diff --git a/features/org.eclipse.wst.web_sdk.feature/.project b/features/org.eclipse.wst.web_sdk.feature/.project
deleted file mode 100644
index b79f84b..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_sdk.feature/build.properties b/features/org.eclipse.wst.web_sdk.feature/build.properties
deleted file mode 100644
index 23244a4..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
-generate.feature@org.eclipse.wst.web_ui.feature.source=org.eclipse.wst.web_ui.feature, feature@org.eclipse.wst.web_core.feature.source
-
diff --git a/features/org.eclipse.wst.web_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_sdk.feature/epl-v10.html b/features/org.eclipse.wst.web_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.properties b/features/org.eclipse.wst.web_sdk.feature/feature.properties
deleted file mode 100644
index c1e2ef3..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web Plug-in Developer Resources
-
-# "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=Source code zips for the WST web tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_sdk.feature/feature.xml b/features/org.eclipse.wst.web_sdk.feature/feature.xml
deleted file mode 100644
index 22fe242..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/feature.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_sdk.feature"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.web_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_ui.feature.source"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.jsdt_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.server_sdk.feature"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_sdk.feature/license.html b/features/org.eclipse.wst.web_sdk.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_sdk.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.web_ui.feature.patch/.project b/features/org.eclipse.wst.web_ui.feature.patch/.project
deleted file mode 100644
index 4bcd9fe..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_ui.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_ui.feature.patch/build.properties b/features/org.eclipse.wst.web_ui.feature.patch/build.properties
deleted file mode 100644
index cb50260..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/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/features/org.eclipse.wst.web_ui.feature.patch/buildnotes_org.eclipse.wst.web_ui.feature.patch.html b/features/org.eclipse.wst.web_ui.feature.patch/buildnotes_org.eclipse.wst.web_ui.feature.patch.html
deleted file mode 100644
index e392a3c..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/buildnotes_org.eclipse.wst.web_ui.feature.patch.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="Build" content="Build">
-<title>WTP 3.0.4 Patches</title>
-</head>
-
-<body>
-
-<h1>WTP 3.0.4 Patches</h1>
-
-<h2>org.eclipse.wst.web_ui.feature</h2>
-
-<p>Bug <a
-	href='https://bugs.eclipse.org/bugs/show_bug.cgi?id=270407'>270407</a>.
-org.eclipse.ui.workbench.texteditor.hyperlinkDetectors' extension point will be ignored
-</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_ui.feature.patch/eclipse_update_120.jpg b/features/org.eclipse.wst.web_ui.feature.patch/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature.patch/epl-v10.html b/features/org.eclipse.wst.web_ui.feature.patch/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_ui.feature.patch/feature.properties b/features/org.eclipse.wst.web_ui.feature.patch/feature.properties
deleted file mode 100644
index 500d125..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/feature.properties
+++ /dev/null
@@ -1,148 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# 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=WTP Patch for org.eclipse.wst.web_ui.feature
-
-# "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=\
-Contains fixes for the following bugs: \n\
-\n\
-Bug https://bugs.eclipse.org/270407 org.eclipse.ui.workbench.texteditor.hyperlinkDetectors' extension point will be ignored\n\
-\n\
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2008 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\
-October, 2008\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/features/org.eclipse.wst.web_ui.feature.patch/feature.xml b/features/org.eclipse.wst.web_ui.feature.patch/feature.xml
deleted file mode 100644
index d185d36..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_ui.feature.patch"
-      label="%featureName"
-      version="3.0.4.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.wst.web_ui.feature" version="3.0.4.v200811240900-7R0EP7E8Ks9v7urtuDJtBcaRV6Ri" patch="true"/>
-   </requires>
-   
-   <plugin
-         id="org.eclipse.wst.jsdt.web.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-         
-</feature>
diff --git a/features/org.eclipse.wst.web_ui.feature.patch/license.html b/features/org.eclipse.wst.web_ui.feature.patch/license.html
deleted file mode 100644
index 2347060..0000000
--- a/features/org.eclipse.wst.web_ui.feature.patch/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.wst.web_ui.feature/.cvsignore b/features/org.eclipse.wst.web_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.web_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.web_ui.feature/.project b/features/org.eclipse.wst.web_ui.feature/.project
deleted file mode 100644
index 024b477..0000000
--- a/features/org.eclipse.wst.web_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_ui.feature/build.properties b/features/org.eclipse.wst.web_ui.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.web_ui.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/features/org.eclipse.wst.web_ui.feature/epl-v10.html b/features/org.eclipse.wst.web_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.properties b/features/org.eclipse.wst.web_ui.feature/feature.properties
deleted file mode 100644
index 7f5e288..0000000
--- a/features/org.eclipse.wst.web_ui.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2009 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# 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=Eclipse Web Developer Tools
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=Eclipse Web Developer Tools, including HTML, CSS, XHTML, etc.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006, 2009 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June, 2009\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_ui.feature/feature.xml b/features/org.eclipse.wst.web_ui.feature/feature.xml
deleted file mode 100644
index 37234c4..0000000
--- a/features/org.eclipse.wst.web_ui.feature/feature.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_ui.feature"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.wst.web.ui">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.web_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.web_core.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.jsdt.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"/>
-
-
-   <plugin
-         id="org.eclipse.wst.jsdt.web.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.jsdt.web.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.html.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.css.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.html.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.web.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_ui.feature/license.html b/features/org.eclipse.wst.web_ui.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_ui.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/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@
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 3195c0a..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web UI\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/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 0656fb9..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/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
-###############################################################################
-pluginName=Web Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index dd8a618..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-
-generate.feature@org.eclipse.wst.web_core.feature.source = org.eclipse.wst.web_core.feature
-
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/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>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 1d92f12..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,133 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web UI Developer Resources
-
-# "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=Source code zips for WST Web UI.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-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>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<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>
-	<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>	
-	<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>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/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@

diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 3195c0a..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - Web UI\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/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 0656fb9..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/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
-###############################################################################
-pluginName=Web Standard Tools - Web UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.web_ui.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_userdoc.feature/.cvsignore b/features/org.eclipse.wst.web_userdoc.feature/.cvsignore
deleted file mode 100644
index 9cfe174..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build.xml
-org.eclipse.wst.web_userdoc.feature_1.0.0.jar
diff --git a/features/org.eclipse.wst.web_userdoc.feature/.project b/features/org.eclipse.wst.web_userdoc.feature/.project
deleted file mode 100644
index 1b5eb31..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.web_userdoc.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.web_userdoc.feature/build.properties b/features/org.eclipse.wst.web_userdoc.feature/build.properties
deleted file mode 100644
index 7f47694..0000000
--- a/features/org.eclipse.wst.web_userdoc.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/features/org.eclipse.wst.web_userdoc.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.web_userdoc.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.web_userdoc.feature/epl-v10.html b/features/org.eclipse.wst.web_userdoc.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.web_userdoc.feature/feature.properties b/features/org.eclipse.wst.web_userdoc.feature/feature.properties
deleted file mode 100644
index 35a1216..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST Web User Documentation
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST Web user documentation
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.web_userdoc.feature/feature.xml b/features/org.eclipse.wst.web_userdoc.feature/feature.xml
deleted file mode 100644
index 712ec3c..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/feature.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.web_userdoc.feature"
-      label="%featureName"
-      version="3.1.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.wst.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.webtools.doc.user"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.web_userdoc.feature/license.html b/features/org.eclipse.wst.web_userdoc.feature/license.html
deleted file mode 100644
index 5644598..0000000
--- a/features/org.eclipse.wst.web_userdoc.feature/license.html
+++ /dev/null
@@ -1,98 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>) 
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>) 
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>) 
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>) 
-
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) 
-  </LI>
-    
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_core.feature.patch/.project b/features/org.eclipse.wst.xml_core.feature.patch/.project
deleted file mode 100644
index 648c793..0000000
--- a/features/org.eclipse.wst.xml_core.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_core.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_core.feature.patch/description.txt b/features/org.eclipse.wst.xml_core.feature.patch/description.txt
deleted file mode 100644
index 2d8148a..0000000
--- a/features/org.eclipse.wst.xml_core.feature.patch/description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This head trunk is deliberatly empty. 
-
-Please load the appropriate maintenance branch. 
-
diff --git a/features/org.eclipse.wst.xml_core.feature/.cvsignore b/features/org.eclipse.wst.xml_core.feature/.cvsignore
deleted file mode 100644
index b235ae1..0000000
--- a/features/org.eclipse.wst.xml_core.feature/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build.xml
-org.eclipse.wst.xml_core.feature_1.5.0.200605080104.bin.dist.zip
-dev.properties
diff --git a/features/org.eclipse.wst.xml_core.feature/.project b/features/org.eclipse.wst.xml_core.feature/.project
deleted file mode 100644
index 11ae248..0000000
--- a/features/org.eclipse.wst.xml_core.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_core.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_core.feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.wst.xml_core.feature/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index b409276..0000000
--- a/features/org.eclipse.wst.xml_core.feature/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Mon May 08 09:10:27 EDT 2006
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/features/org.eclipse.wst.xml_core.feature/build.properties b/features/org.eclipse.wst.xml_core.feature/build.properties
deleted file mode 100644
index 364480b..0000000
--- a/features/org.eclipse.wst.xml_core.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               license.html,\
-               feature.properties
-
diff --git a/features/org.eclipse.wst.xml_core.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_core.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_core.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/epl-v10.html b/features/org.eclipse.wst.xml_core.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_core.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.properties b/features/org.eclipse.wst.xml_core.feature/feature.properties
deleted file mode 100644
index 3544f59..0000000
--- a/features/org.eclipse.wst.xml_core.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Core
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=WST XML core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_core.feature/feature.xml b/features/org.eclipse.wst.xml_core.feature/feature.xml
deleted file mode 100644
index 7c5edba..0000000
--- a/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_core.feature"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <plugin
-         id="javax.xml"
-         download-size="190"
-         install-size="190"
-         version="1.3.4.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xml.resolver"
-         download-size="96"
-         install-size="96"
-         version="1.2.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xml.serializer"
-         download-size="270"
-         install-size="270"
-         version="2.7.1.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.xerces"
-         download-size="1200"
-         install-size="1200"
-         version="2.9.0.qualifier"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.standard.schemas"
-         download-size="152"
-         install-size="152"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_core.feature/license.html b/features/org.eclipse.wst.xml_core.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_core.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/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@
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index e1c2716..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - XML Core\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/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 8f43777..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/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
-###############################################################################
-pluginName=Web Standard Tools - XML Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index f249e9f..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/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>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index be282aa..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML Core Developer Resources
-
-# "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=Source code zips for WST XML core.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-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>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<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>
-	<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>	
-	<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>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/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@

diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index e1c2716..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - XML Core\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/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index ead512d..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index 8f43777..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/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
-###############################################################################
-pluginName=Web Standard Tools - XML Core Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/wtp_prod32.gif b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/wtp_prod32.png b/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.xml_core.feature/sourceTemplatePlugin/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_sdk.feature/.cvsignore b/features/org.eclipse.wst.xml_sdk.feature/.cvsignore
deleted file mode 100644
index 8774952..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-features
-plugins
-build.xml
-dev.properties
diff --git a/features/org.eclipse.wst.xml_sdk.feature/.project b/features/org.eclipse.wst.xml_sdk.feature/.project
deleted file mode 100644
index 4275fa6..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_sdk.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/build.properties b/features/org.eclipse.wst.xml_sdk.feature/build.properties
deleted file mode 100644
index 724050e..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-bin.includes = feature.xml,\
-               license.html,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               feature.properties
-generate.feature@org.eclipse.wst.xml_ui.feature.source=org.eclipse.wst.xml_ui.feature, feature@org.eclipse.wst.xml_core.feature.source 
diff --git a/features/org.eclipse.wst.xml_sdk.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_sdk.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_sdk.feature/epl-v10.html b/features/org.eclipse.wst.xml_sdk.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.properties b/features/org.eclipse.wst.xml_sdk.feature/feature.properties
deleted file mode 100644
index dc6f535..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# 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=Eclipse XML Editors and Tools 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=Source code zips for the WST XML tools
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2008 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June, 2008\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_sdk.feature/feature.xml b/features/org.eclipse.wst.xml_sdk.feature/feature.xml
deleted file mode 100644
index af8a74f..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/feature.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_sdk.feature"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.wst.common_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_ui.feature.source"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_sdk.feature/license.html b/features/org.eclipse.wst.xml_sdk.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_sdk.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/.project b/features/org.eclipse.wst.xml_ui.feature.patch/.project
deleted file mode 100644
index 910c1f8..0000000
--- a/features/org.eclipse.wst.xml_ui.feature.patch/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_ui.feature.patch</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/build.properties b/features/org.eclipse.wst.xml_ui.feature.patch/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.wst.xml_ui.feature.patch/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.wst.xml_ui.feature.patch/feature.xml b/features/org.eclipse.wst.xml_ui.feature.patch/feature.xml
deleted file mode 100644
index 42b3c23..0000000
--- a/features/org.eclipse.wst.xml_ui.feature.patch/feature.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_ui.feature.path"
-      label="Path Feature"
-      version="1.0.0">
-
-   <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>
-
-   <requires>
-      <import feature="org.eclipse.wst.xml_ui.feature" version="1.5.5.v200707311635-zkiCfzO-IFUOjzR" patch="true"/>
-   </requires>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_ui.feature/.cvsignore b/features/org.eclipse.wst.xml_ui.feature/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.wst.xml_ui.feature/.project b/features/org.eclipse.wst.xml_ui.feature/.project
deleted file mode 100644
index 69318c7..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.wst.xml_ui.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.wst.xml_ui.feature/build.properties b/features/org.eclipse.wst.xml_ui.feature/build.properties
deleted file mode 100644
index 27affc5..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               eclipse_update_120.jpg,\
-               license.html,\
-               feature.properties
diff --git a/features/org.eclipse.wst.xml_ui.feature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_ui.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/epl-v10.html b/features/org.eclipse.wst.xml_ui.feature/epl-v10.html
deleted file mode 100644
index ed4b196..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
-  <o:Revision>2</o:Revision>
-  <o:TotalTime>3</o:TotalTime>
-  <o:Created>2004-03-05T23:03:00Z</o:Created>
-  <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
-  <o:Pages>4</o:Pages>
-  <o:Words>1626</o:Words>
-  <o:Characters>9270</o:Characters>
-   <o:Lines>77</o:Lines>
-  <o:Paragraphs>18</o:Paragraphs>
-  <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
-  <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
-  <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{font-family:Tahoma;
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-generic-font-family:swiss;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	font-family:"Times New Roman";
-	mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	font-family:Tahoma;
-	mso-fareast-font-family:"Times New Roman";}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/feature.properties
deleted file mode 100644
index 272b56b..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2007 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse XML Editors and Tools
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-# "updateSiteName" property - label for the update site
-updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
-
-# "description" property - description of the feature
-description=XML, DTD and XML Schema Editors, validators, and XML Catalog support
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_ui.feature/feature.xml b/features/org.eclipse.wst.xml_ui.feature/feature.xml
deleted file mode 100644
index 5a624f5..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/feature.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.wst.xml_ui.feature"
-      label="%featureName"
-      version="3.2.0.qualifier"
-      provider-name="%providerName"
-      plugin="org.eclipse.wst.xml.ui">
-
-   <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.common_ui.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_userdoc.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.wst.xml_core.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.dtd.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui.infopop"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.sse.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xml.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.wst.xsd.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.wst.xml_ui.feature/license.html b/features/org.eclipse.wst.xml_ui.feature/license.html
deleted file mode 100644
index 303e665..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/license.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
-<!-- saved from url=(0044)http://www.eclipse.org/legal/epl/notice.html -->
-<HTML><HEAD><TITLE>Eclipse.org Software User Agreement</TITLE>
-<META http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<META content="MSHTML 6.00.2800.1479" name=GENERATOR></HEAD>
-<BODY lang=EN-US vLink=purple link=blue>
-<H2>Eclipse Foundation Software User Agreement</H2>
-<P>June 06, 2007</P>
-<H3>Usage Of Content</H3>
-<P>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION 
-AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF 
-THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE 
-TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED 
-BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED 
-BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE 
-AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE 
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY 
-APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU 
-MAY NOT USE THE CONTENT.</P>
-<H3>Applicable Licenses</H3>
-<P>Unless otherwise indicated, all Content made available by the Eclipse 
-Foundation is provided to you under the terms and conditions of the Eclipse 
-Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this 
-Content and is also available at <A 
-href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</A>. 
-For purposes of the EPL, "Program" will mean the Content.</P>
-<P>Content includes, but is not limited to, source code, object code, 
-documentation and other files maintained in the Eclipse.org CVS repository 
-("Repository") in CVS modules ("Modules") and made available as downloadable 
-archives ("Downloads").</P>
-<P>Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments 
-("Fragments"), and features ("Features"). A Feature is a bundle of one or more 
-Plug-ins and/or Fragments and associated material. Files named "feature.xml" may 
-contain a list of the names and version numbers of the Plug-ins and/or Fragments 
-associated with a Feature. Plug-ins and Fragments are located in directories 
-named "plugins" and Features are located in directories named "features".</P>
-<P>Features may also include other Features ("Included Features"). Files named 
-"feature.xml" may contain a list of the names and version numbers of Included 
-Features.</P>
-<P>The terms and conditions governing Plug-ins and Fragments should be contained 
-in files named "about.html" ("Abouts"). The terms and conditions governing 
-Features and Included Features should be contained in files named "license.html" 
-("Feature Licenses"). Abouts and Feature Licenses may be located in any 
-directory of a Download or Module including, but not limited to the following 
-locations:</P>
-<UL>
-  <LI>The top-level (root) directory 
-  <LI>Plug-in and Fragment directories 
-  <LI>Subdirectories of the directory named "src" of certain Plug-ins 
-  <LI>Feature directories </LI></UL>
-<P>Note: if a Feature made available by the Eclipse Foundation is installed 
-using the Eclipse Update Manager, you must agree to a license ("Feature Update 
-License") during the installation process. If the Feature contains Included 
-Features, the Feature Update License should either provide you with the terms 
-and conditions governing the Included Features or inform you where you can 
-locate them. Feature Update Licenses may be found in the "license" property of 
-files named "feature.properties". Such Abouts, Feature Licenses and Feature 
-Update Licenses contain the terms and conditions (or references to such terms 
-and conditions) that govern your use of the associated Content in that 
-directory.</P>
-<P>THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL 
-OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE 
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</P>
-<UL>
-  <LI>Common Public License Version 1.0 (available at <A 
-  href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</A>)
-
-  <LI>Apache Software License 1.1 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</A>)
-
-  <LI>Apache Software License 2.0 (available at <A 
-  href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</A>)
-
-  <LI>IBM Public License 1.0 (available at <A 
-  href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</A>)
-  <LI>Metro Link Public License 1.00 (available at <A 
-  href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</A>) 
-  
-  <LI>Mozilla Public License Version 1.1 (available at <A 
-  href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</A>) </LI>
-  
-  <li>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-<P>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR 
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License is 
-provided, please contact the Eclipse Foundation to determine what terms and 
-conditions govern that particular Content.</P>
-<H3>Cryptography</H3>
-<P>Content may contain encryption software. The country in which you are 
-currently may have restrictions on the import, possession, and use, and/or 
-re-export to another country, of encryption software. BEFORE using any 
-encryption software, please check the country's laws, regulations and policies 
-concerning the import, possession, or use, and re-export of encryption software, 
-to see if this is permitted.</P></BODY></HTML>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.ini b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.mappings b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.mappings
deleted file mode 100644
index a28390a..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/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@
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.properties
deleted file mode 100644
index 04e10ea..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/about.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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.
-#
-# Do not translate any values surrounded by {}
-
-blurb=Web Standard Tools - XML UI\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/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/build.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/build.properties
deleted file mode 100644
index 30a575c..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/build.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-
-bin.includes = about.html, about.ini, about.mappings, about.properties, wtp_prod32.png, plugin.properties, plugin.xml, src/**, META-INF/
-sourcePlugin = true
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/plugin.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 29b5f4d..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/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
-###############################################################################
-pluginName=Web Standard Tools - XML UI Source
-providerName=Eclipse.org
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/wtp_prod32.gif b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/wtp_prod32.gif
deleted file mode 100644
index eefb44a..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/wtp_prod32.gif
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/wtp_prod32.png b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/wtp_prod32.png
deleted file mode 100644
index bfceab3..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateBundle/wtp_prod32.png
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index dc737af..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v10.html,\
-eclipse_update_120.jpg,\
-feature.xml,\
-feature.properties,\
-license.html
-generate.feature@org.eclipse.wst.xml_core.feature.source=org.eclipse.wst.xml_core.feature
-
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/epl-v10.html
deleted file mode 100644
index 022ad29..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/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>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 90609a9..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,145 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=WST XML UI Developer Resources
-
-# "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=Source code zips for WST XML UI.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2007 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-June 06, 2007\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java? ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-    - Common Development and Distribution License (CDDL) Version 1.0 (available at http://www.sun.com/cddl/cddl.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index fec4a48..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>June 06, 2007</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  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
-   (&quot;EPL&quot;).  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, &quot;Program&quot; 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 (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-   
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>   
- 
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  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>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<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 (&quot;Feature Update License&quot;) 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 &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-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>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<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>
-	<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>	
-	<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>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-  <LI>Common Development and Distribution License (CDDL) Version 1.0 (available at <A 
-  href="http://www.sun.com/cddl/cddl.html">http://www.sun.com/cddl/cddl.html)</A>
-  </LI>
-</UL>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-   
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index fe81d46..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-<h3>Source Code</h3>
-<p>This plug-in contains source code zip files (&quot;Source Zips&quot;) that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
-agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
-src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
-
-</body>
-</html>
diff --git a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index fda5a40..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,31 +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=wtp_prod32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (not 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/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings b/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 0dfb735..0000000
--- a/features/org.eclipse.wst.xml_ui.feature/sourceTemplatePlugin/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@

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